diff --git a/src/gallium/drivers/iris/Android.mk b/src/gallium/drivers/iris/Android.mk
index 9119b54582c..5d5744025b7 100644
--- a/src/gallium/drivers/iris/Android.mk
+++ b/src/gallium/drivers/iris/Android.mk
@@ -42,11 +42,11 @@ IRIS_COMMON_INCLUDES := \
 	$(MESA_TOP)/src/gallium/auxiliary
 
 #
-# libiris for gen8
+# libiris for gfx8
 #
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libmesa_iris_gen8
+LOCAL_MODULE := libmesa_iris_gfx8
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
 LOCAL_SRC_FILES := $(LIBIRIS_SRC_FILES)
@@ -62,11 +62,11 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 #
-# libiris for gen9
+# libiris for gfx9
 #
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libmesa_iris_gen9
+LOCAL_MODULE := libmesa_iris_gfx9
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
 LOCAL_SRC_FILES := $(LIBIRIS_SRC_FILES)
@@ -82,11 +82,11 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 #
-# libiris for gen11
+# libiris for gfx11
 #
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libmesa_iris_gen11
+LOCAL_MODULE := libmesa_iris_gfx11
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
 LOCAL_SRC_FILES := $(LIBIRIS_SRC_FILES)
@@ -102,11 +102,11 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 #
-# libiris for gen12
+# libiris for gfx12
 #
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libmesa_iris_gen12
+LOCAL_MODULE := libmesa_iris_gfx12
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
 LOCAL_SRC_FILES := $(LIBIRIS_SRC_FILES)
@@ -122,11 +122,11 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 #
-# libiris for gen125
+# libiris for gfx125
 #
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libmesa_iris_gen125
+LOCAL_MODULE := libmesa_iris_gfx125
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
 LOCAL_SRC_FILES := $(LIBIRIS_SRC_FILES)
@@ -167,11 +167,11 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
 	libmesa_intel_common \
 	libmesa_intel_compiler \
 	libmesa_intel_perf \
