fix some naming