diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/storage/duffelbag.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/storage/duffelbag.ftl
new file mode 100644
index 00000000000..3f96665bd5a
--- /dev/null
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/storage/duffelbag.ftl
@@ -0,0 +1,20 @@
+ent-ClothingBackpackDuffelWeaponSubMachineGunWt550Filled = Bundle WT550
+.desc = WT550 with 3 raspy magazines.
+ent-ClothingBackpackDuffelWeaponSubMachineGunMP5Filled = Bundle MP5
+.desc = Mp5 with 2 raspy magazines.
+ent-ClothingBackpackDuffelWeaponRifleLecterFilled = Bundle Lecter
+.desc = Lecter with 3 raspy magazines.
+ent-ClothingBackpackDuffelWeaponSubMachineGunP90Filled = Bundle P-90
+.desc = P-90 with 2 raspy magazines.
+ent-ClothingBackpackDuffelWeaponAMS42Filled = Bundle AMS-42
+.desc = AMS-42 with 3 raspy magazines.
+ent-ClothingBackpackDuffelWeaponShotgunZauerFilled = Bundle Zauer
+.desc = Zauer with 2 raspy magazines. дроби.
+ent-ClothingBackpackDuffelWeaponXM1014Filled = Bundle XM1014
+.desc = XM1014 with 1 Box ammo.
+ent-ClothingBackpackDuffelWeaponShotgun12Filled = Bundle LAW-12
+.desc = LAW-12 with 1 Box ammo.
+ent-ClothingBackpackDuffelWeaponRifleBR64Filled = Bundle BR-64
+.desc = BR-64 with 2 raspy magazines.
+ent-ClothingBackpackDuffelWeaponLightMachineGunMG42 = Bundle MG-342
+.desc = MG-342 with 2 raspy magazines.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_strings/_sunrise/store/ntuplink-catalog.ftl b/Resources/Locale/en-US/_strings/_sunrise/store/ntuplink-catalog.ftl
index 36f7e813401..55a9e839f72 100644
--- a/Resources/Locale/en-US/_strings/_sunrise/store/ntuplink-catalog.ftl
+++ b/Resources/Locale/en-US/_strings/_sunrise/store/ntuplink-catalog.ftl
@@ -5,10 +5,23 @@ ntuplink-mech-teleporter-heavy-desc = contains crate with Marauder.
 ntuplink-mech-teleporter-eliteheavy-name = Teleporter Heavy Elite Mech.
 ntuplink-mech-teleporter-eliteheavy-desc = contains crate with Seraph. for high command only!
 
-ntuplink-mech-powercage-nanotrasen-name = NanoTrasen combat power cage
+ntuplink-mech-powercage-nanotrasen-name = NanoTrasen power cage
 ntuplink-mech-powercage-nanotrasen-desc = A rechargeable power cage for big devices. Increased capacity for increased power levels. Immune to EMP.
 ntuplink-equip-jetpackvoid-name = void jetpack
-ntuplink-equip-jetpackvoid-desc = { ent-JetpackVoid.desc }
 ntuplink-equip-jetpackmini-name = mini jetpack
-ntuplink-equip-jetpackmini-desc = It's a jetpack. It can hold 1.5 L of gas.
-
+ntuplink-equip-jetpack-name = jetpack
+ntuplink-equip-riotshield-name = riot shield
+ntuplink-equip-riotlasershield-name = riot laser shield
+ntuplink-equip-riotbulletshield-name = riot bullet shield
+ntuplink-equip-telescopicshield-name = telescopic shield
+ntuplink-engineering-powercellnt-name = PowerCell NanoTrasen
+ntuplink-gun-bundlewt550-name = Bundle WT550
+ntuplink-gun-bundlemp5-name = Bundle Mp5
+ntuplink-gun-bundlelecter-name = Bundle Lecter
+ntuplink-gun-bundlep90-name = Bundle P-90
+ntuplink-gun-bundleams42-name = Bundle AMS-42
+ntuplink-gun-bundlemg342-name = Bundle MG-342
+ntuplink-gun-bundlebr64-name = Bundle BR-64
+ntuplink-gun-bundlezauer-name = Bundle Zauer
+ntuplink-gun-bundlexm1014-name = Bundle XM1014
+ntuplink-gun-bundlelaw12-name = Bundle Law-12
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/syndicate.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/syndicate.ftl
index c941cd97cb1..31d7b7fcc51 100644
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/syndicate.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/syndicate.ftl
@@ -4,14 +4,14 @@ ent-ExpCollarsKit = Коробка с взрывными ошейниками
 ent-CaselessAmmoKit = Коробка с магазинами для Siar-52
     .desc = Содержит 3 расширеных магазина and 3 базовых магазина для Siar-52
 
