diff --git a/Resources/Prototypes/_DV/Body/Species/asakim.yml b/Resources/Prototypes/_DV/Body/Species/asakim.yml
index 27ca6292e6a..88436e98a61 100644
--- a/Resources/Prototypes/_DV/Body/Species/asakim.yml
+++ b/Resources/Prototypes/_DV/Body/Species/asakim.yml
@@ -76,16 +76,16 @@
       LegRight: OrganAsakimLegRight
       FootLeft: OrganAsakimFootLeft
       FootRight: OrganAsakimFootRight
-      Brain: OrganHumanBrain
+      Brain: OrganReptilianBrain
       Eyes: OrganAsakimEyes
-      Tongue: OrganHumanTongue
-      Appendix: OrganHumanAppendix
-      Ears: OrganHumanEars
-      Lungs: OrganHumanLungs
-      Heart: OrganAnimalHeart
+      Tongue: OrganReptilianTongue
+      Appendix: OrganReptilianAppendix
+      Ears: OrganReptilianEars
+      Lungs: OrganReptilianLungs
+      Heart: OrganReptilianHeart
       Stomach: OrganReptilianStomach
-      Liver: OrganAnimalLiver
-      Kidneys: OrganHumanKidneys
+      Liver: OrganReptilianLiver
+      Kidneys: OrganReptilianKidneys
   - type: HumanoidProfile
     species: Asakim
 
diff --git a/Resources/Prototypes/_DV/Body/Species/avali.yml b/Resources/Prototypes/_DV/Body/Species/avali.yml
index 478a71459cc..243c1f9eb7f 100644
--- a/Resources/Prototypes/_DV/Body/Species/avali.yml
+++ b/Resources/Prototypes/_DV/Body/Species/avali.yml
@@ -89,7 +89,7 @@
       Heart: OrganAnimalHeart
       Stomach: OrganAvaliStomach
       Liver: OrganAnimalLiver
-      Kidneys: OrganHumanKidneys
+      Kidneys: OrganAnimalKidneys
   - type: HumanoidProfile
     species: Avali
 
diff --git a/Resources/Prototypes/_DV/Body/Species/felinid.yml b/Resources/Prototypes/_DV/Body/Species/felinid.yml
index 781182cf2d7..1be33c78df5 100644
--- a/Resources/Prototypes/_DV/Body/Species/felinid.yml
+++ b/Resources/Prototypes/_DV/Body/Species/felinid.yml
@@ -57,7 +57,7 @@
       Heart: OrganAnimalHeart
       Stomach: OrganVulpkaninStomach
       Liver: OrganAnimalLiver
-      Kidneys: OrganHumanKidneys
+      Kidneys: OrganAnimalKidneys
   - type: HumanoidProfile
     species: Felinid
 
diff --git a/Resources/Prototypes/_DV/Body/Species/feroxi.yml b/Resources/Prototypes/_DV/Body/Species/feroxi.yml
index fcc50cd17b8..05d244bcef8 100644
--- a/Resources/Prototypes/_DV/Body/Species/feroxi.yml
+++ b/Resources/Prototypes/_DV/Body/Species/feroxi.yml
@@ -65,7 +65,7 @@
       Heart: OrganAnimalHeart
       Stomach: OrganFeroxiStomach
       Liver: OrganAnimalLiver
-      Kidneys: OrganHumanKidneys
+      Kidneys: OrganAnimalKidneys
   - type: HumanoidProfile
     species: Feroxi
 
diff --git a/Resources/Prototypes/_DV/Body/Species/harpy.yml b/Resources/Prototypes/_DV/Body/Species/harpy.yml
index 438f092c698..a59e488a465 100644
--- a/Resources/Prototypes/_DV/Body/Species/harpy.yml
+++ b/Resources/Prototypes/_DV/Body/Species/harpy.yml
@@ -73,7 +73,7 @@
       Heart: OrganAnimalHeart
       Stomach: OrganAnimalStomach
       Liver: OrganAnimalLiver
-      Kidneys: OrganHumanKidneys
+      Kidneys: OrganAnimalKidneys
   - type: HumanoidProfile
     species: Harpy
 
diff --git a/Resources/Prototypes/_DV/Body/Species/kitsune.yml b/Resources/Prototypes/_DV/Body/Species/kitsune.yml
index 2402041c2a0..c5f352e33ea 100644
--- a/Resources/Prototypes/_DV/Body/Species/kitsune.yml
+++ b/Resources/Prototypes/_DV/Body/Species/kitsune.yml
@@ -65,10 +65,10 @@
       Ears: OrganHumanEars
       Appendix: OrganHumanAppendix
       Lungs: OrganHumanLungs
-      Heart: OrganAnimalHeart
+      Heart: OrganHumanHeart
       Stomach: OrganAnimalStomach
-      Liver: OrganAnimalLiver
-      Kidneys: OrganHumanKidneys
+      Liver: OrganHumanLiver
+      Kidneys: OrganAnimalKidneys
   - type: HumanoidProfile
     species: Kitsune
 
diff --git a/Resources/Prototypes/_DV/Body/Species/oni.yml b/Resources/Prototypes/_DV/Body/Species/oni.yml
index 158e959c4be..db09fd71de0 100644
--- a/Resources/Prototypes/_DV/Body/Species/oni.yml
+++ b/Resources/Prototypes/_DV/Body/Species/oni.yml
@@ -58,9 +58,9 @@
       Ears: OrganHumanEars
       Appendix: OrganHumanAppendix
       Lungs: OrganHumanLungs
-      Heart: OrganAnimalHeart
-      Stomach: OrganAnimalStomach
-      Liver: OrganAnimalLiver
+      Heart: OrganHumanHeart
+      Stomach: OrganHumanStomach
+      Liver: OrganHumanLiver
       Kidneys: OrganHumanKidneys
   - type: HumanoidProfile
     species: Oni
diff --git a/Resources/Prototypes/_DV/Body/Species/rodentia.yml b/Resources/Prototypes/_DV/Body/Species/rodentia.yml
index d7887662418..29a0eae4ac5 100644
--- a/Resources/Prototypes/_DV/Body/Species/rodentia.yml
+++ b/Resources/Prototypes/_DV/Body/Species/rodentia.yml
@@ -67,7 +67,7 @@
       Heart: OrganAnimalHeart
       Stomach: OrganAnimalStomach
       Liver: OrganAnimalLiver
-      Kidneys: OrganHumanKidneys
+      Kidneys: OrganAnimalKidneys
   - type: HumanoidProfile
     species: Rodentia
 
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Species/allulalo.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Species/allulalo.yml
index 0b2bdcb5579..cdf607e7dc6 100644
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Species/allulalo.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Species/allulalo.yml
@@ -219,7 +219,7 @@
       Heart: OrganAllulaloHeart
       Stomach: OrganAnimalStomach
       Liver: OrganAnimalLiver
-      Kidneys: OrganHumanKidneys
+      Kidneys: OrganAnimalKidneys
   - type: HumanoidProfile
     species: Allulalo
   # BEGIN DeltaV