diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 3cc5733b..3a5a702a 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -4706,7 +4706,7 @@ rotate_grab_motion(struct weston_pointer_grab *grab, uint32_t time,
 					 shsurf->view->geometry.y + dposy);
 	}
 
-	/* Repaint implies weston_surface_update_transform(), which
+	/* Repaint implies weston_view_update_transform(), which
 	 * lazily applies the damage due to rotation update.
 	 */
 	weston_compositor_schedule_repaint(shsurf->surface->compositor);
diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index 9c83b1a7..e4496e76 100644
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
@@ -900,7 +900,7 @@ drm_output_prepare_overlay_view(struct weston_output *output_base,
 
 	/*
 	 * Calculate the source & dest rects properly based on actual
-	 * position (note the caller has called weston_surface_update_transform()
+	 * position (note the caller has called weston_view_update_transform()
 	 * for us already).
 	 */
 	pixman_region32_init(&dest_rect);
diff --git a/src/compositor.c b/src/compositor.c
index 18975bf4..b0bc86c9 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -2621,13 +2621,13 @@ subsurface_configure(struct weston_surface *surface, int32_t dx, int32_t dy)
 	if (!weston_surface_is_mapped(surface)) {
 		struct weston_output *output;
 
-		/* Cannot call weston_surface_update_transform(),
+		/* Cannot call weston_view_update_transform(),
 		 * because that would call it also for the parent surface,
 		 * which might not be mapped yet. That would lead to
 		 * inconsistent state, where the window could never be
 		 * mapped.
 		 *
-		 * Instead just assing any output, to make
+		 * Instead just assign any output, to make
 		 * weston_surface_is_mapped() return true, so that when the
 		 * parent surface does get mapped, this one will get
 		 * included, too. See view_list_add().