diff --git a/.travis.yml b/.travis.yml
index b1d0baa1..1e8480eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,5 +8,5 @@ addons:
     packages:
     - libboost-regex-dev
 
-install: script/configure.sh -D USE_BOOST_REGEX=true -D USE_LIBPROFILER=false
+install: script/configure -D USE_BOOST_REGEX=true -D USE_LIBPROFILER=false
 script: script/ci
diff --git a/README.md b/README.md
index b4ec7a8f..428e79e9 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,8 @@ This allows it to generate a fast parser for any context-free grammar.
 ### Installation
 
 ```sh
-script/configure.sh  # Generate a Makefile
-make                 # Build static libraries for the compiler and runtime
+script/configure # Generate a Makefile
+make             # Build static libraries for the compiler and runtime
 ```
 
 ### Overview
@@ -31,7 +31,6 @@ The second library, `libruntime`, is used in combination with the parsers
 generated by `libcompiler`, to generate syntax trees based on text documents, and keep the
 syntax trees up-to-date as changes are made to the documents.
 
-
 ### Writing a grammar
 
 Tree-sitter's grammars are specified as JSON strings. This format allows them
diff --git a/script/ci b/script/ci
index b259a165..2aefb67a 100755
--- a/script/ci
+++ b/script/ci
@@ -2,5 +2,5 @@
 
 set -e
 
-script/fetch_languages
+script/fetch-fixtures
 script/test
diff --git a/script/clean.sh b/script/clean
similarity index 100%
rename from script/clean.sh
rename to script/clean
diff --git a/script/configure.sh b/script/configure
similarity index 100%
rename from script/configure.sh
rename to script/configure
diff --git a/script/fetch_languages b/script/fetch-fixtures
similarity index 100%
rename from script/fetch_languages
rename to script/fetch-fixtures
diff --git a/script/format.sh b/script/format
similarity index 100%
rename from script/format.sh
rename to script/format
diff --git a/script/lint.sh b/script/lint
similarity index 100%
rename from script/lint.sh
rename to script/lint
diff --git a/script/trim.sh b/script/trim-whitespace
similarity index 100%
rename from script/trim.sh
rename to script/trim-whitespace