diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt
index 1566ea91..65d29e29 100644
--- a/library/PolyVoxCore/CMakeLists.txt
+++ b/library/PolyVoxCore/CMakeLists.txt
@@ -12,7 +12,7 @@ SET(CORE_SRC_FILES
 	source/MeshFace.cpp
 	source/MeshVertex.cpp
 	source/Region.cpp
-	source/SurfaceVertex.cpp
+	source/VertexTypes.cpp
 	source/VoxelFilters.cpp
 )
 
@@ -41,9 +41,9 @@ SET(CORE_INC_FILES
 	include/SurfaceExtractor.inl
 	include/SurfaceMesh.h
 	include/SurfaceMesh.inl
-	include/SurfaceVertex.h
 	include/Vector.h
 	include/Vector.inl
+	include/VertexTypes.h
 	include/Volume.h
 	include/Volume.inl
 	include/VolumeSampler.h
diff --git a/library/PolyVoxCore/include/CubicSurfaceExtractor.inl b/library/PolyVoxCore/include/CubicSurfaceExtractor.inl
index b77e287e..7f56eb65 100644
--- a/library/PolyVoxCore/include/CubicSurfaceExtractor.inl
+++ b/library/PolyVoxCore/include/CubicSurfaceExtractor.inl
@@ -25,7 +25,7 @@ freely, subject to the following restrictions:
 #include "MaterialDensityPair.h"
 #include "SurfaceMesh.h"
 #include "PolyVoxImpl/MarchingCubesTables.h"
-#include "SurfaceVertex.h"
+#include "VertexTypes.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/CubicSurfaceExtractorWithNormals.inl b/library/PolyVoxCore/include/CubicSurfaceExtractorWithNormals.inl
index 1dcf6b73..75d24ec9 100644
--- a/library/PolyVoxCore/include/CubicSurfaceExtractorWithNormals.inl
+++ b/library/PolyVoxCore/include/CubicSurfaceExtractorWithNormals.inl
@@ -25,7 +25,7 @@ freely, subject to the following restrictions:
 #include "MaterialDensityPair.h"
 #include "SurfaceMesh.h"
 #include "PolyVoxImpl/MarchingCubesTables.h"
-#include "SurfaceVertex.h"
+#include "VertexTypes.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/MeshVertex.h b/library/PolyVoxCore/include/MeshVertex.h
index 68a5b221..66c85a4a 100644
--- a/library/PolyVoxCore/include/MeshVertex.h
+++ b/library/PolyVoxCore/include/MeshVertex.h
@@ -25,7 +25,7 @@ freely, subject to the following restrictions:
 #define __PolyVox_MeshVertex_H__
 
 #include "PolyVoxForwardDeclarations.h"
-#include "SurfaceVertex.h"
+#include "VertexTypes.h"
 
 #include "PolyVoxImpl/TypeDef.h"
 
diff --git a/library/PolyVoxCore/include/SurfaceExtractor.inl b/library/PolyVoxCore/include/SurfaceExtractor.inl
index 0e166974..8b4b0e08 100644
--- a/library/PolyVoxCore/include/SurfaceExtractor.inl
+++ b/library/PolyVoxCore/include/SurfaceExtractor.inl
@@ -25,7 +25,7 @@ freely, subject to the following restrictions:
 #include "MaterialDensityPair.h"
 #include "SurfaceMesh.h"
 #include "PolyVoxImpl/MarchingCubesTables.h"
-#include "SurfaceVertex.h"
+#include "VertexTypes.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/SurfaceMesh.h b/library/PolyVoxCore/include/SurfaceMesh.h
index c55fc392..a7352507 100644
--- a/library/PolyVoxCore/include/SurfaceMesh.h
+++ b/library/PolyVoxCore/include/SurfaceMesh.h
@@ -30,7 +30,7 @@ freely, subject to the following restrictions:
 
 #include "PolyVoxForwardDeclarations.h"
 #include "Region.h"
-#include "SurfaceVertex.h"
+#include "VertexTypes.h"
 #include "PolyVoxImpl/TypeDef.h"
 
 namespace PolyVox
diff --git a/library/PolyVoxCore/include/SurfaceVertex.h b/library/PolyVoxCore/include/VertexTypes.h
similarity index 100%
rename from library/PolyVoxCore/include/SurfaceVertex.h
rename to library/PolyVoxCore/include/VertexTypes.h
diff --git a/library/PolyVoxCore/source/GradientEstimators.cpp b/library/PolyVoxCore/source/GradientEstimators.cpp
index d2930364..2dfdb6d8 100644
--- a/library/PolyVoxCore/source/GradientEstimators.cpp
+++ b/library/PolyVoxCore/source/GradientEstimators.cpp
@@ -23,7 +23,7 @@ freely, subject to the following restrictions:
 
 #include "GradientEstimators.h"
 #include "SurfaceMesh.h"
-#include "SurfaceVertex.h"
+#include "VertexTypes.h"
 #include "PolyVoxImpl/TypeDef.h"
 
 using namespace std;
diff --git a/library/PolyVoxCore/source/MeshEdge.cpp b/library/PolyVoxCore/source/MeshEdge.cpp
index 5ac59007..5158ea4e 100644
--- a/library/PolyVoxCore/source/MeshEdge.cpp
+++ b/library/PolyVoxCore/source/MeshEdge.cpp
@@ -26,7 +26,7 @@ freely, subject to the following restrictions:
 #include "Mesh.h"
 #include "MeshFace.h"
 #include "MeshVertex.h"
-#include "SurfaceVertex.h"
+#include "VertexTypes.h"
 
 #include <set>
 
diff --git a/library/PolyVoxCore/source/SurfaceVertex.cpp b/library/PolyVoxCore/source/VertexTypes.cpp
similarity index 95%
rename from library/PolyVoxCore/source/SurfaceVertex.cpp
rename to library/PolyVoxCore/source/VertexTypes.cpp
index 4ab73489..46a89283 100644
--- a/library/PolyVoxCore/source/SurfaceVertex.cpp
+++ b/library/PolyVoxCore/source/VertexTypes.cpp
@@ -23,7 +23,7 @@ freely, subject to the following restrictions:
 
 #include <sstream>
 
-#include "SurfaceVertex.h"
+#include "VertexTypes.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxUtil/include/VolumeChangeTracker.inl b/library/PolyVoxUtil/include/VolumeChangeTracker.inl
index 1829850d..15a4c649 100644
--- a/library/PolyVoxUtil/include/VolumeChangeTracker.inl
+++ b/library/PolyVoxUtil/include/VolumeChangeTracker.inl
@@ -26,7 +26,7 @@ freely, subject to the following restrictions:
 #include "GradientEstimators.h"
 #include "SurfaceMesh.h"
 #include "PolyVoxImpl/MarchingCubesTables.h"
-#include "SurfaceVertex.h"
+#include "VertexTypes.h"
 #include "PolyVoxImpl/Utility.h"
 #include "Vector.h"
 #include "Volume.h"