--- a/src/helper/csma-helper.cc	Tue Feb 23 10:04:31 2010 -0800
+++ b/src/helper/csma-helper.cc	Tue Feb 23 10:30:38 2010 -0800
@@ -100,7 +100,7 @@
 }
 
 void 
-CsmaHelper::EnableAsciiInternal (Ptr<OutputStreamKeeper> stream, std::string prefix, Ptr<NetDevice> nd)
+CsmaHelper::EnableAsciiInternal (Ptr<OutputStreamWrapper> stream, std::string prefix, Ptr<NetDevice> nd)
 {
   //
   // All of the ascii enable functions vector through here including the ones
@@ -121,7 +121,7 @@
   Packet::EnablePrinting ();
 
   //
-  // If we are not provided an OutputStreamKeeper, we are expected to create 
+  // If we are not provided an OutputStreamWrapper, we are expected to create 
   // one using the usual trace filename conventions and do a Hook*WithoutContext
   // since there will be one file per context and therefore the context would
   // be redundant.
@@ -135,7 +135,7 @@
       //
       AsciiTraceHelper asciiTraceHelper;
       std::string filename = asciiTraceHelper.GetFilenameFromDevice (prefix, device);
-      Ptr<OutputStreamKeeper> theStream = asciiTraceHelper.CreateFileStream (filename, "w");
+      Ptr<OutputStreamWrapper> theStream = asciiTraceHelper.CreateFileStream (filename, "w");
 
       //
       // The MacRx trace source provides our "r" event.
@@ -155,7 +155,7 @@
     }
 
   //
-  // If we are provided an OutputStreamKeeper, we are expected to use it, and
+  // If we are provided an OutputStreamWrapper, we are expected to use it, and
   // to providd a context.  We are free to come up with our own context if we
   // want, and use the AsciiTraceHelper Hook*WithContext functions, but for 
   // compatibility and simplicity, we just use Config::Connect and let it deal