-ent-SMGAmmoKit = Коробка с магазинами для c20r
-    .desc = Перезаряжаю! Содержит 8 магазинов для C-20r
+ent-SMGAmmoKit = Коробка с магазинами ПП (.35 Авто)
+    .desc = Перезаряжаю! Содержит 8 магазинов для ПП (.35 Авто)
 
-ent-SMGIncendiaryAmmoKit = Коробка с зажигательными магазинами для c20r
-    .desc = Перезаряжаю! Содержит 8 магазинов для C-20r
+ent-SMGIncendiaryAmmoKit = Коробка с зажигательными магазинами ПП (.35 Авто)
+    .desc = Перезаряжаю! Содержит 8 магазинов для ПП (.35 Авто)
 
-ent-SMGUraniumAmmoKit = Коробка с урановыми магазинами для c20r
-    .desc = Перезаряжаю! Содержит 8 магазинов для C-20r
+ent-SMGUraniumAmmoKit = Коробка с урановыми магазинами ПП (.35 Авто)
+    .desc = Перезаряжаю! Содержит 8 магазинов для ПП (.35 Авто)
 
 ent-ShotGunKit = Коробка с магазинами для Бульдога
     .desc = Перезаряжаю! Содержит 5 магазинов дроби и 3 магазина пуля для Bulldog
diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/storage/duffelbag.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/storage/duffelbag.ftl
new file mode 100644
index 00000000000..2cb46a9ec83
--- /dev/null
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/storage/duffelbag.ftl
@@ -0,0 +1,20 @@
+ent-ClothingBackpackDuffelWeaponSubMachineGunWt550Filled = Набор WT550
+.desc = WT550 c 3мя магазинами.
+ent-ClothingBackpackDuffelWeaponSubMachineGunMP5Filled = Набор MP5
+.desc = Mp5 c 2мя магазинами.
+ent-ClothingBackpackDuffelWeaponRifleLecterFilled = Набор Lecter
+.desc = Lecter c 3мя магазинами.
+ent-ClothingBackpackDuffelWeaponSubMachineGunP90Filled = Набор P-90
+.desc = P-90 c 2мя магазинами.
+ent-ClothingBackpackDuffelWeaponAMS42Filled = Набор AMS-42
+.desc = AMS-42 c 3мя магазинами.
+ent-ClothingBackpackDuffelWeaponShotgunZauerFilled = Набор Zauer
+.desc = Zauer c 2мя магазинами дроби.
+ent-ClothingBackpackDuffelWeaponXM1014Filled = Набор XM1014
+.desc = XM1014 c пачкой патронов дроби.
+ent-ClothingBackpackDuffelWeaponShotgun12Filled = Набор LAW-12
+.desc = LAW-12 c пачкой патронов дроби.
+ent-ClothingBackpackDuffelWeaponRifleBR64Filled = Набор BR-64
+.desc = BR-64 c 2мя магазинами.
+ent-ClothingBackpackDuffelWeaponLightMachineGunMG42 = Набор MG-342
+.desc = MG-342 c 2мя магазинами.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/store/ntuplink-catalog.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/store/ntuplink-catalog.ftl
index 42ac7df8aed..7478a90f421 100644
--- a/Resources/Locale/ru-RU/_strings/_sunrise/store/ntuplink-catalog.ftl
+++ b/Resources/Locale/ru-RU/_strings/_sunrise/store/ntuplink-catalog.ftl
@@ -5,10 +5,23 @@ ntuplink-mech-teleporter-heavy-desc = Содержит ящик с тяжелы
 ntuplink-mech-teleporter-eliteheavy-name = Телепортер Тяжелого Элитного Меха.
 ntuplink-mech-teleporter-eliteheavy-desc = Содержит ящик с лучшим мехом НаноТрейзен. Только для старших Офицеров!
 
