       targets = @_findTargetElements(e, params.attachId)
       if targets? and !(targets.length is 0)
         switch params.type
-          when 'link', 'node' then name = targets[0].road_names()
+          when 'link' then name = targets[0].link_name()
+          when 'node' then name = targets[0].name()
           else name = targets[0].get('name')
   
         # for OD Profiles

          attachId: 'events'
        },
        {
          parentList: @scenario.get('fundamentaldiagramprofileset')
          modelListName: 'fundamentaldiagramprofile'
          attachId: 'fundamental-diagram-profiles'
        },
        {
          parentList: @scenario.get('oddemandprofileset')
          modelListName: 'oddemandprofile'
          attachId: 'od-demand-profiles'
        },
        {
          parentList: @scenario.get('downstreamboundarycapacityprofileset')
          modelListName: 'downstreamboundarycapacityprofile'
          attachId: 'downstream-boundary-profiles'
        },
        {
          parentList: @scenario.get('splitratioprofileset')
          modelListName: 'splitratioprofile'
          attachId: 'split-ratio-profiles'
        },
        {
          parentList: @scenario.get('sensorlist')
          modelListName: 'sensor'
          attachId: 'sensors'
        },
        {
          parentList: @scenario.get('signallist')
          modelListName: 'signal'
          attachId: 'signals'
        }

          attachId: 'controllers'
        },
        {
          parentList: @scenario.get('demandset')
          modelListName: 'demandprofile'
          attachId: 'demand-profiles'
        },
