diff --git a/scripts/base/frameworks/dpd/main.bro b/scripts/base/frameworks/dpd/main.bro
index 1e71c61f7e..d9288bdd04 100644
--- a/scripts/base/frameworks/dpd/main.bro
+++ b/scripts/base/frameworks/dpd/main.bro
@@ -25,7 +25,7 @@ export {
 		
 		## Disabled analyzer IDs.  This is only for internal tracking 
 		## so as to not attempt to disable analyzers multiple times.
-		disabled_aids:  set[count]      &default=set();
+		disabled_aids:  set[count];
 	};
 	
 	## Ignore violations which go this many bytes into the connection.
diff --git a/scripts/policy/protocols/conn/known-hosts.bro b/scripts/policy/protocols/conn/known-hosts.bro
index b88803092b..74da528007 100644
--- a/scripts/policy/protocols/conn/known-hosts.bro
+++ b/scripts/policy/protocols/conn/known-hosts.bro
@@ -10,7 +10,7 @@ module Known;
 export {
 	redef enum Log::ID += { HOSTS_LOG };
 	
-	type Info: record {
+	type HostsInfo: record {
 		## The timestamp at which the host was detected.
 		ts:      time &log;
 		## The address that was detected originating or responding to a TCP 
@@ -29,12 +29,12 @@ export {
 	## of each individual address is logged each day.
 	global known_hosts: set[addr] &create_expire=1day &synchronized &redef;
 	
-	global log_known_hosts: event(rec: Info);
+	global log_known_hosts: event(rec: HostsInfo);
 }
 
 event bro_init()
 	{
-	Log::create_stream(Known::HOSTS_LOG, [$columns=Info, $ev=log_known_hosts]);
+	Log::create_stream(Known::HOSTS_LOG, [$columns=HostsInfo, $ev=log_known_hosts]);
 	}
 
 event connection_established(c: connection) &priority=5
diff --git a/scripts/policy/protocols/conn/known-services.bro b/scripts/policy/protocols/conn/known-services.bro
index 3c73c07aad..c0b7283d78 100644
--- a/scripts/policy/protocols/conn/known-services.bro
+++ b/scripts/policy/protocols/conn/known-services.bro
@@ -10,7 +10,7 @@ module Known;
 export {
 	redef enum Log::ID += { SERVICES_LOG };
 	
-	type Info: record {
+	type ServicesInfo: record {
 		ts:             time            &log;
 		host:           addr            &log;
 		port_num:       port            &log;
@@ -25,7 +25,7 @@ export {
 	
 	global known_services: set[addr, port] &create_expire=1day &synchronized;
 	
-	global log_known_services: event(rec: Info);
+	global log_known_services: event(rec: ServicesInfo);
 }
 
 redef record connection += {
@@ -35,7 +35,7 @@ redef record connection += {
 
 event bro_init() &priority=5
 	{
-	Log::create_stream(Known::SERVICES_LOG, [$columns=Info,
+	Log::create_stream(Known::SERVICES_LOG, [$columns=ServicesInfo,
 	                                         $ev=log_known_services]);
 	}
 	
@@ -48,7 +48,7 @@ function known_services_done(c: connection)
 	     [id$resp_h, id$resp_p] !in known_services &&
 	     "ftp-data" !in c$service ) # don't include ftp data sessions
 		{
-		local i: Info;
+		local i: ServicesInfo;
 		i$ts=c$start_time;
 		i$host=id$resp_h;
 		i$port_num=id$resp_p;
diff --git a/scripts/policy/protocols/ssl/known-certs.bro b/scripts/policy/protocols/ssl/known-certs.bro
index 8a013123c8..573cfaac0e 100644
--- a/scripts/policy/protocols/ssl/known-certs.bro
+++ b/scripts/policy/protocols/ssl/known-certs.bro
@@ -5,7 +5,7 @@ module Known;
 export {
 	redef enum Log::ID += { CERTS_LOG };
 	
-	type Info: record {
+	type CertsInfo: record {
 		## The timestamp when the certificate was detected.
 		ts:             time   &log;
 		## The address that offered the certificate.
@@ -31,12 +31,12 @@ export {
 	## in the set is for storing the certificate's serial number.
 	global known_certs: set[addr, string] &create_expire=1day &synchronized &redef;
 	
-	global log_known_certs: event(rec: Info);
+	global log_known_certs: event(rec: CertsInfo);
 }
 
 event bro_init() &priority=5
 	{
-	Log::create_stream(Known::CERTS_LOG, [$columns=Info, $ev=log_known_certs]);
+	Log::create_stream(Known::CERTS_LOG, [$columns=CertsInfo, $ev=log_known_certs]);
 	}
 
 event x509_certificate(c: connection, cert: X509, is_server: bool, chain_idx: count, chain_len: count, der_cert: string)