first round of changes to names