Puts everything under the same namespace. Previously the header was only partially namespaced, which is inconsistent.