Merge "StandardNames: update RI expectations"