Just changes to bring code in line with new namespaces