RA-417 - Use newly-defined constants in reference metadata