Finishing up the rename.