Fix namespaces and exports