diff --git a/source/blender/editors/interface/interface_templates.cc b/source/blender/editors/interface/interface_templates.cc
index 748ff9f7294..af6f8687aaa 100644
--- a/source/blender/editors/interface/interface_templates.cc
+++ b/source/blender/editors/interface/interface_templates.cc
@@ -3141,7 +3141,7 @@ void uiTemplatePreview(uiLayout *layout,
   Tex *tex = (Tex *)id;
   short *pr_texture = nullptr;
 
-  char _preview_id[UI_MAX_NAME_STR];
+  char _preview_id[sizeof(uiPreview::preview_id)];
 
   if (id && !ELEM(GS(id->name), ID_MA, ID_TE, ID_WO, ID_LA, ID_LS)) {
     RNA_warning("Expected ID of type material, texture, light, world or line style");
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h
index 57b46329b51..4f5cb4fb245 100644
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@ -152,7 +152,7 @@ typedef struct Panel {
   /** Runtime for drawing. */
   struct uiLayout *layout;
 
-  /** Defined as UI_MAX_NAME_STR. */
+  /** Defined as #BKE_ST_MAXNAME. */
   char panelname[64];
   /** Panel name is identifier for restoring location. */
   char *drawname;
@@ -329,7 +329,7 @@ typedef struct TransformOrientation {
 typedef struct uiPreview {
   struct uiPreview *next, *prev;
 
-  /** Defined as #UI_MAX_NAME_STR. */
+  /** Defined as #BKE_ST_MAXNAME. */
   char preview_id[64];
   short height;
   char _pad1[6];