Change namespace to use P as primary namespace