Revert namespaces changes