more namespacing fixes