changed namespacing to fix clang bug