adjust attribute name matching
finished handling attributes in states
change token type names