fixes a few naming bugs