diff --git a/aux/broccoli b/aux/broccoli
index 241f37597d..042ce05428 160000
--- a/aux/broccoli
+++ b/aux/broccoli
@@ -1 +1 @@
-Subproject commit 241f37597d5fb345dfed5b6b246107d143290851
+Subproject commit 042ce05428035b6bdd4863b9d316b7fd4bb5252e
diff --git a/scripts/base/frameworks/communication/main.bro b/scripts/base/frameworks/communication/main.bro
index 44d6ace1db..569ba140a9 100644
--- a/scripts/base/frameworks/communication/main.bro
+++ b/scripts/base/frameworks/communication/main.bro
@@ -14,8 +14,8 @@ export {
 	## Which port to listen on.
 	const listen_port = 47757/tcp &redef;
 	
-	## This defines if a listening socket should use encryption.
-	const listen_encrypted = F &redef;
+	## This defines if a listening socket should use SSL.
+	const listen_ssl = F &redef;
 
 	## Default compression level.  Compression level is 0-9, with 0 = no 
 	## compression.
diff --git a/scripts/policy/frameworks/communication/listen.bro b/scripts/policy/frameworks/communication/listen.bro
index b42271bced..e366e5b4ff 100644
--- a/scripts/policy/frameworks/communication/listen.bro
+++ b/scripts/policy/frameworks/communication/listen.bro
@@ -8,5 +8,5 @@ module Communication;
 event bro_init() &priority=-10
 	{
 	enable_communication();
-	listen(listen_interface, listen_port, listen_encrypted);
+	listen(listen_interface, listen_port, listen_ssl);
 	}
diff --git a/testing/btest/istate/events-ssl.bro b/testing/btest/istate/events-ssl.bro
index 9110648be9..5a41e1683b 100644
--- a/testing/btest/istate/events-ssl.bro
+++ b/testing/btest/istate/events-ssl.bro
@@ -17,7 +17,7 @@
 @TEST-START-FILE sender.bro
 
 @load frameworks/communication/listen
-redef Communication::listen_encrypted=T;
+redef Communication::listen_ssl=T;
 
 event bro_init()
     {