diff --git a/src/dobjtype.cpp b/src/dobjtype.cpp
index b025cd032..76ac79095 100644
--- a/src/dobjtype.cpp
+++ b/src/dobjtype.cpp
@@ -516,24 +516,24 @@ void PType::StaticInit()
 	TypeTable.AddType(TypeAngle = new PAngle);
 
 	// Add types to the global symbol table.
-	GlobalSymbols.AddSymbol(new PSymbolType(NAME_sbyte, TypeSInt8));
-	GlobalSymbols.AddSymbol(new PSymbolType(NAME_byte, TypeUInt8));
-	GlobalSymbols.AddSymbol(new PSymbolType(NAME_short, TypeSInt16));
-	GlobalSymbols.AddSymbol(new PSymbolType(NAME_ushort, TypeUInt16));
-	GlobalSymbols.AddSymbol(new PSymbolType(NAME_int, TypeSInt32));
-	GlobalSymbols.AddSymbol(new PSymbolType(NAME_uint, TypeUInt32));
-	GlobalSymbols.AddSymbol(new PSymbolType(NAME_bool, TypeBool));
-	GlobalSymbols.AddSymbol(new PSymbolType(NAME_float, TypeFloat64));
-	GlobalSymbols.AddSymbol(new PSymbolType(NAME_double, TypeFloat64));
-	GlobalSymbols.AddSymbol(new PSymbolType(NAME_float32, TypeFloat32));
-	GlobalSymbols.AddSymbol(new PSymbolType(NAME_float64, TypeFloat64));
-	GlobalSymbols.AddSymbol(new PSymbolType(NAME_string, TypeString));
-	GlobalSymbols.AddSymbol(new PSymbolType(NAME_name, TypeName));
-	GlobalSymbols.AddSymbol(new PSymbolType(NAME_sound, TypeSound));
-	GlobalSymbols.AddSymbol(new PSymbolType(NAME_color, TypeColor));
-	GlobalSymbols.AddSymbol(new PSymbolType(NAME_state, TypeState));
-	GlobalSymbols.AddSymbol(new PSymbolType(NAME_fixed, TypeFixed));
-	GlobalSymbols.AddSymbol(new PSymbolType(NAME_angle, TypeAngle));
+	GlobalSymbols.AddSymbol(new PSymbolType(NAME_sByte, TypeSInt8));
+	GlobalSymbols.AddSymbol(new PSymbolType(NAME_Byte, TypeUInt8));
+	GlobalSymbols.AddSymbol(new PSymbolType(NAME_Short, TypeSInt16));
+	GlobalSymbols.AddSymbol(new PSymbolType(NAME_uShort, TypeUInt16));
+	GlobalSymbols.AddSymbol(new PSymbolType(NAME_Int, TypeSInt32));
+	GlobalSymbols.AddSymbol(new PSymbolType(NAME_uInt, TypeUInt32));
+	GlobalSymbols.AddSymbol(new PSymbolType(NAME_Bool, TypeBool));
+	GlobalSymbols.AddSymbol(new PSymbolType(NAME_Float, TypeFloat64));
+	GlobalSymbols.AddSymbol(new PSymbolType(NAME_Double, TypeFloat64));
+	GlobalSymbols.AddSymbol(new PSymbolType(NAME_Float32, TypeFloat32));
+	GlobalSymbols.AddSymbol(new PSymbolType(NAME_Float64, TypeFloat64));
+	GlobalSymbols.AddSymbol(new PSymbolType(NAME_String, TypeString));
+	GlobalSymbols.AddSymbol(new PSymbolType(NAME_Name, TypeName));
+	GlobalSymbols.AddSymbol(new PSymbolType(NAME_Sound, TypeSound));
+	GlobalSymbols.AddSymbol(new PSymbolType(NAME_Color, TypeColor));
+	GlobalSymbols.AddSymbol(new PSymbolType(NAME_State, TypeState));
+	GlobalSymbols.AddSymbol(new PSymbolType(NAME_Fixed, TypeFixed));
+	GlobalSymbols.AddSymbol(new PSymbolType(NAME_Angle, TypeAngle));
 }
 
 
diff --git a/src/namedef.h b/src/namedef.h
index 9d8496280..fb85502bf 100644
--- a/src/namedef.h
+++ b/src/namedef.h
@@ -579,22 +579,22 @@ xx(DecoFindMultiNameState)
 xx(DecoFindSingleNameState)
 
 // basic type names
