diff --git a/Examples/RateStuffer/Mainpage.dox b/Examples/RateStuffer/Mainpage.dox
index c17c9b4c80836522edbcdb6d62b17e80e0e39559..9f02568bb53b3ec8f70b33b147b949a74a8720ad 100644
--- a/Examples/RateStuffer/Mainpage.dox
+++ b/Examples/RateStuffer/Mainpage.dox
@@ -63,7 +63,7 @@
     \image html ratestuffer.png
 
     Above image depicts the module setup implementing the rate stuffer. A
-    senf::ppi::module::ActiveSocketReader reads the incoming UDP packets and sends them into a
+    senf::ppi::module::ActiveSocketSource reads the incoming UDP packets and sends them into a
     senf::ppi::module::PassiveQueue (via a senf::ppi::module::ThrottleBarrier).
 
     The \a queue feeds the packets into a senf::ppi::module::PriorityJoin. The CloneSource
diff --git a/PPI/Mainpage.dox b/PPI/Mainpage.dox
index 72b5f4b8c800f4f87b14ba89d37ca8ea3e04e04a..2491f501ada326031939215adb0743e7bbb5fa83 100644
--- a/PPI/Mainpage.dox
+++ b/PPI/Mainpage.dox
@@ -227,10 +227,10 @@
       CopyPacketGenerator generator (stuffingPacket);
 
       senf::UDPv4ClientSocketHandle inputSocket (1111);
-      senf::ppi::module::ActiveSocketReader udpInput (inputSocket);
+      senf::ppi::module::ActiveSocketSource<> udpInput (inputSocket);
 
       senf::UDPv4ClientSocketHandle outputSocket ("2.3.4.5:2222");
-      senf::ppi::module::PassiveSocketWriter udpOutput (outputSocket);
+      senf::ppi::module::PassiveSocketSink<> udpOutput (outputSocket);
 
       senf::ppi::module::PassiveQueue adaptor;
 
