Really finish rename.