Small changes to names