--- a/stage1_2/iec_bison.yy	Mon Nov 19 22:53:43 2012 +0100
+++ b/stage1_2/iec_bison.yy	Tue Nov 20 00:01:57 2012 +0100
@@ -100,7 +100,7 @@
 
 /* The interface through which bison and flex interact. */
 #include "stage1_2_priv.hh"
-#include "derived_conversion_functions.hh"
+#include "create_enumtype_conversion_functions.hh"
 
 #include "../absyntax_utils/add_en_eno_param_decl.hh"	/* required for  add_en_eno_param_decl_c */
 
@@ -8412,10 +8412,11 @@
   std::string tmp;
   
   strname = dname; 
-  for (int i = 0; derived_conversion_functions_c::functionDataType[i] != NULL; i++) {
-    tmp = strname + std::string("_TO_") + derived_conversion_functions_c::functionDataType[i];
+  for (int i = 0; create_enumtype_conversion_functions_c::functionDataType[i] != NULL; i++) {
+    tmp = strname + std::string("_TO_") + create_enumtype_conversion_functions_c::functionDataType[i];
     library_element_symtable.insert(tmp.c_str(), prev_declared_derived_function_name_token);
-    tmp = derived_conversion_functions_c::functionDataType[i] + std::string("_TO_") + strname;
+    
+    tmp = create_enumtype_conversion_functions_c::functionDataType[i] + std::string("_TO_") + strname;
     library_element_symtable.insert(tmp.c_str(), prev_declared_derived_function_name_token);
   }  
 }