Renaming rules changed

Files could not be renamed if simplify_file_names didn't make any
changes