diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h
index bdf257810e..8cceb07606 100644
--- a/include/asterisk/manager.h
+++ b/include/asterisk/manager.h
@@ -340,14 +340,14 @@ struct ast_channel_snapshot;
  *
  * \param snapshot the channel snapshot for which to generate an AMI message
  *                 body
- * \param suffix the suffix to append to the channel fields
+ * \param prefix What to prepend to the channel fields
  *
  * \retval NULL on error
  * \retval ast_str* on success (must be ast_freed by caller)
  */
 struct ast_str *ast_manager_build_channel_state_string_prefix(
 		const struct ast_channel_snapshot *snapshot,
-		const char *suffix);
+		const char *prefix);
 
 /*!
  * \brief Generate the AMI message body from a channel snapshot
diff --git a/include/asterisk/stasis_channels.h b/include/asterisk/stasis_channels.h
index d5c320119f..a8556e06f5 100644
--- a/include/asterisk/stasis_channels.h
+++ b/include/asterisk/stasis_channels.h
@@ -53,7 +53,7 @@ struct ast_channel_snapshot {
 		AST_STRING_FIELD(caller_name);      /*!< Caller ID Name */
 		AST_STRING_FIELD(caller_number);    /*!< Caller ID Number */
 		AST_STRING_FIELD(caller_dnid);      /*!< Dialed ID Number */
-		AST_STRING_FIELD(caller_ani);       /*< Caller ID ANI Number */
+		AST_STRING_FIELD(caller_ani);       /*!< Caller ID ANI Number */
 		AST_STRING_FIELD(caller_rdnis);     /*!< Caller ID RDNIS Number */
 		AST_STRING_FIELD(caller_subaddr);   /*!< Caller subaddress */
 		AST_STRING_FIELD(dialed_subaddr);   /*!< Dialed subaddress */