Index: code/branches/objecthierarchy/src/network/packet/Acknowledgement.cc
===================================================================
--- code/branches/objecthierarchy/src/network/packet/Acknowledgement.cc	(revision 2111)
+++ code/branches/objecthierarchy/src/network/packet/Acknowledgement.cc	(revision 2112)
@@ -33,10 +33,10 @@
 #include "core/CoreIncludes.h"
 
-namespace network {
+namespace orxonox {
 namespace packet {
 
 #define PACKET_FLAGS_ACK    0
 #define _PACKETID           0
-#define _ACKID              _PACKETID + sizeof(network::packet::ENUM::Type)
+#define _ACKID              _PACKETID + sizeof(packet::ENUM::Type)
   
 Acknowledgement::Acknowledgement( unsigned int id, unsigned int clientID )
@@ -74,3 +74,3 @@
 
 } //namespace packet
-} //namespace network
+} //namespace orxonox
Index: code/branches/objecthierarchy/src/network/packet/Acknowledgement.h
===================================================================
--- code/branches/objecthierarchy/src/network/packet/Acknowledgement.h	(revision 2111)
+++ code/branches/objecthierarchy/src/network/packet/Acknowledgement.h	(revision 2112)
@@ -33,5 +33,5 @@
 
 
-namespace network {
+namespace orxonox {
 namespace packet {
 /**
@@ -53,5 +53,5 @@
 
 } //namespace packet
-} //namespace network
+} //namespace orxonox
 
 #endif
Index: code/branches/objecthierarchy/src/network/packet/Chat.cc
===================================================================
--- code/branches/objecthierarchy/src/network/packet/Chat.cc	(revision 2111)
+++ code/branches/objecthierarchy/src/network/packet/Chat.cc	(revision 2112)
@@ -31,5 +31,5 @@
 #include "network/Host.h"
 
-namespace network {
+namespace orxonox {
 namespace packet {
   
@@ -77,3 +77,3 @@
 
 } //namespace packet
-} //namespace network
+} //namespace orxonox
Index: code/branches/objecthierarchy/src/network/packet/Chat.h
===================================================================
--- code/branches/objecthierarchy/src/network/packet/Chat.h	(revision 2111)
+++ code/branches/objecthierarchy/src/network/packet/Chat.h	(revision 2112)
@@ -10,5 +10,5 @@
 #include "Packet.h"
 
-namespace network {
+namespace orxonox {
 namespace packet {
 /**
@@ -33,5 +33,5 @@
 
 } //namespace packet
-} //namespace network
+} //namespace orxonox
 
 #endif
Index: code/branches/objecthierarchy/src/network/packet/ClassID.cc
===================================================================
--- code/branches/objecthierarchy/src/network/packet/ClassID.cc	(revision 2111)
+++ code/branches/objecthierarchy/src/network/packet/ClassID.cc	(revision 2112)
@@ -34,5 +34,5 @@
 #include <assert.h>
 
-namespace network {
+namespace orxonox {
 namespace packet {
 
@@ -68,10 +68,10 @@
 
 unsigned int ClassID::getSize() const{
-  return sizeof(network::packet::ENUM::Type) + 2*sizeof(uint32_t) + classNameLength_;
+  return sizeof(packet::ENUM::Type) + 2*sizeof(uint32_t) + classNameLength_;
 }
 
 bool ClassID::process(){
   COUT(3) << "processing classid: " << getClassID() << " name: " << (const char*)(data_+_CLASSNAME) << std::endl;
-  orxonox::Identifier *id=ClassByID( std::string((const char*)(data_+_CLASSNAME) ));
+  Identifier *id=ClassByID( std::string((const char*)(data_+_CLASSNAME) ));
   if(id==NULL)
     return false;
@@ -86,3 +86,3 @@
 
 } //namespace packet
-}//namespace network
+}//namespace orxonox
Index: code/branches/objecthierarchy/src/network/packet/ClassID.h
===================================================================
--- code/branches/objecthierarchy/src/network/packet/ClassID.h	(revision 2111)
+++ code/branches/objecthierarchy/src/network/packet/ClassID.h	(revision 2112)
@@ -35,5 +35,5 @@
 #include "Packet.h"
 
-namespace network {
+namespace orxonox {
 namespace packet {
 
@@ -59,5 +59,5 @@
 
 } //namespace packet
-} //namespace network
+} //namespace orxonox
 
 #endif
Index: code/branches/objecthierarchy/src/network/packet/DeleteObjects.cc
===================================================================
--- code/branches/objecthierarchy/src/network/packet/DeleteObjects.cc	(revision 2111)
+++ code/branches/objecthierarchy/src/network/packet/DeleteObjects.cc	(revision 2112)
@@ -34,5 +34,5 @@
 #include <assert.h>
 
-namespace network {
+namespace orxonox {
 namespace packet {
 
@@ -95,3 +95,3 @@
 
 } //namespace packet
-} //namespace network
+} //namespace orxonox
Index: code/branches/objecthierarchy/src/network/packet/DeleteObjects.h
===================================================================
--- code/branches/objecthierarchy/src/network/packet/DeleteObjects.h	(revision 2111)
+++ code/branches/objecthierarchy/src/network/packet/DeleteObjects.h	(revision 2112)
@@ -34,5 +34,5 @@
 
 
-namespace network {
+namespace orxonox {
 namespace packet {
 /**
@@ -55,5 +55,5 @@
 
 } //namespace packet
-} //namespace network
+} //namespace orxonox
 
 #endif
Index: code/branches/objecthierarchy/src/network/packet/Gamestate.cc
===================================================================
--- code/branches/objecthierarchy/src/network/packet/Gamestate.cc	(revision 2111)
+++ code/branches/objecthierarchy/src/network/packet/Gamestate.cc	(revision 2112)
@@ -38,5 +38,5 @@
 
 
-namespace network {
+namespace orxonox {
 
 namespace packet {
@@ -93,6 +93,6 @@
   uint8_t *mem=data_;
   mem+=sizeof(GamestateHeader);
-  orxonox::ObjectList<Synchronisable>::iterator it;
-  for(it = orxonox::ObjectList<Synchronisable>::begin(); it; ++it){
+  ObjectList<Synchronisable>::iterator it;
+  for(it = ObjectList<Synchronisable>::begin(); it; ++it){
     tempsize=it->getSize(id, mode);
 
@@ -100,5 +100,5 @@
       // start allocate additional memory
       COUT(3) << "G.St.Man: need additional memory" << std::endl;
-      orxonox::ObjectList<Synchronisable>::iterator temp = it;
+      ObjectList<Synchronisable>::iterator temp = it;
       int addsize=tempsize;
       while(++temp)
@@ -147,5 +147,5 @@
   uint8_t *mem=data_+sizeof(GamestateHeader);
     // get the start of the Synchronisable list
-  //orxonox::ObjectList<Synchronisable>::iterator it=orxonox::ObjectList<Synchronisable>::begin();
+  //ObjectList<Synchronisable>::iterator it=ObjectList<Synchronisable>::begin();
   Synchronisable *s;
 
@@ -244,5 +244,5 @@
   //copy and modify header
 #ifndef NDEBUG
-  HEADER->crc32 = orxonox::calcCRC(data_+sizeof(GamestateHeader), HEADER->datasize);
+  HEADER->crc32 = calcCRC(data_+sizeof(GamestateHeader), HEADER->datasize);
 #endif
   *GAMESTATE_HEADER(ndata) = *HEADER;
@@ -281,5 +281,5 @@
   }
 #ifndef NDEBUG
-  assert(HEADER->crc32==orxonox::calcCRC(ndata+sizeof(GamestateHeader), HEADER->datasize));
+  assert(HEADER->crc32==calcCRC(ndata+sizeof(GamestateHeader), HEADER->datasize));
 #endif
 
@@ -569,7 +569,7 @@
   int size=0;
     // get the start of the Synchronisable list
-  orxonox::ObjectList<Synchronisable>::iterator it;
+  ObjectList<Synchronisable>::iterator it;
     // get total size of gamestate
-  for(it = orxonox::ObjectList<Synchronisable>::begin(); it; ++it)
+  for(it = ObjectList<Synchronisable>::begin(); it; ++it)
     size+=it->getSize(id, mode); // size of the actual data of the synchronisable
 //  size+=sizeof(GamestateHeader);
@@ -582,6 +582,6 @@
  * @return iterator pointing to the next object in the list
  */
-  void Gamestate::removeObject(orxonox::ObjectList<Synchronisable>::iterator &it) {
-    orxonox::ObjectList<Synchronisable>::iterator temp=it;
+  void Gamestate::removeObject(ObjectList<Synchronisable>::iterator &it) {
+    ObjectList<Synchronisable>::iterator temp=it;
     ++it;
     delete  *temp;
Index: code/branches/objecthierarchy/src/network/packet/Gamestate.h
===================================================================
--- code/branches/objecthierarchy/src/network/packet/Gamestate.h	(revision 2111)
+++ code/branches/objecthierarchy/src/network/packet/Gamestate.h	(revision 2112)
@@ -40,5 +40,5 @@
 #endif
 
-namespace network {
+namespace orxonox {
 
 namespace packet {
@@ -91,5 +91,5 @@
   private:
     unsigned int calcGamestateSize(unsigned int id, int mode=0x0);
-    void removeObject(orxonox::ObjectListIterator<Synchronisable> &it);
+    void removeObject(ObjectListIterator<Synchronisable> &it);
     std::map<unsigned int, Synchronisable*> dataMap_;
 };
Index: code/branches/objecthierarchy/src/network/packet/Packet.cc
===================================================================
--- code/branches/objecthierarchy/src/network/packet/Packet.cc	(revision 2111)
+++ code/branches/objecthierarchy/src/network/packet/Packet.cc	(revision 2112)
@@ -46,5 +46,5 @@
 #include "core/CoreIncludes.h"
 
-namespace network{
+namespace orxonox{
 
 namespace packet{
@@ -153,5 +153,5 @@
 //  ENetPacket *temp = enetPacket_;
 //  enetPacket_ = 0; // otherwise we have a double free because enet already handles the deallocation of the packet
-  network::Host::addPacket( enetPacket_, clientID_);
+  Host::addPacket( enetPacket_, clientID_);
   return true;
 }
@@ -219,4 +219,4 @@
 } // namespace packet
 
-} // namespace network
-
+} // namespace orxonox
+
Index: code/branches/objecthierarchy/src/network/packet/Packet.h
===================================================================
--- code/branches/objecthierarchy/src/network/packet/Packet.h	(revision 2111)
+++ code/branches/objecthierarchy/src/network/packet/Packet.h	(revision 2112)
@@ -36,5 +36,5 @@
 #include "util/Integers.h"
 
-namespace network {
+namespace orxonox {
 
 namespace packet{
@@ -98,5 +98,5 @@
 } //namespace packet
 
-} //namespace network
+} //namespace orxonox
 
 #endif
Index: code/branches/objecthierarchy/src/network/packet/Welcome.cc
===================================================================
--- code/branches/objecthierarchy/src/network/packet/Welcome.cc	(revision 2111)
+++ code/branches/objecthierarchy/src/network/packet/Welcome.cc	(revision 2112)
@@ -36,5 +36,5 @@
 #include <assert.h>
 
-namespace network {
+namespace orxonox {
 namespace packet {
 
@@ -70,5 +70,5 @@
 
 unsigned int Welcome::getSize() const{
-  return sizeof(network::packet::ENUM::Type) + 2*sizeof(uint32_t);
+  return sizeof(packet::ENUM::Type) + 2*sizeof(uint32_t);
 }
 
@@ -87,3 +87,3 @@
 
 } //namespace packet
-}//namespace network
+}//namespace orxonox
Index: code/branches/objecthierarchy/src/network/packet/Welcome.h
===================================================================
--- code/branches/objecthierarchy/src/network/packet/Welcome.h	(revision 2111)
+++ code/branches/objecthierarchy/src/network/packet/Welcome.h	(revision 2112)
@@ -33,5 +33,5 @@
 #include "Packet.h"
 
-namespace network {
+namespace orxonox {
 namespace packet {
 
@@ -54,5 +54,5 @@
 
 } //namespace packet
-} //namespace network
+} //namespace orxonox
 
 #endif
