diff --git a/apps/openmw/mwmp/RecordHelper.cpp b/apps/openmw/mwmp/RecordHelper.cpp
index 504e5b9b5..a5849a5a2 100644
--- a/apps/openmw/mwmp/RecordHelper.cpp
+++ b/apps/openmw/mwmp/RecordHelper.cpp
@@ -5,7 +5,7 @@
 
 #include "RecordHelper.hpp"
 
-void RecordHelper::overrideCreatureRecord(const mwmp::CreatureRecord& record)
+void RecordHelper::overrideRecord(const mwmp::CreatureRecord& record)
 {
     const ESM::Creature &recordData = record.data;
 
@@ -84,7 +84,7 @@ void RecordHelper::overrideCreatureRecord(const mwmp::CreatureRecord& record)
         world->updatePtrsWithRefId(recordData.mId);
 }
 
-void RecordHelper::overrideNpcRecord(const mwmp::NpcRecord& record)
+void RecordHelper::overrideRecord(const mwmp::NpcRecord& record)
 {
     const ESM::NPC &recordData = record.data;
 
@@ -206,7 +206,7 @@ void RecordHelper::overrideNpcRecord(const mwmp::NpcRecord& record)
         world->updatePtrsWithRefId(recordData.mId);
 }
 
-void RecordHelper::overrideEnchantmentRecord(const mwmp::EnchantmentRecord& record)
+void RecordHelper::overrideRecord(const mwmp::EnchantmentRecord& record)
 {
     const ESM::Enchantment &recordData = record.data;
 
@@ -258,7 +258,7 @@ void RecordHelper::overrideEnchantmentRecord(const mwmp::EnchantmentRecord& reco
     }
 }
 
-void RecordHelper::overridePotionRecord(const mwmp::PotionRecord& record)
+void RecordHelper::overrideRecord(const mwmp::PotionRecord& record)
 {
     const ESM::Potion &recordData = record.data;
 
@@ -317,7 +317,7 @@ void RecordHelper::overridePotionRecord(const mwmp::PotionRecord& record)
         world->updatePtrsWithRefId(recordData.mId);
 }
 
-void RecordHelper::overrideSpellRecord(const mwmp::SpellRecord& record)
+void RecordHelper::overrideRecord(const mwmp::SpellRecord& record)
 {
     const ESM::Spell &recordData = record.data;
 
@@ -364,7 +364,7 @@ void RecordHelper::overrideSpellRecord(const mwmp::SpellRecord& record)
     }
 }
 
-void RecordHelper::overrideArmorRecord(const mwmp::ArmorRecord& record)
+void RecordHelper::overrideRecord(const mwmp::ArmorRecord& record)
 {
     const ESM::Armor &recordData = record.data;
 
@@ -448,7 +448,7 @@ void RecordHelper::overrideArmorRecord(const mwmp::ArmorRecord& record)
         world->updatePtrsWithRefId(recordData.mId);
 }
 
-void RecordHelper::overrideBookRecord(const mwmp::BookRecord& record)
+void RecordHelper::overrideRecord(const mwmp::BookRecord& record)
 {
     const ESM::Book &recordData = record.data;
 
@@ -527,7 +527,7 @@ void RecordHelper::overrideBookRecord(const mwmp::BookRecord& record)
         world->updatePtrsWithRefId(recordData.mId);
 }
 
-void RecordHelper::overrideClothingRecord(const mwmp::ClothingRecord& record)
+void RecordHelper::overrideRecord(const mwmp::ClothingRecord& record)
 {
     const ESM::Clothing &recordData = record.data;
 
@@ -603,7 +603,7 @@ void RecordHelper::overrideClothingRecord(const mwmp::ClothingRecord& record)
         world->updatePtrsWithRefId(recordData.mId);
 }
 
