[XSP] Fixed namespaces