-ntuplink-mech-powercage-nanotrasen-name = Боевая энерго ячейка НаноТрейзен
+ntuplink-mech-powercage-nanotrasen-name = Энерго ячейка НаноТрейзен
 ntuplink-mech-powercage-nanotrasen-desc = Перезаряжаемая энергетическая ячейка для больших устройств. Увеличенная ёмкость для увеличенного уровня мощности. Имеет защиту от ЭМИ.
 ntuplink-equip-jetpackvoid-name = пустотный джетпак
-ntuplink-equip-jetpackvoid-desc = { ent-JetpackVoid.desc }
 ntuplink-equip-jetpackmini-name = мини джетпак
-ntuplink-equip-jetpackmini-desc = Это реактивный ранец - джетпак. Вмещает 1,5 Л газа.
-
+ntuplink-equip-jetpack-name = джетпак
+ntuplink-equip-riotshield-name = противоударный щит
+ntuplink-equip-riotlasershield-name = противолазерный щит
+ntuplink-equip-riotbulletshield-name = противопульный щит
+ntuplink-equip-telescopicshield-name = телескопический щит
+ntuplink-engineering-powercellnt-name = Батарея НаноТрейзен
+ntuplink-gun-bundlewt550-name = Набор WT550
+ntuplink-gun-bundlemp5-name = Набор MP-5
+ntuplink-gun-bundlelecter-name = Набор Lecter
+ntuplink-gun-bundlep90-name = Набор P-90
+ntuplink-gun-bundleams42-name = Набор AMS-42
+ntuplink-gun-bundlemg342-name = Набор MG-342
+ntuplink-gun-bundlebr64-name = Набор BR-64
+ntuplink-gun-bundlezauer-name = Набор Zauer
+ntuplink-gun-bundlexm1014-name = Набор XM1014
+ntuplink-gun-bundlelaw12-name = Набор Law-12
diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
index 03832f626d9..a364c88cb52 100644
--- a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
+++ b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
@@ -229,7 +229,6 @@
     shoes: ClothingShoesBootsMagAdv
     mask: ClothingMaskGasERT
     eyes: ClothingEyesHudDiagnosticERT # Sunrise-edit
-    eyes: ClothingEyesHudDiagnosticERT # Sunrise-edit
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTEngineer
     id: ERTEngineerPDA
diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml
index 8e77b8b6fbc..4ea61e403cc 100644
--- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml
@@ -14,8 +14,8 @@
 - type: entity
   id: ClothingBackpackDuffelWeaponSubMachineGunWt550Filled
   parent: ClothingBackpackDuffelMilitary
-  name: bundle WT550
-  description: Содержит WT550 и 3 обоймы.
+  name: Bundle WT550
+  description: WT550 with 3 raspy magazines.
   components:
   - type: StorageFill
     contents:
@@ -26,8 +26,8 @@
 - type: entity
   id: ClothingBackpackDuffelWeaponSubMachineGunMP5Filled
   parent: ClothingBackpackDuffelMilitary
-  name: Набор MP5
-  description: Содержит MP5 и две обоймы.
+  name: Bundle MP5
+  description: MP5 with 2 raspy magazines.
   components:
   - type: StorageFill
     contents:
@@ -40,8 +40,8 @@
 - type: entity
   id: ClothingBackpackDuffelWeaponRifleLecterFilled
   parent: ClothingBackpackDuffelMilitary
-  name: bundle Lecter
-  description: Содержит Lecter и 3 обоймы.
+  name: Bundlelecter
+  description: Lecter with 3 raspy magazines.
   components:
     - type: StorageFill
       contents:
