diff --git a/app/src/app_base.h b/app/src/app_base.h
index 06afc4479..187d4fe59 100644
--- a/app/src/app_base.h
+++ b/app/src/app_base.h
@@ -42,7 +42,8 @@
 #define ST_APP_MAX_TX_ANC_SESSIONS (180)
 #define ST_APP_MAX_RX_ANC_SESSIONS (180)
 
-#define ST_APP_MAX_TX_FMD_SESSIONS (180)
+/* FMD = Fast Metadata (ST2110-41) */
+#define ST_APP_MAX_TX_FMD_SESSIONS (180) 
 #define ST_APP_MAX_RX_FMD_SESSIONS (180)
 
 #define ST_APP_MAX_LCORES (32)
diff --git a/app/src/rx_fastmetadata_app.c b/app/src/rx_fastmetadata_app.c
index daa35bf30..ec6e27bb0 100644
--- a/app/src/rx_fastmetadata_app.c
+++ b/app/src/rx_fastmetadata_app.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2022 Intel Corporation
+ * SPDX-FileCopyrightText: Copyright (c) 2024 Intel Corporation
  */
 
 #include "rx_fastmetadata_app.h"
diff --git a/app/src/rx_fastmetadata_app.h b/app/src/rx_fastmetadata_app.h
index 66b36b1be..e4b50f923 100644
--- a/app/src/rx_fastmetadata_app.h
+++ b/app/src/rx_fastmetadata_app.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2022 Intel Corporation
+ * SPDX-FileCopyrightText: Copyright (c) 2024 Intel Corporation
  */
 
 #include <fcntl.h>
@@ -19,4 +19,4 @@ int st_app_rx_fmd_sessions_uinit(struct st_app_context* ctx);
 
 int st_app_rx_fmd_sessions_result(struct st_app_context* ctx);
 
-#endif
\ No newline at end of file
+#endif /* _RX_APP_FMD_HEAD_H_ */
\ No newline at end of file
diff --git a/app/src/tx_fastmetadata_app.c b/app/src/tx_fastmetadata_app.c
index 457c74403..b3c422ecf 100644
--- a/app/src/tx_fastmetadata_app.c
+++ b/app/src/tx_fastmetadata_app.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2022 Intel Corporation
+ * SPDX-FileCopyrightText: Copyright (c) 2024 Intel Corporation
  */
 
 #include "tx_fastmetadata_app.h"
diff --git a/app/src/tx_fastmetadata_app.h b/app/src/tx_fastmetadata_app.h
index 01a2e9b5d..06f79b0fd 100644
--- a/app/src/tx_fastmetadata_app.h
+++ b/app/src/tx_fastmetadata_app.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2022 Intel Corporation
+ * SPDX-FileCopyrightText: Copyright (c) 2024 Intel Corporation
  */
 
 #include <fcntl.h>
@@ -16,4 +16,4 @@ int st_app_tx_fmd_sessions_init(struct st_app_context* ctx);
 
 int st_app_tx_fmd_sessions_uinit(struct st_app_context* ctx);
 int st_app_tx_fmd_sessions_stop(struct st_app_context* ctx);
-#endif
\ No newline at end of file
+#endif /* _TX_APP_FMD_HEAD_H_ */
\ No newline at end of file
diff --git a/include/st41_api.h b/include/st41_api.h
index 1f8678eb0..acd4c583a 100644
--- a/include/st41_api.h
+++ b/include/st41_api.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2022 Intel Corporation
+ * SPDX-FileCopyrightText: Copyright (c) 2024 Intel Corporation
  */
 
 /**
@@ -437,4 +437,4 @@ int st41_rx_get_queue_meta(st41_rx_handle handle, struct st_queue_meta* meta);
 }
 #endif
 
-#endif
+#endif /* _ST41_API_HEAD_H_ */
diff --git a/lib/src/st2110/st_fastmetadata_transmitter.c b/lib/src/st2110/st_fastmetadata_transmitter.c
index b0f762067..081116144 100644
--- a/lib/src/st2110/st_fastmetadata_transmitter.c
+++ b/lib/src/st2110/st_fastmetadata_transmitter.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2022 Intel Corporation
+ * SPDX-FileCopyrightText: Copyright (c) 2024 Intel Corporation
  */
 
 #include "st_fastmetadata_transmitter.h"
diff --git a/lib/src/st2110/st_fastmetadata_transmitter.h b/lib/src/st2110/st_fastmetadata_transmitter.h
index 513dcee47..78eb2991b 100644
--- a/lib/src/st2110/st_fastmetadata_transmitter.h
+++ b/lib/src/st2110/st_fastmetadata_transmitter.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2022 Intel Corporation
+ * SPDX-FileCopyrightText: Copyright (c) 2024 Intel Corporation
  */
 
 #ifndef _ST_LIB_FASTMETADATA_TRANSMITTER_HEAD_H_
diff --git a/lib/src/st2110/st_rx_fastmetadata_session.c b/lib/src/st2110/st_rx_fastmetadata_session.c
index d7ae2daca..e915e3a09 100644
--- a/lib/src/st2110/st_rx_fastmetadata_session.c
+++ b/lib/src/st2110/st_rx_fastmetadata_session.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2022 Intel Corporation
+ * SPDX-FileCopyrightText: Copyright (c) 2024 Intel Corporation
  */
 
 #include "st_rx_fastmetadata_session.h"
diff --git a/lib/src/st2110/st_rx_fastmetadata_session.h b/lib/src/st2110/st_rx_fastmetadata_session.h
index 1d42c6d8f..a1014ab6e 100644
--- a/lib/src/st2110/st_rx_fastmetadata_session.h
+++ b/lib/src/st2110/st_rx_fastmetadata_session.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2022 Intel Corporation
+ * SPDX-FileCopyrightText: Copyright (c) 2024 Intel Corporation
  */
 
 #ifndef _ST_LIB_RX_FASTMETADATA_SESSION_HEAD_H_
@@ -13,4 +13,4 @@
 
 int st_rx_fastmetadata_sessions_sch_uinit(struct mtl_sch_impl* sch);
 
-#endif
\ No newline at end of file
+#endif /* _ST_LIB_RX_FASTMETADATA_SESSION_HEAD_H_ */
\ No newline at end of file
diff --git a/lib/src/st2110/st_tx_fastmetadata_session.c b/lib/src/st2110/st_tx_fastmetadata_session.c
index 12e880474..1dcacd110 100644
--- a/lib/src/st2110/st_tx_fastmetadata_session.c
+++ b/lib/src/st2110/st_tx_fastmetadata_session.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2022 Intel Corporation
+ * SPDX-FileCopyrightText: Copyright (c) 2024 Intel Corporation
  */
 
 #include "st_tx_fastmetadata_session.h"
diff --git a/lib/src/st2110/st_tx_fastmetadata_session.h b/lib/src/st2110/st_tx_fastmetadata_session.h
index 106ffa3e2..1169ee1e0 100644
--- a/lib/src/st2110/st_tx_fastmetadata_session.h
+++ b/lib/src/st2110/st_tx_fastmetadata_session.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2022 Intel Corporation
+ * SPDX-FileCopyrightText: Copyright (c) 2024 Intel Corporation
  */
 
 #ifndef _ST_LIB_TX_FASTMETADATA_SESSION_HEAD_H_
@@ -11,4 +11,4 @@
 
 int st_tx_fastmetadata_sessions_sch_uinit(struct mtl_sch_impl* sch);
 
-#endif
+#endif /* _ST_LIB_TX_FASTMETADATA_SESSION_HEAD_H_ */