missed a few namespace cleanups