adjust some of the names