Per RFC, continue with renaming