Updated order events to use namespaces