diff --git a/hw/xbox/nv2a/pgraph/gl/display.c b/hw/xbox/nv2a/pgraph/gl/display.c
index 23472ac4e1..fbea7d2f0c 100644
--- a/hw/xbox/nv2a/pgraph/gl/display.c
+++ b/hw/xbox/nv2a/pgraph/gl/display.c
@@ -25,7 +25,7 @@
 
 #include <math.h>
 
-void pgraph_gl_init_display_renderer(NV2AState *d)
+void pgraph_gl_init_display(NV2AState *d)
 {
     struct PGRAPHState *pg = &d->pgraph;
     PGRAPHGLState *r = pg->gl_renderer_state;
diff --git a/hw/xbox/nv2a/pgraph/gl/renderer.c b/hw/xbox/nv2a/pgraph/gl/renderer.c
index d65b8cdeff..02d28a2130 100644
--- a/hw/xbox/nv2a/pgraph/gl/renderer.c
+++ b/hw/xbox/nv2a/pgraph/gl/renderer.c
@@ -53,10 +53,10 @@ static void pgraph_gl_init(NV2AState *d)
 
     pgraph_gl_init_surfaces(pg);
     pgraph_gl_init_reports(d);
-    pgraph_gl_init_texture_cache(d);
-    pgraph_gl_init_vertex_cache(d);
-    pgraph_gl_init_shader_cache(pg);
-    pgraph_gl_init_display_renderer(d);
+    pgraph_gl_init_textures(d);
+    pgraph_gl_init_buffers(d);
+    pgraph_gl_init_shaders(pg);
+    pgraph_gl_init_display(d);
 
     pgraph_gl_update_entire_memory_buffer(d);
 
@@ -74,7 +74,7 @@ static void pgraph_gl_finalize(NV2AState *d)
     pgraph_gl_finalize_shaders(pg);
     pgraph_gl_finalize_textures(pg);
     pgraph_gl_finalize_reports(pg);
-    pgraph_gl_finalize_vertex(pg);
+    pgraph_gl_finalize_buffers(pg);
     pgraph_gl_finalize_display(pg);
 
     glo_set_current(NULL);
diff --git a/hw/xbox/nv2a/pgraph/gl/renderer.h b/hw/xbox/nv2a/pgraph/gl/renderer.h
index 5044f9d5a2..14160b21b7 100644
--- a/hw/xbox/nv2a/pgraph/gl/renderer.h
+++ b/hw/xbox/nv2a/pgraph/gl/renderer.h
@@ -254,18 +254,18 @@ void pgraph_gl_surface_flush(NV2AState *d);
 void pgraph_gl_surface_update(NV2AState *d, bool upload, bool color_write, bool zeta_write);
 void pgraph_gl_sync(NV2AState *d);
 void pgraph_gl_update_entire_memory_buffer(NV2AState *d);
-void pgraph_gl_init_display_renderer(NV2AState *d);
+void pgraph_gl_init_display(NV2AState *d);
 void pgraph_gl_finalize_display(PGRAPHState *pg);
 void pgraph_gl_init_reports(NV2AState *d);
 void pgraph_gl_finalize_reports(PGRAPHState *pg);
-void pgraph_gl_init_shader_cache(PGRAPHState *pg);
+void pgraph_gl_init_shaders(PGRAPHState *pg);
 void pgraph_gl_finalize_shaders(PGRAPHState *pg);
 void pgraph_gl_init_surfaces(PGRAPHState *pg);
 void pgraph_gl_finalize_surfaces(PGRAPHState *pg);
-void pgraph_gl_init_texture_cache(NV2AState *d);
+void pgraph_gl_init_textures(NV2AState *d);
 void pgraph_gl_finalize_textures(PGRAPHState *pg);
-void pgraph_gl_init_vertex_cache(NV2AState *d);
-void pgraph_gl_finalize_vertex(PGRAPHState *pg);
+void pgraph_gl_init_buffers(NV2AState *d);
+void pgraph_gl_finalize_buffers(PGRAPHState *pg);
 void pgraph_gl_process_pending_downloads(NV2AState *d);
 void pgraph_gl_reload_surface_scale_factor(PGRAPHState *pg);
 void pgraph_gl_render_surface_to_texture(NV2AState *d, SurfaceBinding *surface, TextureBinding *texture, TextureShape *texture_shape, int texture_unit);
diff --git a/hw/xbox/nv2a/pgraph/gl/shaders.c b/hw/xbox/nv2a/pgraph/gl/shaders.c
index 5569277252..0d725dd304 100644
--- a/hw/xbox/nv2a/pgraph/gl/shaders.c
+++ b/hw/xbox/nv2a/pgraph/gl/shaders.c
@@ -551,7 +551,7 @@ static bool shader_cache_entry_compare(Lru *lru, LruNode *node, void *key)
     return memcmp(&snode->state, key, sizeof(ShaderState));
 }
 
-void pgraph_gl_init_shader_cache(PGRAPHState *pg)
+void pgraph_gl_init_shaders(PGRAPHState *pg)
 {
     PGRAPHGLState *r = pg->gl_renderer_state;
 
diff --git a/hw/xbox/nv2a/pgraph/gl/texture.c b/hw/xbox/nv2a/pgraph/gl/texture.c
index 942d1fe194..4011e979fe 100644
--- a/hw/xbox/nv2a/pgraph/gl/texture.c
+++ b/hw/xbox/nv2a/pgraph/gl/texture.c
@@ -791,7 +791,7 @@ static bool texture_cache_entry_compare(Lru *lru, LruNode *node, void *key)
     return memcmp(&tnode->key, key, sizeof(TextureKey));
 }
 
-void pgraph_gl_init_texture_cache(NV2AState *d)
+void pgraph_gl_init_textures(NV2AState *d)
 {
     PGRAPHState *pg = &d->pgraph;
     PGRAPHGLState *r = pg->gl_renderer_state;
diff --git a/hw/xbox/nv2a/pgraph/gl/vertex.c b/hw/xbox/nv2a/pgraph/gl/vertex.c
index 2fd39db7c6..c2eccdb128 100644
--- a/hw/xbox/nv2a/pgraph/gl/vertex.c
+++ b/hw/xbox/nv2a/pgraph/gl/vertex.c
@@ -247,7 +247,7 @@ static bool vertex_cache_entry_compare(Lru *lru, LruNode *node, void *key)
 
 static const size_t element_cache_size = 50*1024;
 
-void pgraph_gl_init_vertex_cache(NV2AState *d)
+void pgraph_gl_init_buffers(NV2AState *d)
 {
     PGRAPHState *pg = &d->pgraph;
     PGRAPHGLState *r = pg->gl_renderer_state;
@@ -283,7 +283,7 @@ void pgraph_gl_init_vertex_cache(NV2AState *d)
     assert(glGetError() == GL_NO_ERROR);
 }
 
-void pgraph_gl_finalize_vertex(PGRAPHState *pg)
+void pgraph_gl_finalize_buffers(PGRAPHState *pg)
 {
     PGRAPHGLState *r = pg->gl_renderer_state;