@@ -52,8 +52,8 @@
 - type: entity
   id: ClothingBackpackDuffelWeaponSubMachineGunP90Filled
   parent: ClothingBackpackDuffelMilitary
-  name: bundle P-90
-  description: Содержит P-90 и 2 обоймы.
+  name: Bundle p90
+  description: P-90 with 2 raspy magazines.
   components:
     - type: StorageFill
       contents:
@@ -64,8 +64,8 @@
 - type: entity
   id: ClothingBackpackDuffelWeaponAMS42Filled
   parent: ClothingBackpackDuffelMilitary
-  name: Набор AMS-42
-  description: Содержит AMS-42 и 3 обоймы.
+  name: Bundle ams42
+  description: AMS-42 with 3 raspy magazines.
   components:
     - type: StorageFill
       contents:
@@ -76,8 +76,8 @@
 - type: entity
   id: ClothingBackpackDuffelWeaponShotgunZauerFilled
   parent: ClothingBackpackDuffelMilitary
-  name: Набор Zauer
-  description: Содержит Zauer и две обоймы.
+  name: Bundle zauer
+  description: Zauer with 2 raspy magazines.
   components:
     - type: StorageFill
       contents:
@@ -88,8 +88,8 @@
 - type: entity
   id: ClothingBackpackDuffelWeaponXM1014Filled
   parent: ClothingBackpackDuffelMilitary
-  name: Набор XM1014
-  description: XM1014 и одну обойму.
+  name: Bundle xm1014
+  description: XM1014 with 1 Box ammo.
   components:
     - type: StorageFill
       contents:
@@ -100,8 +100,8 @@
 - type: entity
   id: ClothingBackpackDuffelWeaponShotgun12Filled
   parent: ClothingBackpackDuffelMilitary
-  name: Набор LAW-12
-  description: Содержит LAW-12 и коробку ружейных патрон.
+  name: Bundle law12
+  description: Law-12 with 1 Box ammo.
   components:
     - type: StorageFill
       contents:
@@ -112,8 +112,8 @@
 - type: entity
   id: ClothingBackpackDuffelWeaponRifleBR64Filled
   parent: ClothingBackpackDuffelMilitary
-  name: Набор BR-64
-  description: Содержит BR-64 и две обоймы.
+  name: Bundle br64
+  description: BR64 with 2 raspy magazines.
   components:
     - type: StorageFill
       contents:
@@ -124,8 +124,8 @@
 - type: entity
   id: ClothingBackpackDuffelWeaponLightMachineGunMG42
   parent: ClothingBackpackDuffelMilitary
-  name: Набор MG-342
-  description: Содержит пулемет MG-342 и 2 барабанных магазина.
+  name: Bundle mg342
+  description: MG-342 with 2 raspy magazines.
   components:
     - type: StorageFill
       contents:
diff --git a/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml
index d3be8472046..4c584f3f665 100644
--- a/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml
@@ -1,7 +1,7 @@
 # Автоматы:
 - type: listing
   id: NTUplinkSunriseClothingBackpackDuffelWeaponSubMachineGunWt550Filled
-  name: bundle WT550
+  name: ntuplink-gun-bundlewt550-name
   productEntity: ClothingBackpackDuffelWeaponSubMachineGunWt550Filled
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: wt550 }
   cost:
@@ -14,7 +14,7 @@
 
 - type: listing
   id: NTUplinkSunriseClothingBackpackDuffelWeaponSubMachineGunMP5
-  name: bundle MP5
+  name: ntuplink-gun-bundlemp5-name
   productEntity: ClothingBackpackDuffelWeaponSubMachineGunMP5Filled
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mp5 }
   cost:
@@ -27,7 +27,7 @@
 
 - type: listing
   id: NTUplinkSunriseClothingBackpackDuffelWeaponRifleLecter
-  name: bundle Lecter
+  name: ntuplink-gun-bundlelecter-name
   productEntity: ClothingBackpackDuffelWeaponRifleLecterFilled
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: lecter }
   cost:
