first pass at name change

first tests are OK.