diff --git a/util/header_generator.c b/util/header_generator.c
index 0632c18..01a6263 100644
--- a/util/header_generator.c
+++ b/util/header_generator.c
@@ -923,6 +923,7 @@ void OutputOdinFunction(Entry *entry, Entry *root) {
 
 			const char *initialValue = TrimPrefix(variable->variable.initialValue);
 			bool needLeadingDot = false;
+			const char *leadingTypeName = "";
 
 			if (0 == strcmp(initialValue, "NULL")) {
 				initialValue = "nil";
@@ -947,6 +948,7 @@ void OutputOdinFunction(Entry *entry, Entry *root) {
 						if (0 == memcmp(initialValue, entry->bitset.definePrefix + 3, strlen(entry->bitset.definePrefix) - 3)) {
 							needLeadingDot = true;
 							initialValue += strlen(entry->bitset.definePrefix) - 3;
+							leadingTypeName = TrimPrefix(entry->name);
 						}
 
 						break;
@@ -954,7 +956,7 @@ void OutputOdinFunction(Entry *entry, Entry *root) {
 				}
 			}
 
-			FilePrintFormat(output, " = %c%s", needLeadingDot ? '.' : ' ', initialValue);
+			FilePrintFormat(output, " = %s%c%s", leadingTypeName, needLeadingDot ? '.' : ' ', initialValue);
 		}
 	}