-void RecordHelper::overrideMiscellaneousRecord(const mwmp::MiscellaneousRecord& record)
+void RecordHelper::overrideRecord(const mwmp::MiscellaneousRecord& record)
 {
     const ESM::Miscellaneous &recordData = record.data;
 
@@ -659,7 +659,7 @@ void RecordHelper::overrideMiscellaneousRecord(const mwmp::MiscellaneousRecord&
         world->updatePtrsWithRefId(recordData.mId);
 }
 
-void RecordHelper::overrideWeaponRecord(const mwmp::WeaponRecord& record)
+void RecordHelper::overrideRecord(const mwmp::WeaponRecord& record)
 {
     const ESM::Weapon &recordData = record.data;
 
@@ -762,7 +762,7 @@ void RecordHelper::overrideWeaponRecord(const mwmp::WeaponRecord& record)
         world->updatePtrsWithRefId(recordData.mId);
 }
 
-void RecordHelper::overrideContainerRecord(const mwmp::ContainerRecord& record)
+void RecordHelper::overrideRecord(const mwmp::ContainerRecord& record)
 {
     const ESM::Container &recordData = record.data;
 
@@ -815,7 +815,7 @@ void RecordHelper::overrideContainerRecord(const mwmp::ContainerRecord& record)
         world->updatePtrsWithRefId(recordData.mId);
 }
 
-void RecordHelper::overrideDoorRecord(const mwmp::DoorRecord& record)
+void RecordHelper::overrideRecord(const mwmp::DoorRecord& record)
 {
     const ESM::Door &recordData = record.data;
 
@@ -865,7 +865,7 @@ void RecordHelper::overrideDoorRecord(const mwmp::DoorRecord& record)
         world->updatePtrsWithRefId(recordData.mId);
 }
 
-void RecordHelper::overrideActivatorRecord(const mwmp::ActivatorRecord& record)
+void RecordHelper::overrideRecord(const mwmp::ActivatorRecord& record)
 {
     const ESM::Activator &recordData = record.data;
 
@@ -909,7 +909,7 @@ void RecordHelper::overrideActivatorRecord(const mwmp::ActivatorRecord& record)
         world->updatePtrsWithRefId(recordData.mId);
 }
 
-void RecordHelper::overrideStaticRecord(const mwmp::StaticRecord& record)
+void RecordHelper::overrideRecord(const mwmp::StaticRecord& record)
 {
     const ESM::Static &recordData = record.data;
 
@@ -947,7 +947,7 @@ void RecordHelper::overrideStaticRecord(const mwmp::StaticRecord& record)
         world->updatePtrsWithRefId(recordData.mId);
 }
 
-void RecordHelper::overrideIngredientRecord(const mwmp::IngredientRecord& record)
+void RecordHelper::overrideRecord(const mwmp::IngredientRecord& record)
 {
     const ESM::Ingredient &recordData = record.data;
 
@@ -1012,7 +1012,7 @@ void RecordHelper::overrideIngredientRecord(const mwmp::IngredientRecord& record
         world->updatePtrsWithRefId(recordData.mId);
 }
 
-void RecordHelper::overrideApparatusRecord(const mwmp::ApparatusRecord& record)
+void RecordHelper::overrideRecord(const mwmp::ApparatusRecord& record)
 {
     const ESM::Apparatus &recordData = record.data;
 
@@ -1071,7 +1071,7 @@ void RecordHelper::overrideApparatusRecord(const mwmp::ApparatusRecord& record)
         world->updatePtrsWithRefId(recordData.mId);
 }
 
-void RecordHelper::overrideLockpickRecord(const mwmp::LockpickRecord& record)
+void RecordHelper::overrideRecord(const mwmp::LockpickRecord& record)
 {
     const ESM::Lockpick &recordData = record.data;
 
@@ -1130,7 +1130,7 @@ void RecordHelper::overrideLockpickRecord(const mwmp::LockpickRecord& record)
         world->updatePtrsWithRefId(recordData.mId);
 }
 
-void RecordHelper::overrideProbeRecord(const mwmp::ProbeRecord& record)
+void RecordHelper::overrideRecord(const mwmp::ProbeRecord& record)
 {
     const ESM::Probe &recordData = record.data;
 
@@ -1189,7 +1189,7 @@ void RecordHelper::overrideProbeRecord(const mwmp::ProbeRecord& record)
         world->updatePtrsWithRefId(recordData.mId);
 }
 
-void RecordHelper::overrideRepairRecord(const mwmp::RepairRecord& record)
+void RecordHelper::overrideRecord(const mwmp::RepairRecord& record)
 {
     const ESM::Repair &recordData = record.data;
 
@@ -1248,7 +1248,7 @@ void RecordHelper::overrideRepairRecord(const mwmp::RepairRecord& record)
         world->updatePtrsWithRefId(recordData.mId);
 }
 
-void RecordHelper::overrideLightRecord(const mwmp::LightRecord& record)
+void RecordHelper::overrideRecord(const mwmp::LightRecord& record)
 {
     const ESM::Light &recordData = record.data;
 
@@ -1316,7 +1316,7 @@ void RecordHelper::overrideLightRecord(const mwmp::LightRecord& record)
         world->updatePtrsWithRefId(recordData.mId);
 }
 
-void RecordHelper::overrideCellRecord(const mwmp::CellRecord& record)
+void RecordHelper::overrideRecord(const mwmp::CellRecord& record)
 {
     MWBase::World *world = MWBase::Environment::get().getWorld();
 
diff --git a/apps/openmw/mwmp/RecordHelper.hpp b/apps/openmw/mwmp/RecordHelper.hpp
index e76bddd3c..e1d7c74f9 100644
--- a/apps/openmw/mwmp/RecordHelper.hpp
+++ b/apps/openmw/mwmp/RecordHelper.hpp
@@ -7,32 +7,27 @@
 
 namespace RecordHelper
 {
-    void overrideCreatureRecord(const mwmp::CreatureRecord& record);
-    void overrideNpcRecord(const mwmp::NpcRecord& record);
-
-    void overrideEnchantmentRecord(const mwmp::EnchantmentRecord& record);
-    void overridePotionRecord(const mwmp::PotionRecord& record);
-    void overrideSpellRecord(const mwmp::SpellRecord& record);
-
-    void overrideArmorRecord(const mwmp::ArmorRecord& record);
-    void overrideBookRecord(const mwmp::BookRecord& record);
-    void overrideClothingRecord(const mwmp::ClothingRecord& record);
-    void overrideMiscellaneousRecord(const mwmp::MiscellaneousRecord& record);
-    void overrideWeaponRecord(const mwmp::WeaponRecord& record);
-
-    void overrideContainerRecord(const mwmp::ContainerRecord& record);
-    void overrideDoorRecord(const mwmp::DoorRecord& record);
-
-    void overrideActivatorRecord(const mwmp::ActivatorRecord& record);
-    void overrideStaticRecord(const mwmp::StaticRecord& record);
-
-    void overrideIngredientRecord(const mwmp::IngredientRecord& record);
-    void overrideApparatusRecord(const mwmp::ApparatusRecord& record);
-    void overrideLockpickRecord(const mwmp::LockpickRecord& record);
-    void overrideProbeRecord(const mwmp::ProbeRecord& record);
-    void overrideRepairRecord(const mwmp::RepairRecord& record);
-    void overrideLightRecord(const mwmp::LightRecord& record);
-    void overrideCellRecord(const mwmp::CellRecord& record);
+    void overrideRecord(const mwmp::CreatureRecord& record);
+    void overrideRecord(const mwmp::NpcRecord& record);
+    void overrideRecord(const mwmp::EnchantmentRecord& record);
+    void overrideRecord(const mwmp::PotionRecord& record);
+    void overrideRecord(const mwmp::SpellRecord& record);
+    void overrideRecord(const mwmp::ArmorRecord& record);
+    void overrideRecord(const mwmp::BookRecord& record);
+    void overrideRecord(const mwmp::ClothingRecord& record);
+    void overrideRecord(const mwmp::MiscellaneousRecord& record);
+    void overrideRecord(const mwmp::WeaponRecord& record);
+    void overrideRecord(const mwmp::ContainerRecord& record);
+    void overrideRecord(const mwmp::DoorRecord& record);
+    void overrideRecord(const mwmp::ActivatorRecord& record);
+    void overrideRecord(const mwmp::StaticRecord& record);
+    void overrideRecord(const mwmp::IngredientRecord& record);
+    void overrideRecord(const mwmp::ApparatusRecord& record);
+    void overrideRecord(const mwmp::LockpickRecord& record);
+    void overrideRecord(const mwmp::ProbeRecord& record);
+    void overrideRecord(const mwmp::RepairRecord& record);
+    void overrideRecord(const mwmp::LightRecord& record);
+    void overrideRecord(const mwmp::CellRecord& record);
 
     template<class RecordType>
     void overrideRecord(const RecordType &record)
diff --git a/apps/openmw/mwmp/Worldstate.cpp b/apps/openmw/mwmp/Worldstate.cpp
index 1f0a9db40..23e4dcd12 100644
--- a/apps/openmw/mwmp/Worldstate.cpp
+++ b/apps/openmw/mwmp/Worldstate.cpp
@@ -49,7 +49,7 @@ void Worldstate::addRecords()
             LOG_APPEND(TimedLog::LOG_INFO, "- spell record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(),
                 hasBaseId ? record.baseId.c_str() : "empty");
 
-            RecordHelper::overrideSpellRecord(record);
+            RecordHelper::overrideRecord(record);
         }
     }
     else if (recordsType == mwmp::RECORD_TYPE::POTION)
@@ -61,7 +61,7 @@ void Worldstate::addRecords()
             LOG_APPEND(TimedLog::LOG_INFO, "- potion record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(),
                 hasBaseId ? record.baseId.c_str() : "empty");
 
-            RecordHelper::overridePotionRecord(record);
+            RecordHelper::overrideRecord(record);
         }
     }
     else if (recordsType == mwmp::RECORD_TYPE::ENCHANTMENT)
