Changed names and added scopes of controller and model class methods and properties