Update more UI classes to use namespaces.
Update more UI classes to use namespaces.
Update more classes to use namespaces.