Fix for npi namespace issues found in 4.0.1-RC1.