Rename financial type & assign to form in one place