Some initial work for improved file renaming support.