Namespacing comments and updates