Renames and test