fix some naming stuff