fixed naming of controllers etc.