Rename controllers (no 'Controller'-suffix), fix comment in routes