fix to model and controller naming