Small changes to the names