Per RFC, continue the renaming effort