Final changes.  Looks like rename successful