Fixing a namespacing issue that would make things hard to import.