Fixing up namespacing issues.