Ensure class namespacing is honored