diff --git a/src_nbgl/ui_approve_tx.c b/src_nbgl/ui_approve_tx.c
index cd8cfa5..7a0b9a0 100644
--- a/src_nbgl/ui_approve_tx.c
+++ b/src_nbgl/ui_approve_tx.c
@@ -17,8 +17,8 @@
 #define VALUE_MAX_LEN    79
 #define MAX_PAIRS        12  // Max 10 for plugins + 2 (Network and fees)
 
-static nbgl_layoutTagValue_t pairs[MAX_PAIRS];
-static nbgl_layoutTagValueList_t pairsList;
+static nbgl_contentTagValue_t pairs[MAX_PAIRS];
+static nbgl_contentTagValueList_t pairsList;
 // these buffers are used as circular
 static char title_buffer[MAX_PLUGIN_ITEMS][TAG_MAX_LEN];
 static char msg_buffer[MAX_PLUGIN_ITEMS][VALUE_MAX_LEN];
diff --git a/src_nbgl/ui_confirm_parameter_selector.c b/src_nbgl/ui_confirm_parameter_selector.c
index b2daa78..f9e06e9 100644
--- a/src_nbgl/ui_confirm_parameter_selector.c
+++ b/src_nbgl/ui_confirm_parameter_selector.c
@@ -24,7 +24,7 @@ static void long_press_cb(int token, uint8_t index, int page) {
 static void buildScreen(e_confirmation_type confirm_type) {
     static nbgl_genericContents_t contents = {0};
     static nbgl_content_t contentsList[3] = {0};
-    static nbgl_layoutTagValue_t pair = {0};
+    static nbgl_contentTagValue_t pair = {0};
     uint8_t nbContents = 0;
     uint32_t buf_size = SHARED_BUFFER_SIZE / 2;
 
diff --git a/src_nbgl/ui_display_privacy.c b/src_nbgl/ui_display_privacy.c
index 5dd8a9e..1d5eb8b 100644
--- a/src_nbgl/ui_display_privacy.c
+++ b/src_nbgl/ui_display_privacy.c
@@ -23,7 +23,7 @@ static void long_press_cb(int token, uint8_t index, int page) {
 static void buildFirstPage(const char *review_string) {
     static nbgl_genericContents_t contents = {0};
     static nbgl_content_t contentsList[3] = {0};
-    static nbgl_layoutTagValue_t pairs[2] = {0};
+    static nbgl_contentTagValue_t pairs[2] = {0};
     uint8_t nbContents = 0;
     uint8_t nbPairs = 0;
 
diff --git a/src_nbgl/ui_sign_712.c b/src_nbgl/ui_sign_712.c
index b4707f8..de82582 100644
--- a/src_nbgl/ui_sign_712.c
+++ b/src_nbgl/ui_sign_712.c
@@ -9,7 +9,7 @@
 #include "ui_message_signing.h"
 #include "ui_signing.h"
 
-static nbgl_layoutTagValue_t pair;
+static nbgl_contentTagValue_t pair;
 
 static bool display_sign_page(uint8_t page, nbgl_pageContent_t *content) {
     (void) page;
diff --git a/src_nbgl/ui_sign_712_v0.c b/src_nbgl/ui_sign_712_v0.c
index 51e12ed..6c8a81d 100644
--- a/src_nbgl/ui_sign_712_v0.c
+++ b/src_nbgl/ui_sign_712_v0.c
@@ -6,8 +6,8 @@
 #include "ui_signing.h"
 #include "uint_common.h"
 
-static nbgl_layoutTagValue_t pairs[2];
-static nbgl_layoutTagValueList_t pairsList;
+static nbgl_contentTagValue_t pairs[2];
+static nbgl_contentTagValueList_t pairsList;
 
 static void messageReviewChoice_cb(bool confirm) {
     if (confirm) {
diff --git a/src_nbgl/ui_sign_message.c b/src_nbgl/ui_sign_message.c
index 50ec141..954b0c2 100644
--- a/src_nbgl/ui_sign_message.c
+++ b/src_nbgl/ui_sign_message.c
@@ -22,7 +22,7 @@ static e_ui_191_action g_action;
 
 static bool skip_message;
 
-static nbgl_layoutTagValue_t pair;
+static nbgl_contentTagValue_t pair;
 
 static uint32_t eip191MessageIdx = 0;
 static uint32_t stringsTmpTmpIdx = 0;