diff --git a/scripts/buildAssets.ts b/scripts/buildAssets.ts
index 8131fb517..6a31a04b9 100644
--- a/scripts/buildAssets.ts
+++ b/scripts/buildAssets.ts
@@ -231,7 +231,7 @@ if (allTargets || targets?.includes('definitions')) {
                   .split(' ')
                   .map(Number) as [number, number],
                 name: strings[gun.userString] ?? gunKey.replaceAll('_', ' '),
-                tier: gun.level,
+                tier: gun.level as Tier,
                 shells: gunShells,
               };
 
@@ -245,7 +245,7 @@ if (allTargets || targets?.includes('definitions')) {
                 turretKey
                   .replaceAll('_', ' ')
                   .replace(/^(Turret ([0-9] )?)+/, ''),
-              tier: turret.level,
+              tier: turret.level as Tier,
               yaw: (typeof turret.yawLimits === 'string'
                 ? turret.yawLimits
                 : turret.yawLimits.at(-1)!
diff --git a/src/app/embeds/session/page.tsx b/src/app/embeds/session/page.tsx
index 181b7e999..279652aee 100644
--- a/src/app/embeds/session/page.tsx
+++ b/src/app/embeds/session/page.tsx
@@ -299,9 +299,7 @@ export default function SessionPage() {
                       key={stats.tank_id}
                       minimized={!session.showCareer}
                       title={
-                        tankDefinitions?.name_short ??
-                        tankDefinitions?.name ??
-                        `Unknown tank ${stats.tank_id}`
+                        tankDefinitions?.name ?? `Unknown tank ${stats.tank_id}`
                       }
                       type="tank"
                       tankType={tankDefinitions?.type}
diff --git a/src/commands/breakdown.tsx b/src/commands/breakdown.tsx
index bd843f41e..fe05523db 100644
--- a/src/commands/breakdown.tsx
+++ b/src/commands/breakdown.tsx
@@ -8,7 +8,6 @@ import { AllStats, getAccountInfo } from '../core/blitz/getAccountInfo';
 import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
 import getTankStats from '../core/blitz/getTankStats';
 import getTreeType from '../core/blitz/getTreeType';
-import resolveTankName from '../core/blitz/resolveTankName';
 import { tankDefinitions } from '../core/blitzkrieg/definitions/tanks';
 import { filtersToDescription } from '../core/blitzkrieg/filtersToDescription';
 import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
@@ -195,7 +194,7 @@ async function render(
             type="tank"
             tankType={tankDefinition?.type}
             treeType={tankDefinition ? await getTreeType(id) : undefined}
-            title={await resolveTankName(id)}
+            title={awaitedTankDefinitions[id].name}
             stats={[
               {
                 title: 'Battles',
diff --git a/src/commands/ownedTanks.tsx b/src/commands/ownedTanks.tsx
index 00fb6f345..e92e628bf 100644
--- a/src/commands/ownedTanks.tsx
+++ b/src/commands/ownedTanks.tsx
@@ -8,7 +8,6 @@ import { getAccountInfo } from '../core/blitz/getAccountInfo';
 import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
 import getTankStats from '../core/blitz/getTankStats';
 import getTreeType from '../core/blitz/getTreeType';
-import resolveTankName from '../core/blitz/resolveTankName';
 import {
   BlitzkriegTankDefinition,
   TIER_ROMAN_NUMERALS,
@@ -96,7 +95,7 @@ export const ownedTanksCommand: CommandRegistry = {
                         leftColumn.map(async (tank) => (
                           <Tanks.Item
                             key={tank.id}
-                            name={await resolveTankName(tank.id)}
+                            name={tank.name}
                             tankType={tank.type}
                             image={tankIcon(tank.id)}
                             treeType={await getTreeType(tank.id)}
@@ -109,7 +108,7 @@ export const ownedTanksCommand: CommandRegistry = {
                         rightColumn.map(async (tank) => (
                           <Tanks.Item
                             key={tank.id}
-                            name={await resolveTankName(tank.id)}
+                            name={tank.name}
                             tankType={tank.type}
                             image={tankIcon(tank.id)}
                             treeType={await getTreeType(tank.id)}
diff --git a/src/core/blitz/resolveTankName.ts b/src/core/blitz/resolveTankName.ts
deleted file mode 100644
index b08e8ad0a..000000000
--- a/src/core/blitz/resolveTankName.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { tankDefinitions } from '../blitzkrieg/definitions/tanks';
-
-export default async function resolveTankName(tankId: number) {
-  const awaitedTankDefinitions = await tankDefinitions;
-  const entry = awaitedTankDefinitions[tankId];
-
-  return entry?.name_short ?? entry?.name ?? `Unknown Tank ${tankId}`;
-}
diff --git a/src/core/blitzkrieg/filtersToDescription.ts b/src/core/blitzkrieg/filtersToDescription.ts
index 949cb8fe5..c7963b5e4 100644
--- a/src/core/blitzkrieg/filtersToDescription.ts
+++ b/src/core/blitzkrieg/filtersToDescription.ts
@@ -1,8 +1,11 @@
 import { TREE_TYPE_NAMES } from '../../components/Tanks';
 import { encyclopediaInfo } from '../blitz/encyclopediaInfo';
-import resolveTankName from '../blitz/resolveTankName';
 import { StatFilters } from '../statistics/filterStats';
-import { TIER_ROMAN_NUMERALS, Tier } from './definitions/tanks';
+import {
+  TIER_ROMAN_NUMERALS,
+  Tier,
+  tankDefinitions,
+} from './definitions/tanks';
 
 export async function filtersToDescription({
   nation,
@@ -12,9 +15,10 @@ export async function filtersToDescription({
   tank,
 }: StatFilters) {
   const awaitedEncyclopediaInfo = await encyclopediaInfo;
+  const awaitedTankDefinitions = await tankDefinitions;
   const info: string[] = [];
 
-  if (tank) return await resolveTankName(tank);
+  if (tank) return awaitedTankDefinitions[tank].name;
   if (nation) info.push(awaitedEncyclopediaInfo.vehicle_nations[nation]);
   if (tier) info.push(`Tier ${TIER_ROMAN_NUMERALS[tier as Tier]}`);
   if (tankType) info.push(awaitedEncyclopediaInfo.vehicle_types[tankType]);