diff --git a/builder/vmware/iso/artifact.go b/builder/vmware/iso/artifact.go
index 7e6fddb92..56924c3df 100644
--- a/builder/vmware/iso/artifact.go
+++ b/builder/vmware/iso/artifact.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"fmt"
diff --git a/builder/vmware/iso/artifact_test.go b/builder/vmware/iso/artifact_test.go
index ea96fe569..4394c2735 100644
--- a/builder/vmware/iso/artifact_test.go
+++ b/builder/vmware/iso/artifact_test.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"github.com/mitchellh/packer/packer"
diff --git a/builder/vmware/iso/builder.go b/builder/vmware/iso/builder.go
index 5df26f0ac..a65176d2c 100644
--- a/builder/vmware/iso/builder.go
+++ b/builder/vmware/iso/builder.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"errors"
diff --git a/builder/vmware/iso/builder_test.go b/builder/vmware/iso/builder_test.go
index 893970768..a722595cd 100644
--- a/builder/vmware/iso/builder_test.go
+++ b/builder/vmware/iso/builder_test.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"github.com/mitchellh/packer/packer"
diff --git a/builder/vmware/iso/driver.go b/builder/vmware/iso/driver.go
index 7031aebd5..3e52af5a8 100644
--- a/builder/vmware/iso/driver.go
+++ b/builder/vmware/iso/driver.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"bytes"
diff --git a/builder/vmware/iso/driver_esx5.go b/builder/vmware/iso/driver_esx5.go
index 83d326333..2fc86f70c 100644
--- a/builder/vmware/iso/driver_esx5.go
+++ b/builder/vmware/iso/driver_esx5.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"bufio"
diff --git a/builder/vmware/iso/driver_esx5_test.go b/builder/vmware/iso/driver_esx5_test.go
index 2c3184199..577e68d71 100644
--- a/builder/vmware/iso/driver_esx5_test.go
+++ b/builder/vmware/iso/driver_esx5_test.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"testing"
diff --git a/builder/vmware/iso/driver_fusion5.go b/builder/vmware/iso/driver_fusion5.go
index a857237ae..5674acafe 100644
--- a/builder/vmware/iso/driver_fusion5.go
+++ b/builder/vmware/iso/driver_fusion5.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"fmt"
diff --git a/builder/vmware/iso/driver_player5.go b/builder/vmware/iso/driver_player5.go
index 7f68a80a2..56a8b0b06 100644
--- a/builder/vmware/iso/driver_player5.go
+++ b/builder/vmware/iso/driver_player5.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"fmt"
diff --git a/builder/vmware/iso/driver_workstation9.go b/builder/vmware/iso/driver_workstation9.go
index 47ac14220..101572ada 100644
--- a/builder/vmware/iso/driver_workstation9.go
+++ b/builder/vmware/iso/driver_workstation9.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"fmt"
diff --git a/builder/vmware/iso/driver_workstation9_unix.go b/builder/vmware/iso/driver_workstation9_unix.go
index 31d0f33dc..c3c6288cd 100644
--- a/builder/vmware/iso/driver_workstation9_unix.go
+++ b/builder/vmware/iso/driver_workstation9_unix.go
@@ -1,6 +1,6 @@
 // +build !windows
 
