diff --git a/plugins/kernel_v2/config/disk.rb b/plugins/kernel_v2/config/disk.rb
index 7c0386cdf..ae8f7ad24 100644
--- a/plugins/kernel_v2/config/disk.rb
+++ b/plugins/kernel_v2/config/disk.rb
@@ -112,8 +112,9 @@ module VagrantPlugins
         @size = nil if @size == UNSET_VALUE
         @primary = true if @primary == UNSET_VALUE
 
-        # generate name instead of nil if unset_value
-        @name = nil if @name == UNSET_VALUE
+        # Give the disk a default name if unset
+        # TODO: Name not required if primray?
+        @name = "vagrant_#{@type.to_s}_#{@id.split("-").last}" if @name == UNSET_VALUE
 
         @config = nil if @config == UNSET_VALUE
       end
diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb
index 69aab52f2..3bb7d41e1 100644
--- a/plugins/kernel_v2/config/vm.rb
+++ b/plugins/kernel_v2/config/vm.rb
@@ -791,6 +791,8 @@ module VagrantPlugins
           errors << "There is more than one disk defined for guest '#{machine.name}'. Please pick a `primary` disk."
         end
 
+        # TODO: Check for duplicate disk names?
+
         @__disks.each do |d|
           error = d.validate(machine)
           errors.concat error if !error.empty?