diff --git a/configure.py b/configure.py
index 56cb11c625..b1f2b1f394 100755
--- a/configure.py
+++ b/configure.py
@@ -10,7 +10,7 @@ from subprocess import PIPE
 import subprocess
 import hashlib
 
-sys.path.append(os.path.dirname(__file__) + "/tools/n64splat")
+sys.path.append(os.path.dirname(__file__) + "/tools/splat")
 import split
 
 INCLUDE_ASM_RE = re.compile(r"_INCLUDE_ASM\([^,]+, ([^,]+), ([^,)]+)") # note _ prefix
diff --git a/tools/n64splat/.gitignore b/tools/splat/.gitignore
similarity index 100%
rename from tools/n64splat/.gitignore
rename to tools/splat/.gitignore
diff --git a/tools/n64splat/.gitrepo b/tools/splat/.gitrepo
similarity index 88%
rename from tools/n64splat/.gitrepo
rename to tools/splat/.gitrepo
index a36d64ec01..6b26c87759 100644
--- a/tools/n64splat/.gitrepo
+++ b/tools/splat/.gitrepo
@@ -4,7 +4,7 @@
 ; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
 ;
 [subrepo]
-	remote = https://github.com/ethteck/n64splat.git
+	remote = https://github.com/ethteck/splat.git
 	branch = master
 	commit = 7574db712ef19ca420904c82d3559e9ac4b8c5f5
 	parent = 86760369a5ab977c037c21aebf6f10484570642f
