diff --git a/Mac/Demo/PICTbrowse/ICONbrowse.py b/Mac/Demo/PICTbrowse/ICONbrowse.py
index fe28564bf98..c827fac0e23 100644
--- a/Mac/Demo/PICTbrowse/ICONbrowse.py
+++ b/Mac/Demo/PICTbrowse/ICONbrowse.py
@@ -122,7 +122,7 @@ class MyDialog(FrameWork.DialogWindow):
 		self.wid.SetDialogDefaultItem(MAIN_SHOW)
 		self.contents = contents
 		self.ctl = self.wid.GetDialogItemAsControl(MAIN_LIST)
-		h = self.ctl.GetControlDataHandle(Controls.kControlListBoxPart, 
+		h = self.ctl.GetControlData_Handle(Controls.kControlListBoxPart, 
 				Controls.kControlListBoxListHandleTag)
 		self.list = List.as_List(h)
 		self.setlist()
diff --git a/Mac/Demo/PICTbrowse/PICTbrowse.py b/Mac/Demo/PICTbrowse/PICTbrowse.py
index 07719918f7e..04d321c057f 100644
--- a/Mac/Demo/PICTbrowse/PICTbrowse.py
+++ b/Mac/Demo/PICTbrowse/PICTbrowse.py
@@ -100,7 +100,7 @@ class MyDialog(FrameWork.DialogWindow):
 		self.wid.SetDialogDefaultItem(MAIN_SHOW)
 		self.contents = contents
 		self.ctl = self.wid.GetDialogItemAsControl(MAIN_LIST)
-		h = self.ctl.GetControlDataHandle(Controls.kControlListBoxPart, 
+		h = self.ctl.GetControlData_Handle(Controls.kControlListBoxPart, 
 				Controls.kControlListBoxListHandleTag)
 		self.list = List.as_List(h)
 		self.setlist()
diff --git a/Mac/Demo/PICTbrowse/PICTbrowse2.py b/Mac/Demo/PICTbrowse/PICTbrowse2.py
index c78960cc29b..903fd9be8ab 100644
--- a/Mac/Demo/PICTbrowse/PICTbrowse2.py
+++ b/Mac/Demo/PICTbrowse/PICTbrowse2.py
@@ -122,7 +122,7 @@ class MyDialog(FrameWork.DialogWindow):
 		self.wid.SetDialogDefaultItem(MAIN_SHOW)
 		self.contents = contents
 		self.ctl = self.wid.GetDialogItemAsControl(MAIN_LIST)
-		h = self.ctl.GetControlDataHandle(Controls.kControlListBoxPart, 
+		h = self.ctl.GetControlData_Handle(Controls.kControlListBoxPart, 
 				Controls.kControlListBoxListHandleTag)
 		self.list = List.as_List(h)
 		self.setlist()
diff --git a/Mac/Demo/PICTbrowse/cicnbrowse.py b/Mac/Demo/PICTbrowse/cicnbrowse.py
index b56cd134298..47cd472bef4 100644
--- a/Mac/Demo/PICTbrowse/cicnbrowse.py
+++ b/Mac/Demo/PICTbrowse/cicnbrowse.py
@@ -122,7 +122,7 @@ class MyDialog(FrameWork.DialogWindow):
 		self.wid.SetDialogDefaultItem(MAIN_SHOW)
 		self.contents = contents
 		self.ctl = self.wid.GetDialogItemAsControl(MAIN_LIST)
-		h = self.ctl.GetControlDataHandle(Controls.kControlListBoxPart, 
+		h = self.ctl.GetControlData_Handle(Controls.kControlListBoxPart, 
 				Controls.kControlListBoxListHandleTag)
 		self.list = List.as_List(h)
 		self.setlist()
diff --git a/Mac/Lib/EasyDialogs.py b/Mac/Lib/EasyDialogs.py
index e24bc8b9404..cfd55a16cbb 100644
--- a/Mac/Lib/EasyDialogs.py
+++ b/Mac/Lib/EasyDialogs.py
@@ -326,7 +326,7 @@ ARGV_CMDLINE_DATA=14
 ##				MacOS.HandleEvent(ev) 
 ##
 def _setmenu(control, items):
-		mhandle = control.GetControlDataHandle(Controls.kControlMenuPart,
+		mhandle = control.GetControlData_Handle(Controls.kControlMenuPart,
 				Controls.kControlPopupButtonMenuHandleTag)
 		menu = Menu.as_Menu(mhandle)
 		for item in items:
@@ -338,7 +338,7 @@ def _setmenu(control, items):
 				label = label[:-1]
 			menu.AppendMenu(label)
 ##		mhandle, mid = menu.getpopupinfo()
-##		control.SetControlDataHandle(Controls.kControlMenuPart,
+##		control.SetControlData_Handle(Controls.kControlMenuPart,
 ##				Controls.kControlPopupButtonMenuHandleTag, mhandle)
 		control.SetControlMinimum(1)
 		control.SetControlMaximum(len(items)+1)