diff --git a/testing/btest/scripts/base/frameworks/input/basic.bro b/testing/btest/scripts/base/frameworks/input/basic.bro
index 139888fa7c..3ad45eac69 100644
--- a/testing/btest/scripts/base/frameworks/input/basic.bro
+++ b/testing/btest/scripts/base/frameworks/input/basic.bro
@@ -18,11 +18,11 @@ export {
 	redef enum Log::ID += { LOG };
 }
 
-type idx: record {
+type Idx: record {
 	i: int;
 };
 
-type val: record {
+type Val: record {
 	b: bool;
 	e: Log::ID;
 	c: count;
@@ -40,13 +40,13 @@ type val: record {
 	ve: vector of int;
 };
 
-global servers: table[int] of val = table();
+global servers: table[int] of Val = table();
 
 event bro_init()
 {
 	# first read in the old stuff into the table...
 	Input::create_stream(A::LOG, [$source="input.log"]);
-	Input::add_tablefilter(A::LOG, [$name="ssh", $idx=idx, $val=val, $destination=servers]);
+	Input::add_tablefilter(A::LOG, [$name="ssh", $idx=Idx, $val=Val, $destination=servers]);
 	Input::force_update(A::LOG);
 	print servers;
 }
diff --git a/testing/btest/scripts/base/frameworks/input/onecolumn-norecord.bro b/testing/btest/scripts/base/frameworks/input/onecolumn-norecord.bro
index 12dbdd42aa..134ceb49e6 100644
--- a/testing/btest/scripts/base/frameworks/input/onecolumn-norecord.bro
+++ b/testing/btest/scripts/base/frameworks/input/onecolumn-norecord.bro
@@ -18,21 +18,21 @@ export {
 	redef enum Log::ID += { LOG };
 }
 
-type idx: record {
+type Idx: record {
 	i: int;
 };
 
-type val: record {
+type Val: record {
 	b: bool;
 };
 
-global servers: table[int] of val = table();
+global servers: table[int] of Val = table();
 
 event bro_init()
 {
 	# first read in the old stuff into the table...
 	Input::create_stream(A::LOG, [$source="input.log"]);
-	Input::add_tablefilter(A::LOG, [$name="input", $idx=idx, $val=val, $destination=servers, $want_record=F]);
+	Input::add_tablefilter(A::LOG, [$name="input", $idx=Idx, $val=Val, $destination=servers, $want_record=F]);
 	Input::force_update(A::LOG);
 	print servers;
 }
diff --git a/testing/btest/scripts/base/frameworks/input/onecolumn-record.bro b/testing/btest/scripts/base/frameworks/input/onecolumn-record.bro
index 4eef12d752..c07c9c826c 100644
--- a/testing/btest/scripts/base/frameworks/input/onecolumn-record.bro
+++ b/testing/btest/scripts/base/frameworks/input/onecolumn-record.bro
@@ -18,21 +18,21 @@ export {
 	redef enum Log::ID += { LOG };
 }
 
-type idx: record {
+type Idx: record {
 	i: int;
 };
 
-type val: record {
+type Val: record {
 	b: bool;
 };
 
-global servers: table[int] of val = table();
+global servers: table[int] of Val = table();
 
 event bro_init()
 {
 	# first read in the old stuff into the table...
 	Input::create_stream(A::LOG, [$source="input.log"]);
-	Input::add_tablefilter(A::LOG, [$name="input", $idx=idx, $val=val, $destination=servers]);
+	Input::add_tablefilter(A::LOG, [$name="input", $idx=Idx, $val=Val, $destination=servers]);
 	Input::force_update(A::LOG);
 	print servers;
 }
diff --git a/testing/btest/scripts/base/frameworks/input/predicate.bro b/testing/btest/scripts/base/frameworks/input/predicate.bro
index e82ded6fd0..769536d2a6 100644
--- a/testing/btest/scripts/base/frameworks/input/predicate.bro
+++ b/testing/btest/scripts/base/frameworks/input/predicate.bro
@@ -24,22 +24,22 @@ export {
 	redef enum Log::ID += { LOG };
 }
 
-type idx: record {
+type Idx: record {
 	i: int;
 };
 
-type val: record {
+type Val: record {
 	b: bool;
 };
 
-global servers: table[int] of val = table();
+global servers: table[int] of Val = table();
 
 event bro_init()
 {
 	# first read in the old stuff into the table...
 	Input::create_stream(A::LOG, [$source="input.log"]);
-	Input::add_tablefilter(A::LOG, [$name="input", $idx=idx, $val=val, $destination=servers, $want_record=F,
-				$pred(typ: Input::Event, left: idx, right: bool) = { return right; }
+	Input::add_tablefilter(A::LOG, [$name="input", $idx=Idx, $val=Val, $destination=servers, $want_record=F,
+				$pred(typ: Input::Event, left: Idx, right: bool) = { return right; }
 				]);
 	Input::force_update(A::LOG);
 	if ( 1 in servers ) {