Fixed some bad naming