fixed some naming stuff