TAGs now get the class name rather than being a string literal.
Edits poorly chosen constant names.