added controller postfix and name capitalization