diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc.h b/src/libcharon/plugins/tnc_imc/tnc_imc.h
index fff520fa4..10a67f90b 100644
--- a/src/libcharon/plugins/tnc_imc/tnc_imc.h
+++ b/src/libcharon/plugins/tnc_imc/tnc_imc.h
@@ -15,7 +15,7 @@
 
 /**
  *
- * @defgroup tnc_imc tnc_imc
+ * @defgroup tnc_imc_t tnc_imc
  * @{ @ingroup tnc_imc
  */
 
diff --git a/src/libcharon/plugins/tnc_imv/tnc_imv.h b/src/libcharon/plugins/tnc_imv/tnc_imv.h
index 023bbc531..75939e54c 100644
--- a/src/libcharon/plugins/tnc_imv/tnc_imv.h
+++ b/src/libcharon/plugins/tnc_imv/tnc_imv.h
@@ -15,7 +15,7 @@
 
 /**
  *
- * @defgroup tnc_imv tnc_imv
+ * @defgroup tnc_imv_t tnc_imv
  * @{ @ingroup tnc_imv
  */
 
diff --git a/src/libcharon/plugins/tnccs_11/messages/imc_imv_msg.h b/src/libcharon/plugins/tnccs_11/messages/imc_imv_msg.h
index 335b1b759..02f07199f 100644
--- a/src/libcharon/plugins/tnccs_11/messages/imc_imv_msg.h
+++ b/src/libcharon/plugins/tnccs_11/messages/imc_imv_msg.h
@@ -55,7 +55,7 @@ struct imc_imv_msg_t {
 /**
  * Create an IMC-IMV message from XML-encoded message node
  *
- * @param msg_node			XML-encoded message node
+ * @param node				XML-encoded message node
  * @param errors			linked list of TNCCS error messages
 */
 tnccs_msg_t *imc_imv_msg_create_from_node(xmlNodePtr node, linked_list_t *errors);
@@ -64,7 +64,7 @@ tnccs_msg_t *imc_imv_msg_create_from_node(xmlNodePtr node, linked_list_t *errors
  * Create an IMC-IMV message from parameters
  *
  * @param msg_type			IMC-IMV message type
- * @param msg_body			IMC-IMV message body		
+ * @param msg_body			IMC-IMV message body
  */
 tnccs_msg_t *imc_imv_msg_create(TNC_MessageType msg_type, chunk_t msg_body);
 
diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_error_msg.h b/src/libcharon/plugins/tnccs_11/messages/tnccs_error_msg.h
index 61deaffda..ce2ce9755 100644
--- a/src/libcharon/plugins/tnccs_11/messages/tnccs_error_msg.h
+++ b/src/libcharon/plugins/tnccs_11/messages/tnccs_error_msg.h
@@ -65,7 +65,7 @@ struct tnccs_error_msg_t {
 /**
  * Create a TNCCS-Error message from XML-encoded message node
  *
- * @param msg_node		XML-encoded message node
+ * @param node			XML-encoded message node
  */
 tnccs_msg_t *tnccs_error_msg_create_from_node(xmlNodePtr node);
 
diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_preferred_language_msg.h b/src/libcharon/plugins/tnccs_11/messages/tnccs_preferred_language_msg.h
index 97e0ff831..d301ab2bb 100644
--- a/src/libcharon/plugins/tnccs_11/messages/tnccs_preferred_language_msg.h
+++ b/src/libcharon/plugins/tnccs_11/messages/tnccs_preferred_language_msg.h
@@ -48,7 +48,7 @@ struct tnccs_preferred_language_msg_t {
 /**
  * Create a TNCCS-PreferredLanguage message from XML-encoded message node
  *
- * @param msg_node			XML-encoded message node
+ * @param node				XML-encoded message node
  * @param errors			linked list of TNCCS error messages
  */
 tnccs_msg_t *tnccs_preferred_language_msg_create_from_node(xmlNodePtr node,
diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.h b/src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.h
index 5b4dec324..0046a5789 100644
--- a/src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.h
+++ b/src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.h
@@ -47,7 +47,7 @@ struct tnccs_reason_strings_msg_t {
 /**
  * Create a TNCCS-ReasonStrings message from XML-encoded message node
  *
- * @param msg_node			XML-encoded message node
+ * @param node				XML-encoded message node
  * @param errors			linked list of TNCCS error messages
  */
 tnccs_msg_t *tnccs_reason_strings_msg_create_from_node(xmlNodePtr node,
diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_recommendation_msg.h b/src/libcharon/plugins/tnccs_11/messages/tnccs_recommendation_msg.h
index 42f6e8b74..685049e95 100644
--- a/src/libcharon/plugins/tnccs_11/messages/tnccs_recommendation_msg.h
+++ b/src/libcharon/plugins/tnccs_11/messages/tnccs_recommendation_msg.h
@@ -48,7 +48,7 @@ struct tnccs_recommendation_msg_t {
 /**
  * Create a TNCCS-Recommendation message from XML-encoded message node
  *
- * @param msg_node			XML-encoded message node
+ * @param node				XML-encoded message node
  * @param errors			linked list of TNCCS error messages
  */
 tnccs_msg_t *tnccs_recommendation_msg_create_from_node(xmlNodePtr node,
@@ -59,6 +59,6 @@ tnccs_msg_t *tnccs_recommendation_msg_create_from_node(xmlNodePtr node,
  *
  * @param rec				Action Recommendation
  */
-tnccs_msg_t *tnccs_recommendation_msg_create(TNC_IMV_Action_Recommendation);
+tnccs_msg_t *tnccs_recommendation_msg_create(TNC_IMV_Action_Recommendation rec);
 
 #endif /** TNCCS_RECOMMENDATION_MSG_H_ @}*/
diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.h b/src/libcharon/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.h
index 7612b102f..8ed210a57 100644
--- a/src/libcharon/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.h
+++ b/src/libcharon/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.h
@@ -39,7 +39,7 @@ struct tnccs_tncs_contact_info_msg_t {
 /**
  * Create a TNCCS-TNCSContactInfo message from XML-encoded message node
  *
- * @param msg_node			XML-encoded message node
+ * @param node				XML-encoded message node
  * @param errors			linked list of TNCCS error messages
  */
 tnccs_msg_t *tnccs_tncs_contact_info_msg_create_from_node(xmlNodePtr node,
diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.h b/src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.h
index 2dde48eb6..01b83cfd7 100644
--- a/src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.h
+++ b/src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.h
@@ -62,7 +62,7 @@ struct pb_access_recommendation_msg_t {
 /**
  * Create a PB-Access-Recommendation message from parameters
  *
- * @param access_recommendation		Access Recommendation code
+ * @param recommendation	Access Recommendation code
  */
 pb_tnc_msg_t* pb_access_recommendation_msg_create(u_int16_t recommendation);