feature/model-rename-to-controller