diff --git a/samples/main-callback.cc b/samples/main-callback.cc
index b1131d6f9..13d298d52 100644
--- a/samples/main-callback.cc
+++ b/samples/main-callback.cc
@@ -3,7 +3,7 @@
 #include <cassert>
 #include <iostream>
 
-using namespace yans;
+using namespace ns3;
 
 static double 
 cb_one (double a, double b)
diff --git a/samples/main-event.cc b/samples/main-event.cc
index 3b26167d1..02b5da4e5 100644
--- a/samples/main-event.cc
+++ b/samples/main-event.cc
@@ -3,7 +3,7 @@
 #include "ns3/event.tcc"
 #include <iostream>
 
-using namespace yans;
+using namespace ns3;
 
 class MyModel {
 public:
diff --git a/samples/main-packet.cc b/samples/main-packet.cc
index d279e9c8a..3c70556c4 100644
--- a/samples/main-packet.cc
+++ b/samples/main-packet.cc
@@ -3,7 +3,7 @@
 #include "ns3/chunk.h"
 #include <iostream>
 
-using namespace yans;
+using namespace ns3;
 
 /* A sample Chunk implementation
  */
diff --git a/samples/main-simulator.cc b/samples/main-simulator.cc
index a529307cd..720484aa5 100644
--- a/samples/main-simulator.cc
+++ b/samples/main-simulator.cc
@@ -4,7 +4,7 @@
 #include "ns3/simulator.h"
 #include <iostream>
 
-using namespace yans;
+using namespace ns3;
 
 class MyModel {
 public:
diff --git a/samples/main-trace.cc b/samples/main-trace.cc
index 0a5d73e58..545f8e729 100644
--- a/samples/main-trace.cc
+++ b/samples/main-trace.cc
@@ -6,7 +6,7 @@
 #include "ns3/pcap-writer.h"
 #include <iostream>
 
-using namespace yans;
+using namespace ns3;
 
 PacketLogger a;
 UiTracedVariable<unsigned short> b;
diff --git a/src/common/buffer.cc b/src/common/buffer.cc
index 5be1b81be..abe9ef989 100644
--- a/src/common/buffer.cc
+++ b/src/common/buffer.cc
@@ -25,7 +25,7 @@
 //#define TRACE(x) std::cout << x << std::endl;
 #define TRACE(x)
 
-namespace yans {
+namespace ns3 {
 
 Buffer::BufferDataList  Buffer::m_free_list;
 uint32_t Buffer::m_max_total_add_start = 0;
@@ -109,12 +109,12 @@ Buffer::create (void)
 }
 #endif
 
-}; // namespace yans
+}; // namespace ns3
 
 
 #include <cassert>
 
-namespace yans {
+namespace ns3 {
 
 
 void 
@@ -372,7 +372,7 @@ Buffer::peek_data (void) const
 
 
 
-}; // namespace yans
+}; // namespace ns3
 
 
 #ifdef RUN_SELF_TESTS
@@ -380,7 +380,7 @@ Buffer::peek_data (void) const
 #include "ns3/test.h"
 #include <iomanip>
 
-namespace yans {
+namespace ns3 {
 
 class BufferTest: public Test {
 private:
@@ -588,7 +588,7 @@ BufferTest::run_tests (void)
 
 static BufferTest g_buffer_test;
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* RUN_SELF_TESTS */
 
diff --git a/src/common/buffer.h b/src/common/buffer.h
index f3fbc25ef..7384caf47 100644
--- a/src/common/buffer.h
+++ b/src/common/buffer.h
@@ -24,7 +24,7 @@
 #include <stdint.h>
 #include <vector>
 
-namespace yans {
+namespace ns3 {
 
 /**
  * \brief automatically resized byte buffer
@@ -257,7 +257,7 @@ public:
 	 * byte buffer.
 	 *
 	 * The returned pointer points to an area of
-	 * memory which is yans::Buffer::get_size () bytes big.
+	 * memory which is ns3::Buffer::get_size () bytes big.
 	 * Please, try to never ever use this method. It is really
 	 * evil and is present only for a few specific uses.
 	 */
@@ -353,11 +353,11 @@ private:
 	uint32_t m_size;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #include <cassert>
 
-namespace yans {
+namespace ns3 {
 
 Buffer::Buffer ()
 	: m_data (Buffer::create ()),
@@ -684,7 +684,7 @@ Buffer::Iterator::read (uint8_t *buffer, uint16_t size)
 	m_current += size;
 }
 
-}; // namespace yans
+}; // namespace ns3
 
 
 #endif /* BUFFER_H */
diff --git a/src/common/callback-logger.h b/src/common/callback-logger.h
index 9c8b6090c..d39045d1e 100644
--- a/src/common/callback-logger.h
+++ b/src/common/callback-logger.h
@@ -24,15 +24,15 @@
 
 #include "ns3/callback.h"
 
-namespace yans {
+namespace ns3 {
 
 class CallbackLoggerBase {};
 
 /**
- * \brief log arbitrary number of parameters to a matching yans:Callback
+ * \brief log arbitrary number of parameters to a matching ns3::Callback
  *
  * Whenever operator () is invoked on this class, the call and its arguments
- * are forwarded to the internal matching yans::Callback.
+ * are forwarded to the internal matching ns3::Callback.
  */
 template<typename T1 = empty, typename T2 = empty, 
 	 typename T3 = empty, typename T4 = empty,
@@ -79,6 +79,6 @@ private:
 	Callback<void,T1,T2,T3,T4,T5> m_callback;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* CALLBACK_LOGGER_H */
diff --git a/src/common/chunk-constant-data.cc b/src/common/chunk-constant-data.cc
index e2c72ef22..99a2c6c66 100644
--- a/src/common/chunk-constant-data.cc
+++ b/src/common/chunk-constant-data.cc
@@ -21,7 +21,7 @@
 
 #include "chunk-constant-data.h"
 
-namespace yans {
+namespace ns3 {
 
 ChunkConstantData::ChunkConstantData (uint32_t len, uint8_t data)
 	: m_len (len), m_data (data)
@@ -60,4 +60,4 @@ ChunkConstantData::remove_from (Buffer *buffer)
 }
 
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/common/chunk-constant-data.h b/src/common/chunk-constant-data.h
index d246a5659..a2baf01dc 100644
--- a/src/common/chunk-constant-data.h
+++ b/src/common/chunk-constant-data.h
@@ -25,7 +25,7 @@
 #include "chunk.h"
 #include <stdint.h>
 
-namespace yans {
+namespace ns3 {
 
 
 class ChunkConstantData : public Chunk {
@@ -42,6 +42,6 @@ private:
 	uint8_t m_data;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* CHUNK_CONSTANT_DATA_H */
diff --git a/src/common/chunk-llc-snap.cc b/src/common/chunk-llc-snap.cc
index b8d8eade1..1b4ac88e7 100644
--- a/src/common/chunk-llc-snap.cc
+++ b/src/common/chunk-llc-snap.cc
@@ -34,7 +34,7 @@ std::cout << "CHUNK LLCSNAP TRACE " << Simulator::now_s () << " " << x << std::e
 #endif /* TRACE_CHUNK_LLC_SNAP */
 
 
-namespace yans {
+namespace ns3 {
 
 ChunkLlcSnap::ChunkLlcSnap ()
 {}
@@ -91,4 +91,4 @@ ChunkLlcSnap::remove_from (Buffer *buffer)
 
 
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/common/chunk-llc-snap.h b/src/common/chunk-llc-snap.h
index 793dd36a8..22e90e073 100644
--- a/src/common/chunk-llc-snap.h
+++ b/src/common/chunk-llc-snap.h
@@ -25,7 +25,7 @@
 #include "chunk.h"
 #include <stdint.h>
 
-namespace yans {
+namespace ns3 {
 
 class ChunkLlcSnap : public Chunk {
  public:
@@ -50,6 +50,6 @@ private:
 	uint16_t m_ether_type;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* CHUNK_LLC_SNAP_H */
diff --git a/src/common/chunk-utils.cc b/src/common/chunk-utils.cc
index 462839f3d..395fc1998 100644
--- a/src/common/chunk-utils.cc
+++ b/src/common/chunk-utils.cc
@@ -20,7 +20,7 @@
  */
 #include "chunk-utils.h"
 
-namespace yans {
+namespace ns3 {
 
 void write_to (Buffer::Iterator &i, Ipv4Address ad)
 {
@@ -46,4 +46,4 @@ void read_from (Buffer::Iterator &i, MacAddress &ad)
 
 
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/common/chunk-utils.h b/src/common/chunk-utils.h
index 04b38a6d9..970ffa40c 100644
--- a/src/common/chunk-utils.h
+++ b/src/common/chunk-utils.h
@@ -25,7 +25,7 @@
 #include "ipv4-address.h"
 #include "mac-address.h"
 
-namespace yans {
+namespace ns3 {
 
 void write_to (Buffer::Iterator &i, Ipv4Address ad);
 void write_to (Buffer::Iterator &i, MacAddress ad);
diff --git a/src/common/chunk.cc b/src/common/chunk.cc
index fcb7a8071..6ab425d92 100644
--- a/src/common/chunk.cc
+++ b/src/common/chunk.cc
@@ -22,7 +22,7 @@
 #include "chunk.h"
 #include <cassert>
 
-namespace yans {
+namespace ns3 {
 
 Chunk::Chunk ()
 	: m_must_peek_before_remove (false) {}
@@ -62,4 +62,4 @@ std::ostream& operator<< (std::ostream& os, Chunk const& chunk)
 	return os;
 }
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/common/chunk.h b/src/common/chunk.h
index daf953c4d..df4bcba55 100644
--- a/src/common/chunk.h
+++ b/src/common/chunk.h
@@ -26,7 +26,7 @@
 #include <ostream>
 #include "buffer.h"
 
-namespace yans {
+namespace ns3 {
 
 /**
  * \brief Protocol header serialization and deserialization.
@@ -84,6 +84,6 @@ private:
 
 std::ostream& operator<< (std::ostream& os, Chunk const& chunk);
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* CHUNK_H */
diff --git a/src/common/count-ptr-holder.tcc b/src/common/count-ptr-holder.tcc
index 67a0685ed..c67aeb4a1 100644
--- a/src/common/count-ptr-holder.tcc
+++ b/src/common/count-ptr-holder.tcc
@@ -22,7 +22,7 @@
 #ifndef COUNT_PTR_HOLDER_TCC
 #define COUNT_PTR_HOLDER_TCC
 
-namespace yans {
+namespace ns3 {
 
 template <typename T>
 class CountPtrHolder {
@@ -65,6 +65,6 @@ make_const_count_ptr_holder (T *t) {
 	return CountPtrHolder<T const> (t);
 }
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* REF_HOLDER_TCC */
diff --git a/src/common/data-writer.cc b/src/common/data-writer.cc
index 7aa8d1049..0591fecb3 100644
--- a/src/common/data-writer.cc
+++ b/src/common/data-writer.cc
@@ -42,7 +42,7 @@ std::cout << "DATA WRITER TRACE " << this << " " << x << std::endl;
 #define BUFFER_SIZE (4096)
 
 
-namespace yans {
+namespace ns3 {
 
 class DataWriterPrivate {
 public:
diff --git a/src/common/data-writer.h b/src/common/data-writer.h
index 5d066260c..6fb83812e 100644
--- a/src/common/data-writer.h
+++ b/src/common/data-writer.h
@@ -24,7 +24,7 @@
 
 #include <stdint.h>
 
-namespace yans {
+namespace ns3 {
 
 class DataWriterPrivate;
 
@@ -39,6 +39,6 @@ private:
 	DataWriterPrivate *m_priv;
 };
 
-}; //namespace yans
+}; //namespace ns3
 
 #endif /* DATA_WRITER_H */
diff --git a/src/common/f-traced-variable.tcc b/src/common/f-traced-variable.tcc
index 033fc564a..4109c27c0 100644
--- a/src/common/f-traced-variable.tcc
+++ b/src/common/f-traced-variable.tcc
@@ -25,7 +25,7 @@
 #include "ns3/callback.h"
 #include <stdint.h>
 
-namespace yans {
+namespace ns3 {
 
 class FTracedVariableBase {
 public:
@@ -53,6 +53,6 @@ private:
 };
 
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* F_TRACED_VARIABLE_TCC */
diff --git a/src/common/ipv4-address.cc b/src/common/ipv4-address.cc
index 91dcd2cad..60b90d69b 100644
--- a/src/common/ipv4-address.cc
+++ b/src/common/ipv4-address.cc
@@ -22,7 +22,7 @@
 #include "utils.h"
 #include "ipv4-address.h"
 
-namespace yans {
+namespace ns3 {
 
 Ipv4Mask::Ipv4Mask ()
 	: m_mask (0x66666666)
@@ -200,4 +200,4 @@ std::ostream& operator<< (std::ostream& os, Ipv4Mask const& mask)
 }
 
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/common/ipv4-address.h b/src/common/ipv4-address.h
index b2267242a..6b5f5d3a0 100644
--- a/src/common/ipv4-address.h
+++ b/src/common/ipv4-address.h
@@ -25,7 +25,7 @@
 #include <stdint.h>
 #include <ostream>
 
-namespace yans {
+namespace ns3 {
 
 /* Ipv4 addresses are stored in host order in
  * this class.
@@ -102,6 +102,6 @@ public:
 };
 bool operator != (Ipv4Address const &a, Ipv4Address const &b);
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* IPV4_ADDRESS_H */
diff --git a/src/common/ipv4-network-interface.cc b/src/common/ipv4-network-interface.cc
index cb3c43de7..21f9003d4 100644
--- a/src/common/ipv4-network-interface.cc
+++ b/src/common/ipv4-network-interface.cc
@@ -20,7 +20,7 @@
  */
 #include "ipv4-network-interface.h"
 
-namespace yans {
+namespace ns3 {
 
 Ipv4NetworkInterface::~Ipv4NetworkInterface ()
 {}
@@ -79,4 +79,4 @@ Ipv4NetworkInterface::forward_up (Packet packet)
 
 
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/common/ipv4-network-interface.h b/src/common/ipv4-network-interface.h
index 72a461636..c05066978 100644
--- a/src/common/ipv4-network-interface.h
+++ b/src/common/ipv4-network-interface.h
@@ -25,7 +25,7 @@
 #include "ns3/callback.h"
 #include "packet.h"
 
-namespace yans {
+namespace ns3 {
 
 class Packet;
 
@@ -54,6 +54,6 @@ private:
 	Ipv4Mask m_mask;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* IPV4_NETWORK_INTERFACE */
diff --git a/src/common/llc-snap-encapsulation.cc b/src/common/llc-snap-encapsulation.cc
index 538696ec0..d450b971c 100644
--- a/src/common/llc-snap-encapsulation.cc
+++ b/src/common/llc-snap-encapsulation.cc
@@ -25,7 +25,7 @@
 #include "mac-network-interface.h"
 #include <cassert>
 
-namespace yans {
+namespace ns3 {
 
 uint32_t
 LlcSnapEncapsulation::get_overhead (void) const
@@ -86,4 +86,4 @@ LlcSnapEncapsulation::receive (Packet packet, MacNetworkInterface *interface)
 	}
 }
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/common/llc-snap-encapsulation.h b/src/common/llc-snap-encapsulation.h
index c03b38f8f..d8ddfbe84 100644
--- a/src/common/llc-snap-encapsulation.h
+++ b/src/common/llc-snap-encapsulation.h
@@ -26,7 +26,7 @@
 #include "mac-address.h"
 #include "packet.h"
 
-namespace yans {
+namespace ns3 {
 
 class MacNetworkInterface;
 
@@ -47,6 +47,6 @@ private:
 	MacNetworkInterface *m_interface;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* LLC_SNAP_ENCAPSULATION */
diff --git a/src/common/mac-address-factory.cc b/src/common/mac-address-factory.cc
index 3ba3c0287..2f44cd28a 100644
--- a/src/common/mac-address-factory.cc
+++ b/src/common/mac-address-factory.cc
@@ -20,7 +20,7 @@
  */
 #include "mac-address-factory.h"
 
-namespace yans {
+namespace ns3 {
 
 MacAddressFactory::MacAddressFactory ()
 {
@@ -43,4 +43,4 @@ MacAddressFactory::get_next (void)
 	return MacAddress (m_addr);
 }
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/common/mac-address-factory.h b/src/common/mac-address-factory.h
index dec330fb9..a2144512a 100644
--- a/src/common/mac-address-factory.h
+++ b/src/common/mac-address-factory.h
@@ -23,7 +23,7 @@
 
 #include "mac-address.h"
 
-namespace yans {
+namespace ns3 {
 
 class MacAddressFactory {
 public:
@@ -35,6 +35,6 @@ private:
 	uint8_t m_index;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* MAC_ADDRESS_FACTORY_H */
diff --git a/src/common/mac-address.cc b/src/common/mac-address.cc
index 635d853fe..c7f1ff209 100644
--- a/src/common/mac-address.cc
+++ b/src/common/mac-address.cc
@@ -22,7 +22,7 @@
 #include "mac-address.h"
 #include "utils.h"
 
-namespace yans {
+namespace ns3 {
 
 MacAddress::MacAddress ()
 {
@@ -184,4 +184,4 @@ std::ostream& operator<< (std::ostream& os, MacAddress const& address)
 }
 
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/common/mac-address.h b/src/common/mac-address.h
index e1e240758..e1e0df2d6 100644
--- a/src/common/mac-address.h
+++ b/src/common/mac-address.h
@@ -25,7 +25,7 @@
 #include <stdint.h>
 #include <ostream>
 
-namespace yans {
+namespace ns3 {
 
 class MacAddress {
 public:
@@ -67,6 +67,6 @@ bool operator < (MacAddress const&a, MacAddress const&b);
 
 std::ostream& operator<< (std::ostream& os, MacAddress const& address);
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* MAC_ADDRESS_H */
diff --git a/src/common/mac-network-interface.cc b/src/common/mac-network-interface.cc
index 164aa2e73..175964a04 100644
--- a/src/common/mac-network-interface.cc
+++ b/src/common/mac-network-interface.cc
@@ -20,7 +20,7 @@
  */
 #include "mac-network-interface.h"
 
-namespace yans {
+namespace ns3 {
 
 MacNetworkInterface::MacNetworkInterface (MacAddress self, uint16_t max_mtu)
 	: m_self (self), m_max_mtu (max_mtu), m_mtu (max_mtu)
@@ -93,4 +93,4 @@ MacNetworkInterface::notify_status_change (void)
 	m_status_change_callback (this);
 }
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/common/mac-network-interface.h b/src/common/mac-network-interface.h
index 8ec3f6297..5698a044d 100644
--- a/src/common/mac-network-interface.h
+++ b/src/common/mac-network-interface.h
@@ -26,7 +26,7 @@
 #include "mac-address.h"
 #include "packet.h"
 
-namespace yans {
+namespace ns3 {
 
 class MacNetworkInterface {
 public:
@@ -63,6 +63,6 @@ private:
 	bool m_is_down;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* MAC_NETWORK_INTERFACE_H */
diff --git a/src/common/packet-logger.cc b/src/common/packet-logger.cc
index f70f545ed..0942d0a2c 100644
--- a/src/common/packet-logger.cc
+++ b/src/common/packet-logger.cc
@@ -21,7 +21,7 @@
 
 #include "packet-logger.h"
 
-namespace yans {
+namespace ns3 {
 
 PacketLogger::PacketLogger ()
 {}
@@ -38,5 +38,5 @@ PacketLogger::set_callback (PacketLoggerCallback callback)
 	m_callback = callback;
 }
 
-}; // namespace yans
+}; // namespace ns3
 
diff --git a/src/common/packet-logger.h b/src/common/packet-logger.h
index 70827b734..7b71b14c4 100644
--- a/src/common/packet-logger.h
+++ b/src/common/packet-logger.h
@@ -25,7 +25,7 @@
 #include "ns3/callback.h"
 #include "packet.h"
 
-namespace yans {
+namespace ns3 {
 
 /**
  * \brief log packets
@@ -48,6 +48,6 @@ private:
 	PacketLoggerCallback m_callback;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* PACKET_LOGGER_H */
diff --git a/src/common/packet.cc b/src/common/packet.cc
index 91d81d8a3..181e49098 100644
--- a/src/common/packet.cc
+++ b/src/common/packet.cc
@@ -21,7 +21,7 @@
 #include "packet.h"
 #include <cassert>
 
-namespace yans {
+namespace ns3 {
 
 Packet::Packet ()
 	: m_buffer () {}
@@ -124,4 +124,4 @@ Packet::remove_all_tags (void)
 	m_tags.remove_all ();
 }
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/common/packet.h b/src/common/packet.h
index 0dc720d6a..ccd5e08dc 100644
--- a/src/common/packet.h
+++ b/src/common/packet.h
@@ -27,7 +27,7 @@
 #include "tags.h"
 #include "ns3/callback.h"
 
-namespace yans {
+namespace ns3 {
 
 class Packet {
 public:
@@ -60,9 +60,9 @@ private:
 	Tags m_tags;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
-namespace yans {
+namespace ns3 {
 
 template <typename T>
 void Packet::add_tag (T const*tag)
@@ -85,6 +85,6 @@ bool Packet::update_tag (T const*tag)
 	return m_tags.update (tag);
 }
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* PACKET_H */
diff --git a/src/common/pcap-writer.cc b/src/common/pcap-writer.cc
index cb308c974..5333ce7fd 100644
--- a/src/common/pcap-writer.cc
+++ b/src/common/pcap-writer.cc
@@ -30,7 +30,7 @@
 #include "packet.h"
 
 
-namespace yans {
+namespace ns3 {
 
 enum {
 	PCAP_ETHERNET = 1
@@ -96,4 +96,4 @@ PcapWriter::write_16 (uint16_t data)
 	m_writer->write ((uint8_t*)&data, 2);
 }
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/common/pcap-writer.h b/src/common/pcap-writer.h
index 9332bde05..6f1e54397 100644
--- a/src/common/pcap-writer.h
+++ b/src/common/pcap-writer.h
@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include "packet.h"
 
-namespace yans {
+namespace ns3 {
 
 class SystemFile;
 
@@ -68,6 +68,6 @@ private:
 	Callback<void,uint8_t *,uint32_t> m_write_callback;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* PCAP_WRITER_H */
diff --git a/src/common/population-analysis.cc b/src/common/population-analysis.cc
index 5853a0965..69ade9b8b 100644
--- a/src/common/population-analysis.cc
+++ b/src/common/population-analysis.cc
@@ -29,7 +29,7 @@
    http://cutebugs.net/code/treegrowth-stable.
  */
 
-namespace yans {
+namespace ns3 {
 
 PopulationAnalysis::PopulationAnalysis ()
 {
@@ -91,4 +91,4 @@ PopulationAnalysis::get_unbiased_variance (void)
         return m_square_sum / (m_n - 1);
 }
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/common/population-analysis.h b/src/common/population-analysis.h
index 7d8448a72..37e20503d 100644
--- a/src/common/population-analysis.h
+++ b/src/common/population-analysis.h
@@ -25,7 +25,7 @@
 
 #include <stdint.h>
 
-namespace yans {
+namespace ns3 {
 
 class PopulationAnalysis {
 public:
@@ -49,7 +49,7 @@ private:
 	uint32_t m_n;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 
 #endif /* POPULATION_ANALYSIS_H */
diff --git a/src/common/position.cc b/src/common/position.cc
index b7d5fcea6..f74279511 100644
--- a/src/common/position.cc
+++ b/src/common/position.cc
@@ -21,7 +21,7 @@
 #include "position.h"
 #include <math.h>
 
-namespace yans {
+namespace ns3 {
 
 Position::~Position ()
 {}
@@ -44,4 +44,4 @@ Position::get_distance_from (Position const*position) const
 	return sqrt (dx*dx+dy*dy+dz*dz);
 }
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/common/position.h b/src/common/position.h
index a56aa4df5..566f4a639 100644
--- a/src/common/position.h
+++ b/src/common/position.h
@@ -21,7 +21,7 @@
 #ifndef POSITION_H
 #define POSITION_H
 
-namespace yans {
+namespace ns3 {
 
 class Position {
 public:
@@ -33,6 +33,6 @@ private:
 	virtual void real_get (double &x, double &y, double &z) const = 0;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* POSITION_H */
diff --git a/src/common/ref-ptr.h b/src/common/ref-ptr.h
index bcfc82b36..8693eea16 100644
--- a/src/common/ref-ptr.h
+++ b/src/common/ref-ptr.h
@@ -22,7 +22,7 @@
 #ifndef REF_PTR_H
 #define REF_PTR_H
 
-namespace yans {
+namespace ns3 {
 
 template <typename T>
 class RefPtr {
@@ -134,6 +134,6 @@ public:
 	}
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* REF_PTR_H */
diff --git a/src/common/seed-generator-mrg32k3a.cc b/src/common/seed-generator-mrg32k3a.cc
index d92527cb0..032de7eee 100644
--- a/src/common/seed-generator-mrg32k3a.cc
+++ b/src/common/seed-generator-mrg32k3a.cc
@@ -21,7 +21,7 @@
 #include "seed-generator.h"
 #include "rng-mrg32k3a.h"
 
-namespace yans {
+namespace ns3 {
 
 class SeedGeneratorPrivate {
 public:
@@ -58,4 +58,4 @@ SeedGenerator::get (void)
 	return SeedGeneratorPrivate::get ();
 }
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/common/seed-generator.h b/src/common/seed-generator.h
index fef5b61f2..8f4be1f6c 100644
--- a/src/common/seed-generator.h
+++ b/src/common/seed-generator.h
@@ -23,7 +23,7 @@
 
 #include <stdint.h>
 
-namespace yans {
+namespace ns3 {
 
 class SeedGeneratorPrivate;
 
@@ -35,6 +35,6 @@ private:
 	SeedGenerator ();
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* SEED_GENERATOR_H */
diff --git a/src/common/si-traced-variable.tcc b/src/common/si-traced-variable.tcc
index 642713441..3221bf3fa 100644
--- a/src/common/si-traced-variable.tcc
+++ b/src/common/si-traced-variable.tcc
@@ -25,7 +25,7 @@
 #include "ns3/callback.h"
 #include <stdint.h>
 
-namespace yans {
+namespace ns3 {
 
 class SiTracedVariableBase {
 public:
@@ -66,12 +66,12 @@ class UiTracedVariable;
  *
  * To instantiate a 32-bit signed variable (to store
  * a TCP counter for example), you would create a variable of type
- * yans::UiTracedVariable<int32_t> :
+ * ns3::UiTracedVariable<int32_t> :
  \code
  #include <stdint.h>
  #include "ns3/si-traced-variable.tcc"
 
- yans::SiTracedVariable<uint16_t> var;
+ ns3::SiTracedVariable<uint16_t> var;
  \endcode
  * and you would use it like any other variable of type int32_t:
  \code
@@ -232,6 +232,6 @@ SiTracedVariable<T> &operator ^= (SiTracedVariable<T> &lhs, U const &rhs) {
 	return lhs;
 }
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* TRACED_VARIABLE_TCC */
diff --git a/src/common/static-position.cc b/src/common/static-position.cc
index c2b769690..5e4198083 100644
--- a/src/common/static-position.cc
+++ b/src/common/static-position.cc
@@ -20,7 +20,7 @@
  */
 #include "static-position.h"
 
-namespace yans {
+namespace ns3 {
 
 StaticPosition::StaticPosition ()
 	: m_x (0.0), m_y (0.0), m_z (0.0)
@@ -43,4 +43,4 @@ StaticPosition::real_get (double &x, double &y, double &z) const
 	z = m_z;
 }
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/common/static-position.h b/src/common/static-position.h
index c19debc8a..8b36b22e2 100644
--- a/src/common/static-position.h
+++ b/src/common/static-position.h
@@ -23,7 +23,7 @@
 
 #include "position.h"
 
-namespace yans {
+namespace ns3 {
 
 class StaticPosition : public Position {
 public:
@@ -38,6 +38,6 @@ private:
 	double m_z;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* STATIC_POSITION_H */
diff --git a/src/common/static-speed-position.cc b/src/common/static-speed-position.cc
index d2fc01776..d4db5e07b 100644
--- a/src/common/static-speed-position.cc
+++ b/src/common/static-speed-position.cc
@@ -21,7 +21,7 @@
 #include "static-speed-position.h"
 #include "ns3/simulator.h"
 
-namespace yans {
+namespace ns3 {
 
 StaticSpeedPosition::StaticSpeedPosition ()
 	: m_x (0.0),
@@ -65,4 +65,4 @@ StaticSpeedPosition::real_get (double &x, double &y, double &z) const
 	z = m_z;
 }
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/common/static-speed-position.h b/src/common/static-speed-position.h
index 2fa53f733..e8bce266c 100644
--- a/src/common/static-speed-position.h
+++ b/src/common/static-speed-position.h
@@ -24,7 +24,7 @@
 #include <stdint.h>
 #include "position.h"
 
-namespace yans {
+namespace ns3 {
 
 class StaticSpeedPosition : public Position {
 public:
@@ -46,6 +46,6 @@ private:
 	mutable uint64_t m_prev_us;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* STATIC_SPEED_POSITION */
diff --git a/src/common/tags.cc b/src/common/tags.cc
index 4a02b0952..6abcbf5fd 100644
--- a/src/common/tags.cc
+++ b/src/common/tags.cc
@@ -21,7 +21,7 @@
 #include "tags.h"
 #include <string.h>
 
-namespace yans {
+namespace ns3 {
 
 TagsPrettyPrinterRegistry::PrettyPrinters TagsPrettyPrinterRegistry::g_pretty_printers;
 
@@ -174,7 +174,7 @@ Tags::pretty_print (std::ostream &os)
 }
 
 
-}; // namespace yans
+}; // namespace ns3
 
 #ifdef RUN_SELF_TESTS
 
@@ -182,7 +182,7 @@ Tags::pretty_print (std::ostream &os)
 #include <iomanip>
 #include <iostream>
 
-namespace yans {
+namespace ns3 {
 
 class TagsTest : Test {
 public:
@@ -316,7 +316,7 @@ TagsTest::run_tests (void)
 static TagsTest g_tags_test;
 
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* RUN_SELF_TESTS */
 
diff --git a/src/common/tags.h b/src/common/tags.h
index 4b6457a39..cff2f9be8 100644
--- a/src/common/tags.h
+++ b/src/common/tags.h
@@ -25,7 +25,7 @@
 #include <ostream>
 #include <vector>
 
-namespace yans {
+namespace ns3 {
 
 template <typename T>
 class TagPrettyPrinter;
@@ -110,13 +110,13 @@ private:
 };
 
 
-}; // namespace yans
+}; // namespace ns3
 
 
 #include <cassert>
 #include <string.h>
 
-namespace yans {
+namespace ns3 {
 
 /**
  * The TypeUid class is used to create a mapping Type --> uid
@@ -287,6 +287,6 @@ Tags::remove_all (void)
 }
 
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* TAGS_H */
diff --git a/src/common/trace-container.cc b/src/common/trace-container.cc
index 95d59ff2d..9faadbf85 100644
--- a/src/common/trace-container.cc
+++ b/src/common/trace-container.cc
@@ -25,7 +25,7 @@
 #include <utility>
 #include <cassert>
 
-namespace yans {
+namespace ns3 {
 
 TraceContainer::TraceContainer ()
 {}
@@ -158,11 +158,11 @@ TraceContainer::register_callback (char const *name, CallbackLoggerBase *logger)
 
 
 
-}; // namespace yans
+}; // namespace ns3
 
 #include <iostream>
 void 
-yans::TraceContainer::print_debug (void)
+ns3::TraceContainer::print_debug (void)
 {
 	if (!m_ui_list.empty ()) {
 		std::cout << "ui var: " << std::endl;
diff --git a/src/common/trace-container.h b/src/common/trace-container.h
index e062e3db9..188b18a40 100644
--- a/src/common/trace-container.h
+++ b/src/common/trace-container.h
@@ -31,7 +31,7 @@
 #include <list>
 #include <string>
 
-namespace yans {
+namespace ns3 {
 
 class PacketLogger;
 class TraceStream;
@@ -45,12 +45,12 @@ class TraceStream;
  * model trace event sources.
  *
  * TraceContainer can be used to register the following event sources:
- *   - yans::PacketLogger : can be connected to yans::PcapWriter
- *   - yans::TraceStream : can be connected to any std::ostream
- *   - yans::CallbackLogger: can be connected to yans::Callback
- *   - yans::UiTracedVariable
- *   - yans::SiTracedVariable
- *   - yans::FTracedVariable
+ *   - ns3::PacketLogger : can be connected to ns3::PcapWriter
+ *   - ns3::TraceStream : can be connected to any std::ostream
+ *   - ns3::CallbackLogger: can be connected to ns3::Callback
+ *   - ns3::UiTracedVariable
+ *   - ns3::SiTracedVariable
+ *   - ns3::FTracedVariable
  *
  * The following sample code shows how you can:
  *   - create trace event sources
@@ -214,13 +214,13 @@ private:
 	CallbackList m_callback_list;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #ifndef NDEBUG
 #include <cassert>
 #endif
 
-namespace yans {
+namespace ns3 {
 
 template <typename T1>
 void 
@@ -294,6 +294,6 @@ TraceContainer::set_callback (char const *name, Callback<void,T1,T2,T3,T4,T5> ca
 }
 
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* TRACED_VARIABLE_CONTAINER_H */
diff --git a/src/common/trace-stream-test.cc b/src/common/trace-stream-test.cc
index e152b0658..ddcafe7d0 100644
--- a/src/common/trace-stream-test.cc
+++ b/src/common/trace-stream-test.cc
@@ -26,7 +26,7 @@
 
 namespace {
 
-class TestTraceStream : public yans::Test {
+class TestTraceStream : public ns3::Test {
 public:
 	TestTraceStream ();
 	virtual bool run_tests (void);
@@ -42,7 +42,7 @@ bool
 TestTraceStream::run_tests (void)
 {
 	bool ok = true;
-	yans::TraceStream trace;
+	ns3::TraceStream trace;
 	//trace.set_stream (&std::cout);
 	trace << 1;
 	trace << " X ";
@@ -63,6 +63,6 @@ TestTraceStream::run_tests (void)
 }
 
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* RUN_SELF_TESTS */
diff --git a/src/common/trace-stream.h b/src/common/trace-stream.h
index df9493d95..7c1807618 100644
--- a/src/common/trace-stream.h
+++ b/src/common/trace-stream.h
@@ -23,7 +23,7 @@
 
 #include <ostream>
 
-namespace yans {
+namespace ns3 {
 
 /**
  * \brief log arbitrary data to std::ostreams
@@ -67,7 +67,7 @@ private:
 	std::ostream *m_os;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 
 #endif /* TRACE_STREAM_H */
diff --git a/src/common/traced-variable-test.cc b/src/common/traced-variable-test.cc
index 97adee57e..5c8d6e5a2 100644
--- a/src/common/traced-variable-test.cc
+++ b/src/common/traced-variable-test.cc
@@ -25,7 +25,7 @@
 #include "ns3/callback.h"
 
 
-namespace yans {
+namespace ns3 {
 
 class Foo {
 public:
@@ -247,6 +247,6 @@ TracedVariableTest::TracedVariableTest ()
 
 static TracedVariableTest g_traced_variable_test;
 
-}; // namespace yans
+}; // namespace ns3
 
 
diff --git a/src/common/ui-traced-variable.tcc b/src/common/ui-traced-variable.tcc
index c330902b8..f8b575225 100644
--- a/src/common/ui-traced-variable.tcc
+++ b/src/common/ui-traced-variable.tcc
@@ -25,7 +25,7 @@
 #include "ns3/callback.h"
 #include <stdint.h>
 
-namespace yans {
+namespace ns3 {
 
 class UiTracedVariableBase {
 public:
@@ -69,12 +69,12 @@ class SiTracedVariable;
  *
  * To instantiate a 32-bit unsigned variable (to store
  * a TCP counter for example), you would create a variable of type
- * yans::UiTracedVariable<uint32_t> :
+ * ns3::UiTracedVariable<uint32_t> :
  \code
  #include <stdint.h>
  #include "ns3/ui-traced-variable.tcc"
 
- yans::UiTracedVariable<uint32_t> var;
+ ns3::UiTracedVariable<uint32_t> var;
  \endcode
  * and you would use it like any other variable of type uint32_t:
  \code
@@ -234,6 +234,6 @@ UiTracedVariable<T> &operator ^= (UiTracedVariable<T> &lhs, U const &rhs) {
 	return lhs;
 }
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* UI_TRACED_VARIABLE_TCC */
diff --git a/src/common/utils.cc b/src/common/utils.cc
index bf821681d..dc0210286 100644
--- a/src/common/utils.cc
+++ b/src/common/utils.cc
@@ -21,7 +21,7 @@
 
 #include "utils.h"
 
-namespace yans {
+namespace ns3 {
 
 uint16_t 
 utils_hton_16 (uint16_t v)
@@ -156,12 +156,12 @@ utils_checksum_complete (uint16_t checksum)
 }
 
 
-}; // namespace yans
+}; // namespace ns3
 
 
 #ifdef RUN_SELF_TESTS
 #include "ns3/test.h"
-namespace yans {
+namespace ns3 {
 
 class UtilsTest : public Test {
 public:
@@ -289,5 +289,5 @@ UtilsTest::run_tests (void)
 	return ok;
 }
 static UtilsTest g_utils_test;
-}; //namespace yans
+}; //namespace ns3
 #endif /* RUN_SELF_TESTS */
diff --git a/src/common/utils.h b/src/common/utils.h
index ef38d7cd2..19ef7100b 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -24,7 +24,7 @@
 
 #include <stdint.h>
 
-namespace yans {
+namespace ns3 {
 
 uint16_t utils_hton_16 (uint16_t v);
 uint32_t utils_hton_32 (uint32_t v);
@@ -38,6 +38,6 @@ void ascii_to_mac_network (char const *str, uint8_t address[6]);
 uint16_t utils_checksum_calculate (uint16_t checksum, uint8_t *buffer, uint16_t size);
 uint16_t utils_checksum_complete (uint16_t checksum);
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* UTILS_H */
diff --git a/src/core/callback-test.cc b/src/core/callback-test.cc
index 2ff152d3c..b64af3832 100644
--- a/src/core/callback-test.cc
+++ b/src/core/callback-test.cc
@@ -25,7 +25,7 @@
 
 #ifdef RUN_SELF_TESTS
 
-namespace yans {
+namespace ns3 {
 
 static bool g_test5 = false;
 static bool g_test6 = false;
@@ -47,7 +47,7 @@ int test7 (int a)
 	return a;
 }
 
-class CallbackTest : public yans::Test {
+class CallbackTest : public ns3::Test {
 private:
 	bool m_test1;
 	bool m_test2;
@@ -66,7 +66,7 @@ public:
 };
 
 CallbackTest::CallbackTest ()
-	: yans::Test ("Callback"),
+	: ns3::Test ("Callback"),
 	  m_test1 (false),
 	  m_test2 (false),
 	  m_test3 (false),
@@ -133,13 +133,13 @@ CallbackTest::run_tests (void)
 {
 	bool ok = true;
 
-	typedef yans::Callback<void> A;
-	typedef yans::Callback<int> B;
-	typedef yans::Callback<void, double> C;
-	typedef yans::Callback<int, double, int> D;
-	typedef yans::Callback<void> E;
-	typedef yans::Callback<void,int> F;
-	typedef yans::Callback<int,int> G;
+	typedef ns3::Callback<void> A;
+	typedef ns3::Callback<int> B;
+	typedef ns3::Callback<void, double> C;
+	typedef ns3::Callback<int, double, int> D;
+	typedef ns3::Callback<void> E;
+	typedef ns3::Callback<void,int> F;
+	typedef ns3::Callback<int,int> G;
 	
 	A a0 (this, &CallbackTest::test1);
 	B b0;
@@ -164,13 +164,13 @@ CallbackTest::run_tests (void)
 
 	reset ();
 
-	A a1 = yans::make_callback (&CallbackTest::test1, this);
-	B b1 = yans::make_callback (&CallbackTest::test2, this);
-	C c1 = yans::make_callback (&CallbackTest::test3, this);
-	D d1 = yans::make_callback (&CallbackTest::test4, this);
-	E e1 = yans::make_callback (&test5);
-	F f1 = yans::make_callback (&test6);
-	G g1 = yans::make_callback (&test7);
+	A a1 = ns3::make_callback (&CallbackTest::test1, this);
+	B b1 = ns3::make_callback (&CallbackTest::test2, this);
+	C c1 = ns3::make_callback (&CallbackTest::test3, this);
+	D d1 = ns3::make_callback (&CallbackTest::test4, this);
+	E e1 = ns3::make_callback (&test5);
+	F f1 = ns3::make_callback (&test6);
+	G g1 = ns3::make_callback (&test7);
 	
 	a1 ();
 	b1 ();
diff --git a/src/core/callback.h b/src/core/callback.h
index 966e8ec1d..8e1f0d421 100644
--- a/src/core/callback.h
+++ b/src/core/callback.h
@@ -24,7 +24,7 @@
 
 #include "reference-list.h"
 
-namespace yans {
+namespace ns3 {
 
 /***
  * \internal
@@ -512,7 +512,7 @@ Callback<R,T1,T2,T3,T4,T5> make_bound_callback (R (*fn_ptr) (TX,T1,T2,T3,T4,T5),
 }
 
 
-}; // namespace yans
+}; // namespace ns3
 
 
 #endif /* CALLBACK_H */
diff --git a/src/core/exec-commands.h b/src/core/exec-commands.h
index fb74a5bf6..2947889af 100644
--- a/src/core/exec-commands.h
+++ b/src/core/exec-commands.h
@@ -26,7 +26,7 @@
 #include <vector>
 #include "callback.h"
 
-namespace yans {
+namespace ns3 {
 
 class ExecCommandsPrivate;
 
diff --git a/src/core/reference-list-test.cc b/src/core/reference-list-test.cc
index 51746f753..00ca9f9c9 100644
--- a/src/core/reference-list-test.cc
+++ b/src/core/reference-list-test.cc
@@ -48,20 +48,20 @@ public:
 	}
 };
 
-class RefTest : public yans::Test {
+class RefTest : public ns3::Test {
 public:
 	RefTest ();
 	virtual bool run_tests (void);
 private:
-	void test (yans::ReferenceList<A *>);
+	void test (ns3::ReferenceList<A *>);
 };
 
 RefTest::RefTest ()
-	: yans::Test ("ReferenceList")
+	: ns3::Test ("ReferenceList")
 {}
 
 void
-RefTest::test (yans::ReferenceList<A *> a) 
+RefTest::test (ns3::ReferenceList<A *> a) 
 {
 	a->trace ();
 }
@@ -72,9 +72,9 @@ RefTest::run_tests (void)
 	bool ok = true;
 
 	{
-		yans::ReferenceList<A *> tmp;
+		ns3::ReferenceList<A *> tmp;
 		{
-			yans::ReferenceList<A *> a (new A ());
+			ns3::ReferenceList<A *> a (new A ());
 			
 			test (a);
 			tmp = a;
@@ -88,22 +88,22 @@ RefTest::run_tests (void)
 	}
 
 	{
-		yans::ReferenceList<A *> tmp;
+		ns3::ReferenceList<A *> tmp;
 	}
 
 	{
-		yans::ReferenceList<A *> tmp (new A ());
+		ns3::ReferenceList<A *> tmp (new A ());
 	}
 
 	{
-		yans::ReferenceList<A *> tmp;
+		ns3::ReferenceList<A *> tmp;
 		tmp.set (new A ());
 	}
 
 	{
 		TRACE ("test assignement");
-		yans::ReferenceList<A *> a0 (new A ());
-		yans::ReferenceList<A *> a1 (new A ());
+		ns3::ReferenceList<A *> a0 (new A ());
+		ns3::ReferenceList<A *> a1 (new A ());
 		a0 = a1;
 	}
 
diff --git a/src/core/reference-list.h b/src/core/reference-list.h
index d2bc95eb0..149a814e4 100644
--- a/src/core/reference-list.h
+++ b/src/core/reference-list.h
@@ -29,7 +29,7 @@
  */
 
 
-namespace yans {
+namespace ns3 {
 
 template <typename OBJ_PTR>
 class ReferenceList;
@@ -112,6 +112,6 @@ private:
 	mutable ReferenceList const*m_next;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* REFERENCE_LIST_H */
diff --git a/src/core/system-file.h b/src/core/system-file.h
index e534eb708..ed8ae0774 100644
--- a/src/core/system-file.h
+++ b/src/core/system-file.h
@@ -24,7 +24,7 @@
 
 #include <stdint.h>
 
-namespace yans {
+namespace ns3 {
 
 class SystemFilePrivate;
 
@@ -39,6 +39,6 @@ private:
 	SystemFilePrivate *m_priv;
 };
 
-}; //namespace yans
+}; //namespace ns3
 
 #endif /* SYSTEM_FILE_H */
diff --git a/src/core/system-mutex.h b/src/core/system-mutex.h
index c3a5e4960..64db342a0 100644
--- a/src/core/system-mutex.h
+++ b/src/core/system-mutex.h
@@ -23,7 +23,7 @@
 
 #include <stdint.h>
 
-namespace yans {
+namespace ns3 {
 
 class SystemMutexPrivate;
 
@@ -37,6 +37,6 @@ public:
 	SystemMutexPrivate *m_priv;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* SYSTEM_MUTEX_H */
diff --git a/src/core/system-semaphore.h b/src/core/system-semaphore.h
index 5bce291b4..eb114f160 100644
--- a/src/core/system-semaphore.h
+++ b/src/core/system-semaphore.h
@@ -23,7 +23,7 @@
 
 #include <stdint.h>
 
-namespace yans {
+namespace ns3 {
 
 class SystemSemaphorePrivate;
 
@@ -39,6 +39,6 @@ private:
 	SystemSemaphorePrivate *m_priv;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* SYSTEM_SEMAPHORE_H */
diff --git a/src/core/system-thread.h b/src/core/system-thread.h
index 82375f389..a6fbb526f 100644
--- a/src/core/system-thread.h
+++ b/src/core/system-thread.h
@@ -21,7 +21,7 @@
 #ifndef SYSTEM_THREAD_H
 #define SYSTEM_THREAD_H
 
-namespace yans {
+namespace ns3 {
 
 class SystemThreadPrivate;
 
@@ -35,7 +35,7 @@ private:
 	virtual void real_run (void) = 0;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 
 #endif /* SYSTEM_THREAD_H */
diff --git a/src/core/test.cc b/src/core/test.cc
index de166957e..7af109fea 100644
--- a/src/core/test.cc
+++ b/src/core/test.cc
@@ -24,7 +24,7 @@
 #ifdef RUN_SELF_TESTS
 #include <iostream>
 
-namespace yans {
+namespace ns3 {
 
 TestManager *
 TestManager::get (void)
@@ -102,6 +102,6 @@ Test::failure (void)
 	return TestManager::failure ();
 }
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* RUN_SELF_TESTS */
diff --git a/src/core/test.h b/src/core/test.h
index c1b0ac244..f9f4d363d 100644
--- a/src/core/test.h
+++ b/src/core/test.h
@@ -29,7 +29,7 @@
 
 #ifdef RUN_SELF_TESTS
 
-namespace yans {
+namespace ns3 {
 
 class TestManager;
 
@@ -68,7 +68,7 @@ private:
 	Tests m_tests;
 	bool m_verbose;
 };
-}; // namespace yans 
+}; // namespace ns3 
 
 #endif /* RUN_SELF_TESTS */
 
diff --git a/src/core/unix-exec-commands.cc b/src/core/unix-exec-commands.cc
index 49e36d61b..641c2ff73 100644
--- a/src/core/unix-exec-commands.cc
+++ b/src/core/unix-exec-commands.cc
@@ -47,7 +47,7 @@ std::cout << "COMMAND TRACE " << x << std::endl;
 #endif /* TRACE_COMMAND */
 
 
-namespace yans {
+namespace ns3 {
 
 class LogThread : public SystemThread {
 public:
@@ -446,7 +446,7 @@ ExecCommands::get_size (void)
 	return m_priv->get_size ();
 }
 
-}; // namespace yans
+}; // namespace ns3
 
 #ifdef RUN_SELF_TESTS
 
@@ -454,7 +454,7 @@ ExecCommands::get_size (void)
 #include <iomanip>
 #include <iostream>
 
-namespace yans {
+namespace ns3 {
 
 class ExecCommandsTest: public Test {
 public:
@@ -509,7 +509,7 @@ ExecCommandsTest::run_tests (void)
 
 static ExecCommandsTest g_exec_commands_test;
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* RUN_SELF_TESTS */
 
diff --git a/src/core/unix-system-file.cc b/src/core/unix-system-file.cc
index 25081a16a..ea2ad593f 100644
--- a/src/core/unix-system-file.cc
+++ b/src/core/unix-system-file.cc
@@ -42,7 +42,7 @@ std::cout << "SYS FILE TRACE " << this << " " << x << std::endl;
 #define BUFFER_SIZE (4096)
 
 
-namespace yans {
+namespace ns3 {
 
 class SystemFilePrivate {
 public:
diff --git a/src/core/unix-system-mutex.cc b/src/core/unix-system-mutex.cc
index f6269c446..6035f0d10 100644
--- a/src/core/unix-system-mutex.cc
+++ b/src/core/unix-system-mutex.cc
@@ -24,7 +24,7 @@
 #include <pthread.h>
 #include <cassert>
 
-namespace yans {
+namespace ns3 {
 
 class SystemMutexPrivate {
 public:
@@ -79,4 +79,4 @@ SystemMutex::unlock (void)
 
 
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/core/unix-system-semaphore.cc b/src/core/unix-system-semaphore.cc
index 8286c10fa..d36ccd8db 100644
--- a/src/core/unix-system-semaphore.cc
+++ b/src/core/unix-system-semaphore.cc
@@ -27,7 +27,7 @@
 #include "errno.h"
 #include "string.h"
 
-namespace yans {
+namespace ns3 {
 
 class SystemSemaphorePrivate {
 public:
@@ -111,4 +111,4 @@ SystemSemaphore::wait (uint32_t n)
 
 
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/core/unix-system-thread.cc b/src/core/unix-system-thread.cc
index 637163f69..8e495ef22 100644
--- a/src/core/unix-system-thread.cc
+++ b/src/core/unix-system-thread.cc
@@ -24,7 +24,7 @@
 #include <pthread.h>
 #include <cassert>
 
-namespace yans {
+namespace ns3 {
 
 class SystemThreadPrivate {
 public:
@@ -65,5 +65,5 @@ SystemThread::~SystemThread ()
 	delete m_priv;
 }
 
-}; // namespace yans
+}; // namespace ns3
 
diff --git a/src/core/unix-wall-clock-ms.cc b/src/core/unix-wall-clock-ms.cc
index f1879bced..e4dd08df5 100644
--- a/src/core/unix-wall-clock-ms.cc
+++ b/src/core/unix-wall-clock-ms.cc
@@ -22,7 +22,7 @@
 #include "wall-clock-ms.h"
 #include <sys/time.h>
 
-namespace yans {
+namespace ns3 {
 
 class WallClockMsPrivate {
 public:
@@ -71,4 +71,4 @@ WallClockMs::end (void)
 	return m_priv->end ();
 }
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/core/wall-clock-ms.h b/src/core/wall-clock-ms.h
index 87597ec22..08f39292b 100644
--- a/src/core/wall-clock-ms.h
+++ b/src/core/wall-clock-ms.h
@@ -22,7 +22,7 @@
 #ifndef WALL_CLOCK_MS_H
 #define WALL_CLOCK_MS_H
 
-namespace yans {
+namespace ns3 {
 
 class WallClockMs {
 public:
@@ -35,6 +35,6 @@ private:
 	class WallClockMsPrivate *m_priv;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* WALL_CLOCK_MS_H */
diff --git a/src/core/win32-system-file.cc b/src/core/win32-system-file.cc
index ac94d6d1f..a2047a61c 100644
--- a/src/core/win32-system-file.cc
+++ b/src/core/win32-system-file.cc
@@ -34,7 +34,7 @@ std::cout << "SYS FILE TRACE " << this << " " << x << std::endl;
 #define BUFFER_SIZE (4096)
 
 
-namespace yans {
+namespace ns3 {
 
 class SystemFilePrivate {
 public:
diff --git a/src/core/win32-system-mutex.cc b/src/core/win32-system-mutex.cc
index b5344ceea..e17c51891 100644
--- a/src/core/win32-system-mutex.cc
+++ b/src/core/win32-system-mutex.cc
@@ -24,7 +24,7 @@
 #include <windows.h>
 #include <cassert>
 
-namespace yans {
+namespace ns3 {
 
 class SystemMutexPrivate {
 public:
@@ -75,4 +75,4 @@ SystemMutex::unlock (void)
 
 
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/core/win32-system-semaphore.cc b/src/core/win32-system-semaphore.cc
index eea57aace..b752f1f89 100644
--- a/src/core/win32-system-semaphore.cc
+++ b/src/core/win32-system-semaphore.cc
@@ -25,7 +25,7 @@
 #include <cassert>
 #include <iostream>
 
-namespace yans {
+namespace ns3 {
 
 class SystemSemaphorePrivate {
 public:
@@ -100,4 +100,4 @@ SystemSemaphore::wait (uint32_t n)
 
 
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/core/win32-system-thread.cc b/src/core/win32-system-thread.cc
index 1062c7d9d..fa4a79585 100644
--- a/src/core/win32-system-thread.cc
+++ b/src/core/win32-system-thread.cc
@@ -23,7 +23,7 @@
 #include <windows.h>
 #include <cassert>
 
-namespace yans {
+namespace ns3 {
 
 class SystemThreadPrivate {
 public:
@@ -62,5 +62,5 @@ SystemThread::~SystemThread ()
 	delete m_priv;
 }
 
-}; // namespace yans
+}; // namespace ns3
 
diff --git a/src/core/win32-wall-clock-ms.cc b/src/core/win32-wall-clock-ms.cc
index e783dafc8..b7169e7f2 100644
--- a/src/core/win32-wall-clock-ms.cc
+++ b/src/core/win32-wall-clock-ms.cc
@@ -21,7 +21,7 @@
 
 #include "wall-clock-ms.h"
 
-namespace yans {
+namespace ns3 {
 
 class WallClockMsPrivate {
 public:
@@ -62,4 +62,4 @@ WallClockMs::end (void)
 	return m_priv->end ();
 }
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/simulator/event-impl.cc b/src/simulator/event-impl.cc
index 708f063d4..e390ce151 100644
--- a/src/simulator/event-impl.cc
+++ b/src/simulator/event-impl.cc
@@ -22,7 +22,7 @@
 #include "event-impl.h"
 
 
-namespace yans {
+namespace ns3 {
 
 
 EventImpl::~EventImpl ()
@@ -64,4 +64,4 @@ EventImpl::is_running (void)
 	return (m_running == 1);
 }
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/simulator/event-impl.h b/src/simulator/event-impl.h
index b781606c5..af2e9196a 100644
--- a/src/simulator/event-impl.h
+++ b/src/simulator/event-impl.h
@@ -23,7 +23,7 @@
 
 #include <stdint.h>
 
-namespace yans {
+namespace ns3 {
 
 class EventImpl {
 public:
@@ -44,6 +44,6 @@ private:
 	uint32_t m_running : 1;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* EVENT_IMPL_H */
diff --git a/src/simulator/event-tcc-test.cc b/src/simulator/event-tcc-test.cc
index 1cb996767..9a13a0cd6 100644
--- a/src/simulator/event-tcc-test.cc
+++ b/src/simulator/event-tcc-test.cc
@@ -66,7 +66,7 @@ void five_cb (int a,int b,int c,int d,int e)
 
 };
 
-namespace yans {
+namespace ns3 {
 class EventTest : public Test {
 public:
 	EventTest ();
@@ -82,17 +82,17 @@ EventTest::run_tests (void)
 {
 	Event ev;
 
-	ev = yans::make_event (&null_cb);
+	ev = ns3::make_event (&null_cb);
 	ev ();
-	ev = yans::make_event (&one_cb, 1);
+	ev = ns3::make_event (&one_cb, 1);
 	ev ();
-	ev = yans::make_event (&two_cb, 1, 2);
+	ev = ns3::make_event (&two_cb, 1, 2);
 	ev ();
-	ev = yans::make_event (&three_cb, 1, 2, 3);
+	ev = ns3::make_event (&three_cb, 1, 2, 3);
 	ev ();
-	ev = yans::make_event (&four_cb, 1, 2, 3, 4);
+	ev = ns3::make_event (&four_cb, 1, 2, 3, 4);
 	ev ();
-	ev = yans::make_event (&five_cb, 1, 2, 3, 4, 5);
+	ev = ns3::make_event (&five_cb, 1, 2, 3, 4, 5);
 	ev ();
 
 	if (g_error) {
diff --git a/src/simulator/event-tcc.cc b/src/simulator/event-tcc.cc
index f953297c8..4be0c6b46 100644
--- a/src/simulator/event-tcc.cc
+++ b/src/simulator/event-tcc.cc
@@ -21,7 +21,7 @@
 #include "event-impl.h"
 #include "event.h"
 
-namespace yans {
+namespace ns3 {
 
 class EventFunctionImpl0 : public EventImpl {
 public:
@@ -44,4 +44,4 @@ Event make_event(void (*f) (void))
 	return Event (new EventFunctionImpl0 (f));
 }
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/simulator/event.h b/src/simulator/event.h
index 5dcd4ac31..ab0639257 100644
--- a/src/simulator/event.h
+++ b/src/simulator/event.h
@@ -25,7 +25,7 @@
 #include <algorithm>
 #include "event-impl.h"
 
-namespace yans {
+namespace ns3 {
 
 
 class EventImpl;
@@ -135,6 +135,6 @@ private:
 	EventImpl *m_impl;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* EVENT_H */
diff --git a/src/simulator/event.tcc b/src/simulator/event.tcc
index 0a1742931..2f8a30261 100644
--- a/src/simulator/event.tcc
+++ b/src/simulator/event.tcc
@@ -26,9 +26,9 @@
 #include "event-impl.h"
 
 /**
- * yans namespace
+ * ns3 namespace
  */
-namespace yans {
+namespace ns3 {
 
 /**
  * \defgroup make_event make_event
@@ -449,6 +449,6 @@ Event make_event(void (*f) (T1, T2, T3, T4, T5), T1 a1, T2 a2, T3 a3, T4 a4, T5
 }
 
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* EVENT_TCC */
diff --git a/src/simulator/scheduler-heap.cc b/src/simulator/scheduler-heap.cc
index 6addb02e1..c5628fc9f 100644
--- a/src/simulator/scheduler-heap.cc
+++ b/src/simulator/scheduler-heap.cc
@@ -49,7 +49,7 @@ std::cout << "HEAP TRACE " << x << std::endl;
 
 
 
-namespace yans {
+namespace ns3 {
 
 SchedulerHeap::SchedulerHeap ()
 {
@@ -240,4 +240,4 @@ SchedulerHeap::remove (Event const ev)
 	return key;
 }
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/simulator/scheduler-heap.h b/src/simulator/scheduler-heap.h
index a74b65cec..e56854d12 100644
--- a/src/simulator/scheduler-heap.h
+++ b/src/simulator/scheduler-heap.h
@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include <vector>
 
-namespace yans {
+namespace ns3 {
 
 class Event;
 class EventHolder;
@@ -65,7 +65,7 @@ private:
 	BinaryHeap m_heap;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 
 #endif /* SCHEDULER_HEAP_H */
diff --git a/src/simulator/scheduler-list.cc b/src/simulator/scheduler-list.cc
index 467874f02..767b71dc0 100644
--- a/src/simulator/scheduler-list.cc
+++ b/src/simulator/scheduler-list.cc
@@ -24,7 +24,7 @@
 #include <utility>
 #include <cassert>
 
-namespace yans {
+namespace ns3 {
 
 SchedulerList::SchedulerList ()
 {}
@@ -104,4 +104,4 @@ SchedulerList::remove (Event const ev)
 	return key;
 }
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/simulator/scheduler-list.h b/src/simulator/scheduler-list.h
index e4af68981..d316674d8 100644
--- a/src/simulator/scheduler-list.h
+++ b/src/simulator/scheduler-list.h
@@ -27,7 +27,7 @@
 #include <utility>
 #include <stdint.h>
 
-namespace yans {
+namespace ns3 {
 
 class Event;
 
@@ -51,7 +51,7 @@ class SchedulerList : public Scheduler {
 	Events m_events;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 
 #endif /* SCHEDULER_LIST_H */
diff --git a/src/simulator/scheduler-map.cc b/src/simulator/scheduler-map.cc
index b78243bf9..630006cb8 100644
--- a/src/simulator/scheduler-map.cc
+++ b/src/simulator/scheduler-map.cc
@@ -35,7 +35,7 @@ std::cout << "MAP TRACE " << x << std::endl;
 #endif /* TRACE_MAP */
 
 
-namespace yans {
+namespace ns3 {
 
 
 SchedulerMap::SchedulerMap ()
@@ -109,4 +109,4 @@ SchedulerMap::remove (Event const ev)
 }
 
 
-}; // namespace yans
+}; // namespace ns3
diff --git a/src/simulator/scheduler-map.h b/src/simulator/scheduler-map.h
index 3659ec077..931b9e562 100644
--- a/src/simulator/scheduler-map.h
+++ b/src/simulator/scheduler-map.h
@@ -27,7 +27,7 @@
 #include <map>
 #include <utility>
 
-namespace yans {
+namespace ns3 {
 
 class SchedulerMap : public Scheduler {
 public:
@@ -53,7 +53,7 @@ private:
 	uint32_t m_uid;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 
 #endif /* SCHEDULER_MAP_H */
diff --git a/src/simulator/scheduler.cc b/src/simulator/scheduler.cc
index c2f8fa971..9ca871e72 100644
--- a/src/simulator/scheduler.cc
+++ b/src/simulator/scheduler.cc
@@ -23,7 +23,7 @@
 #include <cassert>
 
 
-yans::Scheduler::~Scheduler () 
+ns3::Scheduler::~Scheduler () 
 {}
 
 /* Note the invariants which this function must provide:
@@ -32,7 +32,7 @@ yans::Scheduler::~Scheduler ()
  * - transitivity: f(x,y) and f(y,z) => f(x,z)
  */
 bool
-yans::Scheduler::EventKeyCompare::operator () (struct EventKey a, struct EventKey b)
+ns3::Scheduler::EventKeyCompare::operator () (struct EventKey a, struct EventKey b)
 {
 	assert (a.m_uid != b.m_uid);
 	if (a.m_time < b.m_time) {
diff --git a/src/simulator/scheduler.h b/src/simulator/scheduler.h
index 945ca4121..d43839268 100644
--- a/src/simulator/scheduler.h
+++ b/src/simulator/scheduler.h
@@ -25,7 +25,7 @@
 #include <stdint.h>
 #include "event.h"
 
-namespace yans {
+namespace ns3 {
 
 class Scheduler {
  public:
@@ -48,7 +48,7 @@ class Scheduler {
 
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 
 #endif /* SCHEDULER_H */
diff --git a/src/simulator/simulator.cc b/src/simulator/simulator.cc
index 73ec19078..1a92d4151 100644
--- a/src/simulator/simulator.cc
+++ b/src/simulator/simulator.cc
@@ -46,7 +46,7 @@ std::cout << "SIMU TRACE " << x << std::endl;
 #endif /* TRACE_SIMU */
 
 
-namespace yans {
+namespace ns3 {
 
 class ParallelSimulatorQueuePrivate {
 public:
@@ -362,7 +362,7 @@ SimulatorPrivate::remove (Event const ev)
 }
 
 
-}; // namespace yans
+}; // namespace ns3
 
 
 #include "scheduler-list.h"
@@ -370,7 +370,7 @@ SimulatorPrivate::remove (Event const ev)
 #include "scheduler-map.h"
 
 
-namespace yans {
+namespace ns3 {
 
 SimulatorPrivate *Simulator::m_priv = 0;
 Simulator::ListType Simulator::m_list_type = LINKED_LIST;
@@ -520,10 +520,10 @@ Simulator::remove (Event const ev)
 	return get_priv ()->remove (ev);
 }
 
-}; // namespace yans
+}; // namespace ns3
 
 
-namespace yans {
+namespace ns3 {
 
 ParallelSimulatorQueue::ParallelSimulatorQueue ()
 {}
diff --git a/src/simulator/simulator.h b/src/simulator/simulator.h
index 4fb762bc6..2be5b6c46 100644
--- a/src/simulator/simulator.h
+++ b/src/simulator/simulator.h
@@ -25,7 +25,7 @@
 #include <stdint.h>
 #include "event.h"
 
-namespace yans {
+namespace ns3 {
 
 class SimulatorPrivate;
 class ParallelSimulatorQueuePrivate;
@@ -226,6 +226,6 @@ private:
 	} m_list_type;
 };
 
-}; // namespace yans
+}; // namespace ns3
 
 #endif /* SIMULATOR_H */
diff --git a/utils/bench-packets.cc b/utils/bench-packets.cc
index e01223201..b5d2cea79 100644
--- a/utils/bench-packets.cc
+++ b/utils/bench-packets.cc
@@ -25,7 +25,7 @@
 #include "ns3/chunk-ipv4.h"
 #include <iostream>
 
-using namespace yans;
+using namespace ns3;
 
 static void 
 bench_ptr_a (uint32_t n)
diff --git a/utils/bench-simulator.cc b/utils/bench-simulator.cc
index 3fcd4ea7c..f5f39f7d6 100644
--- a/utils/bench-simulator.cc
+++ b/utils/bench-simulator.cc
@@ -27,7 +27,7 @@
 #include <fstream>
 #include <vector>
 
-using namespace yans;
+using namespace ns3;
 
 
 bool g_debug = false;
diff --git a/utils/replay-simulation.cc b/utils/replay-simulation.cc
index 936b547b5..d88e65288 100644
--- a/utils/replay-simulation.cc
+++ b/utils/replay-simulation.cc
@@ -28,7 +28,7 @@
 #include <fstream>
 #include <iostream>
 
-using namespace yans;
+using namespace ns3;
 
 class LogReader {
 public:
diff --git a/utils/run-tests.cc b/utils/run-tests.cc
index b16b622c5..a70544d72 100644
--- a/utils/run-tests.cc
+++ b/utils/run-tests.cc
@@ -24,8 +24,8 @@
 int main (int argc, char *argv[])
 {
 #ifdef RUN_SELF_TESTS
-	yans::TestManager::enable_verbose ();
-	yans::TestManager::run_tests ();
+	ns3::TestManager::enable_verbose ();
+	ns3::TestManager::run_tests ();
 #endif /* RUN_SELF_TESTS */
 
 	return 0;