diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml
index cfa4354abca..aecb13d1eab 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml
@@ -11,7 +11,7 @@
     mayTransfer: true
     whitelist:
       tags:
-        - ArtilleryGrenade #Sunrise-edit
+        - ArtilleryShell #Sunrise-edit
     capacity: 5
     soundRack:
       path: /Audio/Weapons/Guns/Bolt/lmg_bolt_closed.ogg
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index d901107096b..ae7022fbfeb 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -390,9 +390,9 @@
       - BoxShotgunUranium
       - BoxShellTranquilizer
       - ExplosivePayload
-      - GrenadeBlast
-      - GrenadeEMP
-      - GrenadeFlash
+      - ShellBlastArtillery #Sunrise-edit
+      - ShellEMPArtillery #Sunrise-edit
+      - ShellFlashArtillery #Sunrise-edit
       - HoloprojectorSecurity
       - MagazineBoxLightRifleIncendiary
       - MagazineBoxLightRifleUranium
@@ -864,9 +864,9 @@
       - ClothingBackpackElectropack
       - ExplosivePayload
       - FlashPayload
-      - GrenadeBlast
-      - GrenadeEMP
-      - GrenadeFlash
+      - ShellBlastArtillery #Sunrise-edit
+      - ShellEMPArtillery #Sunrise-edit
+      - ShellFlashArtillery #Sunrise-edit
       - HoloprojectorSecurity
       - MagazineBoxLightRifleIncendiary
       - MagazineBoxLightRifleUranium
diff --git a/Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml
index 629e8bad53c..018b40447f9 100644
--- a/Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml
@@ -3006,7 +3006,7 @@
 - type: listing
   id: UplinkSunrisePlayerBorgGeneric
   name: uplink-sunrise-player-borg-generic-name
-  productEntity: PlayerBorgGeneric
+  productEntity: BorgChassisGeneric
   cost:
     Suntick: 100
   categories:
diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml
index ccdfcb2bce8..76829f607a8 100644
--- a/Resources/Prototypes/borg_types.yml
+++ b/Resources/Prototypes/borg_types.yml
@@ -90,7 +90,7 @@
   - Supply
   - Science
 
-  addComponent:
+  addComponents:
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepCyborgSpider
@@ -133,7 +133,7 @@
   - Science
   - Service
 
-  addComponent:
+  addComponents:
   - type: FootstepModifier
     footstepSoundCollection:
       path: /Audio/Effects/Fluids/watersplash.ogg
@@ -327,7 +327,7 @@
   petFailureString: petting-failure-peace-cyborg
 
 
-# Peace borg
+# Clown borg
 - type: borgType
   id: clown