Fix namespacing for base classes