Changes to rename file and buffer
Changes to ffip
Fixes for rebase-mode