cleanup some names since we are changing the interface