diff --git a/utils/code_model_generator/main.cpp b/utils/code_model_generator/main.cpp
index 84517c26..09260374 100755
--- a/utils/code_model_generator/main.cpp
+++ b/utils/code_model_generator/main.cpp
@@ -306,7 +306,7 @@ void makeGetterHeader(PIFile & f, const PICodeParser::Entity * e) {
 
 void writeModel(PICodeParser & parser, PICLI & cli, const PIString out, bool meta, bool enums, bool streams, bool texts, bool getters) {
 	PIVector<const PICodeParser::Entity * > ventities;
-	PIString defname = out.replaceAll(".", "_").replaceAll("/", "_").replaceAll(":", "_").replaceAll("-", "_").toUpperCase() + "_H";
+	PIString defname = out.replaceAll(".", "_").replaceAll("/", "_").replaceAll(":", "_").replaceAll("-", "_").removeAll(" ").toUpperCase() + "_H";
 	bool inc_h, inc_cpp;
 	inc_h = streams || texts;
 	inc_cpp = !inc_h && getters;