Renaming and other changes