more renaming of methods in model