diff --git a/CMakeLists.txt b/CMakeLists.txt
index 633bcd89e..d9e26ee73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -148,10 +148,10 @@ if(ENTT_INCLUDE_HEADERS)
             $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/entity/organizer.hpp>
             $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/entity/registry.hpp>
             $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/entity/runtime_view.hpp>
-            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/entity/sigh_storage_mixin.hpp>
             $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/entity/snapshot.hpp>
             $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/entity/sparse_set.hpp>
             $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/entity/storage.hpp>
+            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/entity/storage_mixin.hpp>
             $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/entity/view.hpp>
             $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/graph/adjacency_matrix.hpp>
             $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/graph/dot.hpp>
diff --git a/src/entt/entity/storage.hpp b/src/entt/entity/storage.hpp
index db6d25043..aebd59ae7 100644
--- a/src/entt/entity/storage.hpp
+++ b/src/entt/entity/storage.hpp
@@ -16,7 +16,7 @@
 #include "component.hpp"
 #include "entity.hpp"
 #include "fwd.hpp"
-#include "sigh_storage_mixin.hpp"
+#include "storage_mixin.hpp"
 #include "sparse_set.hpp"
 
 namespace entt {
diff --git a/src/entt/entity/sigh_storage_mixin.hpp b/src/entt/entity/storage_mixin.hpp
similarity index 100%
rename from src/entt/entity/sigh_storage_mixin.hpp
rename to src/entt/entity/storage_mixin.hpp
diff --git a/src/entt/entt.hpp b/src/entt/entt.hpp
index d84dd5ee7..3544fb605 100644
--- a/src/entt/entt.hpp
+++ b/src/entt/entt.hpp
@@ -28,10 +28,10 @@
 #include "entity/organizer.hpp"
 #include "entity/registry.hpp"
 #include "entity/runtime_view.hpp"
-#include "entity/sigh_storage_mixin.hpp"
 #include "entity/snapshot.hpp"
 #include "entity/sparse_set.hpp"
 #include "entity/storage.hpp"
+#include "entity/storage_mixin.hpp"
 #include "entity/view.hpp"
 #include "graph/adjacency_matrix.hpp"
 #include "graph/dot.hpp"
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 32ddb5d39..acecdee1c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -211,10 +211,10 @@ SETUP_BASIC_TEST(observer entt/entity/observer.cpp)
 SETUP_BASIC_TEST(organizer entt/entity/organizer.cpp)
 SETUP_BASIC_TEST(registry entt/entity/registry.cpp)
 SETUP_BASIC_TEST(runtime_view entt/entity/runtime_view.cpp)
-SETUP_BASIC_TEST(sigh_storage_mixin entt/entity/sigh_storage_mixin.cpp)
 SETUP_BASIC_TEST(snapshot entt/entity/snapshot.cpp)
 SETUP_BASIC_TEST(sparse_set entt/entity/sparse_set.cpp)
 SETUP_BASIC_TEST(storage entt/entity/storage.cpp)
+SETUP_BASIC_TEST(storage_mixin entt/entity/storage_mixin.cpp)
 SETUP_BASIC_TEST(view entt/entity/view.cpp)
 
 # Test graph
diff --git a/test/entt/entity/sigh_storage_mixin.cpp b/test/entt/entity/storage_mixin.cpp
similarity index 100%
rename from test/entt/entity/sigh_storage_mixin.cpp
rename to test/entt/entity/storage_mixin.cpp