Add CANONICAL_NAMESPACE to old-style keys