Fixed few model names and controller names