leftover namespacing bugs