diff --git a/environment.py b/environment.py
index 4031d32ab..1dda39319 100755
--- a/environment.py
+++ b/environment.py
@@ -16,7 +16,7 @@
 
 import subprocess, os.path
 
-builder_filename = 'builder.txt'
+builder_filename = 'meson.build'
 
 class EnvironmentException(Exception):
     def __init(self, *args, **kwargs):
diff --git a/builder.py b/meson.py
similarity index 96%
rename from builder.py
rename to meson.py
index 536ddfe18..d7e6e4486 100755
--- a/builder.py
+++ b/meson.py
@@ -79,11 +79,11 @@ class BuilderApp():
             raise RuntimeError('Source and build directories must not be the same. Create a pristine build directory.')
         if self.has_builder_file(ndir1):
             if self.has_builder_file(ndir2):
-                raise RuntimeError('Both directories contain a builder file %s.' % environment.builder_filename)
+                raise RuntimeError('Both directories contain a build file %s.' % environment.builder_filename)
             return (ndir1, ndir2)
         if self.has_builder_file(ndir2):
             return (ndir2, ndir1)
-        raise RuntimeError('Neither directory contains a builder file %s.' % environment.builder_filename)
+        raise RuntimeError('Neither directory contains a build file %s.' % environment.builder_filename)
     
     def generate(self):
         env = environment.Environment(self.source_dir, self.build_dir, self.builder_script_file, options)
diff --git a/readme.txt b/readme.txt
index bd9811b11..c075d815c 100644
--- a/readme.txt
+++ b/readme.txt
@@ -6,17 +6,17 @@ Dependencies: Python3 and Python-Ply
 
 Running:
 
-Builder requires that you have a source directory and a build directory
+Meson requires that you have a source directory and a build directory
 and that these two are different. In your source root must exist a file
-called 'builder.txt'. To generate the build system run this command:
+called 'meson.build'. To generate the build system run this command:
 
-builder.py <source directory> <build directory>
+meson.py <source directory> <build directory>
 
-You can omit either of the two directories, and Builder will substitute
+You can omit either of the two directories, and Meson will substitute
 the current directory and autodetect what you mean. This mean that you
 can do things like this:
 
-cd source_root; mkdir build; cd build; builder ..
-cd source_root; mkdir build; builder build
+cd source_root; mkdir build; cd build; meson.py ..
+cd source_root; mkdir build; meson.py build
 
 For questions contact jpakkane@gmail.com.
diff --git a/run_tests.py b/run_tests.py
index 20465093e..5892ec841 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 = './builder.py'
+builder_command = './meson.py'
 if use_shell:
     generator_flags = ['--generator', 'shell']
     compile_commands = ['compile.sh']
