o1 namespace adaptations

No match.