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

[xavierjohn]

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

• You've read the Contributor Guide and Code of Conduct.
• You've included unit or integration tests for your change, where applicable.
• You've included inline docs for your change, where applicable.
• There's an open issue for the PR that you are making. If you'd like to propose a new feature or change, please open an issue to discuss the change or find an existing issue.

Summary of the changes (Less than 80 chars)

Description

Merge from main.
If Controller Attribute is set, use it for the controller's name

Fixes #1033