fixed bad naming stuff