Tweaks namespacing a bit.