diff --git a/apps/esmtool/record.cpp b/apps/esmtool/record.cpp
index 856700f5e..e26015970 100644
--- a/apps/esmtool/record.cpp
+++ b/apps/esmtool/record.cpp
@@ -1213,7 +1213,7 @@ void Record<ESM::Region>::print()
 template<>
 void Record<ESM::Script>::print()
 {
-    std::cout << "  Name: " << mData.mData.mName.toString() << std::endl;
+    std::cout << "  Name: " << mData.mId << std::endl;
 
     std::cout << "  Num Shorts: " << mData.mData.mNumShorts << std::endl;
     std::cout << "  Num Longs: " << mData.mData.mNumLongs << std::endl;
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index 4ce056010..6c45d2b3d 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -2,14 +2,13 @@
 
 #include <boost/lexical_cast.hpp>
 
-#include <components/esm_store/store.hpp>
-
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
 
+#include "../mwworld/esmstore.hpp"
 #include "../mwworld/player.hpp"
 #include "../mwworld/class.hpp"
 
diff --git a/apps/openmw/mwmechanics/alchemy.cpp b/apps/openmw/mwmechanics/alchemy.cpp
index 962350472..99259bad1 100644
--- a/apps/openmw/mwmechanics/alchemy.cpp
+++ b/apps/openmw/mwmechanics/alchemy.cpp
@@ -13,11 +13,11 @@
 #include <components/esm/loadgmst.hpp>
 #include <components/esm/loadmgef.hpp>
 
-#include <components/esm_store/store.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
+#include "../mwworld/esmstore.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
@@ -192,7 +192,7 @@ void MWMechanics::Alchemy::updateEffects()
 
 const ESM::Potion *MWMechanics::Alchemy::getRecord() const
 {
-    for (ESMS::RecListWithIDT<ESM::Potion>::MapType::const_iterator iter (
+    for (MWWorld::RecListWithIDT<ESM::Potion>::MapType::const_iterator iter (
         MWBase::Environment::get().getWorld()->getStore().potions.list.begin());
         iter!=MWBase::Environment::get().getWorld()->getStore().potions.list.end(); ++iter)
     {
diff --git a/apps/openmw/mwworld/reclists.hpp b/apps/openmw/mwworld/reclists.hpp
index 1548049ae..179a7ac7c 100644
--- a/apps/openmw/mwworld/reclists.hpp
+++ b/apps/openmw/mwworld/reclists.hpp
@@ -528,7 +528,7 @@ namespace MWWorld
       X ref;
       ref.load (esm);
 
-      std::string realId = toLower (ref.mData.mName.toString());
+      std::string realId = toLower (ref.mId);
 
       std::swap (list[realId], ref);
     }
diff --git a/components/esm/loadscpt.cpp b/components/esm/loadscpt.cpp
index 55a71b6b7..d9b6497d9 100644
--- a/components/esm/loadscpt.cpp
+++ b/components/esm/loadscpt.cpp
@@ -8,8 +8,8 @@ namespace ESM
 
 struct SCHD
 {
-    NAME32      mName;
-    SCHDstruct  mData;
+    NAME32              mName;
+    Script::SCHDstruct  mData;
 };
 
 void Script::load(ESMReader &esm)