Namespace tweaking.