update some namespacing