fix some naming issues again