-	libmesa_iris_gen8 \
-	libmesa_iris_gen9 \
-	libmesa_iris_gen11 \
-	libmesa_iris_gen12 \
-	libmesa_iris_gen125
+	libmesa_iris_gfx8 \
+	libmesa_iris_gfx9 \
+	libmesa_iris_gfx11 \
+	libmesa_iris_gfx12 \
+	libmesa_iris_gfx125
 
 include $(GALLIUM_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
diff --git a/src/intel/Android.isl.mk b/src/intel/Android.isl.mk
index 07a8615a76a..e1ef62b73fc 100644
--- a/src/intel/Android.isl.mk
+++ b/src/intel/Android.isl.mk
@@ -29,12 +29,12 @@ LIBISL_GENX_COMMON_INCLUDES := \
 	$(MESA_TOP)/src/gallium/include/
 
 # ---------------------------------------
-# Build libmesa_isl_gen4
+# Build libmesa_isl_gfx4
 # ---------------------------------------
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libmesa_isl_gen4
+LOCAL_MODULE := libmesa_isl_gfx4
 
 LOCAL_SRC_FILES := $(ISL_GFX4_FILES)
 
@@ -48,12 +48,12 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 # ---------------------------------------
-# Build libmesa_isl_gen5
+# Build libmesa_isl_gfx5
 # ---------------------------------------
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libmesa_isl_gen5
+LOCAL_MODULE := libmesa_isl_gfx5
 
 LOCAL_SRC_FILES := $(ISL_GFX5_FILES)
 
@@ -67,12 +67,12 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 # ---------------------------------------
-# Build libmesa_isl_gen6
+# Build libmesa_isl_gfx6
 # ---------------------------------------
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libmesa_isl_gen6
+LOCAL_MODULE := libmesa_isl_gfx6
 
 LOCAL_SRC_FILES := $(ISL_GFX6_FILES)
 
@@ -86,12 +86,12 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 # ---------------------------------------
-# Build libmesa_isl_gen7
+# Build libmesa_isl_gfx7
 # ---------------------------------------
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libmesa_isl_gen7
+LOCAL_MODULE := libmesa_isl_gfx7
 
 LOCAL_SRC_FILES := $(ISL_GFX7_FILES)
 
@@ -105,12 +105,12 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 # ---------------------------------------
-# Build libmesa_isl_gen75
+# Build libmesa_isl_gfx75
 # ---------------------------------------
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libmesa_isl_gen75
+LOCAL_MODULE := libmesa_isl_gfx75
 
 LOCAL_SRC_FILES := $(ISL_GFX75_FILES)
 
@@ -124,12 +124,12 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 # ---------------------------------------
-# Build libmesa_isl_gen8
+# Build libmesa_isl_gfx8
 # ---------------------------------------
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libmesa_isl_gen8
+LOCAL_MODULE := libmesa_isl_gfx8
 
 LOCAL_SRC_FILES := $(ISL_GFX8_FILES)
 
@@ -143,12 +143,12 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 # ---------------------------------------
-# Build libmesa_isl_gen9
+# Build libmesa_isl_gfx9
 # ---------------------------------------
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libmesa_isl_gen9
+LOCAL_MODULE := libmesa_isl_gfx9
 
 LOCAL_SRC_FILES := $(ISL_GFX9_FILES)
 
@@ -162,12 +162,12 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 # ---------------------------------------
-# Build libmesa_isl_gen11
+# Build libmesa_isl_gfx11
 # ---------------------------------------
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libmesa_isl_gen11
+LOCAL_MODULE := libmesa_isl_gfx11
 
 LOCAL_SRC_FILES := $(ISL_GFX11_FILES)
 
@@ -181,12 +181,12 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 # ---------------------------------------
-# Build libmesa_isl_gen12
+# Build libmesa_isl_gfx12
 # ---------------------------------------
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libmesa_isl_gen12
+LOCAL_MODULE := libmesa_isl_gfx12
 
 LOCAL_SRC_FILES := $(ISL_GFX12_FILES)
 
@@ -200,12 +200,12 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 # ---------------------------------------
-# Build libmesa_isl_gen125
+# Build libmesa_isl_gfx125
 # ---------------------------------------
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libmesa_isl_gen125
+LOCAL_MODULE := libmesa_isl_gfx125
 
 LOCAL_SRC_FILES := $(ISL_GFX125_FILES)
 
@@ -279,16 +279,16 @@ LOCAL_C_INCLUDES := \
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(MESA_TOP)/src/intel
 
 LOCAL_WHOLE_STATIC_LIBRARIES := \
-	libmesa_isl_gen4 \
-	libmesa_isl_gen5 \
-	libmesa_isl_gen6 \
-	libmesa_isl_gen7 \
-	libmesa_isl_gen75 \
-	libmesa_isl_gen8 \
-	libmesa_isl_gen9 \
-	libmesa_isl_gen11 \
-	libmesa_isl_gen12 \
-	libmesa_isl_gen125 \
+	libmesa_isl_gfx4 \
+	libmesa_isl_gfx5 \
+	libmesa_isl_gfx6 \
+	libmesa_isl_gfx7 \
+	libmesa_isl_gfx75 \
+	libmesa_isl_gfx8 \
+	libmesa_isl_gfx9 \
+	libmesa_isl_gfx11 \
+	libmesa_isl_gfx12 \
+	libmesa_isl_gfx125 \
 	libmesa_genxml \
 	libmesa_isl_tiled_memcpy
 
diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk
index 76b1df35689..a265fdc5842 100644
--- a/src/intel/Android.vulkan.mk
+++ b/src/intel/Android.vulkan.mk
@@ -63,11 +63,11 @@ ANV_SHARED_LIBRARIES += libnativewindow
 endif
 
 #
-# libanv for gen7
+# libanv for gfx7
 #
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libmesa_anv_gen7
+LOCAL_MODULE := libmesa_anv_gfx7
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
 LOCAL_SRC_FILES := $(VULKAN_GFX7_FILES)
@@ -84,11 +84,11 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 #
-# libanv for gen75
+# libanv for gfx75
 #
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libmesa_anv_gen75
+LOCAL_MODULE := libmesa_anv_gfx75
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
 LOCAL_SRC_FILES := $(VULKAN_GFX75_FILES)
@@ -105,11 +105,11 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 #
-# libanv for gen8
+# libanv for gfx8
 #
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libmesa_anv_gen8
+LOCAL_MODULE := libmesa_anv_gfx8
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
 LOCAL_SRC_FILES := $(VULKAN_GFX8_FILES)
@@ -126,11 +126,11 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 #
-# libanv for gen9
+# libanv for gfx9
 #
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libmesa_anv_gen9
+LOCAL_MODULE := libmesa_anv_gfx9
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
 LOCAL_SRC_FILES := $(VULKAN_GFX9_FILES)
@@ -147,11 +147,11 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 #
-# libanv for gen11
+# libanv for gfx11
 #
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libmesa_anv_gen11
+LOCAL_MODULE := libmesa_anv_gfx11
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
 LOCAL_SRC_FILES := $(VULKAN_GFX11_FILES)
@@ -168,11 +168,11 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 #
-# libanv for gen12
+# libanv for gfx12
 #
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libmesa_anv_gen12
+LOCAL_MODULE := libmesa_anv_gfx12
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
 LOCAL_SRC_FILES := $(VULKAN_GFX12_FILES)
@@ -189,11 +189,11 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 #
-# libanv for gen125
+# libanv for gfx125
 #
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libmesa_anv_gen125
+LOCAL_MODULE := libmesa_anv_gfx125
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
 LOCAL_SRC_FILES := $(VULKAN_GFX125_FILES)
@@ -293,13 +293,13 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
 	libmesa_intel_perf \
 	libmesa_vulkan_common \
 	libmesa_vulkan_util \
-	libmesa_anv_gen7 \
-	libmesa_anv_gen75 \
-	libmesa_anv_gen8 \
-	libmesa_anv_gen9 \
-	libmesa_anv_gen11 \
-	libmesa_anv_gen12 \
-	libmesa_anv_gen125 \
+	libmesa_anv_gfx7 \
+	libmesa_anv_gfx75 \
+	libmesa_anv_gfx8 \
+	libmesa_anv_gfx9 \
+	libmesa_anv_gfx11 \
+	libmesa_anv_gfx12 \
+	libmesa_anv_gfx125 \
 	libmesa_intel_compiler
 
 LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) libz libsync liblog libcutils
diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build
index b19a5cc07cc..20ada897cc5 100644
--- a/src/intel/common/meson.build
+++ b/src/intel/common/meson.build
@@ -76,9 +76,9 @@ idep_libintel_common = declare_dependency(
 install_intel_gpu_tests = get_option('install-intel-gpu-tests')
 
 if install_intel_gpu_tests
-  foreach g : [['70', 'gen7'], ['75', 'hsw'], ['80', 'gen8'],
-               ['90', 'gen9'], ['110', 'gen11'], ['120', 'gen12'],
-               ['125', 'gen125']]
+  foreach g : [['70', 'gfx7'], ['75', 'hsw'], ['80', 'gfx8'],
+               ['90', 'gfx9'], ['110', 'gfx11'], ['120', 'gfx12'],
+               ['125', 'gfx125']]
     executable(
       'intel_@0@_mi_builder_test'.format(g[1]),
       files('tests/mi_builder_test.cpp'),
diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build
index 04e6a96b213..ca00d1bd66a 100644
--- a/src/intel/isl/meson.build
+++ b/src/intel/isl/meson.build
@@ -23,46 +23,46 @@ isl_gen_files = files(
   'isl_surface_state.c',
 )
 
-isl_gen4_files = files(
+isl_gfx4_files = files(
   'isl_gfx4.c',
   'isl_gfx4.h',
 )
 
-isl_gen6_files = files(
+isl_gfx6_files = files(
   'isl_gfx6.c',
   'isl_gfx6.h',
 )
 
-isl_gen7_files = files(
+isl_gfx7_files = files(
   'isl_gfx7.c',
   'isl_gfx7.h',
 )
 
-isl_gen8_files = files(
+isl_gfx8_files = files(
   'isl_gfx8.c',
   'isl_gfx8.h',
 )
 
-isl_gen9_files = files(
+isl_gfx9_files = files(
   'isl_gfx9.c',
   'isl_gfx9.h',
 )
 
-isl_gen12_files = files(
+isl_gfx12_files = files(
   'isl_gfx12.c',
   'isl_gfx12.h',
 )
 
-isl_gen125_files = files(
+isl_gfx125_files = files(
   'isl_gfx12.c',
   'isl_gfx12.h',
 )
 
 isl_gen_libs = []
-foreach g : [['40', isl_gen4_files], ['50', []], ['60', isl_gen6_files],
-             ['70', isl_gen7_files], ['75', []], ['80', isl_gen8_files],
-             ['90', isl_gen9_files], ['110', []], ['120', isl_gen12_files],
-             ['125', isl_gen12_files]]
+foreach g : [['40', isl_gfx4_files], ['50', []], ['60', isl_gfx6_files],
+             ['70', isl_gfx7_files], ['75', []], ['80', isl_gfx8_files],
+             ['90', isl_gfx9_files], ['110', []], ['120', isl_gfx12_files],
+             ['125', isl_gfx12_files]]
   _gen = g[0]
   isl_gen_libs += static_library(
     'isl_gen@0@'.format(_gen),
diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build
index 6508165ab6a..7c4cc3e4ccf 100644
--- a/src/intel/tools/meson.build
+++ b/src/intel/tools/meson.build
@@ -190,15 +190,15 @@ i965_asm = executable(
 )
 
 asm_testcases = [
-  ['brw', 'gen4'],
-  ['g4x', 'gen4.5'],
-  ['ilk', 'gen5'],
-  ['snb', 'gen6'],
-  ['ivb', 'gen7'],
-  ['hsw', 'gen7.5'],
-  ['bdw', 'gen8'],
-  ['skl', 'gen9'],
-  ['icl', 'gen11'],
+  ['brw', 'gfx4'],
+  ['g4x', 'gfx4.5'],
+  ['ilk', 'gfx5'],
+  ['snb', 'gfx6'],
+  ['ivb', 'gfx7'],
+  ['hsw', 'gfx7.5'],
+  ['bdw', 'gfx8'],
+  ['skl', 'gfx9'],
+  ['icl', 'gfx11'],
 ]
 
 test_runner = find_program('tests/run-test.py')
diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
index e80464ea681..81649258108 100644
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -40,27 +40,27 @@ I965_PERGEN_STATIC_LIBRARIES := \
 	libmesa_nir
 
 I965_PERGEN_LIBS := \
-	libmesa_i965_gen4 \
-	libmesa_i965_gen45 \
-	libmesa_i965_gen5 \
-	libmesa_i965_gen6 \
-	libmesa_i965_gen7 \
-	libmesa_i965_gen75 \
-	libmesa_i965_gen8 \
-	libmesa_i965_gen9 \
-	libmesa_i965_gen11
+	libmesa_i965_gfx4 \
+	libmesa_i965_gfx45 \
+	libmesa_i965_gfx5 \
+	libmesa_i965_gfx6 \
+	libmesa_i965_gfx7 \
+	libmesa_i965_gfx75 \
+	libmesa_i965_gfx8 \
+	libmesa_i965_gfx9 \
+	libmesa_i965_gfx11
 
 # ---------------------------------------
-# Build libmesa_i965_gen4
+# Build libmesa_i965_gfx4
 # ---------------------------------------
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libmesa_i965_gen4
+LOCAL_MODULE := libmesa_i965_gfx4
 
 LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
 
-LOCAL_SRC_FILES := $(i965_gen4_FILES)
+LOCAL_SRC_FILES := $(i965_gfx4_FILES)
 
 LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES)
 
@@ -72,16 +72,16 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 # ---------------------------------------
-# Build libmesa_i965_gen45
+# Build libmesa_i965_gfx45
 # ---------------------------------------
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libmesa_i965_gen45
+LOCAL_MODULE := libmesa_i965_gfx45
 
 LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
 
-LOCAL_SRC_FILES := $(i965_gen45_FILES)
+LOCAL_SRC_FILES := $(i965_gfx45_FILES)
 
 LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES)
 
@@ -93,16 +93,16 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 # ---------------------------------------
-# Build libmesa_i965_gen5
+# Build libmesa_i965_gfx5
 # ---------------------------------------
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libmesa_i965_gen5
+LOCAL_MODULE := libmesa_i965_gfx5
 
 LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
 
-LOCAL_SRC_FILES := $(i965_gen5_FILES)
+LOCAL_SRC_FILES := $(i965_gfx5_FILES)
 
 LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES)
 
@@ -114,16 +114,16 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 # ---------------------------------------
-# Build libmesa_i965_gen6
+# Build libmesa_i965_gfx6
 # ---------------------------------------
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libmesa_i965_gen6
+LOCAL_MODULE := libmesa_i965_gfx6
 
 LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
 
-LOCAL_SRC_FILES := $(i965_gen6_FILES)
+LOCAL_SRC_FILES := $(i965_gfx6_FILES)
 
 LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES)
 
@@ -135,16 +135,16 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 # ---------------------------------------
-# Build libmesa_i965_gen7
+# Build libmesa_i965_gfx7
 # ---------------------------------------
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libmesa_i965_gen7
+LOCAL_MODULE := libmesa_i965_gfx7
 
 LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
 
-LOCAL_SRC_FILES := $(i965_gen7_FILES)
+LOCAL_SRC_FILES := $(i965_gfx7_FILES)
 
 LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES)
 
@@ -156,16 +156,16 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 # ---------------------------------------
-# Build libmesa_i965_gen75
+# Build libmesa_i965_gfx75
 # ---------------------------------------
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libmesa_i965_gen75
+LOCAL_MODULE := libmesa_i965_gfx75
 
 LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
 
-LOCAL_SRC_FILES := $(i965_gen75_FILES)
+LOCAL_SRC_FILES := $(i965_gfx75_FILES)
 
 LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES)
 
@@ -177,16 +177,16 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 # ---------------------------------------
-# Build libmesa_i965_gen8
+# Build libmesa_i965_gfx8
 # ---------------------------------------
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libmesa_i965_gen8
+LOCAL_MODULE := libmesa_i965_gfx8
 
 LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
 
-LOCAL_SRC_FILES := $(i965_gen8_FILES)
+LOCAL_SRC_FILES := $(i965_gfx8_FILES)
 
 LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES)
 
@@ -198,16 +198,16 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 # ---------------------------------------
-# Build libmesa_i965_gen9
+# Build libmesa_i965_gfx9
 # ---------------------------------------
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libmesa_i965_gen9
+LOCAL_MODULE := libmesa_i965_gfx9
 
 LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
 
-LOCAL_SRC_FILES := $(i965_gen9_FILES)
+LOCAL_SRC_FILES := $(i965_gfx9_FILES)
 
 LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES)
 
@@ -219,16 +219,16 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 # ---------------------------------------
-# Build libmesa_i965_gen11
+# Build libmesa_i965_gfx11
 # ---------------------------------------
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libmesa_i965_gen11
+LOCAL_MODULE := libmesa_i965_gfx11
 
 LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
 
-LOCAL_SRC_FILES := $(i965_gen11_FILES)
+LOCAL_SRC_FILES := $(i965_gfx11_FILES)
 
 LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES)
 
diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
index 2ed2e206003..3f63aef86e5 100644
--- a/src/mesa/drivers/dri/i965/Makefile.sources
+++ b/src/mesa/drivers/dri/i965/Makefile.sources
@@ -110,55 +110,55 @@ i965_FILES = \
 	brw_upload.c \
 	libdrm_macros.h
 
-i965_gen4_FILES = \
+i965_gfx4_FILES = \
 	genX_blorp_exec.c \
 	genX_boilerplate.h \
 	genX_pipe_control.c \
 	genX_state_upload.c
 
-i965_gen45_FILES = \
+i965_gfx45_FILES = \
 	genX_blorp_exec.c \
 	genX_boilerplate.h \
 	genX_pipe_control.c \
 	genX_state_upload.c
 
-i965_gen5_FILES = \
+i965_gfx5_FILES = \
 	genX_blorp_exec.c \
 	genX_boilerplate.h \
 	genX_pipe_control.c \
 	genX_state_upload.c
 
-i965_gen6_FILES = \
+i965_gfx6_FILES = \
 	genX_blorp_exec.c \
 	genX_boilerplate.h \
 	genX_pipe_control.c \
 	genX_state_upload.c
 
-i965_gen7_FILES = \
+i965_gfx7_FILES = \
 	genX_blorp_exec.c \
 	genX_boilerplate.h \
 	genX_pipe_control.c \
 	genX_state_upload.c
 
-i965_gen75_FILES = \
+i965_gfx75_FILES = \
 	genX_blorp_exec.c \
 	genX_boilerplate.h \
 	genX_pipe_control.c \
 	genX_state_upload.c
 
-i965_gen8_FILES = \
+i965_gfx8_FILES = \
 	genX_blorp_exec.c \
 	genX_boilerplate.h \
 	genX_pipe_control.c \
 	genX_state_upload.c
 
-i965_gen9_FILES = \
+i965_gfx9_FILES = \
 	genX_blorp_exec.c \
 	genX_boilerplate.h \
 	genX_pipe_control.c \
 	genX_state_upload.c
 
-i965_gen11_FILES = \
+i965_gfx11_FILES = \
 	genX_blorp_exec.c \
 	genX_boilerplate.h \
 	genX_pipe_control.c \