diff --git a/pkg/controller/volume/persistentvolume/controller.go b/pkg/controller/volume/persistentvolume/pv_controller.go
similarity index 100%
rename from pkg/controller/volume/persistentvolume/controller.go
rename to pkg/controller/volume/persistentvolume/pv_controller.go
diff --git a/pkg/controller/volume/persistentvolume/controller_base.go b/pkg/controller/volume/persistentvolume/pv_controller_base.go
similarity index 99%
rename from pkg/controller/volume/persistentvolume/controller_base.go
rename to pkg/controller/volume/persistentvolume/pv_controller_base.go
index d9f4c93d1db..80057ff070e 100644
--- a/pkg/controller/volume/persistentvolume/controller_base.go
+++ b/pkg/controller/volume/persistentvolume/pv_controller_base.go
@@ -41,7 +41,7 @@ import (
 
 // This file contains the controller base functionality, i.e. framework to
 // process PV/PVC added/updated/deleted events. The real binding, provisioning,
-// recycling and deleting is done in controller.go
+// recycling and deleting is done in pv_controller.go
 
 // NewPersistentVolumeController creates a new PersistentVolumeController
 func NewPersistentVolumeController(
diff --git a/pkg/controller/volume/persistentvolume/controller_test.go b/pkg/controller/volume/persistentvolume/pv_controller_test.go
similarity index 100%
rename from pkg/controller/volume/persistentvolume/controller_test.go
rename to pkg/controller/volume/persistentvolume/pv_controller_test.go