Fix namespacing / package name