Update util classes to use namespaces.