clean up a few naming errors