diff --git a/elog-errors.hpp b/elog-errors.hpp
index a782ed0..20f5f45 100644
--- a/elog-errors.hpp
+++ b/elog-errors.hpp
@@ -136,7 +136,7 @@
 {
     using type = xyz::openbmc_project::Software::Version::UnTarFailure;
 };
-}
+} // namespace details
 
 namespace xyz
 {
@@ -199,7 +199,7 @@
 {
     using type = xyz::openbmc_project::Software::Version::ManifestFileFailure;
 };
-}
+} // namespace details
 
 namespace xyz
 {
@@ -263,7 +263,7 @@
 {
     using type = xyz::openbmc_project::Software::Version::InternalFailure;
 };
-}
+} // namespace details
 
 } // namespace logging
 
diff --git a/image_manager.cpp b/image_manager.cpp
index 7c19866..c346fd4 100644
--- a/image_manager.cpp
+++ b/image_manager.cpp
@@ -277,4 +277,4 @@
 
 } // namespace manager
 } // namespace software
-} // namepsace phosphor
+} // namespace phosphor
diff --git a/serialize.cpp b/serialize.cpp
index 722b71b..f52ec16 100644
--- a/serialize.cpp
+++ b/serialize.cpp
@@ -95,6 +95,6 @@
     }
 }
 
-} // namespace phosphor
+} // namespace updater
 } // namespace software
-} // namespace openpower
+} // namespace phosphor
diff --git a/serialize.hpp b/serialize.hpp
index 03eea99..5ebebc6 100644
--- a/serialize.hpp
+++ b/serialize.hpp
@@ -30,6 +30,6 @@
  **/
 void removeFile(std::string versionId);
 
-} // namespace phosphor
+} // namespace updater
 } // namespace software
-} // namespace openpower
+} // namespace phosphor
diff --git a/static/flash.cpp b/static/flash.cpp
index 6fc4563..d06d08c 100644
--- a/static/flash.cpp
+++ b/static/flash.cpp
@@ -8,7 +8,7 @@
 namespace
 {
 constexpr auto PATH_INITRAMFS = "/run/initramfs";
-} // anonymous
+} // namespace
 
 namespace phosphor
 {
@@ -40,4 +40,4 @@
 
 } // namespace updater
 } // namespace software
-} // namepsace phosphor
+} // namespace phosphor
diff --git a/sync_manager.cpp b/sync_manager.cpp
index f83aebd..debead2 100644
--- a/sync_manager.cpp
+++ b/sync_manager.cpp
@@ -78,4 +78,4 @@
 
 } // namespace manager
 } // namespace software
-} // namepsace phosphor
+} // namespace phosphor
diff --git a/ubi/flash.cpp b/ubi/flash.cpp
index 8986a07..4d6d153 100644
--- a/ubi/flash.cpp
+++ b/ubi/flash.cpp
@@ -79,4 +79,4 @@
 
 } // namespace updater
 } // namespace software
-} // namepsace phosphor
+} // namespace phosphor
diff --git a/version.cpp b/version.cpp
index 3b1b0c9..6702fbd 100644
--- a/version.cpp
+++ b/version.cpp
@@ -133,4 +133,4 @@
 
 } // namespace manager
 } // namespace software
-} // namepsace phosphor
+} // namespace phosphor