Fixed some naming stuff