diff --git a/samples/main.cc b/samples/main.cc
index 4fa8166..f2d8507 100644
--- a/samples/main.cc
+++ b/samples/main.cc
@@ -27,7 +27,7 @@
 #include "src/writer/writer.h"
 
 #if TINT_BUILD_SPV_PARSER
-#include "src/reader/spv/parser.h"
+#include "src/reader/spirv/parser.h"
 #endif
 
 namespace {
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ae349de..c9f494c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -189,11 +189,11 @@
 
 if(TINT_BUILD_SPV_PARSER)
   list(APPEND TINT_LIB_SRCS
-    reader/spv/fail_stream.h
-    reader/spv/parser.cc
-    reader/spv/parser.h
-    reader/spv/parser_impl.cc
-    reader/spv/parser_impl.h
+    reader/spirv/fail_stream.h
+    reader/spirv/parser.cc
+    reader/spirv/parser.h
+    reader/spirv/parser_impl.cc
+    reader/spirv/parser_impl.h
   )
 endif()
 
@@ -352,12 +352,12 @@
 
 if(${TINT_BUILD_SPV_PARSER})
   list (APPEND TINT_TEST_SRCS
-    reader/spv/fail_stream_test.cc
-    reader/spv/parser_impl_import_test.cc
-    reader/spv/parser_impl_test.cc
-    reader/spv/parser_test.cc
-    reader/spv/spirv_tools_helpers_test.cc
-    reader/spv/spirv_tools_helpers_test.h
+    reader/spirv/fail_stream_test.cc
+    reader/spirv/parser_impl_import_test.cc
+    reader/spirv/parser_impl_test.cc
+    reader/spirv/parser_test.cc
+    reader/spirv/spirv_tools_helpers_test.cc
+    reader/spirv/spirv_tools_helpers_test.h
   )
 endif()
 
diff --git a/src/reader/spv/fail_stream.h b/src/reader/spirv/fail_stream.h
similarity index 100%
rename from src/reader/spv/fail_stream.h
rename to src/reader/spirv/fail_stream.h
diff --git a/src/reader/spv/fail_stream_test.cc b/src/reader/spirv/fail_stream_test.cc
similarity index 97%
rename from src/reader/spv/fail_stream_test.cc
rename to src/reader/spirv/fail_stream_test.cc
index d496a80..96c9652 100644
--- a/src/reader/spv/fail_stream_test.cc
+++ b/src/reader/spirv/fail_stream_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/reader/spv/fail_stream.h"
+#include "src/reader/spirv/fail_stream.h"
 
 #include <memory>
 #include <sstream>
diff --git a/src/reader/spv/parser.cc b/src/reader/spirv/parser.cc
similarity index 92%
rename from src/reader/spv/parser.cc
rename to src/reader/spirv/parser.cc
index ddeeb1c..56bc07b 100644
--- a/src/reader/spv/parser.cc
+++ b/src/reader/spirv/parser.cc
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/reader/spv/parser.h"
+#include "src/reader/spirv/parser.h"
 
-#include "src/reader/spv/parser_impl.h"
+#include "src/reader/spirv/parser_impl.h"
 
 namespace tint {
 namespace reader {
diff --git a/src/reader/spv/parser.h b/src/reader/spirv/parser.h
similarity index 100%
rename from src/reader/spv/parser.h
rename to src/reader/spirv/parser.h
diff --git a/src/reader/spv/parser_impl.cc b/src/reader/spirv/parser_impl.cc
similarity index 98%
rename from src/reader/spv/parser_impl.cc
rename to src/reader/spirv/parser_impl.cc
index 8adba19..8eb8a27 100644
--- a/src/reader/spv/parser_impl.cc
+++ b/src/reader/spirv/parser_impl.cc
@@ -16,7 +16,7 @@
 
 #include "source/opt/build_module.h"
 #include "spirv-tools/libspirv.hpp"
-#include "src/reader/spv/parser_impl.h"
+#include "src/reader/spirv/parser_impl.h"
 
 namespace tint {
 namespace reader {
diff --git a/src/reader/spv/parser_impl.h b/src/reader/spirv/parser_impl.h
similarity index 98%
rename from src/reader/spv/parser_impl.h
rename to src/reader/spirv/parser_impl.h
index 8c5de47..65127d5 100644
--- a/src/reader/spv/parser_impl.h
+++ b/src/reader/spirv/parser_impl.h
@@ -31,7 +31,7 @@
 #include "src/ast/import.h"
 #include "src/ast/module.h"
 #include "src/reader/reader.h"
-#include "src/reader/spv/fail_stream.h"
+#include "src/reader/spirv/fail_stream.h"
 
 namespace tint {
 namespace reader {
diff --git a/src/reader/spv/parser_impl_import_test.cc b/src/reader/spirv/parser_impl_import_test.cc
similarity index 95%
rename from src/reader/spv/parser_impl_import_test.cc
rename to src/reader/spirv/parser_impl_import_test.cc
index b6ee771..6b07d63 100644
--- a/src/reader/spv/parser_impl_import_test.cc
+++ b/src/reader/spirv/parser_impl_import_test.cc
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/reader/spv/parser_impl.h"
+#include "src/reader/spirv/parser_impl.h"
 
 #include <memory>
 #include <sstream>
 
 #include "gmock/gmock.h"
-#include "src/reader/spv/spirv_tools_helpers_test.h"
+#include "src/reader/spirv/spirv_tools_helpers_test.h"
 
 namespace tint {
 namespace reader {
diff --git a/src/reader/spv/parser_impl_test.cc b/src/reader/spirv/parser_impl_test.cc
similarity index 93%
rename from src/reader/spv/parser_impl_test.cc
rename to src/reader/spirv/parser_impl_test.cc
index 5604e8e..4c29806 100644
--- a/src/reader/spv/parser_impl_test.cc
+++ b/src/reader/spirv/parser_impl_test.cc
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/reader/spv/parser_impl.h"
+#include "src/reader/spirv/parser_impl.h"
 
 #include <cstdint>
 #include <vector>
 
 #include "gmock/gmock.h"
-#include "src/reader/spv/spirv_tools_helpers_test.h"
+#include "src/reader/spirv/spirv_tools_helpers_test.h"
 
 namespace tint {
 namespace reader {
diff --git a/src/reader/spv/parser_test.cc b/src/reader/spirv/parser_test.cc
similarity index 96%
rename from src/reader/spv/parser_test.cc
rename to src/reader/spirv/parser_test.cc
index 035f3c8..7f8da83 100644
--- a/src/reader/spv/parser_test.cc
+++ b/src/reader/spirv/parser_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/reader/spv/parser.h"
+#include "src/reader/spirv/parser.h"
 
 #include <cstdint>
 #include <vector>
diff --git a/src/reader/spv/spirv_tools_helpers_test.cc b/src/reader/spirv/spirv_tools_helpers_test.cc
similarity index 96%
rename from src/reader/spv/spirv_tools_helpers_test.cc
rename to src/reader/spirv/spirv_tools_helpers_test.cc
index 00d6d51..7345308 100644
--- a/src/reader/spv/spirv_tools_helpers_test.cc
+++ b/src/reader/spirv/spirv_tools_helpers_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/reader/spv/spirv_tools_helpers_test.h"
+#include "src/reader/spirv/spirv_tools_helpers_test.h"
 
 #include <cstdint>
 #include <sstream>
diff --git a/src/reader/spv/spirv_tools_helpers_test.h b/src/reader/spirv/spirv_tools_helpers_test.h
similarity index 100%
rename from src/reader/spv/spirv_tools_helpers_test.h
rename to src/reader/spirv/spirv_tools_helpers_test.h