A little cleanup and support for complex Controller names