diff --git a/apps/openmw/mwmp/CellController.cpp b/apps/openmw/mwmp/CellController.cpp
index 501626321..bfa8ee37b 100644
--- a/apps/openmw/mwmp/CellController.cpp
+++ b/apps/openmw/mwmp/CellController.cpp
@@ -64,7 +64,7 @@ void CellController::initializeCell(const ESM::Cell& cell)
     // If this key doesn't exist, create it
     if (cellsActive.count(mapIndex) == 0)
     {
-        MWWorld::CellStore *cellStore = getCell(cell);
+        MWWorld::CellStore *cellStore = getCellStore(cell);
 
         if (!cellStore) return;
 
@@ -175,7 +175,7 @@ int CellController::getCellSize() const
     return 8192;
 }
 
-MWWorld::CellStore *CellController::getCell(const ESM::Cell& cell)
+MWWorld::CellStore *CellController::getCellStore(const ESM::Cell& cell)
 {
     MWWorld::CellStore *cellStore;
 
diff --git a/apps/openmw/mwmp/CellController.hpp b/apps/openmw/mwmp/CellController.hpp
index ca15937ba..86dde640d 100644
--- a/apps/openmw/mwmp/CellController.hpp
+++ b/apps/openmw/mwmp/CellController.hpp
@@ -37,7 +37,7 @@ namespace mwmp
         std::string generateMapIndex(mwmp::BaseActor baseActor);
 
         int getCellSize() const;
-        virtual MWWorld::CellStore *getCell(const ESM::Cell& cell);
+        virtual MWWorld::CellStore *getCellStore(const ESM::Cell& cell);
 
         void openContainer(const MWWorld::Ptr& container,  bool loot);
         void closeContainer(const MWWorld::Ptr& container);
diff --git a/apps/openmw/mwmp/LocalPlayer.cpp b/apps/openmw/mwmp/LocalPlayer.cpp
index cd9cbd909..08ae8ced1 100644
--- a/apps/openmw/mwmp/LocalPlayer.cpp
+++ b/apps/openmw/mwmp/LocalPlayer.cpp
@@ -677,7 +677,7 @@ void LocalPlayer::addJournalItems()
         
         if (journalItem.type == JournalItem::ENTRY)
         {
-            MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(journalItem.actorCell);
+            MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(journalItem.actorCell);
 
             if (!ptrCellStore) continue;
 
diff --git a/apps/openmw/mwmp/Networking.cpp b/apps/openmw/mwmp/Networking.cpp
index d413f7602..a6c6de7f1 100644
--- a/apps/openmw/mwmp/Networking.cpp
+++ b/apps/openmw/mwmp/Networking.cpp
@@ -844,7 +844,7 @@ void Networking::processActorPacket(RakNet::Packet *packet)
     {
     case ID_ACTOR_LIST:
     {
-        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(actorList.cell);
+        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(actorList.cell);
 
         if (!ptrCellStore) return;
 
@@ -902,7 +902,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
     {
     case ID_CONTAINER:
     {
-        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
+        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
 
         if (!ptrCellStore) return;
 
@@ -920,7 +920,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
     }
     case ID_OBJECT_PLACE:
     {
-        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
+        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
 
         if (!ptrCellStore) return;
 
@@ -931,7 +931,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
     }
     case ID_OBJECT_DELETE:
     {
-        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
+        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
 
         if (!ptrCellStore) return;
 
@@ -942,7 +942,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
     }
     case ID_OBJECT_LOCK:
     {
-        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
+        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
 
         if (!ptrCellStore) return;
 
@@ -953,7 +953,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
     }
     case ID_OBJECT_UNLOCK:
     {
-        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
+        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
 
         if (!ptrCellStore) return;
 
@@ -964,7 +964,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
     }
     case ID_OBJECT_SCALE:
     {
-        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
+        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
 
         if (!ptrCellStore) return;
 
@@ -975,7 +975,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
     }
     case ID_OBJECT_MOVE:
     {
-        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
+        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
 
         if (!ptrCellStore) return;
 
@@ -986,7 +986,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
     }
     case ID_OBJECT_ROTATE:
     {
-        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
+        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
 
         if (!ptrCellStore) return;
 
@@ -997,7 +997,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
     }
     case ID_OBJECT_ANIM_PLAY:
     {
-        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
+        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
 
         if (!ptrCellStore) return;
 
@@ -1008,7 +1008,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
     }
     case ID_DOOR_STATE:
     {
-        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
+        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
 
         if (!ptrCellStore) return;
 
@@ -1019,7 +1019,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
     }
     case ID_SCRIPT_LOCAL_SHORT:
     {
-        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
+        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
 
         if (!ptrCellStore) return;
 
@@ -1030,7 +1030,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
     }
     case ID_SCRIPT_LOCAL_FLOAT:
     {
-        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
+        MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
 
         if (!ptrCellStore) return;