Per RFC, continue the naming conversion