Revert to single namespace