YH-504: Renamed HRI organization