Now using namespaces to prevent collisions.