diff --git a/doc/connectivity/bluetooth/img/zephyr_gaf.svg b/doc/connectivity/bluetooth/img/zephyr_gaf.svg
index 3e56f35bd57..67fa66ed65f 100644
Binary files a/doc/connectivity/bluetooth/img/zephyr_gaf.svg and b/doc/connectivity/bluetooth/img/zephyr_gaf.svg differ
diff --git a/include/zephyr/bluetooth/audio/mics.h b/include/zephyr/bluetooth/audio/micp.h
similarity index 100%
rename from include/zephyr/bluetooth/audio/mics.h
rename to include/zephyr/bluetooth/audio/micp.h
diff --git a/subsys/bluetooth/audio/Kconfig b/subsys/bluetooth/audio/Kconfig
index 43576c17aae..796e6d09dd5 100644
--- a/subsys/bluetooth/audio/Kconfig
+++ b/subsys/bluetooth/audio/Kconfig
@@ -29,7 +29,7 @@ rsource "Kconfig.baps"
 rsource "Kconfig.vocs"
 rsource "Kconfig.aics"
 rsource "Kconfig.vcs"
-rsource "Kconfig.mics"
+rsource "Kconfig.micp"
 rsource "Kconfig.csis"
 rsource "Kconfig.tbs"
 rsource "Kconfig.mcs"
diff --git a/subsys/bluetooth/audio/Kconfig.mics b/subsys/bluetooth/audio/Kconfig.micp
similarity index 100%
rename from subsys/bluetooth/audio/Kconfig.mics
rename to subsys/bluetooth/audio/Kconfig.micp
diff --git a/subsys/bluetooth/audio/mics.c b/subsys/bluetooth/audio/mics.c
index 61a26a9e35b..c0392dcb6d0 100644
--- a/subsys/bluetooth/audio/mics.c
+++ b/subsys/bluetooth/audio/mics.c
@@ -16,7 +16,7 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/gatt.h>
-#include <zephyr/bluetooth/audio/mics.h>
+#include <zephyr/bluetooth/audio/micp.h>
 #include <zephyr/bluetooth/audio/aics.h>
 
 #include "mics_internal.h"
diff --git a/subsys/bluetooth/audio/mics_client.c b/subsys/bluetooth/audio/mics_client.c
index fffefe9dfcc..9d3c00fdd3b 100644
--- a/subsys/bluetooth/audio/mics_client.c
+++ b/subsys/bluetooth/audio/mics_client.c
@@ -18,7 +18,7 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/gatt.h>
-#include <zephyr/bluetooth/audio/mics.h>
+#include <zephyr/bluetooth/audio/micp.h>
 
 #include "mics_internal.h"
 
diff --git a/subsys/bluetooth/shell/mics.c b/subsys/bluetooth/shell/mics.c
index c3d9efb6e74..e390a28fd89 100644
--- a/subsys/bluetooth/shell/mics.c
+++ b/subsys/bluetooth/shell/mics.c
@@ -9,7 +9,7 @@
 
 #include <zephyr/types.h>
 #include <zephyr/bluetooth/conn.h>
-#include <zephyr/bluetooth/audio/mics.h>
+#include <zephyr/bluetooth/audio/micp.h>
 #include <zephyr/shell/shell.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/subsys/bluetooth/shell/mics_client.c b/subsys/bluetooth/shell/mics_client.c
index 47a1164ba4c..85f2c76cc4f 100644
--- a/subsys/bluetooth/shell/mics_client.c
+++ b/subsys/bluetooth/shell/mics_client.c
@@ -9,7 +9,7 @@
 
 #include <zephyr/types.h>
 #include <zephyr/bluetooth/conn.h>
-#include <zephyr/bluetooth/audio/mics.h>
+#include <zephyr/bluetooth/audio/micp.h>
 #include <zephyr/shell/shell.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/src/mics_client_test.c b/tests/bluetooth/bsim_bt/bsim_test_audio/src/mics_client_test.c
index 907f487bd20..b1de7ec1348 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_audio/src/mics_client_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_audio/src/mics_client_test.c
@@ -7,7 +7,7 @@
 #ifdef CONFIG_BT_MICS_CLIENT
 
 #include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/audio/mics.h>
+#include <zephyr/bluetooth/audio/micp.h>
 
 #include "common.h"
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/src/mics_test.c b/tests/bluetooth/bsim_bt/bsim_test_audio/src/mics_test.c
index 538c7a1c2c1..d266a50bdad 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_audio/src/mics_test.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_audio/src/mics_test.c
@@ -5,7 +5,7 @@
  */
 
 #ifdef CONFIG_BT_MICS
-#include <zephyr/bluetooth/audio/mics.h>
+#include <zephyr/bluetooth/audio/micp.h>
 #include "common.h"
 
 extern enum bst_result_t bst_result;