--- a/samples/main-callback.cc	Tue Aug 29 17:48:43 2006 +0200
+++ b/samples/main-callback.cc	Tue Aug 29 17:51:04 2006 +0200
@@ -1,5 +1,5 @@
 /* -*-	Mode:C++; c-basic-offset:8; tab-width:8; indent-tabs-mode:t -*- */
-#include "yans/callback.h"
+#include "ns3/callback.h"
 #include <cassert>
 #include <iostream>
 

--- a/samples/main-event.cc	Tue Aug 29 17:48:43 2006 +0200
+++ b/samples/main-event.cc	Tue Aug 29 17:51:04 2006 +0200
@@ -1,6 +1,6 @@
 /* -*-	Mode:C++; c-basic-offset:8; tab-width:8; indent-tabs-mode:t -*- */
-#include "yans/event.h"
-#include "yans/event.tcc"
+#include "ns3/event.h"
+#include "ns3/event.tcc"
 #include <iostream>
 
 using namespace yans;

--- a/samples/main-packet.cc	Tue Aug 29 17:48:43 2006 +0200
+++ b/samples/main-packet.cc	Tue Aug 29 17:51:04 2006 +0200
@@ -1,6 +1,6 @@
 /* -*-	Mode:C++; c-basic-offset:8; tab-width:8; indent-tabs-mode:t -*- */
-#include "yans/packet.h"
-#include "yans/chunk.h"
+#include "ns3/packet.h"
+#include "ns3/chunk.h"
 #include <iostream>
 
 using namespace yans;

--- a/samples/main-simulator.cc	Tue Aug 29 17:48:43 2006 +0200
+++ b/samples/main-simulator.cc	Tue Aug 29 17:51:04 2006 +0200
@@ -1,7 +1,7 @@
 /* -*-	Mode:C++; c-basic-offset:8; tab-width:8; indent-tabs-mode:t -*- */
-#include "yans/event.h"
-#include "yans/event.tcc"
-#include "yans/simulator.h"
+#include "ns3/event.h"
+#include "ns3/event.tcc"
+#include "ns3/simulator.h"
 #include <iostream>
 
 using namespace yans;

--- a/samples/main-trace.cc	Tue Aug 29 17:48:43 2006 +0200
+++ b/samples/main-trace.cc	Tue Aug 29 17:51:04 2006 +0200
@@ -1,9 +1,9 @@
 /* -*-	Mode:C++; c-basic-offset:8; tab-width:8; indent-tabs-mode:t -*- */
-#include "yans/trace-container.h"
-#include "yans/ui-traced-variable.tcc"
-#include "yans/packet-logger.h"
-#include "yans/trace-stream.h"
-#include "yans/pcap-writer.h"
+#include "ns3/trace-container.h"
+#include "ns3/ui-traced-variable.tcc"
+#include "ns3/packet-logger.h"
+#include "ns3/trace-stream.h"
+#include "ns3/pcap-writer.h"
 #include <iostream>
 
 using namespace yans;

--- a/src/common/buffer.cc	Tue Aug 29 17:48:43 2006 +0200
+++ b/src/common/buffer.cc	Tue Aug 29 17:51:04 2006 +0200
@@ -377,7 +377,7 @@
 
 #ifdef RUN_SELF_TESTS
 
