Drop generic terms from ends of Canonical name
Merge pull request #3255 from rolandwalker/doc_cask_name_drop_mac

Drop generic terms from ends of Canonical names