Fix namespacing problem.