diff --git a/gui/builtinContextMenus/commandFits.py b/gui/builtinContextMenus/commandFits.py
index 06ef53eae..bc2342e85 100644
--- a/gui/builtinContextMenus/commandFits.py
+++ b/gui/builtinContextMenus/commandFits.py
@@ -64,7 +64,7 @@ class CommandFits(ContextMenu):
             for fit in sorted(self.__class__.commandFits, key=lambda x: x.name):
                 print(fit)
                 menuItem = self.addFit(rootMenu if msw else sub, fit, True)
-                sub.AppendItem(menuItem)
+                sub.Append(menuItem)
         else:
             typeDict = {}
 
diff --git a/gui/builtinContextMenus/damagePattern.py b/gui/builtinContextMenus/damagePattern.py
index 710447a50..bf725e233 100644
--- a/gui/builtinContextMenus/damagePattern.py
+++ b/gui/builtinContextMenus/damagePattern.py
@@ -96,7 +96,7 @@ class DamagePattern(ContextMenu):
 
         # Items that have a parent
         for pattern in self.subMenus[self.m[i]]:
-            sub.AppendItem(self.addPattern(rootMenu if msw else sub, pattern))
+            sub.Append(self.addPattern(rootMenu if msw else sub, pattern))
 
         return sub
 
diff --git a/gui/builtinContextMenus/fighterAbilities.py b/gui/builtinContextMenus/fighterAbilities.py
index 6f6bc8051..76eab5c1e 100644
--- a/gui/builtinContextMenus/fighterAbilities.py
+++ b/gui/builtinContextMenus/fighterAbilities.py
@@ -44,7 +44,7 @@ class FighterAbility(ContextMenu):
             if not ability.effect.isImplemented:
                 continue
             menuItem = self.addAbility(rootMenu if msw else sub, ability)
-            sub.AppendItem(menuItem)
+            sub.Append(menuItem)
             menuItem.Check(ability.active)
 
         return sub
diff --git a/gui/builtinContextMenus/implantSets.py b/gui/builtinContextMenus/implantSets.py
index d553a6f8d..d338a1930 100644
--- a/gui/builtinContextMenus/implantSets.py
+++ b/gui/builtinContextMenus/implantSets.py
@@ -61,7 +61,7 @@ class ImplantSets(ContextMenu):
             mitem = wx.MenuItem(rootMenu, id, set.name)
             bindmenu.Bind(wx.EVT_MENU, self.handleSelection, mitem)
             self.idmap[id] = set
-            m.AppendItem(mitem)
+            m.Append(mitem)
 
         return m
 
diff --git a/gui/builtinContextMenus/tacticalMode.py b/gui/builtinContextMenus/tacticalMode.py
index 8b87dd10b..e09b26940 100644
--- a/gui/builtinContextMenus/tacticalMode.py
+++ b/gui/builtinContextMenus/tacticalMode.py
@@ -49,7 +49,7 @@ class TacticalMode(ContextMenu):
 
         for mode in self.modes:
             menuItem = self.addMode(rootMenu if msw else sub, mode)
-            sub.AppendItem(menuItem)
+            sub.Append(menuItem)
             menuItem.Check(self.currMode.item == mode.item)
 
         return sub
diff --git a/gui/builtinContextMenus/targetResists.py b/gui/builtinContextMenus/targetResists.py
index 677605f31..391608fed 100644
--- a/gui/builtinContextMenus/targetResists.py
+++ b/gui/builtinContextMenus/targetResists.py
@@ -87,12 +87,12 @@ class TargetResists(ContextMenu):
             else:
                 self.singles.append(pattern)
 
-        sub.AppendItem(self.addPattern(rootMenu if msw else sub, None))  # Add reset
+        sub.Append(self.addPattern(rootMenu if msw else sub, None))  # Add reset
         sub.AppendSeparator()
 
         # Single items, no parent
         for pattern in self.singles:
