diff --git a/src/opus.h b/src/opus.h
index 4ffe4446f5b8e9f77bdc1b4683f05a3f00610996..93d6c7c292d2d1af241126caf03adce5d63e0c5e 100644
--- a/src/opus.h
+++ b/src/opus.h
@@ -95,10 +95,10 @@ extern "C" {
 #define OPUS_GET_BITRATE_REQUEST 3
 #define OPUS_GET_BITRATE(x) OPUS_GET_BITRATE_REQUEST, __check_int_ptr(x)
 
-#define OPUS_SET_VBR_FLAG_REQUEST 6
-#define OPUS_SET_VBR_FLAG(x) OPUS_SET_VBR_FLAG_REQUEST, __check_int(x)
-#define OPUS_GET_VBR_FLAG_REQUEST 7
-#define OPUS_GET_VBR_FLAG(x) OPUS_GET_VBR_FLAG_REQUEST, __check_int_ptr(x)
+#define OPUS_SET_VBR_REQUEST 6
+#define OPUS_SET_VBR(x) OPUS_SET_VBR_REQUEST, __check_int(x)
+#define OPUS_GET_VBR_REQUEST 7
+#define OPUS_GET_VBR(x) OPUS_GET_VBR_REQUEST, __check_int_ptr(x)
 
 #define OPUS_SET_BANDWIDTH_REQUEST 8
 #define OPUS_SET_BANDWIDTH(x) OPUS_SET_BANDWIDTH_REQUEST, __check_int(x)
diff --git a/src/opus_encoder.c b/src/opus_encoder.c
index f47d013d81645999c90f37f1dd58a2cb98513f05..5e7c9698c52fc5766d5d14939728786ca2621786 100644
--- a/src/opus_encoder.c
+++ b/src/opus_encoder.c
@@ -872,14 +872,14 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             *value = st->silk_mode.packetLossPercentage;
         }
         break;
-        case OPUS_SET_VBR_FLAG_REQUEST:
+        case OPUS_SET_VBR_REQUEST:
         {
             int value = va_arg(ap, int);
             st->use_vbr = value;
             st->silk_mode.useCBR = 1-value;
         }
         break;
-        case OPUS_GET_VBR_FLAG_REQUEST:
+        case OPUS_GET_VBR_REQUEST:
         {
             int *value = va_arg(ap, int*);
             *value = st->use_vbr;
diff --git a/src/test_opus.c b/src/test_opus.c
index 3becf36e7df9351abfb96171a360e440ee84df86..43e101b715fc0d7a8b7f8f1429b739a4bbe1077d 100644
--- a/src/test_opus.c
+++ b/src/test_opus.c
@@ -270,7 +270,7 @@ int main(int argc, char *argv[])
 
     opus_encoder_ctl(enc, OPUS_SET_BITRATE(bitrate_bps));
     opus_encoder_ctl(enc, OPUS_SET_BANDWIDTH(bandwidth));
-    opus_encoder_ctl(enc, OPUS_SET_VBR_FLAG(use_vbr));
+    opus_encoder_ctl(enc, OPUS_SET_VBR(use_vbr));
     opus_encoder_ctl(enc, OPUS_SET_VBR_CONSTRAINT(cvbr));
     opus_encoder_ctl(enc, OPUS_SET_COMPLEXITY(complexity));
     opus_encoder_ctl(enc, OPUS_SET_INBAND_FEC_FLAG(use_inbandfec));