diff --git a/ccan/README b/ccan/README
index acdc78064..4fab455bc 100644
--- a/ccan/README
+++ b/ccan/README
@@ -1,3 +1,3 @@
 CCAN imported from http://ccodearchive.net.
 
-CCAN version: init-2541-g52b86922
+CCAN version: init-2545-g7b11e744
diff --git a/ccan/ccan/tal/tal.c b/ccan/ccan/tal/tal.c
index e0ca30d72..69270c6ff 100644
--- a/ccan/ccan/tal/tal.c
+++ b/ccan/ccan/tal/tal.c
@@ -594,12 +594,12 @@ bool tal_set_name_(tal_t *ctx, const char *name, bool literal)
 
         /* Get rid of any old name */
         if (prop) {
-                struct name *name = (struct name *)*prop;
-                if (is_literal(&name->hdr))
+                struct name *oldname = (struct name *)*prop;
+                if (is_literal(&oldname->hdr))
                         *prop = NULL;
                 else {
-                        *prop = name->hdr.next;
-			freefn(name);
+                        *prop = oldname->hdr.next;
+			freefn(oldname);
                 }
         }
 
diff --git a/ccan/tools/configurator/configurator.c b/ccan/tools/configurator/configurator.c
index 57779f299..f830cbca1 100644
--- a/ccan/tools/configurator/configurator.c
+++ b/ccan/tools/configurator/configurator.c
@@ -797,12 +797,12 @@ static bool run_test(const char *cmd, const char *wrapper, struct test *test)
 		/* We run INSIDE_MAIN tests for sanity checking. */
 		if (strstr(test->style, "EXECUTE")
 		    || strstr(test->style, "INSIDE_MAIN")) {
-			char *cmd = malloc(strlen(wrapper) + strlen(" ." DIR_SEP OUTPUT_FILE) + 1);
+			char *runcmd = malloc(strlen(wrapper) + strlen(" ." DIR_SEP OUTPUT_FILE) + 1);
 
-			strcpy(cmd, wrapper);
-			strcat(cmd, " ." DIR_SEP OUTPUT_FILE);
-			output = run(cmd, &status);
-			free(cmd);
+			strcpy(runcmd, wrapper);
+			strcat(runcmd, " ." DIR_SEP OUTPUT_FILE);
+			output = run(runcmd, &status);
+			free(runcmd);
 			if (!strstr(test->style, "EXECUTE") && status != 0)
 				c12r_errx(EXIT_BAD_TEST,
 					  "Test for %s failed with %i:\n%s",