[PATCH kernel-4.19 16/29] psi: rename psi fields in preparation for psi trigger addition