Use new safe_rename()