Revert renaming from ONE_TO_ONE to POINTWISE, because it was not apt