CRM-13344 - Individual/Pseudoconstant - Fix prefix/suffix