diff --git a/pkg/build/controller/controller.go b/pkg/build/controller/build_controller.go
similarity index 100%
rename from pkg/build/controller/controller.go
rename to pkg/build/controller/build_controller.go
diff --git a/pkg/build/controller/controller_test.go b/pkg/build/controller/build_controller_test.go
similarity index 100%
rename from pkg/build/controller/controller_test.go
rename to pkg/build/controller/build_controller_test.go
diff --git a/pkg/build/controller/config_controller.go b/pkg/build/controller/buildconfig_controller.go
similarity index 100%
rename from pkg/build/controller/config_controller.go
rename to pkg/build/controller/buildconfig_controller.go
diff --git a/pkg/build/controller/config_controller_test.go b/pkg/build/controller/buildconfig_controller_test.go
similarity index 100%
rename from pkg/build/controller/config_controller_test.go
rename to pkg/build/controller/buildconfig_controller_test.go
diff --git a/pkg/build/controller/buildpod/controller.go b/pkg/build/controller/buildpod/buildpod_controller.go
similarity index 100%
rename from pkg/build/controller/buildpod/controller.go
rename to pkg/build/controller/buildpod/buildpod_controller.go
diff --git a/pkg/build/controller/buildpod/controller_test.go b/pkg/build/controller/buildpod/buildpod_controller_test.go
similarity index 100%
rename from pkg/build/controller/buildpod/controller_test.go
rename to pkg/build/controller/buildpod/buildpod_controller_test.go
diff --git a/pkg/deploy/controller/deployment/controller.go b/pkg/deploy/controller/deployment/deployment_controller.go
similarity index 100%
rename from pkg/deploy/controller/deployment/controller.go
rename to pkg/deploy/controller/deployment/deployment_controller.go
diff --git a/pkg/deploy/controller/deployment/controller_test.go b/pkg/deploy/controller/deployment/deployment_controller_test.go
similarity index 100%
rename from pkg/deploy/controller/deployment/controller_test.go
rename to pkg/deploy/controller/deployment/deployment_controller_test.go
diff --git a/pkg/deploy/controller/deploymentconfig/controller.go b/pkg/deploy/controller/deploymentconfig/deploymentconfig_controller.go
similarity index 100%
rename from pkg/deploy/controller/deploymentconfig/controller.go
rename to pkg/deploy/controller/deploymentconfig/deploymentconfig_controller.go
diff --git a/pkg/deploy/controller/deploymentconfig/controller_test.go b/pkg/deploy/controller/deploymentconfig/deploymentconfig_controller_test.go
similarity index 100%
rename from pkg/deploy/controller/deploymentconfig/controller_test.go
rename to pkg/deploy/controller/deploymentconfig/deploymentconfig_controller_test.go
diff --git a/pkg/deploy/controller/generictrigger/controller.go b/pkg/deploy/controller/generictrigger/deploy_generictrigger_controller.go
similarity index 100%
rename from pkg/deploy/controller/generictrigger/controller.go
rename to pkg/deploy/controller/generictrigger/deploy_generictrigger_controller.go
diff --git a/pkg/deploy/controller/generictrigger/controller_test.go b/pkg/deploy/controller/generictrigger/deploy_generictrigger_controller_test.go
similarity index 100%
rename from pkg/deploy/controller/generictrigger/controller_test.go
rename to pkg/deploy/controller/generictrigger/deploy_generictrigger_controller_test.go
diff --git a/pkg/image/controller/controller.go b/pkg/image/controller/image_controller.go
similarity index 100%
rename from pkg/image/controller/controller.go
rename to pkg/image/controller/image_controller.go
diff --git a/pkg/image/controller/controller_test.go b/pkg/image/controller/image_controller_test.go
similarity index 100%
rename from pkg/image/controller/controller_test.go
rename to pkg/image/controller/image_controller_test.go
diff --git a/pkg/project/controller/controller.go b/pkg/project/controller/project_controller.go
similarity index 100%
rename from pkg/project/controller/controller.go
rename to pkg/project/controller/project_controller.go
diff --git a/pkg/project/controller/controller_test.go b/pkg/project/controller/project_controller_test.go
similarity index 100%
rename from pkg/project/controller/controller_test.go
rename to pkg/project/controller/project_controller_test.go
diff --git a/pkg/route/controller/allocation/controller.go b/pkg/route/controller/allocation/route_allocation_controller.go
similarity index 100%
rename from pkg/route/controller/allocation/controller.go
rename to pkg/route/controller/allocation/route_allocation_controller.go
diff --git a/pkg/route/controller/allocation/controller_test.go b/pkg/route/controller/allocation/route_allocation_controller_test.go
similarity index 100%
rename from pkg/route/controller/allocation/controller_test.go
rename to pkg/route/controller/allocation/route_allocation_controller_test.go
diff --git a/pkg/router/controller/controller.go b/pkg/router/controller/router_controller.go
similarity index 100%
rename from pkg/router/controller/controller.go
rename to pkg/router/controller/router_controller.go
diff --git a/pkg/router/controller/controller_test.go b/pkg/router/controller/router_controller_test.go
similarity index 100%
rename from pkg/router/controller/controller_test.go
rename to pkg/router/controller/router_controller_test.go
diff --git a/pkg/sdn/plugin/controller.go b/pkg/sdn/plugin/sdn_controller.go
similarity index 100%
rename from pkg/sdn/plugin/controller.go
rename to pkg/sdn/plugin/sdn_controller.go
diff --git a/pkg/security/controller/controller.go b/pkg/security/controller/security_controller.go
similarity index 100%
rename from pkg/security/controller/controller.go
rename to pkg/security/controller/security_controller.go
diff --git a/pkg/security/controller/controller_test.go b/pkg/security/controller/security_controller_test.go
similarity index 100%
rename from pkg/security/controller/controller_test.go
rename to pkg/security/controller/security_controller_test.go
diff --git a/pkg/service/controller/ingressip/controller.go b/pkg/service/controller/ingressip/service_ingressip_controller.go
similarity index 100%
rename from pkg/service/controller/ingressip/controller.go
rename to pkg/service/controller/ingressip/service_ingressip_controller.go
diff --git a/pkg/service/controller/ingressip/controller_test.go b/pkg/service/controller/ingressip/service_ingressip_controller_test.go
similarity index 100%
rename from pkg/service/controller/ingressip/controller_test.go
rename to pkg/service/controller/ingressip/service_ingressip_controller_test.go
diff --git a/pkg/unidling/controller/controller.go b/pkg/unidling/controller/unidling_controller.go
similarity index 100%
rename from pkg/unidling/controller/controller.go
rename to pkg/unidling/controller/unidling_controller.go
diff --git a/pkg/unidling/controller/controller_test.go b/pkg/unidling/controller/unidling_controller_test.go
similarity index 100%
rename from pkg/unidling/controller/controller_test.go
rename to pkg/unidling/controller/unidling_controller_test.go