Update namespaces and comments.