-#include "yans/test.h"
+#include "ns3/test.h"
 #include <iomanip>
 
 namespace yans {

--- a/src/common/callback-logger.h	Tue Aug 29 17:48:43 2006 +0200
+++ b/src/common/callback-logger.h	Tue Aug 29 17:51:04 2006 +0200
@@ -22,7 +22,7 @@
 #ifndef CALLBACK_LOGGER_H
 #define CALLBACK_LOGGER_H
 
-#include "yans/callback.h"
+#include "ns3/callback.h"
 
 namespace yans {
 

--- a/src/common/f-traced-variable.tcc	Tue Aug 29 17:48:43 2006 +0200
+++ b/src/common/f-traced-variable.tcc	Tue Aug 29 17:51:04 2006 +0200
@@ -22,7 +22,7 @@
 #ifndef F_TRACED_VARIABLE_TCC
 #define F_TRACED_VARIABLE_TCC
 
-#include "yans/callback.h"
+#include "ns3/callback.h"
 #include <stdint.h>
 
 namespace yans {

--- a/src/common/ipv4-network-interface.h	Tue Aug 29 17:48:43 2006 +0200
+++ b/src/common/ipv4-network-interface.h	Tue Aug 29 17:51:04 2006 +0200
@@ -22,7 +22,7 @@
 #define IPV4_NETWORK_INTERFACE
 
 #include "ipv4-address.h"
-#include "yans/callback.h"
+#include "ns3/callback.h"
 #include "packet.h"
 
 namespace yans {

--- a/src/common/llc-snap-encapsulation.h	Tue Aug 29 17:48:43 2006 +0200
+++ b/src/common/llc-snap-encapsulation.h	Tue Aug 29 17:51:04 2006 +0200
@@ -22,7 +22,7 @@
 #define LLC_SNAP_ENCAPSULATION
 
 #include <stdint.h>
-#include "yans/callback.h"
+#include "ns3/callback.h"
 #include "mac-address.h"
 #include "packet.h"
 

--- a/src/common/mac-network-interface.h	Tue Aug 29 17:48:43 2006 +0200
+++ b/src/common/mac-network-interface.h	Tue Aug 29 17:51:04 2006 +0200
@@ -22,7 +22,7 @@
 #define MAC_NETWORK_INTERFACE_H
 
 #include <stdint.h>
-#include "yans/callback.h"
+#include "ns3/callback.h"
 #include "mac-address.h"
 #include "packet.h"
 

--- a/src/common/packet-logger.h	Tue Aug 29 17:48:43 2006 +0200
+++ b/src/common/packet-logger.h	Tue Aug 29 17:51:04 2006 +0200
@@ -22,7 +22,7 @@
 #ifndef PACKET_LOGGER_H
 #define PACKET_LOGGER_H
 
-#include "yans/callback.h"
+#include "ns3/callback.h"
 #include "packet.h"
 
 namespace yans {

--- a/src/common/packet.h	Tue Aug 29 17:48:43 2006 +0200
+++ b/src/common/packet.h	Tue Aug 29 17:51:04 2006 +0200
@@ -25,7 +25,7 @@
 #include "buffer.h"
 #include "chunk.h"
 #include "tags.h"
-#include "yans/callback.h"
+#include "ns3/callback.h"
 
 namespace yans {
 

--- a/src/common/pcap-writer.cc	Tue Aug 29 17:48:43 2006 +0200
+++ b/src/common/pcap-writer.cc	Tue Aug 29 17:51:04 2006 +0200
@@ -24,8 +24,8 @@
  * http://wiki.ethereal.com/Development/LibpcapFileFormat
  */
 
-#include "yans/simulator.h"
-#include "yans/system-file.h"
+#include "ns3/simulator.h"
+#include "ns3/system-file.h"
 #include "pcap-writer.h"
 #include "packet.h"
 

--- a/src/common/pcap-writer.h	Tue Aug 29 17:48:43 2006 +0200
+++ b/src/common/pcap-writer.h	Tue Aug 29 17:51:04 2006 +0200
@@ -22,7 +22,7 @@
 #ifndef PCAP_WRITER_H
 #define PCAP_WRITER_H
 
-#include "yans/callback.h"
+#include "ns3/callback.h"
 #include <stdint.h>
 #include "packet.h"
 

--- a/src/common/si-traced-variable.tcc	Tue Aug 29 17:48:43 2006 +0200
+++ b/src/common/si-traced-variable.tcc	Tue Aug 29 17:51:04 2006 +0200
@@ -22,7 +22,7 @@
 #ifndef SI_TRACED_VARIABLE_TCC
 #define SI_TRACED_VARIABLE_TCC
 
-#include "yans/callback.h"
+#include "ns3/callback.h"
 #include <stdint.h>
 
 namespace yans {
@@ -69,7 +69,7 @@
  * yans::UiTracedVariable<int32_t> :
  \code
  #include <stdint.h>
- #include "yans/si-traced-variable.tcc"
+ #include "ns3/si-traced-variable.tcc"
 
  yans::SiTracedVariable<uint16_t> var;
  \endcode

--- a/src/common/static-speed-position.cc	Tue Aug 29 17:48:43 2006 +0200
+++ b/src/common/static-speed-position.cc	Tue Aug 29 17:51:04 2006 +0200
@@ -19,7 +19,7 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 #include "static-speed-position.h"
-#include "yans/simulator.h"
+#include "ns3/simulator.h"
 
 namespace yans {
 

--- a/src/common/tags.cc	Tue Aug 29 17:48:43 2006 +0200
+++ b/src/common/tags.cc	Tue Aug 29 17:51:04 2006 +0200
@@ -178,7 +178,7 @@
 
 #ifdef RUN_SELF_TESTS
 
-#include "yans/test.h"
+#include "ns3/test.h"
 #include <iomanip>
 #include <iostream>
 

--- a/src/common/trace-container.h	Tue Aug 29 17:48:43 2006 +0200
+++ b/src/common/trace-container.h	Tue Aug 29 17:51:04 2006 +0200
@@ -26,7 +26,7 @@
 #include "si-traced-variable.tcc"
 #include "f-traced-variable.tcc"
 #include "callback-logger.h"
-#include "yans/callback.h"
+#include "ns3/callback.h"
 #include "packet.h"
 #include <list>
 #include <string>

--- a/src/common/trace-stream-test.cc	Tue Aug 29 17:48:43 2006 +0200
+++ b/src/common/trace-stream-test.cc	Tue Aug 29 17:51:04 2006 +0200
@@ -19,7 +19,7 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 #include "trace-stream.h"
-#include "yans/test.h"
+#include "ns3/test.h"
 #include <iostream>
 
 #ifdef RUN_SELF_TESTS

--- a/src/common/traced-variable-test.cc	Tue Aug 29 17:48:43 2006 +0200
+++ b/src/common/traced-variable-test.cc	Tue Aug 29 17:51:04 2006 +0200
@@ -21,8 +21,8 @@
 
 #include "ui-traced-variable.tcc"
 #include "si-traced-variable.tcc"
-#include "yans/test.h"
-#include "yans/callback.h"
+#include "ns3/test.h"
+#include "ns3/callback.h"
 
 
 namespace yans {

--- a/src/common/ui-traced-variable.tcc	Tue Aug 29 17:48:43 2006 +0200
+++ b/src/common/ui-traced-variable.tcc	Tue Aug 29 17:51:04 2006 +0200
@@ -22,7 +22,7 @@
 #ifndef UI_TRACED_VARIABLE_TCC
 #define UI_TRACED_VARIABLE_TCC
 
-#include "yans/callback.h"
+#include "ns3/callback.h"
 #include <stdint.h>
 
 namespace yans {
@@ -72,7 +72,7 @@
  * yans::UiTracedVariable<uint32_t> :
  \code
  #include <stdint.h>
- #include "yans/ui-traced-variable.tcc"
+ #include "ns3/ui-traced-variable.tcc"
 
  yans::UiTracedVariable<uint32_t> var;
  \endcode

--- a/src/common/utils.cc	Tue Aug 29 17:48:43 2006 +0200
+++ b/src/common/utils.cc	Tue Aug 29 17:51:04 2006 +0200
@@ -160,7 +160,7 @@
 
 
 #ifdef RUN_SELF_TESTS
-#include "yans/test.h"
+#include "ns3/test.h"
 namespace yans {
 
 class UtilsTest : public Test {

--- a/src/simulator/event-tcc-test.cc	Tue Aug 29 17:48:43 2006 +0200
+++ b/src/simulator/event-tcc-test.cc	Tue Aug 29 17:51:04 2006 +0200
@@ -19,7 +19,7 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 #include "event.tcc"
-#include "yans/test.h"
+#include "ns3/test.h"
 
 #ifdef RUN_SELF_TESTS
 

--- a/src/simulator/simulator.cc	Tue Aug 29 17:48:43 2006 +0200
+++ b/src/simulator/simulator.cc	Tue Aug 29 17:51:04 2006 +0200
@@ -23,7 +23,7 @@
 #include "scheduler.h"
 #include "event.h"
 #include "event.tcc"
-#include "yans/system-semaphore.h"
+#include "ns3/system-semaphore.h"
 
 #include <math.h>
 #include <cassert>

--- a/utils/bench-packets.cc	Tue Aug 29 17:48:43 2006 +0200
+++ b/utils/bench-packets.cc	Tue Aug 29 17:51:04 2006 +0200
@@ -18,11 +18,11 @@
  *
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
-#include "yans/wall-clock-ms.h"
-#include "yans/packet.h"
-#include "yans/chunk-constant-data.h"
-#include "yans/chunk-udp.h"
-#include "yans/chunk-ipv4.h"
+#include "ns3/wall-clock-ms.h"
+#include "ns3/packet.h"
+#include "ns3/chunk-constant-data.h"
+#include "ns3/chunk-udp.h"
+#include "ns3/chunk-ipv4.h"
 #include <iostream>
 
 using namespace yans;

--- a/utils/bench-simulator.cc	Tue Aug 29 17:48:43 2006 +0200
+++ b/utils/bench-simulator.cc	Tue Aug 29 17:51:04 2006 +0200
@@ -19,10 +19,10 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 
-#include "yans/simulator.h"
-#include "yans/event.h"
-#include "yans/event.tcc"
-#include "yans/wall-clock-ms.h"
+#include "ns3/simulator.h"
+#include "ns3/event.h"
+#include "ns3/event.tcc"
+#include "ns3/wall-clock-ms.h"
 #include <iostream>
 #include <fstream>
 #include <vector>

--- a/utils/replay-simulation.cc	Tue Aug 29 17:48:43 2006 +0200
+++ b/utils/replay-simulation.cc	Tue Aug 29 17:51:04 2006 +0200
@@ -19,10 +19,10 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 
-#include "yans/simulator.h"
-#include "yans/event.h"
-#include "yans/event.tcc"
-#include "yans/wall-clock-ms.h"
+#include "ns3/simulator.h"
+#include "ns3/event.h"
+#include "ns3/event.tcc"
+#include "ns3/wall-clock-ms.h"
 #include <vector>
 #include <deque>
 #include <fstream>

--- a/utils/run-tests.cc	Tue Aug 29 17:48:43 2006 +0200
+++ b/utils/run-tests.cc	Tue Aug 29 17:51:04 2006 +0200
@@ -19,7 +19,7 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 
-#include "yans/test.h"
+#include "ns3/test.h"
 
 int main (int argc, char *argv[])
 {