diff --git a/scripts/event_header_generator/EventFunctions.cpp.template b/scripts/event_header_generator/EventFunctions.cpp.template
index 18f7690704c127e2bd5eb516097a08868e505565..34feee56ad083054fef7582886afa7627552fe2b 100644
--- a/scripts/event_header_generator/EventFunctions.cpp.template
+++ b/scripts/event_header_generator/EventFunctions.cpp.template
@@ -35,7 +35,7 @@
 
 #include <map>
 
-namespace HomeoneBoard
+namespace DeathStackBoard
 {{
 
 string getEventString(uint8_t event)
diff --git a/scripts/event_header_generator/Events.h.template b/scripts/event_header_generator/Events.h.template
index 2c4937a1fdd509e3307baf666120b77fdd067fec..d47404cce22a7e875cee47441eaa93136ba63e5a 100644
--- a/scripts/event_header_generator/Events.h.template
+++ b/scripts/event_header_generator/Events.h.template
@@ -43,7 +43,7 @@
 using std::string;
 using std::map;
 
-namespace HomeoneBoard
+namespace DeathStackBoard
 {{
 /**
  * Definition of all events in the Homeone Board software
diff --git a/scripts/event_header_generator/Topics.h.template b/scripts/event_header_generator/Topics.h.template
index 43e72f7302673cf61bbb3a6605681feb08cf7236..fb9c58a5b655d6475a13f7f007c2ee8bc5064a4d 100644
--- a/scripts/event_header_generator/Topics.h.template
+++ b/scripts/event_header_generator/Topics.h.template
@@ -38,7 +38,7 @@
 using std::map;
 using std::string;
 
-namespace HomeoneBoard
+namespace DeathStackBoard
 {{
 /**
  * Definition of various event topics to use in the EventBroker
@@ -56,6 +56,6 @@ enum Topics : uint8_t
  */
 string getTopicString(uint8_t topic);
 
-}}  // namespace HomeoneBoard
+}}  // namespace DeathStackBoard
 
 #endif /* SRC_SHARED_BOARDS_HOMEONE_TOPICS_H_ */