diff --git a/scripts/base/frameworks/input/main.bro b/scripts/base/frameworks/input/main.bro
index a036eeeebd..1a9e8b885c 100644
--- a/scripts/base/frameworks/input/main.bro
+++ b/scripts/base/frameworks/input/main.bro
@@ -58,28 +58,28 @@ module Input;
 
 #global filters: table[ID, string] of Filter;
 
-function create_stream(id: Log::ID, description: Input::StreamDescription) : bool
+function create_stream(id: Input::ID, description: Input::StreamDescription) : bool
 	{
 	return __create_stream(id, description);
 	}
 
-function remove_stream(id: Log::ID) : bool
+function remove_stream(id: Input::ID) : bool
 	{
 	return __remove_stream(id);
 	}
 
-function force_update(id: Log::ID) : bool
+function force_update(id: Input::ID) : bool
 	{
 	return __force_update(id);
 	}
 
-function add_tablefilter(id: Log::ID, filter: Input::TableFilter) : bool
+function add_tablefilter(id: Input::ID, filter: Input::TableFilter) : bool
 	{
 #	filters[id, filter$name] = filter;
 	return __add_tablefilter(id, filter);
 	}
 
-function remove_tablefilter(id: Log::ID, name: string) : bool
+function remove_tablefilter(id: Input::ID, name: string) : bool
 	{
 #	delete filters[id, name];
 	return __remove_tablefilter(id, name);
diff --git a/src/input.bif b/src/input.bif
index b1d57b1df6..a7d561c060 100644
--- a/src/input.bif
+++ b/src/input.bif
@@ -11,31 +11,31 @@ type StreamDescription: record;
 type TableFilter: record;
 type EventFilter: record;
 
-function Input::__create_stream%(id: Log::ID, description: Input::StreamDescription%) : bool
+function Input::__create_stream%(id: Input::ID, description: Input::StreamDescription%) : bool
 	%{
 	InputReader *the_reader = input_mgr->CreateStream(id->AsEnumVal(), description->AsRecordVal());
 	return new Val( the_reader != 0, TYPE_BOOL );
 	%}
 
-function Input::__remove_stream%(id: Log::ID%) : bool
+function Input::__remove_stream%(id: Input::ID%) : bool
 	%{
 	bool res = input_mgr->RemoveStream(id->AsEnumVal());
 	return new Val( res, TYPE_BOOL );
 	%}
 
-function Input::__force_update%(id: Log::ID%) : bool
+function Input::__force_update%(id: Input::ID%) : bool
 	%{
 	bool res = input_mgr->ForceUpdate(id->AsEnumVal());
 	return new Val( res, TYPE_BOOL );
 	%}
 
-function Input::__add_tablefilter%(id: Log::ID, filter: Input::TableFilter%) : bool
+function Input::__add_tablefilter%(id: Input::ID, filter: Input::TableFilter%) : bool
 	%{
 	bool res = input_mgr->AddTableFilter(id->AsEnumVal(), filter->AsRecordVal());
 	return new Val( res, TYPE_BOOL );
 	%}
 
-function Input::__remove_tablefilter%(id: Log::ID, name: string%) : bool
+function Input::__remove_tablefilter%(id: Input::ID, name: string%) : bool
 	%{
 	bool res = input_mgr->RemoveTableFilter(id->AsEnumVal(), name->AsString()->CheckString());
 	return new Val( res, TYPE_BOOL);
diff --git a/src/types.bif b/src/types.bif
index f90a954224..15fab1a7b1 100644
--- a/src/types.bif
+++ b/src/types.bif
@@ -180,7 +180,6 @@ enum Event %{
 	EVENT_REMOVED,
 %}
 
-
 enum ID %{
 	Unknown,
 %}
diff --git a/testing/btest/scripts/base/frameworks/input/basic.bro b/testing/btest/scripts/base/frameworks/input/basic.bro
index 3ad45eac69..10cc7376a8 100644
--- a/testing/btest/scripts/base/frameworks/input/basic.bro
+++ b/testing/btest/scripts/base/frameworks/input/basic.bro
@@ -15,7 +15,7 @@ redef InputAscii::empty_field = "EMPTY";
 module A;
 
 export {
-	redef enum Log::ID += { LOG };
+	redef enum Input::ID += { INPUT };
 }
 
 type Idx: record {
@@ -45,8 +45,8 @@ 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::force_update(A::LOG);
+	Input::create_stream(A::INPUT, [$source="input.log"]);
+	Input::add_tablefilter(A::INPUT, [$name="ssh", $idx=Idx, $val=Val, $destination=servers]);
+	Input::force_update(A::INPUT);
 	print servers;
 }
diff --git a/testing/btest/scripts/base/frameworks/input/event.bro b/testing/btest/scripts/base/frameworks/input/event.bro
index d9be733a1b..a07f0934a0 100644
--- a/testing/btest/scripts/base/frameworks/input/event.bro
+++ b/testing/btest/scripts/base/frameworks/input/event.bro
@@ -20,7 +20,7 @@
 module A;
 
 export {
-	redef enum Log::ID += { LOG };
+	redef enum Input::ID += { INPUT };
 }
 
 type Val: record {
@@ -36,7 +36,7 @@ event line(tpe: Input::Event, i: int, b: bool) {
 
 event bro_init()
 {
-	Input::create_stream(A::LOG, [$source="input.log"]);
-	Input::add_eventfilter(A::LOG, [$name="input", $fields=Val, $ev=line]);
-	Input::force_update(A::LOG);
+	Input::create_stream(A::INPUT, [$source="input.log"]);
+	Input::add_eventfilter(A::INPUT, [$name="input", $fields=Val, $ev=line]);
+	Input::force_update(A::INPUT);
 }
diff --git a/testing/btest/scripts/base/frameworks/input/onecolumn-norecord.bro b/testing/btest/scripts/base/frameworks/input/onecolumn-norecord.bro
index 134ceb49e6..88838cc8d6 100644
--- a/testing/btest/scripts/base/frameworks/input/onecolumn-norecord.bro
+++ b/testing/btest/scripts/base/frameworks/input/onecolumn-norecord.bro
@@ -15,7 +15,7 @@ redef InputAscii::empty_field = "EMPTY";
 module A;
 
 export {
-	redef enum Log::ID += { LOG };
+	redef enum Input::ID += { INPUT };
 }
 
 type Idx: record {
@@ -31,8 +31,8 @@ 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::force_update(A::LOG);
+	Input::create_stream(A::INPUT, [$source="input.log"]);
+	Input::add_tablefilter(A::INPUT, [$name="input", $idx=Idx, $val=Val, $destination=servers, $want_record=F]);
+	Input::force_update(A::INPUT);
 	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 c07c9c826c..fc4d862cd3 100644
--- a/testing/btest/scripts/base/frameworks/input/onecolumn-record.bro
+++ b/testing/btest/scripts/base/frameworks/input/onecolumn-record.bro
@@ -15,7 +15,7 @@ redef InputAscii::empty_field = "EMPTY";
 module A;
 
 export {
-	redef enum Log::ID += { LOG };
+	redef enum Input::ID += { INPUT };
 }
 
 type Idx: record {
@@ -31,8 +31,8 @@ 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::force_update(A::LOG);
+	Input::create_stream(A::INPUT, [$source="input.log"]);
+	Input::add_tablefilter(A::INPUT, [$name="input", $idx=Idx, $val=Val, $destination=servers]);
+	Input::force_update(A::INPUT);
 	print servers;
 }
diff --git a/testing/btest/scripts/base/frameworks/input/predicate.bro b/testing/btest/scripts/base/frameworks/input/predicate.bro
index 769536d2a6..5e6bae7b62 100644
--- a/testing/btest/scripts/base/frameworks/input/predicate.bro
+++ b/testing/btest/scripts/base/frameworks/input/predicate.bro
@@ -21,7 +21,7 @@ redef InputAscii::empty_field = "EMPTY";
 module A;
 
 export {
-	redef enum Log::ID += { LOG };
+	redef enum Input::ID += { INPUT };
 }
 
 type Idx: record {
@@ -37,11 +37,11 @@ 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::create_stream(A::INPUT, [$source="input.log"]);
+	Input::add_tablefilter(A::INPUT, [$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);
+	Input::force_update(A::INPUT);
 	if ( 1 in servers ) {
 		print "VALID";
 	}
diff --git a/testing/btest/scripts/base/frameworks/input/twofilters.bro b/testing/btest/scripts/base/frameworks/input/twofilters.bro
index 575665e6e5..5af664e0e9 100644
--- a/testing/btest/scripts/base/frameworks/input/twofilters.bro
+++ b/testing/btest/scripts/base/frameworks/input/twofilters.bro
@@ -21,7 +21,7 @@ redef InputAscii::empty_field = "EMPTY";
 module A;
 
 export {
-	redef enum Log::ID += { LOG };
+	redef enum Input::ID += { INPUT };
 }
 
 type Idx: record {
@@ -38,13 +38,13 @@ global destination2: 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=destination1, $want_record=F,
+	Input::create_stream(A::INPUT, [$source="input.log"]);
+	Input::add_tablefilter(A::INPUT, [$name="input", $idx=Idx, $val=Val, $destination=destination1, $want_record=F,
 				$pred(typ: Input::Event, left: Idx, right: bool) = { return right; }
 				]);
-	Input::add_tablefilter(A::LOG, [$name="input2",$idx=Idx, $val=Val, $destination=destination2]);
+	Input::add_tablefilter(A::INPUT, [$name="input2",$idx=Idx, $val=Val, $destination=destination2]);
 	
-	Input::force_update(A::LOG);
+	Input::force_update(A::INPUT);
 	if ( 1 in destination1 ) {
 		print "VALID";
 	}