diff --git a/model/wire/ccnb.h b/model/wire/ccnb.h
index 893d481..9b920b9 100644
--- a/model/wire/ccnb.h
+++ b/model/wire/ccnb.h
@@ -18,6 +18,10 @@
 NDN_NAMESPACE_BEGIN
 
 namespace wire {
+
+/**
+ * @brief Namespace for CCNb wire format operations
+ */
 namespace ccnb {
 
 /**
diff --git a/model/wire/ccnb/ccnb-parser/common.h b/model/wire/ccnb/ccnb-parser/common.h
index aa3f68a..531cd87 100644
--- a/model/wire/ccnb/ccnb-parser/common.h
+++ b/model/wire/ccnb/ccnb-parser/common.h
@@ -31,14 +31,6 @@
 
 namespace wire {
 
-/**
- * \ingroup ndn
- * \defgroup ndn-ccnb CCNB decoding routines
- */
-/**
- * \ingroup ndn-ccnb
- * \brief Namespace for ccnb parer
- */
 namespace CcnbParser {
 
 // forward declarations
@@ -54,8 +46,6 @@
 
 /**
  * \brief Exception thrown if there is a parsing error
- *
- * \todo inherit this class from some exception class and provide meaningful error messages
  */
 class CcnbDecodingException {};
 
diff --git a/model/wire/ndnsim.h b/model/wire/ndnsim.h
index 186335e..417edba 100644
--- a/model/wire/ndnsim.h
+++ b/model/wire/ndnsim.h
@@ -17,7 +17,14 @@
 
 NDN_NAMESPACE_BEGIN
 
+/**
+ * @brief Namespace encapsulating wire operations
+ */
 namespace wire {
+
+/**
+ * @brief Namespace for ndnSIM wire format operations
+ */
 namespace ndnSIM {
 
 /**