Refactory rename.

Also fix a bug in old code where the name has not been updated.