Clarifications to names and stuff