diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
index 9b1c7ffc18c..3d57da32153 100644
--- a/test/e2e/e2e_test.go
+++ b/test/e2e/e2e_test.go
@@ -62,7 +62,7 @@ import (
 	_ "k8s.io/kubernetes/test/e2e/node"
 	_ "k8s.io/kubernetes/test/e2e/scheduling"
 	_ "k8s.io/kubernetes/test/e2e/storage"
-	_ "k8s.io/kubernetes/test/e2e/storage/csi_mock"
+	_ "k8s.io/kubernetes/test/e2e/storage/csimock"
 	_ "k8s.io/kubernetes/test/e2e/storage/external"
 	_ "k8s.io/kubernetes/test/e2e/windows"
 
diff --git a/test/e2e/storage/csi_mock/base.go b/test/e2e/storage/csimock/base.go
similarity index 99%
rename from test/e2e/storage/csi_mock/base.go
rename to test/e2e/storage/csimock/base.go
index d240e1d7552..99c69dbf2d0 100644
--- a/test/e2e/storage/csi_mock/base.go
+++ b/test/e2e/storage/csimock/base.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package csi_mock
+package csimock
 
 import (
 	"context"
diff --git a/test/e2e/storage/csi_mock/csi_attach_volume.go b/test/e2e/storage/csimock/csi_attach_volume.go
similarity index 99%
rename from test/e2e/storage/csi_mock/csi_attach_volume.go
rename to test/e2e/storage/csimock/csi_attach_volume.go
index 9b263ea6cee..e1107f0dd21 100644
--- a/test/e2e/storage/csi_mock/csi_attach_volume.go
+++ b/test/e2e/storage/csimock/csi_attach_volume.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package csi_mock
+package csimock
 
 import (
 	"context"
diff --git a/test/e2e/storage/csi_mock/csi_fsgroup_mount.go b/test/e2e/storage/csimock/csi_fsgroup_mount.go
similarity index 99%
rename from test/e2e/storage/csi_mock/csi_fsgroup_mount.go
rename to test/e2e/storage/csimock/csi_fsgroup_mount.go
index 947ef88fa05..ca120b1f4be 100644
--- a/test/e2e/storage/csi_mock/csi_fsgroup_mount.go
+++ b/test/e2e/storage/csimock/csi_fsgroup_mount.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package csi_mock
+package csimock
 
 import (
 	"context"
diff --git a/test/e2e/storage/csi_mock/csi_fsgroup_policy.go b/test/e2e/storage/csimock/csi_fsgroup_policy.go
similarity index 99%
rename from test/e2e/storage/csi_mock/csi_fsgroup_policy.go
rename to test/e2e/storage/csimock/csi_fsgroup_policy.go
index 7a635deb6fb..14dab2c21f0 100644
--- a/test/e2e/storage/csi_mock/csi_fsgroup_policy.go
+++ b/test/e2e/storage/csimock/csi_fsgroup_policy.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package csi_mock
+package csimock
 
 import (
 	"context"
diff --git a/test/e2e/storage/csi_mock/csi_node_stage_error_cases.go b/test/e2e/storage/csimock/csi_node_stage_error_cases.go
similarity index 99%
rename from test/e2e/storage/csi_mock/csi_node_stage_error_cases.go
rename to test/e2e/storage/csimock/csi_node_stage_error_cases.go
index fbfe6cc2b2b..daa621be407 100644
--- a/test/e2e/storage/csi_mock/csi_node_stage_error_cases.go
+++ b/test/e2e/storage/csimock/csi_node_stage_error_cases.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package csi_mock
+package csimock
 
 import (
 	"context"
diff --git a/test/e2e/storage/csi_mock/csi_selinux_mount.go b/test/e2e/storage/csimock/csi_selinux_mount.go
similarity index 99%
rename from test/e2e/storage/csi_mock/csi_selinux_mount.go
rename to test/e2e/storage/csimock/csi_selinux_mount.go
index f20b2a6df2f..c1554014f2d 100644
--- a/test/e2e/storage/csi_mock/csi_selinux_mount.go
+++ b/test/e2e/storage/csimock/csi_selinux_mount.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package csi_mock
+package csimock
 
 import (
 	"context"
diff --git a/test/e2e/storage/csi_mock/csi_service_account_token.go b/test/e2e/storage/csimock/csi_service_account_token.go
similarity index 99%
rename from test/e2e/storage/csi_mock/csi_service_account_token.go
rename to test/e2e/storage/csimock/csi_service_account_token.go
index fcd647575c2..e8b06f9a093 100644
--- a/test/e2e/storage/csi_mock/csi_service_account_token.go
+++ b/test/e2e/storage/csimock/csi_service_account_token.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package csi_mock
+package csimock
 
 import (
 	"context"
diff --git a/test/e2e/storage/csi_mock/csi_snapshot.go b/test/e2e/storage/csimock/csi_snapshot.go
similarity index 99%
rename from test/e2e/storage/csi_mock/csi_snapshot.go
rename to test/e2e/storage/csimock/csi_snapshot.go
index 60c3f4589c3..377b53245a1 100644
--- a/test/e2e/storage/csi_mock/csi_snapshot.go
+++ b/test/e2e/storage/csimock/csi_snapshot.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package csi_mock
+package csimock
 
 import (
 	"context"
diff --git a/test/e2e/storage/csi_mock/csi_storage_capacity.go b/test/e2e/storage/csimock/csi_storage_capacity.go
similarity index 99%
rename from test/e2e/storage/csi_mock/csi_storage_capacity.go
rename to test/e2e/storage/csimock/csi_storage_capacity.go
index b2cb03668b1..adb350c405c 100644
--- a/test/e2e/storage/csi_mock/csi_storage_capacity.go
+++ b/test/e2e/storage/csimock/csi_storage_capacity.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package csi_mock
+package csimock
 
 import (
 	"context"
diff --git a/test/e2e/storage/csi_mock/csi_volume_expansion.go b/test/e2e/storage/csimock/csi_volume_expansion.go
similarity index 99%
rename from test/e2e/storage/csi_mock/csi_volume_expansion.go
rename to test/e2e/storage/csimock/csi_volume_expansion.go
index 24e135af51b..495bfb0464d 100644
--- a/test/e2e/storage/csi_mock/csi_volume_expansion.go
+++ b/test/e2e/storage/csimock/csi_volume_expansion.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package csi_mock
+package csimock
 
 import (
 	"context"
diff --git a/test/e2e/storage/csi_mock/csi_volume_limit.go b/test/e2e/storage/csimock/csi_volume_limit.go
similarity index 99%
rename from test/e2e/storage/csi_mock/csi_volume_limit.go
rename to test/e2e/storage/csimock/csi_volume_limit.go
index b3799d5af3c..be8db44415f 100644
--- a/test/e2e/storage/csi_mock/csi_volume_limit.go
+++ b/test/e2e/storage/csimock/csi_volume_limit.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package csi_mock
+package csimock
 
 import (
 	"context"
diff --git a/test/e2e/storage/csi_mock/csi_workload.go b/test/e2e/storage/csimock/csi_workload.go
similarity index 99%
rename from test/e2e/storage/csi_mock/csi_workload.go
rename to test/e2e/storage/csimock/csi_workload.go
index 5ad053c861b..265e38a1c7b 100644
--- a/test/e2e/storage/csi_mock/csi_workload.go
+++ b/test/e2e/storage/csimock/csi_workload.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package csi_mock
+package csimock
 
 import (
 	"context"