diff --git a/windows/button.c b/windows/button.c
index 812f5174..01202966 100644
--- a/windows/button.c
+++ b/windows/button.c
@@ -34,7 +34,7 @@ static void onDestroy(void *data)
 // from http://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing
 #define buttonHeight 14
 
-static void preferredSize(uiControl *c, uiSizing *d, intmax_t *width, intmax_t *height)
+static void buttonPreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intmax_t *height)
 {
 	struct button *b = (struct button *) c;
 	SIZE size;
@@ -104,7 +104,7 @@ uiButton *uiNewButton(const char *text)
 
 	b->onClicked = defaultOnClicked;
 
-	uiControl(b)->PreferredSize = preferredSize;
+	uiControl(b)->PreferredSize = buttonPreferredSize;
 
 	uiButton(b)->Text = buttonText;
 	uiButton(b)->SetText = buttonSetText;
diff --git a/windows/checkbox.c b/windows/checkbox.c
index 3ad2c75c..af57736b 100644
--- a/windows/checkbox.c
+++ b/windows/checkbox.c
@@ -44,7 +44,7 @@ static void onDestroy(void *data)
 // from http://msdn.microsoft.com/en-us/library/windows/desktop/bb226818%28v=vs.85%29.aspx
 #define checkboxXFromLeftOfBoxToLeftOfLabel 12
 
-static void preferredSize(uiControl *cc, uiSizing *d, intmax_t *width, intmax_t *height)
+static void checkboxPreferredSize(uiControl *cc, uiSizing *d, intmax_t *width, intmax_t *height)
 {
 	struct checkbox *c = (struct checkbox *) cc;
 
@@ -119,7 +119,7 @@ uiCheckbox *uiNewCheckbox(const char *text)
 
 	c->onToggled = defaultOnToggled;
 
-	uiControl(c)->PreferredSize = preferredSize;
+	uiControl(c)->PreferredSize = checkboxPreferredSize;
 
 	uiCheckbox(c)->Text = checkboxText;
 	uiCheckbox(c)->SetText = checkboxSetText;
diff --git a/windows/entry.c b/windows/entry.c
index 634be397..5bf90e32 100644
--- a/windows/entry.c
+++ b/windows/entry.c
@@ -27,7 +27,7 @@ static void onDestroy(void *data)
 #define entryWidth 107 /* this is actually the shorter progress bar width, but Microsoft only indicates as wide as necessary */
 #define entryHeight 14
 
-static void preferredSize(uiControl *c, uiSizing *d, intmax_t *width, intmax_t *height)
+static void entryPreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intmax_t *height)
 {
 	*width = uiDlgUnitsToX(entryWidth, d->sys->baseX);
 	*height = uiDlgUnitsToY(entryHeight, d->sys->baseY);
@@ -64,7 +64,7 @@ uiEntry *uiNewEntry(void)
 
 	e->hwnd = (HWND) uiControlHandle(uiControl(e));
 
-	uiControl(e)->PreferredSize = preferredSize;
+	uiControl(e)->PreferredSize = entryPreferredSize;
 
 	uiEntry(e)->Text = entryText;
 	uiEntry(e)->SetText = entrySetText;
diff --git a/windows/label.c b/windows/label.c
index ef78dbdf..4d811104 100644
--- a/windows/label.c
+++ b/windows/label.c
@@ -26,7 +26,7 @@ static void onDestroy(void *data)
 // via http://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing
 #define labelHeight 8
 
-static void preferredSize(uiControl *c, uiSizing *d, intmax_t *width, intmax_t *height)
+static void labelPreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intmax_t *height)
 {
 	struct label *l = (struct label *) c;
 
@@ -70,7 +70,7 @@ uiLabel *uiNewLabel(const char *text)
 
 	l->hwnd = (HWND) uiControlHandle(uiControl(l));
 
-	uiControl(l)->PreferredSize = preferredSize;
+	uiControl(l)->PreferredSize = labelPreferredSize;
 
 	uiLabel(l)->Text = labelText;
 	uiLabel(l)->SetText = labelSetText;
diff --git a/windows/tab.c b/windows/tab.c
index c04e42eb..e252a68e 100644
--- a/windows/tab.c
+++ b/windows/tab.c
@@ -1,8 +1,6 @@
 // 12 april 2015
 #include "uipriv_windows.h"
 
-// TODO enable/disable
-
 struct tab {
 	uiTab t;
 	HWND hwnd;
@@ -64,7 +62,6 @@ static void onDestroy(void *data)
 	uiFree(t);
 }
 
-// TODO rename all the other preferredSize overloads to this form
 static void tabPreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intmax_t *height)
 {
 	struct tab *t = (struct tab *) c;