Convert to namespaces.
Backport Category conversion from 2.0
Backport Category conversion from 2.0