-            sub.AppendItem(self.addPattern(rootMenu if msw else sub, pattern))
+            sub.Append(self.addPattern(rootMenu if msw else sub, pattern))
 
         # Items that have a parent
         for menuName, patterns in list(self.subMenus.items()):
@@ -108,8 +108,8 @@ class TargetResists(ContextMenu):
 
             # Append child items to child menu
             for pattern in patterns:
-                grandSub.AppendItem(self.addPattern(rootMenu if msw else grandSub, pattern))
-            sub.AppendItem(item)  # finally, append parent item to root menu
+                grandSub.Append(self.addPattern(rootMenu if msw else grandSub, pattern))
+            sub.Append(item)  # finally, append parent item to root menu
 
         return sub
 
diff --git a/gui/builtinContextMenus/whProjector.py b/gui/builtinContextMenus/whProjector.py
index 4fab1fc93..bafca94ab 100644
--- a/gui/builtinContextMenus/whProjector.py
+++ b/gui/builtinContextMenus/whProjector.py
@@ -45,7 +45,7 @@ class WhProjector(ContextMenu):
                     rootMenu.Bind(wx.EVT_MENU, self.handleSelection, grandSubItem)
                 else:
                     grandSub.Bind(wx.EVT_MENU, self.handleSelection, grandSubItem)
-                grandSub.AppendItem(grandSubItem)
+                grandSub.Append(grandSubItem)
         return sub
 
     def handleSelection(self, event):
diff --git a/gui/crestFittings.py b/gui/crestFittings.py
index 968e5e18b..13df6fd2f 100644
--- a/gui/crestFittings.py
+++ b/gui/crestFittings.py
@@ -403,7 +403,7 @@ class FittingsTreeView(wx.Panel):
             shipID = tree.AppendItem(root, name)
             for fit in fits:
                 fitId = tree.AppendItem(shipID, fit['name'])
-                tree.SetPyData(fitId, json.dumps(fit))
+                tree.SetItemData(fitId, json.dumps(fit))
 
         tree.SortChildren(root)
 
diff --git a/gui/itemStats.py b/gui/itemStats.py
index d1eb50d1e..741482caa 100644
--- a/gui/itemStats.py
+++ b/gui/itemStats.py
@@ -776,7 +776,7 @@ class ItemDependents(wx.Panel):
 
         self.SetSizer(mainSizer)
         self.root = self.reqTree.AddRoot("WINRARZOR")
-        self.reqTree.SetPyData(self.root, None)
+        self.reqTree.SetItemData(self.root, None)
 
         self.imageList = wx.ImageList(16, 16)
         self.reqTree.SetImageList(self.imageList)
@@ -1026,7 +1026,7 @@ class ItemAffectedBy(wx.Panel):
             change = self.affectedBy.GetItemData(item)
             display = self.affectedBy.GetItemText(item)
             self.affectedBy.SetItemText(item, change)
-            self.affectedBy.SetPyData(item, display)
+            self.affectedBy.SetItemData(item, display)
 
         self.Thaw()
 
@@ -1171,7 +1171,7 @@ class ItemAffectedBy(wx.Panel):
 
                 # this is the attribute node
                 child = self.affectedBy.AppendItem(parent, display, attrIcon)
-                self.affectedBy.SetPyData(child, saved)
+                self.affectedBy.SetItemData(child, saved)
                 self.treeItems.append(child)
 
                 items = attributes[attrName]
@@ -1203,7 +1203,7 @@ class ItemAffectedBy(wx.Panel):
                     # this is the Module node, the attribute will be attached to this
                     display = "%s %s %.2f %s" % (displayStr, attrModifier, attrAmount, penalized)
                     treeItem = self.affectedBy.AppendItem(child, display, itemIcon)
-                    self.affectedBy.SetPyData(treeItem, afflictor)
+                    self.affectedBy.SetItemData(treeItem, afflictor)
 
     def buildModuleView(self, root):
         """