make naming consistent with removegrainvs