diff --git a/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py b/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py
index fdf96b3..7438bcb 100644
--- a/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py
+++ b/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py
@@ -20,15 +20,13 @@
 
         self.runCmd("settings set target.import-std-module true")
 
+        size_type = "size_type"
+        value_type = "value_type"
+        iterator = "iterator"
+        riterator = "reverse_iterator"
 
         # Test inspecting an array of integers.
         array_type = "std::array<int, 3>"
-        size_type = "std::array::size_type"
-        value_type = array_type + "::value_type"
-
-        iterator = array_type + "::iterator"
-        riterator = array_type + "::reverse_iterator"
-
         self.expect_expr("a",
                          result_type=array_type,
                          result_children=[
@@ -55,11 +53,7 @@
 
         # Same again with an array that has an element type from debug info.
         array_type = "std::array<DbgInfo, 1>"
-        size_type = "std::array::size_type"
-        value_type = array_type + "::value_type"
 
-        iterator = array_type + "::iterator"
-        riterator = array_type + "::reverse_iterator"
         dbg_info_elem_children = [ValueCheck(value="4")]
         dbg_info_elem = [ValueCheck(children=dbg_info_elem_children)]
 
diff --git a/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py b/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py
index 26b3dbf..44327c9 100644
--- a/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py
+++ b/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py
@@ -21,14 +21,14 @@
         self.runCmd("settings set target.import-std-module true")
 
         deque_type = "std::deque<int>"
-        size_type = deque_type + "::size_type"
-        value_type = "std::__deque_base<int, std::allocator<int> >::value_type"
-        iterator = deque_type + "::iterator"
+        size_type = "size_type"
+        value_type = "value_type"
+        iterator = "iterator"
         iterator_children = [
             ValueCheck(name="__m_iter_"),
             ValueCheck(name="__ptr_")
         ]
-        riterator = deque_type + "::reverse_iterator"
+        riterator = "reverse_iterator"
         riterator_children = [
             ValueCheck(name="__t"),
             ValueCheck(name="current")
diff --git a/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py b/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py
index b66477c..ff32eed 100644
--- a/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py
+++ b/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py
@@ -21,16 +21,16 @@
         self.runCmd("settings set target.import-std-module true")
 
         deque_type = "std::deque<Foo>"
-        size_type = deque_type + "::size_type"
-        value_type = "std::__deque_base<Foo, std::allocator<Foo> >::value_type"
+        size_type = "size_type"
+        value_type = "value_type"
 
-        iterator_type = deque_type + "::iterator"
+        iterator_type = "iterator"
         iterator_children = [
             ValueCheck(name="__m_iter_"),
             ValueCheck(name="__ptr_")
         ]
 
-        riterator_type = deque_type + "::reverse_iterator"
+        riterator_type = "reverse_iterator"
         riterator_children = [
             ValueCheck(name="__t"),
             ValueCheck(name="current")
diff --git a/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py b/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py
index 1f66452..f9b7219 100644
--- a/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py
+++ b/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py
@@ -21,7 +21,7 @@
         self.runCmd("settings set target.import-std-module true")
 
         list_type = "std::forward_list<Foo>"
-        value_type = list_type + "::value_type"
+        value_type = "value_type"
 
         # FIXME: This has three elements in it but the formatter seems to
         # calculate the wrong size and contents.
diff --git a/test/API/commands/expression/import-std-module/forward_list/TestForwardListFromStdModule.py b/test/API/commands/expression/import-std-module/forward_list/TestForwardListFromStdModule.py
index 08a680d..0b6ca83 100644
--- a/test/API/commands/expression/import-std-module/forward_list/TestForwardListFromStdModule.py
+++ b/test/API/commands/expression/import-std-module/forward_list/TestForwardListFromStdModule.py
@@ -21,7 +21,7 @@
         self.runCmd("settings set target.import-std-module true")
 
         list_type = "std::forward_list<int>"
-        value_type = list_type + "::value_type"
+        value_type = "value_type"
 
         # FIXME: This has three elements in it but the formatter seems to
         # calculate the wrong size and contents.
diff --git a/test/API/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentListFromStdModule.py b/test/API/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentListFromStdModule.py
index b4740d2..32b838c 100644
--- a/test/API/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentListFromStdModule.py
+++ b/test/API/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentListFromStdModule.py
@@ -22,8 +22,8 @@
         self.runCmd("settings set target.import-std-module true")
 
         list_type = "std::list<Foo>"
-        size_type = list_type + "::size_type"
-        value_type = list_type + "::value_type"
+        size_type = "size_type"
+        value_type = "value_type"
 
         self.expect_expr("a",
                          result_type=list_type,
diff --git a/test/API/commands/expression/import-std-module/list/TestListFromStdModule.py b/test/API/commands/expression/import-std-module/list/TestListFromStdModule.py
index 9f1fc37..fe496bc 100644
--- a/test/API/commands/expression/import-std-module/list/TestListFromStdModule.py
+++ b/test/API/commands/expression/import-std-module/list/TestListFromStdModule.py
@@ -21,11 +21,11 @@
         self.runCmd("settings set target.import-std-module true")
 
         list_type = "std::list<int>"
-        size_type = list_type + "::size_type"
-        value_type = list_type + "::value_type"
+        size_type = "size_type"
+        value_type = "value_type"
 
-        iteratorvalue = "std::__list_iterator<int, void *>::value_type"
-        riterator_value = "std::__list_iterator<int, void *>::value_type"
+        iteratorvalue = "value_type"
+        riterator_value = "value_type"
 
         self.expect_expr("a",
                          result_type=list_type,
diff --git a/test/API/commands/expression/import-std-module/queue/TestQueueFromStdModule.py b/test/API/commands/expression/import-std-module/queue/TestQueueFromStdModule.py
index 59df9cf..634bd8f 100644
--- a/test/API/commands/expression/import-std-module/queue/TestQueueFromStdModule.py
+++ b/test/API/commands/expression/import-std-module/queue/TestQueueFromStdModule.py
@@ -21,8 +21,8 @@
         self.runCmd("settings set target.import-std-module true")
 
         queue_type = "std::queue<C>"
-        size_type = queue_type + "::size_type"
-        value_type = "std::__deque_base<C, std::allocator<C> >::value_type"
+        size_type = "size_type"
+        value_type = "value_type"
 
         # Test std::queue functionality with a std::deque.
         self.expect_expr(
@@ -53,8 +53,6 @@
 
         # Test std::queue functionality with a std::list.
         queue_type = "std::queue<C, std::list<C> >"
-        size_type = queue_type + "::size_type"
-        value_type = "std::list<C>::value_type"
         self.expect_expr(
             "q_list",
             result_type=queue_type,
diff --git a/test/API/commands/expression/import-std-module/vector-bool/TestVectorBoolFromStdModule.py b/test/API/commands/expression/import-std-module/vector-bool/TestVectorBoolFromStdModule.py
index 024b61e..659e329 100644
--- a/test/API/commands/expression/import-std-module/vector-bool/TestVectorBoolFromStdModule.py
+++ b/test/API/commands/expression/import-std-module/vector-bool/TestVectorBoolFromStdModule.py
@@ -19,7 +19,7 @@
                                           lldb.SBFileSpec("main.cpp"))
 
         vector_type = "std::vector<bool>"
-        size_type = vector_type + "::size_type"
+        size_type = "size_type"
 
         self.runCmd("settings set target.import-std-module true")
 
diff --git a/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py b/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py
index 92dfa02..c2044ce 100644
--- a/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py
+++ b/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py
@@ -22,12 +22,12 @@
         self.runCmd("settings set target.import-std-module true")
 
         vector_type = "std::vector<Foo>"
-        size_type = vector_type + "::size_type"
-        value_type = vector_type + "::value_type"
-        iterator = vector_type + "::iterator"
+        size_type = "size_type"
+        value_type = "value_type"
+        iterator = "iterator"
         # LLDB's formatter provides us with a artificial 'item' member.
         iterator_children = [ValueCheck(name="item")]
-        riterator = vector_type + "::reverse_iterator"
+        riterator = "reverse_iterator"
         riterator_children = [
             ValueCheck(name="__t"),
             ValueCheck(name="current")
diff --git a/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py b/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
index 8a98900..d843ced 100644
--- a/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
+++ b/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
@@ -20,7 +20,8 @@
 
         vector_type = "std::vector<int>"
         vector_of_vector_type = "std::vector<" + vector_type + " >"
-        size_type = vector_of_vector_type + "::size_type"
+        size_type = "size_type"
+        value_type = "value_type"
 
         self.runCmd("settings set target.import-std-module true")
 
@@ -42,12 +43,8 @@
                            ]),
             ])
         self.expect_expr("a.size()", result_type=size_type, result_value="2")
-        front = self.expect_expr("a.front().front()", result_value="1")
-        value_type = front.GetDisplayTypeName()
-        self.assertIn(value_type, [
-            "std::vector<int>::value_type", # Pre-D112976
-            "std::__vector_base<int, std::allocator<int> >::value_type", # Post-D112976
-            ])
+        front = self.expect_expr("a.front().front()", result_type=value_type,
+                                 result_value="1")
         self.expect_expr("a[1][1]", result_type=value_type, result_value="2")
         self.expect_expr("a.back().at(0)",
                          result_type=value_type,
diff --git a/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py b/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py
index b83e50d..59b3e4f 100644
--- a/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py
+++ b/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py
@@ -21,11 +21,12 @@
         self.runCmd("settings set target.import-std-module true")
 
         vector_type = "std::vector<int>"
-        size_type = vector_type + "::size_type"
-        iterator = vector_type + "::iterator"
+        size_type = "size_type"
+        value_type = "value_type"
+        iterator = "iterator"
         # LLDB's formatter provides us with a artificial 'item' member.
         iterator_children = [ValueCheck(name="item")]
-        riterator = vector_type + "::reverse_iterator"
+        riterator = "reverse_iterator"
         riterator_children = [
             ValueCheck(name="__t"),
             ValueCheck(name="current")
@@ -39,12 +40,8 @@
                              ValueCheck(value="2")
                          ])
         self.expect_expr("a.size()", result_type=size_type, result_value="3")
-        front = self.expect_expr("a.front()", result_value="3")
-        value_type = front.GetDisplayTypeName()
-        self.assertIn(value_type, [
-            "std::vector<int>::value_type", # Pre-D112976
-            "std::__vector_base<int, std::allocator<int> >::value_type", # Post-D112976
-            ])
+        front = self.expect_expr("a.front()", result_type=value_type,
+                                 result_value="3")
         self.expect_expr("a[1]", result_type=value_type, result_value="1")
         self.expect_expr("a.back()", result_type=value_type, result_value="2")