fixed a few naming issues