Fix use statements. Rename controller