diff --git a/src/libcharon/plugins/tnccs_11/tnccs_11.h b/src/libcharon/plugins/tnccs_11/tnccs_11.h
index fb4791722..7331fc8cd 100644
--- a/src/libcharon/plugins/tnccs_11/tnccs_11.h
+++ b/src/libcharon/plugins/tnccs_11/tnccs_11.h
@@ -14,7 +14,7 @@
  */
 
 /**
- * @defgroup tnccs_11 tnccs_11
+ * @defgroup tnccs_11_h tnccs_11
  * @{ @ingroup tnccs_11
  */
 
diff --git a/src/libcharon/plugins/tnccs_20/tnccs_20.h b/src/libcharon/plugins/tnccs_20/tnccs_20.h
index 6454fae43..400d1dc12 100644
--- a/src/libcharon/plugins/tnccs_20/tnccs_20.h
+++ b/src/libcharon/plugins/tnccs_20/tnccs_20.h
@@ -14,7 +14,7 @@
  */
 
 /**
- * @defgroup tnccs_20 tnccs_20
+ * @defgroup tnccs_20_h tnccs_20
  * @{ @ingroup tnccs_20
  */
 
diff --git a/src/libcharon/tnccs/tnccs.h b/src/libcharon/tnccs/tnccs.h
index 32f093fd0..583512e82 100644
--- a/src/libcharon/tnccs/tnccs.h
+++ b/src/libcharon/tnccs/tnccs.h
@@ -40,11 +40,11 @@ enum tnccs_type_t {
 extern enum_name_t *tnccs_type_names;
 
 typedef struct tnccs_t tnccs_t;
- 
+
 /**
  * Constructor definition for a pluggable TNCCS protocol implementation.
  *
- * @is_server			TRUE if TNC Server, FALSE if TNC Client
+ * @param is_server		TRUE if TNC Server, FALSE if TNC Client
  * @return				implementation of the tnccs_t interface
  */
 typedef tnccs_t* (*tnccs_constructor_t)(bool is_server);
diff --git a/src/libcharon/tnccs/tnccs_manager.h b/src/libcharon/tnccs/tnccs_manager.h
index 8619f3f92..2f4a961a7 100644
--- a/src/libcharon/tnccs/tnccs_manager.h
+++ b/src/libcharon/tnccs/tnccs_manager.h
@@ -54,7 +54,7 @@ struct tnccs_manager_t {
 	 * Create a new TNCCS protocol instance.
 	 *
 	 * @param type			type of the TNCCS protocol
-	 * @is_server			TRUE if TNC Server, FALSE if TNC Client
+	 * @param is_server		TRUE if TNC Server, FALSE if TNC Client
 	 * @return				TNCCS protocol instance, NULL if no constructor found
 	 */
 	tnccs_t* (*create_instance)(tnccs_manager_t *this, tnccs_type_t type,