diff --git a/Resources/Locale/ru-RU/nyanotrasen/species/species.ftl b/Resources/Locale/ru-RU/nyanotrasen/species/species.ftl
index 04bca8e8cdc..86652cf16cc 100644
--- a/Resources/Locale/ru-RU/nyanotrasen/species/species.ftl
+++ b/Resources/Locale/ru-RU/nyanotrasen/species/species.ftl
@@ -1,4 +1,4 @@
 ## Species Names
 
-species-name-felinid = Фелиниж
+species-name-felinid = Фелинид
 species-name-oni = Они
diff --git a/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_female.yml b/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_female.yml
index afb58253096..232d9d97bb5 100644
--- a/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_female.yml
+++ b/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_female.yml
@@ -1,21 +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
+  - Акари #星
+  - Кира
+  - Кирамеки
+  - Аки #陽
+  - Акийо
+  - Акими
+  - Акаши #明
+  - Сая
+  - Апуро #月
+  - Арута
+  - Мегури
+  - Тиара #天
+  - Суисеа
+  - Ио #水
+  - Айа
+  - Мизу
+  - Тсютен #epic references
+  - Суика
diff --git a/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_location.yml b/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_location.yml
index 005616b7486..3fae0052049 100644
--- a/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_location.yml
+++ b/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_location.yml
@@ -1,31 +1,31 @@
 - type: dataset
   id: names_oni_location
   values:
-  - Amiboshi
-  - Amefuriboshi
-  - Aoboshi
-  - Ashitareboshi
-  - Chirikoboshi
-  - Chichiriboshi
-  - Ekieboshi
-  - Inamiboshi
-  - Hatsuiboshi
-  - 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
index 56273217c84..cb8c50b3460 100644
--- a/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_male.yml
+++ b/Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_male.yml
@@ -1,20 +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
+  - Киоши #陽
+  - Сатоши #明
+  - Теру #光
+  - Хироси
+  - Такаши #天
+  - Еичи #永一
+  - Эичиру #永一朗
+  - Кюсабуро
+  - Цутоми
+  - Цуёши
+  - Кенши
+  - Кендзи
+  - Кеничи
+  - Сусуми
+  - Кёносуке
+  - Суисей #Mars
+  - Сютен #Reference
diff --git a/Resources/Prototypes/Nyanotrasen/Datasets/Names/pitbull.yml b/Resources/Prototypes/Nyanotrasen/Datasets/Names/pitbull.yml
index 628c600a5c4..83bbc23528e 100644
--- a/Resources/Prototypes/Nyanotrasen/Datasets/Names/pitbull.yml
+++ b/Resources/Prototypes/Nyanotrasen/Datasets/Names/pitbull.yml
@@ -1,34 +1,34 @@
 - type: dataset
   id: names_pitbull
   values:
-  - Zeus
-  - Magnum
-  - Diesel
-  - Satan
-  - Dante
-  - Midas
-  - Blue
-  - Petunia
-  - Luna
-  - Bubbles
-  - Rainbow
-  - Echo
-  - Cuddles
-  - Killer
-  - Paisley
-  - Echo
-  - Sweetie
-  - Tutu
-  - Reaper
-  - Peaches
-  - Cujo
-  - Cuddles
-  - Lucifer
-  - Daisy
-  - Blaze
-  - Lady
-  - Franny
-  - Hades
-  - Baby
-  - Demon
-  - Trixie
+  - Зевс
+  - Магнум
+  - Дизель
+  - Сатана
+  - Данте
+  - Мидас
+  - Блюи
+  - Петунья
+  - Луна
+  - Баблс
+  - Радуга
+  - Эхо
+  - Свечка
+  - Убийца
+  - Паслёнок
+  - Пупсик
+  - Вкусняшка
+  - Тата
+  - Жнец
+  - Персик
+  - Кудзо
+  - Мухтар
+  - Люцифер
+  - Дэйзи
+  - Блэйзи
+  - Леди
+  - Одуванчик
+  - Аид
+  - Малыш
+  - Демон
+  - Трикси
diff --git a/Resources/Prototypes/Nyanotrasen/Species/oni.yml b/Resources/Prototypes/Nyanotrasen/Species/oni.yml
index ea1ff735a13..40a4832c57d 100644
--- a/Resources/Prototypes/Nyanotrasen/Species/oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Species/oni.yml
@@ -9,7 +9,8 @@
   skinColoration: Hues
   maleFirstNames: names_oni_male
   femaleFirstNames: names_oni_female
-  lastNames: names_oni_location
+  maleLastNames: names_oni_location # Corvax-LastnameGender
+  femaleLastNames: names_oni_location # Corvax-LastnameGender
   naming: LastNoFirst
 
 - type: markingPoints
diff --git a/Resources/Prototypes/_NF/Datasets/Names/goblin_names_female.yml b/Resources/Prototypes/_NF/Datasets/Names/goblin_names_female.yml
index fed941b5461..66f8b66a934 100644
--- a/Resources/Prototypes/_NF/Datasets/Names/goblin_names_female.yml
+++ b/Resources/Prototypes/_NF/Datasets/Names/goblin_names_female.yml
@@ -1,6 +1,6 @@
 # used this tool: https://www.fantasynamegenerators.com/goblin-names.php
 - type: dataset
-  id: names_goblin_female_russian
+  id: names_goblin_female
   values:
   - Милм
   - Тулкс
diff --git a/Resources/Prototypes/_NF/Species/goblin_species.yml b/Resources/Prototypes/_NF/Species/goblin_species.yml
index b20de872de9..e883211a0d1 100644
--- a/Resources/Prototypes/_NF/Species/goblin_species.yml
+++ b/Resources/Prototypes/_NF/Species/goblin_species.yml
@@ -10,7 +10,8 @@
   skinColoration: HumanToned #Possible values: TintedHues, Hues, HumanToned
   maleFirstNames: names_goblin_male
   femaleFirstNames: names_goblin_female
-  lastNames: names_goblin_last
+  maleLastNames: names_goblin_last # Corvax-LastnameGender
+  femaleLastNames: names_goblin_last # Corvax-LastnameGender
 
 - type: speciesBaseSprites
   id: MobGoblinSprites
diff --git a/Resources/Textures/Logo/logo-ru.png b/Resources/Textures/Logo/logo-ru.png
index 70b3f1e1dff..1bb2f456ef5 100644
Binary files a/Resources/Textures/Logo/logo-ru.png and b/Resources/Textures/Logo/logo-ru.png differ