Some renaming of methods