diff --git a/LEGO1/legovehiclebuildstate.cpp b/LEGO1/legovehiclebuildstate.cpp
index dc44cadc..12e862a1 100644
--- a/LEGO1/legovehiclebuildstate.cpp
+++ b/LEGO1/legovehiclebuildstate.cpp
@@ -9,17 +9,17 @@ DECOMP_SIZE_ASSERT(LegoVehicleBuildState::UnkStruct, 0xc);
 LegoVehicleBuildState::LegoVehicleBuildState(char* p_classType)
 {
   this->m_className = p_classType;
-  this->m_unk2 = 0;
-  this->m_unk3 = 0;
-  this->m_unk4 = 0;
+  this->m_unk4c = 0;
+  this->m_unk4d = 0;
+  this->m_unk4e = 0;
   this->m_placedPartCount = 0;
 }
 
 // OFFSET: LEGO1 10017c00
 LegoVehicleBuildState::UnkStruct::UnkStruct()
 {
-  m_unk1 = 0;
-  m_unk0 = 0;
-  m_unk2 = 0;
-  m_unk3 = 0;
+  m_unk04 = 0;
+  m_unk00 = 0;
+  m_unk06 = 0;
+  m_unk08 = 0;
 }
diff --git a/LEGO1/legovehiclebuildstate.h b/LEGO1/legovehiclebuildstate.h
index 66c8388b..c3c2aae2 100644
--- a/LEGO1/legovehiclebuildstate.h
+++ b/LEGO1/legovehiclebuildstate.h
@@ -29,16 +29,15 @@ class LegoVehicleBuildState : public LegoState
 public:
   struct UnkStruct
   {
-    undefined4 m_unk0;
-    undefined2 m_unk1;
-    undefined2 m_unk2;
-    undefined2 m_unk3;
-    undefined2 _padding;
+    undefined4 m_unk00;
+    undefined2 m_unk04;
+    undefined2 m_unk06;
+    undefined2 m_unk08;
 
     UnkStruct();
   };
 private:
-  UnkStruct m_unk0[4]; // 0x08
+  UnkStruct m_unk08[4]; // 0x08
 
   // This can be one of the following:
   // * LegoRaceCarBuildState
@@ -52,9 +51,9 @@ class LegoVehicleBuildState : public LegoState
   // * 3 == cutscene/dialogue
   // * 6 == exit(ing) build screen
   MxU32 m_animationState; // 0x48
-  undefined m_unk2; // 0x4c
-  undefined m_unk3; // 0x4d
-  undefined m_unk4; // 0x4e
+  undefined m_unk4c; // 0x4c
+  undefined m_unk4d; // 0x4d
+  undefined m_unk4e; // 0x4e
   MxU8 m_placedPartCount; // 0x4f
 };