@@ -73,7 +73,7 @@ void Worldstate::addRecords()
             LOG_APPEND(TimedLog::LOG_INFO, "- enchantment record %s, %i\n-- baseId is %s", record.data.mId.c_str(), record.data.mData.mType,
                 hasBaseId ? record.baseId.c_str() : "empty");
 
-            RecordHelper::overrideEnchantmentRecord(record);
+            RecordHelper::overrideRecord(record);
         }
     }
     else if (recordsType == mwmp::RECORD_TYPE::CREATURE)
@@ -85,7 +85,7 @@ void Worldstate::addRecords()
             LOG_APPEND(TimedLog::LOG_INFO, "- creature record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(),
                 hasBaseId ? record.baseId.c_str() : "empty");
 
-            RecordHelper::overrideCreatureRecord(record);
+            RecordHelper::overrideRecord(record);
         }
     }
     else if (recordsType == mwmp::RECORD_TYPE::NPC)
@@ -97,7 +97,7 @@ void Worldstate::addRecords()
             LOG_APPEND(TimedLog::LOG_INFO, "- NPC record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(),
                 hasBaseId ? record.baseId.c_str() : "empty");
 
-            RecordHelper::overrideNpcRecord(record);
+            RecordHelper::overrideRecord(record);
         }
     }
     else if (recordsType == mwmp::RECORD_TYPE::ARMOR)
