fix %shortname% and %longname% macros broken by last week's commits  [1589]