Cleaned up namespace references.