diff --git a/templates/skeletons/gui-body/function.tmplt b/templates/skeletons/gui-body/function.tmplt
index aabd98ebcbf4563fac8c15e7f05f9060dd680e4b..b32ddcae13589d4fc6db468ed6daf29721fe59e6 100644
--- a/templates/skeletons/gui-body/function.tmplt
+++ b/templates/skeletons/gui-body/function.tmplt
@@ -36,10 +36,10 @@
 
 #include "queue_manager.h"
 #include "@_LOWER:Name_@.h"
-#include "@_Name_@_enums_def.h"
+#include "@_LOWER:Name_@_enums_def.h"
 
 typedef struct _PI_Messages {
-   T_@_Name_@_PI_list msg_id;
+   T_@_LOWER:Name_@_PI_list msg_id;
    union {
       @@TABLE@@
       @@IF@@ @_ASync_PI_Param_Type_@ /= ""
@@ -50,7 +50,7 @@ typedef struct _PI_Messages {
 } PI_Messages;
 
 typedef struct _RI_Messages {
-   T_@_Name_@_RI_list msg_id;
+   T_@_LOWER:Name_@_RI_list msg_id;
    union {
       @@TABLE@@
       @@IF@@ @_ASync_RI_Param_Type_@ /= ""
@@ -132,7 +132,7 @@ void @_LOWER:Name_@_PI_Poll(void)
    struct mq_attr msgq_attr;
    char* msgcontent = NULL;
 
-   T_@_Name_@_RI_list message_received_type;
+   T_@_LOWER:Name_@_RI_list message_received_type;
 
    if ((msgcontent = (char*)malloc(sizeof(RI_Messages))) == NULL) {
       perror("Error when allocating memory in GUI polling function");
diff --git a/templates/skeletons/gui-enum-defs/function-filename.tmplt b/templates/skeletons/gui-enum-defs/function-filename.tmplt
index 2b1e6a1733c6c04de9e363b5b495aad89d185313..306a3ae8e95b0f1b7d3308172ac28c81d1dc0425 100644
--- a/templates/skeletons/gui-enum-defs/function-filename.tmplt
+++ b/templates/skeletons/gui-enum-defs/function-filename.tmplt
@@ -3,5 +3,4 @@
 @@-- @_Name_@                : The name of the function
 @@-- @_Is_Type_@             : True if function type
 @@-- @_Instance_Of_@         : Name of instance or empty string
-@@-- Don't use LOWER because the enums_def.h is also included by DMT's gui_api.c
-@_Name_@_enums_def.h
+@_LOWER:Name_@_enums_def.h
diff --git a/templates/skeletons/gui-enum-defs/function.tmplt b/templates/skeletons/gui-enum-defs/function.tmplt
index f7d0a0a6b9a498aec52f2eae8d604ee5bf4400d1..146d0328a20a5a770b39ba001fdb3f386d1b9ec0 100644
--- a/templates/skeletons/gui-enum-defs/function.tmplt
+++ b/templates/skeletons/gui-enum-defs/function.tmplt
@@ -41,7 +41,7 @@ typedef enum {
       @@END_IF@@
 @@END_TABLE@@
 @@END_INLINE@@
-} T_@_Name_@_PI_list;
+} T_@_LOWER:Name_@_PI_list;
 @@END_IF@@
 
 @@IF@@ @_List_Of_ASync_RIs'Length_@ > 0
@@ -51,5 +51,5 @@ typedef enum {
    i_@_List_Of_ASync_RIs_@
 @@END_TABLE@@
 @@END_INLINE@@
-} T_@_Name_@_RI_list;
+} T_@_LOWER:Name_@_RI_list;
 @@END_IF@@
diff --git a/templates/skeletons/makefile.tmplt b/templates/skeletons/makefile.tmplt
index 1d9d41d70a34a73d225bc89d07ec49cb58684029..36e10bb25cd602143a74b3fee0c4d7e8c7f65cd8 100644
--- a/templates/skeletons/makefile.tmplt
+++ b/templates/skeletons/makefile.tmplt
@@ -121,14 +121,22 @@ dataview/C/built: ${DATAVIEW_UNIQ} ${DATAVIEW_ACN}
            @@--  do nothing, C is always done, only once
 	   @@ELSIF@@ @_Unique_Languages_@ = "GUI"
            @@--  for DMT, GUI means Python
-dataview/Python/built: dataview/C/built
+@@INLINE(dataview/Python/built:	dataview/C/built )( )()@@
+        @@--  aadl2glueC has to be called before the python mapper is built
+        @@--  because it depends on gui_api.c/etc.
+        @@TABLE@@
+          @@IF@@ @_Language_@ = GUI
+             @_LOWER:Function_Names_@/GUI/wrappers/aadl2glueC_built
+          @@END_IF@@
+        @@END_TABLE@@
+@@END_INLINE@@
 	mkdir -p $(dir $@)
 	asn2dataModel -o $(dir $@) -toPython ${DATAVIEW_UNIQ}  @@-- Ignore context parameters for python interface
 	$(MAKE) -C dataview/Python -f Makefile.python
         @@TABLE@@
         @@IF@@ @_Language_@ = GUI
-	cp  dataview/Python/* @_LOWER:Function_Names_@/GUI/wrappers/python
-	cp  dataview/C/timeInMS.[ch] dataview/C/debug_messages.c @_LOWER:Function_Names_@/GUI/wrappers/python
+	cp dataview/Python/* @_LOWER:Function_Names_@/GUI/wrappers/python
+	cp dataview/C/timeInMS.[ch] dataview/C/debug_messages.c @_LOWER:Function_Names_@/GUI/wrappers/python
 	cd @_LOWER:Function_Names_@/GUI/wrappers/python && \
 	   gcc -g -fPIC -c `python-config --cflags`  gui_api.c ../../src/queue_manager.c timeInMS.c debug_messages.c -I. -I../../src && \
 	   gcc -g -shared -o PythonAccess.so gui_api.o queue_manager.o timeInMS.o debug_messages.o `python-config --ldflags` -lrt