diff --git a/src/build_angle.gypi b/src/build_angle.gypi
index ce759c9..6fb7d74 100644
--- a/src/build_angle.gypi
+++ b/src/build_angle.gypi
@@ -228,7 +228,7 @@
             'libGLESv2/Context.h',
             'libGLESv2/D3DConstantTable.cpp',
             'libGLESv2/D3DConstantTable.h',
-            'libGLESv2/EnumTypes.h',
+            'libGLESv2/angletypes.h',
             'libGLESv2/Fence.cpp',
             'libGLESv2/Fence.h',
             'libGLESv2/Float16ToFloat32.cpp',
diff --git a/src/libGLESv2/ResourceManager.h b/src/libGLESv2/ResourceManager.h
index 9dcd547..e99c77c 100644
--- a/src/libGLESv2/ResourceManager.h
+++ b/src/libGLESv2/ResourceManager.h
@@ -20,7 +20,7 @@
 #endif
 
 #include "common/angleutils.h"
-#include "libGLESv2/EnumTypes.h"
+#include "libGLESv2/angletypes.h"
 #include "libGLESv2/HandleAllocator.h"
 
 namespace rx
diff --git a/src/libGLESv2/EnumTypes.h b/src/libGLESv2/angletypes.h
similarity index 64%
rename from src/libGLESv2/EnumTypes.h
rename to src/libGLESv2/angletypes.h
index c554523..f03ebac 100644
--- a/src/libGLESv2/EnumTypes.h
+++ b/src/libGLESv2/angletypes.h
@@ -4,10 +4,10 @@
 // found in the LICENSE file.
 //
 
-// EnumTypes.h : Defines a variety of enum types that are used throughout libGLESv2
+// angletypes.h : Defines a variety of structures and enum types that are used throughout libGLESv2
 
-#ifndef LIBGLESV2_ENUMTYPES_H_
-#define LIBGLESV2_ENUMTYPES_H_
+#ifndef LIBGLESV2_ANGLETYPES_H_
+#define LIBGLESV2_ANGLETYPES_H_
 
 namespace gl
 {
@@ -29,4 +29,4 @@
 
 }
 
-#endif // LIBGLESV2_ENUMTYPES_H_
+#endif // LIBGLESV2_ANGLETYPES_H_
diff --git a/src/libGLESv2/libGLESv2.vcxproj b/src/libGLESv2/libGLESv2.vcxproj
index 5700068..9011b3f 100644
--- a/src/libGLESv2/libGLESv2.vcxproj
+++ b/src/libGLESv2/libGLESv2.vcxproj
@@ -261,11 +261,11 @@
     <ClCompile Include="VertexDataManager.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="angletypes.h" />
     <ClInclude Include="BinaryStream.h" />
     <ClInclude Include="Buffer.h" />
     <ClInclude Include="Context.h" />
     <ClInclude Include="D3DConstantTable.h" />
-    <ClInclude Include="EnumTypes.h" />
     <ClInclude Include="Fence.h" />
     <ClInclude Include="Framebuffer.h" />
     <ClInclude Include="..\..\include\GLES2\gl2.h" />
diff --git a/src/libGLESv2/libGLESv2.vcxproj.filters b/src/libGLESv2/libGLESv2.vcxproj.filters
index 4c36f7d..c8d8051 100644
--- a/src/libGLESv2/libGLESv2.vcxproj.filters
+++ b/src/libGLESv2/libGLESv2.vcxproj.filters
@@ -187,9 +187,6 @@
     <ClInclude Include="VertexDataManager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="EnumTypes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="renderer\ShaderCache.h">
       <Filter>Renderer</Filter>
     </ClInclude>
@@ -220,6 +217,9 @@
     <ClInclude Include="renderer\Blit.h">
       <Filter>Renderer</Filter>
     </ClInclude>
+    <ClInclude Include="angletypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="libGLESv2.def">
diff --git a/src/libGLESv2/renderer/Renderer.h b/src/libGLESv2/renderer/Renderer.h
index 9199a2b..b2e887d 100644
--- a/src/libGLESv2/renderer/Renderer.h
+++ b/src/libGLESv2/renderer/Renderer.h
@@ -17,7 +17,7 @@
 #include <EGL/egl.h>
 
 #include "libGLESv2/Texture.h"
-#include "libGLESv2/EnumTypes.h"
+#include "libGLESv2/angletypes.h"
 
 const int versionWindowsVista = MAKEWORD(0x00, 0x06);
 const int versionWindows7 = MAKEWORD(0x01, 0x06);