Normalized namespaces

Here it goes again :wink: