diff --git a/builder/virtualbox/iso/artifact.go b/builder/virtualbox/iso/artifact.go
index a31b14aee..afbdf584f 100644
--- a/builder/virtualbox/iso/artifact.go
+++ b/builder/virtualbox/iso/artifact.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	"fmt"
diff --git a/builder/virtualbox/iso/builder.go b/builder/virtualbox/iso/builder.go
index 1091858ec..d89715d16 100644
--- a/builder/virtualbox/iso/builder.go
+++ b/builder/virtualbox/iso/builder.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	"errors"
diff --git a/builder/virtualbox/iso/builder_test.go b/builder/virtualbox/iso/builder_test.go
index 942bc059f..0874c4b60 100644
--- a/builder/virtualbox/iso/builder_test.go
+++ b/builder/virtualbox/iso/builder_test.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	"github.com/mitchellh/packer/packer"
diff --git a/builder/virtualbox/iso/driver.go b/builder/virtualbox/iso/driver.go
index 09ace38d9..6e1b79c8d 100644
--- a/builder/virtualbox/iso/driver.go
+++ b/builder/virtualbox/iso/driver.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	"bytes"
diff --git a/builder/virtualbox/iso/ssh.go b/builder/virtualbox/iso/ssh.go
index b685a545f..2eb3cc8ab 100644
--- a/builder/virtualbox/iso/ssh.go
+++ b/builder/virtualbox/iso/ssh.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	gossh "code.google.com/p/go.crypto/ssh"
diff --git a/builder/virtualbox/iso/step_attach_floppy.go b/builder/virtualbox/iso/step_attach_floppy.go
index 8f41441a5..86a0b7c48 100644
--- a/builder/virtualbox/iso/step_attach_floppy.go
+++ b/builder/virtualbox/iso/step_attach_floppy.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	"fmt"
diff --git a/builder/virtualbox/iso/step_attach_guest_additions.go b/builder/virtualbox/iso/step_attach_guest_additions.go
index c0710bc16..a7832a768 100644
--- a/builder/virtualbox/iso/step_attach_guest_additions.go
+++ b/builder/virtualbox/iso/step_attach_guest_additions.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	"fmt"
diff --git a/builder/virtualbox/iso/step_attach_iso.go b/builder/virtualbox/iso/step_attach_iso.go
index ee45647b1..3eeeeec6a 100644
--- a/builder/virtualbox/iso/step_attach_iso.go
+++ b/builder/virtualbox/iso/step_attach_iso.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	"fmt"
diff --git a/builder/virtualbox/iso/step_create_disk.go b/builder/virtualbox/iso/step_create_disk.go
index f0d803295..64dce39b3 100644
--- a/builder/virtualbox/iso/step_create_disk.go
+++ b/builder/virtualbox/iso/step_create_disk.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	"fmt"
diff --git a/builder/virtualbox/iso/step_create_vm.go b/builder/virtualbox/iso/step_create_vm.go
index 3453c168b..4b88ac8ce 100644
--- a/builder/virtualbox/iso/step_create_vm.go
+++ b/builder/virtualbox/iso/step_create_vm.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	"fmt"
diff --git a/builder/virtualbox/iso/step_download_guest_additions.go b/builder/virtualbox/iso/step_download_guest_additions.go
index 6dd2c9cca..5905dfed7 100644
--- a/builder/virtualbox/iso/step_download_guest_additions.go
+++ b/builder/virtualbox/iso/step_download_guest_additions.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	"bytes"
diff --git a/builder/virtualbox/iso/step_export.go b/builder/virtualbox/iso/step_export.go
index 3a875c5d7..37d113410 100644
--- a/builder/virtualbox/iso/step_export.go
+++ b/builder/virtualbox/iso/step_export.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	"fmt"
diff --git a/builder/virtualbox/iso/step_forward_ssh.go b/builder/virtualbox/iso/step_forward_ssh.go
index 55a46611e..351513a11 100644
--- a/builder/virtualbox/iso/step_forward_ssh.go
+++ b/builder/virtualbox/iso/step_forward_ssh.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	"fmt"
diff --git a/builder/virtualbox/iso/step_http_server.go b/builder/virtualbox/iso/step_http_server.go
index ad3e9f755..24da8dd9d 100644
--- a/builder/virtualbox/iso/step_http_server.go
+++ b/builder/virtualbox/iso/step_http_server.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	"fmt"
diff --git a/builder/virtualbox/iso/step_prepare_output_dir.go b/builder/virtualbox/iso/step_prepare_output_dir.go
index 4a3e6c844..42c9124b5 100644
--- a/builder/virtualbox/iso/step_prepare_output_dir.go
+++ b/builder/virtualbox/iso/step_prepare_output_dir.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	"fmt"
diff --git a/builder/virtualbox/iso/step_remove_devices.go b/builder/virtualbox/iso/step_remove_devices.go
index f0f4a46c3..4fcaeb6e4 100644
--- a/builder/virtualbox/iso/step_remove_devices.go
+++ b/builder/virtualbox/iso/step_remove_devices.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	"fmt"
diff --git a/builder/virtualbox/iso/step_run.go b/builder/virtualbox/iso/step_run.go
index 1a44c10c2..de4936dd9 100644
--- a/builder/virtualbox/iso/step_run.go
+++ b/builder/virtualbox/iso/step_run.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	"fmt"
diff --git a/builder/virtualbox/iso/step_shutdown.go b/builder/virtualbox/iso/step_shutdown.go
index 713368e8c..7c36a2534 100644
--- a/builder/virtualbox/iso/step_shutdown.go
+++ b/builder/virtualbox/iso/step_shutdown.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	"errors"
diff --git a/builder/virtualbox/iso/step_suppress_messages.go b/builder/virtualbox/iso/step_suppress_messages.go
index 4ed7f1939..595d97004 100644
--- a/builder/virtualbox/iso/step_suppress_messages.go
+++ b/builder/virtualbox/iso/step_suppress_messages.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	"fmt"
diff --git a/builder/virtualbox/iso/step_type_boot_command.go b/builder/virtualbox/iso/step_type_boot_command.go
index ec3df82a6..f0680efe9 100644
--- a/builder/virtualbox/iso/step_type_boot_command.go
+++ b/builder/virtualbox/iso/step_type_boot_command.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	"fmt"
diff --git a/builder/virtualbox/iso/step_upload_guest_additions.go b/builder/virtualbox/iso/step_upload_guest_additions.go
index 2dce09d0e..839943125 100644
--- a/builder/virtualbox/iso/step_upload_guest_additions.go
+++ b/builder/virtualbox/iso/step_upload_guest_additions.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	"fmt"
diff --git a/builder/virtualbox/iso/step_upload_version.go b/builder/virtualbox/iso/step_upload_version.go
index c22a08117..b84b5d948 100644
--- a/builder/virtualbox/iso/step_upload_version.go
+++ b/builder/virtualbox/iso/step_upload_version.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	"bytes"
diff --git a/builder/virtualbox/iso/step_vboxmanage.go b/builder/virtualbox/iso/step_vboxmanage.go
index 2bc41b90b..e5c80f4b5 100644
--- a/builder/virtualbox/iso/step_vboxmanage.go
+++ b/builder/virtualbox/iso/step_vboxmanage.go
@@ -1,4 +1,4 @@
-package virtualbox
+package iso
 
 import (
 	"fmt"