diff --git a/ml-proto/README.md b/ml-proto/README.md
index 0bc41f21db..a39d81ce1d 100644
--- a/ml-proto/README.md
+++ b/ml-proto/README.md
@@ -75,7 +75,7 @@ wasm [option] [file ...]
 where `file` is a script file (see below) to be run. If no file is given, you'll get into the REPL and can enter script commands interactively. You can also get into the REPL by explicitly passing `-` as a file name. You can do that in combination to giving a module file, so that you can then invoke its exports interactively, e.g.:
 
 ```
-./wasm module.wase -
+./wasm module.wast -
 ```
 Note however that the REPL currently is too dumb to allow multi-line input. :)
 
diff --git a/ml-proto/runtests.py b/ml-proto/runtests.py
index a22feaee76..cf6579436b 100755
--- a/ml-proto/runtests.py
+++ b/ml-proto/runtests.py
@@ -9,7 +9,7 @@
 
 class RunTests(unittest.TestCase):
   def _runTestFile(self, shortName, fileName, interpreterPath):
-    logPath = fileName.replace("test/", "test/output/").replace(".wase", ".wase.log")
+    logPath = fileName.replace("test/", "test/output/").replace(".wast", ".wast.log")
     try:
       os.remove(logPath)
     except OSError:
@@ -20,7 +20,7 @@ def _runTestFile(self, shortName, fileName, interpreterPath):
     self.assertEqual(0, exitCode, "test runner failed with exit code %i" % exitCode)
 
     try:
-      expected = open(fileName.replace("test/", "test/expected-output/").replace(".wase", ".wase.log"))
+      expected = open(fileName.replace("test/", "test/expected-output/").replace(".wast", ".wast.log"))
     except IOError:
       # print("// WARNING: No expected output found for %s" % fileName)
       return
@@ -72,6 +72,6 @@ def rebuild_interpreter(path):
   else:
     find_interpreter(interpreterPath)
 
-  testFiles = glob.glob("test/*.wase")
+  testFiles = glob.glob("test/*.wast")
   generate_test_cases(RunTests, interpreterPath, testFiles)
   unittest.main()
diff --git a/ml-proto/test/conversions.wase b/ml-proto/test/conversions.wast
similarity index 100%
rename from ml-proto/test/conversions.wase
rename to ml-proto/test/conversions.wast
diff --git a/ml-proto/test/exports.wase b/ml-proto/test/exports.wast
similarity index 100%
rename from ml-proto/test/exports.wase
rename to ml-proto/test/exports.wast
diff --git a/ml-proto/test/fac.wase b/ml-proto/test/fac.wast
similarity index 100%
rename from ml-proto/test/fac.wase
rename to ml-proto/test/fac.wast
diff --git a/ml-proto/test/float32.wase b/ml-proto/test/float32.wast
similarity index 100%
rename from ml-proto/test/float32.wase
rename to ml-proto/test/float32.wast
diff --git a/ml-proto/test/forward.wase b/ml-proto/test/forward.wast
similarity index 100%
rename from ml-proto/test/forward.wase
rename to ml-proto/test/forward.wast
diff --git a/ml-proto/test/hexnum.wase b/ml-proto/test/hexnum.wast
similarity index 100%
rename from ml-proto/test/hexnum.wase
rename to ml-proto/test/hexnum.wast
diff --git a/ml-proto/test/i32.wase b/ml-proto/test/i32.wast
similarity index 100%
rename from ml-proto/test/i32.wase
rename to ml-proto/test/i32.wast
diff --git a/ml-proto/test/i64.wase b/ml-proto/test/i64.wast
similarity index 100%
rename from ml-proto/test/i64.wase
rename to ml-proto/test/i64.wast
diff --git a/ml-proto/test/imports.wase b/ml-proto/test/imports.wast
similarity index 100%
rename from ml-proto/test/imports.wase
rename to ml-proto/test/imports.wast
diff --git a/ml-proto/test/memory.wase b/ml-proto/test/memory.wast
similarity index 100%
rename from ml-proto/test/memory.wase
rename to ml-proto/test/memory.wast
diff --git a/ml-proto/test/memory_trap.wase b/ml-proto/test/memory_trap.wast
similarity index 100%
rename from ml-proto/test/memory_trap.wase
rename to ml-proto/test/memory_trap.wast
diff --git a/ml-proto/test/resizing.wase b/ml-proto/test/resizing.wast
similarity index 100%
rename from ml-proto/test/resizing.wase
rename to ml-proto/test/resizing.wast
diff --git a/ml-proto/test/switch.wase b/ml-proto/test/switch.wast
similarity index 100%
rename from ml-proto/test/switch.wase
rename to ml-proto/test/switch.wast