Close #38: Fix namespaces