Fix namespaces (properly this time!), thanks to Gunnar