Replace some incorrect r: -> rich: substituitons from RF-13642
RFPL-3372: Misc. Component reference fixes