diff --git a/tools/editworld/src/limitsdialog.cpp b/tools/editworld/src/limitsdialog.cpp
index 48afc0d56..5e6b85a33 100644
--- a/tools/editworld/src/limitsdialog.cpp
+++ b/tools/editworld/src/limitsdialog.cpp
@@ -48,9 +48,9 @@ void LimitsDialog::DoDataExchange(CDataExchange* pDX)
 
 BEGIN_MESSAGE_MAP(LimitsDialog, CDialog)
 	//{{AFX_MSG_MAP(LimitsDialog)
-	ON_NOTIFY(LVN_GETDISPINFO, IDC_LISTLIMITS, OnGetdispinfoListlimits)
-	ON_NOTIFY(LVN_KEYDOWN, IDC_LISTLIMITS, OnKeydownListlimits)
-	ON_NOTIFY(LVN_ITEMCHANGED, IDC_LISTLIMITS, OnItemchangedListlimits)
+	ON_NOTIFY(LVN_GETDISPINFO, IDC_LISTLIMITS, OnGetItemText)
+	ON_NOTIFY(LVN_KEYDOWN, IDC_LISTLIMITS, OnLimits_ListCtrlKeyDown)
+	ON_NOTIFY(LVN_ITEMCHANGED, IDC_LISTLIMITS, OnLimits_ListCtrlItemFocused)
 	ON_BN_CLICKED(IDC_ADDLIMITS, OnAddLimits_ButtonClick)
 	ON_BN_CLICKED(IDC_MODIFY, OnModify_ButtonClick)
 	//}}AFX_MSG_MAP
@@ -101,7 +101,7 @@ BOOL LimitsDialog::OnInitDialog()
 }
 
 
-void LimitsDialog::OnGetdispinfoListlimits(NMHDR* pNMHDR, LRESULT* pResult) 
+void LimitsDialog::OnGetItemText(NMHDR* pNMHDR, LRESULT* pResult) 
 {
 	LVITEMA& item = reinterpret_cast<LV_DISPINFO*>(pNMHDR)->item;
 
@@ -138,7 +138,7 @@ void LimitsDialog::OnGetdispinfoListlimits(NMHDR* pNMHDR, LRESULT* pResult)
 }
 
 
-void LimitsDialog::OnKeydownListlimits(NMHDR* pNMHDR, LRESULT* pResult) 
+void LimitsDialog::OnLimits_ListCtrlKeyDown(NMHDR* pNMHDR, LRESULT* pResult) 
 {
 	LV_KEYDOWN* pLVKeyDown = (LV_KEYDOWN*)pNMHDR;
 
@@ -159,7 +159,7 @@ void LimitsDialog::OnKeydownListlimits(NMHDR* pNMHDR, LRESULT* pResult)
 }
 
 
-void LimitsDialog::OnItemchangedListlimits(NMHDR* pNMHDR, LRESULT* pResult) 
+void LimitsDialog::OnLimits_ListCtrlItemFocused(NMHDR* pNMHDR, LRESULT* pResult) 
 {
 	NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;
 	char String[256];
diff --git a/tools/editworld/src/limitsdialog.hpp b/tools/editworld/src/limitsdialog.hpp
index 1898e3a9a..c1cdff3b7 100644
--- a/tools/editworld/src/limitsdialog.hpp
+++ b/tools/editworld/src/limitsdialog.hpp
@@ -73,9 +73,9 @@ class LimitsDialog : public CDialog
 		// Generated message map functions
 		//{{AFX_MSG(LimitsDialog)
 		virtual BOOL OnInitDialog();
-		afx_msg void OnGetdispinfoListlimits(NMHDR* pNMHDR, LRESULT* pResult);
-		afx_msg void OnKeydownListlimits(NMHDR* pNMHDR, LRESULT* pResult);
-		afx_msg void OnItemchangedListlimits(NMHDR* pNMHDR, LRESULT* pResult);
+		afx_msg void OnGetItemText(NMHDR* pNMHDR, LRESULT* pResult);
+		afx_msg void OnLimits_ListCtrlKeyDown(NMHDR* pNMHDR, LRESULT* pResult);
+		afx_msg void OnLimits_ListCtrlItemFocused(NMHDR* pNMHDR, LRESULT* pResult);
 		afx_msg void OnAddLimits_ButtonClick();
 		afx_msg void OnModify_ButtonClick();
 		//}}AFX_MSG