If Controller Attribute is set, use it for the controller's name

If Controller Attribute is set, use it for the controller's name #373