Fixed namespacing issues in USPSBase