diff --git a/doc/configuration.txt b/doc/configuration.txt
index a9587129b..87fc56729 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -12941,7 +12941,7 @@ language(<value>[,<default>])
     use_backend english if en
     default_backend choose_your_language
 
-len
+length
   Get the length of the string. This can only be placed after a string
   sample fetch function or after a transformation keyword returning a string
   type. The result is of type integer.
diff --git a/src/sample.c b/src/sample.c
index 213dd317b..ed2aee010 100644
--- a/src/sample.c
+++ b/src/sample.c
@@ -1568,7 +1568,7 @@ static int sample_conv_djb2(const struct arg *arg_p, struct sample *smp, void *p
 	return 1;
 }
 
-static int sample_conv_strlen(const struct arg *arg_p, struct sample *smp, void *private)
+static int sample_conv_length(const struct arg *arg_p, struct sample *smp, void *private)
 {
 	int i = smp->data.u.str.len;
 	smp->data.u.sint = i;
@@ -2796,7 +2796,7 @@ static struct sample_conv_kw_list sample_conv_kws = {ILH, {
 	{ "base64", sample_conv_bin2base64,0,            NULL, SMP_T_BIN,  SMP_T_STR  },
 	{ "upper",  sample_conv_str2upper, 0,            NULL, SMP_T_STR,  SMP_T_STR  },
 	{ "lower",  sample_conv_str2lower, 0,            NULL, SMP_T_STR,  SMP_T_STR  },
-	{ "len",    sample_conv_strlen,    0,            NULL, SMP_T_STR,  SMP_T_SINT },
+	{ "length", sample_conv_length,    0,            NULL, SMP_T_STR,  SMP_T_SINT },
 	{ "hex",    sample_conv_bin2hex,   0,            NULL, SMP_T_BIN,  SMP_T_STR  },
 	{ "hex2i",  sample_conv_hex2int,   0,            NULL, SMP_T_STR,  SMP_T_SINT },
 	{ "ipmask", sample_conv_ipmask,    ARG1(1,MSK4), NULL, SMP_T_IPV4, SMP_T_IPV4 },