8 files changed, 19 insertions, 19 deletions
diff --git a/lib/ccan/tlist/test/compile_fail-tlist_add.c b/lib/ccan/tlist/test/compile_fail-tlist_add.c
index 1b87bfd119..addcf01e9b 100644
--- a/lib/ccan/tlist/test/compile_fail-tlist_add.c
+++ b/lib/ccan/tlist/test/compile_fail-tlist_add.c
@@ -5,12 +5,12 @@ TLIST_TYPE(cousins, struct cousin);
 
 struct child {
 	const char *name;
-	struct list_node list;
+	struct ccan_list_node list;
 };
 
 struct cousin {
 	const char *name;
-	struct list_node list;
+	struct ccan_list_node list;
 };
 
 int main(int argc, char *argv[])
diff --git a/lib/ccan/tlist/test/compile_fail-tlist_add_tail.c b/lib/ccan/tlist/test/compile_fail-tlist_add_tail.c
index 33dff3d8eb..cfa5d89031 100644
--- a/lib/ccan/tlist/test/compile_fail-tlist_add_tail.c
+++ b/lib/ccan/tlist/test/compile_fail-tlist_add_tail.c
@@ -5,12 +5,12 @@ TLIST_TYPE(cousins, struct cousin);
 
 struct child {
 	const char *name;
-	struct list_node list;
+	struct ccan_list_node list;
 };
 
 struct cousin {
 	const char *name;
-	struct list_node list;
+	struct ccan_list_node list;
 };
 
 int main(int argc, char *argv[])
diff --git a/lib/ccan/tlist/test/compile_fail-tlist_del_from.c b/lib/ccan/tlist/test/compile_fail-tlist_del_from.c
index d06a72fbfa..d3314dab80 100644
--- a/lib/ccan/tlist/test/compile_fail-tlist_del_from.c
+++ b/lib/ccan/tlist/test/compile_fail-tlist_del_from.c
@@ -5,12 +5,12 @@ TLIST_TYPE(cousins, struct cousin);
 
 struct child {
 	const char *name;
-	struct list_node list;
+	struct ccan_list_node list;
 };
 
 struct cousin {
 	const char *name;
-	struct list_node list;
+	struct ccan_list_node list;
 };
 
 int main(int argc, char *argv[])
diff --git a/lib/ccan/tlist/test/compile_fail-tlist_for_each.c b/lib/ccan/tlist/test/compile_fail-tlist_for_each.c
index 1b2fb6882f..6ea0183392 100644
--- a/lib/ccan/tlist/test/compile_fail-tlist_for_each.c
+++ b/lib/ccan/tlist/test/compile_fail-tlist_for_each.c
@@ -4,12 +4,12 @@ TLIST_TYPE(children, struct child);
 
 struct child {
 	const char *name;
-	struct list_node list;
+	struct ccan_list_node list;
 };
 
 struct cousin {
 	const char *name;
-	struct list_node list;
+	struct ccan_list_node list;
 };
 
 int main(int argc, char *argv[])
diff --git a/lib/ccan/tlist/test/compile_fail-tlist_for_each_safe.c b/lib/ccan/tlist/test/compile_fail-tlist_for_each_safe.c
index 651c6cefd6..41a3d923b1 100644
--- a/lib/ccan/tlist/test/compile_fail-tlist_for_each_safe.c
+++ b/lib/ccan/tlist/test/compile_fail-tlist_for_each_safe.c
@@ -4,12 +4,12 @@ TLIST_TYPE(children, struct child);
 
 struct child {
 	const char *name;
-	struct list_node list;
+	struct ccan_list_node list;
 };
 
 struct cousin {
 	const char *name;
-	struct list_node list;
+	struct ccan_list_node list;
 };
 
 int main(int argc, char *argv[])
diff --git a/lib/ccan/tlist/test/compile_fail-tlist_tail.c b/lib/ccan/tlist/test/compile_fail-tlist_tail.c
index 48f394446e..4022abf4ac 100644
--- a/lib/ccan/tlist/test/compile_fail-tlist_tail.c
+++ b/lib/ccan/tlist/test/compile_fail-tlist_tail.c
@@ -4,12 +4,12 @@ TLIST_TYPE(children, struct child);
 
 struct child {
 	const char *name;
-	struct list_node list;
+	struct ccan_list_node list;
 };
 
 struct cousin {
 	const char *name;
-	struct list_node list;
+	struct ccan_list_node list;
 };
 
 int main(int argc, char *argv[])
diff --git a/lib/ccan/tlist/test/compile_fail-tlist_top.c b/lib/ccan/tlist/test/compile_fail-tlist_top.c
index 21651400ef..ab3591ff28 100644
--- a/lib/ccan/tlist/test/compile_fail-tlist_top.c
+++ b/lib/ccan/tlist/test/compile_fail-tlist_top.c
@@ -4,12 +4,12 @@ TLIST_TYPE(children, struct child);
 
 struct child {
 	const char *name;
-	struct list_node list;
+	struct ccan_list_node list;
 };
 
 struct cousin {
 	const char *name;
-	struct list_node list;
+	struct ccan_list_node list;
 };
 
 int main(int argc, char *argv[])
diff --git a/lib/ccan/tlist/test/run.c b/lib/ccan/tlist/test/run.c
index 95b02ebe21..fe75c49125 100644
--- a/lib/ccan/tlist/test/run.c
+++ b/lib/ccan/tlist/test/run.c
@@ -12,7 +12,7 @@ struct parent {
 
 struct child {
 	const char *name;
-	struct list_node list;
+	struct ccan_list_node list;
 };
 
 int main(int argc, char *argv[])
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
 
 	c1.name = "c1";
 	tlist_add(&parent.children, &c1, list);
-	/* Test list_add and !list_empty. */
+	/* Test ccan_list_add and !ccan_list_empty. */
 	ok1(!tlist_empty(&parent.children));
 	ok1(c2.list.next == &parent.children.raw.n);
 	ok1(c2.list.prev == &c1.list);
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
 
 	c3.name = "c3";
 	tlist_add_tail(&parent.children, &c3, list);
-	/* Test list_add_tail and !list_empty. */
+	/* Test ccan_list_add_tail and !ccan_list_empty. */
 	ok1(!tlist_empty(&parent.children));
 	ok1(parent.children.raw.n.next == &c1.list);
 	ok1(parent.children.raw.n.prev == &c3.list);
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
 	/* Test tlist_top */
 	ok1(tlist_top(&parent.children, list) == &c1);
 
-	/* Test list_tail */
+	/* Test ccan_list_tail */
 	ok1(tlist_tail(&parent.children, list) == &c3);
 
 	/* Test tlist_for_each. */
@@ -140,7 +140,7 @@ int main(int argc, char *argv[])
 	ok1(i == 3);
 	ok1(tlist_empty(&parent.children));
 
-	/* Test list_top/list_tail on empty list. */
+	/* Test ccan_list_top/ccan_list_tail on empty list. */
 	ok1(tlist_top(&parent.children, list) == (struct child *)NULL);
 	ok1(tlist_tail(&parent.children, list) == (struct child *)NULL);
 	return exit_status();