diff --git a/deerith_engine_client/src/world/universe.cpp b/deerith_engine_client/src/world/world.cpp
similarity index 100%
rename from deerith_engine_client/src/world/universe.cpp
rename to deerith_engine_client/src/world/world.cpp
diff --git a/deerith_engine_client/src/world/universe_internals.h b/deerith_engine_client/src/world/world_internals.h
similarity index 100%
rename from deerith_engine_client/src/world/universe_internals.h
rename to deerith_engine_client/src/world/world_internals.h
diff --git a/deerith_engine_client/src/world/universe_protocols.cpp b/deerith_engine_client/src/world/world_protocols.cpp
similarity index 100%
rename from deerith_engine_client/src/world/universe_protocols.cpp
rename to deerith_engine_client/src/world/world_protocols.cpp
diff --git a/deerith_engine_client/src/world/universe_render.cpp b/deerith_engine_client/src/world/world_render.cpp
similarity index 100%
rename from deerith_engine_client/src/world/universe_render.cpp
rename to deerith_engine_client/src/world/world_render.cpp
diff --git a/deerith_engine_core/include/deerith/world/world_core.h b/deerith_engine_core/include/deerith/world/world_core.h
index 3ca0c06..cb6f955 100644
--- a/deerith_engine_core/include/deerith/world/world_core.h
+++ b/deerith_engine_core/include/deerith/world/world_core.h
@@ -9,4 +9,3 @@ namespace deerith
     void set_tick(uint32_t);
 
 }
-^^
\ No newline at end of file
diff --git a/deerith_engine_server/src/world/universe_internals.h b/deerith_engine_server/src/world/world_internals.h
similarity index 100%
rename from deerith_engine_server/src/world/universe_internals.h
rename to deerith_engine_server/src/world/world_internals.h
diff --git a/deerith_engine_server/src/world/universe_simulation.cpp b/deerith_engine_server/src/world/world_simulation.cpp
similarity index 100%
rename from deerith_engine_server/src/world/universe_simulation.cpp
rename to deerith_engine_server/src/world/world_simulation.cpp