set shortname and longname macros properly.  this should fix first issue
pointed out by Bob (enhancement not getting applied according to user
defaults) [1589]
Merge remote-tracking branch 'upstream/master'