Fixed some small naming problems