More rename clarifications.