diff --git a/hw/xbox/nv2a/Makefile.objs b/hw/xbox/nv2a/Makefile.objs
index dd5a230aa1..1cb0e0b3c2 100644
--- a/hw/xbox/nv2a/Makefile.objs
+++ b/hw/xbox/nv2a/Makefile.objs
@@ -1,26 +1,24 @@
-obj-y += lru.o
-obj-y += swizzle.o
-
 obj-y += nv2a.o
-obj-y += nv2a_debug.o
-obj-y += nv2a_pbus.o
-obj-y += nv2a_pcrtc.o
-obj-y += nv2a_pfb.o
-obj-y += nv2a_pfifo.o
-obj-y += nv2a_pgraph.o
-obj-y += nv2a_pmc.o
-obj-y += nv2a_pramdac.o
-obj-y += nv2a_prmcio.o
-obj-y += nv2a_prmvio.o
-obj-y += nv2a_psh.o
-obj-y += nv2a_ptimer.o
-obj-y += nv2a_pvideo.o
-obj-y += nv2a_shaders.o
-obj-y += nv2a_stubs.o
-obj-y += nv2a_user.o
-obj-y += nv2a_vsh.o
+obj-y += debug.o
+obj-y += pbus.o
+obj-y += pcrtc.o
+obj-y += pfb.o
+obj-y += pfifo.o
+obj-y += pgraph.o
+obj-y += pmc.o
+obj-y += pramdac.o
+obj-y += prmcio.o
+obj-y += prmvio.o
+obj-y += psh.o
+obj-y += ptimer.o
+obj-y += pvideo.o
+obj-y += shaders.o
+obj-y += stubs.o
+obj-y += user.o
+obj-y += vsh.o
 
 obj-y += gl/
-
+obj-y += lru.o
+obj-y += swizzle.o
 obj-y += xxhash.o
 xxhash.o-cflags := -O3 -DXXH_FORCE_MEMORY_ACCESS=2
diff --git a/hw/xbox/nv2a/nv2a_debug.c b/hw/xbox/nv2a/debug.c
similarity index 99%
rename from hw/xbox/nv2a/nv2a_debug.c
rename to hw/xbox/nv2a/debug.c
index ddbdd08542..2d24c8d222 100644
--- a/hw/xbox/nv2a/nv2a_debug.c
+++ b/hw/xbox/nv2a/debug.c
@@ -18,7 +18,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "nv2a_debug.h"
+#include "debug.h"
 
 #ifdef DEBUG_NV2A_GL
 
diff --git a/hw/xbox/nv2a/nv2a_debug.h b/hw/xbox/nv2a/debug.h
similarity index 100%
rename from hw/xbox/nv2a/nv2a_debug.h
rename to hw/xbox/nv2a/debug.h
diff --git a/hw/xbox/nv2a/nv2a_int.h b/hw/xbox/nv2a/nv2a_int.h
index f7c0998276..954f33c4b4 100644
--- a/hw/xbox/nv2a/nv2a_int.h
+++ b/hw/xbox/nv2a/nv2a_int.h
@@ -44,9 +44,8 @@
 #include "gl/gloffscreen.h"
 
 #include "nv2a.h"
-#include "nv2a_debug.h"
-#include "nv2a_shaders.h"
-#include "nv2a_debug.h"
+#include "debug.h"
+#include "shaders.h"
 #include "nv2a_regs.h"
 
 #define USE_TEXTURE_CACHE 1
diff --git a/hw/xbox/nv2a/nv2a_pbus.c b/hw/xbox/nv2a/pbus.c
similarity index 100%
rename from hw/xbox/nv2a/nv2a_pbus.c
rename to hw/xbox/nv2a/pbus.c
diff --git a/hw/xbox/nv2a/nv2a_pcrtc.c b/hw/xbox/nv2a/pcrtc.c
similarity index 100%
rename from hw/xbox/nv2a/nv2a_pcrtc.c
rename to hw/xbox/nv2a/pcrtc.c
diff --git a/hw/xbox/nv2a/nv2a_pfb.c b/hw/xbox/nv2a/pfb.c
similarity index 100%
rename from hw/xbox/nv2a/nv2a_pfb.c
rename to hw/xbox/nv2a/pfb.c
diff --git a/hw/xbox/nv2a/nv2a_pfifo.c b/hw/xbox/nv2a/pfifo.c
similarity index 100%
rename from hw/xbox/nv2a/nv2a_pfifo.c
rename to hw/xbox/nv2a/pfifo.c
diff --git a/hw/xbox/nv2a/nv2a_pgraph.c b/hw/xbox/nv2a/pgraph.c
similarity index 100%
rename from hw/xbox/nv2a/nv2a_pgraph.c
rename to hw/xbox/nv2a/pgraph.c
diff --git a/hw/xbox/nv2a/nv2a_pmc.c b/hw/xbox/nv2a/pmc.c
similarity index 100%
rename from hw/xbox/nv2a/nv2a_pmc.c
rename to hw/xbox/nv2a/pmc.c
diff --git a/hw/xbox/nv2a/nv2a_pramdac.c b/hw/xbox/nv2a/pramdac.c
similarity index 100%
rename from hw/xbox/nv2a/nv2a_pramdac.c
rename to hw/xbox/nv2a/pramdac.c
diff --git a/hw/xbox/nv2a/nv2a_prmcio.c b/hw/xbox/nv2a/prmcio.c
similarity index 100%
rename from hw/xbox/nv2a/nv2a_prmcio.c
rename to hw/xbox/nv2a/prmcio.c
diff --git a/hw/xbox/nv2a/nv2a_prmvio.c b/hw/xbox/nv2a/prmvio.c
similarity index 100%
rename from hw/xbox/nv2a/nv2a_prmvio.c
rename to hw/xbox/nv2a/prmvio.c
diff --git a/hw/xbox/nv2a/nv2a_psh.c b/hw/xbox/nv2a/psh.c
similarity index 99%
rename from hw/xbox/nv2a/nv2a_psh.c
rename to hw/xbox/nv2a/psh.c
index 79e680705a..e5fb303e99 100644
--- a/hw/xbox/nv2a/nv2a_psh.c
+++ b/hw/xbox/nv2a/psh.c
@@ -35,8 +35,8 @@
 
 #include "qapi/qmp/qstring.h"
 
