[UPDATE] Update GetEntityNameFromAttr logic
[UPDATE] Update GetEntityNameFromAttr logic

AndreyZM/Bridge,bridgedotnet/Bridge,bridgedotnet/Bridge,AndreyZM/Bridge,bridgedotnet/Bridge,AndreyZM/Bridge,bridgedotnet/Bridge,AndreyZM/Bridge