diff --git a/Knot.files b/Knot.files
index f1d43b611ba29fca3f5181f61ceaa368c14fde7a..57f992eb58f642e21f8cd0d33de7af3f30e65de4 100644
--- a/Knot.files
+++ b/Knot.files
@@ -198,10 +198,10 @@ src/knot/zone/zonefile.c
 src/knot/zone/zonefile.h
 src/knot/zone/events/events.c
 src/knot/zone/events/events.h
-src/knot/zone/events/events-impl.h
-src/knot/zone/events/events-impl.c
-src/knot/zone/events/events-replan.c
-src/knot/zone/events/events-replan.h
+src/knot/zone/events/handlers.h
+src/knot/zone/events/handlers.c
+src/knot/zone/events/replan.c
+src/knot/zone/events/replan.h
 src/libknot/binary.c
 src/libknot/binary.h
 src/libknot/common.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 88adfe0a0daab7035535dbd172f400a51f8d656e..456fbcd2ecfcfa9f76baa28bf63b159b9c492c66 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -298,10 +298,10 @@ libknotd_la_SOURCES =				\
 	knot/zone/contents.h			\
 	knot/zone/events/events.c		\
 	knot/zone/events/events.h		\
-	knot/zone/events/events-impl.c		\
-	knot/zone/events/events-impl.h		\
-	knot/zone/events/events-replan.c	\
-	knot/zone/events/events-replan.h	\
+	knot/zone/events/handlers.c		\
+	knot/zone/events/handlers.h		\
+	knot/zone/events/replan.c		\
+	knot/zone/events/replan.h		\
 	knot/zone/node.c			\
 	knot/zone/node.h			\
 	knot/zone/semantic-check.c		\
diff --git a/src/knot/zone/events/events.c b/src/knot/zone/events/events.c
index 686aed64197677df78ece1c753d6ab626ce5ec5d..0a6821002a72ed66a9991c39b4db7979b4c72423 100644
--- a/src/knot/zone/events/events.c
+++ b/src/knot/zone/events/events.c
@@ -22,8 +22,8 @@
 #include "knot/worker/pool.h"
 #include "knot/zone/zone.h"
 #include "knot/zone/events/events.h"
-#include "knot/zone/events/events-impl.h"
-#include "knot/zone/events/events-replan.h"
+#include "knot/zone/events/handlers.h"
+#include "knot/zone/events/replan.h"
 
 /* ------------------------- internal timers -------------------------------- */
 
diff --git a/src/knot/zone/events/events-impl.c b/src/knot/zone/events/handlers.c
similarity index 99%
rename from src/knot/zone/events/events-impl.c
rename to src/knot/zone/events/handlers.c
index 0e2903c4d27cea0b4375eda1c5b24b79c3711b47..21b8a592a567c72ac9d7bfa99218d570d0dc3320 100644
--- a/src/knot/zone/events/events-impl.c
+++ b/src/knot/zone/events/handlers.c
@@ -25,7 +25,7 @@
 #include "knot/zone/zone-load.h"
 #include "knot/zone/zonefile.h"
 #include "knot/zone/events/events.h"
-#include "knot/zone/events/events-impl.h"
+#include "knot/zone/events/handlers.h"
 #include "knot/updates/apply.h"
 #include "knot/nameserver/internet.h"
 #include "knot/nameserver/update.h"
diff --git a/src/knot/zone/events/events-impl.h b/src/knot/zone/events/handlers.h
similarity index 100%
rename from src/knot/zone/events/events-impl.h
rename to src/knot/zone/events/handlers.h
diff --git a/src/knot/zone/events/events-replan.c b/src/knot/zone/events/replan.c
similarity index 98%
rename from src/knot/zone/events/events-replan.c
rename to src/knot/zone/events/replan.c
index 3b64f752383d39199a2f46ba679de7794d43f273..1aecf49d907bb6ff7f95a2fa618ad23595f4cbd2 100644
--- a/src/knot/zone/events/events-replan.c
+++ b/src/knot/zone/events/replan.c
@@ -15,8 +15,8 @@
 */
 
 #include "libknot/rrtype/soa.h"
-#include "knot/zone/events/events-replan.h"
-#include "knot/zone/events/events-impl.h"
+#include "knot/zone/events/replan.h"
+#include "knot/zone/events/handlers.h"
 #include "knot/zone/zone.h"
 
 /* -- Zone event replanning functions --------------------------------------- */
diff --git a/src/knot/zone/events/events-replan.h b/src/knot/zone/events/replan.h
similarity index 100%
rename from src/knot/zone/events/events-replan.h
rename to src/knot/zone/events/replan.h