Renaming; interpolator code from UCNA