Per RFC, another round in the renaming game - nearly complete