diff --git a/LEGO1/mxdirectx/mxdirectxinfo.h b/LEGO1/mxdirectx/mxdirectxinfo.h
index ba6b1f00..3fbecfc8 100644
--- a/LEGO1/mxdirectx/mxdirectxinfo.h
+++ b/LEGO1/mxdirectx/mxdirectxinfo.h
@@ -168,12 +168,12 @@ struct MxDriver {
 // TEMPLATE: CONFIG 0x401b00
 // TEMPLATE: LEGO1 0x1009c400
 // TEMPLATE: BETA10 0x1011fad0
-// list<Direct3DDeviceInfo,allocator<Direct3DDeviceInfo> >::insert
+// ?insert@?$list@UDirect3DDeviceInfo@@V?$allocator@UDirect3DDeviceInfo@@@@@@QAE?AViterator@1@V21@ABUDirect3DDeviceInfo@@@Z
 
 // TEMPLATE: CONFIG 0x401b60
 // TEMPLATE: LEGO1 0x1009c460
 // TEMPLATE: BETA10 0x1011f9a0
-// list<MxDisplayMode,allocator<MxDisplayMode> >::insert
+// ?insert@?$list@UMxDisplayMode@@V?$allocator@UMxDisplayMode@@@@@@QAE?AViterator@1@V21@ABUMxDisplayMode@@@Z
 
 // SYNTHETIC: CONFIG 0x402be0
 // SYNTHETIC: LEGO1 0x1009d450
@@ -248,34 +248,38 @@ class MxDeviceEnumerate {
 // list<Direct3DDeviceInfo,allocator<Direct3DDeviceInfo> >::iterator::operator*
 
 // TEMPLATE: BETA10 0x1011c200
-// list<Direct3DDeviceInfo,allocator<Direct3DDeviceInfo> >::iterator::operator++
+// ??Eiterator@?$list@UDirect3DDeviceInfo@@V?$allocator@UDirect3DDeviceInfo@@@@@@QAE?AV01@H@Z
 
 // TEMPLATE: BETA10 0x1011c290
-// list<Direct3DDeviceInfo,allocator<Direct3DDeviceInfo> >::begin
+// ?begin@?$list@UDirect3DDeviceInfo@@V?$allocator@UDirect3DDeviceInfo@@@@@@QAE?AViterator@1@XZ
+// Note: could also be
+// ?begin@?$list@UDirect3DDeviceInfo@@V?$allocator@UDirect3DDeviceInfo@@@@@@QBE?AVconst_iterator@1@XZ
 
 // TEMPLATE: BETA10 0x1011c300
-// list<Direct3DDeviceInfo,allocator<Direct3DDeviceInfo> >::end
+// ?end@?$list@UDirect3DDeviceInfo@@V?$allocator@UDirect3DDeviceInfo@@@@@@QAE?AViterator@1@XZ
+// Note: could also be
+// ?end@?$list@UDirect3DDeviceInfo@@V?$allocator@UDirect3DDeviceInfo@@@@@@QBE?AVconst_iterator@1@XZ
 
 // TEMPLATE: BETA10 0x1011c4d0
 // list<MxDriver,allocator<MxDriver> >::iterator::operator*
 
 // TEMPLATE: BETA10 0x1011c520
-// list<MxDriver,allocator<MxDriver> >::iterator::operator++
+// ??Eiterator@?$list@UMxDriver@@V?$allocator@UMxDriver@@@@@@QAE?AV01@H@Z
 
 // TEMPLATE: BETA10 0x1011c560
-// list<MxDriver,allocator<MxDriver> >::iterator::operator++
+// ??Eiterator@?$list@UMxDriver@@V?$allocator@UMxDriver@@@@@@QAEAAV01@XZ
 
 // TEMPLATE: BETA10 0x1011c590
 // list<MxDriver,allocator<MxDriver> >::_Acc::_Next
 
 // TEMPLATE: BETA10 0x1011c5b0
-// list<MxDriver,allocator<MxDriver> >::begin
+// ?begin@?$list@UMxDriver@@V?$allocator@UMxDriver@@@@@@QAE?AViterator@1@XZ
 
 // TEMPLATE: BETA10 0x1011c5f0
 // list<MxDriver,allocator<MxDriver> >::iterator::iterator
 
 // TEMPLATE: BETA10 0x1011c620
-// list<MxDriver,allocator<MxDriver> >::end
+// ?end@?$list@UMxDriver@@V?$allocator@UMxDriver@@@@@@QAE?AViterator@1@XZ
 
 // TEMPLATE: BETA10 0x1011c690
 // ??9@YAHABViterator@?$list@UMxDriver@@V?$allocator@UMxDriver@@@@@@0@Z
@@ -290,10 +294,10 @@ class MxDeviceEnumerate {
 // list<Direct3DDeviceInfo,allocator<Direct3DDeviceInfo> >::size
 
 // TEMPLATE: BETA10 0x1011d3e0
-// list<Direct3DDeviceInfo,allocator<Direct3DDeviceInfo> >::erase
+// ?erase@?$list@UDirect3DDeviceInfo@@V?$allocator@UDirect3DDeviceInfo@@@@@@QAE?AViterator@1@V21@@Z
 
 // TEMPLATE: BETA10 0x1011d570
-// list<MxDriver,allocator<MxDriver> >::erase
+// ?erase@?$list@UMxDriver@@V?$allocator@UMxDriver@@@@@@QAE?AViterator@1@V21@@Z
 
 // TEMPLATE: BETA10 0x1011d6a0
 // list<MxDriver,allocator<MxDriver> >::_Freenode
diff --git a/LEGO1/omni/include/mxatom.h b/LEGO1/omni/include/mxatom.h
index 44d467e3..b28b2187 100644
--- a/LEGO1/omni/include/mxatom.h
+++ b/LEGO1/omni/include/mxatom.h
@@ -144,7 +144,7 @@ class MxAtomId {
 // clang-format off
 // TEMPLATE: LEGO1 0x100af7e0
 // TEMPLATE: BETA10 0x10131210
-// _Tree<MxAtom *,MxAtom *,set<MxAtom *,MxAtomCompare,allocator<MxAtom *> >::_Kfn,MxAtomCompare,allocator<MxAtom *> >::erase
+// ?erase@?$_Tree@PAVMxAtom@@PAV1@U_Kfn@?$set@PAVMxAtom@@UMxAtomCompare@@V?$allocator@PAVMxAtom@@@@@@UMxAtomCompare@@V?$allocator@PAVMxAtom@@@@@@QAE?AViterator@1@V21@0@Z
 // clang-format on
 
 // clang-format off
@@ -178,7 +178,9 @@ class MxAtomId {
 
 // clang-format off
 // TEMPLATE: BETA10 0x10132170
-// _Tree<MxAtom *,MxAtom *,set<MxAtom *,MxAtomCompare,allocator<MxAtom *> >::_Kfn,MxAtomCompare,allocator<MxAtom *> >::begin
+// ?begin@?$_Tree@PAVMxAtom@@PAV1@U_Kfn@?$set@PAVMxAtom@@UMxAtomCompare@@V?$allocator@PAVMxAtom@@@@@@UMxAtomCompare@@V?$allocator@PAVMxAtom@@@@@@QAE?AViterator@1@XZ
+// Note: could also be
+// ?begin@?$_Tree@PAVMxAtom@@PAV1@U_Kfn@?$set@PAVMxAtom@@UMxAtomCompare@@V?$allocator@PAVMxAtom@@@@@@UMxAtomCompare@@V?$allocator@PAVMxAtom@@@@@@QBE?AVconst_iterator@1@XZ
 // clang-format on
 
 // TEMPLATE: BETA10 0x101321d0
diff --git a/LEGO1/omni/include/mxparam.h b/LEGO1/omni/include/mxparam.h
index 57df088e..75ab4eac 100644
--- a/LEGO1/omni/include/mxparam.h
+++ b/LEGO1/omni/include/mxparam.h
@@ -14,7 +14,7 @@ class MxParam {
 };
 
 // SYNTHETIC: BETA10 0x10013710
-// MxParam::MxParam
+// ??0MxParam@@QAE@XZ
 
 // SYNTHETIC: ISLE 0x401540
 // SYNTHETIC: LEGO1 0x10010370
diff --git a/LEGO1/omni/include/mxstreamer.h b/LEGO1/omni/include/mxstreamer.h
index 208f3ce1..1b5a7082 100644
--- a/LEGO1/omni/include/mxstreamer.h
+++ b/LEGO1/omni/include/mxstreamer.h
@@ -134,7 +134,7 @@ class MxStreamer : public MxCore {
 // list<MxStreamController *,allocator<MxStreamController *> >::end
 
 // TEMPLATE: BETA10 0x101461b0
-// list<MxStreamController *,allocator<MxStreamController *> >::iterator::operator++
+// ??Eiterator@?$list@PAVMxStreamController@@V?$allocator@PAVMxStreamController@@@@@@QAE?AV01@H@Z
 
 // SYNTHETIC: LEGO1 0x100b9120
 // SYNTHETIC: BETA10 0x101466e0
diff --git a/LEGO1/viewmanager/viewlodlist.h b/LEGO1/viewmanager/viewlodlist.h
index 60847caf..61a5487e 100644
--- a/LEGO1/viewmanager/viewlodlist.h
+++ b/LEGO1/viewmanager/viewlodlist.h
@@ -128,7 +128,7 @@ class ViewLODListManager {
 
 // TEMPLATE: LEGO1 0x100a7960
 // TEMPLATE: BETA10 0x1017ab40
-// _Tree<char const *,pair<char const * const,ViewLODList *>,map<char const *,ViewLODList *,ROINameComparator,allocator<ViewLODList *> >::_Kfn,ROINameComparator,allocator<ViewLODList *> >::erase
+// ?erase@?$_Tree@PBDU?$pair@QBDPAVViewLODList@@@@U_Kfn@?$map@PBDPAVViewLODList@@UROINameComparator@@V?$allocator@PAVViewLODList@@@@@@UROINameComparator@@V?$allocator@PAVViewLODList@@@@@@QAE?AViterator@1@V21@0@Z
 
 // TEMPLATE: LEGO1 0x100a7db0
 // TEMPLATE: BETA10 0x1017aca0
@@ -156,7 +156,7 @@ class ViewLODListManager {
 // map<char const *,ViewLODList *,ROINameComparator,allocator<ViewLODList *> >::begin
 
 // TEMPLATE: BETA10 0x10179070
-// map<char const *,ViewLODList *,ROINameComparator,allocator<ViewLODList *> >::end
+// ?end@?$map@PBDPAVViewLODList@@UROINameComparator@@V?$allocator@PAVViewLODList@@@@@@QAE?AViterator@?$_Tree@PBDU?$pair@QBDPAVViewLODList@@@@U_Kfn@?$map@PBDPAVViewLODList@@UROINameComparator@@V?$allocator@PAVViewLODList@@@@@@UROINameComparator@@V?$allocator@
 
 // TEMPLATE: BETA10 0x10179250
 // pair<char const * const,ViewLODList *>::pair<char const * const,ViewLODList *>