Minor Issues

Fixed a few small naming problems.