replaced IriSmusher with SameAsSmusher, fixed a wrong call to generateNewHttpUri()