fixed a few naming