diff --git a/include/animationfunctions.h b/include/animation_functions.h
similarity index 100%
rename from include/animationfunctions.h
rename to include/animation_functions.h
diff --git a/include/wordclock_functions.h b/include/render_functions.h
similarity index 100%
rename from include/wordclock_functions.h
rename to include/render_functions.h
diff --git a/src/matrix/animationfunctions.cpp b/src/matrix/animation_functions.cpp
similarity index 99%
rename from src/matrix/animationfunctions.cpp
rename to src/matrix/animation_functions.cpp
index b3fe13a..afdbd9e 100644
--- a/src/matrix/animationfunctions.cpp
+++ b/src/matrix/animation_functions.cpp
@@ -1,5 +1,5 @@
 #include <Arduino.h>
-#include "animationfunctions.h"
+#include "animation_functions.h"
 #include "wordclock_constants.h"
 #include "udp_logger.h"
 #include "ledmatrix.h"
diff --git a/src/wordclock_functions.cpp b/src/matrix/render_functions.cpp
similarity index 100%
rename from src/wordclock_functions.cpp
rename to src/matrix/render_functions.cpp
diff --git a/src/wordclock_esp8266.cpp b/src/wordclock_esp8266.cpp
index bbbf220..30a3101 100644
--- a/src/wordclock_esp8266.cpp
+++ b/src/wordclock_esp8266.cpp
@@ -33,7 +33,7 @@
 #include <WiFiUdp.h>
 
 // own libraries
-#include "animationfunctions.h"
+#include "animation_functions.h"
 #include "pong.h"
 #include "snake.h"
 #include "tetris.h"
@@ -44,7 +44,7 @@
 #include "otafunctions.h"
 #include "udp_logger.h"
 #include "wordclock_constants.h"
-#include "wordclock_functions.h"
+#include "render_functions.h"
 
 // DEBUG
 uint32_t dbg_counter = 0; // TODO RM