diff --git a/Panel.c b/Panel.c
index dc8a7e2cd..05e009403 100644
--- a/Panel.c
+++ b/Panel.c
@@ -289,7 +289,7 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
          }
          if (item.highlightAttr) {
             attrset(item.highlightAttr);
-            RichString_setAttr_preserveBold(&item, item.highlightAttr);
+            RichString_setAttr_preserveWithStandout(&item, item.highlightAttr);
             this->selectedLen = itemLen;
          }
          mvhline(y + line, x, ' ', this->w);
diff --git a/RichString.c b/RichString.c
index 9b24bc332..5842ef525 100644
--- a/RichString.c
+++ b/RichString.c
@@ -8,8 +8,6 @@ in the source distribution for its full text.
 #include "config.h" // IWYU pragma: keep
 
 #include "RichString.h"
-#include "ProvideCurses.h"
-#include "CRT.h"
 
 #include <assert.h>
 #include <ctype.h>
@@ -19,7 +17,6 @@ in the source distribution for its full text.
 
 #include "Macros.h"
 #include "XUtils.h"
-#include <stdio.h> // For printf
 
 
 #define charBytes(n) (sizeof(CharType) * (n))
@@ -222,7 +219,7 @@ void printRichStringComparison(cchar_t* before, cchar_t* after, int length, int
     }
 }
 
-void RichString_setAttrn_preserveBold(RichString* this, int attrs, int start, int finish) {
+void RichString_setAttrn_preserveWithStandout(RichString* this, int attrs, int start, int finish) {
     // Extract the foreground and background colors from the passed attrs
     int passed_color_pair_number = PAIR_NUMBER(attrs);
     short passed_fg_color = -1, passed_bg_color = -1;
@@ -280,9 +277,8 @@ void printAttrs(int attrs) {
 }
 
 
-void RichString_setAttr_preserveBold(RichString* this, int attrs) {
-//	printRichString(this);
-   RichString_setAttrn_preserveBold(this, attrs, 0, this->chlen - 1);
+void RichString_setAttr_preserveWithStandout(RichString* this, int attrs) {
+   RichString_setAttrn_preserveWithStandout(this, attrs, 0, this->chlen - 1);
 }
 
 int RichString_findChar(const RichString* this, char c, int start) {
diff --git a/RichString.h b/RichString.h
index f79b4d529..12e68fded 100644
--- a/RichString.h
+++ b/RichString.h
@@ -52,13 +52,13 @@ void RichString_rewind(RichString* this, int count);
 
 void RichString_setAttrn(RichString* this, int attrs, int start, int charcount);
 
-void RichString_setAttrn_preserveBold(RichString* this, int attrs, int start, int finish);
+void RichString_setAttrn_preserveWithStandout(RichString* this, int attrs, int start, int finish);
 
 int RichString_findChar(const RichString* this, char c, int start);
 
 void RichString_setAttr(RichString* this, int attrs);
 
-void RichString_setAttr_preserveBold(RichString* this, int attrs);
+void RichString_setAttr_preserveWithStandout(RichString* this, int attrs);
 
 void RichString_appendChr(RichString* this, int attrs, char c, int count);