fix for namespace splitting bug (where namespace included multiple underscores)