diff --git a/wintable/new/coord.h b/wintable/new/coord.h
index 39517d3..f0a0ec2 100644
--- a/wintable/new/coord.h
+++ b/wintable/new/coord.h
@@ -149,7 +149,7 @@ static BOOL rowColumnToClientRect(struct table *t, struct rowcol rc, RECT *r)
 
 // TODO idealCoordToRowColumn/rowColumnToIdealCoord?
 
-static void toItemContentRect(struct table *t, RECT *r, LRESULT xoff, intptr_t width, intptr_t height)
+static void toCellContentRect(struct table *t, RECT *r, LRESULT xoff, intptr_t width, intptr_t height)
 {
 	if (xoff == 0)
 		xoff = SendMessageW(t->header, HDM_GETBITMAPMARGIN, 0, 0);
@@ -161,4 +161,4 @@ static void toItemContentRect(struct table *t, RECT *r, LRESULT xoff, intptr_t w
 		r->bottom = r->top + height;
 }
 
-#define toCheckboxRect(t, r) toItemContentRect(t, r, 0, t->checkboxWidth, t->checkboxHeight)
+#define toCheckboxRect(t, r) toCellContentRect(t, r, 0, t->checkboxWidth, t->checkboxHeight)
diff --git a/wintable/new/draw.h b/wintable/new/draw.h
index a4bd22d..2834ce7 100644
--- a/wintable/new/draw.h
+++ b/wintable/new/draw.h
@@ -44,7 +44,7 @@ static void drawCell(struct table *t, HDC dc, struct drawCellParams *p)
 	switch (t->columnTypes[p->column]) {
 	case tableColumnText:
 	case tableColumnImage:		// TODO
-		toItemContentRect(t, &r, p->xoff, 0, 0);		// TODO get the text height
+		toCellContentRect(t, &r, p->xoff, 0, 0);		// TODO get the text height
 		if (SetTextColor(dc, GetSysColor(textColor)) == CLR_INVALID)
 			panic("error setting Table cell text color");
 		if (SetBkMode(dc, TRANSPARENT) == 0)