More consistent naming of controllers