diff --git a/samples/main.cc b/samples/main.cc
index f2d85079ad..dc300092f6 100644
--- a/samples/main.cc
+++ b/samples/main.cc
@@ -245,7 +245,7 @@ int main(int argc, const char** argv) {
     if (!ReadFile<uint32_t>(options.input_filename, &data)) {
       return 1;
     }
-    reader = std::make_unique<tint::reader::spv::Parser>(data);
+    reader = std::make_unique<tint::reader::spirv::Parser>(data);
   }
 #endif
   if (!reader) {
diff --git a/src/reader/spirv/fail_stream.h b/src/reader/spirv/fail_stream.h
index 714359b038..8045f9280f 100644
--- a/src/reader/spirv/fail_stream.h
+++ b/src/reader/spirv/fail_stream.h
@@ -19,7 +19,7 @@
 
 namespace tint {
 namespace reader {
-namespace spv {
+namespace spirv {
 
 /// A FailStream object accumulates values onto a given std::ostream,
 /// and can be used to record failure by writing the false value
@@ -67,7 +67,7 @@ class FailStream {
   std::ostream* out_;
 };
 
-}  // namespace spv
+}  // namespace spirv
 }  // namespace reader
 }  // namespace tint
 
diff --git a/src/reader/spirv/fail_stream_test.cc b/src/reader/spirv/fail_stream_test.cc
index 96c9652a97..7ee2ab7bff 100644
--- a/src/reader/spirv/fail_stream_test.cc
+++ b/src/reader/spirv/fail_stream_test.cc
@@ -21,7 +21,7 @@
 
 namespace tint {
 namespace reader {
-namespace spv {
+namespace spirv {
 namespace {
 
 using ::testing::Eq;
@@ -71,6 +71,6 @@ TEST_F(FailStreamTest, ShiftOperatorAccumulatesValues) {
 }
 
 }  // namespace
-}  // namespace spv
+}  // namespace spirv
 }  // namespace reader
 }  // namespace tint
diff --git a/src/reader/spirv/parser.cc b/src/reader/spirv/parser.cc
index 56bc07bbb6..46e4433982 100644
--- a/src/reader/spirv/parser.cc
+++ b/src/reader/spirv/parser.cc
@@ -18,7 +18,7 @@
 
 namespace tint {
 namespace reader {
-namespace spv {
+namespace spirv {
 
 Parser::Parser(const std::vector<uint32_t>& spv_binary)
     : Reader(), impl_(std::make_unique<ParserImpl>(spv_binary)) {}
@@ -35,6 +35,6 @@ ast::Module Parser::module() {
   return impl_->module();
 }
 
-}  // namespace spv
+}  // namespace spirv
 }  // namespace reader
 }  // namespace tint
diff --git a/src/reader/spirv/parser.h b/src/reader/spirv/parser.h
index acf7a6ab01..61eee8011d 100644
--- a/src/reader/spirv/parser.h
+++ b/src/reader/spirv/parser.h
@@ -23,7 +23,7 @@
 
 namespace tint {
 namespace reader {
-namespace spv {
+namespace spirv {
 
 class ParserImpl;
 
@@ -47,7 +47,7 @@ class Parser : public Reader {
   std::unique_ptr<ParserImpl> impl_;
 };
 
-}  // namespace spv
+}  // namespace spirv
 }  // namespace reader
 }  // namespace tint
 
diff --git a/src/reader/spirv/parser_impl.cc b/src/reader/spirv/parser_impl.cc
index 8eb8a27141..2c5e17f889 100644
--- a/src/reader/spirv/parser_impl.cc
+++ b/src/reader/spirv/parser_impl.cc
@@ -20,7 +20,7 @@
 
 namespace tint {
 namespace reader {
-namespace spv {
+namespace spirv {
 
 namespace {
 
@@ -143,6 +143,6 @@ bool ParserImpl::ParseExtendedInstructionImports() {
   return true;
 }
 
-}  // namespace spv
+}  // namespace spirv
 }  // namespace reader
 }  // namespace tint
diff --git a/src/reader/spirv/parser_impl.h b/src/reader/spirv/parser_impl.h
index 65127d519b..00549da615 100644
--- a/src/reader/spirv/parser_impl.h
+++ b/src/reader/spirv/parser_impl.h
@@ -35,7 +35,7 @@
 
 namespace tint {
 namespace reader {
-namespace spv {
+namespace spirv {
 
 /// Parser implementation for SPIR-V.
 class ParserImpl : Reader {
@@ -130,7 +130,7 @@ class ParserImpl : Reader {
   std::unordered_set<uint32_t> glsl_std_450_imports_;
 };
 
-}  // namespace spv
+}  // namespace spirv
 }  // namespace reader
 }  // namespace tint
 
diff --git a/src/reader/spirv/parser_impl_import_test.cc b/src/reader/spirv/parser_impl_import_test.cc
index 6b07d6302c..e1823c89d8 100644
--- a/src/reader/spirv/parser_impl_import_test.cc
+++ b/src/reader/spirv/parser_impl_import_test.cc
@@ -22,7 +22,7 @@
 
 namespace tint {
 namespace reader {
-namespace spv {
+namespace spirv {
 namespace {
 
 using ::testing::ElementsAre;
@@ -69,6 +69,6 @@ TEST_F(SpvParseImport, ImportGlslStd450Twice) {
 // imports.
 
 }  // namespace
-}  // namespace spv
+}  // namespace spirv
 }  // namespace reader
 }  // namespace tint
diff --git a/src/reader/spirv/parser_impl_test.cc b/src/reader/spirv/parser_impl_test.cc
index 4c298062f7..c4ce36c8c7 100644
--- a/src/reader/spirv/parser_impl_test.cc
+++ b/src/reader/spirv/parser_impl_test.cc
@@ -22,7 +22,7 @@
 
 namespace tint {
 namespace reader {
-namespace spv {
+namespace spirv {
 
 namespace {
 
@@ -51,6 +51,6 @@ TEST_F(SpvParserImplTest, InvalidModuleFails) {
 
 }  // namespace
 
-}  // namespace spv
+}  // namespace spirv
 }  // namespace reader
 }  // namespace tint
diff --git a/src/reader/spirv/parser_test.cc b/src/reader/spirv/parser_test.cc
index 7f8da83b1f..25cb34a5e9 100644
--- a/src/reader/spirv/parser_test.cc
+++ b/src/reader/spirv/parser_test.cc
@@ -21,7 +21,7 @@
 
 namespace tint {
 namespace reader {
-namespace spv {
+namespace spirv {
 
 namespace {
 using ParserTest = testing::Test;
@@ -38,6 +38,6 @@ TEST_F(ParserTest, Uint32VecEmpty) {
 
 }  // namespace
 
-}  // namespace spv
+}  // namespace spirv
 }  // namespace reader
 }  // namespace tint
diff --git a/src/reader/spirv/spirv_tools_helpers_test.cc b/src/reader/spirv/spirv_tools_helpers_test.cc
index 73453089f7..2a31f7df2e 100644
--- a/src/reader/spirv/spirv_tools_helpers_test.cc
+++ b/src/reader/spirv/spirv_tools_helpers_test.cc
@@ -23,7 +23,7 @@
 
 namespace tint {
 namespace reader {
-namespace spv {
+namespace spirv {
 namespace test {
 
 /// @returns the SPIR-V module assembled from the given text.  Numeric IDs
@@ -50,6 +50,6 @@ std::vector<uint32_t> Assemble(const std::string& spirv_assembly) {
 }
 
 }  // namespace test
-}  // namespace spv
+}  // namespace spirv
 }  // namespace reader
 }  // namespace tint
diff --git a/src/reader/spirv/spirv_tools_helpers_test.h b/src/reader/spirv/spirv_tools_helpers_test.h
index b77d9546f4..91cb0816fc 100644
--- a/src/reader/spirv/spirv_tools_helpers_test.h
+++ b/src/reader/spirv/spirv_tools_helpers_test.h
@@ -21,7 +21,7 @@
 
 namespace tint {
 namespace reader {
-namespace spv {
+namespace spirv {
 namespace test {
 
 /// @returns the SPIR-V module assembled from the given text.  Numeric IDs
@@ -29,7 +29,7 @@ namespace test {
 std::vector<uint32_t> Assemble(const std::string& spirv_assembly);
 
 }  // namespace test
-}  // namespace spv
+}  // namespace spirv
 }  // namespace reader
 }  // namespace tint