diff --git a/cmd/kube-controller-manager/app/BUILD b/cmd/kube-controller-manager/app/BUILD
index f183dda468..f1947555aa 100644
--- a/cmd/kube-controller-manager/app/BUILD
+++ b/cmd/kube-controller-manager/app/BUILD
@@ -84,7 +84,7 @@ go_library(
         "//pkg/version:go_default_library",
         "//pkg/version/verflag:go_default_library",
         "//pkg/volume:go_default_library",
-        "//pkg/volume/aws_ebs:go_default_library",
+        "//pkg/volume/awsebs:go_default_library",
         "//pkg/volume/azure_dd:go_default_library",
         "//pkg/volume/azure_file:go_default_library",
         "//pkg/volume/cinder:go_default_library",
diff --git a/cmd/kube-controller-manager/app/plugins.go b/cmd/kube-controller-manager/app/plugins.go
index ba9bb40de9..b251183202 100644
--- a/cmd/kube-controller-manager/app/plugins.go
+++ b/cmd/kube-controller-manager/app/plugins.go
@@ -30,7 +30,7 @@ import (
 	_ "k8s.io/kubernetes/pkg/cloudprovider/providers"
 	// Volume plugins
 	"k8s.io/kubernetes/pkg/volume"
-	"k8s.io/kubernetes/pkg/volume/aws_ebs"
+	"k8s.io/kubernetes/pkg/volume/awsebs"
 	"k8s.io/kubernetes/pkg/volume/azure_dd"
 	"k8s.io/kubernetes/pkg/volume/azure_file"
 	"k8s.io/kubernetes/pkg/volume/cinder"
@@ -66,7 +66,7 @@ import (
 func ProbeAttachableVolumePlugins() []volume.VolumePlugin {
 	allPlugins := []volume.VolumePlugin{}
 
-	allPlugins = append(allPlugins, aws_ebs.ProbeVolumePlugins()...)
+	allPlugins = append(allPlugins, awsebs.ProbeVolumePlugins()...)
 	allPlugins = append(allPlugins, gce_pd.ProbeVolumePlugins()...)
 	allPlugins = append(allPlugins, cinder.ProbeVolumePlugins()...)
 	allPlugins = append(allPlugins, portworx.ProbeVolumePlugins()...)
@@ -95,7 +95,7 @@ func GetDynamicPluginProber(config kubectrlmgrconfig.VolumeConfiguration) volume
 func ProbeExpandableVolumePlugins(config kubectrlmgrconfig.VolumeConfiguration) []volume.VolumePlugin {
 	allPlugins := []volume.VolumePlugin{}
 
-	allPlugins = append(allPlugins, aws_ebs.ProbeVolumePlugins()...)
+	allPlugins = append(allPlugins, awsebs.ProbeVolumePlugins()...)
 	allPlugins = append(allPlugins, gce_pd.ProbeVolumePlugins()...)
 	allPlugins = append(allPlugins, cinder.ProbeVolumePlugins()...)
 	allPlugins = append(allPlugins, portworx.ProbeVolumePlugins()...)
@@ -158,7 +158,7 @@ func ProbeControllerVolumePlugins(cloud cloudprovider.Interface, config kubectrl
 	allPlugins = append(allPlugins, local.ProbeVolumePlugins()...)
 	allPlugins = append(allPlugins, storageos.ProbeVolumePlugins()...)
 
-	allPlugins = append(allPlugins, aws_ebs.ProbeVolumePlugins()...)
+	allPlugins = append(allPlugins, awsebs.ProbeVolumePlugins()...)
 	allPlugins = append(allPlugins, gce_pd.ProbeVolumePlugins()...)
 	allPlugins = append(allPlugins, cinder.ProbeVolumePlugins()...)
 	allPlugins = append(allPlugins, vsphere_volume.ProbeVolumePlugins()...)
diff --git a/cmd/kubelet/app/BUILD b/cmd/kubelet/app/BUILD
index aa1948c9df..f5f79cfb13 100644
--- a/cmd/kubelet/app/BUILD
+++ b/cmd/kubelet/app/BUILD
@@ -69,7 +69,7 @@ go_library(
         "//pkg/version:go_default_library",
         "//pkg/version/verflag:go_default_library",
         "//pkg/volume:go_default_library",
-        "//pkg/volume/aws_ebs:go_default_library",
+        "//pkg/volume/awsebs:go_default_library",
         "//pkg/volume/azure_dd:go_default_library",
         "//pkg/volume/azure_file:go_default_library",
         "//pkg/volume/cephfs:go_default_library",
diff --git a/cmd/kubelet/app/plugins.go b/cmd/kubelet/app/plugins.go
index 4f3c39223d..f651ef81e9 100644
--- a/cmd/kubelet/app/plugins.go
+++ b/cmd/kubelet/app/plugins.go
@@ -26,7 +26,7 @@ import (
 	"k8s.io/utils/exec"
 	// Volume plugins
 	"k8s.io/kubernetes/pkg/volume"
-	"k8s.io/kubernetes/pkg/volume/aws_ebs"
+	"k8s.io/kubernetes/pkg/volume/awsebs"
 	"k8s.io/kubernetes/pkg/volume/azure_dd"
 	"k8s.io/kubernetes/pkg/volume/azure_file"
 	"k8s.io/kubernetes/pkg/volume/cephfs"
@@ -71,7 +71,7 @@ func ProbeVolumePlugins() []volume.VolumePlugin {
 	//
 	// Kubelet does not currently need to configure volume plugins.
 	// If/when it does, see kube-controller-manager/app/plugins.go for example of using volume.VolumeConfig
-	allPlugins = append(allPlugins, aws_ebs.ProbeVolumePlugins()...)
+	allPlugins = append(allPlugins, awsebs.ProbeVolumePlugins()...)
 	allPlugins = append(allPlugins, empty_dir.ProbeVolumePlugins()...)
 	allPlugins = append(allPlugins, gce_pd.ProbeVolumePlugins()...)
 	allPlugins = append(allPlugins, git_repo.ProbeVolumePlugins()...)
diff --git a/hack/.golint_failures b/hack/.golint_failures
index f9e25ee471..84ec43876a 100644
--- a/hack/.golint_failures
+++ b/hack/.golint_failures
@@ -401,7 +401,6 @@ pkg/util/tolerations
 pkg/util/workqueue/prometheus
 pkg/version/verflag
 pkg/volume
-pkg/volume/aws_ebs
 pkg/volume/azure_dd
 pkg/volume/azure_file
 pkg/volume/cephfs
diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD
index 62e4602f92..4423c35ce0 100644
--- a/pkg/kubelet/BUILD
+++ b/pkg/kubelet/BUILD
@@ -210,7 +210,7 @@ go_test(
         "//pkg/util/taints:go_default_library",
         "//pkg/version:go_default_library",
         "//pkg/volume:go_default_library",
-        "//pkg/volume/aws_ebs:go_default_library",
+        "//pkg/volume/awsebs:go_default_library",
         "//pkg/volume/azure_dd:go_default_library",
         "//pkg/volume/gce_pd:go_default_library",
         "//pkg/volume/host_path:go_default_library",
diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go
index 509a1f532f..cf75dc8719 100644
--- a/pkg/kubelet/kubelet_test.go
+++ b/pkg/kubelet/kubelet_test.go
@@ -68,7 +68,7 @@ import (
 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache"
 	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
-	"k8s.io/kubernetes/pkg/volume/aws_ebs"
+	"k8s.io/kubernetes/pkg/volume/awsebs"
 	"k8s.io/kubernetes/pkg/volume/azure_dd"
 	"k8s.io/kubernetes/pkg/volume/gce_pd"
 	_ "k8s.io/kubernetes/pkg/volume/host_path"
@@ -313,7 +313,7 @@ func newTestKubeletWithImageList(
 	if initFakeVolumePlugin {
 		allPlugins = append(allPlugins, plug)
 	} else {
-		allPlugins = append(allPlugins, aws_ebs.ProbeVolumePlugins()...)
+		allPlugins = append(allPlugins, awsebs.ProbeVolumePlugins()...)
 		allPlugins = append(allPlugins, gce_pd.ProbeVolumePlugins()...)
 		allPlugins = append(allPlugins, azure_dd.ProbeVolumePlugins()...)
 	}
diff --git a/pkg/volume/BUILD b/pkg/volume/BUILD
index bbe76dd8dc..344aa83b99 100644
--- a/pkg/volume/BUILD
+++ b/pkg/volume/BUILD
@@ -69,7 +69,7 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//pkg/volume/aws_ebs:all-srcs",
+        "//pkg/volume/awsebs:all-srcs",
         "//pkg/volume/azure_dd:all-srcs",
         "//pkg/volume/azure_file:all-srcs",
         "//pkg/volume/cephfs:all-srcs",
diff --git a/pkg/volume/aws_ebs/BUILD b/pkg/volume/awsebs/BUILD
similarity index 97%
rename from pkg/volume/aws_ebs/BUILD
rename to pkg/volume/awsebs/BUILD
index 532ddf8b72..51322cbfe1 100644
--- a/pkg/volume/aws_ebs/BUILD
+++ b/pkg/volume/awsebs/BUILD
@@ -15,7 +15,7 @@ go_library(
         "aws_util.go",
         "doc.go",
     ],
-    importpath = "k8s.io/kubernetes/pkg/volume/aws_ebs",
+    importpath = "k8s.io/kubernetes/pkg/volume/awsebs",
     deps = [
         "//pkg/cloudprovider:go_default_library",
         "//pkg/cloudprovider/providers/aws:go_default_library",
diff --git a/pkg/volume/aws_ebs/OWNERS b/pkg/volume/awsebs/OWNERS
similarity index 100%
rename from pkg/volume/aws_ebs/OWNERS
rename to pkg/volume/awsebs/OWNERS
diff --git a/pkg/volume/aws_ebs/attacher.go b/pkg/volume/awsebs/attacher.go
similarity index 96%
rename from pkg/volume/aws_ebs/attacher.go
rename to pkg/volume/awsebs/attacher.go
index da25691d41..81f9411217 100644
--- a/pkg/volume/aws_ebs/attacher.go
+++ b/pkg/volume/awsebs/attacher.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package aws_ebs
+package awsebs
 
 import (
 	"fmt"
@@ -163,7 +163,7 @@ func (attacher *awsElasticBlockStoreAttacher) WaitForAttach(spec *volume.Spec, d
 	}
 
 	if devicePath == "" {
-		return "", fmt.Errorf("WaitForAttach failed for AWS Volume %q: devicePath is empty.", volumeID)
+		return "", fmt.Errorf("waitForAttach failed for AWS Volume %q: devicePath is empty", volumeID)
 	}
 
 	ticker := time.NewTicker(checkSleepDuration)
@@ -175,7 +175,7 @@ func (attacher *awsElasticBlockStoreAttacher) WaitForAttach(spec *volume.Spec, d
 		select {
 		case <-ticker.C:
 			glog.V(5).Infof("Checking AWS Volume %q is attached.", volumeID)
-			devicePaths := getDiskByIdPaths(aws.KubernetesVolumeID(volumeSource.VolumeID), partition, devicePath)
+			devicePaths := getDiskByIDPaths(aws.KubernetesVolumeID(volumeSource.VolumeID), partition, devicePath)
 			path, err := verifyDevicePath(devicePaths)
 			if err != nil {
 				// Log error, if any, and continue checking periodically. See issue #11321
@@ -186,7 +186,7 @@ func (attacher *awsElasticBlockStoreAttacher) WaitForAttach(spec *volume.Spec, d
 				return path, nil
 			}
 		case <-timer.C:
-			return "", fmt.Errorf("Could not find attached AWS Volume %q. Timeout waiting for mount paths to be created.", volumeID)
+			return "", fmt.Errorf("could not find attached AWS Volume %q. Timeout waiting for mount paths to be created", volumeID)
 		}
 	}
 }
diff --git a/pkg/volume/aws_ebs/attacher_test.go b/pkg/volume/awsebs/attacher_test.go
similarity index 98%
rename from pkg/volume/aws_ebs/attacher_test.go
rename to pkg/volume/awsebs/attacher_test.go
index 36ed854d1a..7fc397cc89 100644
--- a/pkg/volume/aws_ebs/attacher_test.go
+++ b/pkg/volume/awsebs/attacher_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package aws_ebs
+package awsebs
 
 import (
 	"errors"
@@ -219,7 +219,7 @@ func (testcase *testcase) AttachDisk(diskName aws.KubernetesVolumeID, nodeName t
 		// testcase.attach looks uninitialized, test did not expect to call
 		// AttachDisk
 		testcase.t.Errorf("Unexpected AttachDisk call!")
-		return "", errors.New("Unexpected AttachDisk call!")
+		return "", errors.New("unexpected AttachDisk call")
 	}
 
 	if expected.diskName != diskName {
@@ -244,7 +244,7 @@ func (testcase *testcase) DetachDisk(diskName aws.KubernetesVolumeID, nodeName t
 		// testcase.detach looks uninitialized, test did not expect to call
 		// DetachDisk
 		testcase.t.Errorf("Unexpected DetachDisk call!")
-		return "", errors.New("Unexpected DetachDisk call!")
+		return "", errors.New("unexpected DetachDisk call")
 	}
 
 	if expected.diskName != diskName {
diff --git a/pkg/volume/aws_ebs/aws_ebs.go b/pkg/volume/awsebs/aws_ebs.go
similarity index 99%
rename from pkg/volume/aws_ebs/aws_ebs.go
rename to pkg/volume/awsebs/aws_ebs.go
index 1e3ef4f165..1d52bf53de 100644
--- a/pkg/volume/aws_ebs/aws_ebs.go
+++ b/pkg/volume/awsebs/aws_ebs.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package aws_ebs
+package awsebs
 
 import (
 	"context"
@@ -39,7 +39,7 @@ import (
 	"k8s.io/kubernetes/pkg/volume/util"
 )
 
-// This is the primary entrypoint for volume plugins.
+// ProbeVolumePlugins is the primary entrypoint for volume plugins.
 func ProbeVolumePlugins() []volume.VolumePlugin {
 	return []volume.VolumePlugin{&awsElasticBlockStorePlugin{nil}}
 }
diff --git a/pkg/volume/aws_ebs/aws_ebs_block.go b/pkg/volume/awsebs/aws_ebs_block.go
similarity index 99%
rename from pkg/volume/aws_ebs/aws_ebs_block.go
rename to pkg/volume/awsebs/aws_ebs_block.go
index 997f5bbc7e..10b5e42284 100644
--- a/pkg/volume/aws_ebs/aws_ebs_block.go
+++ b/pkg/volume/awsebs/aws_ebs_block.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package aws_ebs
+package awsebs
 
 import (
 	"fmt"
diff --git a/pkg/volume/aws_ebs/aws_ebs_block_test.go b/pkg/volume/awsebs/aws_ebs_block_test.go
similarity index 99%
rename from pkg/volume/aws_ebs/aws_ebs_block_test.go
rename to pkg/volume/awsebs/aws_ebs_block_test.go
index 5181492d6c..f778c63fa6 100644
--- a/pkg/volume/aws_ebs/aws_ebs_block_test.go
+++ b/pkg/volume/awsebs/aws_ebs_block_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package aws_ebs
+package awsebs
 
 import (
 	"os"
diff --git a/pkg/volume/aws_ebs/aws_ebs_test.go b/pkg/volume/awsebs/aws_ebs_test.go
similarity index 99%
rename from pkg/volume/aws_ebs/aws_ebs_test.go
rename to pkg/volume/awsebs/aws_ebs_test.go
index d5506f92c4..9325a7de8b 100644
--- a/pkg/volume/aws_ebs/aws_ebs_test.go
+++ b/pkg/volume/awsebs/aws_ebs_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package aws_ebs
+package awsebs
 
 import (
 	"fmt"
diff --git a/pkg/volume/aws_ebs/aws_util.go b/pkg/volume/awsebs/aws_util.go
similarity index 97%
rename from pkg/volume/aws_ebs/aws_util.go
rename to pkg/volume/awsebs/aws_util.go
index 95a5154a35..9f1d9a3d2e 100644
--- a/pkg/volume/aws_ebs/aws_util.go
+++ b/pkg/volume/awsebs/aws_util.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package aws_ebs
+package awsebs
 
 import (
 	"fmt"
@@ -45,8 +45,10 @@ const (
 	ebsMaxReplicasInAZ  = 1
 )
 
+// AWSDiskUtil provides operations for EBS volume.
 type AWSDiskUtil struct{}
 
+// DeleteVolume deletes an AWS EBS volume.
 func (util *AWSDiskUtil) DeleteVolume(d *awsElasticBlockStoreDeleter) error {
 	cloud, err := getCloudProvider(d.awsElasticBlockStore.plugin.host.GetCloudProvider())
 	if err != nil {
@@ -198,11 +200,11 @@ func verifyDevicePath(devicePaths []string) (string, error) {
 func verifyAllPathsRemoved(devicePaths []string) (bool, error) {
 	allPathsRemoved := true
 	for _, path := range devicePaths {
-		if exists, err := volumeutil.PathExists(path); err != nil {
+		exists, err := volumeutil.PathExists(path)
+		if err != nil {
 			return false, fmt.Errorf("Error checking if path exists: %v", err)
-		} else {
-			allPathsRemoved = allPathsRemoved && !exists
 		}
+		allPathsRemoved = allPathsRemoved && !exists
 	}
 
 	return allPathsRemoved, nil
@@ -211,7 +213,7 @@ func verifyAllPathsRemoved(devicePaths []string) (bool, error) {
 // Returns list of all paths for given EBS mount
 // This is more interesting on GCE (where we are able to identify volumes under /dev/disk-by-id)
 // Here it is mostly about applying the partition path
-func getDiskByIdPaths(volumeID aws.KubernetesVolumeID, partition string, devicePath string) []string {
+func getDiskByIDPaths(volumeID aws.KubernetesVolumeID, partition string, devicePath string) []string {
 	devicePaths := []string{}
 	if devicePath != "" {
 		devicePaths = append(devicePaths, devicePath)
diff --git a/pkg/volume/aws_ebs/doc.go b/pkg/volume/awsebs/doc.go
similarity index 81%
rename from pkg/volume/aws_ebs/doc.go
rename to pkg/volume/awsebs/doc.go
index 2d73712242..3b2d21208e 100644
--- a/pkg/volume/aws_ebs/doc.go
+++ b/pkg/volume/awsebs/doc.go
@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package aws_ebs contains the internal representation of AWS Elastic
+// Package awsebs contains the internal representation of AWS Elastic
 // Block Store volumes.
-package aws_ebs // import "k8s.io/kubernetes/pkg/volume/aws_ebs"
+package awsebs // import "k8s.io/kubernetes/pkg/volume/awsebs"
diff --git a/test/test_owners.csv b/test/test_owners.csv
index 909fe148a8..783995f7ee 100644
--- a/test/test_owners.csv
+++ b/test/test_owners.csv
@@ -811,7 +811,7 @@ k8s.io/kubernetes/pkg/util/term,davidopp,1,
 k8s.io/kubernetes/pkg/util/threading,roberthbailey,1,
 k8s.io/kubernetes/pkg/util/version,danwinship,0,
 k8s.io/kubernetes/pkg/volume,saad-ali,0,
-k8s.io/kubernetes/pkg/volume/aws_ebs,caesarxuchao,1,
+k8s.io/kubernetes/pkg/volume/awsebs,caesarxuchao,1,
 k8s.io/kubernetes/pkg/volume/azure_dd,bgrant0607,1,
 k8s.io/kubernetes/pkg/volume/azure_file,maisem,1,
 k8s.io/kubernetes/pkg/volume/cephfs,eparis,1,