cleanup some naming