diff --git a/assets/js/hooks/Mapper/components/map/constants.ts b/assets/js/hooks/Mapper/components/map/constants.ts
index b0a2ac4b..5e20f0d7 100644
--- a/assets/js/hooks/Mapper/components/map/constants.ts
+++ b/assets/js/hooks/Mapper/components/map/constants.ts
@@ -217,7 +217,7 @@ export const WORMHOLES_ADDITIONAL_INFO_RAW: WormholesAdditionalInfoType[] = [
     wormholeClassID: 14,
     effectPower: 2,
     title: 'Class 14 (Sentinel Drifter)',
-    shortTitle: 'Sentinel',
+    shortTitle: 'Sentinel MZ',
   },
   {
     id: 'barbican',
@@ -225,7 +225,7 @@ export const WORMHOLES_ADDITIONAL_INFO_RAW: WormholesAdditionalInfoType[] = [
     wormholeClassID: 15,
     effectPower: 2,
     title: 'Class 15 (Barbican Drifter)',
-    shortTitle: 'Barbican',
+    shortTitle: 'Liberated Barbican',
   },
   {
     id: 'vidette',
@@ -233,7 +233,7 @@ export const WORMHOLES_ADDITIONAL_INFO_RAW: WormholesAdditionalInfoType[] = [
     wormholeClassID: 16,
     effectPower: 2,
     title: 'Class 16 (Vidette Drifter)',
-    shortTitle: 'Vidette',
+    shortTitle: 'Sanctified Vidette',
   },
   {
     id: 'conflux',
@@ -241,7 +241,7 @@ export const WORMHOLES_ADDITIONAL_INFO_RAW: WormholesAdditionalInfoType[] = [
     wormholeClassID: 17,
     effectPower: 2,
     title: 'Class 17 (Conflux Drifter)',
-    shortTitle: 'Conflux',
+    shortTitle: 'Conflux Eyrie',
   },
   {
     id: 'redoubt',
@@ -249,7 +249,7 @@ export const WORMHOLES_ADDITIONAL_INFO_RAW: WormholesAdditionalInfoType[] = [
     wormholeClassID: 18,
     effectPower: 2,
     title: 'Class 18 (Redoubt Drifter)',
-    shortTitle: 'Redoubt',
+    shortTitle: 'Azdaja Redoubt',
   },
   {
     id: 'a1',
diff --git a/assets/js/hooks/Mapper/components/map/hooks/useSystemName.ts b/assets/js/hooks/Mapper/components/map/hooks/useSystemName.ts
index 9a57b696..87550245 100644
--- a/assets/js/hooks/Mapper/components/map/hooks/useSystemName.ts
+++ b/assets/js/hooks/Mapper/components/map/hooks/useSystemName.ts
@@ -1,10 +1,5 @@
 import { useMemo } from 'react';
 import { SolarSystemStaticInfoRaw } from '@/hooks/Mapper/types';
-import {
-  SOLAR_SYSTEM_CLASS_GROUPS,
-  SOLAR_SYSTEM_CLASSES_TO_CLASS_GROUPS,
-  WORMHOLES_ADDITIONAL_INFO_BY_CLASS_ID,
-} from '@/hooks/Mapper/components/map/constants.ts';
 
 interface UseSystemNameParams {
   isTempSystemNameEnabled: boolean;
@@ -23,19 +18,7 @@ export const useSystemName = ({
   name,
   systemStaticInfo,
 }: UseSystemNameParams) => {
-  const { solar_system_name = '', system_class } = systemStaticInfo;
-
-  const systemPreparedName = useMemo(() => {
-    const { id: whType, shortTitle } = WORMHOLES_ADDITIONAL_INFO_BY_CLASS_ID[system_class];
-
-    // @ts-ignore
-    const spawnClassGroup = SOLAR_SYSTEM_CLASSES_TO_CLASS_GROUPS[whType];
-    if (spawnClassGroup === SOLAR_SYSTEM_CLASS_GROUPS.drifter) {
-      return shortTitle;
-    }
-
-    return solar_system_name;
-  }, [system_class, solar_system_name]);
+  const { solar_system_name = '' } = systemStaticInfo;
 
   const computedTemporaryName = useMemo(() => {
     if (!isTempSystemNameEnabled) {
@@ -43,19 +26,19 @@ export const useSystemName = ({
     }
 
     if (isShowLinkedSigIdTempName && linkedSigPrefix) {
-      return temporary_name ? `${linkedSigPrefix}・${temporary_name}` : `${linkedSigPrefix}・${systemPreparedName}`;
+      return temporary_name ? `${linkedSigPrefix}・${temporary_name}` : `${linkedSigPrefix}・${solar_system_name}`;
     }
 
     return temporary_name ?? '';
-  }, [isTempSystemNameEnabled, temporary_name, systemPreparedName, isShowLinkedSigIdTempName, linkedSigPrefix]);
+  }, [isTempSystemNameEnabled, temporary_name, solar_system_name, isShowLinkedSigIdTempName, linkedSigPrefix]);
 
   const systemName = useMemo(() => {
     if (isTempSystemNameEnabled && computedTemporaryName) {
       return computedTemporaryName;
     }
 
-    return systemPreparedName;
-  }, [isTempSystemNameEnabled, computedTemporaryName, systemPreparedName]);
+    return solar_system_name;
+  }, [isTempSystemNameEnabled, computedTemporaryName, solar_system_name]);
 
   const customName = useMemo(() => {
     if (isTempSystemNameEnabled && computedTemporaryName && name) {
diff --git a/assets/js/hooks/Mapper/components/ui-kit/SystemViewStandalone/SystemViewStandalone.tsx b/assets/js/hooks/Mapper/components/ui-kit/SystemViewStandalone/SystemViewStandalone.tsx
index 4512a90d..954de443 100644
--- a/assets/js/hooks/Mapper/components/ui-kit/SystemViewStandalone/SystemViewStandalone.tsx
+++ b/assets/js/hooks/Mapper/components/ui-kit/SystemViewStandalone/SystemViewStandalone.tsx
@@ -4,12 +4,7 @@ import classes from './SystemViewStandalone.module.scss';
 import clsx from 'clsx';
 import { WithClassName } from '@/hooks/Mapper/types/common.ts';
 import { SolarSystemStaticInfoRaw } from '@/hooks/Mapper/types';
-import { HTMLProps, MouseEvent, useCallback, useMemo } from 'react';
-import {
-  SOLAR_SYSTEM_CLASS_GROUPS,
-  SOLAR_SYSTEM_CLASSES_TO_CLASS_GROUPS,
-  WORMHOLES_ADDITIONAL_INFO_BY_CLASS_ID,
-} from '@/hooks/Mapper/components/map/constants.ts';
+import { HTMLProps, MouseEvent, useCallback } from 'react';
 
 export type SystemViewStandaloneStatic = Pick<
   SolarSystemStaticInfoRaw,
@@ -45,18 +40,6 @@ export const SystemViewStandalone = ({
   const isWH = isWormholeSpace(system_class);
   1;
 
-  const systemPreparedName = useMemo(() => {
-    const { id: whType, shortTitle } = WORMHOLES_ADDITIONAL_INFO_BY_CLASS_ID[system_class];
-
-    // @ts-ignore
-    const spawnClassGroup = SOLAR_SYSTEM_CLASSES_TO_CLASS_GROUPS[whType];
-    if (spawnClassGroup === SOLAR_SYSTEM_CLASS_GROUPS.drifter) {
-      return shortTitle;
-    }
-
-    return solar_system_name;
-  }, [system_class, solar_system_name]);
-
   const handleClick = useCallback(
     (e: MouseEvent) => {
       e.preventDefault();
@@ -79,7 +62,7 @@ export const SystemViewStandalone = ({
           [classes.CompactName]: compact,
         })}
       >
-        {customName ?? systemPreparedName}
+        {customName ?? solar_system_name}
       </span>
       {!hideRegion && !isWH && <span className="whitespace-nowrap">{region_name}</span>}
     </div>
diff --git a/priv/repo/data/wormholeClasses.json b/priv/repo/data/wormholeClasses.json
index e7dec0f0..2204af55 100644
--- a/priv/repo/data/wormholeClasses.json
+++ b/priv/repo/data/wormholeClasses.json
@@ -110,7 +110,7 @@
     "wormholeClassID": 14,
     "effectPower": 2,
     "title": "Class 14 (Sentinel Drifter)",
-    "shortTitle": "Sentinel"
+    "shortTitle": "Sentinel MZ"
   },
   {
     "id": "barbican",
@@ -118,7 +118,7 @@
     "wormholeClassID": 15,
     "effectPower": 2,
     "title": "Class 15 (Barbican Drifter)",
-    "shortTitle": "Barbican"
+    "shortTitle": "Lib. Barbican"
   },
   {
     "id": "vidette",
@@ -126,7 +126,7 @@
     "wormholeClassID": 16,
     "effectPower": 2,
     "title": "Class 16 (Vidette Drifter)",
-    "shortTitle": "Vidette"
+    "shortTitle": "Sanct. Vidette"
   },
   {
     "id": "conflux",
@@ -134,7 +134,7 @@
     "wormholeClassID": 17,
     "effectPower": 2,
     "title": "Class 17 (Conflux Drifter)",
-    "shortTitle": "Conflux"
+    "shortTitle": "Conflux Eyrie"
   },
   {
     "id": "redoubt",
@@ -142,7 +142,7 @@
     "wormholeClassID": 18,
     "effectPower": 2,
     "title": "Class 18 (Redoubt Drifter)",
-    "shortTitle": "Redoubt"
+    "shortTitle": "Azdaja Redoubt"
   },
   {
     "id": "a1",