Renaming and testing