Unify naming

Ultimately it's taking info from the info.desktop and description or
comment from the metadata.desktop (why!???!)

In either case, make it unified, and also use full name instead of
abbrevation