Renaming controllers again to match the style in other projects