Fixed massive namespace breakage.
Namespaced everything else.