diff --git a/include/rd7.hpp b/include/rd7.hpp
index ea53676..117d445 100644
--- a/include/rd7.hpp
+++ b/include/rd7.hpp
@@ -27,7 +27,7 @@
 #include <renderd7/Message.hpp>
 #include <renderd7/Net.hpp>
 #include <renderd7/Overlays.hpp>
-#include <renderd7/Sound2.hpp>
+#include <renderd7/Sound.hpp>
 #include <renderd7/StealConsole.hpp>
 #include <renderd7/Timer.hpp>
 #include <renderd7/UI7.hpp>
diff --git a/include/renderd7/Font2.hpp b/include/renderd7/Font.hpp
similarity index 100%
rename from include/renderd7/Font2.hpp
rename to include/renderd7/Font.hpp
diff --git a/include/renderd7/Render2.hpp b/include/renderd7/Render2.hpp
index db79cdc..3f05a85 100644
--- a/include/renderd7/Render2.hpp
+++ b/include/renderd7/Render2.hpp
@@ -20,7 +20,7 @@
 
 #include <map>
 #include <renderd7/Color.hpp>
-#include <renderd7/Font2.hpp>
+#include <renderd7/Font.hpp>
 #include <renderd7/R7Vec.hpp>
 #include <renderd7/smart_ctor.hpp>
 
diff --git a/include/renderd7/Sound2.hpp b/include/renderd7/Sound.hpp
similarity index 100%
rename from include/renderd7/Sound2.hpp
rename to include/renderd7/Sound.hpp
diff --git a/source/Sound2.cpp b/source/Sound.cpp
similarity index 99%
rename from source/Sound2.cpp
rename to source/Sound.cpp
index 320ee3f..d805c7f 100644
--- a/source/Sound2.cpp
+++ b/source/Sound.cpp
@@ -18,7 +18,7 @@
 
 #include <cstring>
 #include <fstream>
-#include <renderd7/Sound2.hpp>
+#include <renderd7/Sound.hpp>
 #include <renderd7/internal_db.hpp>
 #include <string>