fixing some naming