Update to namespaces and completed conversion.