name cleanup, more units tests