revert namespacing style