Update more UI code ot use namespaces.