diff --git a/dll/cpl/intl/generalp.c b/dll/cpl/intl/generalp.c
index dc3ef3da9df..bee911bc8bf 100644
--- a/dll/cpl/intl/generalp.c
+++ b/dll/cpl/intl/generalp.c
@@ -38,7 +38,7 @@
 
 HWND hList;
 HWND hLocaleList, hGeoList;
-BOOL bSpain = FALSE;
+BOOL isSpain = FALSE;
 
 GROUPINGDATA
 GroupingFormats[MAX_GROUPINGFORMATS] =
@@ -49,7 +49,7 @@ GroupingFormats[MAX_GROUPINGFORMATS] =
 };
 
 static BOOL CALLBACK
-LocalesEnumProc(LPTSTR lpLocale)
+GeneralPropertyPageLocalesEnumProc(LPTSTR lpLocale)
 {
     LCID lcid;
     WCHAR lang[255];
@@ -65,10 +65,10 @@ LocalesEnumProc(LPTSTR lpLocale)
     if (lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT) ||
         lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), SORT_DEFAULT))
     {
-        if (bSpain == FALSE)
+        if (isSpain == FALSE)
         {
             LoadStringW(hApplet, IDS_SPAIN, lang, 255);
-            bSpain = TRUE;
+            isSpain = TRUE;
         }
         else
         {
@@ -169,8 +169,8 @@ CreateLanguagesList(HWND hwnd)
     WCHAR langSel[255];
 
     hList = hwnd;
-    bSpain = FALSE;
-    EnumSystemLocalesW(LocalesEnumProc, LCID_SUPPORTED);
+    isSpain = FALSE;
+    EnumSystemLocalesW(GeneralPropertyPageLocalesEnumProc, LCID_SUPPORTED);
 
     /* Select current locale */
     /* or should it be System and not user? */
diff --git a/dll/cpl/intl/intl.c b/dll/cpl/intl/intl.c
index 6bf35edb8db..440e34469ae 100644
--- a/dll/cpl/intl/intl.c
+++ b/dll/cpl/intl/intl.c
@@ -77,7 +77,7 @@ ResourceMessageBox(
 }
 
 static VOID
-InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, LPARAM lParam)
+InitIntlPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, LPARAM lParam)
 {
     ZeroMemory(psp, sizeof(PROPSHEETPAGE));
     psp->dwSize = sizeof(PROPSHEETPAGE);
@@ -183,14 +183,14 @@ Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
     psh.nStartPage = 0;
     psh.ppsp = psp;
 
-    InitPropSheetPage(&psp[0], IDD_GENERALPAGE, GeneralPageProc, (LPARAM)pGlobalData);
+    InitIntlPropSheetPage(&psp[0], IDD_GENERALPAGE, GeneralPageProc, (LPARAM)pGlobalData);
     psh.nPages++;
-    InitPropSheetPage(&psp[1], IDD_LANGUAGESPAGE, LanguagesPageProc, (LPARAM)pGlobalData);
+    InitIntlPropSheetPage(&psp[1], IDD_LANGUAGESPAGE, LanguagesPageProc, (LPARAM)pGlobalData);
     psh.nPages++;
 
     if (pGlobalData->bIsUserAdmin)
     {
-        InitPropSheetPage(&psp[2], IDD_ADVANCEDPAGE, AdvancedPageProc, (LPARAM)pGlobalData);
+        InitIntlPropSheetPage(&psp[2], IDD_ADVANCEDPAGE, AdvancedPageProc, (LPARAM)pGlobalData);
         psh.nPages++;
     }
 
diff --git a/dll/cpl/intl/time.c b/dll/cpl/intl/time.c
index 9920f1881d2..2ad1307e8e0 100644
--- a/dll/cpl/intl/time.c
+++ b/dll/cpl/intl/time.c
@@ -26,12 +26,12 @@
 
 #include "intl.h"
 
-static HWND hwndEnum = NULL;
+static HWND hwndTimeEnum = NULL;
 
 static BOOL CALLBACK
 TimeFormatEnumProc(PWSTR lpTimeFormatString)
 {
-    SendMessageW(hwndEnum,
+    SendMessageW(hwndTimeEnum,
                 CB_ADDSTRING,
                 0,
                 (LPARAM)lpTimeFormatString);
@@ -62,7 +62,7 @@ InitTimeFormatCB(
                         CB_LIMITTEXT, MAX_TIMEFORMAT, 0);
 
     /* Add available time formats to the list */
-    hwndEnum = GetDlgItem(hwndDlg, IDC_TIMEFORMAT);
+    hwndTimeEnum = GetDlgItem(hwndDlg, IDC_TIMEFORMAT);
     EnumTimeFormatsW(TimeFormatEnumProc, pGlobalData->UserLCID, 0);
 
     SendDlgItemMessageW(hwndDlg, IDC_TIMEFORMAT,