Disambiguation changes for RHQ4