Refactoring: naming.

Controller is for actual controller.
Support is extended by controller.