Renames OriginalDescription to OriginalCombination.  Updates Typification hierarchy.