More cleaning up of bad namespacing.