xsf prefix
Revert "xsf prefix"

This reverts commit 725c008f23e1b70dc2f59c5d391118ca4997fc67.
xsd prefix