Merge "Making names consistent with REFERENCE_MODE enum name."