more accurate renaming