adjust some naming