Changed the way the canonical names was being used with entity
Merge branch 'coreference-hotfix-entity-key' into relational-storage