@@ -40,7 +40,7 @@
 
 - type: listing
   id: NTUplinkSunriseClothingBackpackDuffelWeaponSubMachineGunP90
-  name: bundle P-90
+  name: ntuplink-gun-bundlep90-name
   productEntity: ClothingBackpackDuffelWeaponSubMachineGunP90Filled
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: p90 }
   cost:
@@ -53,7 +53,7 @@
 
 - type: listing
   id: NTUplinkSunriseClothingBackpackDuffelWeaponAMS42Filled
-  name: bundle AMS-42
+  name: ntuplink-gun-bundleams42-name
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: ams42 }
   productEntity: ClothingBackpackDuffelWeaponAMS42Filled
   cost:
@@ -66,7 +66,7 @@
 
 - type: listing
   id: NTUplinkSunriseClothingBackpackDuffelWeaponLightMachineGunMG42
-  name: Bundle MG-342
+  name: ntuplink-gun-bundlemg342-name
   productEntity: ClothingBackpackDuffelWeaponLightMachineGunMG42
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mg42 }
   cost:
@@ -79,7 +79,7 @@
 
 - type: listing
   id: NTUplinkSunriseClothingBackpackDuffelWeaponRifleBR64Filled
-  name: BR-64 Bundle
+  name: ntuplink-gun-bundlebr64-name
   productEntity: ClothingBackpackDuffelWeaponRifleBR64Filled
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: br64 }
   cost:
@@ -92,7 +92,7 @@
 
 - type: listing
   id: NTUplinkSunriseClothingBackpackDuffelWeaponShotgunZauer
-  name: bundle Zauer
+  name: ntuplink-gun-bundlezauer-name
   productEntity: ClothingBackpackDuffelWeaponShotgunZauerFilled
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: zauer }
   cost:
@@ -105,7 +105,7 @@
 
 - type: listing
   id: NTUplinkSunriseClothingBackpackDuffelWeaponXM1014
-  name: bundle XM1014
+  name: ntuplink-gun-bundlexm1014-name
   productEntity: ClothingBackpackDuffelWeaponXM1014Filled
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: xm1014 }
   cost:
@@ -118,7 +118,7 @@
 
 - type: listing
   id: NTUplinkSunriseClothingBackpackDuffelWeaponShotgun12
-  name: bundle LAW-12
+  name: ntuplink-gun-bundlelaw12-name
   productEntity: ClothingBackpackDuffelWeaponShotgun12Filled
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: spas12 }
   cost:
@@ -132,7 +132,6 @@
 # Лазеры:
 - type: listing
   id: NTUplinkSunriseWeaponWeaponPulseRifle
-  name: Heavy Pulse Rifle
   productEntity: WeaponPulseRifle
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: pulse-r }
   cost:
@@ -145,7 +144,6 @@
 
 - type: listing
   id: NTUplinkSunriseWeaponSniperPulseCarbine
-  name: Heavy Pulse Carbine
   productEntity: WeaponSniperPulseCarbine
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: pulse-sc }
   cost:
@@ -158,7 +156,6 @@
 
 - type: listing
   id: NTUplinkSunriseWeaponIONRifle
-  name: ION Rifle
   productEntity: WeaponIONRifle
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: ion-r }
   cost:
@@ -171,7 +168,6 @@
 
 - type: listing
   id: NTUplinkSunriseWeaponPulseCarbine
-  name: Pulse Carbine
   productEntity: WeaponPulseCarbine
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: pulse-c }
   cost:
@@ -184,7 +180,6 @@
 
 - type: listing
   id: NTUplinkSunriseWeaponEnergyGunTactical
-  name: Energy Gun Tactical
   productEntity: WeaponEnergyGunTactical
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: energygun_tac }
   cost:
@@ -197,7 +192,6 @@
 
 - type: listing
   id: NTUplinkSunriseWeaponWeaponEnergyGun
-  name: Energy Gun
   productEntity: WeaponEnergyGun
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: energygun }
   cost:
