Renaming of methods to fit spec