(cm) more namespacing cleanups