diff --git a/Socket/BSDSocketProtocol.cc b/Socket/BSDSocketProtocol.cc
index 117686133adb8acbc6bf2a0fda303c6831c28f14..f7df702b769bab560d00a53fd9d3f8f0ac0d6557 100644
--- a/Socket/BSDSocketProtocol.cc
+++ b/Socket/BSDSocketProtocol.cc
@@ -59,7 +59,7 @@ prefix_ void satcom::lib::BSDSocketProtocol::linger(bool enable, unsigned timeou
 prefix_ struct timeval satcom::lib::BSDSocketProtocol::timestamp()
     const
 {
-    // TODO: Check, why this fails with ENOFILE (!!!!) at least when
+    // BUG: Check, why this fails with ENOFILE (!!!!) at least when
     // called from a tcp socket. Further investigation necessary ...
     struct timeval tv;
     if (::ioctl(body().fd(), SIOCGSTAMP, &tv) < 0)
diff --git a/Socket/PacketSocketHandle.test.cc b/Socket/PacketSocketHandle.test.cc
index fb10346bf63b75a9802e5f835a84374971860c67..77ce526878efb533f224b4c469fa23cd114e3983 100644
--- a/Socket/PacketSocketHandle.test.cc
+++ b/Socket/PacketSocketHandle.test.cc
@@ -55,7 +55,7 @@ BOOST_AUTO_UNIT_TEST(packetSocketHandle)
 
         // How am I supposed to test read and write .. grmpf ..
         
-        // TODO: There are some failures here ... need to investigate
+        // BUG: There are some failures here ... need to investigate
         /*
         BOOST_CHECK_NO_THROW( sock.protocol().promisc(
                                   "lo",satcom::lib::PacketProtocol::Promiscuous) );
diff --git a/Socket/SocketProtocol.hh b/Socket/SocketProtocol.hh
index 4dbd95bd41361d989748cebb29f45eabfb354317..e55cbf8b76d995edb9435c7af078b6c8f1516abe 100644
--- a/Socket/SocketProtocol.hh
+++ b/Socket/SocketProtocol.hh
@@ -25,7 +25,7 @@
 
 // Custom includes
 #include <boost/utility.hpp>
-// TODO: this is really bad. This includes and predefs should be restructured
+// FIXME: this is really bad. The includes and predefs should be restructured
 #include "SocketHandle.ih"
 
 //#include "SocketProtocol.mpp"