diff --git a/Vagrantfile b/Vagrantfile
index 5468b9c6240cd5afcb06ad83de8f770f54f79335..ed8687e63c7e64dbb54f6985fb5fb409a29a000a 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -102,40 +102,40 @@ Vagrant.configure(2) do |config|
     # owners or timestamps or anything.
     config.vm.provision :shell, privileged: false, inline: <<-EOF
         set -xe
-        mkdir "#{test_dir}/file-types"
+        mkdir "#{test_dir}/file-names-exts"
 
-        touch "#{test_dir}/file-types/Makefile"
+        touch "#{test_dir}/file-names-exts/Makefile"
 
-        touch "#{test_dir}/file-types/image.png"
-        touch "#{test_dir}/file-types/image.svg"
+        touch "#{test_dir}/file-names-exts/image.png"
+        touch "#{test_dir}/file-names-exts/image.svg"
 
-        touch "#{test_dir}/file-types/video.avi"
-        touch "#{test_dir}/file-types/video.wmv"
+        touch "#{test_dir}/file-names-exts/video.avi"
+        touch "#{test_dir}/file-names-exts/video.wmv"
 
-        touch "#{test_dir}/file-types/music.mp3"
-        touch "#{test_dir}/file-types/music.ogg"
+        touch "#{test_dir}/file-names-exts/music.mp3"
+        touch "#{test_dir}/file-names-exts/music.ogg"
 
-        touch "#{test_dir}/file-types/lossless.flac"
-        touch "#{test_dir}/file-types/lossless.wav"
+        touch "#{test_dir}/file-names-exts/lossless.flac"
+        touch "#{test_dir}/file-names-exts/lossless.wav"
 
-        touch "#{test_dir}/file-types/crypto.asc"
-        touch "#{test_dir}/file-types/crypto.signature"
+        touch "#{test_dir}/file-names-exts/crypto.asc"
+        touch "#{test_dir}/file-names-exts/crypto.signature"
 
-        touch "#{test_dir}/file-types/document.pdf"
-        touch "#{test_dir}/file-types/document.xlsx"
+        touch "#{test_dir}/file-names-exts/document.pdf"
+        touch "#{test_dir}/file-names-exts/document.xlsx"
 
-        touch "#{test_dir}/file-types/compressed.zip"
-        touch "#{test_dir}/file-types/compressed.tar.gz"
-        touch "#{test_dir}/file-types/compressed.tgz"
+        touch "#{test_dir}/file-names-exts/compressed.zip"
+        touch "#{test_dir}/file-names-exts/compressed.tar.gz"
+        touch "#{test_dir}/file-names-exts/compressed.tgz"
 
-        touch "#{test_dir}/file-types/backup~"
-        touch "#{test_dir}/file-types/#SAVEFILE#"
-        touch "#{test_dir}/file-types/file.tmp"
+        touch "#{test_dir}/file-names-exts/backup~"
+        touch "#{test_dir}/file-names-exts/#SAVEFILE#"
+        touch "#{test_dir}/file-names-exts/file.tmp"
 
-        touch "#{test_dir}/file-types/compiled.class"
-        touch "#{test_dir}/file-types/compiled.o"
-        touch "#{test_dir}/file-types/compiled.js"
-        touch "#{test_dir}/file-types/compiled.coffee"
+        touch "#{test_dir}/file-names-exts/compiled.class"
+        touch "#{test_dir}/file-names-exts/compiled.o"
+        touch "#{test_dir}/file-names-exts/compiled.js"
+        touch "#{test_dir}/file-names-exts/compiled.coffee"
     EOF
 
 
diff --git a/xtests/file-types b/xtests/file-names-exts
similarity index 100%
rename from xtests/file-types
rename to xtests/file-names-exts
diff --git a/xtests/ignores_ogg b/xtests/ignores_ogg
index d32a8a9d37b5a528e01004d22e6c577724d447df..d54732c9ce93741d90f99cd4189259a33fccc1b9 100644
--- a/xtests/ignores_ogg
+++ b/xtests/ignores_ogg
@@ -1 +1 @@
-/testcases/file-types/music.mp3
+/testcases/file-names-exts/music.mp3
diff --git a/xtests/run.sh b/xtests/run.sh
index 8e3246ada00146d2ce88570acee070f30c52096a..ac0cba4285e7d5983e87598dd1ab5ad5669568bb 100755
--- a/xtests/run.sh
+++ b/xtests/run.sh
@@ -56,12 +56,12 @@ sudo -u cassowary $exa $testcases/permissions -lghR 2>&1 | diff -q - $results/pe
 
 
 # File types
-$exa $testcases/file-types -1 2>&1 | diff -q - $results/file-types  || exit 1
+$exa $testcases/file-names-exts -1 2>&1 | diff -q - $results/file-names-exts  || exit 1
 
 
 # Ignores
-$exa $testcases/file-types/music.* -I "*.ogg"       -1 2>&1 | diff -q - $results/ignores_ogg  || exit 1
-$exa $testcases/file-types/music.* -I "*.ogg|*.mp3" -1 2>&1 | diff -q - $results/empty        || exit 1
+$exa $testcases/file-names-exts/music.* -I "*.ogg"       -1 2>&1 | diff -q - $results/ignores_ogg  || exit 1
+$exa $testcases/file-names-exts/music.* -I "*.ogg|*.mp3" -1 2>&1 | diff -q - $results/empty        || exit 1
 
 
 # Links