diff --git a/util/test/demos/CMakeLists.txt b/util/test/demos/CMakeLists.txt
index f7e855d56..b257e5551 100644
--- a/util/test/demos/CMakeLists.txt
+++ b/util/test/demos/CMakeLists.txt
@@ -103,7 +103,7 @@ set(OPENGL_SRC
         gl/gl_overlay_test.cpp
         gl/gl_parameter_zoo.cpp
         gl/gl_per_type_tex_units.cpp
-        gl/gl_pixelhistory_formats.cpp
+        gl/gl_pixel_history.cpp
         gl/gl_queries_in_use.cpp
         gl/gl_renderbuffer_zoo.cpp
         gl/gl_resource_lifetimes.cpp
diff --git a/util/test/demos/demos.vcxproj b/util/test/demos/demos.vcxproj
index 195d5b505..3dcdded5d 100644
--- a/util/test/demos/demos.vcxproj
+++ b/util/test/demos/demos.vcxproj
@@ -272,7 +272,7 @@
     <ClCompile Include="gl\gl_unsized_ms_fbo_attachment.cpp" />
     <ClCompile Include="gl\gl_vao_0.cpp" />
     <ClCompile Include="gl\gl_vertex_attr_zoo.cpp" />
-    <ClCompile Include="gl\gl_pixelhistory_formats.cpp" />
+    <ClCompile Include="gl\gl_pixel_history.cpp" />
     <ClCompile Include="linux\linux_platform.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
diff --git a/util/test/demos/demos.vcxproj.filters b/util/test/demos/demos.vcxproj.filters
index c3443183e..0c9037950 100644
--- a/util/test/demos/demos.vcxproj.filters
+++ b/util/test/demos/demos.vcxproj.filters
@@ -643,7 +643,7 @@
     <ClCompile Include="d3d12\d3d12_vertex_uav.cpp">
       <Filter>D3D12\demos</Filter>
     </ClCompile>
-    <ClCompile Include="gl\gl_pixelhistory_formats.cpp">
+    <ClCompile Include="gl\gl_pixel_history.cpp">
       <Filter>OpenGL\demos</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/util/test/demos/gl/gl_pixelhistory_formats.cpp b/util/test/demos/gl/gl_pixel_history.cpp
similarity index 99%
rename from util/test/demos/gl/gl_pixelhistory_formats.cpp
rename to util/test/demos/gl/gl_pixel_history.cpp
index 4ceab59fe..8d8abc9b8 100644
--- a/util/test/demos/gl/gl_pixelhistory_formats.cpp
+++ b/util/test/demos/gl/gl_pixel_history.cpp
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include "gl_test.h"
 
-RD_TEST(GL_PixelHistory_Formats, OpenGLGraphicsTest)
+RD_TEST(GL_Pixel_History, OpenGLGraphicsTest)
 {
   static constexpr const char *Description =
       "Draw a triangle to a variety of texture formats (to test pixel history).";
diff --git a/util/test/tests/GL/GL_PixelHistory_Formats.py b/util/test/tests/GL/GL_Pixel_History.py
similarity index 96%
rename from util/test/tests/GL/GL_PixelHistory_Formats.py
rename to util/test/tests/GL/GL_Pixel_History.py
index 03ffec0ce..e17b6e640 100644
--- a/util/test/tests/GL/GL_PixelHistory_Formats.py
+++ b/util/test/tests/GL/GL_Pixel_History.py
@@ -2,10 +2,8 @@ import renderdoc as rd
 import rdtest
 from typing import List
 
-def event_id(x): return x.eventId
-
-class GL_PixelHistory_Formats(rdtest.TestCase):
-    demos_test_name = 'GL_PixelHistory_Formats'
+class GL_Pixel_History(rdtest.TestCase):
+    demos_test_name = 'GL_Pixel_History'
     demos_frame_cap = 10
 
     def check_capture(self):