Fixing some namespacing whoopsees