r22: renamed cp_safe_file_replace to cp_mv