Rename massageFormValues to massageRenderValues