REFS: #497 Changes for synonyms name