Eliminate the use of tags.
Fix names of patterns
Eliminate use of tags
Eliminate use of tags