@@ -212,7 +206,6 @@
 
 - type: listing
   id: NTUplinkSunriseWeaponPulsePistol
-  name: Pulse Pistol
   productEntity: WeaponPulsePistol
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: pulse-p }
   cost:
@@ -225,7 +218,6 @@
 
 - type: listing
   id: NTUplinkSunriseWeaponEnergyGunPistolSecurity
-  name: Energy Gun "Judge"
   productEntity: WeaponEnergyGunPistolSecurity
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: energygun-psec }
   cost:
@@ -252,7 +244,6 @@
 # Боеприпасы:
 - type: listing
   id: NTUplinkSunriseBoxMagazineSubMachineGunTopMounted
-  name: Box Magazine WT550
   productEntity: BoxMagazinePistolSubMachineGunTopMounted 
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_wt550 }
   cost:
@@ -265,7 +256,6 @@
 
 - type: listing
   id: NTUplinkSunriseBoxMagazineRifle
-  name: Box Magazine (.20 Rifle)
   productEntity: BoxMagazineRifle
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_rifle }
   cost:
@@ -278,7 +268,6 @@
 
 - type: listing
   id: NTUplinkSunriseMagazineMagnum
-  name: Magazine Magnum
   productEntity: MagazineMagnum
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mag_magnum }
   cost:
@@ -291,7 +280,6 @@
 
 - type: listing
   id: NTUplinkSunriseMagazineBoxMagnumIncendiary
-  name: Box Magnum (Incendiary)
   productEntity: MagazineBoxMagnumIncendiary
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_magnum_ince }
   cost:
@@ -304,7 +292,6 @@
 
 - type: listing
   id: NTUplinkSunriseMagazineBoxMagnumUranium
-  name: Box Magnum (Uranium)
   productEntity: MagazineBoxMagnumUranium
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_magnum_uran }
   cost:
@@ -317,7 +304,6 @@
 
 - type: listing
   id: NTUplinkSunriseMagazineP90
-  name: Magazine P90
   productEntity: MagazineP90
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mag_p90 }
   cost:
@@ -330,7 +316,6 @@
 
 - type: listing
   id: NTUplinkSunriseSMGAmmoKit
-  name: SMG Ammo Kit
   productEntity: SMGAmmoKit
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_smg }
   cost:
@@ -343,7 +328,6 @@
 
 - type: listing
   id: NTUplinkSunriseSMGIncendiaryAmmoKit
-  name: SMG Ammo Kit (Incendiary)
   productEntity: SMGIncendiaryAmmoKit
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_smg_red }
   cost:
@@ -356,7 +340,6 @@
 
 - type: listing
   id: NTUplinkSunriseSMGUraniumAmmoKit
-  name: SMG Ammo Kit (Uranium)
   productEntity: SMGUraniumAmmoKit
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_smg_uran }
   cost:
@@ -369,7 +352,6 @@
 
 - type: listing
   id: NTUplinkSunriseBoxMagazineShotgun
-  name: Box Magazine Shotgun (.50 pellet)
   productEntity: BoxMagazineShotgun
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_shot }
   cost:
@@ -382,7 +364,6 @@
 
 - type: listing
   id: NTUplinkSunriseBoxMagazineShotgunIncendiary
-  name: Box Magazine Shotgun (.50 Incendiary)
   productEntity: BoxMagazineShotgunIncendiary
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_shot_red }
   cost:
@@ -395,7 +376,6 @@
 
 - type: listing
   id: NTUplinkSunriseBoxMagazineShotgunSlug
-  name: Box Magazine Shotgun (.50 Slug )
   productEntity: BoxMagazineShotgunSlug
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_shot_slug }
   cost:
@@ -408,7 +388,6 @@
 
 - type: listing
   id: NTUplinkSunriseBoxMagazineShotgunBeanbag
-  name: Box Magazine Shotgun (.50 Beanbag)
   productEntity: BoxMagazineShotgunBeanbag
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_shot }
   cost:
@@ -421,7 +400,6 @@
 
 - type: listing
   id: NTUplinkSunriseMagazineBR64
