diff --git a/windows/button.c b/windows/button.c
index f3c0846c..5dc3eacf 100644
--- a/windows/button.c
+++ b/windows/button.c
@@ -56,12 +56,12 @@ static void defaultOnClicked(uiButton *b, void *data)
 
 char *uiButtonText(uiButton *b)
 {
-	return uiWindowsUtilText(b->hwnd);
+	return uiWindowsWindowText(b->hwnd);
 }
 
 void uiButtonSetText(uiButton *b, const char *text)
 {
-	uiWindowsUtilSetText(b->hwnd, text);
+	uiWindowsSetWindowText(b->hwnd, text);
 	// changing the text might necessitate a change in the button's size
 	uiWindowsControlQueueRelayout(uiWindowsControl(b));
 }
diff --git a/windows/checkbox.c b/windows/checkbox.c
index 9d4f7b80..ce7e6c0c 100644
--- a/windows/checkbox.c
+++ b/windows/checkbox.c
@@ -53,12 +53,12 @@ static void defaultOnToggled(uiCheckbox *c, void *data)
 
 char *uiCheckboxText(uiCheckbox *c)
 {
-	return uiWindowsUtilText(c->hwnd);
+	return uiWindowsWindowText(c->hwnd);
 }
 
 void uiCheckboxSetText(uiCheckbox *c, const char *text)
 {
-	uiWindowsUtilSetText(c->hwnd, text);
+	uiWindowsSetWindowText(c->hwnd, text);
 	// changing the text might necessitate a change in the checkbox's size
 	uiWindowsControlQueueRelayout(uiWindowsControl(c));
 }
diff --git a/windows/entry.c b/windows/entry.c
index 184efce3..f0f2c5af 100644
--- a/windows/entry.c
+++ b/windows/entry.c
@@ -45,14 +45,14 @@ static void defaultOnChanged(uiEntry *e, void *data)
 
 char *uiEntryText(uiEntry *e)
 {
-	return uiWindowsUtilText(e->hwnd);
+	return uiWindowsWindowText(e->hwnd);
 }
 
 void uiEntrySetText(uiEntry *e, const char *text)
 {
 	// doing this raises an EN_CHANGED
 	e->inhibitChanged = TRUE;
-	uiWindowsUtilSetText(e->hwnd, text);
+	uiWindowsSetWindowText(e->hwnd, text);
 	e->inhibitChanged = FALSE;
 	// don't queue the control for resize; entry sizes are independent of their contents
 }
diff --git a/windows/group.c b/windows/group.c
index 62b616be..1db16ba2 100644
--- a/windows/group.c
+++ b/windows/group.c
@@ -97,12 +97,12 @@ static void groupArrangeChildrenControlIDsZOrder(uiWindowsControl *c)
 
 char *uiGroupTitle(uiGroup *g)
 {
-	return uiWindowsUtilText(g->hwnd);
+	return uiWindowsWindowText(g->hwnd);
 }
 
 void uiGroupSetTitle(uiGroup *g, const char *text)
 {
-	uiWindowsUtilSetText(g->hwnd, text);
+	uiWindowsSetWindowText(g->hwnd, text);
 	// changing the text might necessitate a change in the groupbox's size
 	uiWindowsControlQueueRelayout(uiWindowsControl(g));
 }
diff --git a/windows/multilineentry.c b/windows/multilineentry.c
index 7b54042d..10a41559 100644
--- a/windows/multilineentry.c
+++ b/windows/multilineentry.c
@@ -49,14 +49,14 @@ static void defaultOnChanged(uiMultilineEntry *e, void *data)
 
 char *uiMultilineEntryText(uiMultilineEntry *e)
 {
-	return uiWindowsUtilText(e->hwnd);
+	return uiWindowsWindowText(e->hwnd);
 }
 
 void uiMultilineEntrySetText(uiMultilineEntry *e, const char *text)
 {
 	// doing this raises an EN_CHANGED
 	e->inhibitChanged = TRUE;
-	uiWindowsUtilSetText(e->hwnd, text);
+	uiWindowsSetWindowText(e->hwnd, text);
 	e->inhibitChanged = FALSE;
 	// don't queue the control for resize; entry sizes are independent of their contents
 }
diff --git a/windows/window.c b/windows/window.c
index ca2e0652..93ee1443 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -195,12 +195,12 @@ static void windowArrangeChildrenControlIDsZOrder(uiWindowsControl *c)
 
 char *uiWindowTitle(uiWindow *w)
 {
-	return uiWindowsUtilText(w->hwnd);
+	return uiWindowsWindowText(w->hwnd);
 }
 
 void uiWindowSetTitle(uiWindow *w, const char *title)
 {
-	uiWindowsUtilSetText(w->hwnd, title);
+	uiWindowsSetWindowText(w->hwnd, title);
 	// don't queue resize; the caption isn't part of what affects layout and sizing of the client area (it'll be ellipsized if too long)
 }