changed some naming stuff