fixed a few naming mistakes