-  name: Magazine BR-64 Extended
   productEntity: MagazineBR64
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mag_br64 }
   cost:
@@ -434,7 +412,6 @@
 
 - type: listing
   id: NTUplinkSunriseMagazineMachineGunMG42
-  name: Ammo MG-342
   productEntity: MagazineMachineGunMG42
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mag_mg342 }
   cost:
@@ -448,7 +425,6 @@
 # Медицина:
 - type: listing
   id: NTUplinkSunriseMaterialBiomass
-  name: Biomass
   productEntity: MaterialBiomass
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: monkeycube }
   cost:
@@ -461,7 +437,6 @@
 
 - type: listing
   id: NTUplinkSunriseDefibrillator
-  name: Compact Defibrillator
   productEntity: DefibrillatorCompact
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: comp_defib }
   cost:
@@ -474,7 +449,6 @@
 
 - type: listing
   id: NTUplinkSunriseMedkitOxygenFilled
-  name: Medkit Oxygen
   productEntity: MedkitOxygenFilled
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: med-oxygen }
   cost:
@@ -487,7 +461,6 @@
 
 - type: listing
   id: NTUplinkSunriseMedkitBruteFilled
-  name: Medkit Brute
   productEntity: MedkitBruteFilled
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: med-brute }
   cost:
@@ -500,7 +473,6 @@
 
 - type: listing
   id: NTUplinkSunriseMedkitRadiationFilled
-  name: Medkit Radiation
   productEntity: MedkitRadiationFilled
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: med-rad }
   cost:
@@ -513,7 +485,6 @@
 
 - type: listing
   id: NTUplinkSunriseMedkitToxinFilled
-  name: Medkit Toxin
   productEntity: MedkitToxinFilled
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: med-toxin }
   cost:
@@ -526,7 +497,6 @@
 
 - type: listing
   id: NTUplinkSunriseMedkitBurnFilled
-  name: Medkit Burn
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: med-burn }
   productEntity: MedkitBurnFilled
   cost:
@@ -539,7 +509,6 @@
 
 - type: listing
   id: NTUplinkSunriseMedkitCombatFilled
-  name: Medkit Combat
   productEntity: MedkitCombatFilled
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: med-black }
   cost:
@@ -554,7 +523,6 @@
 
 - type: listing
   id: NTUplinkSunriseMindShieldImplants
-  name: MindShield Implants
   productEntity: CrateMindShieldImplants
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: crate_med }
   cost:
@@ -567,7 +535,6 @@
 
 - type: listing
   id: NTUplinkSunriseBoxMRE
-  name: MRE
   productEntity: BoxMRE
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_mre }
   cost:
@@ -580,7 +547,6 @@
 
 - type: listing
   id: NTUplinkSunriseBoxHandcuff
-  name: Box Handcuff
   productEntity: BoxHandcuff
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_handcuffs }
   cost:
@@ -593,7 +559,6 @@
 
 - type: listing
   id: NTUplinkSunriseBoxFlashbang
-  name: Box Flash bang
   productEntity: BoxFlashbang
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_flashbangs }
   cost:
@@ -606,7 +571,6 @@
 
 - type: listing
   id: NTUplinkSunriseFlash
-  name: Flash
   productEntity: Flash
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: flash }
   cost:
@@ -619,7 +583,6 @@
 
 - type: listing
   id: NTUplinkSunriseStunbaton
-  name: Stunbaton
   productEntity: Stunbaton
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: stunbaton }
   cost:
@@ -634,7 +597,6 @@
 
 - type: listing
   id: NTUplinkSunrisePestSpray
-  name: PestSpray
   productEntity: PestSpray
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: pest_spray }
   cost:
@@ -647,7 +609,6 @@
 
 - type: listing
   id: NTUplinkSunriseWeedSpray
-  name: WeedSpray
   productEntity: WeedSpray
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: weed_spray }
   cost:
@@ -660,7 +621,6 @@
 
 - type: listing
   id: NTUplinkSunriseSprayBottleSpaceCleaner
