Fix Namespaces

This will fix #51 and hopefully prevent wrong namespaces going forward.