Fix issue with parameter namespace collision.