diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
index be07fb839b..b1fde218b2 100644
--- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
@@ -196,9 +196,9 @@ ghost-role-information-behonker-description = You are an antagonist, bring death
 ghost-role-information-Death-Squad-name = Death Squad Operative
 ghost-role-information-Death-Squad-description = One of Nanotrasen's top internal affairs agents. Await orders from CentComm or an official.
 
-ghost-role-information-Shiva-name = Shiva
-ghost-role-information-Shiva-description = Shiva, the stations first defender. Help the Head of Security in their work
-ghost-role-information-Shiva-rules = Protect security staff and the crew from danger. Stay with Security staff or around the Security department, try to disable criminals and not kill them if the situation allows for it.
+ghost-role-information-Shiva-name = Geoff
+ghost-role-information-Shiva-description = Geoff, the stations best friend. Help the Head of Security in their work.
+ghost-role-information-Shiva-rules = Bring joy to the Security crew and remove any fear of spiders from everyone else.
 
 ghost-role-information-Cak-name = Cak
 ghost-role-information-Cak-description = You are the chef's favorite child. You're a living cake cat.  
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
index eecf395bb1..d66d4e7a1b 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
@@ -365,7 +365,7 @@
       - MobAlexander
 
 - type: entity
-  name: Shiva Spawner
+  name: Geoff Spawner
   id: SpawnMobShiva
   parent: MarkerBase
   components:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 4bd0e0d916..85d872062d 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -580,10 +580,10 @@
     - VimPilot
 
 - type: entity
-  name: Shiva
+  name: Geoff
   parent: MobGiantSpider
   id: MobSpiderShiva
-  description: The first defender of the station.
+  description: Widely recognized to be the literal best thing in existence.
   components:
   - type: GhostRole # DeltaV
     makeSentient: true
@@ -656,7 +656,7 @@
   - type: Grammar
     attributes:
       proper: true
-      gender: female
+      gender: male
   - type: Tag
     tags:
     - CannotSuicide