More work for underscores in attribute namespaces

Classify the namespace to use CamelCase classes
Add _ to the regex for keys