Add source_hfid fields
Rename some classes to match DF's own naming scheme