-#include "nv2a_shaders_common.h"
-#include "nv2a_psh.h"
+#include "shaders_common.h"
+#include "psh.h"
 
 /*
  * This implements translation of register combiners into glsl
diff --git a/hw/xbox/nv2a/nv2a_psh.h b/hw/xbox/nv2a/psh.h
similarity index 100%
rename from hw/xbox/nv2a/nv2a_psh.h
rename to hw/xbox/nv2a/psh.h
diff --git a/hw/xbox/nv2a/nv2a_ptimer.c b/hw/xbox/nv2a/ptimer.c
similarity index 100%
rename from hw/xbox/nv2a/nv2a_ptimer.c
rename to hw/xbox/nv2a/ptimer.c
diff --git a/hw/xbox/nv2a/nv2a_pvideo.c b/hw/xbox/nv2a/pvideo.c
similarity index 100%
rename from hw/xbox/nv2a/nv2a_pvideo.c
rename to hw/xbox/nv2a/pvideo.c
diff --git a/hw/xbox/nv2a/nv2a_shaders.c b/hw/xbox/nv2a/shaders.c
similarity index 99%
rename from hw/xbox/nv2a/nv2a_shaders.c
rename to hw/xbox/nv2a/shaders.c
index d02968aa5a..bf68da1d6f 100644
--- a/hw/xbox/nv2a/nv2a_shaders.c
+++ b/hw/xbox/nv2a/shaders.c
@@ -21,8 +21,9 @@
 
 #include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "nv2a_shaders_common.h"
-#include "nv2a_shaders.h"
+
+#include "shaders_common.h"
+#include "shaders.h"
 
 void qstring_append_fmt(QString *qstring, const char *fmt, ...)
 {
diff --git a/hw/xbox/nv2a/nv2a_shaders.h b/hw/xbox/nv2a/shaders.h
similarity index 98%
rename from hw/xbox/nv2a/nv2a_shaders.h
rename to hw/xbox/nv2a/shaders.h
index 64366a38de..3b2690b010 100644
--- a/hw/xbox/nv2a/nv2a_shaders.h
+++ b/hw/xbox/nv2a/shaders.h
@@ -24,9 +24,9 @@
 #include "qapi/qmp/qstring.h"
 #include "gl/gloffscreen.h"
 
-#include "nv2a_vsh.h"
-#include "nv2a_psh.h"
 #include "nv2a_regs.h"
+#include "vsh.h"
+#include "psh.h"
 
 enum ShaderPrimitiveMode {
     PRIM_TYPE_NONE,
diff --git a/hw/xbox/nv2a/nv2a_shaders_common.h b/hw/xbox/nv2a/shaders_common.h
similarity index 98%
rename from hw/xbox/nv2a/nv2a_shaders_common.h
rename to hw/xbox/nv2a/shaders_common.h
index 302b197608..2c46531dd2 100644
--- a/hw/xbox/nv2a/nv2a_shaders_common.h
+++ b/hw/xbox/nv2a/shaders_common.h
@@ -21,7 +21,7 @@
 #ifndef HW_NV2A_SHADERS_COMMON_H
 #define HW_NV2A_SHADERS_COMMON_H
 
-#include "nv2a_debug.h"
+#include "debug.h"
 
 #define STRUCT_VERTEX_DATA "struct VertexData {\n" \
                            "  float inv_w;\n" \
diff --git a/hw/xbox/nv2a/nv2a_stubs.c b/hw/xbox/nv2a/stubs.c
similarity index 100%
rename from hw/xbox/nv2a/nv2a_stubs.c
rename to hw/xbox/nv2a/stubs.c
diff --git a/hw/xbox/nv2a/nv2a_user.c b/hw/xbox/nv2a/user.c
similarity index 100%
rename from hw/xbox/nv2a/nv2a_user.c
rename to hw/xbox/nv2a/user.c
diff --git a/hw/xbox/nv2a/nv2a_vsh.c b/hw/xbox/nv2a/vsh.c
similarity index 99%
rename from hw/xbox/nv2a/nv2a_vsh.c
rename to hw/xbox/nv2a/vsh.c
index 1552e1c70b..b7efc7abeb 100644
--- a/hw/xbox/nv2a/nv2a_vsh.c
+++ b/hw/xbox/nv2a/vsh.c
@@ -32,8 +32,8 @@
 #include <stdbool.h>
 #include <assert.h>
 
-#include "nv2a_shaders_common.h"
-#include "nv2a_vsh.h"
+#include "shaders_common.h"
+#include "vsh.h"
 
 #define VSH_D3DSCM_CORRECTION 96
 
diff --git a/hw/xbox/nv2a/nv2a_vsh.h b/hw/xbox/nv2a/vsh.h
similarity index 100%
rename from hw/xbox/nv2a/nv2a_vsh.h
rename to hw/xbox/nv2a/vsh.h