--- a/objdictgen/subindextable.py	Thu Sep 06 16:49:11 2012 +0200
+++ b/objdictgen/subindextable.py	Mon Oct 01 19:18:35 2012 +0200
@@ -550,7 +550,7 @@
                         typeinfos = self.Manager.GetEntryInfos(subentry_infos["type"])
                         if typeinfos:
                             bus_id = '.'.join(map(str, self.ParentWindow.GetBusId()))
-                            var_name = "master_%04x_%02x" % (index, subindex)
+                            var_name = "%s_%04x_%02x" % (self.Manager.GetCurrentNodeName(), index, subindex)
                             size = typeinfos["size"]
                             data = wx.TextDataObject(str(
                                 ("%s%s.%d.%d"%(SizeConversion[size], bus_id, index, subindex),