diff --git a/Examples/DVBAdapter/MPEdec.cc b/Examples/DVBAdapter/MPEdec.cc
index a0b6a3a33897656218972d74957f04a7ae47cef6..107fd64716169b204cf0279daad42ca7de287254 100644
--- a/Examples/DVBAdapter/MPEdec.cc
+++ b/Examples/DVBAdapter/MPEdec.cc
@@ -1,9 +1,9 @@
// $Id$
//
-// Copyright (C) 2006
+// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/Examples/DVBAdapter/ULEdec.cc b/Examples/DVBAdapter/ULEdec.cc
index 695037fef4632ef57cafd4728a4dc857363759db..c00e607f171091ad6e1f70d11b8afc3e2e4e8fdf 100644
--- a/Examples/DVBAdapter/ULEdec.cc
+++ b/Examples/DVBAdapter/ULEdec.cc
@@ -1,9 +1,9 @@
// $Id$
//
-// Copyright (C) 2006
+// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/Examples/DVBAdapter/ULEdec.hh b/Examples/DVBAdapter/ULEdec.hh
index 03ab0fc901d74ab6f16cab7a592f82bee6b8baba..df61af833e2c55a74a373ce40d58acb0001668de 100644
--- a/Examples/DVBAdapter/ULEdec.hh
+++ b/Examples/DVBAdapter/ULEdec.hh
@@ -3,7 +3,7 @@
// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/Examples/DVBAdapter/frontend.cc b/Examples/DVBAdapter/frontend.cc
index d805bb4e1d41d3ffa58e051d2aa8164940d70e94..300a7fbb6aba105b4748b89ae8656f8e437bc065 100644
--- a/Examples/DVBAdapter/frontend.cc
+++ b/Examples/DVBAdapter/frontend.cc
@@ -1,9 +1,9 @@
// $Id$
//
-// Copyright (C) 2006
+// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/Examples/MCSniffer/MCSniffer.cc b/Examples/MCSniffer/MCSniffer.cc
index fd288d2edf7ac3fcac7a5f4875c8bde56fd8a420..71913ac27d8e93d1856395edf0731764d42c6128 100644
--- a/Examples/MCSniffer/MCSniffer.cc
+++ b/Examples/MCSniffer/MCSniffer.cc
@@ -3,6 +3,7 @@
// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/Examples/TCPClientServer/client.cc b/Examples/TCPClientServer/client.cc
index 0323d9498ff3840e646b42cfcabff032f77eeeb4..219c91a0a95e76e7622f21fce4e7b6928a481546 100644
--- a/Examples/TCPClientServer/client.cc
+++ b/Examples/TCPClientServer/client.cc
@@ -3,6 +3,7 @@
// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/Examples/TCPClientServer/server.cc b/Examples/TCPClientServer/server.cc
index 54a2040c6f75f1ec4678fcb1d9fd67aae30a0c8c..376c8ddb35fc41cd167ad39ea41394d79b1c3836 100644
--- a/Examples/TCPClientServer/server.cc
+++ b/Examples/TCPClientServer/server.cc
@@ -3,6 +3,7 @@
// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/Packets/MPEGDVBBundle/DSMCCSection.cc b/Packets/MPEGDVBBundle/DSMCCSection.cc
index b6092bb9c0d30ee78476678a38b534a9443b4125..8c4e48806131f1a62e182c6c00c128c2216644c7 100644
--- a/Packets/MPEGDVBBundle/DSMCCSection.cc
+++ b/Packets/MPEGDVBBundle/DSMCCSection.cc
@@ -3,7 +3,7 @@
// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@ prefix_ void senf::DSMCCSectionType::dump(packet p, std::ostream & os)
<< std::hex
<< " table_id: 0x" << unsigned(p->table_id()) << "\n"
<< " section_syntax_indicator: " << p->ssi() << "\n"
- << " private_indicator: " << p->pi() << "\n"
+ << " private_indicator: " << p->private_indicator() << "\n"
<< " reserved_1: " << p->reserved_1() << "\n"
<< std::dec
<< " section_length: " << p->sec_length() << "\n"
diff --git a/Packets/MPEGDVBBundle/DSMCCSection.hh b/Packets/MPEGDVBBundle/DSMCCSection.hh
index e53d068fa0757db4de829e5debdb80a763ff18c5..b0eccc139df0df5fff59d8bf53d73d0aee548851 100644
--- a/Packets/MPEGDVBBundle/DSMCCSection.hh
+++ b/Packets/MPEGDVBBundle/DSMCCSection.hh
@@ -3,7 +3,7 @@
// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -61,7 +61,7 @@ namespace senf {
SENF_PACKET_PARSER_DEFINE_FIXED_FIELDS(
((Field ) ( table_id, Parse_table_id ))
((OverlayField) ( ssi, Parse_ssi ))
- ((OverlayField) ( pi, Parse_pi ))
+ ((OverlayField) ( private_indicator, Parse_pi ))
((OverlayField) ( reserved_1, Parse_reserved_1 ))
((Field ) ( sec_length, Parse_sec_length ))
((Field ) ( tabel_id_extension, Parse_UInt16 ))
diff --git a/Packets/MPEGDVBBundle/DatagramSection.cc b/Packets/MPEGDVBBundle/DatagramSection.cc
index 6df71f769f421cd6b99f22a89785988e2fdc4409..a03c96aec5f2c61e09fee4f844f203d8664515ba 100644
--- a/Packets/MPEGDVBBundle/DatagramSection.cc
+++ b/Packets/MPEGDVBBundle/DatagramSection.cc
@@ -3,7 +3,7 @@
// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@ prefix_ void senf::DatagramSectionType::dump(packet p, std::ostream & os)
<< std::hex
<< " table_id: 0x" << unsigned(p->table_id()) << "\n"
<< " section_syntax_indicator: " << p->ssi() << "\n"
- << " private_indicator: " << p->pi() << "\n"
+ << " private_indicator: " << p->private_indicator() << "\n"
<< " reserved_1: " << p->reserved_1() << "\n"
<< std::dec
<< " section_length: " << p->sec_length() << "\n"
diff --git a/Packets/MPEGDVBBundle/DatagramSection.hh b/Packets/MPEGDVBBundle/DatagramSection.hh
index 5168f4cc761b3b0457294cb19e7acd32de779a28..3e4e35555efeff9c3934666392fd8a1996eca078 100644
--- a/Packets/MPEGDVBBundle/DatagramSection.hh
+++ b/Packets/MPEGDVBBundle/DatagramSection.hh
@@ -3,7 +3,7 @@
// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/Packets/MPEGDVBBundle/MPEGDVBBundle.dox b/Packets/MPEGDVBBundle/MPEGDVBBundle.dox
index 9a5a80559f75d9f44f1c836172430821e93881fb..8638b3bac1bc75855444b5e17df8cf7260d88a80 100644
--- a/Packets/MPEGDVBBundle/MPEGDVBBundle.dox
+++ b/Packets/MPEGDVBBundle/MPEGDVBBundle.dox
@@ -1,7 +1,7 @@
// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <g0dil@berlios.de>
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/Packets/MPEGDVBBundle/SNDUPacket.cc b/Packets/MPEGDVBBundle/SNDUPacket.cc
index 39784e93acd8e92382a566c3aa59e0326fa07e75..582a2d42077c46cff3d3ca8e60e29fc604b95015 100644
--- a/Packets/MPEGDVBBundle/SNDUPacket.cc
+++ b/Packets/MPEGDVBBundle/SNDUPacket.cc
@@ -3,7 +3,7 @@
// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/Packets/MPEGDVBBundle/SNDUPacket.hh b/Packets/MPEGDVBBundle/SNDUPacket.hh
index d2a00fa15c934106eef4792cd3e412638b4a71a5..540927276b887f319c8215fad380b2445a75e324 100644
--- a/Packets/MPEGDVBBundle/SNDUPacket.hh
+++ b/Packets/MPEGDVBBundle/SNDUPacket.hh
@@ -3,7 +3,7 @@
// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/Packets/MPEGDVBBundle/TransportPacket.cc b/Packets/MPEGDVBBundle/TransportPacket.cc
index 3f12c75f84f887aa36eebde92dd1f75739f936fc..fd7a9e678a93f6d603dc79f025cf5acf6d7430fb 100644
--- a/Packets/MPEGDVBBundle/TransportPacket.cc
+++ b/Packets/MPEGDVBBundle/TransportPacket.cc
@@ -3,7 +3,7 @@
// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/Packets/MPEGDVBBundle/TransportPacket.hh b/Packets/MPEGDVBBundle/TransportPacket.hh
index eecb10319851f2e1595bf063ccbd92383275a957..323ff78ab65f29031c67a78cad390101fd89c558 100644
--- a/Packets/MPEGDVBBundle/TransportPacket.hh
+++ b/Packets/MPEGDVBBundle/TransportPacket.hh
@@ -3,7 +3,7 @@
// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/Packets/MPEGDVBBundle/TransportPacket.test.cc b/Packets/MPEGDVBBundle/TransportPacket.test.cc
index ee98b3c1b8d58ae54c3fca808064c5feca417351..e2e09effff82c5e8d82b2abf1e3bd8cfb545f250 100644
--- a/Packets/MPEGDVBBundle/TransportPacket.test.cc
+++ b/Packets/MPEGDVBBundle/TransportPacket.test.cc
@@ -3,7 +3,7 @@
// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/Packets/MPEGDVBBundle/main.test.cc b/Packets/MPEGDVBBundle/main.test.cc
index b7958bfb6603eff87dcb5527bef32e5008563639..c784c25f47156d4aa82b4cc5e8990a2820335808 100644
--- a/Packets/MPEGDVBBundle/main.test.cc
+++ b/Packets/MPEGDVBBundle/main.test.cc
@@ -3,7 +3,7 @@
// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/Packets/ParseVec.test.cc b/Packets/ParseVec.test.cc
index 078626c2d6a4b03967de3f344327d3a24ccc3e2f..64e68e6e0366aaea75edf9974a63b5635ed3fbee 100644
--- a/Packets/ParseVec.test.cc
+++ b/Packets/ParseVec.test.cc
@@ -68,7 +68,7 @@ BOOST_AUTO_UNIT_TEST(parseVec)
BOOST_CHECK_EQUAL(std::distance(b,e), Parse_UInt16Vec::difference_type(v.size()));
}
- // Warning: Each of the followingoperations invalidate the parser -> we need to recreate it at
+ // Warning: Each of the following operations invalidate the parser -> we need to recreate it at
// each step
// And since all these members directly call the corresponding members in the container wrapper,
diff --git a/Socket/Protocols/DVB/DVBDemuxHandles.cc b/Socket/Protocols/DVB/DVBDemuxHandles.cc
index 5ca2de0962f3ee40caba305968906e74a70dfc98..b0e83ab2397e32e75b62f5738eae2789fa9ff075 100644
--- a/Socket/Protocols/DVB/DVBDemuxHandles.cc
+++ b/Socket/Protocols/DVB/DVBDemuxHandles.cc
@@ -3,7 +3,7 @@
// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/Socket/Protocols/DVB/DVBDemuxHandles.hh b/Socket/Protocols/DVB/DVBDemuxHandles.hh
index 341bf0b72d8fe6c6c0a7824663ba41741c4e4af9..fcef798dd1f9e84b35b54c1119f79b43e6c5d44a 100644
--- a/Socket/Protocols/DVB/DVBDemuxHandles.hh
+++ b/Socket/Protocols/DVB/DVBDemuxHandles.hh
@@ -3,7 +3,7 @@
// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/Socket/Protocols/DVB/DVBDemuxProtocol.cc b/Socket/Protocols/DVB/DVBDemuxProtocol.cc
index a0eedefae2e0d0b3fb1f2e5cc1321ff62582d088..0e9847f50a8349e0fb20888ba60141a79b19eaa0 100644
--- a/Socket/Protocols/DVB/DVBDemuxProtocol.cc
+++ b/Socket/Protocols/DVB/DVBDemuxProtocol.cc
@@ -3,7 +3,7 @@
// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/Socket/Protocols/DVB/DVBDemuxProtocol.hh b/Socket/Protocols/DVB/DVBDemuxProtocol.hh
index 2db7ccbeab12af8eb9e2c8b1abf3d0616d9a8dab..56f510acb2f58e38a14e1cfec2184e085d3ec3e4 100644
--- a/Socket/Protocols/DVB/DVBDemuxProtocol.hh
+++ b/Socket/Protocols/DVB/DVBDemuxProtocol.hh
@@ -3,7 +3,7 @@
// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/Socket/Protocols/DVB/DVBFrontendHandle.cc b/Socket/Protocols/DVB/DVBFrontendHandle.cc
index eda5a1b3f34b5783df1d6079e1133d6d0577c530..2a8755995b2a77d9e25ddef32214c9ea115a1678 100644
--- a/Socket/Protocols/DVB/DVBFrontendHandle.cc
+++ b/Socket/Protocols/DVB/DVBFrontendHandle.cc
@@ -3,7 +3,7 @@
// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/Socket/Protocols/DVB/DVBFrontendHandle.hh b/Socket/Protocols/DVB/DVBFrontendHandle.hh
index 3e9dc8cc55f24abc2ac6a7b2b10efa5692838883..fcc02cf45624b6beb24c7c20eed3e2610f820401 100644
--- a/Socket/Protocols/DVB/DVBFrontendHandle.hh
+++ b/Socket/Protocols/DVB/DVBFrontendHandle.hh
@@ -3,7 +3,7 @@
// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by