File renaming - more clean up