Re: Disambiguation changes for RHQ4