fix some namespacing