diff --git a/src/naveditor/CMakeLists.txt b/src/naveditor/CMakeLists.txt
index da50a2e7..777c6d45 100644
--- a/src/naveditor/CMakeLists.txt
+++ b/src/naveditor/CMakeLists.txt
@@ -45,20 +45,20 @@ add_sources( SOURCE_GROUP "IO/Include"
 
 add_sources( SOURCE_GROUP "Tools"
     "ChunkyTriMesh.cpp"
-    "ConvexVolumeTool.cpp"
     "CrowdTool.cpp"
     "NavMeshPruneTool.cpp"
     "NavMeshTesterTool.cpp"
     "OffMeshConnectionTool.cpp"
+    "ShapeVolumeTool.cpp"
 )
 
 add_sources( SOURCE_GROUP "Tools/Include"
     "include/ChunkyTriMesh.h"
-    "include/ConvexVolumeTool.h"
     "include/CrowdTool.h"
     "include/NavMeshPruneTool.h"
     "include/NavMeshTesterTool.h"
     "include/OffMeshConnectionTool.h"
+    "include/ShapeVolumeTool.h"
 )
 
 add_sources( SOURCE_GROUP "Utils"
diff --git a/src/naveditor/Editor_SoloMesh.cpp b/src/naveditor/Editor_SoloMesh.cpp
index a3dc339b..40df6048 100644
--- a/src/naveditor/Editor_SoloMesh.cpp
+++ b/src/naveditor/Editor_SoloMesh.cpp
@@ -25,7 +25,7 @@
 #include "NavEditor/Include/NavMeshTesterTool.h"
 #include "NavEditor/Include/NavMeshPruneTool.h"
 #include "NavEditor/Include/OffMeshConnectionTool.h"
-#include "NavEditor/Include/ConvexVolumeTool.h"
+#include "NavEditor/Include/ShapeVolumeTool.h"
 #include "NavEditor/Include/CrowdTool.h"
 #include "NavEditor/Include/InputGeom.h"
 #include "NavEditor/Include/Editor.h"
diff --git a/src/naveditor/Editor_TempObstacles.cpp b/src/naveditor/Editor_TempObstacles.cpp
index 66d296e1..cc5dd454 100644
--- a/src/naveditor/Editor_TempObstacles.cpp
+++ b/src/naveditor/Editor_TempObstacles.cpp
@@ -27,7 +27,7 @@
 #include "DebugUtils/Include/DetourDebugDraw.h"
 #include "NavEditor/Include/NavMeshTesterTool.h"
 #include "NavEditor/Include/OffMeshConnectionTool.h"
-#include "NavEditor/Include/ConvexVolumeTool.h"
+#include "NavEditor/Include/ShapeVolumeTool.h"
 #include "NavEditor/Include/CrowdTool.h"
 #include "NavEditor/Include/InputGeom.h"
 #include "NavEditor/Include/Editor.h"
diff --git a/src/naveditor/Editor_TileMesh.cpp b/src/naveditor/Editor_TileMesh.cpp
index 07efe4a5..2938c019 100644
--- a/src/naveditor/Editor_TileMesh.cpp
+++ b/src/naveditor/Editor_TileMesh.cpp
@@ -27,7 +27,7 @@
 #include "NavEditor/Include/NavMeshTesterTool.h"
 #include "NavEditor/Include/NavMeshPruneTool.h"
 #include "NavEditor/Include/OffMeshConnectionTool.h"
-#include "NavEditor/Include/ConvexVolumeTool.h"
+#include "NavEditor/Include/ShapeVolumeTool.h"
 #include "NavEditor/Include/CrowdTool.h"
 #include "NavEditor/Include/InputGeom.h"
 #include "NavEditor/Include/Editor.h"
diff --git a/src/naveditor/ConvexVolumeTool.cpp b/src/naveditor/ShapeVolumeTool.cpp
similarity index 99%
rename from src/naveditor/ConvexVolumeTool.cpp
rename to src/naveditor/ShapeVolumeTool.cpp
index 4029300e..456c9f28 100644
--- a/src/naveditor/ConvexVolumeTool.cpp
+++ b/src/naveditor/ShapeVolumeTool.cpp
@@ -19,7 +19,7 @@
 #include "Recast/Include/Recast.h"
 #include "DebugUtils/Include/DetourDebugDraw.h"
 #include "DebugUtils/Include/RecastDebugDraw.h"
-#include "NavEditor/Include/ConvexVolumeTool.h"
+#include "NavEditor/Include/ShapeVolumeTool.h"
 #include "NavEditor/Include/InputGeom.h"
 #include "NavEditor/Include/Editor.h"
 #include "naveditor/include/GameUtils.h"
diff --git a/src/naveditor/include/ConvexVolumeTool.h b/src/naveditor/include/ShapeVolumeTool.h
similarity index 95%
rename from src/naveditor/include/ConvexVolumeTool.h
rename to src/naveditor/include/ShapeVolumeTool.h
index 108fd370..1226510b 100644
--- a/src/naveditor/include/ConvexVolumeTool.h
+++ b/src/naveditor/include/ShapeVolumeTool.h
@@ -16,8 +16,8 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //
 
-#ifndef CONVEXVOLUMETOOL_H
-#define CONVEXVOLUMETOOL_H
+#ifndef SHAPEVOLUMETOOL_H
+#define SHAPEVOLUMETOOL_H
 
 #include "NavEditor/Include/Editor.h"
 
@@ -61,4 +61,4 @@ public:
 	virtual void handleRenderOverlay(double* proj, double* model, int* view);
 };
 
-#endif // CONVEXVOLUMETOOL_H
+#endif // SHAPEVOLUMETOOL_H