@@ -109,7 +109,7 @@ void Worldstate::addRecords()
             LOG_APPEND(TimedLog::LOG_INFO, "- armor record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(),
                 hasBaseId ? record.baseId.c_str() : "empty");
 
-            RecordHelper::overrideArmorRecord(record);
+            RecordHelper::overrideRecord(record);
         }
     }
     else if (recordsType == mwmp::RECORD_TYPE::BOOK)
@@ -121,7 +121,7 @@ void Worldstate::addRecords()
             LOG_APPEND(TimedLog::LOG_INFO, "- book record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(),
                 hasBaseId ? record.baseId.c_str() : "empty");
 
-            RecordHelper::overrideBookRecord(record);
+            RecordHelper::overrideRecord(record);
         }
     }
     else if (recordsType == mwmp::RECORD_TYPE::CLOTHING)
@@ -133,7 +133,7 @@ void Worldstate::addRecords()
             LOG_APPEND(TimedLog::LOG_INFO, "- clothing record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(),
                 hasBaseId ? record.baseId.c_str() : "empty");
 
-            RecordHelper::overrideClothingRecord(record);
+            RecordHelper::overrideRecord(record);
         }
     }
     else if (recordsType == mwmp::RECORD_TYPE::MISCELLANEOUS)
@@ -145,7 +145,7 @@ void Worldstate::addRecords()
             LOG_APPEND(TimedLog::LOG_INFO, "- miscellaneous record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(),
                 hasBaseId ? record.baseId.c_str() : "empty");
 
-            RecordHelper::overrideMiscellaneousRecord(record);
+            RecordHelper::overrideRecord(record);
         }
     }
     else if (recordsType == mwmp::RECORD_TYPE::WEAPON)
@@ -157,7 +157,7 @@ void Worldstate::addRecords()
             LOG_APPEND(TimedLog::LOG_INFO, "- weapon record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(),
                 hasBaseId ? record.baseId.c_str() : "empty");
 
-            RecordHelper::overrideWeaponRecord(record);
+            RecordHelper::overrideRecord(record);
         }
     }
     else if (recordsType == mwmp::RECORD_TYPE::CONTAINER)
@@ -169,7 +169,7 @@ void Worldstate::addRecords()
             LOG_APPEND(TimedLog::LOG_INFO, "- container record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(),
                 hasBaseId ? record.baseId.c_str() : "empty");
 
-            RecordHelper::overrideContainerRecord(record);
+            RecordHelper::overrideRecord(record);
         }
     }
     else if (recordsType == mwmp::RECORD_TYPE::DOOR)
