Updating Generic to unique wording

This is only for tags, curious if any other wording should be changed from generic...
Updating Unique Name
Updating Unique Name (Again)
Might as well add it to categories
Merge pull request #2127 from NikV/master

Updating Generic to unique wording