diff --git a/Examples/DVBdec/MPEdec.cc b/Examples/DVBdec/MPEdec.cc
index 278cb750cccfebcd63d4aa34f03d675d7b2f9653..372e7bebf5e9a3e93404fc3314a25801611365c5 100644
--- a/Examples/DVBdec/MPEdec.cc
+++ b/Examples/DVBdec/MPEdec.cc
@@ -31,7 +31,7 @@
 
 #include "Scheduler/Scheduler.hh"
 #include "Packets/DefaultBundle/EthernetPacket.hh"
-#include "Packets/MPEG_DVBBundle/DatagramSection.hh"
+#include "Packets/MPEGDVBBundle/DatagramSection.hh"
 #include "Utils/membind.hh"
 #include "Socket/DVBDemuxHandles.hh"
 #include "Packets/ParseInt.hh"
diff --git a/Examples/DVBdec/SConscript b/Examples/DVBdec/SConscript
index 5f69e844206a179636ad306f83c0e1f030c133eb..f18f7dd02957bb215cd135e206312c32e8b0dd52 100644
--- a/Examples/DVBdec/SConscript
+++ b/Examples/DVBdec/SConscript
@@ -5,8 +5,8 @@ import SENFSCons
 
 SENFSCons.Binary(env, 'uledec', 'ULEdec.cc',
                  LIBS = [ 'Scheduler', 'Packets', 'Socket', 'Utils' ],
-                 OBJECTS = [ '#/Packets/MPEG_DVBBundle/MPEG_DVBBundle.o' ]);
+                 OBJECTS = [ '#/Packets/MPEGDVBBundle/MPEGDVBBundle.o' ]);
 
 SENFSCons.Binary(env, 'mpedec', 'MPEdec.cc',
                  LIBS = [ 'Scheduler', 'Packets', 'Socket', 'Utils' ],
-                 OBJECTS = [ '#/Packets/MPEG_DVBBundle/MPEG_DVBBundle.o' ]);
+                 OBJECTS = [ '#/Packets/MPEGDVBBundle/MPEGDVBBundle.o' ]);
diff --git a/Examples/DVBdec/ULEdec.cc b/Examples/DVBdec/ULEdec.cc
index 6c23a568034a31322f9cbb1a4fe07da92c7cd25a..b41c3a859182d52c7a81c98c2dc2f4fa9ab67079 100644
--- a/Examples/DVBdec/ULEdec.cc
+++ b/Examples/DVBdec/ULEdec.cc
@@ -31,7 +31,7 @@
 
 #include "Scheduler/Scheduler.hh"
 #include "Packets/DefaultBundle/EthernetPacket.hh"
-#include "Packets/MPEG_DVBBundle/DatagramSection.hh"
+#include "Packets/MPEGDVBBundle/DatagramSection.hh"
 #include "Utils/membind.hh"
 #include "Socket/DVBDemuxHandles.hh"
 #include "Packets/ParseInt.hh"
