add option to enable/disable legacy namespacing