diff --git a/src/mainboard/amd/dinar/sb700_cfg.h b/src/mainboard/amd/dinar/sb700_cfg.h
index 216c264535..539a57659b 100644
--- a/src/mainboard/amd/dinar/sb700_cfg.h
+++ b/src/mainboard/amd/dinar/sb700_cfg.h
@@ -233,9 +233,9 @@ void sb700_cimx_config(AMDSBCFG *sb_cfg);
  *
  * @param[in] func    Southbridge CIMx Function ID.
  * @param[in] data    Southbridge Input Data.
- * @param[in] sb_cfg  Southbridge configuration structure pointer.
+ * @param[in] config  Southbridge configuration structure pointer.
  *
  */
-u32 sb700_callout_entry(u32 func, u32 data, void* sb_cfg);
+u32 sb700_callout_entry(u32 func, u32 data, void* config);
 
 #endif //_SB700_CFG_H_
diff --git a/src/mainboard/supermicro/h8qgi/sb700_cfg.h b/src/mainboard/supermicro/h8qgi/sb700_cfg.h
index 1df3fc5ea9..1b1c636895 100644
--- a/src/mainboard/supermicro/h8qgi/sb700_cfg.h
+++ b/src/mainboard/supermicro/h8qgi/sb700_cfg.h
@@ -233,9 +233,9 @@ void sb700_cimx_config(AMDSBCFG *sb_cfg);
  *
  * @param[in] func    Southbridge CIMx Function ID.
  * @param[in] data    Southbridge Input Data.
- * @param[in] sb_cfg  Southbridge configuration structure pointer.
+ * @param[in] config  Southbridge configuration structure pointer.
  *
  */
-u32 sb700_callout_entry(u32 func, u32 data, void* sb_cfg);
+u32 sb700_callout_entry(u32 func, u32 data, void* config);
 
 #endif //_SB700_CFG_H_
diff --git a/src/mainboard/supermicro/h8scm/sb700_cfg.h b/src/mainboard/supermicro/h8scm/sb700_cfg.h
index 40c89fa59f..2f3ece2b15 100644
--- a/src/mainboard/supermicro/h8scm/sb700_cfg.h
+++ b/src/mainboard/supermicro/h8scm/sb700_cfg.h
@@ -233,9 +233,9 @@ void sb700_cimx_config(AMDSBCFG *sb_cfg);
  *
  * @param[in] func    Southbridge CIMx Function ID.
  * @param[in] data    Southbridge Input Data.
- * @param[in] sb_cfg  Southbridge configuration structure pointer.
+ * @param[in] config  Southbridge configuration structure pointer.
  *
  */
-u32 sb700_callout_entry(u32 func, u32 data, void* sb_cfg);
+u32 sb700_callout_entry(u32 func, u32 data, void* config);
 
 #endif //_SB700_CFG_H_
diff --git a/src/mainboard/tyan/s8226/sb700_cfg.h b/src/mainboard/tyan/s8226/sb700_cfg.h
index c1ee84c1ed..9c566a5127 100644
--- a/src/mainboard/tyan/s8226/sb700_cfg.h
+++ b/src/mainboard/tyan/s8226/sb700_cfg.h
@@ -228,9 +228,9 @@ void sb700_cimx_config(AMDSBCFG *sb_cfg);
  *
  * @param[in] func    Southbridge CIMx Function ID.
  * @param[in] data    Southbridge Input Data.
- * @param[in] sb_cfg  Southbridge configuration structure pointer.
+ * @param[in] config  Southbridge configuration structure pointer.
  *
  */
-u32 sb700_callout_entry(u32 func, u32 data, void* sb_cfg);
+u32 sb700_callout_entry(u32 func, u32 data, void* config);
 
 #endif //_SB700_CFG_H_
diff --git a/src/southbridge/amd/cimx/sb700/late.c b/src/southbridge/amd/cimx/sb700/late.c
index 3fa6940610..b0ec2dcb2e 100644
--- a/src/southbridge/amd/cimx/sb700/late.c
+++ b/src/southbridge/amd/cimx/sb700/late.c
@@ -51,7 +51,7 @@ static AMDSBCFG *sb_config = &sb_late_cfg;
  *
  * @param[in] func      Southbridge CIMx Function ID.
  * @param[in] data      Southbridge Input Data.
- * @param[in] sb_config Southbridge configuration structure pointer.
+ * @param[in] config    Southbridge configuration structure pointer.
  *
  */
 u32 sb700_callout_entry(u32 func, u32 data, void* config)
diff --git a/src/southbridge/amd/cimx/sb800/cfg.h b/src/southbridge/amd/cimx/sb800/cfg.h
index 1fc3f7cec7..f6a3ab0470 100644
--- a/src/southbridge/amd/cimx/sb800/cfg.h
+++ b/src/southbridge/amd/cimx/sb800/cfg.h
@@ -36,9 +36,9 @@ void sb800_cimx_config(AMDSBCFG *sb_cfg);
  *
  * @param[in] func    Southbridge CIMx Function ID.
  * @param[in] data    Southbridge Input Data.
- * @param[in] sb_cfg  Southbridge configuration structure pointer.
+ * @param[in] config  Southbridge configuration structure pointer.
  *
  */
-u32 sb800_callout_entry(u32 func, u32 data, void* sb_cfg);
+u32 sb800_callout_entry(u32 func, u32 data, void* config);
 
 #endif
diff --git a/src/southbridge/amd/cimx/sb800/late.c b/src/southbridge/amd/cimx/sb800/late.c
index d7f22d32b5..1eb865e356 100644
--- a/src/southbridge/amd/cimx/sb800/late.c
+++ b/src/southbridge/amd/cimx/sb800/late.c
@@ -56,7 +56,7 @@ static AMDSBCFG *sb_config = &sb_late_cfg;
  *
  * @param[in] func      Southbridge CIMx Function ID.
  * @param[in] data      Southbridge Input Data.
- * @param[in] sb_config Southbridge configuration structure pointer.
+ * @param[in] config    Southbridge configuration structure pointer.
  *
  */
 u32 sb800_callout_entry(u32 func, u32 data, void* config)
diff --git a/src/southbridge/amd/cimx/sb900/late.c b/src/southbridge/amd/cimx/sb900/late.c
index e9f5ad6229..6d47f05a08 100644
--- a/src/southbridge/amd/cimx/sb900/late.c
+++ b/src/southbridge/amd/cimx/sb900/late.c
@@ -54,7 +54,7 @@ static AMDSBCFG *sb_config = &sb_late_cfg;
  *
  * @param[in] func      Southbridge CIMx Function ID.
  * @param[in] data      Southbridge Input Data.
- * @param[in] sb_config Southbridge configuration structure pointer.
+ * @param[in] config    Southbridge configuration structure pointer.
  *
  */
 u32 sb900_callout_entry(u32 func, u32 data, void* config)