diff --git a/src/mapi/glapi/gen/gl_marshal.py b/src/mapi/glapi/gen/marshal_generated_c.py
similarity index 99%
rename from src/mapi/glapi/gen/gl_marshal.py
rename to src/mapi/glapi/gen/marshal_generated_c.py
index 4da469a6b8b..0a46ac5a3f1 100644
--- a/src/mapi/glapi/gen/gl_marshal.py
+++ b/src/mapi/glapi/gen/marshal_generated_c.py
@@ -70,7 +70,7 @@ class PrintCode(gl_XML.gl_print_base):
     def __init__(self):
         super(PrintCode, self).__init__()
 
-        self.name = 'gl_marshal.py'
+        self.name = 'marshal_generated_c.py'
         self.license = license.bsd_license_template % (
             'Copyright (C) 2012 Intel Corporation', 'INTEL CORPORATION')
 
diff --git a/src/mapi/glapi/gen/gl_marshal_h.py b/src/mapi/glapi/gen/marshal_generated_h.py
similarity index 98%
rename from src/mapi/glapi/gen/gl_marshal_h.py
rename to src/mapi/glapi/gen/marshal_generated_h.py
index 47da88481db..4e11f52a6ba 100644
--- a/src/mapi/glapi/gen/gl_marshal_h.py
+++ b/src/mapi/glapi/gen/marshal_generated_h.py
@@ -41,7 +41,7 @@ class PrintCode(gl_XML.gl_print_base):
     def __init__(self):
         super(PrintCode, self).__init__()
 
-        self.name = 'gl_marshal_h.py'
+        self.name = 'marshal_generated_h.py'
         self.license = license.bsd_license_template % (
             'Copyright (C) 2012 Intel Corporation', 'INTEL CORPORATION')
 
diff --git a/src/mapi/glapi/gen/meson.build b/src/mapi/glapi/gen/meson.build
index c63f52aa36f..0a48c946f8f 100644
--- a/src/mapi/glapi/gen/meson.build
+++ b/src/mapi/glapi/gen/meson.build
@@ -110,7 +110,7 @@ main_api_hw_select_init_h = custom_target(
 
 main_unmarshal_table_c = custom_target(
   'unmarshal_table.c',
-  input : ['gl_unmarshal_table.py', 'gl_and_es_API.xml'],
+  input : ['unmarshal_table_c.py', 'gl_and_es_API.xml'],
   output : 'unmarshal_table.c',
   command : [prog_python, '@INPUT0@', '@INPUT1@', sizeof_pointer],
   depend_files : glapi_xml_py_deps,
@@ -121,7 +121,7 @@ main_marshal_generated_c = []
 foreach x : ['0', '1', '2', '3', '4', '5', '6', '7']
   main_marshal_generated_c += custom_target(
     'marshal_generated' + x + '.c',
-    input : ['gl_marshal.py', 'gl_and_es_API.xml'],
+    input : ['marshal_generated_c.py', 'gl_and_es_API.xml'],
     output : 'marshal_generated' + x + '.c',
     command : [prog_python, '@INPUT0@', '@INPUT1@', x, '8', sizeof_pointer],
     depend_files : glapi_xml_py_deps,
diff --git a/src/mapi/glapi/gen/gl_unmarshal_table.py b/src/mapi/glapi/gen/unmarshal_table_c.py
similarity index 98%
rename from src/mapi/glapi/gen/gl_unmarshal_table.py
rename to src/mapi/glapi/gen/unmarshal_table_c.py
index 1d446e72e7c..cae96ccb759 100644
--- a/src/mapi/glapi/gen/gl_unmarshal_table.py
+++ b/src/mapi/glapi/gen/unmarshal_table_c.py
@@ -51,7 +51,7 @@ class PrintCode(gl_XML.gl_print_base):
     def __init__(self):
         super(PrintCode, self).__init__()
 
-        self.name = 'gl_marshal.py'
+        self.name = 'unmarshal_table_c.py'
         self.license = license.bsd_license_template % (
             'Copyright (C) 2012 Intel Corporation', 'INTEL CORPORATION')
 
diff --git a/src/mesa/main/meson.build b/src/mesa/main/meson.build
index 39e274b9e77..d02dafd6c90 100644
--- a/src/mesa/main/meson.build
+++ b/src/mesa/main/meson.build
@@ -12,7 +12,7 @@ main_dispatch_h = custom_target(
 
 main_marshal_generated_h = custom_target(
   'marshal_generated.h',
-  input : ['../../mapi/glapi/gen/gl_marshal_h.py', '../../mapi/glapi/gen/gl_and_es_API.xml'],
+  input : ['../../mapi/glapi/gen/marshal_generated_h.py', '../../mapi/glapi/gen/gl_and_es_API.xml'],
   output : 'marshal_generated.h',
   command : [prog_python, '@INPUT0@', '@INPUT1@', sizeof_pointer],
   depend_files : glapi_xml_py_deps,