diff --git a/Content.Shared/Humanoid/NamingSystem.cs b/Content.Shared/Humanoid/NamingSystem.cs
index 5e9ebdbf23c..a44f396dcaf 100644
--- a/Content.Shared/Humanoid/NamingSystem.cs
+++ b/Content.Shared/Humanoid/NamingSystem.cs
@@ -26,6 +26,11 @@ public string GetName(string species, Gender? gender = null)
 
             switch (speciesProto.Naming)
             {
+                //Start of Nyano code for Oni naming
+            case SpeciesNaming.XnoY:
+                    return Loc.GetString("namepreset-x-no-y",
+                        ("first", GetFirstName(speciesProto, gender)), ("last", GetLastName(speciesProto)));
+                //End of Nyano code for Oni naming
                 case SpeciesNaming.TheFirstofLast:
                     return Loc.GetString("namepreset-thefirstoflast",
                         ("first", GetFirstName(speciesProto, gender)), ("last", GetLastName(speciesProto)));
diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
index 54c74e542fc..ad2562fe141 100644
--- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
+++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
@@ -126,5 +126,8 @@ public enum SpeciesNaming : byte
 {
     FirstLast,
     FirstDashFirst,
+    //Start of Nyano code for Oni naming
+    XnoY,
+    //End of Nyano code for Oni naming
     TheFirstofLast,
 }
diff --git a/Resources/Locale/en-US/nyanotrasen/species/namepreset.ftl b/Resources/Locale/en-US/nyanotrasen/species/namepreset.ftl
new file mode 100644
index 00000000000..030001e5ef5
--- /dev/null
+++ b/Resources/Locale/en-US/nyanotrasen/species/namepreset.ftl
@@ -0,0 +1 @@
+namepreset-x-no-y = {$last}-no-{$first}
diff --git a/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_female.yml b/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_female.yml
new file mode 100644
index 00000000000..afb58253096
--- /dev/null
+++ b/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_female.yml
@@ -0,0 +1,21 @@
+- type: dataset
+  id: names_oni_female
+  values:
+  - Akari #星
+  - Kira
+  - Kirameki
+  - Aki #陽
+  - Akiho
+  - Akimi
+  - Akashi #明
+  - Saya
+  - Aporo #月
+  - Arute
+  - Meguru
+  - Tiara #天
+  - Suisei
+  - Io #水
+  - Aoi
+  - Mizu
+  - Shuten #epic references
+  - Suika
diff --git a/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_location.yml b/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_location.yml
new file mode 100644
index 00000000000..a7eda394872
--- /dev/null
+++ b/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_location.yml
@@ -0,0 +1,31 @@
+- type: dataset
+  id: names_oni_location
+  values:
+  - Amiboshi
+  - Amefuriboshi
+  - Aoboshi
+  - Ashitareboshi
+  - Chirikoboshi
+  - Chichiriboshi
+  - Ekieboshi
+  - Inamiboshi
+  - Hatsuinoshi
+  - Hikitsuboshi
+  - Hotohoriboshi
+  - Karasukiboshi
+  - Miboshi
+  - Namameboshi
+  - Nakagoboshi
+  - Nuriboshi
+  - Soiboshi
+  - Suboshi
+  - Subaruboshi
+  - Tamaonoboshi
+  - Tasukiboshi
+  - Tataraboshi
+  - Tomiteboshi
+  - Tomoboshi
+  - Tokakiboshi
+  - Torokiboshi
+  - Umiyameboshi
+  - Urukiboshi
diff --git a/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_male.yml b/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_male.yml
new file mode 100644
index 00000000000..2742cf90734
--- /dev/null
+++ b/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_male.yml
@@ -0,0 +1,20 @@
+- type: dataset
+  id: names_oni_male
+  values:
+  - Kiyoshi #陽
+  - Satoshi #明
+  - Teru #光
+  - Hiroshi
+  - Takashi #天
+  - Eeichi #永一
+  - Eeichirou #永一朗
+  - Kyousaburou
+  - Tsutomu
+  - Tsuyoshi
+  - Kenshi
+  - Kenji
+  - Kenichi
+  - Susumu
+  - Kyounosuke
+  - Suisei #Mars
+  - Shuten #Reference
diff --git a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
index 0b74120cc3b..84c6eac63d2 100644
--- a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
@@ -10,7 +10,7 @@
   maleFirstNames: names_oni_male
   femaleFirstNames: names_oni_female
   lastNames: names_oni_location
-  # naming: XnoY
+  naming: XnoY
 
 - type: markingPoints
   id: MobOniMarkingLimits