diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
index dc6c99dbc5a..89b1d9dcef8 100644
--- a/src/intel/Makefile.sources
+++ b/src/intel/Makefile.sources
@@ -141,8 +141,8 @@ COMPILER_FILES = \
 	compiler/brw_vec4_vs.h \
 	compiler/brw_vue_map.c \
 	compiler/brw_wm_iz.cpp \
-	compiler/gen6_gs_visitor.cpp \
-	compiler/gen6_gs_visitor.h
+	compiler/gfx6_gs_visitor.cpp \
+	compiler/gfx6_gs_visitor.h
 
 COMPILER_GENERATED_FILES = \
 	compiler/brw_nir_trig_workarounds.c
@@ -195,8 +195,8 @@ ISL_FILES = \
 	isl/isl_storage_image.c
 
 ISL_GEN4_FILES = \
-	isl/isl_gen4.c \
-	isl/isl_gen4.h \
+	isl/isl_gfx4.c \
+	isl/isl_gfx4.h \
 	isl/isl_emit_depth_stencil.c \
 	isl/isl_surface_state.c
 
@@ -205,14 +205,14 @@ ISL_GEN5_FILES = \
 	isl/isl_surface_state.c
 
 ISL_GEN6_FILES = \
-	isl/isl_gen6.c \
-	isl/isl_gen6.h \
+	isl/isl_gfx6.c \
+	isl/isl_gfx6.h \
 	isl/isl_emit_depth_stencil.c \
 	isl/isl_surface_state.c
 
 ISL_GEN7_FILES = \
-	isl/isl_gen7.c \
-	isl/isl_gen7.h \
+	isl/isl_gfx7.c \
+	isl/isl_gfx7.h \
 	isl/isl_emit_depth_stencil.c \
 	isl/isl_surface_state.c
 
@@ -221,14 +221,14 @@ ISL_GEN75_FILES = \
 	isl/isl_surface_state.c
 
 ISL_GEN8_FILES = \
-	isl/isl_gen8.c \
-	isl/isl_gen8.h \
+	isl/isl_gfx8.c \
+	isl/isl_gfx8.h \
 	isl/isl_emit_depth_stencil.c \
 	isl/isl_surface_state.c
 
 ISL_GEN9_FILES = \
-	isl/isl_gen9.c \
-	isl/isl_gen9.h \
+	isl/isl_gfx9.c \
+	isl/isl_gfx9.h \
 	isl/isl_emit_depth_stencil.c \
 	isl/isl_surface_state.c
 
@@ -237,8 +237,8 @@ ISL_GEN11_FILES = \
 	isl/isl_surface_state.c
 
 ISL_GEN12_FILES = \
-	isl/isl_gen12.c \
-	isl/isl_gen12.h \
+	isl/isl_gfx12.c \
+	isl/isl_gfx12.h \
 	isl/isl_emit_depth_stencil.c \
 	isl/isl_surface_state.c
 
@@ -322,31 +322,31 @@ VULKAN_GENX_FILES := \
 	vulkan/genX_state.c
 
 VULKAN_GEN7_FILES := \
-	vulkan/gen7_cmd_buffer.c \
+	vulkan/gfx7_cmd_buffer.c \
 	$(VULKAN_GENX_FILES)
 
 VULKAN_GEN75_FILES := \
-	vulkan/gen7_cmd_buffer.c \
+	vulkan/gfx7_cmd_buffer.c \
 	$(VULKAN_GENX_FILES)
 
 VULKAN_GEN8_FILES := \
-	vulkan/gen8_cmd_buffer.c \
+	vulkan/gfx8_cmd_buffer.c \
 	$(VULKAN_GENX_FILES)
 
 VULKAN_GEN9_FILES := \
-	vulkan/gen8_cmd_buffer.c \
+	vulkan/gfx8_cmd_buffer.c \
 	$(VULKAN_GENX_FILES)
 
 VULKAN_GEN11_FILES := \
-	vulkan/gen8_cmd_buffer.c \
+	vulkan/gfx8_cmd_buffer.c \
 	$(VULKAN_GENX_FILES)
 
 VULKAN_GEN12_FILES := \
-	vulkan/gen8_cmd_buffer.c \
+	vulkan/gfx8_cmd_buffer.c \
 	$(VULKAN_GENX_FILES)
 
 VULKAN_GEN125_FILES := \
-	vulkan/gen8_cmd_buffer.c \
+	vulkan/gfx8_cmd_buffer.c \
 	$(VULKAN_GENX_FILES)
 
 GEN_PERF_XML_FILES = \
diff --git a/src/intel/compiler/brw_vec4_gs_visitor.cpp b/src/intel/compiler/brw_vec4_gs_visitor.cpp
index f12d454391c..0e3f37a9fba 100644
--- a/src/intel/compiler/brw_vec4_gs_visitor.cpp
+++ b/src/intel/compiler/brw_vec4_gs_visitor.cpp
@@ -28,7 +28,7 @@
  */
 
 #include "brw_vec4_gs_visitor.h"
