diff --git a/src/game/editor/ed_editor.cpp b/src/game/editor/editor.cpp
similarity index 99%
rename from src/game/editor/ed_editor.cpp
rename to src/game/editor/editor.cpp
index 2be4da76a..e12b20bf4 100644
--- a/src/game/editor/ed_editor.cpp
+++ b/src/game/editor/editor.cpp
@@ -18,7 +18,7 @@
 #include <game/client/render.h>
 #include <game/generated/client_data.h>
 
-#include "ed_editor.h"
+#include "editor.h"
 #include <game/client/lineinput.h>
 
 #include <game/localization.h>
diff --git a/src/game/editor/ed_editor.h b/src/game/editor/editor.h
similarity index 99%
rename from src/game/editor/ed_editor.h
rename to src/game/editor/editor.h
index 41162b228..22e8c32dd 100644
--- a/src/game/editor/ed_editor.h
+++ b/src/game/editor/editor.h
@@ -1,7 +1,7 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
-#ifndef GAME_EDITOR_ED_EDITOR_H
-#define GAME_EDITOR_ED_EDITOR_H
+#ifndef GAME_EDITOR_EDITOR_H
+#define GAME_EDITOR_EDITOR_H
 
 #include <base/system.h>
 #include <base/math.h>
diff --git a/src/game/editor/ed_io.cpp b/src/game/editor/io.cpp
similarity index 99%
rename from src/game/editor/ed_io.cpp
rename to src/game/editor/io.cpp
index a5ead97a7..7207e49fe 100644
--- a/src/game/editor/ed_io.cpp
+++ b/src/game/editor/io.cpp
@@ -6,7 +6,7 @@
 #include <engine/serverbrowser.h>
 #include <engine/storage.h>
 #include <game/gamecore.h>
-#include "ed_editor.h"
+#include "editor.h"
 
 template<typename T>
 static int MakeVersion(int i, const T &v)
diff --git a/src/game/editor/ed_layer_game.cpp b/src/game/editor/layer_game.cpp
similarity index 95%
rename from src/game/editor/ed_layer_game.cpp
rename to src/game/editor/layer_game.cpp
index cf48845ee..f4a5fb76d 100644
--- a/src/game/editor/ed_layer_game.cpp
+++ b/src/game/editor/layer_game.cpp
@@ -1,6 +1,6 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
-#include "ed_editor.h"
+#include "editor.h"
 
 
 CLayerGame::CLayerGame(int w, int h)
diff --git a/src/game/editor/ed_layer_quads.cpp b/src/game/editor/layer_quads.cpp
similarity index 99%
rename from src/game/editor/ed_layer_quads.cpp
rename to src/game/editor/layer_quads.cpp
index 680a54cd9..d2a8a1e5a 100644
--- a/src/game/editor/ed_layer_quads.cpp
+++ b/src/game/editor/layer_quads.cpp
@@ -5,7 +5,7 @@
 #include <engine/console.h>
 #include <engine/graphics.h>
 
-#include "ed_editor.h"
+#include "editor.h"
 #include <game/generated/client_data.h>
 #include <game/client/render.h>
 #include <game/localization.h>
diff --git a/src/game/editor/ed_layer_tiles.cpp b/src/game/editor/layer_tiles.cpp
similarity index 99%
rename from src/game/editor/ed_layer_tiles.cpp
rename to src/game/editor/layer_tiles.cpp
index d0c9041cc..db020351a 100644
--- a/src/game/editor/ed_layer_tiles.cpp
+++ b/src/game/editor/layer_tiles.cpp
@@ -8,7 +8,7 @@
 
 #include <game/generated/client_data.h>
 #include <game/client/render.h>
-#include "ed_editor.h"
+#include "editor.h"
 
 #include <game/localization.h>
 
diff --git a/src/game/editor/ed_popups.cpp b/src/game/editor/popups.cpp
similarity index 99%
rename from src/game/editor/ed_popups.cpp
rename to src/game/editor/popups.cpp
index f572e43cd..3ae29725e 100644
--- a/src/game/editor/ed_popups.cpp
+++ b/src/game/editor/popups.cpp
@@ -5,7 +5,7 @@
 #include <engine/input.h>
 #include <engine/keys.h>
 #include <engine/storage.h>
-#include "ed_editor.h"
+#include "editor.h"
 
 
 // popup menu handling