general changes to names