Minor changes to names