Added ability to specify a different name for the controller