Add model name to the calculated metrics table

Update map/reduce classes, hive queries, entity and maps.