diff --git a/Packets/MPEGDVBBundle/TransportPacket.hh b/Packets/MPEGDVBBundle/TransportPacket.hh
index ead0347dd48e4292cdb0e6254af8a562db46ed40..6e9caa2ee95eecd12fba77cc1d19f5a1b48dc0ca 100644
--- a/Packets/MPEGDVBBundle/TransportPacket.hh
+++ b/Packets/MPEGDVBBundle/TransportPacket.hh
@@ -45,15 +45,15 @@ namespace senf {
     {
 #       include SENF_FIXED_PARSER()
 
-        SENF_PARSER_FIELD    ( sync_byte                 , UInt8Parser   );
-        
-        SENF_PARSER_BITFIELD ( transport_error_indicator ,  1 , bool     );
-        SENF_PARSER_BITFIELD ( pusi                      ,  1 , bool     );
-        SENF_PARSER_BITFIELD ( transport_priority        ,  1 , bool     );
-        SENF_PARSER_BITFIELD ( pid                       , 13 , unsigned );
-        SENF_PARSER_BITFIELD ( transport_scrmbl_ctrl     ,  2 , unsigned );
-        SENF_PARSER_BITFIELD ( adaptation_field_ctrl     ,  2 , unsigned );
-        SENF_PARSER_BITFIELD ( continuity_counter        ,  4 , unsigned );
+        SENF_PARSER_FIELD    ( sync_byte,                  UInt8Parser  );
+
+        SENF_PARSER_BITFIELD ( transport_error_indicator,   1, bool     );
+        SENF_PARSER_BITFIELD ( pusi,                        1, bool     );
+        SENF_PARSER_BITFIELD ( transport_priority,          1, bool     );
+        SENF_PARSER_BITFIELD ( pid,                        13, unsigned );
+        SENF_PARSER_BITFIELD ( transport_scrmbl_ctrl,       2, unsigned );
+        SENF_PARSER_BITFIELD ( adaptation_field_ctrl,       2, unsigned );
+        SENF_PARSER_BITFIELD ( continuity_counter,          4, unsigned );
 
         SENF_PARSER_FINALIZE( TransportPacketParser );
     
diff --git a/Socket/Protocols/INet/MulticastProtocol.hh b/Socket/Protocols/INet/MulticastProtocol.hh
index 1d3d0f66a6034aec4fe3db02e62d65cf7f7d7317..3ce6347eaeca5ca225e48944b4f6f4f3c33827f4 100644
--- a/Socket/Protocols/INet/MulticastProtocol.hh
+++ b/Socket/Protocols/INet/MulticastProtocol.hh
@@ -119,8 +119,7 @@ namespace senf {
                                              multicast groups received. The group is left from the
                                              interface with the given local address.
                                              \param[in] mcAddr address of group to leave
-                                             \param[in] localAddr address of interface to leave
-                                                 from */
+                                             \param[in] iface interface name */
     };
 
     class INet6MulticastProtocol
diff --git a/Utils/Logger/Config.hh b/Utils/Logger/Config.hh
index 9387444830c2f60d463f6f7120bb8a59028d7c28..6c1ae63b65525818a17931910b423de26b9e2af2 100644
--- a/Utils/Logger/Config.hh
+++ b/Utils/Logger/Config.hh
@@ -46,7 +46,7 @@
     <em>Runtime</em> configuration on the other hand deals with routing all those messages, which
     are enabled at compile time to the logging targets. If a message is not routed, it will be
     discarded. This allows to additionally disable messages at run-time. Message routing is managed
-    via the \ref Target interface.
+    via the \ref Targets interface.
 
     \section config_compile Compile time configuration
 
diff --git a/Utils/Logger/Definitions.hh b/Utils/Logger/Definitions.hh
index 0c0fb3359a6b59d1fbe65458e5b89d13ac0ffea3..24c32f7d87ac0dec41f312c6bd7cedd83145fd53 100644
--- a/Utils/Logger/Definitions.hh
+++ b/Utils/Logger/Definitions.hh
@@ -110,7 +110,7 @@ namespace log {
     /** \brief Default global log stream */
     SENF_LOG_DEF_STREAM(Debug, MESSAGE, MESSAGE, MESSAGE);
 
-    /** \brief Default global log area */
+    /** \brief Default global %log area */
     SENF_LOG_DEF_AREA(DefaultArea);
 
     ///\}
diff --git a/Utils/Logger/FileTarget.hh b/Utils/Logger/FileTarget.hh
index 9bc933194a6a6916739d9dd8f64635ce80fab180..45f1bd0eca3a609d698470342fba00f2f63868a2 100644
--- a/Utils/Logger/FileTarget.hh
+++ b/Utils/Logger/FileTarget.hh
@@ -37,12 +37,12 @@
 namespace senf {
 namespace log {
 
-    /** \brief Log target writing to a log file.
+    /** \brief Log target writing to a %log file.
 
-        The FileTarget will save all log messages in the given file. Messages will be appended at
+        The FileTarget will save all %log messages in the given file. Messages will be appended at
         the end of the file.
 
-        After log files have been rotated, the reopen() member should be called to create a new log
+        After %log files have been rotated, the reopen() member should be called to create a new %log
         file.
 
         \ingroup targets
@@ -63,8 +63,8 @@ namespace log {
         ///@}
         ///////////////////////////////////////////////////////////////////////////
 
-        void reopen();                  ///< Reopen log after log-file rotation
-        void reopen(std::string file);  ///< Reopen log under a new name
+        void reopen();                  ///< Reopen %log after log-file rotation
+        void reopen(std::string file);  ///< Reopen %log under a new name
 
     private:
         std::string file_;
diff --git a/Utils/Logger/IOStreamTarget.hh b/Utils/Logger/IOStreamTarget.hh
index d091a375a2021a30220879ac9ae19bab9ab227ab..94e1258ffc305e371007da5c38a89b924cd4978d 100644
--- a/Utils/Logger/IOStreamTarget.hh
+++ b/Utils/Logger/IOStreamTarget.hh
@@ -37,9 +37,9 @@
 namespace senf {
 namespace log {
 
-    /** \brief Write log messages to arbitrary std::ostream
+    /** \brief Write %log messages to arbitrary std::ostream
 
-        This target will write log messages to an arbitrary std::ostream in the format
+        This target will write %log messages to an arbitrary std::ostream in the format
         <pre>
         <date> [<area>] <message>
         </pre>
diff --git a/Utils/Logger/StringTarget.hh b/Utils/Logger/StringTarget.hh
index cf8180807950bd3e457f8eba7987c94f5d7fbca6..c9591de5fcb9765de402e3c4908b6a094f7f640d 100644
--- a/Utils/Logger/StringTarget.hh
+++ b/Utils/Logger/StringTarget.hh
@@ -36,7 +36,7 @@
 namespace senf {
 namespace log {
   
-    /** \brief Store log messages in a string buffer
+    /** \brief Store %log messages in a string buffer
 
         This target is mostly useful for debug purposes. 
 
diff --git a/Utils/Logger/Target.hh b/Utils/Logger/Target.hh
index 74110c936512b92f001b67239bc111d0d005db25..d8ed8d18b68e7a1ea3be8b76b5428f14635acc95 100644
--- a/Utils/Logger/Target.hh
+++ b/Utils/Logger/Target.hh
@@ -56,7 +56,7 @@ namespace log {
 
     /** \brief Logging target base class
         
-        Targets are the final destination of log messages. Every message is eventually routed to one
+        Targets are the final destination of %log messages. Every message is eventually routed to one
         or several targets.
 
         \section target_routing Routing
@@ -383,7 +383,7 @@ namespace log {
                                                  simple logging over NFS or many other network
                                                  protocols.
 
-                                             \param[in] timestamp log message timing information
+                                             \param[in] timestamp %log message timing information
                                              \param[in] stream message stream
                                              \param[in] area message area
                                              \param[in] level message level
@@ -415,7 +415,7 @@ namespace log {
         virtual boost::posix_time::ptime operator()() const = 0;
     };
 
-    /** \brief Default log message time source
+    /** \brief Default %log message time source
 
         This time source is installed by default and uses gettimeofday() (via the Boost.DateTime
         library) to get the current universal time.