Update more UI classes to use namespaces.