diff --git a/provider/doc.go b/provider/doc.go
deleted file mode 100644
index ef541e8048..0000000000
--- a/provider/doc.go
+++ /dev/null
@@ -1,3 +0,0 @@
-// Package provider contains the interface and primary types required to
-// implement a Terraform resource provider.
-package provider
diff --git a/providers/doc.go b/providers/doc.go
new file mode 100644
index 0000000000..39aa1de60f
--- /dev/null
+++ b/providers/doc.go
@@ -0,0 +1,3 @@
+// Package providers contains the interface and primary types required to
+// implement a Terraform resource provider.
+package providers
diff --git a/provider/provider.go b/providers/provider.go
similarity index 99%
rename from provider/provider.go
rename to providers/provider.go
index 9769b80d2e..d45d2b22ab 100644
--- a/provider/provider.go
+++ b/providers/provider.go
@@ -1,4 +1,4 @@
-package provider
+package providers
 
 import (
 	"github.com/hashicorp/terraform/config/configschema"
diff --git a/provisioner/doc.go b/provisioners/doc.go
similarity index 100%
rename from provisioner/doc.go
rename to provisioners/doc.go
diff --git a/provisioner/provisioner.go b/provisioners/provisioner.go
similarity index 93%
rename from provisioner/provisioner.go
rename to provisioners/provisioner.go
index 57a8bd9c3f..0cd86b99f7 100644
--- a/provisioner/provisioner.go
+++ b/provisioners/provisioner.go
@@ -53,9 +53,9 @@ type ProvisionResourceRequest struct {
 	// Config is the complete provisioner configuration.
 	Config cty.Value
 
-	// Connection is a map of string values containing any information required
-	// to access the resource instance.
-	Connection map[string]string
+	// Connection contains any information required to access the resource
+	// instance.
+	Connection cty.Value
 
 	// UIOutput is used to return output during the Apply operation.
 	UIOutput UIOutput