Rename FIA variants for clarity.
Merge branch 'dev'

* dev:
  Rename FIA variants for clarity.