HPSA-48: Resolve conflig in parameter name