RF: renamed 'disc_shape' and 'disc_affine' ('discretization shape, affine') to 'disp_shape' and 'disp_affine' ('displacement_shape, affine')