Revert namespace changes