Fixed a few naming issues