diff --git a/core/crypto.h b/core/crypto.h
index b97fb17..901b46b 100644
--- a/core/crypto.h
+++ b/core/crypto.h
@@ -40,6 +40,6 @@
             size_t digest_size);
 
 }  // namespace crypto
-}  // namespave nvram
+}  // namespace nvram
 
 #endif  // NVRAM_CORE_CRYPTO_H_
diff --git a/hal/include/nvram/hal/tests/scoped_nvram_device.h b/hal/include/nvram/hal/tests/scoped_nvram_device.h
index 7034a85..8fb1978 100644
--- a/hal/include/nvram/hal/tests/scoped_nvram_device.h
+++ b/hal/include/nvram/hal/tests/scoped_nvram_device.h
@@ -77,6 +77,6 @@
   nvram_device_t* device_ = nullptr;
 };
 
-}  // namespace nvram_client
+}  // namespace nvram
 
 #endif  // NVRAM_HAL_TESTS_SCOPED_NVRAM_DEVICE_H_
diff --git a/hal/tests/nvram_hal_test.cc b/hal/tests/nvram_hal_test.cc
index 18373bb..5447f8a 100644
--- a/hal/tests/nvram_hal_test.cc
+++ b/hal/tests/nvram_hal_test.cc
@@ -550,4 +550,4 @@
             device.EnableReadLock(index, kNoAuth));
 }
 
-}  // namespace
+}  // namespace nvram
diff --git a/hal/tests/scoped_nvram_device.cc b/hal/tests/scoped_nvram_device.cc
index 3a001f3..fab59f4 100644
--- a/hal/tests/scoped_nvram_device.cc
+++ b/hal/tests/scoped_nvram_device.cc
@@ -233,4 +233,4 @@
                                    authorization_value.size());
 }
 
-}  // namespace nvram_client
+}  // namespace nvram
diff --git a/messages/message_codec.cpp b/messages/message_codec.cpp
index 229bf1f..09b83af 100644
--- a/messages/message_codec.cpp
+++ b/messages/message_codec.cpp
@@ -134,5 +134,5 @@
   return nullptr;
 }
 
-}  // namespace nvram
 }  // namespace proto
+}  // namespace nvram