Streamline TypeName
to support pattern matching
#3040
Merged
TypeName
to support pattern matching
#3040