diff --git a/windows_2008_r2.json b/windows_2008_r2.json
index 38ae7263..a11ba6eb 100644
--- a/windows_2008_r2.json
+++ b/windows_2008_r2.json
@@ -21,7 +21,7 @@
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "6h",
+      "ssh_timeout": "6h",
       "tools_upload_flavor": "windows",
       "type": "vmware-iso",
       "vmx_data": {
@@ -52,7 +52,7 @@
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "6h",
+      "ssh_timeout": "6h",
       "type": "virtualbox-iso"
     }
   ],
diff --git a/windows_2008_r2_core.json b/windows_2008_r2_core.json
index 0fe41281..df409d96 100644
--- a/windows_2008_r2_core.json
+++ b/windows_2008_r2_core.json
@@ -19,7 +19,7 @@
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "2h",
+      "ssh_timeout": "2h",
       "tools_upload_flavor": "windows",
       "type": "vmware-iso",
       "vmx_data": {
@@ -48,7 +48,7 @@
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "2h",
+      "ssh_timeout": "2h",
       "type": "virtualbox-iso"
     }
   ],
diff --git a/windows_2012.json b/windows_2012.json
index ff78b33a..fc3ba62e 100644
--- a/windows_2012.json
+++ b/windows_2012.json
@@ -20,7 +20,7 @@
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "2h",
+      "ssh_timeout": "2h",
       "tools_upload_flavor": "windows",
       "type": "vmware-iso",
       "vmx_data": {
@@ -50,7 +50,7 @@
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "2h",
+      "ssh_timeout": "2h",
       "type": "virtualbox-iso"
     }
   ],
diff --git a/windows_2012_r2_hyperv.json b/windows_2012_r2_hyperv.json
index 4782611a..91948be6 100644
--- a/windows_2012_r2_hyperv.json
+++ b/windows_2012_r2_hyperv.json
@@ -20,7 +20,7 @@
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "6h",
+      "ssh_timeout": "6h",
       "tools_upload_flavor": "windows",
       "type": "vmware-iso",
       "vmx_data": {
@@ -50,7 +50,7 @@
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "6h",
+      "ssh_timeout": "6h",
       "type": "virtualbox-iso"
     }
   ],
diff --git a/windows_7.json b/windows_7.json
index e63143a6..aca1493b 100644
--- a/windows_7.json
+++ b/windows_7.json
@@ -22,7 +22,7 @@
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "8h",
+      "ssh_timeout": "8h",
       "type": "qemu",
       "accelerator": "kvm",
       "output_directory": "windows_7-qemu",
@@ -56,7 +56,7 @@
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "8h",
+      "ssh_timeout": "8h",
       "tools_upload_flavor": "windows",
       "type": "vmware-iso",
       "vmx_data": {
@@ -90,7 +90,7 @@
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "8h",
+      "ssh_timeout": "8h",
       "type": "virtualbox-iso",
       "vboxmanage": [
         [
diff --git a/windows_81.json b/windows_81.json
index 0d83b5be..0422a5af 100644
--- a/windows_81.json
+++ b/windows_81.json
@@ -20,7 +20,7 @@
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "4h",
+      "ssh_timeout": "4h",
       "tools_upload_flavor": "windows",
       "type": "vmware-iso",
       "vmx_data": {
@@ -50,7 +50,7 @@
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
       "ssh_username": "vagrant",
-      "ssh_wait_timeout": "4h",
+      "ssh_timeout": "4h",
       "type": "virtualbox-iso",
       "vboxmanage": [
         [