diff --git a/src/bin/eolian/types.c b/src/bin/eolian/types.c
index 86cfb5bae0..50c7d17986 100644
--- a/src/bin/eolian/types.c
+++ b/src/bin/eolian/types.c
@@ -153,6 +153,7 @@ _var_generate(const Eolian_Variable *vr, Eina_Bool legacy)
         while ((p = strchr(fn, '.')))
           *p = '_';
      }
+   eina_str_toupper(&fn);
    if (!buf) buf = eina_strbuf_new();
    else eina_strbuf_append_char(buf, '\n');
    const Eolian_Type *vt = eolian_variable_base_type_get(vr);
@@ -262,6 +263,7 @@ void eo_gen_types_source_gen(const char *eof, Eina_Strbuf *buf)
         char *fn = strdup(eolian_variable_full_name_get(vr));
         for (char *p = strchr(fn, '.'); p; p = strchr(p, '.'))
           *p = '_';
+        eina_str_toupper(&fn);
 
         const Eolian_Type *vt = eolian_variable_base_type_get(vr);
         Eina_Stringshare *ct = eolian_type_c_type_get(vt);
diff --git a/src/tests/eolian/data/class_simple_ref.c b/src/tests/eolian/data/class_simple_ref.c
index e9a0d89d83..a8609e49e6 100644
--- a/src/tests/eolian/data/class_simple_ref.c
+++ b/src/tests/eolian/data/class_simple_ref.c
@@ -1,4 +1,4 @@
-float Bar = 10.300000f;
+float BAR = 10.300000f;
 
 Eina_Bool _class_simple_a_set(Eo *obj, Evas_Simple_Data *pd, int value);
 
diff --git a/src/tests/eolian/data/class_simple_ref_eo.h b/src/tests/eolian/data/class_simple_ref_eo.h
index 1c2032fc39..0d34ead475 100644
--- a/src/tests/eolian/data/class_simple_ref_eo.h
+++ b/src/tests/eolian/data/class_simple_ref_eo.h
@@ -11,25 +11,25 @@ typedef Eo Class_Simple;
 #ifndef _CLASS_SIMPLE_EO_TYPES
 #define _CLASS_SIMPLE_EO_TYPES
 
-#ifndef Foo
+#ifndef FOO
 /** doc for constant
  *
  * @ingroup Foo
  */
-#define Foo 5
+#define FOO 5
 #endif
 
 /** doc for global
  *
  * @ingroup Bar
  */
-extern float Bar;
+extern float BAR;
 
 /** in header but not in source
  *
  * @ingroup Baz
  */
-extern long Baz;
+extern long BAZ;
 
 
 #endif
diff --git a/src/tests/eolian/data/class_simple_ref_legacy.h b/src/tests/eolian/data/class_simple_ref_legacy.h
index a478e2f8b8..30b4855780 100644
--- a/src/tests/eolian/data/class_simple_ref_legacy.h
+++ b/src/tests/eolian/data/class_simple_ref_legacy.h
@@ -11,25 +11,25 @@ typedef Eo Class_Simple;
 #ifndef _CLASS_SIMPLE_EO_TYPES
 #define _CLASS_SIMPLE_EO_TYPES
 
-#ifndef Foo
+#ifndef FOO
 /** doc for constant
  *
  * @ingroup Foo
  */
-#define Foo 5
+#define FOO 5
 #endif
 
 /** doc for global
  *
  * @ingroup Bar
  */
-extern float Bar;
+extern float BAR;
 
 /** in header but not in source
  *
  * @ingroup Baz
  */
-extern long Baz;
+extern long BAZ;
 
 
 #endif
diff --git a/src/tests/eolian/data/docs_ref.h b/src/tests/eolian/data/docs_ref.h
index 8c9627bec7..ce1d4bbac6 100644
--- a/src/tests/eolian/data/docs_ref.h
+++ b/src/tests/eolian/data/docs_ref.h
@@ -60,7 +60,7 @@ typedef Bar Alias;
  *
  * @ingroup pants
  */
-extern int pants;
+extern int PANTS;
 
 /** Opaque struct docs. See @ref Foo for another struct.
  *
diff --git a/src/tests/eolian/data/docs_ref_legacy.h b/src/tests/eolian/data/docs_ref_legacy.h
index b4a1e630e4..9c1160e0e5 100644
--- a/src/tests/eolian/data/docs_ref_legacy.h
+++ b/src/tests/eolian/data/docs_ref_legacy.h
@@ -60,7 +60,7 @@ typedef Bar Alias;
  *
  * @ingroup pants
  */
-extern int pants;
+extern int PANTS;
 
 /** Opaque struct docs. See @ref Foo for another struct.
  *