diff --git a/test cases/1 trivial/builder.txt b/test cases/1 trivial/meson.build
similarity index 100%
rename from test cases/1 trivial/builder.txt
rename to test cases/1 trivial/meson.build
diff --git a/test cases/10 man install/builder.txt b/test cases/10 man install/meson.build
similarity index 100%
rename from test cases/10 man install/builder.txt
rename to test cases/10 man install/meson.build
diff --git a/test cases/11 subdir/builder.txt b/test cases/11 subdir/meson.build
similarity index 100%
rename from test cases/11 subdir/builder.txt
rename to test cases/11 subdir/meson.build
diff --git a/test cases/11 subdir/subdir/builder.txt b/test cases/11 subdir/subdir/meson.build
similarity index 100%
rename from test cases/11 subdir/subdir/builder.txt
rename to test cases/11 subdir/subdir/meson.build
diff --git a/test cases/12 data/builder.txt b/test cases/12 data/meson.build
similarity index 100%
rename from test cases/12 data/builder.txt
rename to test cases/12 data/meson.build
diff --git a/test cases/13 pch/builder.txt b/test cases/13 pch/meson.build
similarity index 100%
rename from test cases/13 pch/builder.txt
rename to test cases/13 pch/meson.build
diff --git a/test cases/14 cxx pch/builder.txt b/test cases/14 cxx pch/meson.build
similarity index 100%
rename from test cases/14 cxx pch/builder.txt
rename to test cases/14 cxx pch/meson.build
diff --git a/test cases/15 mixed pch/builder.txt b/test cases/15 mixed pch/meson.build
similarity index 100%
rename from test cases/15 mixed pch/builder.txt
rename to test cases/15 mixed pch/meson.build
diff --git a/test cases/16 configure file/builder.txt b/test cases/16 configure file/meson.build
similarity index 100%
rename from test cases/16 configure file/builder.txt
rename to test cases/16 configure file/meson.build
diff --git a/test cases/17 if/builder.txt b/test cases/17 if/meson.build
similarity index 100%
rename from test cases/17 if/builder.txt
rename to test cases/17 if/meson.build
diff --git a/test cases/18 else/builder.txt b/test cases/18 else/meson.build
similarity index 100%
rename from test cases/18 else/builder.txt
rename to test cases/18 else/meson.build
diff --git a/test cases/19 comparison/builder.txt b/test cases/19 comparison/meson.build
similarity index 100%
rename from test cases/19 comparison/builder.txt
rename to test cases/19 comparison/meson.build
diff --git a/test cases/2 cxx/builder.txt b/test cases/2 cxx/meson.build
similarity index 100%
rename from test cases/2 cxx/builder.txt
rename to test cases/2 cxx/meson.build
diff --git a/test cases/20 array/builder.txt b/test cases/20 array/meson.build
similarity index 100%
rename from test cases/20 array/builder.txt
rename to test cases/20 array/meson.build
diff --git a/test cases/21 includedir/builder.txt b/test cases/21 includedir/meson.build
similarity index 100%
rename from test cases/21 includedir/builder.txt
rename to test cases/21 includedir/meson.build
diff --git a/test cases/21 includedir/src/builder.txt b/test cases/21 includedir/src/meson.build
similarity index 100%
rename from test cases/21 includedir/src/builder.txt
rename to test cases/21 includedir/src/meson.build
diff --git a/test cases/22 header in file list/builder.txt b/test cases/22 header in file list/meson.build
similarity index 100%
rename from test cases/22 header in file list/builder.txt
rename to test cases/22 header in file list/meson.build
diff --git a/test cases/23 global arg/builder.txt b/test cases/23 global arg/meson.build
similarity index 100%
rename from test cases/23 global arg/builder.txt
rename to test cases/23 global arg/meson.build
diff --git a/test cases/24 target arg/builder.txt b/test cases/24 target arg/meson.build
similarity index 100%
rename from test cases/24 target arg/builder.txt
rename to test cases/24 target arg/meson.build
diff --git a/test cases/25 numbers/builder.txt b/test cases/25 numbers/meson.build
similarity index 100%
rename from test cases/25 numbers/builder.txt
rename to test cases/25 numbers/meson.build
diff --git a/test cases/26 endian/builder.txt b/test cases/26 endian/meson.build
similarity index 100%
rename from test cases/26 endian/builder.txt
rename to test cases/26 endian/meson.build
diff --git a/test cases/27 library versions/builder.txt b/test cases/27 library versions/meson.build
similarity index 100%
rename from test cases/27 library versions/builder.txt
rename to test cases/27 library versions/meson.build
diff --git a/test cases/28 config subdir/include/builder.txt b/test cases/28 config subdir/include/meson.build
similarity index 100%
rename from test cases/28 config subdir/include/builder.txt
rename to test cases/28 config subdir/include/meson.build
diff --git a/test cases/28 config subdir/builder.txt b/test cases/28 config subdir/meson.build
similarity index 100%
rename from test cases/28 config subdir/builder.txt
rename to test cases/28 config subdir/meson.build
diff --git a/test cases/28 config subdir/src/builder.txt b/test cases/28 config subdir/src/meson.build
similarity index 100%
rename from test cases/28 config subdir/src/builder.txt
rename to test cases/28 config subdir/src/meson.build
diff --git a/test cases/29 external dep/builder.txt b/test cases/29 external dep/meson.build
similarity index 100%
rename from test cases/29 external dep/builder.txt
rename to test cases/29 external dep/meson.build
diff --git a/test cases/3 static/builder.txt b/test cases/3 static/meson.build
similarity index 100%
rename from test cases/3 static/builder.txt
rename to test cases/3 static/meson.build
diff --git a/test cases/4 shared/builder.txt b/test cases/4 shared/meson.build
similarity index 100%
rename from test cases/4 shared/builder.txt
rename to test cases/4 shared/meson.build
diff --git a/test cases/5 linkstatic/builder.txt b/test cases/5 linkstatic/meson.build
similarity index 100%
rename from test cases/5 linkstatic/builder.txt
rename to test cases/5 linkstatic/meson.build
diff --git a/test cases/6 linkshared/builder.txt b/test cases/6 linkshared/meson.build
similarity index 100%
rename from test cases/6 linkshared/builder.txt
rename to test cases/6 linkshared/meson.build
diff --git a/test cases/7 mixed/builder.txt b/test cases/7 mixed/meson.build
similarity index 100%
rename from test cases/7 mixed/builder.txt
rename to test cases/7 mixed/meson.build
diff --git a/test cases/8 install/builder.txt b/test cases/8 install/meson.build
similarity index 100%
rename from test cases/8 install/builder.txt
rename to test cases/8 install/meson.build
diff --git a/test cases/9 header install/builder.txt b/test cases/9 header install/meson.build
similarity index 100%
rename from test cases/9 header install/builder.txt
rename to test cases/9 header install/meson.build