diff --git a/scripts/buildAssets/definitions.ts b/scripts/buildAssets/definitions.ts
index 0041d08c8..05214e20c 100644
--- a/scripts/buildAssets/definitions.ts
+++ b/scripts/buildAssets/definitions.ts
@@ -334,7 +334,9 @@ export async function buildDefinitions(production: boolean) {
               ? strings[tank.shortUserString]
               : undefined) ??
             strings[tank.userString] ??
-            tankKey.replaceAll('_', ' '),
+            tankKey
+              .replaceAll('_', ' ')
+              .replace(/^[A-Z]+([a-z]+)?([0-9]+)? /, ''),
           nation,
           tree_type: (tank.sellPrice ? 'gold' in tank.sellPrice : false)
             ? 'collector'
@@ -353,6 +355,10 @@ export async function buildDefinitions(production: boolean) {
           turrets: [],
         };
 
+        if (strings[tank.userString] !== tankDefinitions[tankId].name) {
+          tankDefinitions[tankId].name_full = strings[tank.userString];
+        }
+
         modelDefinitions[tankId] = {
           armor: hullArmor,
           trackThickness:
diff --git a/src/core/blitzkrieg/tankDefinitions.ts b/src/core/blitzkrieg/tankDefinitions.ts
index 96a083d6e..fe1ea649f 100644
--- a/src/core/blitzkrieg/tankDefinitions.ts
+++ b/src/core/blitzkrieg/tankDefinitions.ts
@@ -17,6 +17,7 @@ export interface TankDefinition {
   id: number;
   nation: string;
   name: string;
+  name_full?: string;
   tree_type: TreeTypeString;
   tier: Tier;
   type: TankType;