Using uuid instead of name for OTHER NON-CODED - RA-344