diff --git a/Source/Core/VideoCommon/XFMemory.h b/Source/Core/VideoCommon/XFMemory.h
@@ -44,13 +44,13 @@ struct fmt::formatter<TexInputForm> : EnumFormatter<TexInputForm::ABC1>
 enum class NormalCount : u32
 {
   None = 0,
-  Normals = 1,
-  NormalsBinormals = 2
+  Normal = 1,
+  NormalTangentBinormal = 2
 };
 template <>
-struct fmt::formatter<NormalCount> : EnumFormatter<NormalCount::NormalsBinormals>
+struct fmt::formatter<NormalCount> : EnumFormatter<NormalCount::NormalTangentBinormal>
 {
-  constexpr formatter() : EnumFormatter({"None", "Normals only", "Normals and binormals"}) {}
+  constexpr formatter() : EnumFormatter({"None", "Normal only", "Normal, tangent, and binormal"}) {}
 };
 
 // Texture generation type
@@ -416,23 +416,23 @@ struct Projection
 
 struct XFMemory
 {
-  float posMatrices[256];    // 0x0000 - 0x00ff
-  u32 unk0[768];             // 0x0100 - 0x03ff
-  float normalMatrices[96];  // 0x0400 - 0x045f
-  u32 unk1[160];             // 0x0460 - 0x04ff
-  float postMatrices[256];   // 0x0500 - 0x05ff
-  Light lights[8];           // 0x0600 - 0x067f
-  u32 unk2[2432];            // 0x0680 - 0x0fff
-  u32 error;                 // 0x1000
-  u32 diag;                  // 0x1001
-  u32 state0;                // 0x1002
-  u32 state1;                // 0x1003
-  u32 xfClock;               // 0x1004
-  ClipDisable clipDisable;   // 0x1005
-  u32 perf0;                 // 0x1006
-  u32 perf1;                 // 0x1007
-  INVTXSPEC hostinfo;        // 0x1008 number of textures,colors,normals from vertex input
-  NumColorChannel numChan;   // 0x1009
+  float posMatrices[256];                   // 0x0000 - 0x00ff
+  u32 unk0[768];                            // 0x0100 - 0x03ff
+  float normalMatrices[96];                 // 0x0400 - 0x045f
+  u32 unk1[160];                            // 0x0460 - 0x04ff
+  float postMatrices[256];                  // 0x0500 - 0x05ff
+  Light lights[8];                          // 0x0600 - 0x067f
+  u32 unk2[2432];                           // 0x0680 - 0x0fff
+  u32 error;                                // 0x1000
+  u32 diag;                                 // 0x1001
+  u32 state0;                               // 0x1002
+  u32 state1;                               // 0x1003
+  u32 xfClock;                              // 0x1004
+  ClipDisable clipDisable;                  // 0x1005
+  u32 perf0;                                // 0x1006
+  u32 perf1;                                // 0x1007
+  INVTXSPEC invtxspec;                      // 0x1008
+  NumColorChannel numChan;                  // 0x1009
   u32 ambColor[NUM_XF_COLOR_CHANNELS];      // 0x100a, 0x100b
   u32 matColor[NUM_XF_COLOR_CHANNELS];      // 0x100c, 0x100d
   LitChannel color[NUM_XF_COLOR_CHANNELS];  // 0x100e, 0x100f

diff --git a/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp b/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp
@@ -330,7 +330,7 @@ TEST_F(VertexLoaderTest, LargeFloatVertexSpeed)
 
   m_vtx_attr.g0.PosElements = CoordComponentCount::XYZ;
   m_vtx_attr.g0.PosFormat = ComponentFormat::Float;
-  m_vtx_attr.g0.NormalElements = NormalComponentCount::NBT;
+  m_vtx_attr.g0.NormalElements = NormalComponentCount::NTB;
   m_vtx_attr.g0.NormalFormat = ComponentFormat::Float;
   m_vtx_attr.g0.Color0Elements = ColorComponentCount::RGBA;
   m_vtx_attr.g0.Color0Comp = ColorFormat::RGBA8888;