diff --git a/scripts/writeentity.mako.cpp b/scripts/writeentity.mako.cpp
index 110eca9..04ea87c 100644
--- a/scripts/writeentity.mako.cpp
+++ b/scripts/writeentity.mako.cpp
@@ -5,7 +5,8 @@
 #include <ipmid/types.hpp>
 #include <utility>
 
-using namespace ipmi::sensor;
+namespace ipmi {
+namespace sensor {
 
 extern const EntityInfoMap entities = {
 % for key in entityDict.iterkeys():
@@ -34,3 +35,6 @@
 }},
 % endfor
 };
+
+} // namespace sensor
+} // namespace ipmi