Quick update to namespacing