Commit before renaming fb controller