file name change and cleanup