Update everything to use namespaces