diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb
index a2b9f35f8..744649a12 100644
--- a/plugins/kernel_v2/config/vm.rb
+++ b/plugins/kernel_v2/config/vm.rb
@@ -433,8 +433,8 @@ module VagrantPlugins
         # Add provider config
         disk_config.add_provider_config(provider_options, &block)
 
-        if !Vagrant::Util::Experimental.feature_enabled?("virtualbox_disk_hdd")
-          @logger.warn("Disk config defined, but experimental feature is not enabled. To use this feature, enable it with the experimental flag `virtualbox_disk_hdd`. Disk will not be added to internal config, and will be ignored.")
+        if !Vagrant::Util::Experimental.feature_enabled?("disks")
+          @logger.warn("Disk config defined, but experimental feature is not enabled. To use this feature, enable it with the experimental flag `disks`. Disk will not be added to internal config, and will be ignored.")
           return
         end
 
diff --git a/plugins/providers/virtualbox/cap/cleanup_disks.rb b/plugins/providers/virtualbox/cap/cleanup_disks.rb
index 1416f042b..d9e11f7ff 100644
--- a/plugins/providers/virtualbox/cap/cleanup_disks.rb
+++ b/plugins/providers/virtualbox/cap/cleanup_disks.rb
@@ -13,7 +13,7 @@ module VagrantPlugins
         def self.cleanup_disks(machine, defined_disks, disk_meta_file)
           return if disk_meta_file.values.flatten.empty?
 
-          return if !Vagrant::Util::Experimental.feature_enabled?("virtualbox_disk_hdd")
+          return if !Vagrant::Util::Experimental.feature_enabled?("disks")
 
           handle_cleanup_disk(machine, defined_disks, disk_meta_file["disk"])
           # TODO: Floppy and DVD disks
diff --git a/plugins/providers/virtualbox/cap/configure_disks.rb b/plugins/providers/virtualbox/cap/configure_disks.rb
index f84a8b3d3..491b20691 100644
--- a/plugins/providers/virtualbox/cap/configure_disks.rb
+++ b/plugins/providers/virtualbox/cap/configure_disks.rb
@@ -18,7 +18,7 @@ module VagrantPlugins
         def self.configure_disks(machine, defined_disks)
           return {} if defined_disks.empty?
 
-          return {} if !Vagrant::Util::Experimental.feature_enabled?("virtualbox_disk_hdd")
+          return {} if !Vagrant::Util::Experimental.feature_enabled?("disks")
 
           if defined_disks.size > MAX_DISK_NUMBER
             # you can only attach up to 30 disks per controller, INCLUDING the primary disk
diff --git a/test/unit/plugins/kernel_v2/config/vm_test.rb b/test/unit/plugins/kernel_v2/config/vm_test.rb
index 8d0896771..c170c873f 100644
--- a/test/unit/plugins/kernel_v2/config/vm_test.rb
+++ b/test/unit/plugins/kernel_v2/config/vm_test.rb
@@ -556,7 +556,7 @@ describe VagrantPlugins::Kernel_V2::VMConfig do
   describe "#disk" do
     before(:each) do
       allow(Vagrant::Util::Experimental).to receive(:feature_enabled?).
-        with("virtualbox_disk_hdd").and_return("true")
+        with("disks").and_return("true")
     end
 
     it "stores the disks" do
diff --git a/website/source/docs/disks/usage.html.md b/website/source/docs/disks/usage.html.md
index 0cf074924..3fc3b4b42 100644
--- a/website/source/docs/disks/usage.html.md
+++ b/website/source/docs/disks/usage.html.md
@@ -16,7 +16,7 @@ description: |-
   This feature currently reqiures the experimental flag to be used. To explicitly enable this feature, you can set the experimental flag to:
 
   ```
-  VAGRANT_EXPERIMENTAL="virtualbox_disk_hdd"
+  VAGRANT_EXPERIMENTAL="disks"
   ```
 
   Please note that `VAGRANT_EXPERIMENTAL` is an environment variable. For more
diff --git a/website/source/docs/disks/virtualbox/index.html.md b/website/source/docs/disks/virtualbox/index.html.md
index 826343541..cee399420 100644
--- a/website/source/docs/disks/virtualbox/index.html.md
+++ b/website/source/docs/disks/virtualbox/index.html.md
@@ -17,7 +17,7 @@ description: |-
   This feature currently reqiures the experimental flag to be used. To explicitly enable this feature, you can set the experimental flag to:
 
   ```
-  VAGRANT_EXPERIMENTAL="virtualbox_disk_hdd"
+  VAGRANT_EXPERIMENTAL="disks"
   ```
 
   Please note that `VAGRANT_EXPERIMENTAL` is an environment variable. For more
diff --git a/website/source/docs/disks/virtualbox/usage.html.md b/website/source/docs/disks/virtualbox/usage.html.md
index f1b9444e0..fc179c5b8 100644
--- a/website/source/docs/disks/virtualbox/usage.html.md
+++ b/website/source/docs/disks/virtualbox/usage.html.md
@@ -17,7 +17,7 @@ description: |-
   This feature currently reqiures the experimental flag to be used. To explicitly enable this feature, you can set the experimental flag to:
 
   ```
-  VAGRANT_EXPERIMENTAL="virtualbox_disk_hdd"
+  VAGRANT_EXPERIMENTAL="disks"
   ```
 
   Please note that `VAGRANT_EXPERIMENTAL` is an environment variable. For more