-xx(default)
-xx(sbyte)
-xx(byte)
-xx(short)
-xx(ushort)
-xx(int)
-xx(uint)
-xx(bool)
-xx(float)
-xx(float32)
-xx(float64)
-xx(double)
-xx(string)
-xx(vector)
-xx(map)
-xx(array)
-xx(sound)
-xx(state)
-xx(fixed)
+xx(Default)
+xx(sByte)
+xx(Byte)
+xx(Short)
+xx(uShort)
+xx(Int)
+xx(uInt)
+xx(Bool)
+xx(Float)
+xx(Float32)
+xx(Float64)
+xx(Double)
+xx(String)
+xx(Vector)
+xx(Map)
+xx(Array)
+xx(Sound)
+xx(State)
+xx(Fixed)
diff --git a/src/zscript/zcc_parser.cpp b/src/zscript/zcc_parser.cpp
index 1e3591da0..8a9ea4567 100644
--- a/src/zscript/zcc_parser.cpp
+++ b/src/zscript/zcc_parser.cpp
@@ -91,20 +91,20 @@ static void InitTokenMap()
 	TOKENDEF ('}',				ZCC_RBRACE);
 	TOKENDEF (TK_Struct,		ZCC_STRUCT);
 	TOKENDEF (TK_Enum,			ZCC_ENUM);
-	TOKENDEF2(TK_SByte,			ZCC_SBYTE,		NAME_sbyte);
-	TOKENDEF2(TK_Byte,			ZCC_BYTE,		NAME_byte);
-	TOKENDEF2(TK_Short,			ZCC_SHORT,		NAME_short);
-	TOKENDEF2(TK_UShort,		ZCC_USHORT,		NAME_ushort);
-	TOKENDEF2(TK_Int,			ZCC_INT,		NAME_int);
-	TOKENDEF2(TK_UInt,			ZCC_UINT,		NAME_uint);
-	TOKENDEF2(TK_Bool,			ZCC_BOOL,		NAME_bool);
-	TOKENDEF2(TK_Float,			ZCC_FLOAT,		NAME_float);
-	TOKENDEF2(TK_Double,		ZCC_DOUBLE,		NAME_double);
-	TOKENDEF2(TK_String,		ZCC_STRING,		NAME_string);
-	TOKENDEF2(TK_Vector,		ZCC_VECTOR,		NAME_vector);
+	TOKENDEF2(TK_SByte,			ZCC_SBYTE,		NAME_sByte);
+	TOKENDEF2(TK_Byte,			ZCC_BYTE,		NAME_Byte);
+	TOKENDEF2(TK_Short,			ZCC_SHORT,		NAME_Short);
+	TOKENDEF2(TK_UShort,		ZCC_USHORT,		NAME_uShort);
+	TOKENDEF2(TK_Int,			ZCC_INT,		NAME_Int);
+	TOKENDEF2(TK_UInt,			ZCC_UINT,		NAME_uInt);
+	TOKENDEF2(TK_Bool,			ZCC_BOOL,		NAME_Bool);
+	TOKENDEF2(TK_Float,			ZCC_FLOAT,		NAME_Float);
+	TOKENDEF2(TK_Double,		ZCC_DOUBLE,		NAME_Double);
+	TOKENDEF2(TK_String,		ZCC_STRING,		NAME_String);
+	TOKENDEF2(TK_Vector,		ZCC_VECTOR,		NAME_Vector);
 	TOKENDEF2(TK_Name,			ZCC_NAME,		NAME_Name);
-	TOKENDEF2(TK_Map,			ZCC_MAP,		NAME_map);
-	TOKENDEF2(TK_Array,			ZCC_ARRAY,		NAME_array);
+	TOKENDEF2(TK_Map,			ZCC_MAP,		NAME_Map);
+	TOKENDEF2(TK_Array,			ZCC_ARRAY,		NAME_Array);
 	TOKENDEF (TK_Void,			ZCC_VOID);
 	TOKENDEF (TK_True,			ZCC_TRUE);
 	TOKENDEF (TK_False,			ZCC_FALSE);
@@ -130,7 +130,7 @@ static void InitTokenMap()
 	TOKENDEF (TK_Else,			ZCC_ELSE);
 	TOKENDEF (TK_Switch,		ZCC_SWITCH);
 	TOKENDEF (TK_Case,			ZCC_CASE);
-	TOKENDEF2(TK_Default,		ZCC_DEFAULT,	NAME_default);
+	TOKENDEF2(TK_Default,		ZCC_DEFAULT,	NAME_Default);
 	TOKENDEF (TK_Const,			ZCC_CONST);
 	TOKENDEF (TK_Stop,			ZCC_STOP);
 	TOKENDEF (TK_Wait,			ZCC_WAIT);