diff --git a/sources/Component/Music/MusicComponent.hpp b/sources/Component/Music/MusicComponent.hpp
index 2d291e47..7898fd6e 100644
--- a/sources/Component/Music/MusicComponent.hpp
+++ b/sources/Component/Music/MusicComponent.hpp
@@ -31,7 +31,7 @@ namespace BBM
 
 		//! @brief is music playing
 		bool isPlaying(void);
-		
+		//! @brief update music stream
 		void updateMusicStream(void);
 		//! @inherit
 		WAL::Component *clone(WAL::Entity &entity) const override;
diff --git a/sources/System/Music/MusicSystem.hpp b/sources/System/Music/MusicSystem.hpp
index ce65321c..d524d300 100644
--- a/sources/System/Music/MusicSystem.hpp
+++ b/sources/System/Music/MusicSystem.hpp
@@ -25,7 +25,7 @@ namespace BBM
 		MusicSystem(const MusicSystem &) = default;
 		//! @brief Default dtor
 		~MusicSystem() override = default;
-		//! @brief A SoundManager screen system can't be assigned.
+		//! @brief A MusicManager screen system can't be assigned.
 		MusicSystem &operator=(const MusicSystem &) = delete;
 	};
 }
diff --git a/sources/System/Sound/PlayerSoundManagerSystem.cpp b/sources/System/Sound/PlayerSoundManagerSystem.cpp
index 487a4081..2bd4b6ab 100644
--- a/sources/System/Sound/PlayerSoundManagerSystem.cpp
+++ b/sources/System/Sound/PlayerSoundManagerSystem.cpp
@@ -7,18 +7,18 @@
 
 namespace BBM {
 
-	SoundManagerSystem::SoundManagerSystem(WAL::Wal &wal)
+	PlayerSoundManagerSystem::PlayerSoundManagerSystem(WAL::Wal &wal)
 		: System(wal)
 	{}
 
-	void SoundManagerSystem::onFixedUpdate(WAL::ViewEntity<SoundComponent, ControllableComponent, HealthComponent> &entity)
+	void PlayerSoundManagerSystem::onFixedUpdate(WAL::ViewEntity<SoundComponent, ControllableComponent, HealthComponent> &entity)
 	{
 		const auto &controllable = entity.get<ControllableComponent>();
 		auto &sound = entity.get<SoundComponent>();
 		auto &health = entity.get<HealthComponent>();
 		
 		sound.setVolume(sound.volume);
-		std::map<bool, SoundComponent::soundIndex> soundIndex = {
+		std::map<bool, SoundComponent::SoundIndex> soundIndex = {
 			{controllable.bomb, SoundComponent::BOMB},
 			{controllable.jump, SoundComponent::JUMP},
 			{controllable.move.x != 0 || controllable.move.y != 0, SoundComponent::MOVE}
diff --git a/sources/System/Sound/PlayerSoundManagerSystem.hpp b/sources/System/Sound/PlayerSoundManagerSystem.hpp
index 42869888..6e49763b 100644
--- a/sources/System/Sound/PlayerSoundManagerSystem.hpp
+++ b/sources/System/Sound/PlayerSoundManagerSystem.hpp
@@ -13,19 +13,19 @@
 
 namespace BBM
 {
-	class SoundManagerSystem : public WAL::System<SoundComponent, ControllableComponent, HealthComponent>
+	class PlayerSoundManagerSystem : public WAL::System<SoundComponent, ControllableComponent, HealthComponent>
 	{
 	public:
 		//! @inherit
 		void onFixedUpdate(WAL::ViewEntity<SoundComponent, ControllableComponent, HealthComponent> &entity) override;
 		
 		//! @brief ctor
-		SoundManagerSystem(WAL::Wal &wal);
+		PlayerSoundManagerSystem(WAL::Wal &wal);
 		//! @brief Default copy ctor
-		SoundManagerSystem(const SoundManagerSystem &) = default;
+		PlayerSoundManagerSystem(const PlayerSoundManagerSystem &) = default;
 		//! @brief Default dtor
-		~SoundManagerSystem() override = default;
+		~PlayerSoundManagerSystem() override = default;
 		//! @brief A SoundManager screen system can't be assigned.
-		SoundManagerSystem &operator=(const SoundManagerSystem &) = delete;
+		PlayerSoundManagerSystem &operator=(const PlayerSoundManagerSystem &) = delete;
 	};
 }