@@ -181,7 +181,7 @@ void Worldstate::addRecords()
             LOG_APPEND(TimedLog::LOG_INFO, "- door record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(),
                 hasBaseId ? record.baseId.c_str() : "empty");
 
-            RecordHelper::overrideDoorRecord(record);
+            RecordHelper::overrideRecord(record);
         }
     }
     else if (recordsType == mwmp::RECORD_TYPE::ACTIVATOR)
@@ -193,7 +193,7 @@ void Worldstate::addRecords()
             LOG_APPEND(TimedLog::LOG_INFO, "- activator record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(),
                 hasBaseId ? record.baseId.c_str() : "empty");
 
-            RecordHelper::overrideActivatorRecord(record);
+            RecordHelper::overrideRecord(record);
         }
     }
     else if (recordsType == mwmp::RECORD_TYPE::STATIC)
@@ -205,7 +205,7 @@ void Worldstate::addRecords()
             LOG_APPEND(TimedLog::LOG_INFO, "- static record %s\n-- baseId is %s", record.data.mId.c_str(),
                 hasBaseId ? record.baseId.c_str() : "empty");
 
-            RecordHelper::overrideStaticRecord(record);
+            RecordHelper::overrideRecord(record);
         }
     }
     else if (recordsType == mwmp::RECORD_TYPE::INGREDIENT)
@@ -217,7 +217,7 @@ void Worldstate::addRecords()
             LOG_APPEND(TimedLog::LOG_INFO, "- ingredient record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(),
                 hasBaseId ? record.baseId.c_str() : "empty");
 
-            RecordHelper::overrideIngredientRecord(record);
+            RecordHelper::overrideRecord(record);
         }
     }
     else if (recordsType == mwmp::RECORD_TYPE::APPARATUS)
@@ -229,7 +229,7 @@ void Worldstate::addRecords()
             LOG_APPEND(TimedLog::LOG_INFO, "- apparatus record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(),
                 hasBaseId ? record.baseId.c_str() : "empty");
 
-            RecordHelper::overrideApparatusRecord(record);
+            RecordHelper::overrideRecord(record);
         }
     }
     else if (recordsType == mwmp::RECORD_TYPE::LOCKPICK)
@@ -241,7 +241,7 @@ void Worldstate::addRecords()
             LOG_APPEND(TimedLog::LOG_INFO, "- lockpick record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(),
                 hasBaseId ? record.baseId.c_str() : "empty");
 
-            RecordHelper::overrideLockpickRecord(record);
+            RecordHelper::overrideRecord(record);
         }
     }
     else if (recordsType == mwmp::RECORD_TYPE::PROBE)
@@ -253,7 +253,7 @@ void Worldstate::addRecords()
             LOG_APPEND(TimedLog::LOG_INFO, "- probe record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(),
                 hasBaseId ? record.baseId.c_str() : "empty");
 
-            RecordHelper::overrideProbeRecord(record);
+            RecordHelper::overrideRecord(record);
         }
     }
     else if (recordsType == mwmp::RECORD_TYPE::REPAIR)
@@ -265,7 +265,7 @@ void Worldstate::addRecords()
             LOG_APPEND(TimedLog::LOG_INFO, "- repair record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(),
                 hasBaseId ? record.baseId.c_str() : "empty");
 
-            RecordHelper::overrideRepairRecord(record);
+            RecordHelper::overrideRecord(record);
         }
     }
     else if (recordsType == mwmp::RECORD_TYPE::LIGHT)
@@ -277,7 +277,7 @@ void Worldstate::addRecords()
             LOG_APPEND(TimedLog::LOG_INFO, "- light record %s, %s\n-- baseId is %s", record.data.mId.c_str(), record.data.mName.c_str(),
                 hasBaseId ? record.baseId.c_str() : "empty");
 
-            RecordHelper::overrideLightRecord(record);
+            RecordHelper::overrideRecord(record);
         }
     }
     else if (recordsType == mwmp::RECORD_TYPE::CELL)
@@ -289,7 +289,7 @@ void Worldstate::addRecords()
             LOG_APPEND(TimedLog::LOG_INFO, "- cell record %s\n-- baseId is %s", record.data.mName.c_str(),
                 hasBaseId ? record.baseId.c_str() : "empty");
 
-            RecordHelper::overrideCellRecord(record);
+            RecordHelper::overrideRecord(record);
         }
     }
 }