diff --git a/audio/effect/2.0/IVisualizerEffect.hal b/audio/effect/2.0/IVisualizerEffect.hal
index 2a7ddb8..70dabf9 100644
--- a/audio/effect/2.0/IVisualizerEffect.hal
+++ b/audio/effect/2.0/IVisualizerEffect.hal
@@ -36,10 +36,10 @@
     getCaptureSize() generates (Result retval, uint16_t captureSize);
 
     enum ScalingMode {
-        // Keep in sync with
+        // Keep in sync with SCALING_MODE_... in
         // frameworks/base/media/java/android/media/audiofx/Visualizer.java
-        SCALING_MODE_NORMALIZED = 0,
-        SCALING_MODE_AS_PLAYED = 1
+        NORMALIZED = 0,
+        AS_PLAYED = 1
     };
 
     /*
@@ -63,10 +63,10 @@
     getLatency() generates (Result retval, uint32_t latencyMs);
 
     enum MeasurementMode {
-        // Keep in sync with
+        // Keep in sync with MEASUREMENT_MODE_... in
         // frameworks/base/media/java/android/media/audiofx/Visualizer.java
-        MEASUREMENT_MODE_NONE = 0x0,
-        MEASUREMENT_MODE_PEAK_RMS = 0x1
+        NONE = 0x0,
+        PEAK_RMS = 0x1
     };
 
     /*
@@ -97,7 +97,7 @@
                 int32_t peakMb;  // millibels
                 int32_t rmsMb;   // millibels
             } peakAndRms;
-        };
+        } value;
     };
     /*
      * Retrieves the lastest measurements. The measurements to be made