Fixed interface to Renaming a bit.