Rename previously-missed usages