Renaming method and moving to model