Follow-up to renaming components.