fix some naming issues