diff --git a/src/event_serialize.cpp b/src/event_serialize.cpp
index c7e78d9..ddfc4b6 100644
--- a/src/event_serialize.cpp
+++ b/src/event_serialize.cpp
@@ -93,5 +93,5 @@
     }
 }
 
-} // namespace event
+} // namespace events
 } // namespace phosphor
diff --git a/src/sdevent/event.hpp b/src/sdevent/event.hpp
index f47c05d..e3d1b22 100644
--- a/src/sdevent/event.hpp
+++ b/src/sdevent/event.hpp
@@ -15,7 +15,7 @@
 {
 class Timer;
 } // namespace timer
-}
+} // namespace event
 namespace event
 {
 
diff --git a/src/test/propertywatchtest.cpp b/src/test/propertywatchtest.cpp
index 6576bfd..bb021a2 100644
--- a/src/test/propertywatchtest.cpp
+++ b/src/test/propertywatchtest.cpp
@@ -107,8 +107,8 @@
 
 template <typename T> void testStart()
 {
-    using ::testing::Return;
     using ::testing::_;
+    using ::testing::Return;
 
     MockDBusInterface dbus;
     MockDBusInterface::instance(dbus);