Fix
Better naming
Unify ConceptRef and LinkRef to Ref