fixing some naming stuff