--- a/SConstruct	Mon Sep 04 14:06:00 2006 +0200
+++ b/SConstruct	Mon Sep 04 14:10:34 2006 +0200
@@ -537,7 +537,7 @@
 	'pcap-writer.cc',
 	'trace-container.cc',
 	'traced-variable-test.cc',
-	'trace-stream-test.cc',
+	'stream-tracer-test.cc',
 	])
 common.add_inst_headers ([
 	'buffer.h',
@@ -549,9 +549,9 @@
 	'si-traced-variable.tcc',
 	'f-traced-variable.tcc',
 	'callback-tracer.h',
+	'stream-tracer.h',
 	'trace-container.h',
 	'chunk-constant-data.h',
-	'trace-stream.h',
 	'pcap-writer.h',
 	])
 common.add_headers ([