diff --git a/app/src/main/java/org/toop/Main.java b/app/src/main/java/org/toop/Main.java
index aeb4645..b2887a2 100644
--- a/app/src/main/java/org/toop/Main.java
+++ b/app/src/main/java/org/toop/Main.java
@@ -26,8 +26,8 @@ public final class Main {
                         mm,
                         sem,
                         new AudioVolumeManager()
-                                .registerManager(VolumeTypes.VOLUME, mm)
-                                .registerManager(VolumeTypes.VOLUME, sem)
+                                .registerManager(VolumeTypes.MASTERVOLUME, mm)
+                                .registerManager(VolumeTypes.MASTERVOLUME, sem)
                                 .registerManager(VolumeTypes.FX, sem)
                                 .registerManager(VolumeTypes.MUSIC, mm)
                     ); a.initListeners();
diff --git a/framework/src/main/java/org/toop/framework/audio/AudioEventListener.java b/framework/src/main/java/org/toop/framework/audio/AudioEventListener.java
index bfa5a54..25aa599 100644
--- a/framework/src/main/java/org/toop/framework/audio/AudioEventListener.java
+++ b/framework/src/main/java/org/toop/framework/audio/AudioEventListener.java
@@ -56,7 +56,7 @@ public class AudioEventListener<T extends AudioResource, K extends AudioResource
     }
 
     private void handleVolumeChange(AudioEvents.ChangeVolume event) {
-        this.audioVolumeManager.setVolume(event.newVolume() / 100, VolumeTypes.VOLUME);
+        this.audioVolumeManager.setVolume(event.newVolume() / 100, VolumeTypes.MASTERVOLUME);
         this.audioVolumeManager.updateAllVolumes();
     }
 
@@ -74,7 +74,7 @@ public class AudioEventListener<T extends AudioResource, K extends AudioResource
         new EventFlow()
             .addPostEvent(
                     new AudioEvents.GetCurrentVolumeResponse(
-                            audioVolumeManager.getVolume(VolumeTypes.VOLUME),
+                            audioVolumeManager.getVolume(VolumeTypes.MASTERVOLUME),
                             event.snowflakeId()))
             .asyncPostEvent();
     }
diff --git a/framework/src/main/java/org/toop/framework/audio/AudioVolumeManager.java b/framework/src/main/java/org/toop/framework/audio/AudioVolumeManager.java
index 478cc9a..edcb648 100644
--- a/framework/src/main/java/org/toop/framework/audio/AudioVolumeManager.java
+++ b/framework/src/main/java/org/toop/framework/audio/AudioVolumeManager.java
@@ -7,7 +7,7 @@ import org.toop.framework.resource.types.AudioResource;
 public class AudioVolumeManager implements VolumeManager {
 
     public void setVolume(double newVolume, VolumeTypes type) {
-        type.setVolume(newVolume, VolumeTypes.VOLUME.getVolume());
+        type.setVolume(newVolume, VolumeTypes.MASTERVOLUME.getVolume());
     }
 
     public double getVolume(VolumeTypes type) {
@@ -23,10 +23,10 @@ public class AudioVolumeManager implements VolumeManager {
 
     @Override
     public void updateAllVolumes() {
-        double masterVolume = VolumeTypes.VOLUME.getVolume();
+        double masterVolume = VolumeTypes.MASTERVOLUME.getVolume();
 
         for (VolumeTypes type : VolumeTypes.values()) {
-            if (type != VolumeTypes.VOLUME) { // skip master itself
+            if (type != VolumeTypes.MASTERVOLUME) { // skip master itself
                 type.setVolume(type.getVolume(), masterVolume);
             }
         }
diff --git a/framework/src/main/java/org/toop/framework/audio/VolumeTypes.java b/framework/src/main/java/org/toop/framework/audio/VolumeTypes.java
index 6875378..1e02c61 100644
--- a/framework/src/main/java/org/toop/framework/audio/VolumeTypes.java
+++ b/framework/src/main/java/org/toop/framework/audio/VolumeTypes.java
@@ -9,7 +9,7 @@ import java.util.List;
 import java.util.Objects;
 
 public enum VolumeTypes {
-    VOLUME(),
+    MASTERVOLUME(),
     FX(),
     MUSIC();
 
@@ -20,7 +20,7 @@ public enum VolumeTypes {
     public void setVolume(double newVolume, double currentMasterVolume) {
         this.volume = clamp(newVolume);
 
-        if (this != VOLUME) {
+        if (this != MASTERVOLUME) {
             this.masterVolume = clamp(currentMasterVolume);
         }
 
@@ -29,7 +29,7 @@ public enum VolumeTypes {
     }
 
     private double computeEffectiveVolume() {
-        return (this == VOLUME) ? volume : volume * masterVolume;
+        return (this == MASTERVOLUME) ? volume : volume * masterVolume;
     }
 
     private void broadcastVolume(double effectiveVolume) {
diff --git a/framework/src/main/java/org/toop/framework/resource/resources/MusicAsset.java b/framework/src/main/java/org/toop/framework/resource/resources/MusicAsset.java
index 111ab83..6cd2792 100644
--- a/framework/src/main/java/org/toop/framework/resource/resources/MusicAsset.java
+++ b/framework/src/main/java/org/toop/framework/resource/resources/MusicAsset.java
@@ -11,7 +11,6 @@ import org.toop.framework.resource.types.LoadableResource;
 public class MusicAsset extends BaseResource implements LoadableResource, AudioResource {
     private MediaPlayer mediaPlayer;
     private double volume;
-    private boolean isPlaying = false;
 
     public MusicAsset(final File audioFile) {
         super(audioFile);
@@ -25,7 +24,7 @@ public class MusicAsset extends BaseResource implements LoadableResource, AudioR
     private void initPlayer() {
         mediaPlayer.setOnEndOfMedia(this::stop);
         mediaPlayer.setOnError(this::stop);
-        mediaPlayer.setOnStopped(() -> isPlaying = false);
+        mediaPlayer.setOnStopped(null);
     }
 
     @Override
@@ -74,12 +73,10 @@ public class MusicAsset extends BaseResource implements LoadableResource, AudioR
     @Override
     public void play() {
         getMediaPlayer().play();
-        isPlaying = true;
     }
 
     @Override
     public void stop() {
         getMediaPlayer().stop();
-        isPlaying = false;
     }
 }