diff --git a/tools/n64splat/Makefile b/tools/splat/Makefile
similarity index 100%
rename from tools/n64splat/Makefile
rename to tools/splat/Makefile
diff --git a/tools/n64splat/README.md b/tools/splat/README.md
similarity index 100%
rename from tools/n64splat/README.md
rename to tools/splat/README.md
diff --git a/tools/n64splat/create_config.py b/tools/splat/create_config.py
similarity index 100%
rename from tools/n64splat/create_config.py
rename to tools/splat/create_config.py
diff --git a/tools/n64splat/list_objects.py b/tools/splat/list_objects.py
similarity index 100%
rename from tools/n64splat/list_objects.py
rename to tools/splat/list_objects.py
diff --git a/tools/n64splat/requirements.txt b/tools/splat/requirements.txt
similarity index 100%
rename from tools/n64splat/requirements.txt
rename to tools/splat/requirements.txt
diff --git a/tools/n64splat/segtypes/Yay0.py b/tools/splat/segtypes/Yay0.py
similarity index 100%
rename from tools/n64splat/segtypes/Yay0.py
rename to tools/splat/segtypes/Yay0.py
diff --git a/tools/n64splat/segtypes/__init__.py b/tools/splat/segtypes/__init__.py
similarity index 100%
rename from tools/n64splat/segtypes/__init__.py
rename to tools/splat/segtypes/__init__.py
diff --git a/tools/n64splat/segtypes/bin.py b/tools/splat/segtypes/bin.py
similarity index 100%
rename from tools/n64splat/segtypes/bin.py
rename to tools/splat/segtypes/bin.py
diff --git a/tools/n64splat/segtypes/ci4.py b/tools/splat/segtypes/ci4.py
similarity index 100%
rename from tools/n64splat/segtypes/ci4.py
rename to tools/splat/segtypes/ci4.py
diff --git a/tools/n64splat/segtypes/ci8.py b/tools/splat/segtypes/ci8.py
similarity index 100%
rename from tools/n64splat/segtypes/ci8.py
rename to tools/splat/segtypes/ci8.py
diff --git a/tools/n64splat/segtypes/code.py b/tools/splat/segtypes/code.py
similarity index 100%
rename from tools/n64splat/segtypes/code.py
rename to tools/splat/segtypes/code.py
diff --git a/tools/n64splat/segtypes/header.py b/tools/splat/segtypes/header.py
similarity index 100%
rename from tools/n64splat/segtypes/header.py
rename to tools/splat/segtypes/header.py
diff --git a/tools/n64splat/segtypes/i4.py b/tools/splat/segtypes/i4.py
similarity index 100%
rename from tools/n64splat/segtypes/i4.py
rename to tools/splat/segtypes/i4.py
diff --git a/tools/n64splat/segtypes/i8.py b/tools/splat/segtypes/i8.py
similarity index 100%
rename from tools/n64splat/segtypes/i8.py
rename to tools/splat/segtypes/i8.py
diff --git a/tools/n64splat/segtypes/ia16.py b/tools/splat/segtypes/ia16.py
similarity index 100%
rename from tools/n64splat/segtypes/ia16.py
rename to tools/splat/segtypes/ia16.py
diff --git a/tools/n64splat/segtypes/ia4.py b/tools/splat/segtypes/ia4.py
similarity index 100%
rename from tools/n64splat/segtypes/ia4.py
rename to tools/splat/segtypes/ia4.py
diff --git a/tools/n64splat/segtypes/ia8.py b/tools/splat/segtypes/ia8.py
similarity index 100%
rename from tools/n64splat/segtypes/ia8.py
rename to tools/splat/segtypes/ia8.py
diff --git a/tools/n64splat/segtypes/palette.py b/tools/splat/segtypes/palette.py
similarity index 100%
rename from tools/n64splat/segtypes/palette.py
rename to tools/splat/segtypes/palette.py
diff --git a/tools/n64splat/segtypes/rgba16.py b/tools/splat/segtypes/rgba16.py
similarity index 100%
rename from tools/n64splat/segtypes/rgba16.py
rename to tools/splat/segtypes/rgba16.py
diff --git a/tools/n64splat/segtypes/rgba32.py b/tools/splat/segtypes/rgba32.py
similarity index 100%
rename from tools/n64splat/segtypes/rgba32.py
rename to tools/splat/segtypes/rgba32.py
diff --git a/tools/n64splat/segtypes/segment.py b/tools/splat/segtypes/segment.py
similarity index 100%
rename from tools/n64splat/segtypes/segment.py
rename to tools/splat/segtypes/segment.py
diff --git a/tools/n64splat/split.py b/tools/splat/split.py
similarity index 100%
rename from tools/n64splat/split.py
rename to tools/splat/split.py
diff --git a/tools/n64splat/util/Yay0decompress.c b/tools/splat/util/Yay0decompress.c
similarity index 100%
rename from tools/n64splat/util/Yay0decompress.c
rename to tools/splat/util/Yay0decompress.c
diff --git a/tools/n64splat/util/Yay0decompress.py b/tools/splat/util/Yay0decompress.py
similarity index 100%
rename from tools/n64splat/util/Yay0decompress.py
rename to tools/splat/util/Yay0decompress.py
diff --git a/tools/n64splat/util/__init__.py b/tools/splat/util/__init__.py
similarity index 100%
rename from tools/n64splat/util/__init__.py
rename to tools/splat/util/__init__.py
diff --git a/tools/n64splat/util/color.py b/tools/splat/util/color.py
similarity index 100%
rename from tools/n64splat/util/color.py
rename to tools/splat/util/color.py
diff --git a/tools/n64splat/util/find_code_length.py b/tools/splat/util/find_code_length.py
similarity index 100%
rename from tools/n64splat/util/find_code_length.py
rename to tools/splat/util/find_code_length.py
diff --git a/tools/n64splat/util/floats.py b/tools/splat/util/floats.py
similarity index 100%
rename from tools/n64splat/util/floats.py
rename to tools/splat/util/floats.py
diff --git a/tools/n64splat/util/iter.py b/tools/splat/util/iter.py
similarity index 100%
rename from tools/n64splat/util/iter.py
rename to tools/splat/util/iter.py
diff --git a/tools/n64splat/util/log.py b/tools/splat/util/log.py
similarity index 100%
rename from tools/n64splat/util/log.py
rename to tools/splat/util/log.py
diff --git a/tools/n64splat/util/rominfo.py b/tools/splat/util/rominfo.py
similarity index 100%
rename from tools/n64splat/util/rominfo.py
rename to tools/splat/util/rominfo.py