avoid "ApplicationController" - switching from api to webui requests
breaks it
fix some more name clashes