diff --git a/components/QtGroup/CppFileMaker/resources/files/template/CppTemplate b/components/QtGroup/CppFileMaker/resources/files/template/CppTemplate
index 0aaa6a7..2cc4db9 100644
--- a/components/QtGroup/CppFileMaker/resources/files/template/CppTemplate
+++ b/components/QtGroup/CppFileMaker/resources/files/template/CppTemplate
@@ -1,7 +1,2 @@
-#ifndef __%MACROPROTECTSPREFIX%_%CLASSNAME%__
-#define __%MACROPROTECTSPREFIX%_%CLASSNAME%__
-
-// .h include
+// .h include
 #include "%classname%.h"
-
-#endif//__%MACROPROTECTSPREFIX%_%CLASSNAME%__
diff --git a/components/QtGroup/CppFileMaker/resources/files/template/QmlTemplate b/components/QtGroup/CppFileMaker/resources/files/template/QmlTemplate
index 0aaa6a7..2cc4db9 100644
--- a/components/QtGroup/CppFileMaker/resources/files/template/QmlTemplate
+++ b/components/QtGroup/CppFileMaker/resources/files/template/QmlTemplate
@@ -1,7 +1,2 @@
-#ifndef __%MACROPROTECTSPREFIX%_%CLASSNAME%__
-#define __%MACROPROTECTSPREFIX%_%CLASSNAME%__
-
-// .h include
+// .h include
 #include "%classname%.h"
-
-#endif//__%MACROPROTECTSPREFIX%_%CLASSNAME%__
diff --git a/components/QtGroup/CppFileMaker/resources/files/template/cpptemplate.h b/components/QtGroup/CppFileMaker/resources/files/template/cpptemplate.h
index 467b7c0..6835948 100644
--- a/components/QtGroup/CppFileMaker/resources/files/template/cpptemplate.h
+++ b/components/QtGroup/CppFileMaker/resources/files/template/cpptemplate.h
@@ -1,5 +1,5 @@
-#ifndef __%MACROPROTECTSPREFIX%_%CLASSNAME%_H__
-#define __%MACROPROTECTSPREFIX%_%CLASSNAME%_H__
+#ifndef %MACROPROTECTSPREFIX%_%CLASSNAME%_H_
+#define %MACROPROTECTSPREFIX%_%CLASSNAME%_H_
 
 // Qt lib import
 #include <QObject>
@@ -24,4 +24,4 @@ public slots:
 // .inc include
 #include "%classname%.inc"
 
-#endif//__%MACROPROTECTSPREFIX%_%CLASSNAME%_H__
+#endif//%MACROPROTECTSPREFIX%_%CLASSNAME%_H_
diff --git a/components/QtGroup/CppFileMaker/resources/files/template/cpptemplate.inc b/components/QtGroup/CppFileMaker/resources/files/template/cpptemplate.inc
index a53cdee..c38061c 100644
--- a/components/QtGroup/CppFileMaker/resources/files/template/cpptemplate.inc
+++ b/components/QtGroup/CppFileMaker/resources/files/template/cpptemplate.inc
@@ -1,7 +1,7 @@
-#ifndef __%MACROPROTECTSPREFIX%_%CLASSNAME%_INC__
-#define __%MACROPROTECTSPREFIX%_%CLASSNAME%_INC__
+#ifndef %MACROPROTECTSPREFIX%_%CLASSNAME%_INC_
+#define %MACROPROTECTSPREFIX%_%CLASSNAME%_INC_
 
 // .h include
 #include "%classname%.h"
 
-#endif//__%MACROPROTECTSPREFIX%_%CLASSNAME%_INC__
+#endif//%MACROPROTECTSPREFIX%_%CLASSNAME%_INC_
diff --git a/components/QtGroup/CppFileMaker/resources/files/template/qmltemplate.h b/components/QtGroup/CppFileMaker/resources/files/template/qmltemplate.h
index 34224fa..784c970 100644
--- a/components/QtGroup/CppFileMaker/resources/files/template/qmltemplate.h
+++ b/components/QtGroup/CppFileMaker/resources/files/template/qmltemplate.h
@@ -1,5 +1,5 @@
-#ifndef __%MACROPROTECTSPREFIX%_%CLASSNAME%_H__
-#define __%MACROPROTECTSPREFIX%_%CLASSNAME%_H__
+#ifndef %MACROPROTECTSPREFIX%_%CLASSNAME%_H_
+#define %MACROPROTECTSPREFIX%_%CLASSNAME%_H_
 
 // Qt lib import
 #include <QObject>
@@ -27,4 +27,4 @@ public slots:
 // .inc include
 #include "%classname%.inc"
 
-#endif//__%MACROPROTECTSPREFIX%_%CLASSNAME%_H__
+#endif//%MACROPROTECTSPREFIX%_%CLASSNAME%_H_
diff --git a/components/QtGroup/CppFileMaker/resources/files/template/qmltemplate.inc b/components/QtGroup/CppFileMaker/resources/files/template/qmltemplate.inc
index a53cdee..c38061c 100644
--- a/components/QtGroup/CppFileMaker/resources/files/template/qmltemplate.inc
+++ b/components/QtGroup/CppFileMaker/resources/files/template/qmltemplate.inc
@@ -1,7 +1,7 @@
-#ifndef __%MACROPROTECTSPREFIX%_%CLASSNAME%_INC__
-#define __%MACROPROTECTSPREFIX%_%CLASSNAME%_INC__
+#ifndef %MACROPROTECTSPREFIX%_%CLASSNAME%_INC_
+#define %MACROPROTECTSPREFIX%_%CLASSNAME%_INC_
 
 // .h include
 #include "%classname%.h"
 
-#endif//__%MACROPROTECTSPREFIX%_%CLASSNAME%_INC__
+#endif//%MACROPROTECTSPREFIX%_%CLASSNAME%_INC_