diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go
index f5adf978f4a..f646c8557e6 100644
--- a/pkg/cloudprovider/providers/aws/aws.go
+++ b/pkg/cloudprovider/providers/aws/aws.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package aws_cloud
+package aws
 
 import (
 	"errors"
diff --git a/pkg/cloudprovider/providers/aws/aws_instancegroups.go b/pkg/cloudprovider/providers/aws/aws_instancegroups.go
index 643c8fa7c55..d870b04db11 100644
--- a/pkg/cloudprovider/providers/aws/aws_instancegroups.go
+++ b/pkg/cloudprovider/providers/aws/aws_instancegroups.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package aws_cloud
+package aws
 
 import (
 	"fmt"
diff --git a/pkg/cloudprovider/providers/aws/aws_loadbalancer.go b/pkg/cloudprovider/providers/aws/aws_loadbalancer.go
index 58d867ba520..ae83dc97337 100644
--- a/pkg/cloudprovider/providers/aws/aws_loadbalancer.go
+++ b/pkg/cloudprovider/providers/aws/aws_loadbalancer.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package aws_cloud
+package aws
 
 import (
 	"fmt"
diff --git a/pkg/cloudprovider/providers/aws/aws_routes.go b/pkg/cloudprovider/providers/aws/aws_routes.go
index cfa5db37006..42ba025bb71 100644
--- a/pkg/cloudprovider/providers/aws/aws_routes.go
+++ b/pkg/cloudprovider/providers/aws/aws_routes.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package aws_cloud
+package aws
 
 import (
 	"fmt"
diff --git a/pkg/cloudprovider/providers/aws/aws_test.go b/pkg/cloudprovider/providers/aws/aws_test.go
index e7245caf8de..e8b61c85a11 100644
--- a/pkg/cloudprovider/providers/aws/aws_test.go
+++ b/pkg/cloudprovider/providers/aws/aws_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package aws_cloud
+package aws
 
 import (
 	"fmt"
diff --git a/pkg/cloudprovider/providers/aws/aws_utils.go b/pkg/cloudprovider/providers/aws/aws_utils.go
index 1704d2988da..310b4898eca 100644
--- a/pkg/cloudprovider/providers/aws/aws_utils.go
+++ b/pkg/cloudprovider/providers/aws/aws_utils.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package aws_cloud
+package aws
 
 import (
 	"github.com/aws/aws-sdk-go/aws"
diff --git a/pkg/cloudprovider/providers/fake/doc.go b/pkg/cloudprovider/providers/fake/doc.go
index 9d285e995cb..fb73be6e6cd 100644
--- a/pkg/cloudprovider/providers/fake/doc.go
+++ b/pkg/cloudprovider/providers/fake/doc.go
@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package fake_cloud is a test-double implementation of cloudprovider
+// Package fake is a test-double implementation of cloudprovider
 // Interface, TCPLoadBalancer and Instances. It is useful for testing.
-package fake_cloud
+package fake
diff --git a/pkg/cloudprovider/providers/fake/fake.go b/pkg/cloudprovider/providers/fake/fake.go
index f66eee0c96c..beff4747d08 100644
--- a/pkg/cloudprovider/providers/fake/fake.go
+++ b/pkg/cloudprovider/providers/fake/fake.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package fake_cloud
+package fake
 
 import (
 	"errors"
diff --git a/pkg/cloudprovider/providers/gce/doc.go b/pkg/cloudprovider/providers/gce/doc.go
index 4f1bbb92cdc..1136fa64009 100644
--- a/pkg/cloudprovider/providers/gce/doc.go
+++ b/pkg/cloudprovider/providers/gce/doc.go
@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package gce_cloud is an implementation of Interface, TCPLoadBalancer
+// Package gce is an implementation of Interface, TCPLoadBalancer
 // and Instances for Google Compute Engine.
-package gce_cloud
+package gce
diff --git a/pkg/cloudprovider/providers/gce/gce.go b/pkg/cloudprovider/providers/gce/gce.go
index 884846f3dce..f6c5b11c33f 100644
--- a/pkg/cloudprovider/providers/gce/gce.go
+++ b/pkg/cloudprovider/providers/gce/gce.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package gce_cloud
+package gce
 
 import (
 	"fmt"
diff --git a/pkg/cloudprovider/providers/gce/gce_test.go b/pkg/cloudprovider/providers/gce/gce_test.go
index 0c2504c99c3..89b4bda820d 100644
--- a/pkg/cloudprovider/providers/gce/gce_test.go
+++ b/pkg/cloudprovider/providers/gce/gce_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package gce_cloud
+package gce
 
 import "testing"
 
diff --git a/pkg/cloudprovider/providers/gce/token_source.go b/pkg/cloudprovider/providers/gce/token_source.go
index e5e327d03c8..f8a0e3671e2 100644
--- a/pkg/cloudprovider/providers/gce/token_source.go
+++ b/pkg/cloudprovider/providers/gce/token_source.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package gce_cloud
+package gce
 
 import (
 	"encoding/json"
diff --git a/pkg/cloudprovider/providers/ovirt/ovirt.go b/pkg/cloudprovider/providers/ovirt/ovirt.go
index 19688d83d0f..cf97e7f9e92 100644
--- a/pkg/cloudprovider/providers/ovirt/ovirt.go
+++ b/pkg/cloudprovider/providers/ovirt/ovirt.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package ovirt_cloud
+package ovirt
 
 import (
 	"encoding/xml"
diff --git a/pkg/cloudprovider/providers/ovirt/ovirt_test.go b/pkg/cloudprovider/providers/ovirt/ovirt_test.go
index d5d769c3a3e..c76bde72627 100644
--- a/pkg/cloudprovider/providers/ovirt/ovirt_test.go
+++ b/pkg/cloudprovider/providers/ovirt/ovirt_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package ovirt_cloud
+package ovirt
 
 import (
 	"io"
diff --git a/pkg/cloudprovider/providers/vagrant/doc.go b/pkg/cloudprovider/providers/vagrant/doc.go
index aa37006ac61..058aa9b4404 100644
--- a/pkg/cloudprovider/providers/vagrant/doc.go
+++ b/pkg/cloudprovider/providers/vagrant/doc.go
@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package vagrant_cloud is an implementation of Interface, TCPLoadBalancer
+// Package vagrant is an implementation of Interface, TCPLoadBalancer
 // and Instances for developer managed Vagrant cluster.
-package vagrant_cloud
+package vagrant
diff --git a/pkg/cloudprovider/providers/vagrant/vagrant.go b/pkg/cloudprovider/providers/vagrant/vagrant.go
index b0ae0d0543d..3deae992c4a 100644
--- a/pkg/cloudprovider/providers/vagrant/vagrant.go
+++ b/pkg/cloudprovider/providers/vagrant/vagrant.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package vagrant_cloud
+package vagrant
 
 import (
 	"encoding/json"
diff --git a/pkg/cloudprovider/providers/vagrant/vagrant_test.go b/pkg/cloudprovider/providers/vagrant/vagrant_test.go
index 33fca79e1dc..b2cb63c6299 100644
--- a/pkg/cloudprovider/providers/vagrant/vagrant_test.go
+++ b/pkg/cloudprovider/providers/vagrant/vagrant_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package vagrant_cloud
+package vagrant
 
 import (
 	"net/http"
diff --git a/pkg/controller/route/routecontroller_test.go b/pkg/controller/route/routecontroller_test.go
index 4277aec45c1..15c91eb1c21 100644
--- a/pkg/controller/route/routecontroller_test.go
+++ b/pkg/controller/route/routecontroller_test.go
@@ -23,7 +23,7 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/cloudprovider"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
+	fake_cloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
 )
 
 func TestIsResponsibleForRoute(t *testing.T) {
diff --git a/pkg/volume/aws_ebs/aws_ebs.go b/pkg/volume/aws_ebs/aws_ebs.go
index d72baf35838..ec862a48709 100644
--- a/pkg/volume/aws_ebs/aws_ebs.go
+++ b/pkg/volume/aws_ebs/aws_ebs.go
@@ -26,7 +26,7 @@ import (
 
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/aws"
+	aws_cloud "k8s.io/kubernetes/pkg/cloudprovider/providers/aws"
 	"k8s.io/kubernetes/pkg/types"
 	"k8s.io/kubernetes/pkg/util"
 	"k8s.io/kubernetes/pkg/util/exec"
diff --git a/pkg/volume/gce_pd/gce_util.go b/pkg/volume/gce_pd/gce_util.go
index bb3a1020940..bfacc4c9dda 100644
--- a/pkg/volume/gce_pd/gce_util.go
+++ b/pkg/volume/gce_pd/gce_util.go
@@ -26,7 +26,7 @@ import (
 
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/cloudprovider"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	gce_cloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
 	"k8s.io/kubernetes/pkg/util"
 	"k8s.io/kubernetes/pkg/util/exec"
 	"k8s.io/kubernetes/pkg/util/operationmanager"
diff --git a/test/e2e/pd.go b/test/e2e/pd.go
index 4a4e4a39089..641923aed52 100644
--- a/test/e2e/pd.go
+++ b/test/e2e/pd.go
@@ -30,7 +30,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/resource"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/aws"
+	aws_cloud "k8s.io/kubernetes/pkg/cloudprovider/providers/aws"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/util"
diff --git a/test/e2e/resize_nodes.go b/test/e2e/resize_nodes.go
index dbcd54ab711..d70313f7a33 100644
--- a/test/e2e/resize_nodes.go
+++ b/test/e2e/resize_nodes.go
@@ -34,7 +34,7 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/aws"
+	aws_cloud "k8s.io/kubernetes/pkg/cloudprovider/providers/aws"
 )
 
 const (