Make Controller Name use Controller Type instead of router output