diff --git a/solenv/gdb/libreoffice/sal.py b/solenv/gdb/libreoffice/sal.py
index 00923a7bfdb0..8dcfaebe66e1 100644
--- a/solenv/gdb/libreoffice/sal.py
+++ b/solenv/gdb/libreoffice/sal.py
@@ -147,10 +147,10 @@ def build_pretty_printers():
     printer.add('_rtl_String', RtlStringPrinter)
     printer.add('_rtl_uString', lambda name, val: RtlStringPrinter(name,
         val, 'utf-16le'))
-    printer.add('OString', StringPrinter)
-    printer.add('OUString', lambda name, val: StringPrinter(name, val, 'utf-16'))
-    printer.add('OStringBuffer', StringPrinter)
-    printer.add('OUStringBuffer', lambda name, val: StringPrinter(name, val, 'utf-16'))
+    printer.add('rtl::OString', StringPrinter)
+    printer.add('rtl::OUString', lambda name, val: StringPrinter(name, val, 'utf-16'))
+    printer.add('rtl::OStringBuffer', StringPrinter)
+    printer.add('rtl::OUStringBuffer', lambda name, val: StringPrinter(name, val, 'utf-16'))
     printer.add('sal_Unicode', SalUnicodePrinter, SalUnicodePrinter.query)
 
     # other stuff
diff --git a/solenv/gdb/libreoffice/util/uno.py b/solenv/gdb/libreoffice/util/uno.py
index 3790f075f925..648ea408a6d5 100644
--- a/solenv/gdb/libreoffice/util/uno.py
+++ b/solenv/gdb/libreoffice/util/uno.py
@@ -223,7 +223,7 @@ def make_uno_type(val):
     elif type_class == TypeClass.DOUBLE:
         uno_type = PrimitiveType(type_class, name, 'double')
     elif type_class == TypeClass.STRING:
-        uno_type = PrimitiveType(type_class, name, 'OUString')
+        uno_type = PrimitiveType(type_class, name, 'rtl::OUString')
     elif type_class == TypeClass.TYPE:
         uno_type = PrimitiveType(type_class, name, 'com::sun::star::uno::Type')
     elif type_class == TypeClass.ANY:
diff --git a/solenv/lldb/libreoffice/LO.py b/solenv/lldb/libreoffice/LO.py
index 31088af2aa32..3c1134ccadc4 100644
--- a/solenv/lldb/libreoffice/LO.py
+++ b/solenv/lldb/libreoffice/LO.py
@@ -99,8 +99,8 @@ def sal_unicode_string(buffer_ptr, length):
 # Automatically install the above summary functions when this is loaded
 def __lldb_init_module(debugger, dict):
     debugger.HandleCommand("type summary add --skip-references --python-function LO.rtl_String_summary rtl_String")
-    debugger.HandleCommand("type summary add --skip-pointers --skip-references --python-function LO.rtl_OString_summary OString")
+    debugger.HandleCommand("type summary add --skip-pointers --skip-references --python-function LO.rtl_OString_summary rtl::OString")
     debugger.HandleCommand("type summary add --skip-references --python-function LO.rtl_uString_summary rtl_uString")
-    debugger.HandleCommand("type summary add --skip-pointers --skip-references --python-function LO.rtl_OUString_summary OUString")
+    debugger.HandleCommand("type summary add --skip-pointers --skip-references --python-function LO.rtl_OUString_summary rtl::OUString")
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/solenv/vs/LibreOffice.natvis b/solenv/vs/LibreOffice.natvis
index ad16550d0504..409ccd5919c8 100644
--- a/solenv/vs/LibreOffice.natvis
+++ b/solenv/vs/LibreOffice.natvis
@@ -8,11 +8,11 @@
  *
 -->
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-  <Type Name="OUString">
+  <Type Name="rtl::OUString">
     <DisplayString>{*pData}</DisplayString>
     <StringView>*pData,su</StringView>
   </Type>
-  <Type Name="OString">
+  <Type Name="rtl::OString">
     <DisplayString>{*pData}</DisplayString>
     <StringView>*pData,s</StringView>
   </Type>
@@ -54,7 +54,7 @@
     <DisplayString Condition="pType->eTypeClass == 9" >{*((unsigned __int64*)pData),d} (UNSIGNED_HYPER)</DisplayString><!-- typelib_TypeClass_UNSIGNED_HYPER -->
     <DisplayString Condition="pType->eTypeClass == 10">{*((float*)pData)} (FLOAT)</DisplayString><!-- typelib_TypeClass_FLOAT -->
     <DisplayString Condition="pType->eTypeClass == 11">{*((double*)pData)} (DOUBLE)</DisplayString><!-- typelib_TypeClass_DOUBLE -->
-    <DisplayString Condition="pType->eTypeClass == 12">{*((OUString*)pData)} (STRING)</DisplayString><!-- typelib_TypeClass_STRING -->
+    <DisplayString Condition="pType->eTypeClass == 12">{*((rtl::OUString*)pData)} (STRING)</DisplayString><!-- typelib_TypeClass_STRING -->
     <DisplayString Condition="pType->eTypeClass == 13">{*((com::sun::star::uno::Type*)pData)} (TYPE)</DisplayString><!-- typelib_TypeClass_TYPE -->
     <DisplayString Condition="pType->eTypeClass == 14">{*((_uno_Any*)pData)} (ANY)</DisplayString><!-- typelib_TypeClass_ANY -->
     <DisplayString Condition="pType->eTypeClass == 15">{*((sal_Int32*)pData),d} (ENUM)</DisplayString><!-- typelib_TypeClass_ENUM -->