-#include "gen6_gs_visitor.h"
+#include "gfx6_gs_visitor.h"
 #include "brw_cfg.h"
 #include "brw_fs.h"
 #include "brw_nir.h"
diff --git a/src/intel/compiler/gen6_gs_visitor.cpp b/src/intel/compiler/gfx6_gs_visitor.cpp
similarity index 99%
rename from src/intel/compiler/gen6_gs_visitor.cpp
rename to src/intel/compiler/gfx6_gs_visitor.cpp
index 5e3efe06700..736be8fd70e 100644
--- a/src/intel/compiler/gen6_gs_visitor.cpp
+++ b/src/intel/compiler/gfx6_gs_visitor.cpp
@@ -24,12 +24,12 @@
  */
 
 /**
- * \file gen6_gs_visitor.cpp
+ * \file gfx6_gs_visitor.cpp
  *
  * Gen6 geometry shader implementation
  */
 
-#include "gen6_gs_visitor.h"
+#include "gfx6_gs_visitor.h"
 #include "brw_eu.h"
 
 namespace brw {
diff --git a/src/intel/compiler/gen6_gs_visitor.h b/src/intel/compiler/gfx6_gs_visitor.h
similarity index 97%
rename from src/intel/compiler/gen6_gs_visitor.h
rename to src/intel/compiler/gfx6_gs_visitor.h
index d028969cfad..a6fbc2793a7 100644
--- a/src/intel/compiler/gen6_gs_visitor.h
+++ b/src/intel/compiler/gfx6_gs_visitor.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef GEN6_GS_VISITOR_H
-#define GEN6_GS_VISITOR_H
+#ifndef GFX6_GS_VISITOR_H
+#define GFX6_GS_VISITOR_H
 
 #include "brw_vec4.h"
 #include "brw_vec4_gs_visitor.h"
@@ -89,4 +89,4 @@ private:
 
 #endif /* __cplusplus */
 
-#endif /* GEN6_GS_VISITOR_H */
+#endif /* GFX6_GS_VISITOR_H */
diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build
index 240f12753ac..3bcef15f47e 100644
--- a/src/intel/compiler/meson.build
+++ b/src/intel/compiler/meson.build
@@ -130,8 +130,8 @@ libintel_compiler_files = files(
   'brw_vec4_vs.h',
   'brw_vue_map.c',
   'brw_wm_iz.cpp',
-  'gen6_gs_visitor.cpp',
-  'gen6_gs_visitor.h',
+  'gfx6_gs_visitor.cpp',
+  'gfx6_gs_visitor.h',
 )
 
 brw_nir_trig = custom_target(
diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index ee8fdf9f8e1..417c77dcd49 100644
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
@@ -28,12 +28,12 @@
 #include "genxml/genX_bits.h"
 
 #include "isl.h"
-#include "isl_gen4.h"
-#include "isl_gen6.h"
-#include "isl_gen7.h"
-#include "isl_gen8.h"
-#include "isl_gen9.h"
-#include "isl_gen12.h"
+#include "isl_gfx4.h"
+#include "isl_gfx6.h"
+#include "isl_gfx7.h"
+#include "isl_gfx8.h"
+#include "isl_gfx9.h"
+#include "isl_gfx12.h"
 #include "isl_priv.h"
 
 void
diff --git a/src/intel/isl/isl_gen12.c b/src/intel/isl/isl_gfx12.c
similarity index 98%
rename from src/intel/isl/isl_gen12.c
rename to src/intel/isl/isl_gfx12.c
index c177b487213..f9a519fb137 100644
--- a/src/intel/isl/isl_gen12.c
+++ b/src/intel/isl/isl_gfx12.c
@@ -21,8 +21,8 @@
  *  IN THE SOFTWARE.
  */
 
-#include "isl_gen9.h"
-#include "isl_gen12.h"
+#include "isl_gfx9.h"
+#include "isl_gfx12.h"
 #include "isl_priv.h"
 
 void
diff --git a/src/intel/isl/isl_gen12.h b/src/intel/isl/isl_gfx12.h
similarity index 96%
rename from src/intel/isl/isl_gen12.h
rename to src/intel/isl/isl_gfx12.h
index a281f144182..53983e694b9 100644
--- a/src/intel/isl/isl_gen12.h
+++ b/src/intel/isl/isl_gfx12.h
@@ -21,8 +21,8 @@
  *  IN THE SOFTWARE.
  */
 
-#ifndef ISL_GEN12_H
-#define ISL_GEN12_H
+#ifndef ISL_GFX12_H
+#define ISL_GFX12_H
 
 #include "isl.h"
 
@@ -42,4 +42,4 @@ isl_gen12_choose_image_alignment_el(const struct isl_device *dev,
 }
 #endif
 
-#endif /* ISL_GEN12_H */
+#endif /* ISL_GFX12_H */
diff --git a/src/intel/isl/isl_gen4.c b/src/intel/isl/isl_gfx4.c
similarity index 99%
rename from src/intel/isl/isl_gen4.c
rename to src/intel/isl/isl_gfx4.c
index 493870c7ccc..062593bc74a 100644
--- a/src/intel/isl/isl_gen4.c
+++ b/src/intel/isl/isl_gfx4.c
@@ -21,7 +21,7 @@
  *  IN THE SOFTWARE.
  */
 
-#include "isl_gen4.h"
+#include "isl_gfx4.h"
 #include "isl_priv.h"
 
 bool
diff --git a/src/intel/isl/isl_gen4.h b/src/intel/isl/isl_gfx4.h
similarity index 97%
rename from src/intel/isl/isl_gen4.h
rename to src/intel/isl/isl_gfx4.h
index c04f7fbf8b2..dc24b53f190 100644
--- a/src/intel/isl/isl_gen4.h
+++ b/src/intel/isl/isl_gfx4.h
@@ -21,8 +21,8 @@
  *  IN THE SOFTWARE.
  */
 
-#ifndef ISL_GEN4_H
-#define ISL_GEN4_H
+#ifndef ISL_GFX4_H
+#define ISL_GFX4_H
 
 #include "isl.h"
 
@@ -53,4 +53,4 @@ isl_gen4_choose_image_alignment_el(const struct isl_device *dev,
 }
 #endif
 
-#endif /* ISL_GEN4_H */
+#endif /* ISL_GFX4_H */
diff --git a/src/intel/isl/isl_gen6.c b/src/intel/isl/isl_gfx6.c
similarity index 99%
rename from src/intel/isl/isl_gen6.c
rename to src/intel/isl/isl_gfx6.c
index b3a39f33364..b6657dd7a74 100644
--- a/src/intel/isl/isl_gen6.c
+++ b/src/intel/isl/isl_gfx6.c
@@ -21,7 +21,7 @@
  *  IN THE SOFTWARE.
  */
 
-#include "isl_gen6.h"
+#include "isl_gfx6.h"
 #include "isl_priv.h"
 
 bool
diff --git a/src/intel/isl/isl_gen6.h b/src/intel/isl/isl_gfx6.h
similarity index 96%
rename from src/intel/isl/isl_gen6.h
rename to src/intel/isl/isl_gfx6.h
index c954026efb6..591f977cab4 100644
--- a/src/intel/isl/isl_gen6.h
+++ b/src/intel/isl/isl_gfx6.h
@@ -21,8 +21,8 @@
  *  IN THE SOFTWARE.
  */
 
-#ifndef ISL_GEN6_H
-#define ISL_GEN6_H
+#ifndef ISL_GFX6_H
+#define ISL_GFX6_H
 
 #include "isl.h"
 
@@ -48,4 +48,4 @@ isl_gen6_choose_image_alignment_el(const struct isl_device *dev,
 }
 #endif
 
-#endif /* ISL_GEN6_H */
+#endif /* ISL_GFX6_H */
diff --git a/src/intel/isl/isl_gen7.c b/src/intel/isl/isl_gfx7.c
similarity index 99%
rename from src/intel/isl/isl_gen7.c
rename to src/intel/isl/isl_gfx7.c
index 1a2d345bea6..07c5401941e 100644
--- a/src/intel/isl/isl_gen7.c
+++ b/src/intel/isl/isl_gfx7.c
@@ -21,7 +21,7 @@
  *  IN THE SOFTWARE.
  */
 
-#include "isl_gen7.h"
+#include "isl_gfx7.h"
 #include "isl_priv.h"
 
 static bool
diff --git a/src/intel/isl/isl_gen7.h b/src/intel/isl/isl_gfx7.h
similarity index 97%
rename from src/intel/isl/isl_gen7.h
rename to src/intel/isl/isl_gfx7.h
index f1b7252ba3e..bf53a99cdf4 100644
--- a/src/intel/isl/isl_gen7.h
+++ b/src/intel/isl/isl_gfx7.h
@@ -21,8 +21,8 @@
  *  IN THE SOFTWARE.
  */
 
-#ifndef ISL_GEN7_H
-#define ISL_GEN7_H
+#ifndef ISL_GFX7_H
+#define ISL_GFX7_H
 
 #include "isl.h"
 
@@ -53,4 +53,4 @@ isl_gen7_choose_image_alignment_el(const struct isl_device *dev,
 }
 #endif
 
-#endif /* ISL_GEN7_H */
+#endif /* ISL_GFX7_H */
diff --git a/src/intel/isl/isl_gen8.c b/src/intel/isl/isl_gfx8.c
similarity index 99%
rename from src/intel/isl/isl_gen8.c
rename to src/intel/isl/isl_gfx8.c
index 1b93e984650..d2ab1cb2eba 100644
--- a/src/intel/isl/isl_gen8.c
+++ b/src/intel/isl/isl_gfx8.c
@@ -21,7 +21,7 @@
  *  IN THE SOFTWARE.
  */
 
-#include "isl_gen8.h"
+#include "isl_gfx8.h"
 #include "isl_priv.h"
 
 bool
diff --git a/src/intel/isl/isl_gen8.h b/src/intel/isl/isl_gfx8.h
similarity index 96%
rename from src/intel/isl/isl_gen8.h
rename to src/intel/isl/isl_gfx8.h
index f5eb6a2951c..8fc8209de2e 100644
--- a/src/intel/isl/isl_gen8.h
+++ b/src/intel/isl/isl_gfx8.h
@@ -21,8 +21,8 @@
  *  IN THE SOFTWARE.
  */
 
-#ifndef ISL_GEN8_H
-#define ISL_GEN8_H
+#ifndef ISL_GFX8_H
+#define ISL_GFX8_H
 
 #include "isl.h"
 
@@ -48,4 +48,4 @@ isl_gen8_choose_image_alignment_el(const struct isl_device *dev,
 }
 #endif
 
-#endif /* ISL_GEN8_H */
+#endif /* ISL_GFX8_H */
diff --git a/src/intel/isl/isl_gen9.c b/src/intel/isl/isl_gfx9.c
similarity index 99%
rename from src/intel/isl/isl_gen9.c
rename to src/intel/isl/isl_gfx9.c
index e5d0f95402a..77e55b6e768 100644
--- a/src/intel/isl/isl_gen9.c
+++ b/src/intel/isl/isl_gfx9.c
@@ -21,8 +21,8 @@
  *  IN THE SOFTWARE.
  */
 
-#include "isl_gen8.h"
-#include "isl_gen9.h"
+#include "isl_gfx8.h"
+#include "isl_gfx9.h"
 #include "isl_priv.h"
 
 /**
diff --git a/src/intel/isl/isl_gen9.h b/src/intel/isl/isl_gfx9.h
similarity index 96%
rename from src/intel/isl/isl_gen9.h
rename to src/intel/isl/isl_gfx9.h
index 26d716f8f5b..b17bbda9e3f 100644
--- a/src/intel/isl/isl_gen9.h
+++ b/src/intel/isl/isl_gfx9.h
@@ -21,8 +21,8 @@
  *  IN THE SOFTWARE.
  */
 
-#ifndef ISL_GEN9_H
-#define ISL_GEN9_H
+#ifndef ISL_GFX9_H
+#define ISL_GFX9_H
 
 #include "isl.h"
 
@@ -42,4 +42,4 @@ isl_gen9_choose_image_alignment_el(const struct isl_device *dev,
 }
 #endif
 
-#endif /* ISL_GEN9_H */
+#endif /* ISL_GFX9_H */
diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build
index de83ea05028..04e6a96b213 100644
--- a/src/intel/isl/meson.build
+++ b/src/intel/isl/meson.build
@@ -24,38 +24,38 @@ isl_gen_files = files(
 )
 
 isl_gen4_files = files(
-  'isl_gen4.c',
-  'isl_gen4.h',
+  'isl_gfx4.c',
+  'isl_gfx4.h',
 )
 
 isl_gen6_files = files(
-  'isl_gen6.c',
-  'isl_gen6.h',
+  'isl_gfx6.c',
+  'isl_gfx6.h',
 )
 
 isl_gen7_files = files(
-  'isl_gen7.c',
-  'isl_gen7.h',
+  'isl_gfx7.c',
+  'isl_gfx7.h',
 )
 
 isl_gen8_files = files(
-  'isl_gen8.c',
-  'isl_gen8.h',
+  'isl_gfx8.c',
+  'isl_gfx8.h',
 )
 
 isl_gen9_files = files(
-  'isl_gen9.c',
-  'isl_gen9.h',
+  'isl_gfx9.c',
+  'isl_gfx9.h',
 )
 
 isl_gen12_files = files(
-  'isl_gen12.c',
-  'isl_gen12.h',
+  'isl_gfx12.c',
+  'isl_gfx12.h',
 )
 
 isl_gen125_files = files(
-  'isl_gen12.c',
-  'isl_gen12.h',
+  'isl_gfx12.c',
+  'isl_gfx12.h',
 )
 
 isl_gen_libs = []
diff --git a/src/intel/tools/gen_context.h b/src/intel/tools/gen_context.h
index d298f55f68d..408fa052b8a 100644
--- a/src/intel/tools/gen_context.h
+++ b/src/intel/tools/gen_context.h
@@ -98,7 +98,7 @@ struct gen_context_parameters {
 
 typedef void (*gen_context_init_t)(const struct gen_context_parameters *, uint32_t *, uint32_t *);
 
-#include "gen8_context.h"
-#include "gen10_context.h"
+#include "gfx8_context.h"
+#include "gfx10_context.h"
 
 #endif /* INTEL_CONTEXT_H */
diff --git a/src/intel/tools/gen10_context.h b/src/intel/tools/gfx10_context.h
similarity index 99%
rename from src/intel/tools/gen10_context.h
rename to src/intel/tools/gfx10_context.h
index e68fbac4a71..a45b0f50f64 100644
--- a/src/intel/tools/gen10_context.h
+++ b/src/intel/tools/gfx10_context.h
@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef GEN10_CONTEXT_H
-#define GEN10_CONTEXT_H
+#ifndef GFX10_CONTEXT_H
+#define GFX10_CONTEXT_H
 
 static inline void gen10_render_context_init(const struct gen_context_parameters *params,
                                              uint32_t *data, uint32_t *size)
@@ -165,4 +165,4 @@ static inline void gen10_video_context_init(const struct gen_context_parameters
    *data++ = MI_BATCH_BUFFER_END | 1  /* End Context */;
 }
 
-#endif /* GEN10_CONTEXT_H */
+#endif /* GFX10_CONTEXT_H */
diff --git a/src/intel/tools/gen8_context.h b/src/intel/tools/gfx8_context.h
similarity index 99%
rename from src/intel/tools/gen8_context.h
rename to src/intel/tools/gfx8_context.h
index 410a7f6d772..fbfe473ce9b 100644
--- a/src/intel/tools/gen8_context.h
+++ b/src/intel/tools/gfx8_context.h
@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef GEN8_CONTEXT_H
-#define GEN8_CONTEXT_H
+#ifndef GFX8_CONTEXT_H
+#define GFX8_CONTEXT_H
 
 static inline void gen8_render_context_init(const struct gen_context_parameters *params,
                                             uint32_t *data, uint32_t *size)
@@ -155,4 +155,4 @@ static inline void gen8_video_context_init(const struct gen_context_parameters *
    *data++ = MI_BATCH_BUFFER_END;
 }
 
-#endif /* GEN8_CONTEXT_H */
+#endif /* GFX8_CONTEXT_H */
diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build
index f788d81ebd6..6508165ab6a 100644
--- a/src/intel/tools/meson.build
+++ b/src/intel/tools/meson.build
@@ -113,7 +113,7 @@ configure_file(
 libintel_dump_gpu = shared_library(
   'intel_dump_gpu',
   files(
-    'gen_context.h', 'gen8_context.h', 'gen10_context.h', 'intel_aub.h',
+    'gen_context.h', 'gfx8_context.h', 'gfx10_context.h', 'intel_aub.h',
     'aub_write.h', 'aub_write.c', 'intel_dump_gpu.c',
   ),
   dependencies : [dep_dl, idep_mesautil],
diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c
index f358fe622d3..25917efaaf2 100644
--- a/src/intel/vulkan/genX_pipeline.c
+++ b/src/intel/vulkan/genX_pipeline.c
@@ -2324,7 +2324,7 @@ genX(graphics_pipeline_create)(
 #endif
 
 #if 0
-   /* From gen7_vs_state.c */
+   /* From gfx7_vs_state.c */
 
    /**
     * From Graphics BSpec: 3D-Media-GPGPU Engine > 3D Pipeline Stages >
diff --git a/src/intel/vulkan/gen7_cmd_buffer.c b/src/intel/vulkan/gfx7_cmd_buffer.c
similarity index 100%
rename from src/intel/vulkan/gen7_cmd_buffer.c
rename to src/intel/vulkan/gfx7_cmd_buffer.c
diff --git a/src/intel/vulkan/gen8_cmd_buffer.c b/src/intel/vulkan/gfx8_cmd_buffer.c
similarity index 100%
rename from src/intel/vulkan/gen8_cmd_buffer.c
rename to src/intel/vulkan/gfx8_cmd_buffer.c
diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
index 4c5843ec0fa..7328275264d 100644
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@@ -57,10 +57,10 @@ anv_gen_files = files(
   'genX_query.c',
   'genX_state.c',
 )
-foreach g : [['70', ['gen7_cmd_buffer.c']], ['75', ['gen7_cmd_buffer.c']],
-             ['80', ['gen8_cmd_buffer.c']], ['90', ['gen8_cmd_buffer.c']],
-             ['110', ['gen8_cmd_buffer.c']], ['120', ['gen8_cmd_buffer.c']],
-             ['125', ['gen8_cmd_buffer.c']]]
+foreach g : [['70', ['gfx7_cmd_buffer.c']], ['75', ['gfx7_cmd_buffer.c']],
+             ['80', ['gfx8_cmd_buffer.c']], ['90', ['gfx8_cmd_buffer.c']],
+             ['110', ['gfx8_cmd_buffer.c']], ['120', ['gfx8_cmd_buffer.c']],
+             ['125', ['gfx8_cmd_buffer.c']]]
   _gen = g[0]
   libanv_gen_libs += static_library(
     'anv_gen@0@'.format(_gen),
diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
index 5e484af931b..2ed2e206003 100644
--- a/src/mesa/drivers/dri/i965/Makefile.sources
+++ b/src/mesa/drivers/dri/i965/Makefile.sources
@@ -62,19 +62,19 @@ i965_FILES = \
 	brw_wm.c \
 	brw_wm.h \
 	brw_wm_surface_state.c \
-	gen4_blorp_exec.h \
-	gen6_clip_state.c \
-	gen6_constant_state.c \
-	gen6_multisample_state.c \
-	gen6_queryobj.c \
-	gen6_sampler_state.c \
-	gen6_sol.c \
-	gen6_urb.c \
-	gen7_l3_state.c \
-	gen7_sol_state.c \
-	gen7_urb.c \
-	gen8_depth_state.c \
-	gen8_multisample_state.c \
+	gfx4_blorp_exec.h \
+	gfx6_clip_state.c \
+	gfx6_constant_state.c \
+	gfx6_multisample_state.c \
+	gfx6_queryobj.c \
+	gfx6_sampler_state.c \
+	gfx6_sol.c \
+	gfx6_urb.c \
+	gfx7_l3_state.c \
+	gfx7_sol_state.c \
+	gfx7_urb.c \
+	gfx8_depth_state.c \
+	gfx8_multisample_state.c \
 	hsw_queryobj.c \
 	hsw_sol.c \
 	brw_batch.c \
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index ef45e32d2a5..50341861eb5 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -1313,7 +1313,7 @@ bool brw_is_query_pipelined(struct brw_query_object *query);
 uint64_t brw_raw_timestamp_delta(struct brw_context *brw,
                                  uint64_t time0, uint64_t time1);
 
-/** gen6_queryobj.c */
+/** gfx6_queryobj.c */
 void gen6_init_queryobj_functions(struct dd_function_table *functions);
 void brw_write_timestamp(struct brw_context *brw, struct brw_bo *bo, int idx);
 void brw_write_depth_count(struct brw_context *brw, struct brw_bo *bo, int idx);
@@ -1444,7 +1444,7 @@ extern int brw_translate_stencil_op(GLenum op);
 /* brw_sync.c */
 void brw_init_syncobj_functions(struct dd_function_table *functions);
 
-/* gen6_sol.c */
+/* gfx6_sol.c */
 struct gl_transform_feedback_object *
 brw_new_transform_feedback(struct gl_context *ctx, GLuint name);
 void
@@ -1470,7 +1470,7 @@ brw_get_transform_feedback_vertex_count(struct gl_context *ctx,
                                         struct gl_transform_feedback_object *obj,
                                         GLuint stream);
 
-/* gen7_sol_state.c */
+/* gfx7_sol_state.c */
 void
 gen7_begin_transform_feedback(struct gl_context *ctx, GLenum mode,
                               struct gl_transform_feedback_object *obj);
@@ -1526,13 +1526,13 @@ gen6_get_sample_position(struct gl_context *ctx,
                          GLuint index,
                          GLfloat *result);
 
-/* gen8_multisample_state.c */
+/* gfx8_multisample_state.c */
 void gen8_emit_3dstate_sample_pattern(struct brw_context *brw);
 
-/* gen7_l3_state.c */
+/* gfx7_l3_state.c */
 void brw_emit_l3_state(struct brw_context *brw);
 
-/* gen7_urb.c */
+/* gfx7_urb.c */
 void
 gen7_emit_push_constant_state(struct brw_context *brw, unsigned vs_size,
                               unsigned hs_size, unsigned ds_size,
diff --git a/src/mesa/drivers/dri/i965/brw_curbe.c b/src/mesa/drivers/dri/i965/brw_curbe.c
index 2a49497c220..b8164bda189 100644
--- a/src/mesa/drivers/dri/i965/brw_curbe.c
+++ b/src/mesa/drivers/dri/i965/brw_curbe.c
@@ -46,7 +46,7 @@
  * stall occurs at CMD_CONST_BUFFER time.
  *
  * On gen6+, constant handling becomes a much simpler set of per-unit state.
- * See gen6_upload_vec4_push_constants() in gen6_vs_state.c for that code.
+ * See gen6_upload_vec4_push_constants() in gfx6_vs_state.c for that code.
  */
 
 
diff --git a/src/mesa/drivers/dri/i965/brw_state.h b/src/mesa/drivers/dri/i965/brw_state.h
index dbfa66637c7..b01d230676f 100644
--- a/src/mesa/drivers/dri/i965/brw_state.h
+++ b/src/mesa/drivers/dri/i965/brw_state.h
@@ -144,7 +144,7 @@ brw_depthbuffer_format(struct brw_context *brw);
 
 void brw_upload_state_base_address(struct brw_context *brw);
 
-/* gen8_depth_state.c */
+/* gfx8_depth_state.c */
 void gen8_write_pma_stall_bits(struct brw_context *brw,
                                uint32_t pma_stall_bits);
 
@@ -257,7 +257,7 @@ void brw_emit_sampler_state(struct brw_context *brw,
                             bool non_normalized_coordinates,
                             uint32_t border_color_offset);
 
-/* gen6_constant_state.c */
+/* gfx6_constant_state.c */
 void
 brw_populate_constant_data(struct brw_context *brw,
                            const struct gl_program *prog,
@@ -277,7 +277,7 @@ brw_upload_cs_push_constants(struct brw_context *brw,
                              const struct brw_cs_prog_data *cs_prog_data,
                              struct brw_stage_state *stage_state);
 
-/* gen7_vs_state.c */
+/* gfx7_vs_state.c */
 void
 gen7_upload_constant_state(struct brw_context *brw,
                            const struct brw_stage_state *stage_state,
@@ -292,7 +292,7 @@ void brw_upload_sf_prog(struct brw_context *brw);
 bool brw_is_drawing_points(const struct brw_context *brw);
 bool brw_is_drawing_lines(const struct brw_context *brw);
 
-/* gen7_l3_state.c */
+/* gfx7_l3_state.c */
 void
 gen7_restore_default_l3_config(struct brw_context *brw);
 
diff --git a/src/mesa/drivers/dri/i965/genX_blorp_exec.c b/src/mesa/drivers/dri/i965/genX_blorp_exec.c
index e5dc61cc796..e8d9f38e081 100644
--- a/src/mesa/drivers/dri/i965/genX_blorp_exec.c
+++ b/src/mesa/drivers/dri/i965/genX_blorp_exec.c
@@ -33,7 +33,7 @@
 #include "blorp/blorp_genX_exec.h"
 
 #if GFX_VER <= 5
-#include "gen4_blorp_exec.h"
+#include "gfx4_blorp_exec.h"
 #endif
 
 #include "brw_blorp.h"
diff --git a/src/mesa/drivers/dri/i965/gen4_blorp_exec.h b/src/mesa/drivers/dri/i965/gfx4_blorp_exec.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/gen4_blorp_exec.h
rename to src/mesa/drivers/dri/i965/gfx4_blorp_exec.h
diff --git a/src/mesa/drivers/dri/i965/gen6_clip_state.c b/src/mesa/drivers/dri/i965/gfx6_clip_state.c
similarity index 99%
rename from src/mesa/drivers/dri/i965/gen6_clip_state.c
rename to src/mesa/drivers/dri/i965/gfx6_clip_state.c
index 67ab2eaa7e4..8e3fae7d311 100644
--- a/src/mesa/drivers/dri/i965/gen6_clip_state.c
+++ b/src/mesa/drivers/dri/i965/gfx6_clip_state.c
@@ -87,4 +87,3 @@ brw_is_drawing_lines(const struct brw_context *brw)
    }
    return false;
 }
-
diff --git a/src/mesa/drivers/dri/i965/gen6_constant_state.c b/src/mesa/drivers/dri/i965/gfx6_constant_state.c
similarity index 99%
rename from src/mesa/drivers/dri/i965/gen6_constant_state.c
rename to src/mesa/drivers/dri/i965/gfx6_constant_state.c
index 8a7952b5a4f..230e14fc8e1 100644
--- a/src/mesa/drivers/dri/i965/gen6_constant_state.c
+++ b/src/mesa/drivers/dri/i965/gfx6_constant_state.c
@@ -226,7 +226,7 @@ gen6_upload_push_constants(struct brw_context *brw,
  * register space with mostly-unused data).
  *
  * Compare this path to brw_curbe.c for gen4/5 push constants, and
- * gen6_vs_state.c for gen6+ push constants.
+ * gfx6_vs_state.c for gen6+ push constants.
  */
 void
 brw_upload_pull_constants(struct brw_context *brw,
@@ -289,7 +289,7 @@ brw_upload_pull_constants(struct brw_context *brw,
  * pre-loaded into a shader stage's register space at thread spawn time.
  *
  * For other stages, see brw_curbe.c:brw_upload_constant_buffer for the
- * equivalent gen4/5 code and gen6_vs_state.c:gen6_upload_push_constants for
+ * equivalent gen4/5 code and gfx6_vs_state.c:gen6_upload_push_constants for
  * gen6+.
  */
 void
diff --git a/src/mesa/drivers/dri/i965/gen6_multisample_state.c b/src/mesa/drivers/dri/i965/gfx6_multisample_state.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/gen6_multisample_state.c
rename to src/mesa/drivers/dri/i965/gfx6_multisample_state.c
diff --git a/src/mesa/drivers/dri/i965/gen6_queryobj.c b/src/mesa/drivers/dri/i965/gfx6_queryobj.c
similarity index 99%
rename from src/mesa/drivers/dri/i965/gen6_queryobj.c
rename to src/mesa/drivers/dri/i965/gfx6_queryobj.c
index b34d5c9a087..358ec6ee730 100644
--- a/src/mesa/drivers/dri/i965/gen6_queryobj.c
+++ b/src/mesa/drivers/dri/i965/gfx6_queryobj.c
@@ -25,7 +25,7 @@
  *    Kenneth Graunke <kenneth@whitecape.org>
  */
 
-/** @file gen6_queryobj.c
+/** @file gfx6_queryobj.c
  *
  * Support for query objects (GL_ARB_occlusion_query, GL_ARB_timer_query,
  * GL_EXT_transform_feedback, and friends) on platforms that support
diff --git a/src/mesa/drivers/dri/i965/gen6_sampler_state.c b/src/mesa/drivers/dri/i965/gfx6_sampler_state.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/gen6_sampler_state.c
rename to src/mesa/drivers/dri/i965/gfx6_sampler_state.c
diff --git a/src/mesa/drivers/dri/i965/gen6_sol.c b/src/mesa/drivers/dri/i965/gfx6_sol.c
similarity index 99%
rename from src/mesa/drivers/dri/i965/gen6_sol.c
rename to src/mesa/drivers/dri/i965/gfx6_sol.c
index 4601d4e57b6..6ccac9765f3 100644
--- a/src/mesa/drivers/dri/i965/gen6_sol.c
+++ b/src/mesa/drivers/dri/i965/gfx6_sol.c
@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-/** \file gen6_sol.c
+/** \file gfx6_sol.c
  *
  * Code to initialize the binding table entries used by transform feedback.
  */
diff --git a/src/mesa/drivers/dri/i965/gen6_urb.c b/src/mesa/drivers/dri/i965/gfx6_urb.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/gen6_urb.c
rename to src/mesa/drivers/dri/i965/gfx6_urb.c
diff --git a/src/mesa/drivers/dri/i965/gen7_l3_state.c b/src/mesa/drivers/dri/i965/gfx7_l3_state.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/gen7_l3_state.c
rename to src/mesa/drivers/dri/i965/gfx7_l3_state.c
diff --git a/src/mesa/drivers/dri/i965/gen7_sol_state.c b/src/mesa/drivers/dri/i965/gfx7_sol_state.c
similarity index 99%
rename from src/mesa/drivers/dri/i965/gen7_sol_state.c
rename to src/mesa/drivers/dri/i965/gfx7_sol_state.c
index c27772e6e90..0f174b1a6ed 100644
--- a/src/mesa/drivers/dri/i965/gen7_sol_state.c
+++ b/src/mesa/drivers/dri/i965/gfx7_sol_state.c
@@ -22,7 +22,7 @@
  */
 
 /**
- * @file gen7_sol_state.c
+ * @file gfx7_sol_state.c
  *
  * Controls the stream output logic (SOL) stage of the gen7 hardware, which is
  * used to implement GL_EXT_transform_feedback.
diff --git a/src/mesa/drivers/dri/i965/gen7_urb.c b/src/mesa/drivers/dri/i965/gfx7_urb.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/gen7_urb.c
rename to src/mesa/drivers/dri/i965/gfx7_urb.c
diff --git a/src/mesa/drivers/dri/i965/gen8_depth_state.c b/src/mesa/drivers/dri/i965/gfx8_depth_state.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/gen8_depth_state.c
rename to src/mesa/drivers/dri/i965/gfx8_depth_state.c
diff --git a/src/mesa/drivers/dri/i965/gen8_multisample_state.c b/src/mesa/drivers/dri/i965/gfx8_multisample_state.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/gen8_multisample_state.c
rename to src/mesa/drivers/dri/i965/gfx8_multisample_state.c
diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build
index dd8f9ad3514..8ac2f906d21 100644
--- a/src/mesa/drivers/dri/i965/meson.build
+++ b/src/mesa/drivers/dri/i965/meson.build
@@ -81,19 +81,19 @@ files_i965 = files(
   'brw_wm.c',
   'brw_wm.h',
   'brw_wm_surface_state.c',
-  'gen4_blorp_exec.h',
-  'gen6_clip_state.c',
-  'gen6_constant_state.c',
-  'gen6_multisample_state.c',
-  'gen6_queryobj.c',
-  'gen6_sampler_state.c',
-  'gen6_sol.c',
-  'gen6_urb.c',
-  'gen7_l3_state.c',
-  'gen7_sol_state.c',
-  'gen7_urb.c',
-  'gen8_depth_state.c',
-  'gen8_multisample_state.c',
+  'gfx4_blorp_exec.h',
+  'gfx6_clip_state.c',
+  'gfx6_constant_state.c',
+  'gfx6_multisample_state.c',
+  'gfx6_queryobj.c',
+  'gfx6_sampler_state.c',
+  'gfx6_sol.c',
+  'gfx6_urb.c',
+  'gfx7_l3_state.c',
+  'gfx7_sol_state.c',
+  'gfx7_urb.c',
+  'gfx8_depth_state.c',
+  'gfx8_multisample_state.c',
   'hsw_queryobj.c',
   'hsw_sol.c',
   'brw_batch.c',