-package vmware
+package iso
 
 import (
 	"errors"
diff --git a/builder/vmware/iso/driver_workstation9_windows.go b/builder/vmware/iso/driver_workstation9_windows.go
index 19a7679c9..3c4d91105 100644
--- a/builder/vmware/iso/driver_workstation9_windows.go
+++ b/builder/vmware/iso/driver_workstation9_windows.go
@@ -1,6 +1,6 @@
 // +build windows
 
-package vmware
+package iso
 
 import (
 	"log"
diff --git a/builder/vmware/iso/guest_ip.go b/builder/vmware/iso/guest_ip.go
index 7f259b418..2b9ca53fe 100644
--- a/builder/vmware/iso/guest_ip.go
+++ b/builder/vmware/iso/guest_ip.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"errors"
diff --git a/builder/vmware/iso/host_ip.go b/builder/vmware/iso/host_ip.go
index 452cca7dc..98a6d26df 100644
--- a/builder/vmware/iso/host_ip.go
+++ b/builder/vmware/iso/host_ip.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 // Interface to help find the host IP that is available from within
 // the VMware virtual machines.
diff --git a/builder/vmware/iso/host_ip_ifconfig.go b/builder/vmware/iso/host_ip_ifconfig.go
index 28e434b33..31243fafa 100644
--- a/builder/vmware/iso/host_ip_ifconfig.go
+++ b/builder/vmware/iso/host_ip_ifconfig.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"bytes"
diff --git a/builder/vmware/iso/host_ip_ifconfig_test.go b/builder/vmware/iso/host_ip_ifconfig_test.go
index 0f3d9266e..51ccc272c 100644
--- a/builder/vmware/iso/host_ip_ifconfig_test.go
+++ b/builder/vmware/iso/host_ip_ifconfig_test.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import "testing"
 
diff --git a/builder/vmware/iso/host_ip_vmnetnatconf.go b/builder/vmware/iso/host_ip_vmnetnatconf.go
index 888dfa81d..658a0abd4 100644
--- a/builder/vmware/iso/host_ip_vmnetnatconf.go
+++ b/builder/vmware/iso/host_ip_vmnetnatconf.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"bufio"
diff --git a/builder/vmware/iso/host_ip_vmnetnatconf_test.go b/builder/vmware/iso/host_ip_vmnetnatconf_test.go
index a5fc26f27..873a7fa2b 100644
--- a/builder/vmware/iso/host_ip_vmnetnatconf_test.go
+++ b/builder/vmware/iso/host_ip_vmnetnatconf_test.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import "testing"
 
diff --git a/builder/vmware/iso/output_dir.go b/builder/vmware/iso/output_dir.go
index c88e3f41b..5013d6905 100644
--- a/builder/vmware/iso/output_dir.go
+++ b/builder/vmware/iso/output_dir.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"os"
diff --git a/builder/vmware/iso/remote_driver.go b/builder/vmware/iso/remote_driver.go
index 07fb2f8e7..4a88ed1e6 100644
--- a/builder/vmware/iso/remote_driver.go
+++ b/builder/vmware/iso/remote_driver.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 type RemoteDriver interface {
 	Driver
diff --git a/builder/vmware/iso/ssh.go b/builder/vmware/iso/ssh.go
index 0b499db29..3c27c387b 100644
--- a/builder/vmware/iso/ssh.go
+++ b/builder/vmware/iso/ssh.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	gossh "code.google.com/p/go.crypto/ssh"
diff --git a/builder/vmware/iso/step_clean_files.go b/builder/vmware/iso/step_clean_files.go
index 7b6eaa8b5..f6c3f0fa4 100644
--- a/builder/vmware/iso/step_clean_files.go
+++ b/builder/vmware/iso/step_clean_files.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"fmt"
diff --git a/builder/vmware/iso/step_clean_vmx.go b/builder/vmware/iso/step_clean_vmx.go
index a40855d41..2b9d6f90c 100644
--- a/builder/vmware/iso/step_clean_vmx.go
+++ b/builder/vmware/iso/step_clean_vmx.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"fmt"
diff --git a/builder/vmware/iso/step_compact_disk.go b/builder/vmware/iso/step_compact_disk.go
index 4a87b4a1a..352ecf56e 100644
--- a/builder/vmware/iso/step_compact_disk.go
+++ b/builder/vmware/iso/step_compact_disk.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"fmt"
diff --git a/builder/vmware/iso/step_configure_vmx.go b/builder/vmware/iso/step_configure_vmx.go
index a9aeabe31..3b467eeaf 100644
--- a/builder/vmware/iso/step_configure_vmx.go
+++ b/builder/vmware/iso/step_configure_vmx.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"fmt"
diff --git a/builder/vmware/iso/step_configure_vmx_test.go b/builder/vmware/iso/step_configure_vmx_test.go
index e46812c9a..851841311 100644
--- a/builder/vmware/iso/step_configure_vmx_test.go
+++ b/builder/vmware/iso/step_configure_vmx_test.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"io/ioutil"
diff --git a/builder/vmware/iso/step_configure_vnc.go b/builder/vmware/iso/step_configure_vnc.go
index f6a41b48e..6e6c39a22 100644
--- a/builder/vmware/iso/step_configure_vnc.go
+++ b/builder/vmware/iso/step_configure_vnc.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"fmt"
diff --git a/builder/vmware/iso/step_create_disk.go b/builder/vmware/iso/step_create_disk.go
index 3b526812e..8544313c3 100644
--- a/builder/vmware/iso/step_create_disk.go
+++ b/builder/vmware/iso/step_create_disk.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"fmt"
diff --git a/builder/vmware/iso/step_create_vmx.go b/builder/vmware/iso/step_create_vmx.go
index b35d2885c..46bbf77e1 100644
--- a/builder/vmware/iso/step_create_vmx.go
+++ b/builder/vmware/iso/step_create_vmx.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"fmt"
diff --git a/builder/vmware/iso/step_http_server.go b/builder/vmware/iso/step_http_server.go
index 084816f63..24da8dd9d 100644
--- a/builder/vmware/iso/step_http_server.go
+++ b/builder/vmware/iso/step_http_server.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"fmt"
diff --git a/builder/vmware/iso/step_prepare_output_dir.go b/builder/vmware/iso/step_prepare_output_dir.go
index 2909712ef..abd2bbe29 100644
--- a/builder/vmware/iso/step_prepare_output_dir.go
+++ b/builder/vmware/iso/step_prepare_output_dir.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"fmt"
diff --git a/builder/vmware/iso/step_prepare_tools.go b/builder/vmware/iso/step_prepare_tools.go
index e26bcf8ed..3dc1e3482 100644
--- a/builder/vmware/iso/step_prepare_tools.go
+++ b/builder/vmware/iso/step_prepare_tools.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"fmt"
diff --git a/builder/vmware/iso/step_remote_upload.go b/builder/vmware/iso/step_remote_upload.go
index 47c9d04a7..00aca6e09 100644
--- a/builder/vmware/iso/step_remote_upload.go
+++ b/builder/vmware/iso/step_remote_upload.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"fmt"
diff --git a/builder/vmware/iso/step_run.go b/builder/vmware/iso/step_run.go
index d21f34ba1..66ed76377 100644
--- a/builder/vmware/iso/step_run.go
+++ b/builder/vmware/iso/step_run.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"fmt"
diff --git a/builder/vmware/iso/step_shutdown.go b/builder/vmware/iso/step_shutdown.go
index dae402763..67c6a29f4 100644
--- a/builder/vmware/iso/step_shutdown.go
+++ b/builder/vmware/iso/step_shutdown.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"bytes"
diff --git a/builder/vmware/iso/step_suppress_messages.go b/builder/vmware/iso/step_suppress_messages.go
index e4e101933..a936a5e6e 100644
--- a/builder/vmware/iso/step_suppress_messages.go
+++ b/builder/vmware/iso/step_suppress_messages.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"fmt"
diff --git a/builder/vmware/iso/step_test.go b/builder/vmware/iso/step_test.go
index 71bce40f8..04490cb29 100644
--- a/builder/vmware/iso/step_test.go
+++ b/builder/vmware/iso/step_test.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"bytes"
diff --git a/builder/vmware/iso/step_type_boot_command.go b/builder/vmware/iso/step_type_boot_command.go
index 688103c09..c72beecb7 100644
--- a/builder/vmware/iso/step_type_boot_command.go
+++ b/builder/vmware/iso/step_type_boot_command.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"fmt"
diff --git a/builder/vmware/iso/step_upload_tools.go b/builder/vmware/iso/step_upload_tools.go
index 630faef8d..95812a748 100644
--- a/builder/vmware/iso/step_upload_tools.go
+++ b/builder/vmware/iso/step_upload_tools.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"fmt"
diff --git a/builder/vmware/iso/vmx.go b/builder/vmware/iso/vmx.go
index ff60d5477..c4fc6d724 100644
--- a/builder/vmware/iso/vmx.go
+++ b/builder/vmware/iso/vmx.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import (
 	"bytes"
diff --git a/builder/vmware/iso/vmx_test.go b/builder/vmware/iso/vmx_test.go
index d8d554150..4b189b67b 100644
--- a/builder/vmware/iso/vmx_test.go
+++ b/builder/vmware/iso/vmx_test.go
@@ -1,4 +1,4 @@
-package vmware
+package iso
 
 import "testing"