diff --git a/applications/baremetal/models/ethos-u55-128/keyword_spotting_cnn_small_int8/model.h b/applications/baremetal/models/ethos-u55-128/keyword_spotting_cnn_small_int8/model.h
index e2221c2..2f91607 100644
--- a/applications/baremetal/models/ethos-u55-128/keyword_spotting_cnn_small_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-128/keyword_spotting_cnn_small_int8/model.h
@@ -27,7 +27,7 @@
 
 const size_t tensorArenaSize = 50000;
 
-const char *modelName = "keyword_spotting_cnn_small_int8";
+static const char modelName[] = "keyword_spotting_cnn_small_int8";
 
 unsigned char networkModelData[] __attribute__((aligned(16), section("network_model_sec"))) = {
     0x1c, 0x00, 0x00, 0x00, 0x54, 0x46, 0x4c, 0x33, 0x00, 0x00, 0x12, 0x00, 0x1c, 0x00, 0x18, 0x00, 0x14, 0x00, 0x10,
diff --git a/applications/baremetal/models/ethos-u55-128/keyword_spotting_dnn_medium_int8/model.h b/applications/baremetal/models/ethos-u55-128/keyword_spotting_dnn_medium_int8/model.h
index 593ece7..5cb75ce 100644
--- a/applications/baremetal/models/ethos-u55-128/keyword_spotting_dnn_medium_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-128/keyword_spotting_dnn_medium_int8/model.h
@@ -27,7 +27,7 @@
 
 const size_t tensorArenaSize = 2000;
 
-const char *modelName = "keyword_spotting_dnn_medium_int8";
+static const char modelName[] = "keyword_spotting_dnn_medium_int8";
 
 unsigned char networkModelData[] __attribute__((aligned(16), section("network_model_sec"))) = {
     0x1c, 0x00, 0x00, 0x00, 0x54, 0x46, 0x4c, 0x33, 0x00, 0x00, 0x12, 0x00, 0x1c, 0x00, 0x18, 0x00, 0x14, 0x00, 0x10,
diff --git a/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_cnn_large_clustered_int8/model.h b/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_cnn_large_clustered_int8/model.h
index d2dd957..85cc0cd 100644
--- a/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_cnn_large_clustered_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_cnn_large_clustered_int8/model.h
@@ -28,7 +28,7 @@
 
 const size_t tensorArenaSize = 300000;
 
-const char *modelName = "keyword_spotting_ds_cnn_large_clustered_int8";
+static const char modelName[] = "keyword_spotting_ds_cnn_large_clustered_int8";
 
 unsigned char networkModelData[] __attribute__((aligned(16), section("network_model_sec"))) = {
     0x1c, 0x00, 0x00, 0x00, 0x54, 0x46, 0x4c, 0x33, 0x00, 0x00, 0x12, 0x00, 0x1c, 0x00, 0x18, 0x00, 0x14, 0x00, 0x10,
diff --git a/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_dnn_large_clustered_int8/model.h b/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_dnn_large_clustered_int8/model.h
index 7474ff1..cbed44a 100644
--- a/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_dnn_large_clustered_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-128/keyword_spotting_ds_dnn_large_clustered_int8/model.h
@@ -27,7 +27,7 @@
 
 const size_t tensorArenaSize = 75000;
 
-const char *modelName = "keyword_spotting_ds_dnn_large_clustered_int8";
+static const char modelName[] = "keyword_spotting_ds_dnn_large_clustered_int8";
 
 unsigned char networkModelData[442112] __attribute__((aligned(16), section("network_model_sec"))) = {
     0x1c, 0x00, 0x00, 0x00, 0x54, 0x46, 0x4c, 0x33, 0x00, 0x00, 0x12, 0x00, 0x1c, 0x00, 0x18, 0x00, 0x14, 0x00, 0x10,
diff --git a/applications/baremetal/models/ethos-u55-256/keyword_spotting_cnn_small_int8/model.h b/applications/baremetal/models/ethos-u55-256/keyword_spotting_cnn_small_int8/model.h
index 82959fe..72ff670 100644
--- a/applications/baremetal/models/ethos-u55-256/keyword_spotting_cnn_small_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-256/keyword_spotting_cnn_small_int8/model.h
@@ -27,7 +27,7 @@
 
 const size_t tensorArenaSize = 50000;
 
-const char *modelName = "keyword_spotting_cnn_small_int8";
+static const char modelName[] = "keyword_spotting_cnn_small_int8";
 
 unsigned char networkModelData[] __attribute__((aligned(16), section("network_model_sec"))) = {
     0x1c, 0x00, 0x00, 0x00, 0x54, 0x46, 0x4c, 0x33, 0x00, 0x00, 0x12, 0x00, 0x1c, 0x00, 0x18, 0x00, 0x14, 0x00, 0x10,
diff --git a/applications/baremetal/models/ethos-u55-256/keyword_spotting_dnn_medium_int8/model.h b/applications/baremetal/models/ethos-u55-256/keyword_spotting_dnn_medium_int8/model.h
index d9e6593..bc69c12 100644
--- a/applications/baremetal/models/ethos-u55-256/keyword_spotting_dnn_medium_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-256/keyword_spotting_dnn_medium_int8/model.h
@@ -27,7 +27,7 @@
 
 const size_t tensorArenaSize = 2000;
 
-const char *modelName = "keyword_spotting_dnn_medium_int8";
+static const char modelName[] = "keyword_spotting_dnn_medium_int8";
 
 unsigned char networkModelData[] __attribute__((aligned(16), section("network_model_sec"))) = {
     0x1c, 0x00, 0x00, 0x00, 0x54, 0x46, 0x4c, 0x33, 0x00, 0x00, 0x12, 0x00, 0x1c, 0x00, 0x18, 0x00, 0x14, 0x00, 0x10,
diff --git a/applications/baremetal/models/ethos-u55-256/keyword_spotting_ds_cnn_large_clustered_int8/model.h b/applications/baremetal/models/ethos-u55-256/keyword_spotting_ds_cnn_large_clustered_int8/model.h
index 814e440..60544a8 100644
--- a/applications/baremetal/models/ethos-u55-256/keyword_spotting_ds_cnn_large_clustered_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-256/keyword_spotting_ds_cnn_large_clustered_int8/model.h
@@ -28,7 +28,7 @@
 
 const size_t tensorArenaSize = 300000;
 
-const char *modelName = "keyword_spotting_ds_cnn_large_clustered_int8";
+static const char modelName[] = "keyword_spotting_ds_cnn_large_clustered_int8";
 
 unsigned char networkModelData[] __attribute__((aligned(16), section("network_model_sec"))) = {
     0x1c, 0x00, 0x00, 0x00, 0x54, 0x46, 0x4c, 0x33, 0x00, 0x00, 0x12, 0x00, 0x1c, 0x00, 0x18, 0x00, 0x14, 0x00, 0x10,
diff --git a/applications/baremetal/models/ethos-u55-32/keyword_spotting_cnn_small_int8/model.h b/applications/baremetal/models/ethos-u55-32/keyword_spotting_cnn_small_int8/model.h
index bb3c5de..4fd3be4 100644
--- a/applications/baremetal/models/ethos-u55-32/keyword_spotting_cnn_small_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-32/keyword_spotting_cnn_small_int8/model.h
@@ -27,7 +27,7 @@
 
 const size_t tensorArenaSize = 50000;
 
-const char *modelName = "keyword_spotting_cnn_small_int8";
+static const char modelName[] = "keyword_spotting_cnn_small_int8";
 
 unsigned char networkModelData[] __attribute__((aligned(16), section("network_model_sec"))) = {
     0x1c, 0x00, 0x00, 0x00, 0x54, 0x46, 0x4c, 0x33, 0x00, 0x00, 0x12, 0x00, 0x1c, 0x00, 0x18, 0x00, 0x14, 0x00, 0x10,
diff --git a/applications/baremetal/models/ethos-u55-32/keyword_spotting_dnn_medium_int8/model.h b/applications/baremetal/models/ethos-u55-32/keyword_spotting_dnn_medium_int8/model.h
index 24458ec..fe11a2c 100644
--- a/applications/baremetal/models/ethos-u55-32/keyword_spotting_dnn_medium_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-32/keyword_spotting_dnn_medium_int8/model.h
@@ -27,7 +27,7 @@
 
 const size_t tensorArenaSize = 2000;
 
-const char *modelName = "keyword_spotting_dnn_medium_int8";
+static const char modelName[] = "keyword_spotting_dnn_medium_int8";
 
 unsigned char networkModelData[] __attribute__((aligned(16), section("network_model_sec"))) = {
     0x1c, 0x00, 0x00, 0x00, 0x54, 0x46, 0x4c, 0x33, 0x00, 0x00, 0x12, 0x00, 0x1c, 0x00, 0x18, 0x00, 0x14, 0x00, 0x10,
diff --git a/applications/baremetal/models/ethos-u55-32/keyword_spotting_ds_cnn_large_clustered_int8/model.h b/applications/baremetal/models/ethos-u55-32/keyword_spotting_ds_cnn_large_clustered_int8/model.h
index 4d9dc74..18b0b30 100644
--- a/applications/baremetal/models/ethos-u55-32/keyword_spotting_ds_cnn_large_clustered_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-32/keyword_spotting_ds_cnn_large_clustered_int8/model.h
@@ -28,7 +28,7 @@
 
 const size_t tensorArenaSize = 300000;
 
-const char *modelName = "keyword_spotting_ds_cnn_large_clustered_int8";
+static const char modelName[] = "keyword_spotting_ds_cnn_large_clustered_int8";
 
 unsigned char networkModelData[] __attribute__((aligned(16), section("network_model_sec"))) = {
     0x1c, 0x00, 0x00, 0x00, 0x54, 0x46, 0x4c, 0x33, 0x00, 0x00, 0x12, 0x00, 0x1c, 0x00, 0x18, 0x00, 0x14, 0x00, 0x10,
diff --git a/applications/baremetal/models/ethos-u55-64/keyword_spotting_cnn_small_int8/model.h b/applications/baremetal/models/ethos-u55-64/keyword_spotting_cnn_small_int8/model.h
index b6e5cd7..217b7ad 100644
--- a/applications/baremetal/models/ethos-u55-64/keyword_spotting_cnn_small_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-64/keyword_spotting_cnn_small_int8/model.h
@@ -27,7 +27,7 @@
 
 const size_t tensorArenaSize = 50000;
 
-const char *modelName = "keyword_spotting_cnn_small_int8";
+static const char modelName[] = "keyword_spotting_cnn_small_int8";
 
 unsigned char networkModelData[] __attribute__((aligned(16), section("network_model_sec"))) = {
     0x1c, 0x00, 0x00, 0x00, 0x54, 0x46, 0x4c, 0x33, 0x00, 0x00, 0x12, 0x00, 0x1c, 0x00, 0x18, 0x00, 0x14, 0x00, 0x10,
diff --git a/applications/baremetal/models/ethos-u55-64/keyword_spotting_dnn_medium_int8/model.h b/applications/baremetal/models/ethos-u55-64/keyword_spotting_dnn_medium_int8/model.h
index 19317f4..c4e29cd 100644
--- a/applications/baremetal/models/ethos-u55-64/keyword_spotting_dnn_medium_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-64/keyword_spotting_dnn_medium_int8/model.h
@@ -27,7 +27,7 @@
 
 const size_t tensorArenaSize = 2000;
 
-const char *modelName = "keyword_spotting_dnn_medium_int8";
+static const char modelName[] = "keyword_spotting_dnn_medium_int8";
 
 unsigned char networkModelData[] __attribute__((aligned(16), section("network_model_sec"))) = {
     0x1c, 0x00, 0x00, 0x00, 0x54, 0x46, 0x4c, 0x33, 0x00, 0x00, 0x12, 0x00, 0x1c, 0x00, 0x18, 0x00, 0x14, 0x00, 0x10,
diff --git a/applications/baremetal/models/ethos-u55-64/keyword_spotting_ds_cnn_large_clustered_int8/model.h b/applications/baremetal/models/ethos-u55-64/keyword_spotting_ds_cnn_large_clustered_int8/model.h
index cbec876..db6ba26 100644
--- a/applications/baremetal/models/ethos-u55-64/keyword_spotting_ds_cnn_large_clustered_int8/model.h
+++ b/applications/baremetal/models/ethos-u55-64/keyword_spotting_ds_cnn_large_clustered_int8/model.h
@@ -28,7 +28,7 @@
 
 const size_t tensorArenaSize = 300000;
 
-const char *modelName = "keyword_spotting_ds_cnn_large_clustered_int8";
+static const char modelName[] = "keyword_spotting_ds_cnn_large_clustered_int8";
 
 unsigned char networkModelData[] __attribute__((aligned(16), section("network_model_sec"))) = {
     0x1c, 0x00, 0x00, 0x00, 0x54, 0x46, 0x4c, 0x33, 0x00, 0x00, 0x12, 0x00, 0x1c, 0x00, 0x18, 0x00, 0x14, 0x00, 0x10,
diff --git a/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/model.h b/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/model.h
index eb3ff23..bd4dfa2 100644
--- a/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/model.h
+++ b/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/model.h
@@ -27,7 +27,7 @@
 
 const size_t tensorArenaSize = 50000;
 
-const char *modelName = "keyword_spotting_cnn_small_int8";
+static const char modelName[] = "keyword_spotting_cnn_small_int8";
 
 unsigned char networkModelData[] __attribute__((aligned(16), section("network_model_sec"))) = {
     0x1c, 0x00, 0x00, 0x00, 0x54, 0x46, 0x4c, 0x33, 0x00, 0x00, 0x12, 0x00, 0x1c, 0x00, 0x18, 0x00, 0x14, 0x00, 0x10,
diff --git a/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/model.h b/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/model.h
index 95d8d09..85ccab1 100644
--- a/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/model.h
+++ b/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/model.h
@@ -27,7 +27,7 @@
 
 const size_t tensorArenaSize = 2000;
 
-const char *modelName = "keyword_spotting_dnn_medium_int8";
+static const char modelName[] = "keyword_spotting_dnn_medium_int8";
 
 unsigned char networkModelData[] __attribute__((aligned(16), section("network_model_sec"))) = {
     0x1c, 0x00, 0x00, 0x00, 0x54, 0x46, 0x4c, 0x33, 0x00, 0x00, 0x12, 0x00, 0x1c, 0x00, 0x18, 0x00, 0x14, 0x00, 0x10,
diff --git a/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/model.h b/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/model.h
index f1bfb74..e85274f 100644
--- a/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/model.h
+++ b/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/model.h
@@ -28,7 +28,7 @@
 
 const size_t tensorArenaSize = 300000;
 
-const char *modelName = "keyword_spotting_ds_cnn_large_clustered_int8";
+static const char modelName[] = "keyword_spotting_ds_cnn_large_clustered_int8";
 
 unsigned char networkModelData[] __attribute__((aligned(16), section("network_model_sec"))) = {
     0x1c, 0x00, 0x00, 0x00, 0x54, 0x46, 0x4c, 0x33, 0x00, 0x00, 0x12, 0x00, 0x1c, 0x00, 0x18, 0x00, 0x14, 0x00, 0x10,
diff --git a/applications/baremetal/models/ethos-u65-512/keyword_spotting_cnn_small_int8/model.h b/applications/baremetal/models/ethos-u65-512/keyword_spotting_cnn_small_int8/model.h
index a771f6e..b4a1c95 100644
--- a/applications/baremetal/models/ethos-u65-512/keyword_spotting_cnn_small_int8/model.h
+++ b/applications/baremetal/models/ethos-u65-512/keyword_spotting_cnn_small_int8/model.h
@@ -27,7 +27,7 @@
 
 const size_t tensorArenaSize = 50000;
 
-const char *modelName = "keyword_spotting_cnn_small_int8";
+static const char modelName[] = "keyword_spotting_cnn_small_int8";
 
 unsigned char networkModelData[] __attribute__((aligned(16), section("network_model_sec"))) = {
     0x1c, 0x00, 0x00, 0x00, 0x54, 0x46, 0x4c, 0x33, 0x00, 0x00, 0x12, 0x00, 0x1c, 0x00, 0x18, 0x00, 0x14, 0x00, 0x10,
diff --git a/applications/baremetal/models/ethos-u65-512/keyword_spotting_dnn_medium_int8/model.h b/applications/baremetal/models/ethos-u65-512/keyword_spotting_dnn_medium_int8/model.h
index 7a15d83..3fe35b4 100644
--- a/applications/baremetal/models/ethos-u65-512/keyword_spotting_dnn_medium_int8/model.h
+++ b/applications/baremetal/models/ethos-u65-512/keyword_spotting_dnn_medium_int8/model.h
@@ -27,7 +27,7 @@
 
 const size_t tensorArenaSize = 2000;
 
-const char *modelName = "keyword_spotting_dnn_medium_int8";
+static const char modelName[] = "keyword_spotting_dnn_medium_int8";
 
 unsigned char networkModelData[] __attribute__((aligned(16), section("network_model_sec"))) = {
     0x1c, 0x00, 0x00, 0x00, 0x54, 0x46, 0x4c, 0x33, 0x00, 0x00, 0x12, 0x00, 0x1c, 0x00, 0x18, 0x00, 0x14, 0x00, 0x10,
diff --git a/applications/baremetal/models/ethos-u65-512/keyword_spotting_ds_cnn_large_clustered_int8/model.h b/applications/baremetal/models/ethos-u65-512/keyword_spotting_ds_cnn_large_clustered_int8/model.h
index 1630ee4..9e4edeb 100644
--- a/applications/baremetal/models/ethos-u65-512/keyword_spotting_ds_cnn_large_clustered_int8/model.h
+++ b/applications/baremetal/models/ethos-u65-512/keyword_spotting_ds_cnn_large_clustered_int8/model.h
@@ -28,7 +28,7 @@
 
 const size_t tensorArenaSize = 300000;
 
-const char *modelName = "keyword_spotting_ds_cnn_large_clustered_int8";
+static const char modelName[] = "keyword_spotting_ds_cnn_large_clustered_int8";
 
 unsigned char networkModelData[] __attribute__((aligned(16), section("network_model_sec"))) = {
     0x1c, 0x00, 0x00, 0x00, 0x54, 0x46, 0x4c, 0x33, 0x00, 0x00, 0x12, 0x00, 0x1c, 0x00, 0x18, 0x00, 0x14, 0x00, 0x10,