-  name: Spray SpaceCleaner
   productEntity: SprayBottleSpaceCleaner
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: cleaner }
   cost:
@@ -673,7 +633,6 @@
 
 - type: listing
   id: NTUplinkSunriseTrashBagBlue
-  name: TrashBag
   productEntity: TrashBagBlue
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: trash_bag_blue }
   cost:
@@ -686,7 +645,6 @@
 
 - type: listing
   id: NTUplinkSunriseBoxBodyBag
-  name: Box Body Bag
   productEntity: BoxBodyBag
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_bodybags }
   cost:
@@ -699,7 +657,6 @@
 
 - type: listing
   id: NTUplinkSunriseAdvMopItem
-  name: Adv Mop
   productEntity: AdvMopItem
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: adv-mop }
   cost:
@@ -713,7 +670,6 @@
 # Инженерия
 - type: listing
   id: NTUplinkSunriseBoxLightMixed
-  name: Box Light Mixed
   productEntity: BoxLightMixed
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_light }
   cost:
@@ -726,7 +682,6 @@
 
 - type: listing
   id: NTUplinkSunriseJawsOfLife
-  name: JawsOfLife
   productEntity: JawsOfLife
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: jaws }
   cost:
@@ -739,7 +694,6 @@
 
 - type: listing
   id: NTUplinkSunriseOmnitool
-  name: Omnitool
   productEntity: Omnitool
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: omnitool }
   cost:
@@ -752,7 +706,6 @@
 
 - type: listing
   id: NTUplinkSunrisePowerCellHigh
-  name: Power Cell High
   productEntity: PowerCellHigh
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: power_cell_high }
   cost:
@@ -765,7 +718,7 @@
 
 - type: listing
   id: NTUplinkSunrisePowerCellNanoTrasen
-  name: Power Cell NanoTrasen
+  name: ntuplink-engineering-powercellnt-name
   productEntity: PowerCellNanoTrasen
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: power_cell_nt }
   cost:
@@ -778,7 +731,6 @@
 
 - type: listing
   id: NTUplinkSunriseNetworkConfigurator
-  name: Network Configurator
   productEntity: NetworkConfigurator
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: network_configurator }
   cost:
@@ -791,7 +743,6 @@
 
 - type: listing
   id: NTUplinkSunriseMultitool
-  name: Multitool
   productEntity: Multitool
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: multitool }
   cost:
@@ -805,7 +756,7 @@
 # Экипировка:
 - type: listing
   id: NTUplinkSunriseTelescopicShield
-  name: Telescopic Shield
+  name: ntuplink-equip-telescopicshield-name
   productEntity: TelescopicShield
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: telescopic_shield }
   cost:
@@ -818,7 +769,7 @@
 
 - type: listing
   id: NTUplinkSunriseRiotBulletShield
-  name: Riot Bullet Shield
+  name: ntuplink-equip-riotbulletshield-name
   productEntity: RiotBulletShield
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: riot_bullet_shield }
   cost:
@@ -831,7 +782,7 @@
 
 - type: listing
   id: NTUplinkSunriseRiotLaserShield
-  name: Riot Laser Shield
+  name: ntuplink-equip-riotlasershield-name
   productEntity: RiotLaserShield
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: riot_laser_shield }
   cost:
@@ -844,7 +795,7 @@
 
 - type: listing
   id: NTUplinkSunriseRiotShield
-  name: Riot Shield
+  name: ntuplink-equip-riotshield-name
   productEntity: RiotShield
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: riot_shield }
   cost:
@@ -857,7 +808,7 @@
 
 - type: listing
   id: NTUplinkSunriseJetpackBlueFilled
-  name: Jetpack
+  name: ntuplink-equip-jetpack-name
   productEntity: JetpackBlueFilled
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: jet_blue }
   cost:
@@ -870,7 +821,7 @@
 
 - type: listing
   id: NTUplinkSunriseJetpackMiniFilled
-  name: Jetpack Mini
+  name: ntuplink-equip-jetpackmini-name
   productEntity: JetpackMiniFilled
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mini_jet }
   cost: