diff --git a/desktop_version/src/CustomLevels.cpp b/desktop_version/src/CustomLevels.cpp
index 009fc88a..0aaa4615 100644
--- a/desktop_version/src/CustomLevels.cpp
+++ b/desktop_version/src/CustomLevels.cpp
@@ -1073,7 +1073,7 @@ bool customlevelclass::load(std::string& _path)
         {
             for( tinyxml2::XMLElement* edEntityEl = pElem->FirstChildElement(); edEntityEl; edEntityEl=edEntityEl->NextSiblingElement())
             {
-                edentities entity = edentities();
+                CustomEntity entity = CustomEntity();
                 const char* text = edEntityEl->GetText();
 
                 if (text != NULL)
diff --git a/desktop_version/src/CustomLevels.h b/desktop_version/src/CustomLevels.h
index 98dcd352..33367094 100644
--- a/desktop_version/src/CustomLevels.h
+++ b/desktop_version/src/CustomLevels.h
@@ -7,7 +7,8 @@
 #include <string>
 #include <vector>
 
-class edentities{
+class CustomEntity
+{
 public:
     int x, y, t;
     //parameters
@@ -60,7 +61,7 @@ struct LevelMetaData
 };
 
 
-extern std::vector<edentities> edentity;
+extern std::vector<CustomEntity> edentity;
 
 class EditorData
 {
diff --git a/desktop_version/src/Editor.cpp b/desktop_version/src/Editor.cpp
index 86cd5945..5219a31b 100644
--- a/desktop_version/src/Editor.cpp
+++ b/desktop_version/src/Editor.cpp
@@ -245,7 +245,7 @@ void editorclass::getlin(const enum textmode mode, const std::string& prompt, st
 
 static void addedentity( int xp, int yp, int tp, int p1 = 0, int p2 = 0, int p3 = 0, int p4 = 0, int p5 = 320, int p6 = 240)
 {
-    edentities entity;
+    CustomEntity entity;
 
     entity.x=xp;
     entity.y=yp;
diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp
index 428b80bb..be0c4c86 100644
--- a/desktop_version/src/Map.cpp
+++ b/desktop_version/src/Map.cpp
@@ -453,7 +453,7 @@ void mapclass::initcustommapdata(void)
 #if !defined(NO_CUSTOM_LEVELS)
 	for (size_t i = 0; i < edentity.size(); i++)
 	{
-		const edentities& ent = edentity[i];
+		const CustomEntity& ent = edentity[i];
 		if (ent.t != 9)
 		{
 			continue;
@@ -1637,7 +1637,7 @@ void mapclass::loadlevel(int rx, int ry)
 		for (size_t edi = 0; edi < edentity.size(); edi++)
 		{
 			// If entity is in this room, create it
-			const edentities& ent = edentity[edi];
+			const CustomEntity& ent = edentity[edi];
 			const int tsx = ent.x / 40;
 			const int tsy = ent.y / 30;
 
diff --git a/desktop_version/src/main.cpp b/desktop_version/src/main.cpp
index 86874547..4030b6da 100644
--- a/desktop_version/src/main.cpp
+++ b/desktop_version/src/main.cpp
@@ -32,7 +32,7 @@
 scriptclass script;
 
 #ifndef NO_CUSTOM_LEVELS
-std::vector<edentities> edentity;
+std::vector<CustomEntity> edentity;
 customlevelclass cl;
 # ifndef NO_EDITOR
 editorclass ed;