diff --git a/apps/opencs/view/render/terrainstorage.cpp b/apps/opencs/view/render/terrainstorage.cpp
index 725b663649..a6a38600ad 100644
--- a/apps/opencs/view/render/terrainstorage.cpp
+++ b/apps/opencs/view/render/terrainstorage.cpp
@@ -1,7 +1,7 @@
 #include "terrainstorage.hpp"
 
 #include <components/esm3/loadltex.hpp>
-#include <components/esm3terrain/storage.hpp>
+#include <components/esmterrain/storage.hpp>
 #include <components/resource/resourcesystem.hpp>
 
 #include <apps/opencs/model/world/data.hpp>
diff --git a/apps/opencs/view/render/terrainstorage.hpp b/apps/opencs/view/render/terrainstorage.hpp
index 907e63a8eb..b09de55081 100644
--- a/apps/opencs/view/render/terrainstorage.hpp
+++ b/apps/opencs/view/render/terrainstorage.hpp
@@ -5,7 +5,7 @@
 
 #include <components/esm3/loadland.hpp>
 #include <components/esm3/loadltex.hpp>
-#include <components/esm3terrain/storage.hpp>
+#include <components/esmterrain/storage.hpp>
 #include <osg/ref_ptr>
 
 namespace CSMWorld
diff --git a/apps/openmw/mwrender/landmanager.hpp b/apps/openmw/mwrender/landmanager.hpp
index d9c36ea5d9..7166c4b111 100644
--- a/apps/openmw/mwrender/landmanager.hpp
+++ b/apps/openmw/mwrender/landmanager.hpp
@@ -4,7 +4,7 @@
 #include <osg/Object>
 
 #include <components/esm/util.hpp>
-#include <components/esm3terrain/storage.hpp>
+#include <components/esmterrain/storage.hpp>
 #include <components/resource/resourcemanager.hpp>
 
 namespace ESM
diff --git a/apps/openmw/mwrender/terrainstorage.hpp b/apps/openmw/mwrender/terrainstorage.hpp
index 2526c779c6..0b41c06428 100644
--- a/apps/openmw/mwrender/terrainstorage.hpp
+++ b/apps/openmw/mwrender/terrainstorage.hpp
@@ -3,7 +3,7 @@
 
 #include <memory>
 
-#include <components/esm3terrain/storage.hpp>
+#include <components/esmterrain/storage.hpp>
 
 #include <components/resource/resourcesystem.hpp>
 
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index b085eb52d7..32482ec331 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -145,7 +145,7 @@ add_component_dir (esm3
     infoorder timestamp
     )
 
-add_component_dir (esm3terrain
+add_component_dir (esmterrain
     storage
     )
 
diff --git a/components/esm3terrain/storage.cpp b/components/esmterrain/storage.cpp
similarity index 100%
rename from components/esm3terrain/storage.cpp
rename to components/esmterrain/storage.cpp
diff --git a/components/esm3terrain/storage.hpp b/components/esmterrain/storage.hpp
similarity index 98%
rename from components/esm3terrain/storage.hpp
rename to components/esmterrain/storage.hpp
index 17b94a7ee5..291c3afae3 100644
--- a/components/esm3terrain/storage.hpp
+++ b/components/esmterrain/storage.hpp
@@ -1,5 +1,5 @@
-#ifndef COMPONENTS_ESM_TERRAIN_STORAGE_H
-#define COMPONENTS_ESM_TERRAIN_STORAGE_H
+#ifndef OPENMW_COMPONENTS_ESMTERRAIN_STORAGE_H
+#define OPENMW_COMPONENTS_ESMTERRAIN_STORAGE_H
 
 #include <cassert>
 #include <mutex>