Fixed namespaces, and trailing spaces