Remaining changes for ref id to ref name change

Last test change + CLI component changes.