diff --git a/sources/Component/Movable/MovableComponent.cpp b/sources/Component/Movable/MovableComponent.cpp
index c0e9e52d..2bbbde92 100644
--- a/sources/Component/Movable/MovableComponent.cpp
+++ b/sources/Component/Movable/MovableComponent.cpp
@@ -4,7 +4,7 @@
 
 #include "MovableComponent.hpp"
 
-namespace Bomberman
+namespace BBM
 {
 	MovableComponent::MovableComponent(WAL::Entity &entity)
 		: Component(entity)
diff --git a/sources/Component/Movable/MovableComponent.hpp b/sources/Component/Movable/MovableComponent.hpp
index 2f194378..5266232a 100644
--- a/sources/Component/Movable/MovableComponent.hpp
+++ b/sources/Component/Movable/MovableComponent.hpp
@@ -7,7 +7,7 @@
 #include "Models/Vector3.hpp"
 #include "Entity/Entity.hpp"
 
-namespace Bomberman
+namespace BBM
 {
 	//! @brief A component to place on entities that can move or be moved.
 	class MovableComponent : public WAL::Component
diff --git a/sources/Component/Position/PositionComponent.cpp b/sources/Component/Position/PositionComponent.cpp
index d992a4a5..c237f845 100644
--- a/sources/Component/Position/PositionComponent.cpp
+++ b/sources/Component/Position/PositionComponent.cpp
@@ -4,7 +4,7 @@
 
 #include "PositionComponent.hpp"
 
-namespace Bomberman
+namespace BBM
 {
 	PositionComponent::PositionComponent(WAL::Entity &entity)
 		: Component(entity),
diff --git a/sources/Component/Position/PositionComponent.hpp b/sources/Component/Position/PositionComponent.hpp
index 18c5faee..368934eb 100644
--- a/sources/Component/Position/PositionComponent.hpp
+++ b/sources/Component/Position/PositionComponent.hpp
@@ -7,7 +7,7 @@
 #include "Models/Vector3.hpp"
 #include "Component/Component.hpp"
 
-namespace Bomberman
+namespace BBM
 {
 	//! @brief A basic position component
 	class PositionComponent : public WAL::Component
diff --git a/sources/Models/GameState.hpp b/sources/Models/GameState.hpp
index 7be6b723..883578bf 100644
--- a/sources/Models/GameState.hpp
+++ b/sources/Models/GameState.hpp
@@ -9,7 +9,7 @@
 #include <Scene/Scene.hpp>
 
 
-namespace Bomberman
+namespace BBM
 {
 	//! @brief A class representing the current game state. This allow one to retain information between update calls.
 	class GameState
diff --git a/sources/Models/Vector3.hpp b/sources/Models/Vector3.hpp
index ab642e94..094f6da9 100644
--- a/sources/Models/Vector3.hpp
+++ b/sources/Models/Vector3.hpp
@@ -8,7 +8,7 @@
 #include <iostream>
 #include <cmath>
 
-namespace Bomberman
+namespace BBM
 {
 	//! @brief A Vector3 data type. (templated to allow any kind of vector3)
 	template<typename T>
@@ -160,7 +160,7 @@ namespace Bomberman
 }
 
 template<typename T>
-std::ostream &operator<<(std::ostream &s, const Bomberman::Vector3<T> &v)
+std::ostream &operator<<(std::ostream &s, const BBM::Vector3<T> &v)
 {
 	s << "Vector3<" << typeid(T).name() << ">("<< v.x << ", " << v.y << ", " << v.z << ")";
 	return s;
diff --git a/sources/Runner/Runner.cpp b/sources/Runner/Runner.cpp
index 837831cc..ff2dc933 100644
--- a/sources/Runner/Runner.cpp
+++ b/sources/Runner/Runner.cpp
@@ -7,7 +7,7 @@
 #include "Runner.hpp"
 #include "Models/GameState.hpp"
 
-namespace Bomberman
+namespace BBM
 {
 	void updateState(WAL::Wal &engine, GameState &state)
 	{
diff --git a/sources/Runner/Runner.hpp b/sources/Runner/Runner.hpp
index 4531039a..0f622f11 100644
--- a/sources/Runner/Runner.hpp
+++ b/sources/Runner/Runner.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-namespace Bomberman
+namespace BBM
 {
 	//! @brief Start the game and run a Bomberman.
 	//! @return 0 on success, another value on error.
diff --git a/sources/System/Movable/MovableSystem.cpp b/sources/System/Movable/MovableSystem.cpp
index d8b88a48..2f699ece 100644
--- a/sources/System/Movable/MovableSystem.cpp
+++ b/sources/System/Movable/MovableSystem.cpp
@@ -7,7 +7,7 @@
 #include "Component/Movable/MovableComponent.hpp"
 #include "Wal.hpp"
 
-namespace Bomberman
+namespace BBM
 {
 	MovableSystem::MovableSystem()
 		: System({
diff --git a/sources/System/Movable/MovableSystem.hpp b/sources/System/Movable/MovableSystem.hpp
index 0bb89652..08555d26 100644
--- a/sources/System/Movable/MovableSystem.hpp
+++ b/sources/System/Movable/MovableSystem.hpp
@@ -7,7 +7,7 @@
 
 #include "System/System.hpp"
 
-namespace Bomberman
+namespace BBM
 {
 	//! @brief A system to handle movable entities. This system update velocity based on accelerations and positions based on velocity.
 	class MovableSystem : public WAL::System
diff --git a/sources/main.cpp b/sources/main.cpp
index d29f7374..cd4efc41 100644
--- a/sources/main.cpp
+++ b/sources/main.cpp
@@ -107,5 +107,5 @@ int main(int argc, char **argv)
 		return 1;
 	}
 	return demo();
-	return Bomberman::run();
+	return BBM::run();
 }
diff --git a/tests/EngineTests.cpp b/tests/EngineTests.cpp
index 8c908dac..804b6050 100644
--- a/tests/EngineTests.cpp
+++ b/tests/EngineTests.cpp
@@ -8,7 +8,7 @@
 #include <catch2/catch.hpp>
 
 using namespace WAL;
-using namespace Bomberman;
+using namespace BBM;
 
 TEST_CASE("Create system", "[Engine][System]")
 {
diff --git a/tests/EntityTests.cpp b/tests/EntityTests.cpp
index 3b009cad..f58fd0c1 100644
--- a/tests/EntityTests.cpp
+++ b/tests/EntityTests.cpp
@@ -7,7 +7,7 @@
 #include <catch2/catch.hpp>
 
 using namespace WAL;
-using namespace Bomberman;
+using namespace BBM;
 
 TEST_CASE("Component", "[Entity]")
 {