fix marker traits for attribute values and kinds

StringAttr renamed to StringValue etc.
StringKind etc is introduced to reduce code duplication