diff --git a/generators.py b/generators.py
index 21fc70656..951da7b23 100755
--- a/generators.py
+++ b/generators.py
@@ -17,7 +17,7 @@
 import os, stat, re, pickle
 import interpreter, nodes
 import environment
-from builder_install import InstallData
+from meson_install import InstallData
 
 def shell_quote(cmdlist):
     return ["'" + x + "'" for x in cmdlist]
@@ -209,7 +209,7 @@ class NinjaGenerator(Generator):
 
     def generate_install(self, outfile):
         script_root = self.environment.get_script_dir()
-        install_script = os.path.join(script_root, 'builder_install.py')
+        install_script = os.path.join(script_root, 'meson_install.py')
         install_data_file = os.path.join(self.environment.get_scratch_dir(), 'install.dat')
         depfixer = os.path.join(script_root, 'depfixer.py')
         d = InstallData(self.environment.get_prefix(), depfixer, './') # Fixme
@@ -274,8 +274,8 @@ class NinjaGenerator(Generator):
 
     def generate_tests(self, outfile):
         script_root = self.environment.get_script_dir()
-        test_script = os.path.join(script_root, 'builder_test.py')
-        test_data = os.path.join(self.environment.get_scratch_dir(), 'builder_test_setup.dat')
+        test_script = os.path.join(script_root, 'meson_test.py')
+        test_data = os.path.join(self.environment.get_scratch_dir(), 'meson_test_setup.dat')
         outfile.write('build test: CUSTOM_COMMAND\n')
         outfile.write(' COMMAND = \'%s\' \'%s\'\n\n' % (ninja_quote(test_script), ninja_quote(test_data)))
         datafile = open(test_data, 'w')
diff --git a/builder_install.py b/meson_install.py
similarity index 100%
rename from builder_install.py
rename to meson_install.py
diff --git a/builder_test.py b/meson_test.py
similarity index 100%
rename from builder_test.py
rename to meson_test.py
diff --git a/run_tests.py b/run_tests.py
index 5892ec841..9343655f6 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -20,7 +20,7 @@ import os, subprocess, shutil, sys
 test_build_dir = 'work area'
 install_dir = os.path.join(os.path.split(os.path.abspath(__file__))[0], 'install dir')
 use_shell = len(sys.argv) > 1
-builder_command = './meson.py'
+meson_command = './meson.py'
 if use_shell:
     generator_flags = ['--generator', 'shell']
     compile_commands = ['compile.sh']
@@ -38,7 +38,7 @@ def run_test(testdir):
     os.mkdir(test_build_dir)
     os.mkdir(install_dir)
     print('Running test: ' + testdir)
-    gen_command = [builder_command, '--prefix', install_dir, testdir, test_build_dir] + generator_flags
+    gen_command = [meson_command, '--prefix', install_dir, testdir, test_build_dir] + generator_flags
     p = subprocess.Popen(gen_command)
     p.wait()
     if p.returncode != 0: