Adding name to annotation dialog... also cleaning up the code slightly for all the disparate collected item names.  :\