Finished the rename, updates references.
Finished rename, updated references