Update existing definitions and attribute names in FIRE
Update existing definitions and attribute names in FIRE