diff --git a/src/stubser/stubser.c b/src/stubser/stubser.c
index 73efe6f..b776355 100644
--- a/src/stubser/stubser.c
+++ b/src/stubser/stubser.c
@@ -60,7 +60,7 @@ STATIC void createVariableSpecificInit(const char* aVariableTemplate, FILE *aFil
 {
    char *tempChar = NULL;
 
-   if (NULL != strstr(aVariable->dataType, "const"))
+   if (NULL != strstr(aVariable->dataType, CPARS_ELEMENT_CONST))
    {
       return;
    }
@@ -222,7 +222,7 @@ STATIC int8_t createStubExpected(char *aNoSuffix, FILE *aFile, FILE *aHeader, cf
 
    fprintf(aHeader, "void "STUBFUNCTION_INITEXPECTED_S1"();"NEWLINES NEWLINES, aNoSuffix);
    fprintf(aFile, "void "STUBFUNCTION_INITEXPECTED_S1"()"NEWLINES"{"NEWLINES, aNoSuffix);
-   fprintf(aFile, "\t"STUBFUNCTION_USER_INITEXPECTED_S1"();"NEWLINES, aNoSuffix);
+
    work = aList->head;
    while (work)
    {
@@ -234,7 +234,7 @@ STATIC int8_t createStubExpected(char *aNoSuffix, FILE *aFile, FILE *aHeader, cf
       createVariableSpecificInit(STUBVARIABLE_EXPECTED_S1, aFile, work);
       work = work->next;
    }
-
+   fprintf(aFile, "\t"STUBFUNCTION_USER_INITEXPECTED_S1"();"NEWLINES, aNoSuffix);
    fprintf(aFile, "}"NEWLINES NEWLINES);
 
    return 0;
@@ -271,7 +271,7 @@ STATIC int8_t createStubGlobals(char *aNoSuffix, FILE *aFile, FILE *aHeader, cfi
    }
 
    fprintf(aFile, "void "STUBFUNCTION_INITGLOBALS_S1"()"NEWLINES"{"NEWLINES, aNoSuffix);
-   fprintf(aFile, "\t"STUBFUNCTION_USER_INITGLOBALS_S1"();"NEWLINES, aNoSuffix);
+
    work = aList->head;
    while (work)
    {
@@ -283,7 +283,7 @@ STATIC int8_t createStubGlobals(char *aNoSuffix, FILE *aFile, FILE *aHeader, cfi
       createVariableSpecificInit("%s", aFile, work);
       work = work->next;
    }
-
+   fprintf(aFile, "\t"STUBFUNCTION_USER_INITGLOBALS_S1"();"NEWLINES, aNoSuffix);
    fprintf(aFile, "}"NEWLINES);
    fprintf(aHeader, "void "STUBFUNCTION_INITGLOBALS_S1"();"NEWLINES, aNoSuffix);
    fprintf(aHeader, "void "STUBFUNCTION_INIT_S1"();"NEWLINES NEWLINES, aNoSuffix);
@@ -305,7 +305,7 @@ STATIC int8_t createStubCheck(char *aNoSuffix, FILE *aFile, FILE *aHeader, cfile
 
    fprintf(aHeader, "void "STUBFUNCTION_CHECK_S1"();"NEWLINES NEWLINES, aNoSuffix);
    fprintf(aFile, "void "STUBFUNCTION_CHECK_S1"()"NEWLINES"{"NEWLINES, aNoSuffix);
-   fprintf(aFile, "\t"STUBFUNCTION_USER_CHECK_S1"();"NEWLINES, aNoSuffix);
+
    work = aList->head;
    while (work)
    {
@@ -317,7 +317,7 @@ STATIC int8_t createStubCheck(char *aNoSuffix, FILE *aFile, FILE *aHeader, cfile
       createVariableSpecificCheck(aFile, work);
       work = work->next;
    }
-
+   fprintf(aFile, "\t"STUBFUNCTION_USER_CHECK_S1"();"NEWLINES, aNoSuffix);
    fprintf(aFile, "}"NEWLINES NEWLINES);
 
    return 0;