cleanup and patch file rename