diff --git a/Packets/MPEG_DVBBundle/DSMCCSection.cc b/Packets/MPEGDVBBundle/DSMCCSection.cc
similarity index 97%
rename from Packets/MPEG_DVBBundle/DSMCCSection.cc
rename to Packets/MPEGDVBBundle/DSMCCSection.cc
index e3e333edcc19fe32f568c3980f42c860a36d7136..f34ed9182c566727e40218e7e7a5cd5abb8a5654 100644
--- a/Packets/MPEG_DVBBundle/DSMCCSection.cc
+++ b/Packets/MPEGDVBBundle/DSMCCSection.cc
@@ -60,12 +60,12 @@ prefix_ void senf::DSMCCSectionType::dump(packet p, std::ostream & os)
 
 prefix_ senf::PacketParserBase::size_type senf::DSMCCSectionType::initSize()
 {
-    return initHeadSize() + 32/8;
+    return parser::fixed_bytes + 32/8;
 }
 
 prefix_ senf::PacketParserBase::size_type senf::DSMCCSectionType::initHeadSize()
 {
-    return (8+1+1+2+12+16+2+5+1+8+8) / 8;
+    return parser::fixed_bytes;
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////
diff --git a/Packets/MPEG_DVBBundle/DSMCCSection.hh b/Packets/MPEGDVBBundle/DSMCCSection.hh
similarity index 100%
rename from Packets/MPEG_DVBBundle/DSMCCSection.hh
rename to Packets/MPEGDVBBundle/DSMCCSection.hh
diff --git a/Packets/MPEG_DVBBundle/DatagramSection.cc b/Packets/MPEGDVBBundle/DatagramSection.cc
similarity index 97%
rename from Packets/MPEG_DVBBundle/DatagramSection.cc
rename to Packets/MPEGDVBBundle/DatagramSection.cc
index d46ab2b1af7d3896d38961d8da74b6c2845d9920..d25f515bf1d8e15e3b2843280ff247b698566345 100644
--- a/Packets/MPEG_DVBBundle/DatagramSection.cc
+++ b/Packets/MPEGDVBBundle/DatagramSection.cc
@@ -67,12 +67,12 @@ prefix_ void senf::DatagramSectionType::dump(packet p, std::ostream & os)
 
 prefix_ senf::PacketParserBase::size_type senf::DatagramSectionType::initSize()
 {
-    return initHeadSize() + 32/8;
+    return parser::fixed_bytes + 32/8;
 }
 
 prefix_ senf::PacketParserBase::size_type senf::DatagramSectionType::initHeadSize()
 {
-    return (8+1+1+2+12+8+8+2+2+2+1+1+8+8+8+8+8+8) / 8;
+    return parser::fixed_bytes;
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////
diff --git a/Packets/MPEG_DVBBundle/DatagramSection.hh b/Packets/MPEGDVBBundle/DatagramSection.hh
similarity index 98%
rename from Packets/MPEG_DVBBundle/DatagramSection.hh
rename to Packets/MPEGDVBBundle/DatagramSection.hh
index d9d5b4fb1ee6be5f1ce4fb7343231a65aa72ba67..70227093b8bd2c41a7a41662b3c92f84d10a61e4 100644
--- a/Packets/MPEG_DVBBundle/DatagramSection.hh
+++ b/Packets/MPEGDVBBundle/DatagramSection.hh
@@ -29,7 +29,7 @@
 #include "Packets/ParseInt.hh"
 #include "Packets/PacketRegistry.hh"
 #include "Packets/PacketParser.hh"
-#include "Packets/MPEG_DVBBundle/DSMCCSection.hh"
+#include "Packets/MPEGDVBBundle/DSMCCSection.hh"
 
 
 //#include "DatagramSection.mpp"
diff --git a/Packets/MPEG_DVBBundle/Doxyfile b/Packets/MPEGDVBBundle/Doxyfile
similarity index 65%
rename from Packets/MPEG_DVBBundle/Doxyfile
rename to Packets/MPEGDVBBundle/Doxyfile
index 17270267a2e6204dbf65346c642b4d232d6f8144..9e3a960338d0021659a300d5e57ec1b07057bffa 100644
--- a/Packets/MPEG_DVBBundle/Doxyfile
+++ b/Packets/MPEGDVBBundle/Doxyfile
@@ -1,6 +1,6 @@
 @INCLUDE         = "$(TOPDIR)/doclib/Doxyfile.global"
 
-PROJECT_NAME     = libPackets/MPEG_DVBBundle
+PROJECT_NAME     = libPackets/MPEGDVBBundle
 TAGFILES         = "$(TOPDIR)/Utils/doc/Utils.tag" "$(TOPDIR)/Packets/doc/Packets.tag"
-GENERATE_TAGFILE = doc/MPEG_DVBBundle.tag
+GENERATE_TAGFILE = doc/MPEGDVBBundle.tag
 INPUT            = .
diff --git a/Packets/MPEG_DVBBundle/SConscript b/Packets/MPEGDVBBundle/SConscript
similarity index 70%
rename from Packets/MPEG_DVBBundle/SConscript
rename to Packets/MPEGDVBBundle/SConscript
index 57d258dbcc86d64646013cb26f54bc0c2c624375..5d94e25ef3022422f2dc944ac73dffb4546c4748 100644
--- a/Packets/MPEG_DVBBundle/SConscript
+++ b/Packets/MPEGDVBBundle/SConscript
@@ -9,9 +9,9 @@ sources = SENFSCons.GlobSources()
 
 SENFSCons.StandardTargets(env)
 
-SENFSCons.Object(env, target = 'MPEG_DVBBundle', sources=sources,
+SENFSCons.Object(env, target = 'MPEGDVBBundle', sources=sources,
                  LIBS = ['Packets', 'Socket', 'Utils'])
-SENFSCons.Lib(env, library = 'Packets_MPEG_DVBBundle', sources = sources[0],
+SENFSCons.Lib(env, library = 'Packets_MPEGDVBBundle', sources = sources[0],
               LIBS = ['Packets', 'Socket', 'Utils'])
                  
 SENFSCons.Doxygen(env)