diff --git a/man/strongswan.conf.5.in b/man/strongswan.conf.5.in
index 1a4da0016..f08d00497 100644
--- a/man/strongswan.conf.5.in
+++ b/man/strongswan.conf.5.in
@@ -500,13 +500,13 @@ certificates even if they don't contain a CA basic constraint.
 .BR charon.plugins.stroke.max_concurrent " [4]"
 Maximum number of stroke messages handled concurrently
 .TP
-.BR charon.plugins.tnccs-11.max_msg_size " [45000]"
+.BR charon.plugins.tnccs-11.max_message_size " [45000]"
 Maximum size of a PA-TNC message (XML & Base64 encoding)
 .TP
 .BR charon.plugins.tnccs-20.max_batch_size " [65522]"
 Maximum size of a PB-TNC batch (upper limit via PT-EAP = 65529)
 .TP
-.BR charon.plugins.tnccs-20.max_msg_size " [65490]"
+.BR charon.plugins.tnccs-20.max_message_size " [65490]"
 Maximum size of a PA-TNC message (upper limit via PT-EAP = 65497)
 .TP
 .BR charon.plugins.tnc-ifmap.device_name
diff --git a/src/libcharon/plugins/tnccs_11/tnccs_11.c b/src/libcharon/plugins/tnccs_11/tnccs_11.c
index ba7214a05..eeb4c1ac9 100644
--- a/src/libcharon/plugins/tnccs_11/tnccs_11.c
+++ b/src/libcharon/plugins/tnccs_11/tnccs_11.c
@@ -554,7 +554,7 @@ tls_t *tnccs_11_create(bool is_server)
 		.is_server = is_server,
 		.mutex = mutex_create(MUTEX_TYPE_DEFAULT),
 		.max_msg_len = lib->settings->get_int(lib->settings,
-								"%s.plugins.tnccs-11.max_msg_size", 45000,
+								"%s.plugins.tnccs-11.max_message_size", 45000,
 								charon->name),
 	);
 
diff --git a/src/libcharon/plugins/tnccs_20/tnccs_20.c b/src/libcharon/plugins/tnccs_20/tnccs_20.c
index 68a14551e..cd7f149f6 100644
--- a/src/libcharon/plugins/tnccs_20/tnccs_20.c
+++ b/src/libcharon/plugins/tnccs_20/tnccs_20.c
@@ -805,7 +805,7 @@ tls_t *tnccs_20_create(bool is_server)
 								"%s.plugins.tnccs-20.max_batch_size", 65522,
 								charon->name),
 		.max_msg_len = lib->settings->get_int(lib->settings,
-								"%s.plugins.tnccs-20.max_msg_size", 65490,
+								"%s.plugins.tnccs-20.max_message_size", 65490,
 								charon->name),
 	);