fixing some naming issues