diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c
index db4b736d272..9d3adf67a6e 100644
--- a/dlls/msvcirt/msvcirt.c
+++ b/dlls/msvcirt/msvcirt.c
@@ -171,39 +171,39 @@ typedef struct {
 } iostream;
 
 /* ??_7streambuf@@6B@ */
-extern const vtable_ptr MSVCP_streambuf_vtable;
+extern const vtable_ptr streambuf_vtable;
 /* ??_7filebuf@@6B@ */
-extern const vtable_ptr MSVCP_filebuf_vtable;
+extern const vtable_ptr filebuf_vtable;
 /* ??_7strstreambuf@@6B@ */
-extern const vtable_ptr MSVCP_strstreambuf_vtable;
+extern const vtable_ptr strstreambuf_vtable;
 /* ??_7stdiobuf@@6B@ */
-extern const vtable_ptr MSVCP_stdiobuf_vtable;
+extern const vtable_ptr stdiobuf_vtable;
 /* ??_7ios@@6B@ */
-extern const vtable_ptr MSVCP_ios_vtable;
+extern const vtable_ptr ios_vtable;
 /* ??_7ostream@@6B@ */
-extern const vtable_ptr MSVCP_ostream_vtable;
+extern const vtable_ptr ostream_vtable;
 /* ??_7ostream_withassign@@6B@ */
-extern const vtable_ptr MSVCP_ostream_withassign_vtable;
+extern const vtable_ptr ostream_withassign_vtable;
 /* ??_7ostrstream@@6B@ */
-extern const vtable_ptr MSVCP_ostrstream_vtable;
+extern const vtable_ptr ostrstream_vtable;
 /* ??_7ofstream@@6B@ */
-extern const vtable_ptr MSVCP_ofstream_vtable;
+extern const vtable_ptr ofstream_vtable;
 /* ??_7istream@@6B@ */
-extern const vtable_ptr MSVCP_istream_vtable;
+extern const vtable_ptr istream_vtable;
 /* ??_7istream_withassign@@6B@ */
-extern const vtable_ptr MSVCP_istream_withassign_vtable;
+extern const vtable_ptr istream_withassign_vtable;
 /* ??_7istrstream@@6B@ */
-extern const vtable_ptr MSVCP_istrstream_vtable;
+extern const vtable_ptr istrstream_vtable;
 /* ??_7ifstream@@6B@ */
-extern const vtable_ptr MSVCP_ifstream_vtable;
+extern const vtable_ptr ifstream_vtable;
 /* ??_7iostream@@6B@ */
-extern const vtable_ptr MSVCP_iostream_vtable;
+extern const vtable_ptr iostream_vtable;
 /* ??_7strstream@@6B@ */
-extern const vtable_ptr MSVCP_strstream_vtable;
+extern const vtable_ptr strstream_vtable;
 /* ??_7stdiostream@@6B@ */
-extern const vtable_ptr MSVCP_stdiostream_vtable;
+extern const vtable_ptr stdiostream_vtable;
 /* ??_7fstream@@6B@ */
-extern const vtable_ptr MSVCP_fstream_vtable;
+extern const vtable_ptr fstream_vtable;
 
 __ASM_BLOCK_BEGIN(vtables)
     __ASM_VTABLE(streambuf,
@@ -357,7 +357,7 @@ DEFINE_THISCALL_WRAPPER(streambuf_reserve_ctor, 12)
 streambuf* __thiscall streambuf_reserve_ctor(streambuf *this, char *buffer, int length)
 {
     TRACE("(%p %p %d)\n", this, buffer, length);
-    this->vtable = &MSVCP_streambuf_vtable;
+    this->vtable = &streambuf_vtable;
     this->allocated = 0;
     this->stored_char = EOF;
     this->do_lock = -1;
@@ -386,7 +386,7 @@ streambuf* __thiscall streambuf_copy_ctor(streambuf *this, const streambuf *copy
 {
     TRACE("(%p %p)\n", this, copy);
     *this = *copy;
-    this->vtable = &MSVCP_streambuf_vtable;
+    this->vtable = &streambuf_vtable;
     return this;
 }
 
@@ -961,7 +961,7 @@ filebuf* __thiscall filebuf_copy_ctor(filebuf* this, const filebuf *copy)
 {
     TRACE("(%p %p)\n", this, copy);
     *this = *copy;
-    this->base.vtable = &MSVCP_filebuf_vtable;
+    this->base.vtable = &filebuf_vtable;
     return this;
 }
 
@@ -972,7 +972,7 @@ filebuf* __thiscall filebuf_fd_reserve_ctor(filebuf* this, filedesc fd, char *bu
 {
     TRACE("(%p %d %p %d)\n", this, fd, buffer, length);
     streambuf_reserve_ctor(&this->base, buffer, length);
-    this->base.vtable = &MSVCP_filebuf_vtable;
+    this->base.vtable = &filebuf_vtable;
     this->fd = fd;
     this->close = 0;
     return this;
@@ -1305,7 +1305,7 @@ strstreambuf* __thiscall strstreambuf_copy_ctor(strstreambuf *this, const strstr
 {
     TRACE("(%p %p)\n", this, copy);
     *this = *copy;
-    this->base.vtable = &MSVCP_strstreambuf_vtable;
+    this->base.vtable = &strstreambuf_vtable;
     return this;
 }
 
@@ -1316,7 +1316,7 @@ strstreambuf* __thiscall strstreambuf_dynamic_ctor(strstreambuf* this, int lengt
 {
     TRACE("(%p %d)\n", this, length);
     streambuf_ctor(&this->base);
-    this->base.vtable = &MSVCP_strstreambuf_vtable;
+    this->base.vtable = &strstreambuf_vtable;
     this->dynamic = 1;
     this->increase = length;
     this->constant = 0;
@@ -1361,7 +1361,7 @@ strstreambuf* __thiscall strstreambuf_buffer_ctor(strstreambuf *this, char *buff
         streambuf_setg(&this->base, buffer, buffer, put);
         streambuf_setp(&this->base, put, end_buffer);
     }
-    this->base.vtable = &MSVCP_strstreambuf_vtable;
+    this->base.vtable = &strstreambuf_vtable;
     this->dynamic = 0;
     this->constant = 1;
     return this;
@@ -1608,7 +1608,7 @@ stdiobuf* __thiscall stdiobuf_copy_ctor(stdiobuf *this, const stdiobuf *copy)
 {
     TRACE("(%p %p)\n", this, copy);
     *this = *copy;
-    this->base.vtable = &MSVCP_stdiobuf_vtable;
+    this->base.vtable = &stdiobuf_vtable;
     return this;
 }
 
@@ -1619,7 +1619,7 @@ stdiobuf* __thiscall stdiobuf_file_ctor(stdiobuf *this, FILE *file)
 {
     TRACE("(%p %p)\n", this, file);
     streambuf_reserve_ctor(&this->base, NULL, 0);
-    this->base.vtable = &MSVCP_stdiobuf_vtable;
+    this->base.vtable = &stdiobuf_vtable;
     this->file = file;
     return this;
 }
@@ -1835,7 +1835,7 @@ ios* __thiscall ios_copy_ctor(ios *this, const ios *copy)
 {
     TRACE("(%p %p)\n", this, copy);
     ios_fLockcInit++;
-    this->vtable = &MSVCP_ios_vtable;
+    this->vtable = &ios_vtable;
     this->sb = NULL;
     this->delbuf = 0;
     this->do_lock = -1;
@@ -1850,7 +1850,7 @@ ios* __thiscall ios_sb_ctor(ios *this, streambuf *sb)
 {
     TRACE("(%p %p)\n", this, sb);
     ios_fLockcInit++;
-    this->vtable = &MSVCP_ios_vtable;
+    this->vtable = &ios_vtable;
     this->sb = sb;
     this->state = sb ? IOSTATE_goodbit : IOSTATE_badbit;
     this->special[0] = this->special[1] = 0;
@@ -2381,7 +2381,7 @@ ostream* __thiscall ostream_ctor(ostream *this, BOOL virt_init)
         ios_ctor(base);
     } else
         base = ostream_get_ios(this);
-    base->vtable = &MSVCP_ostream_vtable;
+    base->vtable = &ostream_vtable;
     this->unknown = 0;
     return this;
 }
@@ -2977,7 +2977,7 @@ ostream* __thiscall ostream_withassign_copy_ctor(ostream *this, const ostream *c
     } else
         base = ostream_get_ios(this);
     ios_init(base, base_copy->sb);
-    base->vtable = &MSVCP_ostream_withassign_vtable;
+    base->vtable = &ostream_withassign_vtable;
     this->unknown = 0;
     return this;
 }
@@ -2993,7 +2993,7 @@ ostream* __thiscall ostream_withassign_sb_ctor(ostream *this, streambuf *sb, BOO
 
     ostream_sb_ctor(this, sb, virt_init);
     base = ostream_get_ios(this);
-    base->vtable = &MSVCP_ostream_withassign_vtable;
+    base->vtable = &ostream_withassign_vtable;
     return this;
 }
 
@@ -3008,7 +3008,7 @@ ostream* __thiscall ostream_withassign_ctor(ostream *this, BOOL virt_init)
 
     ostream_ctor(this, virt_init);
     base = ostream_get_ios(this);
-    base->vtable = &MSVCP_ostream_withassign_vtable;
+    base->vtable = &ostream_withassign_vtable;
     return this;
 }
 
@@ -3021,7 +3021,7 @@ static ostream* ostrstream_internal_sb_ctor(ostream *this, strstreambuf *ssb, BO
     else
         ostream_ctor(this, virt_init);
     base = ostream_get_ios(this);
-    base->vtable = &MSVCP_ostrstream_vtable;
+    base->vtable = &ostrstream_vtable;
     base->delbuf = 1;
     return this;
 }
@@ -3033,7 +3033,7 @@ ostream* __thiscall ostrstream_copy_ctor(ostream *this, const ostream *copy, BOO
 {
     TRACE("(%p %p %d)\n", this, copy, virt_init);
     ostream_withassign_copy_ctor(this, copy, virt_init);
-    ostream_get_ios(this)->vtable = &MSVCP_ostrstream_vtable;
+    ostream_get_ios(this)->vtable = &ostrstream_vtable;
     return this;
 }
 
@@ -3108,7 +3108,7 @@ ostream* __thiscall ofstream_copy_ctor(ostream *this, const ostream *copy, BOOL
 {
     TRACE("(%p %p %d)\n", this, copy, virt_init);
     ostream_withassign_copy_ctor(this, copy, virt_init);
-    ostream_get_ios(this)->vtable = &MSVCP_ofstream_vtable;
+    ostream_get_ios(this)->vtable = &ofstream_vtable;
     return this;
 }
 
@@ -3131,7 +3131,7 @@ ostream* __thiscall ofstream_buffer_ctor(ostream *this, filedesc fd, char *buffe
     ostream_sb_ctor(this, &fb->base, virt_init);
 
     base = ostream_get_ios(this);
-    base->vtable = &MSVCP_ofstream_vtable;
+    base->vtable = &ofstream_vtable;
     base->delbuf = 1;
 
     return this;
@@ -3156,7 +3156,7 @@ ostream* __thiscall ofstream_fd_ctor(ostream *this, filedesc fd, BOOL virt_init)
     ostream_sb_ctor(this, &fb->base, virt_init);
 
     base = ostream_get_ios(this);
-    base->vtable = &MSVCP_ofstream_vtable;
+    base->vtable = &ofstream_vtable;
     base->delbuf = 1;
 
     return this;
@@ -3181,7 +3181,7 @@ ostream* __thiscall ofstream_open_ctor(ostream *this, const char *name, int mode
     ostream_sb_ctor(this, &fb->base, virt_init);
 
     base = ostream_get_ios(this);
-    base->vtable = &MSVCP_ofstream_vtable;
+    base->vtable = &ofstream_vtable;
     base->delbuf = 1;
 
     if (filebuf_open(fb, name, mode|OPENMODE_out, protection) == NULL)
@@ -3316,7 +3316,7 @@ istream* __thiscall istream_ctor(istream *this, BOOL virt_init)
         ios_ctor(base);
     } else
         base = istream_get_ios(this);
-    base->vtable = &MSVCP_istream_vtable;
+    base->vtable = &istream_vtable;
     base->flags |= FLAGS_skipws;
     this->extract_delim = 0;
     this->count = 0;
@@ -4239,7 +4239,7 @@ istream* __thiscall istream_withassign_copy_ctor(istream *this, const istream *c
     } else
         base = istream_get_ios(this);
     ios_init(base, base_copy->sb);
-    base->vtable = &MSVCP_istream_withassign_vtable;
+    base->vtable = &istream_withassign_vtable;
     base->flags |= FLAGS_skipws;
     this->extract_delim = 0;
     this->count = 0;
@@ -4257,7 +4257,7 @@ istream* __thiscall istream_withassign_sb_ctor(istream *this, streambuf *sb, BOO
 
     istream_sb_ctor(this, sb, virt_init);
     base = istream_get_ios(this);
-    base->vtable = &MSVCP_istream_withassign_vtable;
+    base->vtable = &istream_withassign_vtable;
     return this;
 }
 
@@ -4272,7 +4272,7 @@ istream* __thiscall istream_withassign_ctor(istream *this, BOOL virt_init)
 
     istream_ctor(this, virt_init);
     base = istream_get_ios(this);
-    base->vtable = &MSVCP_istream_withassign_vtable;
+    base->vtable = &istream_withassign_vtable;
     return this;
 }
 
@@ -4283,7 +4283,7 @@ istream* __thiscall istrstream_copy_ctor(istream *this, const istream *copy, BOO
 {
     TRACE("(%p %p %d)\n", this, copy, virt_init);
     istream_withassign_copy_ctor(this, copy, virt_init);
-    istream_get_ios(this)->vtable = &MSVCP_istrstream_vtable;
+    istream_get_ios(this)->vtable = &istrstream_vtable;
     return this;
 }
 
@@ -4306,7 +4306,7 @@ istream* __thiscall istrstream_buffer_ctor(istream *this, char *buffer, int leng
     istream_sb_ctor(this, &ssb->base, virt_init);
 
     base = istream_get_ios(this);
-    base->vtable = &MSVCP_istrstream_vtable;
+    base->vtable = &istrstream_vtable;
     base->delbuf = 1;
     return this;
 }
@@ -4342,7 +4342,7 @@ istream* __thiscall ifstream_copy_ctor(istream *this, const istream *copy, BOOL
 {
     TRACE("(%p %p %d)\n", this, copy, virt_init);
     istream_withassign_copy_ctor(this, copy, virt_init);
-    istream_get_ios(this)->vtable = &MSVCP_ifstream_vtable;
+    istream_get_ios(this)->vtable = &ifstream_vtable;
     return this;
 }
 
@@ -4365,7 +4365,7 @@ istream* __thiscall ifstream_buffer_ctor(istream *this, filedesc fd, char *buffe
     istream_sb_ctor(this, &fb->base, virt_init);
 
     base = istream_get_ios(this);
-    base->vtable = &MSVCP_ifstream_vtable;
+    base->vtable = &ifstream_vtable;
     base->delbuf = 1;
 
     return this;
@@ -4390,7 +4390,7 @@ istream* __thiscall ifstream_fd_ctor(istream *this, filedesc fd, BOOL virt_init)
     istream_sb_ctor(this, &fb->base, virt_init);
 
     base = istream_get_ios(this);
-    base->vtable = &MSVCP_ifstream_vtable;
+    base->vtable = &ifstream_vtable;
     base->delbuf = 1;
 
     return this;
@@ -4415,7 +4415,7 @@ istream* __thiscall ifstream_open_ctor(istream *this, const char *name, ios_open
     istream_sb_ctor(this, &fb->base, virt_init);
 
     base = istream_get_ios(this);
-    base->vtable = &MSVCP_ifstream_vtable;
+    base->vtable = &ifstream_vtable;
     base->delbuf = 1;
 
     if (filebuf_open(fb, name, mode|OPENMODE_in, protection) == NULL)
@@ -4548,7 +4548,7 @@ iostream* __thiscall iostream_ctor(iostream *this, BOOL virt_init)
         base = istream_get_ios(&this->base1);
     istream_ctor(&this->base1, FALSE);
     ostream_ctor(&this->base2, FALSE);
-    base->vtable = &MSVCP_iostream_vtable;
+    base->vtable = &iostream_vtable;
     return this;
 }
 
@@ -4707,7 +4707,7 @@ DEFINE_THISCALL_WRAPPER(strstream_copy_ctor, 12)
 iostream* __thiscall strstream_copy_ctor(iostream *this, const iostream *copy, BOOL virt_init)
 {
     TRACE("(%p %p %d)\n", this, copy, virt_init);
-    return iostream_internal_copy_ctor(this, copy, &MSVCP_strstream_vtable, virt_init);
+    return iostream_internal_copy_ctor(this, copy, &strstream_vtable, virt_init);
 }
 
 /* ??0strstream@@QAE@PADHH@Z */
@@ -4729,7 +4729,7 @@ iostream* __thiscall strstream_buffer_ctor(iostream *this, char *buffer, int len
     if ((mode & OPENMODE_out) && (mode & (OPENMODE_app|OPENMODE_ate)))
         ssb->base.pptr = buffer + strlen(buffer);
 
-    return iostream_internal_sb_ctor(this, &ssb->base, &MSVCP_strstream_vtable, virt_init);
+    return iostream_internal_sb_ctor(this, &ssb->base, &strstream_vtable, virt_init);
 }
 
 /* ??0strstream@@QAE@XZ */
@@ -4748,7 +4748,7 @@ iostream* __thiscall strstream_ctor(iostream *this, BOOL virt_init)
 
     strstreambuf_ctor(ssb);
 
-    return iostream_internal_sb_ctor(this, &ssb->base, &MSVCP_strstream_vtable, virt_init);
+    return iostream_internal_sb_ctor(this, &ssb->base, &strstream_vtable, virt_init);
 }
 
 /* ?pcount@strstream@@QBEHXZ */
@@ -4781,7 +4781,7 @@ DEFINE_THISCALL_WRAPPER(stdiostream_copy_ctor, 12)
 iostream* __thiscall stdiostream_copy_ctor(iostream *this, const iostream *copy, BOOL virt_init)
 {
     TRACE("(%p %p %d)\n", this, copy, virt_init);
-    return iostream_internal_copy_ctor(this, copy, &MSVCP_stdiostream_vtable, virt_init);
+    return iostream_internal_copy_ctor(this, copy, &stdiostream_vtable, virt_init);
 }
 
 /* ??0stdiostream@@QAE@PAU_iobuf@@@Z */
@@ -4800,7 +4800,7 @@ iostream* __thiscall stdiostream_file_ctor(iostream *this, FILE *file, BOOL virt
 
     stdiobuf_file_ctor(stb, file);
 
-    return iostream_internal_sb_ctor(this, &stb->base, &MSVCP_stdiostream_vtable, virt_init);
+    return iostream_internal_sb_ctor(this, &stb->base, &stdiostream_vtable, virt_init);
 }
 
 /* ?rdbuf@stdiostream@@QBEPAVstdiobuf@@XZ */
@@ -4817,7 +4817,7 @@ DEFINE_THISCALL_WRAPPER(fstream_copy_ctor, 12)
 iostream* __thiscall fstream_copy_ctor(iostream *this, const iostream *copy, BOOL virt_init)
 {
     TRACE("(%p %p %d)\n", this, copy, virt_init);
-    iostream_internal_copy_ctor(this, copy, &MSVCP_fstream_vtable, virt_init);
+    iostream_internal_copy_ctor(this, copy, &fstream_vtable, virt_init);
     return this;
 }
 
@@ -4838,7 +4838,7 @@ iostream* __thiscall fstream_buffer_ctor(iostream *this, filedesc fd, char *buff
 
     filebuf_fd_reserve_ctor(fb, fd, buffer, length);
 
-    iostream_internal_sb_ctor(this, &fb->base, &MSVCP_fstream_vtable, virt_init);
+    iostream_internal_sb_ctor(this, &fb->base, &fstream_vtable, virt_init);
 
     base = istream_get_ios(&this->base1);
     base->delbuf = 1;
@@ -4863,7 +4863,7 @@ iostream* __thiscall fstream_fd_ctor(iostream *this, filedesc fd, BOOL virt_init
 
     filebuf_fd_ctor(fb, fd);
 
-    iostream_internal_sb_ctor(this, &fb->base, &MSVCP_fstream_vtable, virt_init);
+    iostream_internal_sb_ctor(this, &fb->base, &fstream_vtable, virt_init);
 
     base = istream_get_ios(&this->base1);
     base->delbuf = 1;
@@ -4888,7 +4888,7 @@ iostream* __thiscall fstream_open_ctor(iostream *this, const char *name, ios_ope
 
     filebuf_ctor(fb);
 
-    iostream_internal_sb_ctor(this, &fb->base, &MSVCP_fstream_vtable, virt_init);
+    iostream_internal_sb_ctor(this, &fb->base, &fstream_vtable, virt_init);
 
     base = istream_get_ios(&this->base1);
     base->delbuf = 1;
diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec
index 3d943e8a5c4..2d2168a9324 100644
--- a/dlls/msvcirt/msvcirt.spec
+++ b/dlls/msvcirt/msvcirt.spec
@@ -4,8 +4,8 @@
 @ cdecl -arch=win64 ??0Iostream_init@@QEAA@XZ(ptr) Iostream_init_ctor
 @ thiscall -arch=i386 ??0exception@@QAE@ABQBD@Z(ptr ptr) MSVCP_exception_ctor
 @ cdecl -arch=win64 ??0exception@@QEAA@AEBQEBD@Z(ptr ptr) MSVCP_exception_ctor
-@ thiscall -arch=i386 ??0exception@@QAE@ABV0@@Z(ptr ptr) MSVCP_exception_copy_ctor
-@ cdecl -arch=win64 ??0exception@@QEAA@AEBV0@@Z(ptr ptr) MSVCP_exception_copy_ctor
+@ thiscall -arch=i386 ??0exception@@QAE@ABV0@@Z(ptr ptr) exception_copy_ctor
+@ cdecl -arch=win64 ??0exception@@QEAA@AEBV0@@Z(ptr ptr) exception_copy_ctor
 @ thiscall -arch=i386 ??0exception@@QAE@XZ(ptr) MSVCP_exception_default_ctor
 @ cdecl -arch=win64 ??0exception@@QEAA@XZ(ptr) MSVCP_exception_default_ctor
 @ thiscall -arch=win32 ??0filebuf@@QAE@ABV0@@Z(ptr ptr) filebuf_copy_ctor
@@ -68,8 +68,8 @@
 @ cdecl -arch=win64 ??0istrstream@@QEAA@PEADH@Z(ptr ptr long long) istrstream_buffer_ctor
 @ thiscall -arch=win32 ??0logic_error@@QAE@ABQBD@Z(ptr ptr) MSVCP_logic_error_ctor
 @ cdecl -arch=win64 ??0logic_error@@QEAA@AEBQEBD@Z(ptr ptr) MSVCP_logic_error_ctor
-@ thiscall -arch=win32 ??0logic_error@@QAE@ABV0@@Z(ptr ptr) MSVCP_logic_error_copy_ctor
-@ cdecl -arch=win64 ??0logic_error@@QEAA@AEBV0@@Z(ptr ptr) MSVCP_logic_error_copy_ctor
+@ thiscall -arch=win32 ??0logic_error@@QAE@ABV0@@Z(ptr ptr) logic_error_copy_ctor
+@ cdecl -arch=win64 ??0logic_error@@QEAA@AEBV0@@Z(ptr ptr) logic_error_copy_ctor
 @ thiscall -arch=win32 ??0ofstream@@QAE@ABV0@@Z(ptr ptr long) ofstream_copy_ctor
 @ cdecl -arch=win64 ??0ofstream@@QEAA@AEBV0@@Z(ptr ptr long) ofstream_copy_ctor
 @ thiscall -arch=win32 ??0ofstream@@QAE@H@Z(ptr long long) ofstream_fd_ctor
@@ -302,25 +302,25 @@
 @ cdecl -arch=win64 ??7ios@@QEBAHXZ(ptr) ios_op_not
 @ thiscall -arch=win32 ??Bios@@QBEPAXXZ(ptr) ios_op_void
 @ cdecl -arch=win64 ??Bios@@QEBAPEAXXZ(ptr) ios_op_void
-@ extern ??_7exception@@6B@ MSVCP_exception_vtable
-@ extern ??_7filebuf@@6B@ MSVCP_filebuf_vtable
-@ extern ??_7fstream@@6B@ MSVCP_fstream_vtable
-@ extern ??_7ifstream@@6B@ MSVCP_ifstream_vtable
-@ extern ??_7ios@@6B@ MSVCP_ios_vtable
-@ extern ??_7iostream@@6B@ MSVCP_iostream_vtable
-@ extern ??_7istream@@6B@ MSVCP_istream_vtable
-@ extern ??_7istream_withassign@@6B@ MSVCP_istream_vtable
-@ extern ??_7istrstream@@6B@ MSVCP_istrstream_vtable
-@ extern ??_7logic_error@@6B@ MSVCP_logic_error_vtable
-@ extern ??_7ofstream@@6B@ MSVCP_ofstream_vtable
-@ extern ??_7ostream@@6B@ MSVCP_ostream_vtable
-@ extern ??_7ostream_withassign@@6B@ MSVCP_ostream_withassign_vtable
-@ extern ??_7ostrstream@@6B@ MSVCP_ostrstream_vtable
-@ extern ??_7stdiobuf@@6B@ MSVCP_stdiobuf_vtable
-@ extern ??_7stdiostream@@6B@ MSVCP_stdiostream_vtable
-@ extern ??_7streambuf@@6B@ MSVCP_streambuf_vtable
-@ extern ??_7strstream@@6B@ MSVCP_strstream_vtable
-@ extern ??_7strstreambuf@@6B@ MSVCP_strstreambuf_vtable
+@ extern ??_7exception@@6B@ exception_vtable
+@ extern ??_7filebuf@@6B@ filebuf_vtable
+@ extern ??_7fstream@@6B@ fstream_vtable
+@ extern ??_7ifstream@@6B@ ifstream_vtable
+@ extern ??_7ios@@6B@ ios_vtable
+@ extern ??_7iostream@@6B@ iostream_vtable
+@ extern ??_7istream@@6B@ istream_vtable
+@ extern ??_7istream_withassign@@6B@ istream_vtable
+@ extern ??_7istrstream@@6B@ istrstream_vtable
+@ extern ??_7logic_error@@6B@ logic_error_vtable
+@ extern ??_7ofstream@@6B@ ofstream_vtable
+@ extern ??_7ostream@@6B@ ostream_vtable
+@ extern ??_7ostream_withassign@@6B@ ostream_withassign_vtable
+@ extern ??_7ostrstream@@6B@ ostrstream_vtable
+@ extern ??_7stdiobuf@@6B@ stdiobuf_vtable
+@ extern ??_7stdiostream@@6B@ stdiostream_vtable
+@ extern ??_7streambuf@@6B@ streambuf_vtable
+@ extern ??_7strstream@@6B@ strstream_vtable
+@ extern ??_7strstreambuf@@6B@ strstreambuf_vtable
 @ extern ??_8fstream@@7Bistream@@@ iostream_vbtable_istream
 @ extern ??_8fstream@@7Bostream@@@  iostream_vbtable_ostream
 @ extern ??_8ifstream@@7B@ istream_vbtable
diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec
index a05d20dea4e..657cdc9f217 100644
--- a/dlls/msvcp100/msvcp100.spec
+++ b/dlls/msvcp100/msvcp100.spec
@@ -643,43 +643,43 @@
 @ cdecl -arch=win64 ??Bid@locale@std@@QEAA_KXZ(ptr) locale_id_operator_size_t
 @ thiscall -arch=win32 ??Bios_base@std@@QBEPAXXZ(ptr) ios_base_op_fail
 @ cdecl -arch=win64 ??Bios_base@std@@QEBAPEAXXZ(ptr) ios_base_op_fail
-@ extern ??_7?$basic_ios@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ios_char_vtable
-@ extern ??_7?$basic_ios@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ios_short_vtable
-@ extern ??_7?$basic_ios@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ios_wchar_vtable
-@ extern ??_7?$basic_iostream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_iostream_char_vtable
-@ extern ??_7?$basic_iostream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_iostream_short_vtable
-@ extern ??_7?$basic_iostream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_iostream_wchar_vtable
-@ extern ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_istream_char_vtable
-@ extern ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_istream_short_vtable
-@ extern ??_7?$basic_istream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_istream_wchar_vtable
-@ extern ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ostream_char_vtable
-@ extern ??_7?$basic_ostream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ostream_short_vtable
-@ extern ??_7?$basic_ostream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ostream_wchar_vtable
-@ extern ??_7?$basic_streambuf@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_streambuf_char_vtable
-@ extern ??_7?$basic_streambuf@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_streambuf_short_vtable
-@ extern ??_7?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_streambuf_wchar_vtable
-@ extern ??_7?$codecvt@DDH@std@@6B@ MSVCP_codecvt_char_vtable
-@ extern ??_7?$codecvt@GDH@std@@6B@ MSVCP_codecvt_short_vtable
-@ extern ??_7?$codecvt@_WDH@std@@6B@ MSVCP_codecvt_wchar_vtable
-@ extern ??_7?$ctype@D@std@@6B@ MSVCP_ctype_char_vtable
-@ extern ??_7?$ctype@G@std@@6B@ MSVCP_ctype_short_vtable
-@ extern ??_7?$ctype@_W@std@@6B@ MSVCP_ctype_wchar_vtable
-@ extern ??_7?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_num_get_char_vtable
-@ extern ??_7?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_num_get_short_vtable
-@ extern ??_7?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_num_get_wchar_vtable
-@ extern ??_7?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_num_put_char_vtable
-@ extern ??_7?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_num_put_short_vtable
-@ extern ??_7?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_num_put_wchar_vtable
-@ extern ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_get_char_vtable
+@ extern ??_7?$basic_ios@DU?$char_traits@D@std@@@std@@6B@ basic_ios_char_vtable
+@ extern ??_7?$basic_ios@GU?$char_traits@G@std@@@std@@6B@ basic_ios_short_vtable
+@ extern ??_7?$basic_ios@_WU?$char_traits@_W@std@@@std@@6B@ basic_ios_wchar_vtable
+@ extern ??_7?$basic_iostream@DU?$char_traits@D@std@@@std@@6B@ basic_iostream_char_vtable
+@ extern ??_7?$basic_iostream@GU?$char_traits@G@std@@@std@@6B@ basic_iostream_short_vtable
+@ extern ??_7?$basic_iostream@_WU?$char_traits@_W@std@@@std@@6B@ basic_iostream_wchar_vtable
+@ extern ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@ basic_istream_char_vtable
+@ extern ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@ basic_istream_short_vtable
+@ extern ??_7?$basic_istream@_WU?$char_traits@_W@std@@@std@@6B@ basic_istream_wchar_vtable
+@ extern ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@ basic_ostream_char_vtable
+@ extern ??_7?$basic_ostream@GU?$char_traits@G@std@@@std@@6B@ basic_ostream_short_vtable
+@ extern ??_7?$basic_ostream@_WU?$char_traits@_W@std@@@std@@6B@ basic_ostream_wchar_vtable
+@ extern ??_7?$basic_streambuf@DU?$char_traits@D@std@@@std@@6B@ basic_streambuf_char_vtable
+@ extern ??_7?$basic_streambuf@GU?$char_traits@G@std@@@std@@6B@ basic_streambuf_short_vtable
+@ extern ??_7?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@6B@ basic_streambuf_wchar_vtable
+@ extern ??_7?$codecvt@DDH@std@@6B@ codecvt_char_vtable
+@ extern ??_7?$codecvt@GDH@std@@6B@ codecvt_short_vtable
+@ extern ??_7?$codecvt@_WDH@std@@6B@ codecvt_wchar_vtable
+@ extern ??_7?$ctype@D@std@@6B@ ctype_char_vtable
+@ extern ??_7?$ctype@G@std@@6B@ ctype_short_vtable
+@ extern ??_7?$ctype@_W@std@@6B@ ctype_wchar_vtable
+@ extern ??_7?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ num_get_char_vtable
+@ extern ??_7?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ num_get_short_vtable
+@ extern ??_7?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ num_get_wchar_vtable
+@ extern ??_7?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ num_put_char_vtable
+@ extern ??_7?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ num_put_short_vtable
+@ extern ??_7?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ num_put_wchar_vtable
+@ extern ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ time_get_char_vtable
 # extern ??_7?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
-@ extern ??_7?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_get_wchar_vtable
-@ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable
-@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable
-@ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable
-@ extern ??_7_Locimp@locale@std@@6B@ MSVCP_locale__Locimp_vtable
-@ extern ??_7codecvt_base@std@@6B@ MSVCP_codecvt_base_vtable
-@ extern ??_7ctype_base@std@@6B@ MSVCP_ctype_base_vtable
-@ extern ??_7ios_base@std@@6B@ MSVCP_ios_base_vtable
+@ extern ??_7?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ time_get_wchar_vtable
+@ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ time_put_char_vtable
+@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ time_put_short_vtable
+@ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ time_put_wchar_vtable
+@ extern ??_7_Locimp@locale@std@@6B@ locale__Locimp_vtable
+@ extern ??_7codecvt_base@std@@6B@ codecvt_base_vtable
+@ extern ??_7ctype_base@std@@6B@ ctype_base_vtable
+@ extern ??_7ios_base@std@@6B@ ios_base_vtable
 # extern ??_7time_base@std@@6B@
 @ extern ??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@ basic_iostream_char_vbtable1
 @ extern ??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@ basic_iostream_char_vbtable2
diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec
index 10c2216aebb..834c4225373 100644
--- a/dlls/msvcp110/msvcp110.spec
+++ b/dlls/msvcp110/msvcp110.spec
@@ -916,46 +916,46 @@
 @ cdecl -arch=arm ??Bios_base@std@@QBAPAXXZ(ptr) ios_base_op_fail
 @ thiscall -arch=i386 ??Bios_base@std@@QBEPAXXZ(ptr) ios_base_op_fail
 @ cdecl -arch=win64 ??Bios_base@std@@QEBAPEAXXZ(ptr) ios_base_op_fail
-@ extern ??_7?$basic_ios@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ios_char_vtable
-@ extern ??_7?$basic_ios@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ios_short_vtable
-@ extern ??_7?$basic_ios@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ios_wchar_vtable
-@ extern ??_7?$basic_iostream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_iostream_char_vtable
-@ extern ??_7?$basic_iostream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_iostream_short_vtable
-@ extern ??_7?$basic_iostream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_iostream_wchar_vtable
-@ extern ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_istream_char_vtable
-@ extern ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_istream_short_vtable
-@ extern ??_7?$basic_istream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_istream_wchar_vtable
-@ extern ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ostream_char_vtable
-@ extern ??_7?$basic_ostream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ostream_short_vtable
-@ extern ??_7?$basic_ostream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ostream_wchar_vtable
-@ extern ??_7?$basic_streambuf@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_streambuf_char_vtable
-@ extern ??_7?$basic_streambuf@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_streambuf_short_vtable
-@ extern ??_7?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_streambuf_wchar_vtable
-@ extern ??_7?$codecvt@DDH@std@@6B@ MSVCP_codecvt_char_vtable
-@ extern ??_7?$codecvt@GDH@std@@6B@ MSVCP_codecvt_short_vtable
-@ extern ??_7?$codecvt@_WDH@std@@6B@ MSVCP_codecvt_wchar_vtable
-@ extern ??_7?$ctype@D@std@@6B@ MSVCP_ctype_char_vtable
-@ extern ??_7?$ctype@G@std@@6B@ MSVCP_ctype_short_vtable
-@ extern ??_7?$ctype@_W@std@@6B@ MSVCP_ctype_wchar_vtable
-@ extern ??_7?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_num_get_char_vtable
-@ extern ??_7?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_num_get_short_vtable
-@ extern ??_7?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_num_get_wchar_vtable
-@ extern ??_7?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_num_put_char_vtable
-@ extern ??_7?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_num_put_short_vtable
-@ extern ??_7?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_num_put_wchar_vtable
-@ extern ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_get_char_vtable
+@ extern ??_7?$basic_ios@DU?$char_traits@D@std@@@std@@6B@ basic_ios_char_vtable
+@ extern ??_7?$basic_ios@GU?$char_traits@G@std@@@std@@6B@ basic_ios_short_vtable
+@ extern ??_7?$basic_ios@_WU?$char_traits@_W@std@@@std@@6B@ basic_ios_wchar_vtable
+@ extern ??_7?$basic_iostream@DU?$char_traits@D@std@@@std@@6B@ basic_iostream_char_vtable
+@ extern ??_7?$basic_iostream@GU?$char_traits@G@std@@@std@@6B@ basic_iostream_short_vtable
+@ extern ??_7?$basic_iostream@_WU?$char_traits@_W@std@@@std@@6B@ basic_iostream_wchar_vtable
+@ extern ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@ basic_istream_char_vtable
+@ extern ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@ basic_istream_short_vtable
+@ extern ??_7?$basic_istream@_WU?$char_traits@_W@std@@@std@@6B@ basic_istream_wchar_vtable
+@ extern ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@ basic_ostream_char_vtable
+@ extern ??_7?$basic_ostream@GU?$char_traits@G@std@@@std@@6B@ basic_ostream_short_vtable
+@ extern ??_7?$basic_ostream@_WU?$char_traits@_W@std@@@std@@6B@ basic_ostream_wchar_vtable
+@ extern ??_7?$basic_streambuf@DU?$char_traits@D@std@@@std@@6B@ basic_streambuf_char_vtable
+@ extern ??_7?$basic_streambuf@GU?$char_traits@G@std@@@std@@6B@ basic_streambuf_short_vtable
+@ extern ??_7?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@6B@ basic_streambuf_wchar_vtable
+@ extern ??_7?$codecvt@DDH@std@@6B@ codecvt_char_vtable
+@ extern ??_7?$codecvt@GDH@std@@6B@ codecvt_short_vtable
+@ extern ??_7?$codecvt@_WDH@std@@6B@ codecvt_wchar_vtable
+@ extern ??_7?$ctype@D@std@@6B@ ctype_char_vtable
+@ extern ??_7?$ctype@G@std@@6B@ ctype_short_vtable
+@ extern ??_7?$ctype@_W@std@@6B@ ctype_wchar_vtable
+@ extern ??_7?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ num_get_char_vtable
+@ extern ??_7?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ num_get_short_vtable
+@ extern ??_7?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ num_get_wchar_vtable
+@ extern ??_7?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ num_put_char_vtable
+@ extern ??_7?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ num_put_short_vtable
+@ extern ??_7?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ num_put_wchar_vtable
+@ extern ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ time_get_char_vtable
 # extern ??_7?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
-@ extern ??_7?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_get_wchar_vtable
-@ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable
-@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable
-@ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable
-@ extern ??_7_Facet_base@std@@6B@ MSVCP__Facet_base_vtable
-@ extern ??_7_Locimp@locale@std@@6B@ MSVCP_locale__Locimp_vtable
-@ extern ??_7_Pad@std@@6B@ MSVCP__Pad_vtable
-@ extern ??_7codecvt_base@std@@6B@ MSVCP_codecvt_base_vtable
-@ extern ??_7ctype_base@std@@6B@ MSVCP_ctype_base_vtable
-@ extern ??_7facet@locale@std@@6B@ MSVCP_locale_facet_vtable
-@ extern ??_7ios_base@std@@6B@ MSVCP_ios_base_vtable
+@ extern ??_7?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ time_get_wchar_vtable
+@ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ time_put_char_vtable
+@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ time_put_short_vtable
+@ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ time_put_wchar_vtable
+@ extern ??_7_Facet_base@std@@6B@ _Facet_base_vtable
+@ extern ??_7_Locimp@locale@std@@6B@ locale__Locimp_vtable
+@ extern ??_7_Pad@std@@6B@ _Pad_vtable
+@ extern ??_7codecvt_base@std@@6B@ codecvt_base_vtable
+@ extern ??_7ctype_base@std@@6B@ ctype_base_vtable
+@ extern ??_7facet@locale@std@@6B@ locale_facet_vtable
+@ extern ??_7ios_base@std@@6B@ ios_base_vtable
 # extern ??_7time_base@std@@6B@
 @ extern ??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@ basic_iostream_char_vbtable1
 @ extern ??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@ basic_iostream_char_vbtable2
diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec
index 6f3e7b65f92..633b3da8552 100644
--- a/dlls/msvcp120/msvcp120.spec
+++ b/dlls/msvcp120/msvcp120.spec
@@ -916,46 +916,46 @@
 @ cdecl -arch=arm ??Bios_base@std@@QBA_NXZ(ptr) ios_base_operator_bool
 @ thiscall -arch=i386 ??Bios_base@std@@QBE_NXZ(ptr) ios_base_operator_bool
 @ cdecl -arch=win64 ??Bios_base@std@@QEBA_NXZ(ptr) ios_base_operator_bool
-@ extern ??_7?$basic_ios@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ios_char_vtable
-@ extern ??_7?$basic_ios@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ios_short_vtable
-@ extern ??_7?$basic_ios@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ios_wchar_vtable
-@ extern ??_7?$basic_iostream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_iostream_char_vtable
-@ extern ??_7?$basic_iostream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_iostream_short_vtable
-@ extern ??_7?$basic_iostream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_iostream_wchar_vtable
-@ extern ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_istream_char_vtable
-@ extern ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_istream_short_vtable
-@ extern ??_7?$basic_istream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_istream_wchar_vtable
-@ extern ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ostream_char_vtable
-@ extern ??_7?$basic_ostream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ostream_short_vtable
-@ extern ??_7?$basic_ostream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ostream_wchar_vtable
-@ extern ??_7?$basic_streambuf@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_streambuf_char_vtable
-@ extern ??_7?$basic_streambuf@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_streambuf_short_vtable
-@ extern ??_7?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_streambuf_wchar_vtable
-@ extern ??_7?$codecvt@DDH@std@@6B@ MSVCP_codecvt_char_vtable
-@ extern ??_7?$codecvt@GDH@std@@6B@ MSVCP_codecvt_short_vtable
-@ extern ??_7?$codecvt@_WDH@std@@6B@ MSVCP_codecvt_wchar_vtable
-@ extern ??_7?$ctype@D@std@@6B@ MSVCP_ctype_char_vtable
-@ extern ??_7?$ctype@G@std@@6B@ MSVCP_ctype_short_vtable
-@ extern ??_7?$ctype@_W@std@@6B@ MSVCP_ctype_wchar_vtable
-@ extern ??_7?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_num_get_char_vtable
-@ extern ??_7?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_num_get_short_vtable
-@ extern ??_7?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_num_get_wchar_vtable
-@ extern ??_7?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_num_put_char_vtable
-@ extern ??_7?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_num_put_short_vtable
-@ extern ??_7?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_num_put_wchar_vtable
-@ extern ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_get_char_vtable
+@ extern ??_7?$basic_ios@DU?$char_traits@D@std@@@std@@6B@ basic_ios_char_vtable
+@ extern ??_7?$basic_ios@GU?$char_traits@G@std@@@std@@6B@ basic_ios_short_vtable
+@ extern ??_7?$basic_ios@_WU?$char_traits@_W@std@@@std@@6B@ basic_ios_wchar_vtable
+@ extern ??_7?$basic_iostream@DU?$char_traits@D@std@@@std@@6B@ basic_iostream_char_vtable
+@ extern ??_7?$basic_iostream@GU?$char_traits@G@std@@@std@@6B@ basic_iostream_short_vtable
+@ extern ??_7?$basic_iostream@_WU?$char_traits@_W@std@@@std@@6B@ basic_iostream_wchar_vtable
+@ extern ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@ basic_istream_char_vtable
+@ extern ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@ basic_istream_short_vtable
+@ extern ??_7?$basic_istream@_WU?$char_traits@_W@std@@@std@@6B@ basic_istream_wchar_vtable
+@ extern ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@ basic_ostream_char_vtable
+@ extern ??_7?$basic_ostream@GU?$char_traits@G@std@@@std@@6B@ basic_ostream_short_vtable
+@ extern ??_7?$basic_ostream@_WU?$char_traits@_W@std@@@std@@6B@ basic_ostream_wchar_vtable
+@ extern ??_7?$basic_streambuf@DU?$char_traits@D@std@@@std@@6B@ basic_streambuf_char_vtable
+@ extern ??_7?$basic_streambuf@GU?$char_traits@G@std@@@std@@6B@ basic_streambuf_short_vtable
+@ extern ??_7?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@6B@ basic_streambuf_wchar_vtable
+@ extern ??_7?$codecvt@DDH@std@@6B@ codecvt_char_vtable
+@ extern ??_7?$codecvt@GDH@std@@6B@ codecvt_short_vtable
+@ extern ??_7?$codecvt@_WDH@std@@6B@ codecvt_wchar_vtable
+@ extern ??_7?$ctype@D@std@@6B@ ctype_char_vtable
+@ extern ??_7?$ctype@G@std@@6B@ ctype_short_vtable
+@ extern ??_7?$ctype@_W@std@@6B@ ctype_wchar_vtable
+@ extern ??_7?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ num_get_char_vtable
+@ extern ??_7?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ num_get_short_vtable
+@ extern ??_7?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ num_get_wchar_vtable
+@ extern ??_7?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ num_put_char_vtable
+@ extern ??_7?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ num_put_short_vtable
+@ extern ??_7?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ num_put_wchar_vtable
+@ extern ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ time_get_char_vtable
 # extern ??_7?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
-@ extern ??_7?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_get_wchar_vtable
-@ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable
-@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable
-@ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable
-@ extern ??_7_Facet_base@std@@6B@ MSVCP__Facet_base_vtable
-@ extern ??_7_Locimp@locale@std@@6B@ MSVCP_locale__Locimp_vtable
-@ extern ??_7_Pad@std@@6B@ MSVCP__Pad_vtable
-@ extern ??_7codecvt_base@std@@6B@ MSVCP_codecvt_base_vtable
-@ extern ??_7ctype_base@std@@6B@ MSVCP_ctype_base_vtable
-@ extern ??_7facet@locale@std@@6B@ MSVCP_locale_facet_vtable
-@ extern ??_7ios_base@std@@6B@ MSVCP_ios_base_vtable
+@ extern ??_7?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ time_get_wchar_vtable
+@ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ time_put_char_vtable
+@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ time_put_short_vtable
+@ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ time_put_wchar_vtable
+@ extern ??_7_Facet_base@std@@6B@ _Facet_base_vtable
+@ extern ??_7_Locimp@locale@std@@6B@ locale__Locimp_vtable
+@ extern ??_7_Pad@std@@6B@ _Pad_vtable
+@ extern ??_7codecvt_base@std@@6B@ codecvt_base_vtable
+@ extern ??_7ctype_base@std@@6B@ ctype_base_vtable
+@ extern ??_7facet@locale@std@@6B@ locale_facet_vtable
+@ extern ??_7ios_base@std@@6B@ ios_base_vtable
 # extern ??_7time_base@std@@6B@
 @ extern ??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@ basic_iostream_char_vbtable1
 @ extern ??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@ basic_iostream_char_vbtable2
diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec
index dcd062aa4fc..6ad46186cb5 100644
--- a/dlls/msvcp140/msvcp140.spec
+++ b/dlls/msvcp140/msvcp140.spec
@@ -919,47 +919,47 @@
 @ cdecl -arch=arm ??Bios_base@std@@QBA_NXZ(ptr) ios_base_operator_bool
 @ thiscall -arch=i386 ??Bios_base@std@@QBE_NXZ(ptr) ios_base_operator_bool
 @ cdecl -arch=win64 ??Bios_base@std@@QEBA_NXZ(ptr) ios_base_operator_bool
-@ extern ??_7?$basic_ios@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ios_char_vtable
-@ extern ??_7?$basic_ios@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ios_short_vtable
-@ extern ??_7?$basic_ios@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ios_wchar_vtable
-@ extern ??_7?$basic_iostream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_iostream_char_vtable
-@ extern ??_7?$basic_iostream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_iostream_short_vtable
-@ extern ??_7?$basic_iostream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_iostream_wchar_vtable
-@ extern ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_istream_char_vtable
-@ extern ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_istream_short_vtable
-@ extern ??_7?$basic_istream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_istream_wchar_vtable
-@ extern ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ostream_char_vtable
-@ extern ??_7?$basic_ostream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ostream_short_vtable
-@ extern ??_7?$basic_ostream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ostream_wchar_vtable
-@ extern ??_7?$basic_streambuf@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_streambuf_char_vtable
-@ extern ??_7?$basic_streambuf@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_streambuf_short_vtable
-@ extern ??_7?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_streambuf_wchar_vtable
-@ extern ??_7?$codecvt@DDU_Mbstatet@@@std@@6B@ MSVCP_codecvt_char_vtable
-@ extern ??_7?$codecvt@GDU_Mbstatet@@@std@@6B@ MSVCP_codecvt_short_vtable
+@ extern ??_7?$basic_ios@DU?$char_traits@D@std@@@std@@6B@ basic_ios_char_vtable
+@ extern ??_7?$basic_ios@GU?$char_traits@G@std@@@std@@6B@ basic_ios_short_vtable
+@ extern ??_7?$basic_ios@_WU?$char_traits@_W@std@@@std@@6B@ basic_ios_wchar_vtable
+@ extern ??_7?$basic_iostream@DU?$char_traits@D@std@@@std@@6B@ basic_iostream_char_vtable
+@ extern ??_7?$basic_iostream@GU?$char_traits@G@std@@@std@@6B@ basic_iostream_short_vtable
+@ extern ??_7?$basic_iostream@_WU?$char_traits@_W@std@@@std@@6B@ basic_iostream_wchar_vtable
+@ extern ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@ basic_istream_char_vtable
+@ extern ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@ basic_istream_short_vtable
+@ extern ??_7?$basic_istream@_WU?$char_traits@_W@std@@@std@@6B@ basic_istream_wchar_vtable
+@ extern ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@ basic_ostream_char_vtable
+@ extern ??_7?$basic_ostream@GU?$char_traits@G@std@@@std@@6B@ basic_ostream_short_vtable
+@ extern ??_7?$basic_ostream@_WU?$char_traits@_W@std@@@std@@6B@ basic_ostream_wchar_vtable
+@ extern ??_7?$basic_streambuf@DU?$char_traits@D@std@@@std@@6B@ basic_streambuf_char_vtable
+@ extern ??_7?$basic_streambuf@GU?$char_traits@G@std@@@std@@6B@ basic_streambuf_short_vtable
+@ extern ??_7?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@6B@ basic_streambuf_wchar_vtable
+@ extern ??_7?$codecvt@DDU_Mbstatet@@@std@@6B@ codecvt_char_vtable
+@ extern ??_7?$codecvt@GDU_Mbstatet@@@std@@6B@ codecvt_short_vtable
 # extern ??_7?$codecvt@_SDU_Mbstatet@@@std@@6B@
 # extern ??_7?$codecvt@_UDU_Mbstatet@@@std@@6B@
-@ extern ??_7?$codecvt@_WDU_Mbstatet@@@std@@6B@ MSVCP_codecvt_wchar_vtable
-@ extern ??_7?$ctype@D@std@@6B@ MSVCP_ctype_char_vtable
-@ extern ??_7?$ctype@G@std@@6B@ MSVCP_ctype_short_vtable
-@ extern ??_7?$ctype@_W@std@@6B@ MSVCP_ctype_wchar_vtable
-@ extern ??_7?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_num_get_char_vtable
-@ extern ??_7?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_num_get_short_vtable
-@ extern ??_7?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_num_get_wchar_vtable
-@ extern ??_7?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_num_put_char_vtable
-@ extern ??_7?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_num_put_short_vtable
-@ extern ??_7?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_num_put_wchar_vtable
-@ extern ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_get_char_vtable
+@ extern ??_7?$codecvt@_WDU_Mbstatet@@@std@@6B@ codecvt_wchar_vtable
+@ extern ??_7?$ctype@D@std@@6B@ ctype_char_vtable
+@ extern ??_7?$ctype@G@std@@6B@ ctype_short_vtable
+@ extern ??_7?$ctype@_W@std@@6B@ ctype_wchar_vtable
+@ extern ??_7?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ num_get_char_vtable
+@ extern ??_7?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ num_get_short_vtable
+@ extern ??_7?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ num_get_wchar_vtable
+@ extern ??_7?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ num_put_char_vtable
+@ extern ??_7?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ num_put_short_vtable
+@ extern ??_7?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ num_put_wchar_vtable
+@ extern ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ time_get_char_vtable
 # extern ??_7?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
-@ extern ??_7?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_get_wchar_vtable
-@ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable
-@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable
-@ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable
-@ extern ??_7_Facet_base@std@@6B@ MSVCP__Facet_base_vtable
-@ extern ??_7_Locimp@locale@std@@6B@ MSVCP_locale__Locimp_vtable
-@ extern ??_7codecvt_base@std@@6B@ MSVCP_codecvt_base_vtable
-@ extern ??_7ctype_base@std@@6B@ MSVCP_ctype_base_vtable
-@ extern ??_7facet@locale@std@@6B@ MSVCP_locale_facet_vtable
-@ extern ??_7ios_base@std@@6B@ MSVCP_ios_base_vtable
+@ extern ??_7?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ time_get_wchar_vtable
+@ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ time_put_char_vtable
+@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ time_put_short_vtable
+@ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ time_put_wchar_vtable
+@ extern ??_7_Facet_base@std@@6B@ _Facet_base_vtable
+@ extern ??_7_Locimp@locale@std@@6B@ locale__Locimp_vtable
+@ extern ??_7codecvt_base@std@@6B@ codecvt_base_vtable
+@ extern ??_7ctype_base@std@@6B@ ctype_base_vtable
+@ extern ??_7facet@locale@std@@6B@ locale_facet_vtable
+@ extern ??_7ios_base@std@@6B@ ios_base_vtable
 # extern ??_7time_base@std@@6B@
 @ extern ??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@ basic_iostream_char_vbtable1
 @ extern ??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@ basic_iostream_char_vbtable2
diff --git a/dlls/msvcp140_1/msvcp140_1.c b/dlls/msvcp140_1/msvcp140_1.c
index c74420bf3d0..823adedf3ac 100644
--- a/dlls/msvcp140_1/msvcp140_1.c
+++ b/dlls/msvcp140_1/msvcp140_1.c
@@ -94,9 +94,9 @@ typedef struct {
     const vtable_ptr *vtable;
 } memory_resource;
 
-extern const vtable_ptr MSVCP_aligned_resource_vtable;
-extern const vtable_ptr MSVCP_unaligned_resource_vtable;
-extern const vtable_ptr MSVCP_null_resource_vtable;
+extern const vtable_ptr aligned_resource_vtable;
+extern const vtable_ptr unaligned_resource_vtable;
+extern const vtable_ptr null_resource_vtable;
 
 __ASM_BLOCK_BEGIN(vtables)
     __ASM_VTABLE(aligned_resource,
@@ -197,13 +197,13 @@ static memory_resource *default_resource;
 
 memory_resource* __cdecl _Aligned_new_delete_resource(void)
 {
-    static memory_resource impl = { &MSVCP_aligned_resource_vtable };
+    static memory_resource impl = { &aligned_resource_vtable };
     return &impl;
 }
 
 memory_resource* __cdecl _Unaligned_new_delete_resource(void)
 {
-    static memory_resource impl = { &MSVCP_unaligned_resource_vtable };
+    static memory_resource impl = { &unaligned_resource_vtable };
     return &impl;
 }
 
@@ -235,7 +235,7 @@ memory_resource* __cdecl _Unaligned_set_default_resource(memory_resource *res)
 
 memory_resource* __cdecl null_memory_resource(void)
 {
-    static memory_resource impl = { &MSVCP_null_resource_vtable };
+    static memory_resource impl = { &null_resource_vtable };
     return &impl;
 }
 
diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c
index 12222dc6260..52e336550d6 100644
--- a/dlls/msvcp60/ios.c
+++ b/dlls/msvcp60/ios.c
@@ -316,83 +316,83 @@ typedef struct {
 #define VBTABLE_ALIGN 4
 #endif
 
-extern const vtable_ptr MSVCP_iosb_vtable;
+extern const vtable_ptr iosb_vtable;
 
 /* ??_7ios_base@std@@6B@ */
-extern const vtable_ptr MSVCP_ios_base_vtable;
+extern const vtable_ptr ios_base_vtable;
 
 /* ??_7?$basic_ios@DU?$char_traits@D@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ios_char_vtable;
+extern const vtable_ptr basic_ios_char_vtable;
 
 /* ??_7?$basic_ios@_WU?$char_traits@_W@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ios_wchar_vtable;
+extern const vtable_ptr basic_ios_wchar_vtable;
 
 /* ??_7?$basic_ios@GU?$char_traits@G@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ios_short_vtable;
+extern const vtable_ptr basic_ios_short_vtable;
 
 /* ??_7?$basic_streambuf@DU?$char_traits@D@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_streambuf_char_vtable;
+extern const vtable_ptr basic_streambuf_char_vtable;
 
 /* ??_7?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_streambuf_wchar_vtable;
+extern const vtable_ptr basic_streambuf_wchar_vtable;
 
 /* ??_7?$basic_streambuf@GU?$char_traits@G@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_streambuf_short_vtable;
+extern const vtable_ptr basic_streambuf_short_vtable;
 
 /* ??_7?$basic_filebuf@DU?$char_traits@D@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_filebuf_char_vtable;
+extern const vtable_ptr basic_filebuf_char_vtable;
 
 /* ??_7?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_filebuf_wchar_vtable;
+extern const vtable_ptr basic_filebuf_wchar_vtable;
 
 /* ??_7?$basic_filebuf@GU?$char_traits@G@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_filebuf_short_vtable;
+extern const vtable_ptr basic_filebuf_short_vtable;
 
 /* ??_7?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_stringbuf_char_vtable;
+extern const vtable_ptr basic_stringbuf_char_vtable;
 
 /* ??_7?$basic_stringbuf@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_stringbuf_wchar_vtable;
+extern const vtable_ptr basic_stringbuf_wchar_vtable;
 
 /* ??_7?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_stringbuf_short_vtable;
+extern const vtable_ptr basic_stringbuf_short_vtable;
 
 /* ??_8?$basic_ostream@DU?$char_traits@D@std@@@std@@7B@ */
 const int basic_ostream_char_vbtable[] = {0, ALIGNED_SIZE(sizeof(basic_ostream_char), VBTABLE_ALIGN)};
 /* ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ostream_char_vtable;
+extern const vtable_ptr basic_ostream_char_vtable;
 
 /* ??_8?$basic_ostream@_WU?$char_traits@_W@std@@@std@@7B@ */
 const int basic_ostream_wchar_vbtable[] = {0, ALIGNED_SIZE(sizeof(basic_ostream_wchar), VBTABLE_ALIGN)};
 /* ??_7?$basic_ostream@_WU?$char_traits@_W@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ostream_wchar_vtable;
+extern const vtable_ptr basic_ostream_wchar_vtable;
 
 /* ??_8?$basic_ostream@GU?$char_traits@G@std@@@std@@7B@ */
 const int basic_ostream_short_vbtable[] = {0, ALIGNED_SIZE(sizeof(basic_ostream_wchar), VBTABLE_ALIGN)};
 /* ??_7?$basic_ostream@GU?$char_traits@G@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ostream_short_vtable;
+extern const vtable_ptr basic_ostream_short_vtable;
 
 /* ??_8?$basic_istream@DU?$char_traits@D@std@@@std@@7B@ */
 const int basic_istream_char_vbtable[] = {0, ALIGNED_SIZE(sizeof(basic_istream_char), VBTABLE_ALIGN)};
 /* ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_istream_char_vtable;
+extern const vtable_ptr basic_istream_char_vtable;
 
 /* ??_8?$basic_istream@_WU?$char_traits@_W@std@@@std@@7B@ */
 const int basic_istream_wchar_vbtable[] = {0, ALIGNED_SIZE(sizeof(basic_istream_wchar), VBTABLE_ALIGN)};
 /* ??_7?$basic_istream@_WU?$char_traits@_W@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_istream_wchar_vtable;
+extern const vtable_ptr basic_istream_wchar_vtable;
 
 /* ??_8?$basic_istream@GU?$char_traits@G@std@@@std@@7B@ */
 const int basic_istream_short_vbtable[] = {0, ALIGNED_SIZE(sizeof(basic_istream_wchar), VBTABLE_ALIGN)};
 /* ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_istream_short_vtable;
+extern const vtable_ptr basic_istream_short_vtable;
 
 /* ??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@ */
 const int basic_iostream_char_vbtable1[] = {0, ALIGNED_SIZE(sizeof(basic_iostream_char), VBTABLE_ALIGN)};
 /* ??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@ */
 const int basic_iostream_char_vbtable2[] = {0, ALIGNED_SIZE(sizeof(basic_iostream_char), VBTABLE_ALIGN)-FIELD_OFFSET(basic_iostream_char, base2)};
 /* ??_7?$basic_iostream@DU?$char_traits@D@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_iostream_char_vtable;
+extern const vtable_ptr basic_iostream_char_vtable;
 
 /* ??_8?$basic_iostream@_WU?$char_traits@_W@std@@@std@@7B?$basic_istream@_WU?$char_traits@_W@std@@@1@@ */
 /* ??_8?$basic_iostream@GU?$char_traits@G@std@@@std@@7B?$basic_istream@GU?$char_traits@G@std@@@1@@ */
@@ -401,46 +401,46 @@ const int basic_iostream_wchar_vbtable1[] = {0, ALIGNED_SIZE(sizeof(basic_iostre
 /* ??_8?$basic_iostream@GU?$char_traits@G@std@@@std@@7B?$basic_ostream@GU?$char_traits@G@std@@@1@@ */
 const int basic_iostream_wchar_vbtable2[] = {0, ALIGNED_SIZE(sizeof(basic_iostream_wchar), VBTABLE_ALIGN)-FIELD_OFFSET(basic_iostream_wchar, base2)};
 /* ??_7?$basic_iostream@_WU?$char_traits@_W@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_iostream_wchar_vtable;
+extern const vtable_ptr basic_iostream_wchar_vtable;
 /* ??_7?$basic_iostream@GU?$char_traits@G@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_iostream_short_vtable;
+extern const vtable_ptr basic_iostream_short_vtable;
 
 /* ??_8?$basic_ofstream@DU?$char_traits@D@std@@@std@@7B@ */
 const int basic_ofstream_char_vbtable[] = {0, sizeof(basic_ofstream_char)};
 /* ??_7?$basic_ofstream@DU?$char_traits@D@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ofstream_char_vtable;
+extern const vtable_ptr basic_ofstream_char_vtable;
 
 /* ??_8?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@7B@ */
 const int basic_ofstream_wchar_vbtable[] = {0, sizeof(basic_ofstream_wchar)};
 /* ??_7?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ofstream_wchar_vtable;
+extern const vtable_ptr basic_ofstream_wchar_vtable;
 
 /* ??_8?$basic_ofstream@GU?$char_traits@G@std@@@std@@7B@ */
 const int basic_ofstream_short_vbtable[] = {0, sizeof(basic_ofstream_wchar)};
 /* ??_7?$basic_ofstream@GU?$char_traits@G@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ofstream_short_vtable;
+extern const vtable_ptr basic_ofstream_short_vtable;
 
 /* ??_8?$basic_ifstream@DU?$char_traits@D@std@@@std@@7B@ */
 const int basic_ifstream_char_vbtable[] = {0, sizeof(basic_ifstream_char)};
 /* ??_7?$basic_ifstream@DU?$char_traits@D@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ifstream_char_vtable;
+extern const vtable_ptr basic_ifstream_char_vtable;
 
 /* ??_8?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@7B@ */
 const int basic_ifstream_wchar_vbtable[] = {0, sizeof(basic_ifstream_wchar)};
 /* ??_7?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ifstream_wchar_vtable;
+extern const vtable_ptr basic_ifstream_wchar_vtable;
 
 /* ??_8?$basic_ifstream@GU?$char_traits@G@std@@@std@@7B@ */
 const int basic_ifstream_short_vbtable[] = {0, sizeof(basic_ifstream_wchar)};
 /* ??_7?$basic_ifstream@GU?$char_traits@G@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ifstream_short_vtable;
+extern const vtable_ptr basic_ifstream_short_vtable;
 
 /* ??_8?$basic_fstream@DU?$char_traits@D@std@@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@ */
 const int basic_fstream_char_vbtable1[] = {0, sizeof(basic_fstream_char)};
 /* ??_8?$basic_fstream@DU?$char_traits@D@std@@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@ */
 const int basic_fstream_char_vbtable2[] = {0, sizeof(basic_fstream_char)-FIELD_OFFSET(basic_fstream_char, base.base2)};
 /* ??_7?$basic_fstream@DU?$char_traits@D@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_fstream_char_vtable;
+extern const vtable_ptr basic_fstream_char_vtable;
 
 /* ??_8?$basic_fstream@_WU?$char_traits@_W@std@@@std@@7B?$basic_istream@_WU?$char_traits@_W@std@@@1@@ */
 /* ??_8?$basic_fstream@GU?$char_traits@G@std@@@std@@7B?$basic_istream@GU?$char_traits@G@std@@@1@@ */
@@ -449,72 +449,72 @@ const int basic_fstream_wchar_vbtable1[] = {0, sizeof(basic_fstream_wchar)};
 /* ??_8?$basic_fstream@GU?$char_traits@G@std@@@std@@7B?$basic_ostream@GU?$char_traits@G@std@@@1@@ */
 const int basic_fstream_wchar_vbtable2[] = {0, sizeof(basic_fstream_wchar)-FIELD_OFFSET(basic_fstream_wchar, base.base2)};
 /* ??_7?$basic_fstream@_WU?$char_traits@_W@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_fstream_wchar_vtable;
+extern const vtable_ptr basic_fstream_wchar_vtable;
 /* ??_7?$basic_fstream@GU?$char_traits@G@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_fstream_short_vtable;
+extern const vtable_ptr basic_fstream_short_vtable;
 
 /* ??_8?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B@ */
 const int basic_ostringstream_char_vbtable[] = {0, sizeof(basic_ostringstream_char)};
 /* ??_7?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ostringstream_char_vtable;
+extern const vtable_ptr basic_ostringstream_char_vtable;
 
 /* ??_8?$basic_ostringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@7B@ */
 const int basic_ostringstream_wchar_vbtable[] = {0, sizeof(basic_ostringstream_wchar)};
 /* ??_7?$basic_ostringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ostringstream_wchar_vtable;
+extern const vtable_ptr basic_ostringstream_wchar_vtable;
 
 /* ??_8?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B@ */
 const int basic_ostringstream_short_vbtable[] = {0, sizeof(basic_ostringstream_wchar)};
 /* ??_7?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ostringstream_short_vtable;
+extern const vtable_ptr basic_ostringstream_short_vtable;
 
 /* ??_8?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B@ */
 const int basic_istringstream_char_vbtable[] = {0, sizeof(basic_istringstream_char)};
 /* ??_7?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_istringstream_char_vtable;
+extern const vtable_ptr basic_istringstream_char_vtable;
 
 /* ??_8?$basic_istringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@7B@ */
 const int basic_istringstream_wchar_vbtable[] = {0, sizeof(basic_istringstream_wchar)};
 /* ??_7?$basic_istringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_istringstream_wchar_vtable;
+extern const vtable_ptr basic_istringstream_wchar_vtable;
 
 /* ??_8?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B@ */
 const int basic_istringstream_short_vbtable[] = {0, sizeof(basic_istringstream_wchar)};
 /* ??_7?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_istringstream_short_vtable;
+extern const vtable_ptr basic_istringstream_short_vtable;
 
 /* ??_8?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@ */
 const int basic_stringstream_char_vbtable1[] = {0, sizeof(basic_stringstream_char)};
 /* ??_8?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@ */
 const int basic_stringstream_char_vbtable2[] = {0, sizeof(basic_stringstream_char)-FIELD_OFFSET(basic_stringstream_char, base.base2)};
 /* ??_7?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_stringstream_char_vtable;
+extern const vtable_ptr basic_stringstream_char_vtable;
 
 /* ??_8?$basic_stringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@7B?$basic_istream@_WU?$char_traits@_W@std@@@1@@ */
 const int basic_stringstream_wchar_vbtable1[] = {0, sizeof(basic_stringstream_wchar)};
 /* ??_8?$basic_stringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@7B?$basic_ostream@_WU?$char_traits@_W@std@@@1@@ */
 const int basic_stringstream_wchar_vbtable2[] = {0, sizeof(basic_stringstream_wchar)-FIELD_OFFSET(basic_stringstream_wchar, base.base2)};
 /* ??_7?$basic_stringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_stringstream_wchar_vtable;
+extern const vtable_ptr basic_stringstream_wchar_vtable;
 
 /* ??_8?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B?$basic_istream@GU?$char_traits@G@std@@@1@@ */
 const int basic_stringstream_short_vbtable1[] = {0, sizeof(basic_stringstream_wchar)};
 /* ??_8?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B?$basic_ostream@GU?$char_traits@G@std@@@1@@ */
 const int basic_stringstream_short_vbtable2[] = {0, sizeof(basic_stringstream_wchar)-FIELD_OFFSET(basic_stringstream_wchar, base.base2)};
 /* ??_7?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_stringstream_short_vtable;
+extern const vtable_ptr basic_stringstream_short_vtable;
 
 /* ??_7strstreambuf@std@@6B */
-extern const vtable_ptr MSVCP_strstreambuf_vtable;
+extern const vtable_ptr strstreambuf_vtable;
 
 static const int ostrstream_vbtable[] = {0, sizeof(ostrstream)};
-extern const vtable_ptr MSVCP_ostrstream_vtable;
+extern const vtable_ptr ostrstream_vtable;
 
 static const int istrstream_vbtable[] = {0, sizeof(istrstream)};
 
 static const int strstream_vbtable1[] = {0, sizeof(strstream)};
 static const int strstream_vbtable2[] = {0, sizeof(strstream)-FIELD_OFFSET(strstream, base.base2)};
-extern const vtable_ptr MSVCP_strstream_vtable;
+extern const vtable_ptr strstream_vtable;
 
 DEFINE_RTTI_DATA0(iosb, 0, ".?AV?$_Iosb@H@std@@")
 DEFINE_RTTI_DATA1(ios_base, 0, &iosb_rtti_base_descriptor, ".?AV?$_Iosb@H@std@@")
@@ -996,7 +996,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_ctor_uninitialized, 8)
 basic_streambuf_char* __thiscall basic_streambuf_char_ctor_uninitialized(basic_streambuf_char *this, int uninitialized)
 {
     TRACE("(%p %d)\n", this, uninitialized);
-    this->vtable = &MSVCP_basic_streambuf_char_vtable;
+    this->vtable = &basic_streambuf_char_vtable;
 #if _MSVCP_VER >= 70 && _MSVCP_VER <= 100
     mutex_ctor(&this->lock);
 #endif
@@ -1010,7 +1010,7 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor(basic_streambuf_char
 {
     TRACE("(%p)\n", this);
 
-    this->vtable = &MSVCP_basic_streambuf_char_vtable;
+    this->vtable = &basic_streambuf_char_vtable;
 #if _MSVCP_VER >= 70 && _MSVCP_VER <= 100
     mutex_ctor(&this->lock);
 #endif
@@ -1835,7 +1835,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar_ctor_uninitialized, 8)
 basic_streambuf_wchar* __thiscall basic_streambuf_wchar_ctor_uninitialized(basic_streambuf_wchar *this, int uninitialized)
 {
     TRACE("(%p %d)\n", this, uninitialized);
-    this->vtable = &MSVCP_basic_streambuf_wchar_vtable;
+    this->vtable = &basic_streambuf_wchar_vtable;
 #if _MSVCP_VER >= 70 && _MSVCP_VER <= 100
     mutex_ctor(&this->lock);
 #endif
@@ -1849,7 +1849,7 @@ basic_streambuf_wchar* __thiscall basic_streambuf_short_ctor_uninitialized(basic
 {
     TRACE("(%p %d)\n", this, uninitialized);
     basic_streambuf_wchar_ctor_uninitialized(this, uninitialized);
-    this->vtable = &MSVCP_basic_streambuf_short_vtable;
+    this->vtable = &basic_streambuf_short_vtable;
     return this;
 }
 
@@ -1860,7 +1860,7 @@ basic_streambuf_wchar* __thiscall basic_streambuf_wchar_ctor(basic_streambuf_wch
 {
     TRACE("(%p)\n", this);
 
-    this->vtable = &MSVCP_basic_streambuf_wchar_vtable;
+    this->vtable = &basic_streambuf_wchar_vtable;
 #if _MSVCP_VER >= 70 && _MSVCP_VER <= 100
     mutex_ctor(&this->lock);
 #endif
@@ -1880,7 +1880,7 @@ basic_streambuf_wchar* __thiscall basic_streambuf_short_ctor(basic_streambuf_wch
 {
     TRACE("(%p)\n", this);
     basic_streambuf_wchar_ctor(this);
-    this->vtable = &MSVCP_basic_streambuf_short_vtable;
+    this->vtable = &basic_streambuf_short_vtable;
     return this;
 }
 
@@ -2800,7 +2800,7 @@ basic_filebuf_char* __thiscall basic_filebuf_char_ctor_file(basic_filebuf_char *
     TRACE("(%p %p)\n", this, file);
 
     basic_streambuf_char_ctor(&this->base);
-    this->base.vtable = &MSVCP_basic_filebuf_char_vtable;
+    this->base.vtable = &basic_filebuf_char_vtable;
 
     locale_ctor(&this->loc);
     basic_filebuf_char__Init(this, file, INITFL_new);
@@ -2823,7 +2823,7 @@ basic_filebuf_char* __thiscall basic_filebuf_char_ctor_uninitialized(basic_fileb
     TRACE("(%p %d)\n", this, uninitialized);
 
     basic_streambuf_char_ctor_uninitialized(&this->base, 0);
-    this->base.vtable = &MSVCP_basic_filebuf_char_vtable;
+    this->base.vtable = &basic_filebuf_char_vtable;
     locale_ctor(&this->loc);
     return this;
 }
@@ -3355,7 +3355,7 @@ basic_filebuf_wchar* __thiscall basic_filebuf_wchar_ctor_file(basic_filebuf_wcha
     TRACE("(%p %p)\n", this, file);
 
     basic_streambuf_wchar_ctor(&this->base);
-    this->base.vtable = &MSVCP_basic_filebuf_wchar_vtable;
+    this->base.vtable = &basic_filebuf_wchar_vtable;
 
     locale_ctor(&this->loc);
     basic_filebuf_wchar__Init(this, file, INITFL_new);
@@ -3370,7 +3370,7 @@ basic_filebuf_wchar* __thiscall basic_filebuf_short_ctor_file(basic_filebuf_wcha
     TRACE("(%p %p)\n", this, file);
 
     basic_streambuf_short_ctor(&this->base);
-    this->base.vtable = &MSVCP_basic_filebuf_short_vtable;
+    this->base.vtable = &basic_filebuf_short_vtable;
 
     locale_ctor(&this->loc);
     basic_filebuf_short__Init(this, file, INITFL_new);
@@ -3401,7 +3401,7 @@ basic_filebuf_wchar* __thiscall basic_filebuf_wchar_ctor_uninitialized(basic_fil
     TRACE("(%p %d)\n", this, uninitialized);
 
     basic_streambuf_wchar_ctor(&this->base);
-    this->base.vtable = &MSVCP_basic_filebuf_wchar_vtable;
+    this->base.vtable = &basic_filebuf_wchar_vtable;
     return this;
 }
 
@@ -3413,7 +3413,7 @@ basic_filebuf_wchar* __thiscall basic_filebuf_short_ctor_uninitialized(basic_fil
     TRACE("(%p %d)\n", this, uninitialized);
 
     basic_streambuf_short_ctor_uninitialized(&this->base, 0);
-    this->base.vtable = &MSVCP_basic_filebuf_short_vtable;
+    this->base.vtable = &basic_filebuf_short_vtable;
     locale_ctor(&this->loc);
     return this;
 }
@@ -3944,7 +3944,7 @@ basic_stringbuf_char* __thiscall basic_stringbuf_char_ctor_str(basic_stringbuf_c
     TRACE("(%p %p %d)\n", this, str, mode);
 
     basic_streambuf_char_ctor(&this->base);
-    this->base.vtable = &MSVCP_basic_stringbuf_char_vtable;
+    this->base.vtable = &basic_stringbuf_char_vtable;
 
     basic_stringbuf_char__Init(this, MSVCP_basic_string_char_c_str(str),
             str->size, basic_stringbuf_char__Getstate(this, mode));
@@ -3960,7 +3960,7 @@ basic_stringbuf_char* __thiscall basic_stringbuf_char_ctor_mode(
     TRACE("(%p %d)\n", this, mode);
 
     basic_streambuf_char_ctor(&this->base);
-    this->base.vtable = &MSVCP_basic_stringbuf_char_vtable;
+    this->base.vtable = &basic_stringbuf_char_vtable;
 
     basic_stringbuf_char__Init(this, NULL, 0, basic_stringbuf_char__Getstate(this, mode));
     return this;
@@ -4321,7 +4321,7 @@ basic_stringbuf_wchar* __thiscall basic_stringbuf_wchar_ctor_str(basic_stringbuf
     TRACE("(%p %p %d)\n", this, str, mode);
 
     basic_streambuf_wchar_ctor(&this->base);
-    this->base.vtable = &MSVCP_basic_stringbuf_wchar_vtable;
+    this->base.vtable = &basic_stringbuf_wchar_vtable;
 
     basic_stringbuf_wchar__Init(this, MSVCP_basic_string_wchar_c_str(str),
             str->size, basic_stringbuf_wchar__Getstate(this, mode));
@@ -4335,7 +4335,7 @@ basic_stringbuf_wchar* __thiscall basic_stringbuf_short_ctor_str(basic_stringbuf
         const basic_string_wchar *str, IOSB_openmode mode)
 {
     basic_stringbuf_wchar_ctor_str(this, str, mode);
-    this->base.vtable = &MSVCP_basic_stringbuf_short_vtable;
+    this->base.vtable = &basic_stringbuf_short_vtable;
     return this;
 }
 
@@ -4348,7 +4348,7 @@ basic_stringbuf_wchar* __thiscall basic_stringbuf_wchar_ctor_mode(
     TRACE("(%p %d)\n", this, mode);
 
     basic_streambuf_wchar_ctor(&this->base);
-    this->base.vtable = &MSVCP_basic_stringbuf_wchar_vtable;
+    this->base.vtable = &basic_stringbuf_wchar_vtable;
 
     basic_stringbuf_wchar__Init(this, NULL, 0, basic_stringbuf_wchar__Getstate(this, mode));
     return this;
@@ -4361,7 +4361,7 @@ basic_stringbuf_wchar* __thiscall basic_stringbuf_short_ctor_mode(
         basic_stringbuf_wchar *this, IOSB_openmode mode)
 {
     basic_stringbuf_wchar_ctor_mode(this, mode);
-    this->base.vtable = &MSVCP_basic_stringbuf_short_vtable;
+    this->base.vtable = &basic_stringbuf_short_vtable;
     return this;
 }
 
@@ -4679,7 +4679,7 @@ DEFINE_THISCALL_WRAPPER(ios_base_ctor, 4)
 ios_base* __thiscall ios_base_ctor(ios_base *this)
 {
     TRACE("(%p)\n", this);
-    this->vtable = &MSVCP_ios_base_vtable;
+    this->vtable = &ios_base_vtable;
     locale_ctor_uninitialized(IOS_LOCALE(this), 0);
     return this;
 }
@@ -4691,7 +4691,7 @@ ios_base* __thiscall ios_base_copy_ctor(ios_base *this, const ios_base *copy)
 {
     TRACE("(%p %p)\n", this, copy);
     *this = *copy;
-    this->vtable = &MSVCP_ios_base_vtable;
+    this->vtable = &ios_base_vtable;
     return this;
 }
 
@@ -5296,7 +5296,7 @@ basic_ios_char* __thiscall basic_ios_char_ctor(basic_ios_char *this)
     TRACE("(%p)\n", this);
 
     ios_base_ctor(&this->base);
-    this->base.vtable = &MSVCP_basic_ios_char_vtable;
+    this->base.vtable = &basic_ios_char_vtable;
     return this;
 }
 
@@ -5539,7 +5539,7 @@ basic_ios_wchar* __thiscall basic_ios_wchar_ctor(basic_ios_wchar *this)
     TRACE("(%p)\n", this);
 
     ios_base_ctor(&this->base);
-    this->base.vtable = &MSVCP_basic_ios_wchar_vtable;
+    this->base.vtable = &basic_ios_wchar_vtable;
     return this;
 }
 
@@ -5549,7 +5549,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_short_ctor, 4)
 basic_ios_wchar* __thiscall basic_ios_short_ctor(basic_ios_wchar *this)
 {
     basic_ios_wchar_ctor(this);
-    this->base.vtable = &MSVCP_basic_ios_short_vtable;
+    this->base.vtable = &basic_ios_short_vtable;
     return this;
 }
 
@@ -5591,7 +5591,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_short_ctor_streambuf, 8)
 basic_ios_wchar* __thiscall basic_ios_short_ctor_streambuf(basic_ios_wchar *this, basic_streambuf_wchar *strbuf)
 {
     basic_ios_wchar_ctor_streambuf(this, strbuf);
-    this->base.vtable = &MSVCP_basic_ios_short_vtable;
+    this->base.vtable = &basic_ios_short_vtable;
     return this;
 }
 
@@ -5865,7 +5865,7 @@ basic_ostream_char* __thiscall basic_ostream_char_ctor(basic_ostream_char *this,
         base = basic_ostream_char_get_basic_ios(this);
     }
 
-    base->base.vtable = &MSVCP_basic_ostream_char_vtable;
+    base->base.vtable = &basic_ostream_char_vtable;
     if(init)
         basic_ios_char_init(base, strbuf, isstd);
     return this;
@@ -5889,7 +5889,7 @@ basic_ostream_char* __thiscall basic_ostream_char_ctor_uninitialized(basic_ostre
         base = basic_ostream_char_get_basic_ios(this);
     }
 
-    base->base.vtable = &MSVCP_basic_ostream_char_vtable;
+    base->base.vtable = &basic_ostream_char_vtable;
     ios_base_Addstd(&base->base);
     return this;
 }
@@ -6688,7 +6688,7 @@ basic_ostream_wchar* __thiscall basic_ostream_short_ctor(basic_ostream_wchar *th
         base = basic_ostream_wchar_get_basic_ios(this);
     }
 
-    base->base.vtable = &MSVCP_basic_ostream_short_vtable;
+    base->base.vtable = &basic_ostream_short_vtable;
     if(init)
         basic_ios_wchar_init(base, strbuf, isstd);
     return this;
@@ -6712,7 +6712,7 @@ basic_ostream_wchar* __thiscall basic_ostream_short_ctor_uninitialized(basic_ost
         base = basic_ostream_wchar_get_basic_ios(this);
     }
 
-    base->base.vtable = &MSVCP_basic_ostream_short_vtable;
+    base->base.vtable = &basic_ostream_short_vtable;
     ios_base_Addstd(&base->base);
     return this;
 }
@@ -7712,7 +7712,7 @@ basic_istream_char* __thiscall basic_istream_char_ctor_init(basic_istream_char *
         base = basic_istream_char_get_basic_ios(this);
     }
 
-    base->base.vtable = &MSVCP_basic_istream_char_vtable;
+    base->base.vtable = &basic_istream_char_vtable;
     this->count = 0;
     if(!noinit)
         basic_ios_char_init(base, strbuf, isstd);
@@ -7744,7 +7744,7 @@ basic_istream_char* __thiscall basic_istream_char_ctor_uninitialized(basic_istre
         base = basic_istream_char_get_basic_ios(this);
     }
 
-    base->base.vtable = &MSVCP_basic_istream_char_vtable;
+    base->base.vtable = &basic_istream_char_vtable;
     ios_base_Addstd(&base->base);
     return this;
 }
@@ -9125,7 +9125,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ctor_init(basic_istream_wcha
         base = basic_istream_wchar_get_basic_ios(this);
     }
 
-    base->base.vtable = &MSVCP_basic_istream_wchar_vtable;
+    base->base.vtable = &basic_istream_wchar_vtable;
     this->count = 0;
     if(!noinit)
         basic_ios_wchar_init(base, strbuf, isstd);
@@ -9139,7 +9139,7 @@ basic_istream_wchar* __thiscall basic_istream_short_ctor_init(basic_istream_wcha
         basic_streambuf_wchar *strbuf, bool isstd, bool noinit, bool virt_init)
 {
     basic_istream_wchar_ctor_init(this, strbuf, isstd, noinit, virt_init);
-    basic_istream_wchar_get_basic_ios(this)->base.vtable = &MSVCP_basic_istream_short_vtable;
+    basic_istream_wchar_get_basic_ios(this)->base.vtable = &basic_istream_short_vtable;
     return this;
 }
 
@@ -9179,7 +9179,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ctor_uninitialized(
         base = basic_istream_wchar_get_basic_ios(this);
     }
 
-    base->base.vtable = &MSVCP_basic_istream_wchar_vtable;
+    base->base.vtable = &basic_istream_wchar_vtable;
     ios_base_Addstd(&base->base);
     return this;
 }
@@ -9191,7 +9191,7 @@ basic_istream_wchar* __thiscall basic_istream_short_ctor_uninitialized(
         basic_istream_wchar *this, int uninitialized, bool virt_init)
 {
     basic_istream_wchar_ctor_uninitialized(this, uninitialized, virt_init);
-    basic_istream_wchar_get_basic_ios(this)->base.vtable = &MSVCP_basic_istream_short_vtable;
+    basic_istream_wchar_get_basic_ios(this)->base.vtable = &basic_istream_short_vtable;
     return this;
 }
 
@@ -10647,7 +10647,7 @@ basic_iostream_char* __thiscall basic_iostream_char_ctor(basic_iostream_char *th
         basic_ios = basic_istream_char_get_basic_ios(&this->base1);
     }
 
-    basic_ios->base.vtable = &MSVCP_basic_iostream_char_vtable;
+    basic_ios->base.vtable = &basic_iostream_char_vtable;
 
     basic_istream_char_ctor(&this->base1, strbuf, FALSE, FALSE);
     basic_ostream_char_ctor(&this->base2, NULL, FALSE, FALSE, FALSE);
@@ -10745,7 +10745,7 @@ basic_iostream_wchar* __thiscall basic_iostream_wchar_ctor(basic_iostream_wchar
     basic_istream_wchar_ctor(&this->base1, strbuf, FALSE, FALSE);
     basic_ostream_short_ctor(&this->base2, NULL, FALSE, FALSE, FALSE);
 
-    basic_ios->base.vtable = &MSVCP_basic_iostream_wchar_vtable;
+    basic_ios->base.vtable = &basic_iostream_wchar_vtable;
     return this;
 }
 
@@ -10756,7 +10756,7 @@ basic_iostream_wchar* __thiscall basic_iostream_short_ctor(basic_iostream_wchar
         basic_streambuf_wchar *strbuf, bool virt_init)
 {
     basic_iostream_wchar_ctor(this, strbuf, virt_init);
-    basic_istream_wchar_get_basic_ios(&this->base1)->base.vtable = &MSVCP_basic_iostream_short_vtable;
+    basic_istream_wchar_get_basic_ios(&this->base1)->base.vtable = &basic_iostream_short_vtable;
     return this;
 }
 
@@ -10854,7 +10854,7 @@ basic_ofstream_char* __thiscall basic_ofstream_char_ctor(basic_ofstream_char *th
 
     basic_filebuf_char_ctor(&this->filebuf);
     basic_ostream_char_ctor(&this->base, &this->filebuf.base, FALSE, TRUE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ofstream_char_vtable;
+    basic_ios->base.vtable = &basic_ofstream_char_vtable;
     return this;
 }
 
@@ -10878,7 +10878,7 @@ basic_ofstream_char* __thiscall basic_ofstream_char_ctor_file(
 
     basic_filebuf_char_ctor_file(&this->filebuf, file);
     basic_ostream_char_ctor(&this->base, &this->filebuf.base, FALSE, TRUE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ofstream_char_vtable;
+    basic_ios->base.vtable = &basic_ofstream_char_vtable;
     return this;
 }
 
@@ -11039,7 +11039,7 @@ basic_ofstream_wchar* __thiscall basic_ofstream_wchar_ctor(basic_ofstream_wchar
 
     basic_filebuf_wchar_ctor(&this->filebuf);
     basic_ostream_short_ctor(&this->base, &this->filebuf.base, FALSE, TRUE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ofstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_ofstream_wchar_vtable;
     return this;
 }
 
@@ -11049,7 +11049,7 @@ DEFINE_THISCALL_WRAPPER(basic_ofstream_short_ctor, 8)
 basic_ofstream_wchar* __thiscall basic_ofstream_short_ctor(basic_ofstream_wchar *this, bool virt_init)
 {
     basic_ofstream_wchar_ctor(this, virt_init);
-    basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ofstream_short_vtable;
+    basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &basic_ofstream_short_vtable;
     return this;
 }
 
@@ -11073,7 +11073,7 @@ basic_ofstream_wchar* __thiscall basic_ofstream_wchar_ctor_file(
 
     basic_filebuf_wchar_ctor_file(&this->filebuf, file);
     basic_ostream_short_ctor(&this->base, &this->filebuf.base, FALSE, TRUE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ofstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_ofstream_wchar_vtable;
     return this;
 }
 
@@ -11084,7 +11084,7 @@ basic_ofstream_wchar* __thiscall basic_ofstream_short_ctor_file(
         basic_ofstream_wchar *this, FILE *file, bool virt_init)
 {
     basic_ofstream_wchar_ctor_file(this, file, virt_init);
-    basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ofstream_short_vtable;
+    basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &basic_ofstream_short_vtable;
     return this;
 }
 
@@ -11255,7 +11255,7 @@ basic_ifstream_char* __thiscall basic_ifstream_char_ctor(basic_ifstream_char *th
 
     basic_filebuf_char_ctor(&this->filebuf);
     basic_istream_char_ctor(&this->base, &this->filebuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ifstream_char_vtable;
+    basic_ios->base.vtable = &basic_ifstream_char_vtable;
     return this;
 }
 
@@ -11279,7 +11279,7 @@ basic_ifstream_char* __thiscall basic_ifstream_char_ctor_file(
 
     basic_filebuf_char_ctor_file(&this->filebuf, file);
     basic_istream_char_ctor(&this->base, &this->filebuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ifstream_char_vtable;
+    basic_ios->base.vtable = &basic_ifstream_char_vtable;
     return this;
 }
 
@@ -11440,7 +11440,7 @@ basic_ifstream_wchar* __thiscall basic_ifstream_wchar_ctor(basic_ifstream_wchar
 
     basic_filebuf_wchar_ctor(&this->filebuf);
     basic_istream_wchar_ctor(&this->base, &this->filebuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ifstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_ifstream_wchar_vtable;
     return this;
 }
 
@@ -11450,7 +11450,7 @@ DEFINE_THISCALL_WRAPPER(basic_ifstream_short_ctor, 8)
 basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor(basic_ifstream_wchar *this, bool virt_init)
 {
     basic_ifstream_wchar_ctor(this, virt_init);
-    basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ifstream_short_vtable;
+    basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &basic_ifstream_short_vtable;
     return this;
 }
 
@@ -11474,7 +11474,7 @@ basic_ifstream_wchar* __thiscall basic_ifstream_wchar_ctor_file(
 
     basic_filebuf_wchar_ctor_file(&this->filebuf, file);
     basic_istream_wchar_ctor(&this->base, &this->filebuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ifstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_ifstream_wchar_vtable;
     return this;
 }
 
@@ -11485,7 +11485,7 @@ basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor_file(
         basic_ifstream_wchar *this, FILE *file, bool virt_init)
 {
     basic_ifstream_wchar_ctor_file(this, file, virt_init);
-    basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ifstream_short_vtable;
+    basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &basic_ifstream_short_vtable;
     return this;
 }
 
@@ -11657,7 +11657,7 @@ basic_fstream_char* __thiscall basic_fstream_char_ctor(basic_fstream_char *this,
 
     basic_filebuf_char_ctor(&this->filebuf);
     basic_iostream_char_ctor(&this->base, &this->filebuf.base, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_fstream_char_vtable;
+    basic_ios->base.vtable = &basic_fstream_char_vtable;
     return this;
 }
 
@@ -11682,7 +11682,7 @@ basic_fstream_char* __thiscall basic_fstream_char_ctor_file(basic_fstream_char *
 
     basic_filebuf_char_ctor_file(&this->filebuf, file);
     basic_iostream_char_ctor(&this->base, &this->filebuf.base, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_fstream_char_vtable;
+    basic_ios->base.vtable = &basic_fstream_char_vtable;
     return this;
 }
 
@@ -11844,7 +11844,7 @@ basic_fstream_wchar* __thiscall basic_fstream_wchar_ctor(basic_fstream_wchar *th
 
     basic_filebuf_wchar_ctor(&this->filebuf);
     basic_iostream_wchar_ctor(&this->base, &this->filebuf.base, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_fstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_fstream_wchar_vtable;
     return this;
 }
 
@@ -11854,7 +11854,7 @@ DEFINE_THISCALL_WRAPPER(basic_fstream_short_ctor, 8)
 basic_fstream_wchar* __thiscall basic_fstream_short_ctor(basic_fstream_wchar *this, bool virt_init)
 {
     basic_fstream_wchar_ctor(this, virt_init);
-    basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &MSVCP_basic_fstream_short_vtable;
+    basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &basic_fstream_short_vtable;
     return this;
 }
 
@@ -11879,7 +11879,7 @@ basic_fstream_wchar* __thiscall basic_fstream_wchar_ctor_file(basic_fstream_wcha
 
     basic_filebuf_wchar_ctor_file(&this->filebuf, file);
     basic_iostream_wchar_ctor(&this->base, &this->filebuf.base, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_fstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_fstream_wchar_vtable;
     return this;
 }
 
@@ -11890,7 +11890,7 @@ basic_fstream_wchar* __thiscall basic_fstream_short_ctor_file(basic_fstream_wcha
         FILE *file, bool virt_init)
 {
     basic_fstream_wchar_ctor_file(this, file, virt_init);
-    basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &MSVCP_basic_fstream_short_vtable;
+    basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &basic_fstream_short_vtable;
     return this;
 }
 
@@ -12062,7 +12062,7 @@ basic_ostringstream_char* __thiscall basic_ostringstream_char_ctor_str(basic_ost
 
     basic_stringbuf_char_ctor_str(&this->strbuf, str, mode|OPENMODE_out);
     basic_ostream_char_ctor(&this->base, &this->strbuf.base, FALSE, TRUE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ostringstream_char_vtable;
+    basic_ios->base.vtable = &basic_ostringstream_char_vtable;
     return this;
 }
 
@@ -12086,7 +12086,7 @@ basic_ostringstream_char* __thiscall basic_ostringstream_char_ctor_mode(
 
     basic_stringbuf_char_ctor_mode(&this->strbuf, mode|OPENMODE_out);
     basic_ostream_char_ctor(&this->base, &this->strbuf.base, FALSE, TRUE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ostringstream_char_vtable;
+    basic_ios->base.vtable = &basic_ostringstream_char_vtable;
     return this;
 }
 
@@ -12203,7 +12203,7 @@ basic_ostringstream_wchar* __thiscall basic_ostringstream_wchar_ctor_str(basic_o
 
     basic_stringbuf_wchar_ctor_str(&this->strbuf, str, mode|OPENMODE_out);
     basic_ostream_short_ctor(&this->base, &this->strbuf.base, FALSE, TRUE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ostringstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_ostringstream_wchar_vtable;
     return this;
 }
 
@@ -12214,7 +12214,7 @@ basic_ostringstream_wchar* __thiscall basic_ostringstream_short_ctor_str(basic_o
         const basic_string_wchar *str, int mode, bool virt_init)
 {
     basic_ostringstream_wchar_ctor_str(this, str, mode, virt_init);
-    basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ostringstream_short_vtable;
+    basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &basic_ostringstream_short_vtable;
     return this;
 }
 
@@ -12238,7 +12238,7 @@ basic_ostringstream_wchar* __thiscall basic_ostringstream_wchar_ctor_mode(
 
     basic_stringbuf_wchar_ctor_mode(&this->strbuf, mode|OPENMODE_out);
     basic_ostream_short_ctor(&this->base, &this->strbuf.base, FALSE, TRUE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ostringstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_ostringstream_wchar_vtable;
     return this;
 }
 
@@ -12249,7 +12249,7 @@ basic_ostringstream_wchar* __thiscall basic_ostringstream_short_ctor_mode(
         basic_ostringstream_wchar *this, int mode, bool virt_init)
 {
     basic_ostringstream_wchar_ctor_mode(this, mode, virt_init);
-    basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ostringstream_short_vtable;
+    basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &basic_ostringstream_short_vtable;
     return this;
 }
 
@@ -12385,7 +12385,7 @@ basic_istringstream_char* __thiscall basic_istringstream_char_ctor_str(basic_ist
 
     basic_stringbuf_char_ctor_str(&this->strbuf, str, mode|OPENMODE_in);
     basic_istream_char_ctor(&this->base, &this->strbuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_istringstream_char_vtable;
+    basic_ios->base.vtable = &basic_istringstream_char_vtable;
     return this;
 }
 
@@ -12409,7 +12409,7 @@ basic_istringstream_char* __thiscall basic_istringstream_char_ctor_mode(
 
     basic_stringbuf_char_ctor_mode(&this->strbuf, mode|OPENMODE_in);
     basic_istream_char_ctor(&this->base, &this->strbuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_istringstream_char_vtable;
+    basic_ios->base.vtable = &basic_istringstream_char_vtable;
     return this;
 }
 
@@ -12526,7 +12526,7 @@ basic_istringstream_wchar* __thiscall basic_istringstream_wchar_ctor_str(basic_i
 
     basic_stringbuf_wchar_ctor_str(&this->strbuf, str, mode|OPENMODE_in);
     basic_istream_wchar_ctor(&this->base, &this->strbuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_istringstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_istringstream_wchar_vtable;
     return this;
 }
 
@@ -12537,7 +12537,7 @@ basic_istringstream_wchar* __thiscall basic_istringstream_short_ctor_str(basic_i
         const basic_string_wchar *str, int mode, bool virt_init)
 {
     basic_istringstream_wchar_ctor_str(this, str, mode, virt_init);
-    basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_istringstream_short_vtable;
+    basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &basic_istringstream_short_vtable;
     return this;
 }
 
@@ -12561,7 +12561,7 @@ basic_istringstream_wchar* __thiscall basic_istringstream_wchar_ctor_mode(
 
     basic_stringbuf_wchar_ctor_mode(&this->strbuf, mode|OPENMODE_in);
     basic_istream_wchar_ctor(&this->base, &this->strbuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_istringstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_istringstream_wchar_vtable;
     return this;
 }
 
@@ -12572,7 +12572,7 @@ basic_istringstream_wchar* __thiscall basic_istringstream_short_ctor_mode(
         basic_istringstream_wchar *this, int mode, bool virt_init)
 {
     basic_istringstream_wchar_ctor_mode(this, mode, virt_init);
-    basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_istringstream_short_vtable;
+    basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &basic_istringstream_short_vtable;
     return this;
 }
 
@@ -12709,7 +12709,7 @@ basic_stringstream_char* __thiscall basic_stringstream_char_ctor_str(basic_strin
 
     basic_stringbuf_char_ctor_str(&this->strbuf, str, mode);
     basic_iostream_char_ctor(&this->base, &this->strbuf.base, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_stringstream_char_vtable;
+    basic_ios->base.vtable = &basic_stringstream_char_vtable;
     return this;
 }
 
@@ -12734,7 +12734,7 @@ basic_stringstream_char* __thiscall basic_stringstream_char_ctor_mode(
 
     basic_stringbuf_char_ctor_mode(&this->strbuf, mode);
     basic_iostream_char_ctor(&this->base, &this->strbuf.base, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_stringstream_char_vtable;
+    basic_ios->base.vtable = &basic_stringstream_char_vtable;
     return this;
 }
 
@@ -12853,7 +12853,7 @@ basic_stringstream_wchar* __thiscall basic_stringstream_wchar_ctor_str(basic_str
 
     basic_stringbuf_wchar_ctor_str(&this->strbuf, str, mode);
     basic_iostream_wchar_ctor(&this->base, &this->strbuf.base, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_stringstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_stringstream_wchar_vtable;
     return this;
 }
 
@@ -12864,7 +12864,7 @@ basic_stringstream_wchar* __thiscall basic_stringstream_short_ctor_str(basic_str
         const basic_string_wchar *str, int mode, bool virt_init)
 {
     basic_stringstream_wchar_ctor_str(this, str, mode, virt_init);
-    basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &MSVCP_basic_stringstream_short_vtable;
+    basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &basic_stringstream_short_vtable;
     return this;
 }
 
@@ -12889,7 +12889,7 @@ basic_stringstream_wchar* __thiscall basic_stringstream_wchar_ctor_mode(
 
     basic_stringbuf_wchar_ctor_mode(&this->strbuf, mode);
     basic_iostream_wchar_ctor(&this->base, &this->strbuf.base, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_stringstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_stringstream_wchar_vtable;
     return this;
 }
 
@@ -12900,7 +12900,7 @@ basic_stringstream_wchar* __thiscall basic_stringstream_short_ctor_mode(
         basic_stringstream_wchar *this, int mode, bool virt_init)
 {
     basic_stringstream_wchar_ctor_mode(this, mode, virt_init);
-    basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &MSVCP_basic_stringstream_short_vtable;
+    basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &basic_stringstream_short_vtable;
     return this;
 }
 
@@ -13060,7 +13060,7 @@ strstreambuf* __thiscall strstreambuf_ctor_get_put(strstreambuf *this, char *g,
     TRACE("(%p %p %s %p)\n", this, g, wine_dbgstr_longlong(len), p);
 
     basic_streambuf_char_ctor(&this->base);
-    this->base.vtable = &MSVCP_strstreambuf_vtable;
+    this->base.vtable = &strstreambuf_vtable;
 
     strstreambuf__Init(this, len, g, p, 0);
     return this;
@@ -13435,7 +13435,7 @@ ostrstream* __thiscall ostrstream_ctor(ostrstream *this, char *buf, streamsize s
     strstreambuf_ctor_get_put(&this->buf, buf, size,
             buf && (mode & OPENMODE_app) ? buf+strlen(buf) : buf);
     basic_ostream_char_ctor(&this->base, &this->buf.base, FALSE, TRUE, FALSE);
-    basic_ios->base.vtable = &MSVCP_ostrstream_vtable;
+    basic_ios->base.vtable = &ostrstream_vtable;
     return this;
 }
 
@@ -13638,7 +13638,7 @@ strstream* __thiscall strstream_ctor(strstream *this, char *buf, streamsize size
     strstreambuf_ctor_get_put(&this->buf, buf, size,
             buf && (mode & OPENMODE_app) ? buf+strlen(buf) : buf);
     basic_iostream_char_ctor(&this->base, &this->buf.base, FALSE);
-    basic_ios->base.vtable = &MSVCP_strstream_vtable;
+    basic_ios->base.vtable = &strstream_vtable;
     return this;
 }
 
diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec
index 5561297d7a5..f3ed2e8b667 100644
--- a/dlls/msvcp60/msvcp60.spec
+++ b/dlls/msvcp60/msvcp60.spec
@@ -659,8 +659,8 @@
 @ cdecl -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@PEBD_KAEBV?$allocator@D@1@@Z(ptr ptr long ptr) MSVCP_basic_string_char_ctor_cstr_len_alloc
 @ thiscall -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@PBDIABV?$allocator@D@1@@Z(ptr ptr long ptr) MSVCP_basic_string_char_ctor_cstr_len_alloc
 @ cdecl -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@_KDAEBV?$allocator@D@1@@Z(ptr long long ptr) MSVCP_basic_string_char_ctor_ch_alloc
-@ thiscall -arch=win32 ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@ABV01@@Z(ptr ptr) MSVCP_basic_string_wchar_copy_ctor
-@ cdecl -arch=win64 ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@AEBV01@@Z(ptr ptr) MSVCP_basic_string_wchar_copy_ctor
+@ thiscall -arch=win32 ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@ABV01@@Z(ptr ptr) basic_string_wchar_copy_ctor
+@ cdecl -arch=win64 ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@AEBV01@@Z(ptr ptr) basic_string_wchar_copy_ctor
 @ thiscall -arch=win32 ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@ABV01@IIABV?$allocator@G@1@@Z(ptr ptr long long ptr) MSVCP_basic_string_wchar_ctor_substr_alloc
 @ cdecl -arch=win64 ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@AEBV01@_K1AEBV?$allocator@G@1@@Z(ptr ptr long long ptr) MSVCP_basic_string_wchar_ctor_substr_alloc
 @ thiscall -arch=win32 ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@ABV?$allocator@G@1@@Z(ptr ptr) MSVCP_basic_string_wchar_ctor_alloc
@@ -839,14 +839,14 @@
 @ stub -arch=win64 ??0__non_rtti_object@std@@QEAA@AEBV01@@Z
 @ stub -arch=win32 ??0__non_rtti_object@std@@QAE@PBD@Z
 @ stub -arch=win64 ??0__non_rtti_object@std@@QEAA@PEBD@Z
-@ thiscall -arch=win32 ??0bad_alloc@std@@QAE@ABV01@@Z(ptr ptr) MSVCP_bad_alloc_copy_ctor
-@ cdecl -arch=win64 ??0bad_alloc@std@@QEAA@AEBV01@@Z(ptr ptr) MSVCP_bad_alloc_copy_ctor
+@ thiscall -arch=win32 ??0bad_alloc@std@@QAE@ABV01@@Z(ptr ptr) bad_alloc_copy_ctor
+@ cdecl -arch=win64 ??0bad_alloc@std@@QEAA@AEBV01@@Z(ptr ptr) bad_alloc_copy_ctor
 @ thiscall -arch=win32 ??0bad_alloc@std@@QAE@PBD@Z(ptr str) MSVCP_bad_alloc_ctor
 @ cdecl -arch=win64 ??0bad_alloc@std@@QEAA@PEBD@Z(ptr str) MSVCP_bad_alloc_ctor
 @ thiscall -arch=win32 ??0bad_alloc@std@@QAE@XZ(ptr) MSVCP_bad_alloc_default_ctor
 @ cdecl -arch=win64 ??0bad_alloc@std@@QEAA@XZ(ptr) MSVCP_bad_alloc_default_ctor
-@ thiscall -arch=i386 ??0bad_cast@std@@QAE@ABV01@@Z(ptr ptr) MSVCP_bad_cast_copy_ctor
-@ cdecl -arch=win64 ??0bad_cast@std@@QEAA@AEBV01@@Z(ptr ptr) MSVCP_bad_cast_copy_ctor
+@ thiscall -arch=i386 ??0bad_cast@std@@QAE@ABV01@@Z(ptr ptr) bad_cast_copy_ctor
+@ cdecl -arch=win64 ??0bad_cast@std@@QEAA@AEBV01@@Z(ptr ptr) bad_cast_copy_ctor
 @ thiscall -arch=i386 ??0bad_cast@std@@QAE@PBD@Z(ptr str) MSVCP_bad_cast_ctor
 @ cdecl -arch=win64 ??0bad_cast@std@@QEAA@PEBD@Z(ptr str) MSVCP_bad_cast_ctor
 @ stub -arch=win32 ??0bad_exception@std@@QAE@ABV01@@Z
@@ -871,8 +871,8 @@
 @ cdecl -arch=win64 ??0ios_base@std@@IEAA@XZ(ptr) ios_base_ctor
 @ thiscall -arch=win32 ??0ios_base@std@@QAE@ABV01@@Z(ptr ptr) ios_base_copy_ctor
 @ cdecl -arch=win64 ??0ios_base@std@@QEAA@AEBV01@@Z(ptr ptr) ios_base_copy_ctor
-@ thiscall -arch=win32 ??0length_error@std@@QAE@ABV01@@Z(ptr ptr) MSVCP_length_error_copy_ctor
-@ cdecl -arch=win64 ??0length_error@std@@QEAA@AEBV01@@Z(ptr ptr) MSVCP_length_error_copy_ctor
+@ thiscall -arch=win32 ??0length_error@std@@QAE@ABV01@@Z(ptr ptr) length_error_copy_ctor
+@ cdecl -arch=win64 ??0length_error@std@@QEAA@AEBV01@@Z(ptr ptr) length_error_copy_ctor
 @ thiscall -arch=win32 ??0length_error@std@@QAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z(ptr ptr) MSVCP_length_error_ctor_bstr
 @ cdecl -arch=win64 ??0length_error@std@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z(ptr ptr) MSVCP_length_error_ctor_bstr
 @ thiscall -arch=win32 ??0locale@std@@AAE@PAV_Locimp@01@@Z(ptr ptr) locale_ctor_locimp
@@ -889,8 +889,8 @@
 @ cdecl -arch=win64 ??0locale@std@@QEAA@W4_Uninitialized@1@@Z(ptr long) locale_ctor_uninitialized
 @ thiscall -arch=win32 ??0locale@std@@QAE@XZ(ptr) locale_ctor
 @ cdecl -arch=win64 ??0locale@std@@QEAA@XZ(ptr) locale_ctor
-@ thiscall -arch=win32 ??0logic_error@std@@QAE@ABV01@@Z(ptr ptr) MSVCP_logic_error_copy_ctor
-@ cdecl -arch=win64 ??0logic_error@std@@QEAA@AEBV01@@Z(ptr ptr) MSVCP_logic_error_copy_ctor
+@ thiscall -arch=win32 ??0logic_error@std@@QAE@ABV01@@Z(ptr ptr) logic_error_copy_ctor
+@ cdecl -arch=win64 ??0logic_error@std@@QEAA@AEBV01@@Z(ptr ptr) logic_error_copy_ctor
 @ thiscall -arch=win32 ??0logic_error@std@@QAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z(ptr ptr) MSVCP_logic_error_ctor_bstr
 @ cdecl -arch=win64 ??0logic_error@std@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z(ptr ptr) MSVCP_logic_error_ctor_bstr
 @ stub -arch=win32 ??0messages_base@std@@QAE@I@Z
@@ -899,20 +899,20 @@
 @ stub -arch=win64 ??0money_base@std@@QEAA@_K@Z
 @ thiscall -arch=win32 ??0ostrstream@std@@QAE@PADHH@Z(ptr ptr long long long) ostrstream_ctor
 @ cdecl -arch=win64 ??0ostrstream@std@@QEAA@PEAD_JH@Z(ptr ptr long long long) ostrstream_ctor
-@ thiscall -arch=win32 ??0out_of_range@std@@QAE@ABV01@@Z(ptr ptr) MSVCP_out_of_range_copy_ctor
-@ cdecl -arch=win64 ??0out_of_range@std@@QEAA@AEBV01@@Z(ptr ptr) MSVCP_out_of_range_copy_ctor
+@ thiscall -arch=win32 ??0out_of_range@std@@QAE@ABV01@@Z(ptr ptr) out_of_range_copy_ctor
+@ cdecl -arch=win64 ??0out_of_range@std@@QEAA@AEBV01@@Z(ptr ptr) out_of_range_copy_ctor
 @ thiscall -arch=win32 ??0out_of_range@std@@QAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z(ptr ptr) MSVCP_out_of_range_ctor_bstr
 @ cdecl -arch=win64 ??0out_of_range@std@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z(ptr ptr) MSVCP_out_of_range_ctor_bstr
 @ stub -arch=win32 ??0overflow_error@std@@QAE@ABV01@@Z
 @ stub -arch=win64 ??0overflow_error@std@@QEAA@AEBV01@@Z
 @ stub -arch=win32 ??0overflow_error@std@@QAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z
 @ stub -arch=win64 ??0overflow_error@std@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z
-@ thiscall -arch=win32 ??0range_error@std@@QAE@ABV01@@Z(ptr ptr) MSVCP_range_error_copy_ctor
-@ cdecl -arch=win64 ??0range_error@std@@QEAA@AEBV01@@Z(ptr ptr) MSVCP_range_error_copy_ctor
+@ thiscall -arch=win32 ??0range_error@std@@QAE@ABV01@@Z(ptr ptr) range_error_copy_ctor
+@ cdecl -arch=win64 ??0range_error@std@@QEAA@AEBV01@@Z(ptr ptr) range_error_copy_ctor
 @ thiscall -arch=win32 ??0range_error@std@@QAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z(ptr ptr) MSVCP_range_error_ctor_bstr
 @ cdecl -arch=win64 ??0range_error@std@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z(ptr ptr) MSVCP_range_error_ctor_bstr
-@ thiscall -arch=win32 ??0runtime_error@std@@QAE@ABV01@@Z(ptr ptr) MSVCP_runtime_error_copy_ctor
-@ cdecl -arch=win64 ??0runtime_error@std@@QEAA@AEBV01@@Z(ptr ptr) MSVCP_runtime_error_copy_ctor
+@ thiscall -arch=win32 ??0runtime_error@std@@QAE@ABV01@@Z(ptr ptr) runtime_error_copy_ctor
+@ cdecl -arch=win64 ??0runtime_error@std@@QEAA@AEBV01@@Z(ptr ptr) runtime_error_copy_ctor
 @ thiscall -arch=win32 ??0runtime_error@std@@QAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z(ptr ptr) MSVCP_runtime_error_ctor_bstr
 @ cdecl -arch=win64 ??0runtime_error@std@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z(ptr ptr) MSVCP_runtime_error_ctor_bstr
 @ thiscall -arch=win32 ??0strstream@std@@QAE@PADHH@Z(ptr ptr long long long) strstream_ctor
@@ -1761,38 +1761,38 @@
 @ stub -arch=win64 ??_0std@@YAAEAV?$complex@O@0@AEAV10@AEBV10@@Z
 # extern ??_7?$_Mpunct@D@std@@6B@
 # extern ??_7?$_Mpunct@G@std@@6B@
-@ extern ??_7?$basic_filebuf@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_filebuf_char_vtable
-@ extern ??_7?$basic_filebuf@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_filebuf_short_vtable
-@ extern ??_7?$basic_fstream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_fstream_char_vtable
-@ extern ??_7?$basic_fstream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_fstream_short_vtable
-@ extern ??_7?$basic_ifstream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ifstream_char_vtable
-@ extern ??_7?$basic_ifstream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ifstream_short_vtable
-@ extern ??_7?$basic_ios@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ios_char_vtable
-@ extern ??_7?$basic_ios@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ios_short_vtable
-@ extern ??_7?$basic_iostream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_iostream_char_vtable
-@ extern ??_7?$basic_iostream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_iostream_short_vtable
-@ extern ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_istream_char_vtable
-@ extern ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_istream_short_vtable
-@ extern ??_7?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ MSVCP_basic_istringstream_char_vtable
-@ extern ??_7?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ MSVCP_basic_istringstream_short_vtable
-@ extern ??_7?$basic_ofstream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ofstream_char_vtable
-@ extern ??_7?$basic_ofstream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ofstream_short_vtable
-@ extern ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ostream_char_vtable
-@ extern ??_7?$basic_ostream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ostream_short_vtable
-@ extern ??_7?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ MSVCP_basic_ostringstream_char_vtable
-@ extern ??_7?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ MSVCP_basic_ostringstream_short_vtable
-@ extern ??_7?$basic_streambuf@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_streambuf_char_vtable
-@ extern ??_7?$basic_streambuf@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_streambuf_short_vtable
-@ extern ??_7?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ MSVCP_basic_stringbuf_char_vtable
-@ extern ??_7?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ MSVCP_basic_stringbuf_short_vtable
-@ extern ??_7?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ MSVCP_basic_stringstream_char_vtable
-@ extern ??_7?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ MSVCP_basic_stringstream_short_vtable
-@ extern ??_7?$codecvt@DDH@std@@6B@ MSVCP_codecvt_char_vtable
-@ extern ??_7?$codecvt@GDH@std@@6B@ MSVCP_codecvt_short_vtable
-@ extern ??_7?$collate@D@std@@6B@ MSVCP_collate_char_vtable
-@ extern ??_7?$collate@G@std@@6B@ MSVCP_collate_short_vtable
-@ extern ??_7?$ctype@D@std@@6B@ MSVCP_ctype_char_vtable
-@ extern ??_7?$ctype@G@std@@6B@ MSVCP_ctype_short_vtable
+@ extern ??_7?$basic_filebuf@DU?$char_traits@D@std@@@std@@6B@ basic_filebuf_char_vtable
+@ extern ??_7?$basic_filebuf@GU?$char_traits@G@std@@@std@@6B@ basic_filebuf_short_vtable
+@ extern ??_7?$basic_fstream@DU?$char_traits@D@std@@@std@@6B@ basic_fstream_char_vtable
+@ extern ??_7?$basic_fstream@GU?$char_traits@G@std@@@std@@6B@ basic_fstream_short_vtable
+@ extern ??_7?$basic_ifstream@DU?$char_traits@D@std@@@std@@6B@ basic_ifstream_char_vtable
+@ extern ??_7?$basic_ifstream@GU?$char_traits@G@std@@@std@@6B@ basic_ifstream_short_vtable
+@ extern ??_7?$basic_ios@DU?$char_traits@D@std@@@std@@6B@ basic_ios_char_vtable
+@ extern ??_7?$basic_ios@GU?$char_traits@G@std@@@std@@6B@ basic_ios_short_vtable
+@ extern ??_7?$basic_iostream@DU?$char_traits@D@std@@@std@@6B@ basic_iostream_char_vtable
+@ extern ??_7?$basic_iostream@GU?$char_traits@G@std@@@std@@6B@ basic_iostream_short_vtable
+@ extern ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@ basic_istream_char_vtable
+@ extern ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@ basic_istream_short_vtable
+@ extern ??_7?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ basic_istringstream_char_vtable
+@ extern ??_7?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ basic_istringstream_short_vtable
+@ extern ??_7?$basic_ofstream@DU?$char_traits@D@std@@@std@@6B@ basic_ofstream_char_vtable
+@ extern ??_7?$basic_ofstream@GU?$char_traits@G@std@@@std@@6B@ basic_ofstream_short_vtable
+@ extern ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@ basic_ostream_char_vtable
+@ extern ??_7?$basic_ostream@GU?$char_traits@G@std@@@std@@6B@ basic_ostream_short_vtable
+@ extern ??_7?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ basic_ostringstream_char_vtable
+@ extern ??_7?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ basic_ostringstream_short_vtable
+@ extern ??_7?$basic_streambuf@DU?$char_traits@D@std@@@std@@6B@ basic_streambuf_char_vtable
+@ extern ??_7?$basic_streambuf@GU?$char_traits@G@std@@@std@@6B@ basic_streambuf_short_vtable
+@ extern ??_7?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ basic_stringbuf_char_vtable
+@ extern ??_7?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ basic_stringbuf_short_vtable
+@ extern ??_7?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ basic_stringstream_char_vtable
+@ extern ??_7?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ basic_stringstream_short_vtable
+@ extern ??_7?$codecvt@DDH@std@@6B@ codecvt_char_vtable
+@ extern ??_7?$codecvt@GDH@std@@6B@ codecvt_short_vtable
+@ extern ??_7?$collate@D@std@@6B@ collate_char_vtable
+@ extern ??_7?$collate@G@std@@6B@ collate_short_vtable
+@ extern ??_7?$ctype@D@std@@6B@ ctype_char_vtable
+@ extern ??_7?$ctype@G@std@@6B@ ctype_short_vtable
 # extern ??_7?$messages@D@std@@6B@
 # extern ??_7?$messages@G@std@@6B@
 # extern ??_7?$money_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@
@@ -1803,34 +1803,34 @@
 # extern ??_7?$moneypunct@D$0A@@std@@6B@
 # extern ??_7?$moneypunct@G$00@std@@6B@
 # extern ??_7?$moneypunct@G$0A@@std@@6B@
-@ extern ??_7?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_num_get_char_vtable
-@ extern ??_7?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_num_get_short_vtable
-@ extern ??_7?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_num_put_char_vtable
-@ extern ??_7?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_num_put_short_vtable
-@ extern ??_7?$numpunct@D@std@@6B@ MSVCP_numpunct_char_vtable
-@ extern ??_7?$numpunct@G@std@@6B@ MSVCP_numpunct_short_vtable
-@ extern ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_get_char_vtable
+@ extern ??_7?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ num_get_char_vtable
+@ extern ??_7?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ num_get_short_vtable
+@ extern ??_7?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ num_put_char_vtable
+@ extern ??_7?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ num_put_short_vtable
+@ extern ??_7?$numpunct@D@std@@6B@ numpunct_char_vtable
+@ extern ??_7?$numpunct@G@std@@6B@ numpunct_short_vtable
+@ extern ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ time_get_char_vtable
 # extern ??_7?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
-@ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable
-@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable
+@ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ time_put_char_vtable
+@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ time_put_short_vtable
 # extern ??_7__non_rtti_object@std@@6B@
-@ extern ??_7bad_alloc@std@@6B@ MSVCP_bad_alloc_vtable
-@ extern ??_7bad_cast@std@@6B@ MSVCP_bad_cast_vtable
+@ extern ??_7bad_alloc@std@@6B@ bad_alloc_vtable
+@ extern ??_7bad_cast@std@@6B@ bad_cast_vtable
 # extern ??_7bad_exception@std@@6B@
 # extern ??_7bad_typeid@std@@6B@
-@ extern ??_7codecvt_base@std@@6B@ MSVCP_codecvt_base_vtable
-@ extern ??_7ctype_base@std@@6B@ MSVCP_ctype_base_vtable
+@ extern ??_7codecvt_base@std@@6B@ codecvt_base_vtable
+@ extern ??_7ctype_base@std@@6B@ ctype_base_vtable
 # extern ??_7domain_error@std@@6B@
-@ extern ??_7facet@locale@std@@6B@ MSVCP_locale_facet_vtable
-@ extern ??_7ios_base@std@@6B@ MSVCP_ios_base_vtable
-@ extern ??_7length_error@std@@6B@ MSVCP_length_error_vtable
-@ extern ??_7logic_error@std@@6B@ MSVCP_logic_error_vtable
+@ extern ??_7facet@locale@std@@6B@ locale_facet_vtable
+@ extern ??_7ios_base@std@@6B@ ios_base_vtable
+@ extern ??_7length_error@std@@6B@ length_error_vtable
+@ extern ??_7logic_error@std@@6B@ logic_error_vtable
 # extern ??_7messages_base@std@@6B@
 # extern ??_7money_base@std@@6B@
-@ extern ??_7out_of_range@std@@6B@ MSVCP_out_of_range_vtable
+@ extern ??_7out_of_range@std@@6B@ out_of_range_vtable
 # extern ??_7overflow_error@std@@6B@
-@ extern ??_7range_error@std@@6B@ MSVCP_range_error_vtable
-@ extern ??_7runtime_error@std@@6B@ MSVCP_runtime_error_vtable
+@ extern ??_7range_error@std@@6B@ range_error_vtable
+@ extern ??_7runtime_error@std@@6B@ runtime_error_vtable
 # extern ??_7time_base@std@@6B@
 # extern ??_7underflow_error@std@@6B@
 @ extern ??_8?$basic_fstream@DU?$char_traits@D@std@@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@ basic_fstream_char_vbtable1
diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c
index 8937dd35873..f162939bdc0 100644
--- a/dlls/msvcp60/string.c
+++ b/dlls/msvcp60/string.c
@@ -2163,8 +2163,8 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_alloc(
 
 /* ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@ABV01@@Z */
 /* ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@AEBV01@@Z */
-DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_copy_ctor, 8)
-basic_string_wchar* __thiscall MSVCP_basic_string_wchar_copy_ctor(
+DEFINE_THISCALL_WRAPPER(basic_string_wchar_copy_ctor, 8)
+basic_string_wchar* __thiscall basic_string_wchar_copy_ctor(
         basic_string_wchar *this, const basic_string_wchar *copy)
 {
     TRACE("%p %p\n", this, copy);
@@ -2884,7 +2884,7 @@ basic_string_wchar* __cdecl MSVCP_basic_string_wchar_concatenate(basic_string_wc
 {
     TRACE("%p %p\n", left, right);
 
-    MSVCP_basic_string_wchar_copy_ctor(ret, left);
+    basic_string_wchar_copy_ctor(ret, left);
     MSVCP_basic_string_wchar_append(ret, right);
     return ret;
 }
@@ -2898,7 +2898,7 @@ basic_string_wchar* __cdecl MSVCP_basic_string_wchar_concatenate_bstr_ch(basic_s
 {
     TRACE("%p %c\n", left, right);
 
-    MSVCP_basic_string_wchar_copy_ctor(ret, left);
+    basic_string_wchar_copy_ctor(ret, left);
     MSVCP_basic_string_wchar_append_ch(ret, right);
     return ret;
 }
@@ -2912,7 +2912,7 @@ basic_string_wchar* __cdecl MSVCP_basic_string_wchar_concatenate_bstr_cstr(basic
 {
     TRACE("%p %s\n", left, debugstr_w(right));
 
-    MSVCP_basic_string_wchar_copy_ctor(ret, left);
+    basic_string_wchar_copy_ctor(ret, left);
     MSVCP_basic_string_wchar_append_cstr(ret, right);
     return ret;
 }
diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec
index f07c6221a11..d60e37bcff6 100644
--- a/dlls/msvcp70/msvcp70.spec
+++ b/dlls/msvcp70/msvcp70.spec
@@ -446,8 +446,8 @@
 @ stub -arch=win64 ??0__non_rtti_object@std@@QEAA@AEBV01@@Z
 @ stub -arch=win32 ??0__non_rtti_object@std@@QAE@PBD@Z
 @ stub -arch=win64 ??0__non_rtti_object@std@@QEAA@PEBD@Z
-@ thiscall -arch=i386 ??0bad_cast@std@@QAE@ABV01@@Z(ptr ptr) MSVCP_bad_cast_copy_ctor
-@ cdecl -arch=win64 ??0bad_cast@std@@QEAA@AEBV01@@Z(ptr ptr) MSVCP_bad_cast_copy_ctor
+@ thiscall -arch=i386 ??0bad_cast@std@@QAE@ABV01@@Z(ptr ptr) bad_cast_copy_ctor
+@ cdecl -arch=win64 ??0bad_cast@std@@QEAA@AEBV01@@Z(ptr ptr) bad_cast_copy_ctor
 @ thiscall -arch=i386 ??0bad_cast@std@@QAE@PBD@Z(ptr str) MSVCP_bad_cast_ctor
 @ cdecl -arch=win64 ??0bad_cast@std@@QEAA@PEBD@Z(ptr str) MSVCP_bad_cast_ctor
 @ stub -arch=win32 ??0bad_typeid@std@@QAE@ABV01@@Z
@@ -1424,54 +1424,54 @@
 # extern ??_7?$_Mpunct@D@std@@6B@
 # extern ??_7?$_Mpunct@G@std@@6B@
 # extern ??_7?$_Mpunct@_W@std@@6B@
-@ extern ??_7?$basic_filebuf@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_filebuf_char_vtable
-@ extern ??_7?$basic_filebuf@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_filebuf_short_vtable
-@ extern ??_7?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_filebuf_wchar_vtable
-@ extern ??_7?$basic_fstream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_fstream_char_vtable
-@ extern ??_7?$basic_fstream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_fstream_short_vtable
-@ extern ??_7?$basic_fstream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_fstream_wchar_vtable
-@ extern ??_7?$basic_ifstream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ifstream_char_vtable
-@ extern ??_7?$basic_ifstream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ifstream_short_vtable
-@ extern ??_7?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ifstream_wchar_vtable
-@ extern ??_7?$basic_ios@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ios_char_vtable
-@ extern ??_7?$basic_ios@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ios_short_vtable
-@ extern ??_7?$basic_ios@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ios_wchar_vtable
-@ extern ??_7?$basic_iostream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_iostream_char_vtable
-@ extern ??_7?$basic_iostream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_iostream_short_vtable
-@ extern ??_7?$basic_iostream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_iostream_wchar_vtable
-@ extern ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_istream_char_vtable
-@ extern ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_istream_short_vtable
-@ extern ??_7?$basic_istream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_istream_wchar_vtable
-@ extern ??_7?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ MSVCP_basic_istringstream_char_vtable
-@ extern ??_7?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ MSVCP_basic_istringstream_short_vtable
-@ extern ??_7?$basic_istringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ MSVCP_basic_istringstream_wchar_vtable
-@ extern ??_7?$basic_ofstream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ofstream_char_vtable
-@ extern ??_7?$basic_ofstream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ofstream_short_vtable
-@ extern ??_7?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ofstream_wchar_vtable
-@ extern ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ostream_char_vtable
-@ extern ??_7?$basic_ostream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ostream_short_vtable
-@ extern ??_7?$basic_ostream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ostream_wchar_vtable
-@ extern ??_7?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ MSVCP_basic_ostringstream_char_vtable
-@ extern ??_7?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ MSVCP_basic_ostringstream_short_vtable
-@ extern ??_7?$basic_ostringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ MSVCP_basic_ostringstream_wchar_vtable
-@ extern ??_7?$basic_streambuf@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_streambuf_char_vtable
-@ extern ??_7?$basic_streambuf@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_streambuf_short_vtable
-@ extern ??_7?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_streambuf_wchar_vtable
-@ extern ??_7?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ MSVCP_basic_stringbuf_char_vtable
-@ extern ??_7?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ MSVCP_basic_stringbuf_short_vtable
-@ extern ??_7?$basic_stringbuf@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ MSVCP_basic_stringbuf_wchar_vtable
-@ extern ??_7?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ MSVCP_basic_stringstream_char_vtable
-@ extern ??_7?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ MSVCP_basic_stringstream_short_vtable
-@ extern ??_7?$basic_stringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ MSVCP_basic_stringstream_wchar_vtable
-@ extern ??_7?$codecvt@DDH@std@@6B@ MSVCP_codecvt_char_vtable
-@ extern ??_7?$codecvt@GDH@std@@6B@ MSVCP_codecvt_short_vtable
-@ extern ??_7?$codecvt@_WDH@std@@6B@ MSVCP_codecvt_wchar_vtable
-@ extern ??_7?$collate@D@std@@6B@ MSVCP_collate_char_vtable
-@ extern ??_7?$collate@G@std@@6B@ MSVCP_collate_short_vtable
-@ extern ??_7?$collate@_W@std@@6B@ MSVCP_collate_wchar_vtable
-@ extern ??_7?$ctype@D@std@@6B@ MSVCP_ctype_char_vtable
-@ extern ??_7?$ctype@G@std@@6B@ MSVCP_ctype_short_vtable
-@ extern ??_7?$ctype@_W@std@@6B@ MSVCP_ctype_wchar_vtable
+@ extern ??_7?$basic_filebuf@DU?$char_traits@D@std@@@std@@6B@ basic_filebuf_char_vtable
+@ extern ??_7?$basic_filebuf@GU?$char_traits@G@std@@@std@@6B@ basic_filebuf_short_vtable
+@ extern ??_7?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@6B@ basic_filebuf_wchar_vtable
+@ extern ??_7?$basic_fstream@DU?$char_traits@D@std@@@std@@6B@ basic_fstream_char_vtable
+@ extern ??_7?$basic_fstream@GU?$char_traits@G@std@@@std@@6B@ basic_fstream_short_vtable
+@ extern ??_7?$basic_fstream@_WU?$char_traits@_W@std@@@std@@6B@ basic_fstream_wchar_vtable
+@ extern ??_7?$basic_ifstream@DU?$char_traits@D@std@@@std@@6B@ basic_ifstream_char_vtable
+@ extern ??_7?$basic_ifstream@GU?$char_traits@G@std@@@std@@6B@ basic_ifstream_short_vtable
+@ extern ??_7?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@6B@ basic_ifstream_wchar_vtable
+@ extern ??_7?$basic_ios@DU?$char_traits@D@std@@@std@@6B@ basic_ios_char_vtable
+@ extern ??_7?$basic_ios@GU?$char_traits@G@std@@@std@@6B@ basic_ios_short_vtable
+@ extern ??_7?$basic_ios@_WU?$char_traits@_W@std@@@std@@6B@ basic_ios_wchar_vtable
+@ extern ??_7?$basic_iostream@DU?$char_traits@D@std@@@std@@6B@ basic_iostream_char_vtable
+@ extern ??_7?$basic_iostream@GU?$char_traits@G@std@@@std@@6B@ basic_iostream_short_vtable
+@ extern ??_7?$basic_iostream@_WU?$char_traits@_W@std@@@std@@6B@ basic_iostream_wchar_vtable
+@ extern ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@ basic_istream_char_vtable
+@ extern ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@ basic_istream_short_vtable
+@ extern ??_7?$basic_istream@_WU?$char_traits@_W@std@@@std@@6B@ basic_istream_wchar_vtable
+@ extern ??_7?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ basic_istringstream_char_vtable
+@ extern ??_7?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ basic_istringstream_short_vtable
+@ extern ??_7?$basic_istringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ basic_istringstream_wchar_vtable
+@ extern ??_7?$basic_ofstream@DU?$char_traits@D@std@@@std@@6B@ basic_ofstream_char_vtable
+@ extern ??_7?$basic_ofstream@GU?$char_traits@G@std@@@std@@6B@ basic_ofstream_short_vtable
+@ extern ??_7?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@6B@ basic_ofstream_wchar_vtable
+@ extern ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@ basic_ostream_char_vtable
+@ extern ??_7?$basic_ostream@GU?$char_traits@G@std@@@std@@6B@ basic_ostream_short_vtable
+@ extern ??_7?$basic_ostream@_WU?$char_traits@_W@std@@@std@@6B@ basic_ostream_wchar_vtable
+@ extern ??_7?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ basic_ostringstream_char_vtable
+@ extern ??_7?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ basic_ostringstream_short_vtable
+@ extern ??_7?$basic_ostringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ basic_ostringstream_wchar_vtable
+@ extern ??_7?$basic_streambuf@DU?$char_traits@D@std@@@std@@6B@ basic_streambuf_char_vtable
+@ extern ??_7?$basic_streambuf@GU?$char_traits@G@std@@@std@@6B@ basic_streambuf_short_vtable
+@ extern ??_7?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@6B@ basic_streambuf_wchar_vtable
+@ extern ??_7?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ basic_stringbuf_char_vtable
+@ extern ??_7?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ basic_stringbuf_short_vtable
+@ extern ??_7?$basic_stringbuf@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ basic_stringbuf_wchar_vtable
+@ extern ??_7?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ basic_stringstream_char_vtable
+@ extern ??_7?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ basic_stringstream_short_vtable
+@ extern ??_7?$basic_stringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ basic_stringstream_wchar_vtable
+@ extern ??_7?$codecvt@DDH@std@@6B@ codecvt_char_vtable
+@ extern ??_7?$codecvt@GDH@std@@6B@ codecvt_short_vtable
+@ extern ??_7?$codecvt@_WDH@std@@6B@ codecvt_wchar_vtable
+@ extern ??_7?$collate@D@std@@6B@ collate_char_vtable
+@ extern ??_7?$collate@G@std@@6B@ collate_short_vtable
+@ extern ??_7?$collate@_W@std@@6B@ collate_wchar_vtable
+@ extern ??_7?$ctype@D@std@@6B@ ctype_char_vtable
+@ extern ??_7?$ctype@G@std@@6B@ ctype_short_vtable
+@ extern ??_7?$ctype@_W@std@@6B@ ctype_wchar_vtable
 # extern ??_7?$messages@D@std@@6B@
 # extern ??_7?$messages@G@std@@6B@
 # extern ??_7?$messages@_W@std@@6B@
@@ -1487,28 +1487,28 @@
 # extern ??_7?$moneypunct@G$0A@@std@@6B@
 # extern ??_7?$moneypunct@_W$00@std@@6B@
 # extern ??_7?$moneypunct@_W$0A@@std@@6B@
-@ extern ??_7?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_num_get_char_vtable
-@ extern ??_7?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_num_get_short_vtable
-@ extern ??_7?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_num_get_wchar_vtable
-@ extern ??_7?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_num_put_char_vtable
-@ extern ??_7?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_num_put_short_vtable
-@ extern ??_7?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_num_put_wchar_vtable
-@ extern ??_7?$numpunct@D@std@@6B@ MSVCP_numpunct_char_vtable
-@ extern ??_7?$numpunct@G@std@@6B@ MSVCP_numpunct_short_vtable
-@ extern ??_7?$numpunct@_W@std@@6B@ MSVCP_numpunct_wchar_vtable
-@ extern ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_get_char_vtable
+@ extern ??_7?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ num_get_char_vtable
+@ extern ??_7?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ num_get_short_vtable
+@ extern ??_7?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ num_get_wchar_vtable
+@ extern ??_7?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ num_put_char_vtable
+@ extern ??_7?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ num_put_short_vtable
+@ extern ??_7?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ num_put_wchar_vtable
+@ extern ??_7?$numpunct@D@std@@6B@ numpunct_char_vtable
+@ extern ??_7?$numpunct@G@std@@6B@ numpunct_short_vtable
+@ extern ??_7?$numpunct@_W@std@@6B@ numpunct_wchar_vtable
+@ extern ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ time_get_char_vtable
 # extern ??_7?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
-@ extern ??_7?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_get_wchar_vtable
-@ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable
-@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable
-@ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable
+@ extern ??_7?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ time_get_wchar_vtable
+@ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ time_put_char_vtable
+@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ time_put_short_vtable
+@ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ time_put_wchar_vtable
 # extern ??_7__non_rtti_object@std@@6B@
-@ extern ??_7bad_cast@std@@6B@ MSVCP_bad_cast_vtable
+@ extern ??_7bad_cast@std@@6B@ bad_cast_vtable
 # extern ??_7bad_typeid@std@@6B@
-@ extern ??_7codecvt_base@std@@6B@ MSVCP_codecvt_base_vtable
-@ extern ??_7ctype_base@std@@6B@ MSVCP_ctype_base_vtable
-@ extern ??_7facet@locale@std@@6B@ MSVCP_locale_facet_vtable
-@ extern ??_7ios_base@std@@6B@ MSVCP_ios_base_vtable
+@ extern ??_7codecvt_base@std@@6B@ codecvt_base_vtable
+@ extern ??_7ctype_base@std@@6B@ ctype_base_vtable
+@ extern ??_7facet@locale@std@@6B@ locale_facet_vtable
+@ extern ??_7ios_base@std@@6B@ ios_base_vtable
 # extern ??_7messages_base@std@@6B@
 # extern ??_7money_base@std@@6B@
 # extern ??_7time_base@std@@6B@
diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec
index 0b371131613..1ccdd09825c 100644
--- a/dlls/msvcp71/msvcp71.spec
+++ b/dlls/msvcp71/msvcp71.spec
@@ -1620,54 +1620,54 @@
 # extern ??_7?$_Mpunct@D@std@@6B@
 # extern ??_7?$_Mpunct@G@std@@6B@
 # extern ??_7?$_Mpunct@_W@std@@6B@
-@ extern ??_7?$basic_filebuf@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_filebuf_char_vtable
-@ extern ??_7?$basic_filebuf@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_filebuf_short_vtable
-@ extern ??_7?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_filebuf_wchar_vtable
-@ extern ??_7?$basic_fstream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_fstream_char_vtable
-@ extern ??_7?$basic_fstream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_fstream_short_vtable
-@ extern ??_7?$basic_fstream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_fstream_wchar_vtable
-@ extern ??_7?$basic_ifstream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ifstream_char_vtable
-@ extern ??_7?$basic_ifstream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ifstream_short_vtable
-@ extern ??_7?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ifstream_wchar_vtable
-@ extern ??_7?$basic_ios@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ios_char_vtable
-@ extern ??_7?$basic_ios@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ios_short_vtable
-@ extern ??_7?$basic_ios@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ios_wchar_vtable
-@ extern ??_7?$basic_iostream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_iostream_char_vtable
-@ extern ??_7?$basic_iostream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_iostream_short_vtable
-@ extern ??_7?$basic_iostream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_iostream_wchar_vtable
-@ extern ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_istream_char_vtable
-@ extern ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_istream_short_vtable
-@ extern ??_7?$basic_istream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_istream_wchar_vtable
-@ extern ??_7?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ MSVCP_basic_istringstream_char_vtable
-@ extern ??_7?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ MSVCP_basic_istringstream_short_vtable
-@ extern ??_7?$basic_istringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ MSVCP_basic_istringstream_wchar_vtable
-@ extern ??_7?$basic_ofstream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ofstream_char_vtable
-@ extern ??_7?$basic_ofstream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ofstream_short_vtable
-@ extern ??_7?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ofstream_wchar_vtable
-@ extern ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ostream_char_vtable
-@ extern ??_7?$basic_ostream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ostream_short_vtable
-@ extern ??_7?$basic_ostream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ostream_wchar_vtable
-@ extern ??_7?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ MSVCP_basic_ostringstream_char_vtable
-@ extern ??_7?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ MSVCP_basic_ostringstream_short_vtable
-@ extern ??_7?$basic_ostringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ MSVCP_basic_ostringstream_wchar_vtable
-@ extern ??_7?$basic_streambuf@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_streambuf_char_vtable
-@ extern ??_7?$basic_streambuf@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_streambuf_short_vtable
-@ extern ??_7?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_streambuf_wchar_vtable
-@ extern ??_7?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ MSVCP_basic_stringbuf_char_vtable
-@ extern ??_7?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ MSVCP_basic_stringbuf_short_vtable
-@ extern ??_7?$basic_stringbuf@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ MSVCP_basic_stringbuf_wchar_vtable
-@ extern ??_7?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ MSVCP_basic_stringstream_char_vtable
-@ extern ??_7?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ MSVCP_basic_stringstream_short_vtable
-@ extern ??_7?$basic_stringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ MSVCP_basic_stringstream_wchar_vtable
-@ extern ??_7?$codecvt@DDH@std@@6B@ MSVCP_codecvt_char_vtable
-@ extern ??_7?$codecvt@GDH@std@@6B@ MSVCP_codecvt_short_vtable
-@ extern ??_7?$codecvt@_WDH@std@@6B@ MSVCP_codecvt_wchar_vtable
-@ extern ??_7?$collate@D@std@@6B@ MSVCP_collate_char_vtable
-@ extern ??_7?$collate@G@std@@6B@ MSVCP_collate_short_vtable
-@ extern ??_7?$collate@_W@std@@6B@ MSVCP_collate_wchar_vtable
-@ extern ??_7?$ctype@D@std@@6B@ MSVCP_ctype_char_vtable
-@ extern ??_7?$ctype@G@std@@6B@ MSVCP_ctype_short_vtable
-@ extern ??_7?$ctype@_W@std@@6B@ MSVCP_ctype_wchar_vtable
+@ extern ??_7?$basic_filebuf@DU?$char_traits@D@std@@@std@@6B@ basic_filebuf_char_vtable
+@ extern ??_7?$basic_filebuf@GU?$char_traits@G@std@@@std@@6B@ basic_filebuf_short_vtable
+@ extern ??_7?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@6B@ basic_filebuf_wchar_vtable
+@ extern ??_7?$basic_fstream@DU?$char_traits@D@std@@@std@@6B@ basic_fstream_char_vtable
+@ extern ??_7?$basic_fstream@GU?$char_traits@G@std@@@std@@6B@ basic_fstream_short_vtable
+@ extern ??_7?$basic_fstream@_WU?$char_traits@_W@std@@@std@@6B@ basic_fstream_wchar_vtable
+@ extern ??_7?$basic_ifstream@DU?$char_traits@D@std@@@std@@6B@ basic_ifstream_char_vtable
+@ extern ??_7?$basic_ifstream@GU?$char_traits@G@std@@@std@@6B@ basic_ifstream_short_vtable
+@ extern ??_7?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@6B@ basic_ifstream_wchar_vtable
+@ extern ??_7?$basic_ios@DU?$char_traits@D@std@@@std@@6B@ basic_ios_char_vtable
+@ extern ??_7?$basic_ios@GU?$char_traits@G@std@@@std@@6B@ basic_ios_short_vtable
+@ extern ??_7?$basic_ios@_WU?$char_traits@_W@std@@@std@@6B@ basic_ios_wchar_vtable
+@ extern ??_7?$basic_iostream@DU?$char_traits@D@std@@@std@@6B@ basic_iostream_char_vtable
+@ extern ??_7?$basic_iostream@GU?$char_traits@G@std@@@std@@6B@ basic_iostream_short_vtable
+@ extern ??_7?$basic_iostream@_WU?$char_traits@_W@std@@@std@@6B@ basic_iostream_wchar_vtable
+@ extern ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@ basic_istream_char_vtable
+@ extern ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@ basic_istream_short_vtable
+@ extern ??_7?$basic_istream@_WU?$char_traits@_W@std@@@std@@6B@ basic_istream_wchar_vtable
+@ extern ??_7?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ basic_istringstream_char_vtable
+@ extern ??_7?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ basic_istringstream_short_vtable
+@ extern ??_7?$basic_istringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ basic_istringstream_wchar_vtable
+@ extern ??_7?$basic_ofstream@DU?$char_traits@D@std@@@std@@6B@ basic_ofstream_char_vtable
+@ extern ??_7?$basic_ofstream@GU?$char_traits@G@std@@@std@@6B@ basic_ofstream_short_vtable
+@ extern ??_7?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@6B@ basic_ofstream_wchar_vtable
+@ extern ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@ basic_ostream_char_vtable
+@ extern ??_7?$basic_ostream@GU?$char_traits@G@std@@@std@@6B@ basic_ostream_short_vtable
+@ extern ??_7?$basic_ostream@_WU?$char_traits@_W@std@@@std@@6B@ basic_ostream_wchar_vtable
+@ extern ??_7?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ basic_ostringstream_char_vtable
+@ extern ??_7?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ basic_ostringstream_short_vtable
+@ extern ??_7?$basic_ostringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ basic_ostringstream_wchar_vtable
+@ extern ??_7?$basic_streambuf@DU?$char_traits@D@std@@@std@@6B@ basic_streambuf_char_vtable
+@ extern ??_7?$basic_streambuf@GU?$char_traits@G@std@@@std@@6B@ basic_streambuf_short_vtable
+@ extern ??_7?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@6B@ basic_streambuf_wchar_vtable
+@ extern ??_7?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ basic_stringbuf_char_vtable
+@ extern ??_7?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ basic_stringbuf_short_vtable
+@ extern ??_7?$basic_stringbuf@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ basic_stringbuf_wchar_vtable
+@ extern ??_7?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ basic_stringstream_char_vtable
+@ extern ??_7?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ basic_stringstream_short_vtable
+@ extern ??_7?$basic_stringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ basic_stringstream_wchar_vtable
+@ extern ??_7?$codecvt@DDH@std@@6B@ codecvt_char_vtable
+@ extern ??_7?$codecvt@GDH@std@@6B@ codecvt_short_vtable
+@ extern ??_7?$codecvt@_WDH@std@@6B@ codecvt_wchar_vtable
+@ extern ??_7?$collate@D@std@@6B@ collate_char_vtable
+@ extern ??_7?$collate@G@std@@6B@ collate_short_vtable
+@ extern ??_7?$collate@_W@std@@6B@ collate_wchar_vtable
+@ extern ??_7?$ctype@D@std@@6B@ ctype_char_vtable
+@ extern ??_7?$ctype@G@std@@6B@ ctype_short_vtable
+@ extern ??_7?$ctype@_W@std@@6B@ ctype_wchar_vtable
 # extern ??_7?$messages@D@std@@6B@
 # extern ??_7?$messages@G@std@@6B@
 # extern ??_7?$messages@_W@std@@6B@
@@ -1683,25 +1683,25 @@
 # extern ??_7?$moneypunct@G$0A@@std@@6B@
 # extern ??_7?$moneypunct@_W$00@std@@6B@
 # extern ??_7?$moneypunct@_W$0A@@std@@6B@
-@ extern ??_7?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_num_get_char_vtable
-@ extern ??_7?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_num_get_short_vtable
-@ extern ??_7?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_num_get_wchar_vtable
-@ extern ??_7?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_num_put_char_vtable
-@ extern ??_7?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_num_put_short_vtable
-@ extern ??_7?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_num_put_wchar_vtable
-@ extern ??_7?$numpunct@D@std@@6B@ MSVCP_numpunct_char_vtable
-@ extern ??_7?$numpunct@G@std@@6B@ MSVCP_numpunct_short_vtable
-@ extern ??_7?$numpunct@_W@std@@6B@ MSVCP_numpunct_wchar_vtable
-@ extern ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_get_char_vtable
+@ extern ??_7?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ num_get_char_vtable
+@ extern ??_7?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ num_get_short_vtable
+@ extern ??_7?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ num_get_wchar_vtable
+@ extern ??_7?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ num_put_char_vtable
+@ extern ??_7?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ num_put_short_vtable
+@ extern ??_7?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ num_put_wchar_vtable
+@ extern ??_7?$numpunct@D@std@@6B@ numpunct_char_vtable
+@ extern ??_7?$numpunct@G@std@@6B@ numpunct_short_vtable
+@ extern ??_7?$numpunct@_W@std@@6B@ numpunct_wchar_vtable
+@ extern ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ time_get_char_vtable
 # extern ??_7?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
-@ extern ??_7?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_get_wchar_vtable
-@ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable
-@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable
-@ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable
-@ extern ??_7codecvt_base@std@@6B@ MSVCP_codecvt_base_vtable
-@ extern ??_7ctype_base@std@@6B@ MSVCP_ctype_base_vtable
-@ extern ??_7facet@locale@std@@6B@ MSVCP_locale_facet_vtable
-@ extern ??_7ios_base@std@@6B@ MSVCP_ios_base_vtable
+@ extern ??_7?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ time_get_wchar_vtable
+@ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ time_put_char_vtable
+@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ time_put_short_vtable
+@ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ time_put_wchar_vtable
+@ extern ??_7codecvt_base@std@@6B@ codecvt_base_vtable
+@ extern ??_7ctype_base@std@@6B@ ctype_base_vtable
+@ extern ??_7facet@locale@std@@6B@ locale_facet_vtable
+@ extern ??_7ios_base@std@@6B@ ios_base_vtable
 # extern ??_7messages_base@std@@6B@
 # extern ??_7money_base@std@@6B@
 # extern ??_7time_base@std@@6B@
diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec
index 6505f893b50..c1f409a1d78 100644
--- a/dlls/msvcp80/msvcp80.spec
+++ b/dlls/msvcp80/msvcp80.spec
@@ -1775,54 +1775,54 @@
 # extern ??_7?$_Mpunct@D@std@@6B@
 # extern ??_7?$_Mpunct@G@std@@6B@
 # extern ??_7?$_Mpunct@_W@std@@6B@
-@ extern ??_7?$basic_filebuf@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_filebuf_char_vtable
-@ extern ??_7?$basic_filebuf@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_filebuf_short_vtable
-@ extern ??_7?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_filebuf_wchar_vtable
-@ extern ??_7?$basic_fstream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_fstream_char_vtable
-@ extern ??_7?$basic_fstream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_fstream_short_vtable
-@ extern ??_7?$basic_fstream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_fstream_wchar_vtable
-@ extern ??_7?$basic_ifstream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ifstream_char_vtable
-@ extern ??_7?$basic_ifstream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ifstream_short_vtable
-@ extern ??_7?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ifstream_wchar_vtable
-@ extern ??_7?$basic_ios@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ios_char_vtable
-@ extern ??_7?$basic_ios@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ios_short_vtable
-@ extern ??_7?$basic_ios@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ios_wchar_vtable
-@ extern ??_7?$basic_iostream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_iostream_char_vtable
-@ extern ??_7?$basic_iostream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_iostream_short_vtable
-@ extern ??_7?$basic_iostream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_iostream_wchar_vtable
-@ extern ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_istream_char_vtable
-@ extern ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_istream_short_vtable
-@ extern ??_7?$basic_istream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_istream_wchar_vtable
-@ extern ??_7?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ MSVCP_basic_istringstream_char_vtable
-@ extern ??_7?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ MSVCP_basic_istringstream_short_vtable
-@ extern ??_7?$basic_istringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ MSVCP_basic_istringstream_wchar_vtable
-@ extern ??_7?$basic_ofstream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ofstream_char_vtable
-@ extern ??_7?$basic_ofstream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ofstream_short_vtable
-@ extern ??_7?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ofstream_wchar_vtable
-@ extern ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ostream_char_vtable
-@ extern ??_7?$basic_ostream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ostream_short_vtable
-@ extern ??_7?$basic_ostream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ostream_wchar_vtable
-@ extern ??_7?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ MSVCP_basic_ostringstream_char_vtable
-@ extern ??_7?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ MSVCP_basic_ostringstream_short_vtable
-@ extern ??_7?$basic_ostringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ MSVCP_basic_ostringstream_wchar_vtable
-@ extern ??_7?$basic_streambuf@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_streambuf_char_vtable
-@ extern ??_7?$basic_streambuf@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_streambuf_short_vtable
-@ extern ??_7?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_streambuf_wchar_vtable
-@ extern ??_7?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ MSVCP_basic_stringbuf_char_vtable
-@ extern ??_7?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ MSVCP_basic_stringbuf_short_vtable
-@ extern ??_7?$basic_stringbuf@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ MSVCP_basic_stringbuf_wchar_vtable
-@ extern ??_7?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ MSVCP_basic_stringstream_char_vtable
-@ extern ??_7?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ MSVCP_basic_stringstream_short_vtable
-@ extern ??_7?$basic_stringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ MSVCP_basic_stringstream_wchar_vtable
-@ extern ??_7?$codecvt@DDH@std@@6B@ MSVCP_codecvt_char_vtable
-@ extern ??_7?$codecvt@GDH@std@@6B@ MSVCP_codecvt_short_vtable
-@ extern ??_7?$codecvt@_WDH@std@@6B@ MSVCP_codecvt_wchar_vtable
-@ extern ??_7?$collate@D@std@@6B@ MSVCP_collate_char_vtable
-@ extern ??_7?$collate@G@std@@6B@ MSVCP_collate_short_vtable
-@ extern ??_7?$collate@_W@std@@6B@ MSVCP_collate_wchar_vtable
-@ extern ??_7?$ctype@D@std@@6B@ MSVCP_ctype_char_vtable
-@ extern ??_7?$ctype@G@std@@6B@ MSVCP_ctype_short_vtable
-@ extern ??_7?$ctype@_W@std@@6B@ MSVCP_ctype_wchar_vtable
+@ extern ??_7?$basic_filebuf@DU?$char_traits@D@std@@@std@@6B@ basic_filebuf_char_vtable
+@ extern ??_7?$basic_filebuf@GU?$char_traits@G@std@@@std@@6B@ basic_filebuf_short_vtable
+@ extern ??_7?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@6B@ basic_filebuf_wchar_vtable
+@ extern ??_7?$basic_fstream@DU?$char_traits@D@std@@@std@@6B@ basic_fstream_char_vtable
+@ extern ??_7?$basic_fstream@GU?$char_traits@G@std@@@std@@6B@ basic_fstream_short_vtable
+@ extern ??_7?$basic_fstream@_WU?$char_traits@_W@std@@@std@@6B@ basic_fstream_wchar_vtable
+@ extern ??_7?$basic_ifstream@DU?$char_traits@D@std@@@std@@6B@ basic_ifstream_char_vtable
+@ extern ??_7?$basic_ifstream@GU?$char_traits@G@std@@@std@@6B@ basic_ifstream_short_vtable
+@ extern ??_7?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@6B@ basic_ifstream_wchar_vtable
+@ extern ??_7?$basic_ios@DU?$char_traits@D@std@@@std@@6B@ basic_ios_char_vtable
+@ extern ??_7?$basic_ios@GU?$char_traits@G@std@@@std@@6B@ basic_ios_short_vtable
+@ extern ??_7?$basic_ios@_WU?$char_traits@_W@std@@@std@@6B@ basic_ios_wchar_vtable
+@ extern ??_7?$basic_iostream@DU?$char_traits@D@std@@@std@@6B@ basic_iostream_char_vtable
+@ extern ??_7?$basic_iostream@GU?$char_traits@G@std@@@std@@6B@ basic_iostream_short_vtable
+@ extern ??_7?$basic_iostream@_WU?$char_traits@_W@std@@@std@@6B@ basic_iostream_wchar_vtable
+@ extern ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@ basic_istream_char_vtable
+@ extern ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@ basic_istream_short_vtable
+@ extern ??_7?$basic_istream@_WU?$char_traits@_W@std@@@std@@6B@ basic_istream_wchar_vtable
+@ extern ??_7?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ basic_istringstream_char_vtable
+@ extern ??_7?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ basic_istringstream_short_vtable
+@ extern ??_7?$basic_istringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ basic_istringstream_wchar_vtable
+@ extern ??_7?$basic_ofstream@DU?$char_traits@D@std@@@std@@6B@ basic_ofstream_char_vtable
+@ extern ??_7?$basic_ofstream@GU?$char_traits@G@std@@@std@@6B@ basic_ofstream_short_vtable
+@ extern ??_7?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@6B@ basic_ofstream_wchar_vtable
+@ extern ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@ basic_ostream_char_vtable
+@ extern ??_7?$basic_ostream@GU?$char_traits@G@std@@@std@@6B@ basic_ostream_short_vtable
+@ extern ??_7?$basic_ostream@_WU?$char_traits@_W@std@@@std@@6B@ basic_ostream_wchar_vtable
+@ extern ??_7?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ basic_ostringstream_char_vtable
+@ extern ??_7?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ basic_ostringstream_short_vtable
+@ extern ??_7?$basic_ostringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ basic_ostringstream_wchar_vtable
+@ extern ??_7?$basic_streambuf@DU?$char_traits@D@std@@@std@@6B@ basic_streambuf_char_vtable
+@ extern ??_7?$basic_streambuf@GU?$char_traits@G@std@@@std@@6B@ basic_streambuf_short_vtable
+@ extern ??_7?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@6B@ basic_streambuf_wchar_vtable
+@ extern ??_7?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ basic_stringbuf_char_vtable
+@ extern ??_7?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ basic_stringbuf_short_vtable
+@ extern ??_7?$basic_stringbuf@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ basic_stringbuf_wchar_vtable
+@ extern ??_7?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ basic_stringstream_char_vtable
+@ extern ??_7?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ basic_stringstream_short_vtable
+@ extern ??_7?$basic_stringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ basic_stringstream_wchar_vtable
+@ extern ??_7?$codecvt@DDH@std@@6B@ codecvt_char_vtable
+@ extern ??_7?$codecvt@GDH@std@@6B@ codecvt_short_vtable
+@ extern ??_7?$codecvt@_WDH@std@@6B@ codecvt_wchar_vtable
+@ extern ??_7?$collate@D@std@@6B@ collate_char_vtable
+@ extern ??_7?$collate@G@std@@6B@ collate_short_vtable
+@ extern ??_7?$collate@_W@std@@6B@ collate_wchar_vtable
+@ extern ??_7?$ctype@D@std@@6B@ ctype_char_vtable
+@ extern ??_7?$ctype@G@std@@6B@ ctype_short_vtable
+@ extern ??_7?$ctype@_W@std@@6B@ ctype_wchar_vtable
 # extern ??_7?$messages@D@std@@6B@
 # extern ??_7?$messages@G@std@@6B@
 # extern ??_7?$messages@_W@std@@6B@
@@ -1838,29 +1838,29 @@
 # extern ??_7?$moneypunct@G$0A@@std@@6B@
 # extern ??_7?$moneypunct@_W$00@std@@6B@
 # extern ??_7?$moneypunct@_W$0A@@std@@6B@
-@ extern ??_7?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_num_get_char_vtable
-@ extern ??_7?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_num_get_short_vtable
-@ extern ??_7?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_num_get_wchar_vtable
-@ extern ??_7?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_num_put_char_vtable
-@ extern ??_7?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_num_put_short_vtable
-@ extern ??_7?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_num_put_wchar_vtable
-@ extern ??_7?$numpunct@D@std@@6B@ MSVCP_numpunct_char_vtable
-@ extern ??_7?$numpunct@G@std@@6B@ MSVCP_numpunct_short_vtable
-@ extern ??_7?$numpunct@_W@std@@6B@ MSVCP_numpunct_wchar_vtable
-@ extern ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_get_char_vtable
+@ extern ??_7?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ num_get_char_vtable
+@ extern ??_7?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ num_get_short_vtable
+@ extern ??_7?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ num_get_wchar_vtable
+@ extern ??_7?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ num_put_char_vtable
+@ extern ??_7?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ num_put_short_vtable
+@ extern ??_7?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ num_put_wchar_vtable
+@ extern ??_7?$numpunct@D@std@@6B@ numpunct_char_vtable
+@ extern ??_7?$numpunct@G@std@@6B@ numpunct_short_vtable
+@ extern ??_7?$numpunct@_W@std@@6B@ numpunct_wchar_vtable
+@ extern ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ time_get_char_vtable
 # extern ??_7?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
-@ extern ??_7?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_get_wchar_vtable
-@ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable
-@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable
-@ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable
-@ extern ??_7_Locimp@locale@std@@6B@ MSVCP_locale__Locimp_vtable
-@ extern ??_7codecvt_base@std@@6B@ MSVCP_codecvt_base_vtable
-@ extern ??_7ctype_base@std@@6B@ MSVCP_ctype_base_vtable
-@ extern ??_7facet@locale@std@@6B@ MSVCP_locale_facet_vtable
-@ extern ??_7ios_base@std@@6B@ MSVCP_ios_base_vtable
+@ extern ??_7?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ time_get_wchar_vtable
+@ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ time_put_char_vtable
+@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ time_put_short_vtable
+@ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ time_put_wchar_vtable
+@ extern ??_7_Locimp@locale@std@@6B@ locale__Locimp_vtable
+@ extern ??_7codecvt_base@std@@6B@ codecvt_base_vtable
+@ extern ??_7ctype_base@std@@6B@ ctype_base_vtable
+@ extern ??_7facet@locale@std@@6B@ locale_facet_vtable
+@ extern ??_7ios_base@std@@6B@ ios_base_vtable
 # extern ??_7messages_base@std@@6B@
 # extern ??_7money_base@std@@6B@
-@ extern ??_7strstreambuf@std@@6B@ MSVCP_strstreambuf_vtable
+@ extern ??_7strstreambuf@std@@6B@ strstreambuf_vtable
 # extern ??_7time_base@std@@6B@
 @ extern ??_8?$basic_fstream@DU?$char_traits@D@std@@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@ basic_fstream_char_vbtable1
 @ extern ??_8?$basic_fstream@DU?$char_traits@D@std@@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@ basic_fstream_char_vbtable2
diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h
index 0c5b83f93f6..9c6c70e375c 100644
--- a/dlls/msvcp90/cxx.h
+++ b/dlls/msvcp90/cxx.h
@@ -26,8 +26,8 @@
     __asm__(".data\n" \
             "\t.balign 8\n" \
             "\t.quad " __ASM_NAME(#name "_rtti") "\n" \
-            "\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \
-            __ASM_NAME("MSVCP_" #name "_vtable") ":\n" \
+            "\t.globl " __ASM_NAME(#name "_vtable") "\n" \
+            __ASM_NAME(#name "_vtable") ":\n" \
             funcs "\n\t.text")
 
 #else
@@ -38,8 +38,8 @@
     __asm__(".data\n" \
             "\t.balign 4\n" \
             "\t.long " __ASM_NAME(#name "_rtti") "\n" \
-            "\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \
-            __ASM_NAME("MSVCP_" #name "_vtable") ":\n" \
+            "\t.globl " __ASM_NAME(#name "_vtable") "\n" \
+            __ASM_NAME(#name "_vtable") ":\n" \
             funcs "\n\t.text")
 
 #endif /* _WIN64 */
@@ -48,7 +48,7 @@
 
 #define DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \
     static type_info name ## _type_info = { \
-        &MSVCP_type_info_vtable, \
+        &type_info_vtable, \
         NULL, \
         mangled_name \
     }; \
@@ -99,7 +99,7 @@ static const cxx_type_info type ## _cxx_type_info = { \
     & type ##_type_info, \
     { 0, -1, 0 }, \
     sizeof(type), \
-    (cxx_copy_ctor)THISCALL(MSVCP_ ## type ##_copy_ctor) \
+    (cxx_copy_ctor)THISCALL(type ##_copy_ctor) \
 };
 
 #define DEFINE_CXX_DATA(type, base_no, cl1, cl2, cl3, cl4, dtor)  \
@@ -127,7 +127,7 @@ static const cxx_exception_type type ## _cxx_type = { \
 
 #define __DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \
     static type_info name ## _type_info = { \
-        &MSVCP_type_info_vtable, \
+        &type_info_vtable, \
         NULL, \
         mangled_name \
     }; \
@@ -212,7 +212,7 @@ static cxx_type_info type ## _cxx_type_info = { \
 static void init_ ## type ## _cxx_type_info(char *base) \
 { \
     type ## _cxx_type_info.type_info  = (char *)&type ## _type_info - base; \
-    type ## _cxx_type_info.copy_ctor  = (char *)MSVCP_ ## type ## _copy_ctor - base; \
+    type ## _cxx_type_info.copy_ctor  = (char *)type ## _copy_ctor - base; \
 }
 
 #define DEFINE_CXX_DATA(type, base_no, cl1, cl2, cl3, cl4, dtor)  \
@@ -338,7 +338,7 @@ typedef struct __type_info
     char               mangled[128]; /* Variable length, but we declare it large enough for static RTTI */
 } type_info;
 
-extern const vtable_ptr MSVCP_type_info_vtable;
+extern const vtable_ptr type_info_vtable;
 
 /* offsets for computing the this pointer */
 typedef struct
@@ -465,25 +465,25 @@ typedef struct
 #endif
 
 #define CREATE_TYPE_INFO_VTABLE\
-    static void MSVCP_type_info_dtor(type_info * _this) \
+    static void type_info_dtor(type_info * _this) \
 { \
     free(_this->name); \
 } \
 \
-DEFINE_THISCALL_WRAPPER(MSVCP_type_info_vector_dtor,8) \
-void * __thiscall MSVCP_type_info_vector_dtor(type_info * _this, unsigned int flags) \
+DEFINE_THISCALL_WRAPPER(type_info_vector_dtor,8) \
+void * __thiscall type_info_vector_dtor(type_info * _this, unsigned int flags) \
 { \
     if (flags & 2) \
     { \
         /* we have an array, with the number of elements stored before the first object */ \
         INT_PTR i, *ptr = (INT_PTR *)_this - 1; \
 \
-        for (i = *ptr - 1; i >= 0; i--) MSVCP_type_info_dtor(_this + i); \
+        for (i = *ptr - 1; i >= 0; i--) type_info_dtor(_this + i); \
         free(ptr); \
     } \
     else \
     { \
-        MSVCP_type_info_dtor(_this); \
+        type_info_dtor(_this); \
         if (flags & 1) free(_this); \
     } \
     return _this; \
@@ -493,5 +493,5 @@ DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ) \
 \
 __ASM_BLOCK_BEGIN(type_info_vtables) \
     __ASM_VTABLE(type_info, \
-            VTABLE_ADD_FUNC(MSVCP_type_info_vector_dtor)); \
+            VTABLE_ADD_FUNC(type_info_vector_dtor)); \
 __ASM_BLOCK_END
diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c
index 496dd915608..1819c34f676 100644
--- a/dlls/msvcp90/exception.c
+++ b/dlls/msvcp90/exception.c
@@ -47,25 +47,25 @@ typedef const char *exception_name;
 void (CDECL *_Raise_handler)(const exception*) = NULL;
 
 /* vtables */
-extern const vtable_ptr MSVCP_exception_vtable;
+extern const vtable_ptr exception_vtable;
 /* ??_7bad_alloc@std@@6B@ */
-extern const vtable_ptr MSVCP_bad_alloc_vtable;
+extern const vtable_ptr bad_alloc_vtable;
 /* ??_7logic_error@std@@6B@ */
-extern const vtable_ptr MSVCP_logic_error_vtable;
+extern const vtable_ptr logic_error_vtable;
 /* ??_7length_error@std@@6B@ */
-extern const vtable_ptr MSVCP_length_error_vtable;
+extern const vtable_ptr length_error_vtable;
 /* ??_7out_of_range@std@@6B@ */
-extern const vtable_ptr MSVCP_out_of_range_vtable;
-extern const vtable_ptr MSVCP_invalid_argument_vtable;
+extern const vtable_ptr out_of_range_vtable;
+extern const vtable_ptr invalid_argument_vtable;
 /* ??_7runtime_error@std@@6B@ */
-extern const vtable_ptr MSVCP_runtime_error_vtable;
-extern const vtable_ptr MSVCP__System_error_vtable;
-extern const vtable_ptr MSVCP_system_error_vtable;
-extern const vtable_ptr MSVCP_failure_vtable;
+extern const vtable_ptr runtime_error_vtable;
+extern const vtable_ptr _System_error_vtable;
+extern const vtable_ptr system_error_vtable;
+extern const vtable_ptr failure_vtable;
 /* ??_7bad_cast@std@@6B@ */
-extern const vtable_ptr MSVCP_bad_cast_vtable;
+extern const vtable_ptr bad_cast_vtable;
 /* ??_7range_error@std@@6B@ */
-extern const vtable_ptr MSVCP_range_error_vtable;
+extern const vtable_ptr range_error_vtable;
 
 /* ??0exception@@QAE@ABQBD@Z */
 /* ??0exception@@QEAA@AEBQEBD@Z */
@@ -74,7 +74,7 @@ exception* __thiscall MSVCP_exception_ctor(exception *this, exception_name name)
 {
     TRACE("(%p %s)\n", this, EXCEPTION_STR(name));
 
-    this->vtable = &MSVCP_exception_vtable;
+    this->vtable = &exception_vtable;
     if(EXCEPTION_STR(name)) {
         unsigned int name_len = strlen(EXCEPTION_STR(name)) + 1;
         this->name = malloc(name_len);
@@ -87,13 +87,13 @@ exception* __thiscall MSVCP_exception_ctor(exception *this, exception_name name)
     return this;
 }
 
-DEFINE_THISCALL_WRAPPER(MSVCP_exception_copy_ctor,8)
-exception* __thiscall MSVCP_exception_copy_ctor(exception *this, const exception *rhs)
+DEFINE_THISCALL_WRAPPER(exception_copy_ctor,8)
+exception* __thiscall exception_copy_ctor(exception *this, const exception *rhs)
 {
     TRACE("(%p,%p)\n", this, rhs);
 
     if(!rhs->do_free) {
-        this->vtable = &MSVCP_exception_vtable;
+        this->vtable = &exception_vtable;
         this->name = rhs->name;
         this->do_free = FALSE;
     } else
@@ -108,7 +108,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_exception_default_ctor,4)
 exception* __thiscall MSVCP_exception_default_ctor(exception *this)
 {
     TRACE("(%p)\n", this);
-    this->vtable = &MSVCP_exception_vtable;
+    this->vtable = &exception_vtable;
     this->name = NULL;
     this->do_free = FALSE;
     return this;
@@ -118,7 +118,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_exception_dtor,4)
 void __thiscall MSVCP_exception_dtor(exception *this)
 {
     TRACE("(%p)\n", this);
-    this->vtable = &MSVCP_exception_vtable;
+    this->vtable = &exception_vtable;
     if(this->do_free)
         free(this->name);
 }
@@ -159,7 +159,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_exception_assign, 8)
 exception* __thiscall MSVCP_exception_assign(exception *this, const exception *assign)
 {
     MSVCP_exception_dtor(this);
-    return MSVCP_exception_copy_ctor(this, assign);
+    return exception_copy_ctor(this, assign);
 }
 
 /* ?_Doraise@bad_alloc@std@@MBEXXZ */
@@ -206,7 +206,7 @@ bad_alloc* __thiscall MSVCP_bad_alloc_ctor(bad_alloc *this, exception_name name)
 {
     TRACE("%p %s\n", this, EXCEPTION_STR(name));
     MSVCP_exception_ctor(this, name);
-    this->vtable = &MSVCP_bad_alloc_vtable;
+    this->vtable = &bad_alloc_vtable;
     return this;
 }
 
@@ -221,12 +221,12 @@ bad_alloc* __thiscall MSVCP_bad_alloc_default_ctor(bad_alloc *this)
 
 /* ??0bad_alloc@std@@QAE@ABV01@@Z */
 /* ??0bad_alloc@std@@QEAA@AEBV01@@Z */
-DEFINE_THISCALL_WRAPPER(MSVCP_bad_alloc_copy_ctor, 8)
-bad_alloc* __thiscall MSVCP_bad_alloc_copy_ctor(bad_alloc *this, const bad_alloc *rhs)
+DEFINE_THISCALL_WRAPPER(bad_alloc_copy_ctor, 8)
+bad_alloc* __thiscall bad_alloc_copy_ctor(bad_alloc *this, const bad_alloc *rhs)
 {
     TRACE("%p %p\n", this, rhs);
-    MSVCP_exception_copy_ctor(this, rhs);
-    this->vtable = &MSVCP_bad_alloc_vtable;
+    exception_copy_ctor(this, rhs);
+    this->vtable = &bad_alloc_vtable;
     return this;
 }
 
@@ -265,7 +265,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_bad_alloc_assign, 8)
 bad_alloc* __thiscall MSVCP_bad_alloc_assign(bad_alloc *this, const bad_alloc *assign)
 {
     MSVCP_bad_alloc_dtor(this);
-    return MSVCP_bad_alloc_copy_ctor(this, assign);
+    return bad_alloc_copy_ctor(this, assign);
 }
 
 DEFINE_RTTI_DATA1(bad_alloc, 0, &exception_rtti_base_descriptor, ".?AVbad_alloc@std@@")
@@ -295,22 +295,22 @@ logic_error* __thiscall MSVCP_logic_error_ctor( logic_error *this, exception_nam
 #else
     MSVCP_exception_ctor(&this->e, name);
 #endif
-    this->e.vtable = &MSVCP_logic_error_vtable;
+    this->e.vtable = &logic_error_vtable;
     return this;
 }
 
 /* ??0logic_error@std@@QAE@ABV01@@Z */
 /* ??0logic_error@std@@QEAA@AEBV01@@Z */
-DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_copy_ctor, 8)
-logic_error* __thiscall MSVCP_logic_error_copy_ctor(
+DEFINE_THISCALL_WRAPPER(logic_error_copy_ctor, 8)
+logic_error* __thiscall logic_error_copy_ctor(
         logic_error *this, const logic_error *rhs)
 {
     TRACE("%p %p\n", this, rhs);
-    MSVCP_exception_copy_ctor(&this->e, &rhs->e);
+    exception_copy_ctor(&this->e, &rhs->e);
 #if _MSVCP_VER <= 90 && !defined _MSVCIRT
     MSVCP_basic_string_char_copy_ctor(&this->str, &rhs->str);
 #endif
-    this->e.vtable = &MSVCP_logic_error_vtable;
+    this->e.vtable = &logic_error_vtable;
     return this;
 }
 
@@ -379,7 +379,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_assign, 8)
 logic_error* __thiscall MSVCP_logic_error_assign(logic_error *this, const logic_error *assign)
 {
     MSVCP_logic_error_dtor(this);
-    return MSVCP_logic_error_copy_ctor(this, assign);
+    return logic_error_copy_ctor(this, assign);
 }
 
 /* ?what@logic_error@std@@UBEPBDXZ */
@@ -409,19 +409,19 @@ static length_error* MSVCP_length_error_ctor( length_error *this, exception_name
 {
     TRACE("%p %s\n", this, EXCEPTION_STR(name));
     MSVCP_logic_error_ctor(this, name);
-    this->e.vtable = &MSVCP_length_error_vtable;
+    this->e.vtable = &length_error_vtable;
     return this;
 }
 
 /* ??0length_error@std@@QAE@ABV01@@Z */
 /* ??0length_error@std@@QEAA@AEBV01@@Z */
-DEFINE_THISCALL_WRAPPER(MSVCP_length_error_copy_ctor, 8)
-length_error* __thiscall MSVCP_length_error_copy_ctor(
+DEFINE_THISCALL_WRAPPER(length_error_copy_ctor, 8)
+length_error* __thiscall length_error_copy_ctor(
         length_error *this, const length_error *rhs)
 {
     TRACE("%p %p\n", this, rhs);
-    MSVCP_logic_error_copy_ctor(this, rhs);
-    this->e.vtable = &MSVCP_length_error_vtable;
+    logic_error_copy_ctor(this, rhs);
+    this->e.vtable = &length_error_vtable;
     return this;
 }
 
@@ -443,7 +443,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_length_error_assign, 8)
 length_error* __thiscall MSVCP_length_error_assign(length_error *this, const length_error *assign)
 {
     MSVCP_logic_error_dtor(this);
-    return MSVCP_length_error_copy_ctor(this, assign);
+    return length_error_copy_ctor(this, assign);
 }
 
 DEFINE_RTTI_DATA2(length_error, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVlength_error@std@@")
@@ -456,19 +456,19 @@ static out_of_range* MSVCP_out_of_range_ctor( out_of_range *this, exception_name
 {
     TRACE("%p %s\n", this, EXCEPTION_STR(name));
     MSVCP_logic_error_ctor(this, name);
-    this->e.vtable = &MSVCP_out_of_range_vtable;
+    this->e.vtable = &out_of_range_vtable;
     return this;
 }
 
 /* ??0out_of_range@std@@QAE@ABV01@@Z */
 /* ??0out_of_range@std@@QEAA@AEBV01@@Z */
-DEFINE_THISCALL_WRAPPER(MSVCP_out_of_range_copy_ctor, 8)
-out_of_range* __thiscall MSVCP_out_of_range_copy_ctor(
+DEFINE_THISCALL_WRAPPER(out_of_range_copy_ctor, 8)
+out_of_range* __thiscall out_of_range_copy_ctor(
         out_of_range *this, const out_of_range *rhs)
 {
     TRACE("%p %p\n", this, rhs);
-    MSVCP_logic_error_copy_ctor(this, rhs);
-    this->e.vtable = &MSVCP_out_of_range_vtable;
+    logic_error_copy_ctor(this, rhs);
+    this->e.vtable = &out_of_range_vtable;
     return this;
 }
 
@@ -490,7 +490,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_out_of_range_assign, 8)
 out_of_range* __thiscall MSVCP_out_of_range_assign(out_of_range *this, const out_of_range *assign)
 {
     MSVCP_logic_error_dtor(this);
-    return MSVCP_out_of_range_copy_ctor(this, assign);
+    return out_of_range_copy_ctor(this, assign);
 }
 
 DEFINE_RTTI_DATA2(out_of_range, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVout_of_range@std@@")
@@ -503,17 +503,17 @@ static invalid_argument* MSVCP_invalid_argument_ctor( invalid_argument *this, ex
 {
     TRACE("%p %s\n", this, EXCEPTION_STR(name));
     MSVCP_logic_error_ctor(this, name);
-    this->e.vtable = &MSVCP_invalid_argument_vtable;
+    this->e.vtable = &invalid_argument_vtable;
     return this;
 }
 
-DEFINE_THISCALL_WRAPPER(MSVCP_invalid_argument_copy_ctor, 8)
-invalid_argument* __thiscall MSVCP_invalid_argument_copy_ctor(
+DEFINE_THISCALL_WRAPPER(invalid_argument_copy_ctor, 8)
+invalid_argument* __thiscall invalid_argument_copy_ctor(
         invalid_argument *this, invalid_argument *rhs)
 {
     TRACE("%p %p\n", this, rhs);
-    MSVCP_logic_error_copy_ctor(this, rhs);
-    this->e.vtable = &MSVCP_invalid_argument_vtable;
+    logic_error_copy_ctor(this, rhs);
+    this->e.vtable = &invalid_argument_vtable;
     return this;
 }
 
@@ -541,22 +541,22 @@ static runtime_error* MSVCP_runtime_error_ctor( runtime_error *this, exception_n
 #else
     MSVCP_exception_ctor(&this->e, name);
 #endif
-    this->e.vtable = &MSVCP_runtime_error_vtable;
+    this->e.vtable = &runtime_error_vtable;
     return this;
 }
 
 /* ??0runtime_error@std@@QAE@ABV01@@Z */
 /* ??0runtime_error@std@@QEAA@AEBV01@@Z */
-DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_copy_ctor, 8)
-runtime_error* __thiscall MSVCP_runtime_error_copy_ctor(
+DEFINE_THISCALL_WRAPPER(runtime_error_copy_ctor, 8)
+runtime_error* __thiscall runtime_error_copy_ctor(
         runtime_error *this, const runtime_error *rhs)
 {
     TRACE("%p %p\n", this, rhs);
-    MSVCP_exception_copy_ctor(&this->e, &rhs->e);
+    exception_copy_ctor(&this->e, &rhs->e);
 #if _MSVCP_VER <= 90 && !defined _MSVCIRT
     MSVCP_basic_string_char_copy_ctor(&this->str, &rhs->str);
 #endif
-    this->e.vtable = &MSVCP_runtime_error_vtable;
+    this->e.vtable = &runtime_error_vtable;
     return this;
 }
 
@@ -613,7 +613,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_assign, 8)
 runtime_error* __thiscall MSVCP_runtime_error_assign(runtime_error *this, const runtime_error *assign)
 {
     MSVCP_runtime_error_dtor(this);
-    return MSVCP_runtime_error_copy_ctor(this, assign);
+    return runtime_error_copy_ctor(this, assign);
 }
 
 /* ?what@runtime_error@std@@UBEPBDXZ */
@@ -650,20 +650,20 @@ static failure* MSVCP_failure_ctor( failure *this, exception_name name )
     /* FIXME: set err correctly */
     this->err = 0;
 #endif
-    this->base.e.vtable = &MSVCP_failure_vtable;
+    this->base.e.vtable = &failure_vtable;
     return this;
 }
 
-DEFINE_THISCALL_WRAPPER(MSVCP_failure_copy_ctor, 8)
-failure* __thiscall MSVCP_failure_copy_ctor(
+DEFINE_THISCALL_WRAPPER(failure_copy_ctor, 8)
+failure* __thiscall failure_copy_ctor(
         failure *this, failure *rhs)
 {
     TRACE("%p %p\n", this, rhs);
-    MSVCP_runtime_error_copy_ctor(&this->base, &rhs->base);
+    runtime_error_copy_ctor(&this->base, &rhs->base);
 #if _MSVCP_VER > 90
     this->err = rhs->err;
 #endif
-    this->base.e.vtable = &MSVCP_failure_vtable;
+    this->base.e.vtable = &failure_vtable;
     return this;
 }
 
@@ -690,23 +690,23 @@ const char* __thiscall MSVCP_failure_what(failure *this)
 }
 
 #if _MSVCP_VER > 90
-DEFINE_THISCALL_WRAPPER(MSVCP_system_error_copy_ctor, 8)
-system_error* __thiscall MSVCP_system_error_copy_ctor(
+DEFINE_THISCALL_WRAPPER(system_error_copy_ctor, 8)
+system_error* __thiscall system_error_copy_ctor(
         system_error *this, system_error *rhs)
 {
-    MSVCP_failure_copy_ctor(this, rhs);
-    this->base.e.vtable = &MSVCP_system_error_vtable;
+    failure_copy_ctor(this, rhs);
+    this->base.e.vtable = &system_error_vtable;
     return this;
 }
 #endif
 
 #if _MSVCP_VER > 110
-DEFINE_THISCALL_WRAPPER(MSVCP__System_error_copy_ctor, 8)
-_System_error* __thiscall MSVCP__System_error_copy_ctor(
+DEFINE_THISCALL_WRAPPER(_System_error_copy_ctor, 8)
+_System_error* __thiscall _System_error_copy_ctor(
         _System_error *this, _System_error *rhs)
 {
-    MSVCP_failure_copy_ctor(this, rhs);
-    this->base.e.vtable = &MSVCP__System_error_vtable;
+    failure_copy_ctor(this, rhs);
+    this->base.e.vtable = &_System_error_vtable;
     return this;
 }
 #endif
@@ -751,7 +751,7 @@ bad_cast* __thiscall MSVCP_bad_cast_ctor(bad_cast *this, const char *name)
 {
     TRACE("%p %s\n", this, name);
     MSVCP_exception_ctor(this, EXCEPTION_NAME(name));
-    this->vtable = &MSVCP_bad_cast_vtable;
+    this->vtable = &bad_cast_vtable;
     return this;
 }
 
@@ -765,12 +765,12 @@ bad_cast* __thiscall MSVCP_bad_cast_default_ctor(bad_cast *this)
 
 /* ??0bad_cast@std@@QAE@ABV01@@Z */
 /* ??0bad_cast@std@@QEAA@AEBV01@@Z */
-DEFINE_THISCALL_WRAPPER(MSVCP_bad_cast_copy_ctor, 8)
-bad_cast* __thiscall MSVCP_bad_cast_copy_ctor(bad_cast *this, const bad_cast *rhs)
+DEFINE_THISCALL_WRAPPER(bad_cast_copy_ctor, 8)
+bad_cast* __thiscall bad_cast_copy_ctor(bad_cast *this, const bad_cast *rhs)
 {
     TRACE("%p %p\n", this, rhs);
-    MSVCP_exception_copy_ctor(this, rhs);
-    this->vtable = &MSVCP_bad_cast_vtable;
+    exception_copy_ctor(this, rhs);
+    this->vtable = &bad_cast_vtable;
     return this;
 }
 
@@ -812,7 +812,7 @@ bad_cast* __thiscall MSVCP_bad_cast_opequals(bad_cast *this, const bad_cast *rhs
 
     if(this != rhs) {
         MSVCP_exception_dtor(this);
-        MSVCP_exception_copy_ctor(this, rhs);
+        exception_copy_ctor(this, rhs);
     }
     return this;
 }
@@ -827,19 +827,19 @@ static range_error* MSVCP_range_error_ctor( range_error *this, exception_name na
 {
     TRACE("%p %s\n", this, EXCEPTION_STR(name));
     MSVCP_runtime_error_ctor(this, name);
-    this->e.vtable = &MSVCP_range_error_vtable;
+    this->e.vtable = &range_error_vtable;
     return this;
 }
 
 /* ??0range_error@std@@QAE@ABV01@@Z */
 /* ??0range_error@std@@QEAA@AEBV01@@Z */
-DEFINE_THISCALL_WRAPPER(MSVCP_range_error_copy_ctor, 8)
-range_error* __thiscall MSVCP_range_error_copy_ctor(
+DEFINE_THISCALL_WRAPPER(range_error_copy_ctor, 8)
+range_error* __thiscall range_error_copy_ctor(
         range_error *this, const range_error *rhs)
 {
     TRACE("%p %p\n", this, rhs);
-    MSVCP_runtime_error_copy_ctor(this, rhs);
-    this->e.vtable = &MSVCP_range_error_vtable;
+    runtime_error_copy_ctor(this, rhs);
+    this->e.vtable = &range_error_vtable;
     return this;
 }
 
@@ -861,7 +861,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_range_error_assign, 8)
 range_error* __thiscall MSVCP_range_error_assign(range_error *this, const range_error *assign)
 {
     MSVCP_runtime_error_dtor(this);
-    return MSVCP_range_error_copy_ctor(this, assign);
+    return range_error_copy_ctor(this, assign);
 }
 
 DEFINE_RTTI_DATA2(range_error, 0, &runtime_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVrange_error@std@@")
diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c
index 9aa72e4438e..9d3a899b568 100644
--- a/dlls/msvcp90/ios.c
+++ b/dlls/msvcp90/ios.c
@@ -364,82 +364,82 @@ enum file_type {
 #define VBTABLE_ENTRY(class, offset, vbase, vtordisp) ALIGNED_SIZE(sizeof(class)+vtordisp*sizeof(int), TYPE_ALIGNMENT(vbase))-offset
 #define VBTABLE_BASIC_IOS_ENTRY(class, offset) VBTABLE_ENTRY(class, offset, basic_ios_char, BASIC_IOS_VTORDISP)
 
-extern const vtable_ptr MSVCP_iosb_vtable;
+extern const vtable_ptr iosb_vtable;
 
 /* ??_7ios_base@std@@6B@ */
-extern const vtable_ptr MSVCP_ios_base_vtable;
+extern const vtable_ptr ios_base_vtable;
 
 /* ??_7?$basic_ios@DU?$char_traits@D@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ios_char_vtable;
+extern const vtable_ptr basic_ios_char_vtable;
 
 /* ??_7?$basic_ios@_WU?$char_traits@_W@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ios_wchar_vtable;
+extern const vtable_ptr basic_ios_wchar_vtable;
 
 /* ??_7?$basic_ios@GU?$char_traits@G@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ios_short_vtable;
+extern const vtable_ptr basic_ios_short_vtable;
 
 /* ??_7?$basic_streambuf@DU?$char_traits@D@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_streambuf_char_vtable;
+extern const vtable_ptr basic_streambuf_char_vtable;
 
 /* ??_7?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_streambuf_wchar_vtable;
+extern const vtable_ptr basic_streambuf_wchar_vtable;
 
 /* ??_7?$basic_streambuf@GU?$char_traits@G@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_streambuf_short_vtable;
+extern const vtable_ptr basic_streambuf_short_vtable;
 
 /* ??_7?$basic_filebuf@DU?$char_traits@D@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_filebuf_char_vtable;
+extern const vtable_ptr basic_filebuf_char_vtable;
 
 /* ??_7?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_filebuf_wchar_vtable;
+extern const vtable_ptr basic_filebuf_wchar_vtable;
 
 /* ??_7?$basic_filebuf@GU?$char_traits@G@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_filebuf_short_vtable;
+extern const vtable_ptr basic_filebuf_short_vtable;
 
 /* ??_7?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_stringbuf_char_vtable;
+extern const vtable_ptr basic_stringbuf_char_vtable;
 
 /* ??_7?$basic_stringbuf@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_stringbuf_wchar_vtable;
+extern const vtable_ptr basic_stringbuf_wchar_vtable;
 
 /* ??_7?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_stringbuf_short_vtable;
+extern const vtable_ptr basic_stringbuf_short_vtable;
 
 /* ??_8?$basic_ostream@DU?$char_traits@D@std@@@std@@7B@ */
 const int basic_ostream_char_vbtable[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_ostream_char, 0)};
 /* ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ostream_char_vtable;
+extern const vtable_ptr basic_ostream_char_vtable;
 
 /* ??_8?$basic_ostream@_WU?$char_traits@_W@std@@@std@@7B@ */
 const int basic_ostream_wchar_vbtable[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_ostream_wchar, 0)};
 /* ??_7?$basic_ostream@_WU?$char_traits@_W@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ostream_wchar_vtable;
+extern const vtable_ptr basic_ostream_wchar_vtable;
 
 /* ??_8?$basic_ostream@GU?$char_traits@G@std@@@std@@7B@ */
 const int basic_ostream_short_vbtable[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_ostream_wchar, 0)};
 /* ??_7?$basic_ostream@GU?$char_traits@G@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ostream_short_vtable;
+extern const vtable_ptr basic_ostream_short_vtable;
 
 /* ??_8?$basic_istream@DU?$char_traits@D@std@@@std@@7B@ */
 const int basic_istream_char_vbtable[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_istream_char, 0)};
 /* ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_istream_char_vtable;
+extern const vtable_ptr basic_istream_char_vtable;
 
 /* ??_8?$basic_istream@_WU?$char_traits@_W@std@@@std@@7B@ */
 const int basic_istream_wchar_vbtable[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_istream_wchar, 0)};
 /* ??_7?$basic_istream@_WU?$char_traits@_W@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_istream_wchar_vtable;
+extern const vtable_ptr basic_istream_wchar_vtable;
 
 /* ??_8?$basic_istream@GU?$char_traits@G@std@@@std@@7B@ */
 const int basic_istream_short_vbtable[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_istream_wchar, 0)};
 /* ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_istream_short_vtable;
+extern const vtable_ptr basic_istream_short_vtable;
 
 /* ??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@ */
 const int basic_iostream_char_vbtable1[] = {0,
@@ -448,7 +448,7 @@ const int basic_iostream_char_vbtable1[] = {0,
 const int basic_iostream_char_vbtable2[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_iostream_char, FIELD_OFFSET(basic_iostream_char, base2))};
 /* ??_7?$basic_iostream@DU?$char_traits@D@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_iostream_char_vtable;
+extern const vtable_ptr basic_iostream_char_vtable;
 
 /* ??_8?$basic_iostream@_WU?$char_traits@_W@std@@@std@@7B?$basic_istream@_WU?$char_traits@_W@std@@@1@@ */
 /* ??_8?$basic_iostream@GU?$char_traits@G@std@@@std@@7B?$basic_istream@GU?$char_traits@G@std@@@1@@ */
@@ -459,45 +459,45 @@ const int basic_iostream_wchar_vbtable1[] = {0,
 const int basic_iostream_wchar_vbtable2[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_iostream_wchar, FIELD_OFFSET(basic_iostream_wchar, base2))};
 /* ??_7?$basic_iostream@_WU?$char_traits@_W@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_iostream_wchar_vtable;
+extern const vtable_ptr basic_iostream_wchar_vtable;
 /* ??_7?$basic_iostream@GU?$char_traits@G@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_iostream_short_vtable;
+extern const vtable_ptr basic_iostream_short_vtable;
 
 /* ??_8?$basic_ofstream@DU?$char_traits@D@std@@@std@@7B@ */
 const int basic_ofstream_char_vbtable[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_ofstream_char, 0)};
 /* ??_7?$basic_ofstream@DU?$char_traits@D@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ofstream_char_vtable;
+extern const vtable_ptr basic_ofstream_char_vtable;
 
 /* ??_8?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@7B@ */
 const int basic_ofstream_wchar_vbtable[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_ofstream_wchar, 0)};
 /* ??_7?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ofstream_wchar_vtable;
+extern const vtable_ptr basic_ofstream_wchar_vtable;
 
 /* ??_8?$basic_ofstream@GU?$char_traits@G@std@@@std@@7B@ */
 const int basic_ofstream_short_vbtable[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_ofstream_wchar, 0)};
 /* ??_7?$basic_ofstream@GU?$char_traits@G@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ofstream_short_vtable;
+extern const vtable_ptr basic_ofstream_short_vtable;
 
 /* ??_8?$basic_ifstream@DU?$char_traits@D@std@@@std@@7B@ */
 const int basic_ifstream_char_vbtable[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_ifstream_char, 0)};
 /* ??_7?$basic_ifstream@DU?$char_traits@D@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ifstream_char_vtable;
+extern const vtable_ptr basic_ifstream_char_vtable;
 
 /* ??_8?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@7B@ */
 const int basic_ifstream_wchar_vbtable[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_ifstream_wchar, 0)};
 /* ??_7?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ifstream_wchar_vtable;
+extern const vtable_ptr basic_ifstream_wchar_vtable;
 
 /* ??_8?$basic_ifstream@GU?$char_traits@G@std@@@std@@7B@ */
 const int basic_ifstream_short_vbtable[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_ifstream_wchar, 0)};
 /* ??_7?$basic_ifstream@GU?$char_traits@G@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ifstream_short_vtable;
+extern const vtable_ptr basic_ifstream_short_vtable;
 
 /* ??_8?$basic_fstream@DU?$char_traits@D@std@@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@ */
 const int basic_fstream_char_vbtable1[] = {0,
@@ -506,7 +506,7 @@ const int basic_fstream_char_vbtable1[] = {0,
 const int basic_fstream_char_vbtable2[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_fstream_char, FIELD_OFFSET(basic_fstream_char, base.base2))};
 /* ??_7?$basic_fstream@DU?$char_traits@D@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_fstream_char_vtable;
+extern const vtable_ptr basic_fstream_char_vtable;
 
 /* ??_8?$basic_fstream@_WU?$char_traits@_W@std@@@std@@7B?$basic_istream@_WU?$char_traits@_W@std@@@1@@ */
 /* ??_8?$basic_fstream@GU?$char_traits@G@std@@@std@@7B?$basic_istream@GU?$char_traits@G@std@@@1@@ */
@@ -517,45 +517,45 @@ const int basic_fstream_wchar_vbtable1[] = {0,
 const int basic_fstream_wchar_vbtable2[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_fstream_wchar, FIELD_OFFSET(basic_fstream_wchar, base.base2))};
 /* ??_7?$basic_fstream@_WU?$char_traits@_W@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_fstream_wchar_vtable;
+extern const vtable_ptr basic_fstream_wchar_vtable;
 /* ??_7?$basic_fstream@GU?$char_traits@G@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_fstream_short_vtable;
+extern const vtable_ptr basic_fstream_short_vtable;
 
 /* ??_8?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B@ */
 const int basic_ostringstream_char_vbtable[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_ostringstream_char, 0)};
 /* ??_7?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ostringstream_char_vtable;
+extern const vtable_ptr basic_ostringstream_char_vtable;
 
 /* ??_8?$basic_ostringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@7B@ */
 const int basic_ostringstream_wchar_vbtable[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_ostringstream_wchar, 0)};
 /* ??_7?$basic_ostringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ostringstream_wchar_vtable;
+extern const vtable_ptr basic_ostringstream_wchar_vtable;
 
 /* ??_8?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B@ */
 const int basic_ostringstream_short_vbtable[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_ostringstream_wchar, 0)};
 /* ??_7?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_ostringstream_short_vtable;
+extern const vtable_ptr basic_ostringstream_short_vtable;
 
 /* ??_8?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B@ */
 const int basic_istringstream_char_vbtable[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_istringstream_char, 0)};
 /* ??_7?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_istringstream_char_vtable;
+extern const vtable_ptr basic_istringstream_char_vtable;
 
 /* ??_8?$basic_istringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@7B@ */
 const int basic_istringstream_wchar_vbtable[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_istringstream_wchar, 0)};
 /* ??_7?$basic_istringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_istringstream_wchar_vtable;
+extern const vtable_ptr basic_istringstream_wchar_vtable;
 
 /* ??_8?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B@ */
 const int basic_istringstream_short_vbtable[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_istringstream_wchar, 0)};
 /* ??_7?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_istringstream_short_vtable;
+extern const vtable_ptr basic_istringstream_short_vtable;
 
 /* ??_8?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@ */
 const int basic_stringstream_char_vbtable1[] = {0,
@@ -564,7 +564,7 @@ const int basic_stringstream_char_vbtable1[] = {0,
 const int basic_stringstream_char_vbtable2[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_stringstream_char, FIELD_OFFSET(basic_stringstream_char, base.base2))};
 /* ??_7?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_stringstream_char_vtable;
+extern const vtable_ptr basic_stringstream_char_vtable;
 
 /* ??_8?$basic_stringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@7B?$basic_istream@_WU?$char_traits@_W@std@@@1@@ */
 const int basic_stringstream_wchar_vbtable1[] = {0,
@@ -573,7 +573,7 @@ const int basic_stringstream_wchar_vbtable1[] = {0,
 const int basic_stringstream_wchar_vbtable2[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_stringstream_wchar, FIELD_OFFSET(basic_stringstream_wchar, base.base2))};
 /* ??_7?$basic_stringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_stringstream_wchar_vtable;
+extern const vtable_ptr basic_stringstream_wchar_vtable;
 
 /* ??_8?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B?$basic_istream@GU?$char_traits@G@std@@@1@@ */
 const int basic_stringstream_short_vbtable1[] = {0,
@@ -582,20 +582,20 @@ const int basic_stringstream_short_vbtable1[] = {0,
 const int basic_stringstream_short_vbtable2[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(basic_stringstream_wchar, FIELD_OFFSET(basic_stringstream_wchar, base.base2))};
 /* ??_7?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ */
-extern const vtable_ptr MSVCP_basic_stringstream_short_vtable;
+extern const vtable_ptr basic_stringstream_short_vtable;
 
 /* ??_7strstreambuf@std@@6B */
-extern const vtable_ptr MSVCP_strstreambuf_vtable;
+extern const vtable_ptr strstreambuf_vtable;
 
 static const int ostrstream_vbtable[] = {0, VBTABLE_BASIC_IOS_ENTRY(ostrstream, 0)};
-extern const vtable_ptr MSVCP_ostrstream_vtable;
+extern const vtable_ptr ostrstream_vtable;
 
 static const int istrstream_vbtable[] = {0, VBTABLE_BASIC_IOS_ENTRY(istrstream, 0)};
 
 static const int strstream_vbtable1[] = {0, VBTABLE_BASIC_IOS_ENTRY(strstream, 0)};
 static const int strstream_vbtable2[] = {0,
     VBTABLE_BASIC_IOS_ENTRY(strstream, FIELD_OFFSET(strstream, base.base2))};
-extern const vtable_ptr MSVCP_strstream_vtable;
+extern const vtable_ptr strstream_vtable;
 
 DEFINE_RTTI_DATA0(iosb, 0, ".?AV?$_Iosb@H@std@@")
 DEFINE_RTTI_DATA1(ios_base, 0, &iosb_rtti_base_descriptor, ".?AV?$_Iosb@H@std@@")
@@ -1237,7 +1237,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_ctor_uninitialized, 8)
 basic_streambuf_char* __thiscall basic_streambuf_char_ctor_uninitialized(basic_streambuf_char *this, int uninitialized)
 {
     TRACE("(%p %d)\n", this, uninitialized);
-    this->vtable = &MSVCP_basic_streambuf_char_vtable;
+    this->vtable = &basic_streambuf_char_vtable;
 #if _MSVCP_VER >= 70 && _MSVCP_VER <= 100
     mutex_ctor(&this->lock);
 #endif
@@ -1251,7 +1251,7 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor(basic_streambuf_char
 {
     TRACE("(%p)\n", this);
 
-    this->vtable = &MSVCP_basic_streambuf_char_vtable;
+    this->vtable = &basic_streambuf_char_vtable;
 #if _MSVCP_VER >= 70 && _MSVCP_VER <= 100
     mutex_ctor(&this->lock);
 #endif
@@ -2097,7 +2097,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar_ctor_uninitialized, 8)
 basic_streambuf_wchar* __thiscall basic_streambuf_wchar_ctor_uninitialized(basic_streambuf_wchar *this, int uninitialized)
 {
     TRACE("(%p %d)\n", this, uninitialized);
-    this->vtable = &MSVCP_basic_streambuf_wchar_vtable;
+    this->vtable = &basic_streambuf_wchar_vtable;
 #if _MSVCP_VER >= 70 && _MSVCP_VER <= 100
     mutex_ctor(&this->lock);
 #endif
@@ -2111,7 +2111,7 @@ basic_streambuf_wchar* __thiscall basic_streambuf_short_ctor_uninitialized(basic
 {
     TRACE("(%p %d)\n", this, uninitialized);
     basic_streambuf_wchar_ctor_uninitialized(this, uninitialized);
-    this->vtable = &MSVCP_basic_streambuf_short_vtable;
+    this->vtable = &basic_streambuf_short_vtable;
     return this;
 }
 
@@ -2122,7 +2122,7 @@ basic_streambuf_wchar* __thiscall basic_streambuf_wchar_ctor(basic_streambuf_wch
 {
     TRACE("(%p)\n", this);
 
-    this->vtable = &MSVCP_basic_streambuf_wchar_vtable;
+    this->vtable = &basic_streambuf_wchar_vtable;
 #if _MSVCP_VER >= 70 && _MSVCP_VER <= 100
     mutex_ctor(&this->lock);
 #endif
@@ -2142,7 +2142,7 @@ basic_streambuf_wchar* __thiscall basic_streambuf_short_ctor(basic_streambuf_wch
 {
     TRACE("(%p)\n", this);
     basic_streambuf_wchar_ctor(this);
-    this->vtable = &MSVCP_basic_streambuf_short_vtable;
+    this->vtable = &basic_streambuf_short_vtable;
     return this;
 }
 
@@ -3127,7 +3127,7 @@ basic_filebuf_char* __thiscall basic_filebuf_char_ctor_file(basic_filebuf_char *
     TRACE("(%p %p)\n", this, file);
 
     basic_streambuf_char_ctor(&this->base);
-    this->base.vtable = &MSVCP_basic_filebuf_char_vtable;
+    this->base.vtable = &basic_filebuf_char_vtable;
 
     basic_filebuf_char__Init(this, file, INITFL_new);
     return this;
@@ -3149,7 +3149,7 @@ basic_filebuf_char* __thiscall basic_filebuf_char_ctor_uninitialized(basic_fileb
     TRACE("(%p %d)\n", this, uninitialized);
 
     basic_streambuf_char_ctor(&this->base);
-    this->base.vtable = &MSVCP_basic_filebuf_char_vtable;
+    this->base.vtable = &basic_filebuf_char_vtable;
     return this;
 }
 
@@ -3748,7 +3748,7 @@ basic_filebuf_wchar* __thiscall basic_filebuf_wchar_ctor_file(basic_filebuf_wcha
     TRACE("(%p %p)\n", this, file);
 
     basic_streambuf_wchar_ctor(&this->base);
-    this->base.vtable = &MSVCP_basic_filebuf_wchar_vtable;
+    this->base.vtable = &basic_filebuf_wchar_vtable;
 
     basic_filebuf_wchar__Init(this, file, INITFL_new);
     return this;
@@ -3762,7 +3762,7 @@ basic_filebuf_wchar* __thiscall basic_filebuf_short_ctor_file(basic_filebuf_wcha
     TRACE("(%p %p)\n", this, file);
 
     basic_streambuf_short_ctor(&this->base);
-    this->base.vtable = &MSVCP_basic_filebuf_short_vtable;
+    this->base.vtable = &basic_filebuf_short_vtable;
 
     basic_filebuf_short__Init(this, file, INITFL_new);
     return this;
@@ -3792,7 +3792,7 @@ basic_filebuf_wchar* __thiscall basic_filebuf_wchar_ctor_uninitialized(basic_fil
     TRACE("(%p %d)\n", this, uninitialized);
 
     basic_streambuf_wchar_ctor(&this->base);
-    this->base.vtable = &MSVCP_basic_filebuf_wchar_vtable;
+    this->base.vtable = &basic_filebuf_wchar_vtable;
     return this;
 }
 
@@ -3804,7 +3804,7 @@ basic_filebuf_wchar* __thiscall basic_filebuf_short_ctor_uninitialized(basic_fil
     TRACE("(%p %d)\n", this, uninitialized);
 
     basic_streambuf_short_ctor(&this->base);
-    this->base.vtable = &MSVCP_basic_filebuf_short_vtable;
+    this->base.vtable = &basic_filebuf_short_vtable;
     return this;
 }
 
@@ -4362,7 +4362,7 @@ basic_stringbuf_char* __thiscall basic_stringbuf_char_ctor_str(basic_stringbuf_c
     TRACE("(%p %p %d)\n", this, str, mode);
 
     basic_streambuf_char_ctor(&this->base);
-    this->base.vtable = &MSVCP_basic_stringbuf_char_vtable;
+    this->base.vtable = &basic_stringbuf_char_vtable;
 
     basic_stringbuf_char__Init(this, MSVCP_basic_string_char_c_str(str),
             str->size, basic_stringbuf_char__Getstate(this, mode));
@@ -4378,7 +4378,7 @@ basic_stringbuf_char* __thiscall basic_stringbuf_char_ctor_mode(
     TRACE("(%p %d)\n", this, mode);
 
     basic_streambuf_char_ctor(&this->base);
-    this->base.vtable = &MSVCP_basic_stringbuf_char_vtable;
+    this->base.vtable = &basic_stringbuf_char_vtable;
 
     basic_stringbuf_char__Init(this, NULL, 0, basic_stringbuf_char__Getstate(this, mode));
     return this;
@@ -4739,7 +4739,7 @@ basic_stringbuf_wchar* __thiscall basic_stringbuf_wchar_ctor_str(basic_stringbuf
     TRACE("(%p %p %d)\n", this, str, mode);
 
     basic_streambuf_wchar_ctor(&this->base);
-    this->base.vtable = &MSVCP_basic_stringbuf_wchar_vtable;
+    this->base.vtable = &basic_stringbuf_wchar_vtable;
 
     basic_stringbuf_wchar__Init(this, MSVCP_basic_string_wchar_c_str(str),
             str->size, basic_stringbuf_wchar__Getstate(this, mode));
@@ -4753,7 +4753,7 @@ basic_stringbuf_wchar* __thiscall basic_stringbuf_short_ctor_str(basic_stringbuf
         const basic_string_wchar *str, IOSB_openmode mode)
 {
     basic_stringbuf_wchar_ctor_str(this, str, mode);
-    this->base.vtable = &MSVCP_basic_stringbuf_short_vtable;
+    this->base.vtable = &basic_stringbuf_short_vtable;
     return this;
 }
 
@@ -4766,7 +4766,7 @@ basic_stringbuf_wchar* __thiscall basic_stringbuf_wchar_ctor_mode(
     TRACE("(%p %d)\n", this, mode);
 
     basic_streambuf_wchar_ctor(&this->base);
-    this->base.vtable = &MSVCP_basic_stringbuf_wchar_vtable;
+    this->base.vtable = &basic_stringbuf_wchar_vtable;
 
     basic_stringbuf_wchar__Init(this, NULL, 0, basic_stringbuf_wchar__Getstate(this, mode));
     return this;
@@ -4779,7 +4779,7 @@ basic_stringbuf_wchar* __thiscall basic_stringbuf_short_ctor_mode(
         basic_stringbuf_wchar *this, IOSB_openmode mode)
 {
     basic_stringbuf_wchar_ctor_mode(this, mode);
-    this->base.vtable = &MSVCP_basic_stringbuf_short_vtable;
+    this->base.vtable = &basic_stringbuf_short_vtable;
     return this;
 }
 
@@ -5097,7 +5097,7 @@ DEFINE_THISCALL_WRAPPER(ios_base_ctor, 4)
 ios_base* __thiscall ios_base_ctor(ios_base *this)
 {
     TRACE("(%p)\n", this);
-    this->vtable = &MSVCP_ios_base_vtable;
+    this->vtable = &ios_base_vtable;
     return this;
 }
 
@@ -5108,7 +5108,7 @@ ios_base* __thiscall ios_base_copy_ctor(ios_base *this, const ios_base *copy)
 {
     TRACE("(%p %p)\n", this, copy);
     *this = *copy;
-    this->vtable = &MSVCP_ios_base_vtable;
+    this->vtable = &ios_base_vtable;
     return this;
 }
 
@@ -5725,7 +5725,7 @@ basic_ios_char* __thiscall basic_ios_char_ctor(basic_ios_char *this)
     TRACE("(%p)\n", this);
 
     ios_base_ctor(&this->base);
-    this->base.vtable = &MSVCP_basic_ios_char_vtable;
+    this->base.vtable = &basic_ios_char_vtable;
     return this;
 }
 
@@ -5968,7 +5968,7 @@ basic_ios_wchar* __thiscall basic_ios_wchar_ctor(basic_ios_wchar *this)
     TRACE("(%p)\n", this);
 
     ios_base_ctor(&this->base);
-    this->base.vtable = &MSVCP_basic_ios_wchar_vtable;
+    this->base.vtable = &basic_ios_wchar_vtable;
     return this;
 }
 
@@ -5978,7 +5978,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_short_ctor, 4)
 basic_ios_wchar* __thiscall basic_ios_short_ctor(basic_ios_wchar *this)
 {
     basic_ios_wchar_ctor(this);
-    this->base.vtable = &MSVCP_basic_ios_short_vtable;
+    this->base.vtable = &basic_ios_short_vtable;
     return this;
 }
 
@@ -6020,7 +6020,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_short_ctor_streambuf, 8)
 basic_ios_wchar* __thiscall basic_ios_short_ctor_streambuf(basic_ios_wchar *this, basic_streambuf_wchar *strbuf)
 {
     basic_ios_wchar_ctor_streambuf(this, strbuf);
-    this->base.vtable = &MSVCP_basic_ios_short_vtable;
+    this->base.vtable = &basic_ios_short_vtable;
     return this;
 }
 
@@ -6295,7 +6295,7 @@ basic_ostream_char* __thiscall basic_ostream_char_ctor(basic_ostream_char *this,
         base = basic_ostream_char_get_basic_ios(this);
     }
 
-    base->base.vtable = &MSVCP_basic_ostream_char_vtable;
+    base->base.vtable = &basic_ostream_char_vtable;
     basic_ios_char_init(base, strbuf, isstd);
     return this;
 }
@@ -6319,7 +6319,7 @@ basic_ostream_char* __thiscall basic_ostream_char_ctor_uninitialized(basic_ostre
         base = basic_ostream_char_get_basic_ios(this);
     }
 
-    base->base.vtable = &MSVCP_basic_ostream_char_vtable;
+    base->base.vtable = &basic_ostream_char_vtable;
     if(addstd)
         ios_base_Addstd(&base->base);
     return this;
@@ -7123,7 +7123,7 @@ basic_ostream_wchar* __thiscall basic_ostream_wchar_ctor(basic_ostream_wchar *th
         base = basic_ostream_wchar_get_basic_ios(this);
     }
 
-    base->base.vtable = &MSVCP_basic_ostream_wchar_vtable;
+    base->base.vtable = &basic_ostream_wchar_vtable;
     basic_ios_wchar_init(base, strbuf, isstd);
     return this;
 }
@@ -7135,7 +7135,7 @@ basic_ostream_wchar* __thiscall basic_ostream_short_ctor(basic_ostream_wchar *th
         basic_streambuf_wchar *strbuf, bool isstd, bool virt_init)
 {
     basic_ostream_wchar_ctor(this, strbuf, isstd, virt_init);
-    basic_ostream_wchar_get_basic_ios(this)->base.vtable = &MSVCP_basic_ostream_short_vtable;
+    basic_ostream_wchar_get_basic_ios(this)->base.vtable = &basic_ostream_short_vtable;
     return this;
 }
 
@@ -7158,7 +7158,7 @@ basic_ostream_wchar* __thiscall basic_ostream_wchar_ctor_uninitialized(basic_ost
         base = basic_ostream_wchar_get_basic_ios(this);
     }
 
-    base->base.vtable = &MSVCP_basic_ostream_wchar_vtable;
+    base->base.vtable = &basic_ostream_wchar_vtable;
     if(addstd)
         ios_base_Addstd(&base->base);
     return this;
@@ -7171,7 +7171,7 @@ basic_ostream_wchar* __thiscall basic_ostream_short_ctor_uninitialized(basic_ost
         int uninitialized, bool addstd, bool virt_init)
 {
     basic_ostream_wchar_ctor_uninitialized(this, uninitialized, addstd, virt_init);
-    basic_ostream_wchar_get_basic_ios(this)->base.vtable = &MSVCP_basic_ostream_short_vtable;
+    basic_ostream_wchar_get_basic_ios(this)->base.vtable = &basic_ostream_short_vtable;
     return this;
 }
 
@@ -8175,7 +8175,7 @@ basic_istream_char* __thiscall basic_istream_char_ctor_init(basic_istream_char *
         base = basic_istream_char_get_basic_ios(this);
     }
 
-    base->base.vtable = &MSVCP_basic_istream_char_vtable;
+    base->base.vtable = &basic_istream_char_vtable;
     this->count = 0;
     if(!noinit)
         basic_ios_char_init(base, strbuf, isstd);
@@ -8210,7 +8210,7 @@ basic_istream_char* __thiscall basic_istream_char_ctor_uninitialized(basic_istre
         base = basic_istream_char_get_basic_ios(this);
     }
 
-    base->base.vtable = &MSVCP_basic_istream_char_vtable;
+    base->base.vtable = &basic_istream_char_vtable;
     ios_base_Addstd(&base->base);
     return this;
 }
@@ -9662,7 +9662,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ctor_init(basic_istream_wcha
         base = basic_istream_wchar_get_basic_ios(this);
     }
 
-    base->base.vtable = &MSVCP_basic_istream_wchar_vtable;
+    base->base.vtable = &basic_istream_wchar_vtable;
     this->count = 0;
     if(!noinit)
         basic_ios_wchar_init(base, strbuf, isstd);
@@ -9676,7 +9676,7 @@ basic_istream_wchar* __thiscall basic_istream_short_ctor_init(basic_istream_wcha
         basic_streambuf_wchar *strbuf, bool isstd, bool noinit, bool virt_init)
 {
     basic_istream_wchar_ctor_init(this, strbuf, isstd, noinit, virt_init);
-    basic_istream_wchar_get_basic_ios(this)->base.vtable = &MSVCP_basic_istream_short_vtable;
+    basic_istream_wchar_get_basic_ios(this)->base.vtable = &basic_istream_short_vtable;
     return this;
 }
 
@@ -9717,7 +9717,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ctor_uninitialized(
         base = basic_istream_wchar_get_basic_ios(this);
     }
 
-    base->base.vtable = &MSVCP_basic_istream_wchar_vtable;
+    base->base.vtable = &basic_istream_wchar_vtable;
     ios_base_Addstd(&base->base);
     return this;
 }
@@ -9729,7 +9729,7 @@ basic_istream_wchar* __thiscall basic_istream_short_ctor_uninitialized(
         basic_istream_wchar *this, int uninitialized, bool virt_init)
 {
     basic_istream_wchar_ctor_uninitialized(this, uninitialized, virt_init);
-    basic_istream_wchar_get_basic_ios(this)->base.vtable = &MSVCP_basic_istream_short_vtable;
+    basic_istream_wchar_get_basic_ios(this)->base.vtable = &basic_istream_short_vtable;
     return this;
 }
 
@@ -11257,7 +11257,7 @@ basic_iostream_char* __thiscall basic_iostream_char_ctor(basic_iostream_char *th
 
     basic_istream_char_ctor(&this->base1, strbuf, FALSE, FALSE);
     basic_ostream_char_ctor_uninitialized(&this->base2, 0, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_iostream_char_vtable;
+    basic_ios->base.vtable = &basic_iostream_char_vtable;
     return this;
 }
 
@@ -11356,7 +11356,7 @@ basic_iostream_wchar* __thiscall basic_iostream_wchar_ctor(basic_iostream_wchar
     basic_istream_wchar_ctor(&this->base1, strbuf, FALSE, FALSE);
     basic_ostream_wchar_ctor_uninitialized(&this->base2, 0, FALSE, FALSE);
 
-    basic_ios->base.vtable = &MSVCP_basic_iostream_wchar_vtable;
+    basic_ios->base.vtable = &basic_iostream_wchar_vtable;
     return this;
 }
 
@@ -11367,7 +11367,7 @@ basic_iostream_wchar* __thiscall basic_iostream_short_ctor(basic_iostream_wchar
         basic_streambuf_wchar *strbuf, bool virt_init)
 {
     basic_iostream_wchar_ctor(this, strbuf, virt_init);
-    basic_istream_wchar_get_basic_ios(&this->base1)->base.vtable = &MSVCP_basic_iostream_short_vtable;
+    basic_istream_wchar_get_basic_ios(&this->base1)->base.vtable = &basic_iostream_short_vtable;
     return this;
 }
 
@@ -11469,7 +11469,7 @@ basic_ofstream_char* __thiscall basic_ofstream_char_ctor(basic_ofstream_char *th
 
     basic_filebuf_char_ctor(&this->filebuf);
     basic_ostream_char_ctor(&this->base, &this->filebuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ofstream_char_vtable;
+    basic_ios->base.vtable = &basic_ofstream_char_vtable;
     return this;
 }
 
@@ -11494,7 +11494,7 @@ basic_ofstream_char* __thiscall basic_ofstream_char_ctor_file(
 
     basic_filebuf_char_ctor_file(&this->filebuf, file);
     basic_ostream_char_ctor(&this->base, &this->filebuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ofstream_char_vtable;
+    basic_ios->base.vtable = &basic_ofstream_char_vtable;
     return this;
 }
 
@@ -11694,7 +11694,7 @@ basic_ofstream_wchar* __thiscall basic_ofstream_wchar_ctor(basic_ofstream_wchar
 
     basic_filebuf_wchar_ctor(&this->filebuf);
     basic_ostream_wchar_ctor(&this->base, &this->filebuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ofstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_ofstream_wchar_vtable;
     return this;
 }
 
@@ -11704,7 +11704,7 @@ DEFINE_THISCALL_WRAPPER(basic_ofstream_short_ctor, 8)
 basic_ofstream_wchar* __thiscall basic_ofstream_short_ctor(basic_ofstream_wchar *this, bool virt_init)
 {
     basic_ofstream_wchar_ctor(this, virt_init);
-    basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ofstream_short_vtable;
+    basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &basic_ofstream_short_vtable;
     return this;
 }
 
@@ -11729,7 +11729,7 @@ basic_ofstream_wchar* __thiscall basic_ofstream_wchar_ctor_file(
 
     basic_filebuf_wchar_ctor_file(&this->filebuf, file);
     basic_ostream_wchar_ctor(&this->base, &this->filebuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ofstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_ofstream_wchar_vtable;
     return this;
 }
 
@@ -11740,7 +11740,7 @@ basic_ofstream_wchar* __thiscall basic_ofstream_short_ctor_file(
         basic_ofstream_wchar *this, FILE *file, bool virt_init)
 {
     basic_ofstream_wchar_ctor_file(this, file, virt_init);
-    basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ofstream_short_vtable;
+    basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &basic_ofstream_short_vtable;
     return this;
 }
 
@@ -11768,7 +11768,7 @@ basic_ofstream_wchar* __thiscall basic_ofstream_short_ctor_name(basic_ofstream_w
         const char *name, int mode, int prot, bool virt_init)
 {
     basic_ofstream_wchar_ctor_name(this, name, mode, prot, virt_init);
-    basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ofstream_short_vtable;
+    basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &basic_ofstream_short_vtable;
     return this;
 }
 
@@ -11800,7 +11800,7 @@ basic_ofstream_wchar* __thiscall basic_ofstream_short_ctor_name_wchar(basic_ofst
         const wchar_t *name, int mode, int prot, bool virt_init)
 {
     basic_ofstream_wchar_ctor_name_wchar(this, name, mode, prot, virt_init);
-    basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ofstream_short_vtable;
+    basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &basic_ofstream_short_vtable;
     return this;
 }
 
@@ -11986,7 +11986,7 @@ basic_ifstream_char* __thiscall basic_ifstream_char_ctor(basic_ifstream_char *th
 
     basic_filebuf_char_ctor(&this->filebuf);
     basic_istream_char_ctor(&this->base, &this->filebuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ifstream_char_vtable;
+    basic_ios->base.vtable = &basic_ifstream_char_vtable;
     return this;
 }
 
@@ -12011,7 +12011,7 @@ basic_ifstream_char* __thiscall basic_ifstream_char_ctor_file(
 
     basic_filebuf_char_ctor_file(&this->filebuf, file);
     basic_istream_char_ctor(&this->base, &this->filebuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ifstream_char_vtable;
+    basic_ios->base.vtable = &basic_ifstream_char_vtable;
     return this;
 }
 
@@ -12220,7 +12220,7 @@ basic_ifstream_wchar* __thiscall basic_ifstream_wchar_ctor(basic_ifstream_wchar
 
     basic_filebuf_wchar_ctor(&this->filebuf);
     basic_istream_wchar_ctor(&this->base, &this->filebuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ifstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_ifstream_wchar_vtable;
     return this;
 }
 
@@ -12230,7 +12230,7 @@ DEFINE_THISCALL_WRAPPER(basic_ifstream_short_ctor, 8)
 basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor(basic_ifstream_wchar *this, bool virt_init)
 {
     basic_ifstream_wchar_ctor(this, virt_init);
-    basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ifstream_short_vtable;
+    basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &basic_ifstream_short_vtable;
     return this;
 }
 
@@ -12255,7 +12255,7 @@ basic_ifstream_wchar* __thiscall basic_ifstream_wchar_ctor_file(
 
     basic_filebuf_wchar_ctor_file(&this->filebuf, file);
     basic_istream_wchar_ctor(&this->base, &this->filebuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ifstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_ifstream_wchar_vtable;
     return this;
 }
 
@@ -12266,7 +12266,7 @@ basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor_file(
         basic_ifstream_wchar *this, FILE *file, bool virt_init)
 {
     basic_ifstream_wchar_ctor_file(this, file, virt_init);
-    basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ifstream_short_vtable;
+    basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &basic_ifstream_short_vtable;
     return this;
 }
 
@@ -12294,7 +12294,7 @@ basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor_name(basic_ifstream_w
         const char *name, int mode, int prot, bool virt_init)
 {
     basic_ifstream_wchar_ctor_name(this, name, mode, prot, virt_init);
-    basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ifstream_short_vtable;
+    basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &basic_ifstream_short_vtable;
     return this;
 }
 
@@ -12344,7 +12344,7 @@ basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor_name_wchar(basic_ifst
         const wchar_t *name, int mode, int prot, bool virt_init)
 {
     basic_ifstream_wchar_ctor_name_wchar(this, name, mode, prot, virt_init);
-    basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ifstream_short_vtable;
+    basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &basic_ifstream_short_vtable;
     return this;
 }
 
@@ -12531,7 +12531,7 @@ basic_fstream_char* __thiscall basic_fstream_char_ctor(basic_fstream_char *this,
 
     basic_filebuf_char_ctor(&this->filebuf);
     basic_iostream_char_ctor(&this->base, &this->filebuf.base, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_fstream_char_vtable;
+    basic_ios->base.vtable = &basic_fstream_char_vtable;
     return this;
 }
 
@@ -12557,7 +12557,7 @@ basic_fstream_char* __thiscall basic_fstream_char_ctor_file(basic_fstream_char *
 
     basic_filebuf_char_ctor_file(&this->filebuf, file);
     basic_iostream_char_ctor(&this->base, &this->filebuf.base, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_fstream_char_vtable;
+    basic_ios->base.vtable = &basic_fstream_char_vtable;
     return this;
 }
 
@@ -12767,7 +12767,7 @@ basic_fstream_wchar* __thiscall basic_fstream_wchar_ctor(basic_fstream_wchar *th
 
     basic_filebuf_wchar_ctor(&this->filebuf);
     basic_iostream_wchar_ctor(&this->base, &this->filebuf.base, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_fstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_fstream_wchar_vtable;
     return this;
 }
 
@@ -12777,7 +12777,7 @@ DEFINE_THISCALL_WRAPPER(basic_fstream_short_ctor, 8)
 basic_fstream_wchar* __thiscall basic_fstream_short_ctor(basic_fstream_wchar *this, bool virt_init)
 {
     basic_fstream_wchar_ctor(this, virt_init);
-    basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &MSVCP_basic_fstream_short_vtable;
+    basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &basic_fstream_short_vtable;
     return this;
 }
 
@@ -12803,7 +12803,7 @@ basic_fstream_wchar* __thiscall basic_fstream_wchar_ctor_file(basic_fstream_wcha
 
     basic_filebuf_wchar_ctor_file(&this->filebuf, file);
     basic_iostream_wchar_ctor(&this->base, &this->filebuf.base, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_fstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_fstream_wchar_vtable;
     return this;
 }
 
@@ -12814,7 +12814,7 @@ basic_fstream_wchar* __thiscall basic_fstream_short_ctor_file(basic_fstream_wcha
         FILE *file, bool virt_init)
 {
     basic_fstream_wchar_ctor_file(this, file, virt_init);
-    basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &MSVCP_basic_fstream_short_vtable;
+    basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &basic_fstream_short_vtable;
     return this;
 }
 
@@ -12842,7 +12842,7 @@ basic_fstream_wchar* __thiscall basic_fstream_short_ctor_name(basic_fstream_wcha
         const char *name, int mode, int prot, bool virt_init)
 {
     basic_fstream_wchar_ctor_name(this, name, mode, prot, virt_init);
-    basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &MSVCP_basic_fstream_short_vtable;
+    basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &basic_fstream_short_vtable;
     return this;
 }
 
@@ -12891,7 +12891,7 @@ basic_fstream_wchar* __thiscall basic_fstream_short_ctor_name_wchar(basic_fstrea
         const wchar_t *name, int mode, int prot, bool virt_init)
 {
     basic_fstream_wchar_ctor_name_wchar(this, name, mode, prot, virt_init);
-    basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &MSVCP_basic_fstream_short_vtable;
+    basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &basic_fstream_short_vtable;
     return this;
 }
 
@@ -13078,7 +13078,7 @@ basic_ostringstream_char* __thiscall basic_ostringstream_char_ctor_str(basic_ost
 
     basic_stringbuf_char_ctor_str(&this->strbuf, str, mode|OPENMODE_out);
     basic_ostream_char_ctor(&this->base, &this->strbuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ostringstream_char_vtable;
+    basic_ios->base.vtable = &basic_ostringstream_char_vtable;
     return this;
 }
 
@@ -13103,7 +13103,7 @@ basic_ostringstream_char* __thiscall basic_ostringstream_char_ctor_mode(
 
     basic_stringbuf_char_ctor_mode(&this->strbuf, mode|OPENMODE_out);
     basic_ostream_char_ctor(&this->base, &this->strbuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ostringstream_char_vtable;
+    basic_ios->base.vtable = &basic_ostringstream_char_vtable;
     return this;
 }
 
@@ -13223,7 +13223,7 @@ basic_ostringstream_wchar* __thiscall basic_ostringstream_wchar_ctor_str(basic_o
 
     basic_stringbuf_wchar_ctor_str(&this->strbuf, str, mode|OPENMODE_out);
     basic_ostream_wchar_ctor(&this->base, &this->strbuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ostringstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_ostringstream_wchar_vtable;
     return this;
 }
 
@@ -13234,7 +13234,7 @@ basic_ostringstream_wchar* __thiscall basic_ostringstream_short_ctor_str(basic_o
         const basic_string_wchar *str, int mode, bool virt_init)
 {
     basic_ostringstream_wchar_ctor_str(this, str, mode, virt_init);
-    basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ostringstream_short_vtable;
+    basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &basic_ostringstream_short_vtable;
     return this;
 }
 
@@ -13259,7 +13259,7 @@ basic_ostringstream_wchar* __thiscall basic_ostringstream_wchar_ctor_mode(
 
     basic_stringbuf_wchar_ctor_mode(&this->strbuf, mode|OPENMODE_out);
     basic_ostream_wchar_ctor(&this->base, &this->strbuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_ostringstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_ostringstream_wchar_vtable;
     return this;
 }
 
@@ -13270,7 +13270,7 @@ basic_ostringstream_wchar* __thiscall basic_ostringstream_short_ctor_mode(
         basic_ostringstream_wchar *this, int mode, bool virt_init)
 {
     basic_ostringstream_wchar_ctor_mode(this, mode, virt_init);
-    basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ostringstream_short_vtable;
+    basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &basic_ostringstream_short_vtable;
     return this;
 }
 
@@ -13409,7 +13409,7 @@ basic_istringstream_char* __thiscall basic_istringstream_char_ctor_str(basic_ist
 
     basic_stringbuf_char_ctor_str(&this->strbuf, str, mode|OPENMODE_in);
     basic_istream_char_ctor(&this->base, &this->strbuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_istringstream_char_vtable;
+    basic_ios->base.vtable = &basic_istringstream_char_vtable;
     return this;
 }
 
@@ -13434,7 +13434,7 @@ basic_istringstream_char* __thiscall basic_istringstream_char_ctor_mode(
 
     basic_stringbuf_char_ctor_mode(&this->strbuf, mode|OPENMODE_in);
     basic_istream_char_ctor(&this->base, &this->strbuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_istringstream_char_vtable;
+    basic_ios->base.vtable = &basic_istringstream_char_vtable;
     return this;
 }
 
@@ -13554,7 +13554,7 @@ basic_istringstream_wchar* __thiscall basic_istringstream_wchar_ctor_str(basic_i
 
     basic_stringbuf_wchar_ctor_str(&this->strbuf, str, mode|OPENMODE_in);
     basic_istream_wchar_ctor(&this->base, &this->strbuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_istringstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_istringstream_wchar_vtable;
     return this;
 }
 
@@ -13565,7 +13565,7 @@ basic_istringstream_wchar* __thiscall basic_istringstream_short_ctor_str(basic_i
         const basic_string_wchar *str, int mode, bool virt_init)
 {
     basic_istringstream_wchar_ctor_str(this, str, mode, virt_init);
-    basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_istringstream_short_vtable;
+    basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &basic_istringstream_short_vtable;
     return this;
 }
 
@@ -13590,7 +13590,7 @@ basic_istringstream_wchar* __thiscall basic_istringstream_wchar_ctor_mode(
 
     basic_stringbuf_wchar_ctor_mode(&this->strbuf, mode|OPENMODE_in);
     basic_istream_wchar_ctor(&this->base, &this->strbuf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_istringstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_istringstream_wchar_vtable;
     return this;
 }
 
@@ -13601,7 +13601,7 @@ basic_istringstream_wchar* __thiscall basic_istringstream_short_ctor_mode(
         basic_istringstream_wchar *this, int mode, bool virt_init)
 {
     basic_istringstream_wchar_ctor_mode(this, mode, virt_init);
-    basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_istringstream_short_vtable;
+    basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &basic_istringstream_short_vtable;
     return this;
 }
 
@@ -13741,7 +13741,7 @@ basic_stringstream_char* __thiscall basic_stringstream_char_ctor_str(basic_strin
 
     basic_stringbuf_char_ctor_str(&this->strbuf, str, mode);
     basic_iostream_char_ctor(&this->base, &this->strbuf.base, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_stringstream_char_vtable;
+    basic_ios->base.vtable = &basic_stringstream_char_vtable;
     return this;
 }
 
@@ -13767,7 +13767,7 @@ basic_stringstream_char* __thiscall basic_stringstream_char_ctor_mode(
 
     basic_stringbuf_char_ctor_mode(&this->strbuf, mode);
     basic_iostream_char_ctor(&this->base, &this->strbuf.base, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_stringstream_char_vtable;
+    basic_ios->base.vtable = &basic_stringstream_char_vtable;
     return this;
 }
 
@@ -13889,7 +13889,7 @@ basic_stringstream_wchar* __thiscall basic_stringstream_wchar_ctor_str(basic_str
 
     basic_stringbuf_wchar_ctor_str(&this->strbuf, str, mode);
     basic_iostream_wchar_ctor(&this->base, &this->strbuf.base, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_stringstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_stringstream_wchar_vtable;
     return this;
 }
 
@@ -13900,7 +13900,7 @@ basic_stringstream_wchar* __thiscall basic_stringstream_short_ctor_str(basic_str
         const basic_string_wchar *str, int mode, bool virt_init)
 {
     basic_stringstream_wchar_ctor_str(this, str, mode, virt_init);
-    basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &MSVCP_basic_stringstream_short_vtable;
+    basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &basic_stringstream_short_vtable;
     return this;
 }
 
@@ -13926,7 +13926,7 @@ basic_stringstream_wchar* __thiscall basic_stringstream_wchar_ctor_mode(
 
     basic_stringbuf_wchar_ctor_mode(&this->strbuf, mode);
     basic_iostream_wchar_ctor(&this->base, &this->strbuf.base, FALSE);
-    basic_ios->base.vtable = &MSVCP_basic_stringstream_wchar_vtable;
+    basic_ios->base.vtable = &basic_stringstream_wchar_vtable;
     return this;
 }
 
@@ -13937,7 +13937,7 @@ basic_stringstream_wchar* __thiscall basic_stringstream_short_ctor_mode(
         basic_stringstream_wchar *this, int mode, bool virt_init)
 {
     basic_stringstream_wchar_ctor_mode(this, mode, virt_init);
-    basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &MSVCP_basic_stringstream_short_vtable;
+    basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &basic_stringstream_short_vtable;
     return this;
 }
 
@@ -14099,7 +14099,7 @@ strstreambuf* __thiscall strstreambuf_ctor_get_put(strstreambuf *this, char *g,
     TRACE("(%p %p %s %p)\n", this, g, wine_dbgstr_longlong(len), p);
 
     basic_streambuf_char_ctor(&this->base);
-    this->base.vtable = &MSVCP_strstreambuf_vtable;
+    this->base.vtable = &strstreambuf_vtable;
 
     strstreambuf__Init(this, len, g, p, 0);
     return this;
@@ -14476,7 +14476,7 @@ ostrstream* __thiscall ostrstream_ctor(ostrstream *this, char *buf, streamsize s
     strstreambuf_ctor_get_put(&this->buf, buf, size,
             buf && (mode & OPENMODE_app) ? buf+strlen(buf) : buf);
     basic_ostream_char_ctor(&this->base, &this->buf.base, FALSE, FALSE);
-    basic_ios->base.vtable = &MSVCP_ostrstream_vtable;
+    basic_ios->base.vtable = &ostrstream_vtable;
     return this;
 }
 
@@ -15168,7 +15168,7 @@ strstream* __thiscall strstream_ctor(strstream *this, char *buf, streamsize size
     strstreambuf_ctor_get_put(&this->buf, buf, size,
             buf && (mode & OPENMODE_app) ? buf+strlen(buf) : buf);
     basic_iostream_char_ctor(&this->base, &this->buf.base, FALSE);
-    basic_ios->base.vtable = &MSVCP_strstream_vtable;
+    basic_ios->base.vtable = &strstream_vtable;
     return this;
 }
 
diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c
index 338ded0082d..0d0af6eac34 100644
--- a/dlls/msvcp90/locale.c
+++ b/dlls/msvcp90/locale.c
@@ -317,7 +317,7 @@ void __thiscall locale_facet__Register(locale_facet *this)
 
 /* Not exported from msvcp90 */
 /* ??_7facet@locale@std@@6B@ */
-extern const vtable_ptr MSVCP_locale_facet_vtable;
+extern const vtable_ptr locale_facet_vtable;
 
 /* ??0id@locale@std@@QAE@I@Z */
 /* ??0id@locale@std@@QEAA@_K@Z */
@@ -373,7 +373,7 @@ DEFINE_THISCALL_WRAPPER(locale_facet_ctor, 4)
 locale_facet* __thiscall locale_facet_ctor(locale_facet *this)
 {
     TRACE("(%p)\n", this);
-    this->vtable = &MSVCP_locale_facet_vtable;
+    this->vtable = &locale_facet_vtable;
     this->refs = 0;
     return this;
 }
@@ -384,7 +384,7 @@ DEFINE_THISCALL_WRAPPER(locale_facet_ctor_refs, 8)
 locale_facet* __thiscall locale_facet_ctor_refs(locale_facet *this, size_t refs)
 {
     TRACE("(%p %Iu)\n", this, refs);
-    this->vtable = &MSVCP_locale_facet_vtable;
+    this->vtable = &locale_facet_vtable;
     this->refs = refs;
     return this;
 }
@@ -965,7 +965,7 @@ _Timevec*__thiscall _Locinfo__Gettnames(const _Locinfo *this, _Timevec *ret)
 locale_id collate_char_id = {0};
 
 /* ??_7?$collate@D@std@@6B@ */
-extern const vtable_ptr MSVCP_collate_char_vtable;
+extern const vtable_ptr collate_char_vtable;
 
 /* ?_Init@?$collate@D@std@@IAEXABV_Locinfo@2@@Z */
 /* ?_Init@?$collate@D@std@@IEAAXAEBV_Locinfo@2@@Z */
@@ -986,7 +986,7 @@ collate* __thiscall collate_char_ctor_name(collate *this, const char *name, size
     TRACE("(%p %s %Iu)\n", this, name, refs);
 
     locale_facet_ctor_refs(&this->facet, refs);
-    this->facet.vtable = &MSVCP_collate_char_vtable;
+    this->facet.vtable = &collate_char_vtable;
 
     _Locinfo_ctor_cstr(&locinfo, name);
     collate_char__Init(this, &locinfo);
@@ -1002,7 +1002,7 @@ collate* __thiscall collate_char_ctor_locinfo(collate *this, const _Locinfo *loc
     TRACE("(%p %p %Iu)\n", this, locinfo, refs);
 
     locale_facet_ctor_refs(&this->facet, refs);
-    this->facet.vtable = &MSVCP_collate_char_vtable;
+    this->facet.vtable = &collate_char_vtable;
     collate_char__Init(this, locinfo);
     return this;
 }
@@ -1211,9 +1211,9 @@ locale_id collate_wchar_id = {0};
 locale_id collate_short_id = {0};
 
 /* ??_7?$collate@_W@std@@6B@ */
-extern const vtable_ptr MSVCP_collate_wchar_vtable;
+extern const vtable_ptr collate_wchar_vtable;
 /* ??_7?$collate@G@std@@6B@ */
-extern const vtable_ptr MSVCP_collate_short_vtable;
+extern const vtable_ptr collate_short_vtable;
 
 /* ?_Init@?$collate@_W@std@@IAEXABV_Locinfo@2@@Z */
 /* ?_Init@?$collate@_W@std@@IEAAXAEBV_Locinfo@2@@Z */
@@ -1236,7 +1236,7 @@ collate* __thiscall collate_wchar_ctor_name(collate *this, const char *name, siz
     TRACE("(%p %s %Iu)\n", this, name, refs);
 
     locale_facet_ctor_refs(&this->facet, refs);
-    this->facet.vtable = &MSVCP_collate_wchar_vtable;
+    this->facet.vtable = &collate_wchar_vtable;
 
     _Locinfo_ctor_cstr(&locinfo, name);
     collate_wchar__Init(this, &locinfo);
@@ -1250,7 +1250,7 @@ DEFINE_THISCALL_WRAPPER(collate_short_ctor_name, 12)
 collate* __thiscall collate_short_ctor_name(collate *this, const char *name, size_t refs)
 {
     collate *ret = collate_wchar_ctor_name(this, name, refs);
-    ret->facet.vtable = &MSVCP_collate_short_vtable;
+    ret->facet.vtable = &collate_short_vtable;
     return ret;
 }
 
@@ -1262,7 +1262,7 @@ collate* __thiscall collate_wchar_ctor_locinfo(collate *this, const _Locinfo *lo
     TRACE("(%p %p %Iu)\n", this, locinfo, refs);
 
     locale_facet_ctor_refs(&this->facet, refs);
-    this->facet.vtable = &MSVCP_collate_wchar_vtable;
+    this->facet.vtable = &collate_wchar_vtable;
     collate_wchar__Init(this, locinfo);
     return this;
 }
@@ -1273,7 +1273,7 @@ DEFINE_THISCALL_WRAPPER(collate_short_ctor_locinfo, 12)
 collate* __thiscall collate_short_ctor_locinfo(collate *this, const _Locinfo *locinfo, size_t refs)
 {
     collate *ret = collate_wchar_ctor_locinfo(this, locinfo, refs);
-    ret->facet.vtable = &MSVCP_collate_short_vtable;
+    ret->facet.vtable = &collate_short_vtable;
     return ret;
 }
 
@@ -1291,7 +1291,7 @@ DEFINE_THISCALL_WRAPPER(collate_short_ctor_refs, 8)
 collate* __thiscall collate_short_ctor_refs(collate *this, size_t refs)
 {
     collate *ret = collate_wchar_ctor_refs(this, refs);
-    ret->facet.vtable = &MSVCP_collate_short_vtable;
+    ret->facet.vtable = &collate_short_vtable;
     return ret;
 }
 
@@ -1341,7 +1341,7 @@ DEFINE_THISCALL_WRAPPER(collate_short_ctor, 4)
 collate* __thiscall collate_short_ctor(collate *this)
 {
     collate *ret = collate_wchar_ctor(this);
-    ret->facet.vtable = &MSVCP_collate_short_vtable;
+    ret->facet.vtable = &collate_short_vtable;
     return ret;
 }
 
@@ -1406,7 +1406,7 @@ size_t __cdecl collate_short__Getcat(const locale_facet **facet, const locale *l
 {
     if(facet && !*facet) {
         collate_wchar__Getcat(facet, loc);
-        (*(locale_facet**)facet)->vtable = &MSVCP_collate_short_vtable;
+        (*(locale_facet**)facet)->vtable = &collate_short_vtable;
     }
 
     return LC_COLLATE;
@@ -1556,7 +1556,7 @@ basic_string_wchar* __thiscall collate_wchar_transform(const collate *this,
 }
 
 /* ??_7ctype_base@std@@6B@ */
-extern const vtable_ptr MSVCP_ctype_base_vtable;
+extern const vtable_ptr ctype_base_vtable;
 
 /* ??0ctype_base@std@@QAE@I@Z */
 /* ??0ctype_base@std@@QEAA@_K@Z */
@@ -1565,7 +1565,7 @@ ctype_base* __thiscall ctype_base_ctor_refs(ctype_base *this, size_t refs)
 {
     TRACE("(%p %Iu)\n", this, refs);
     locale_facet_ctor_refs(&this->facet, refs);
-    this->facet.vtable = &MSVCP_ctype_base_vtable;
+    this->facet.vtable = &ctype_base_vtable;
     return this;
 }
 
@@ -1576,7 +1576,7 @@ ctype_base* __thiscall ctype_base_ctor(ctype_base *this)
 {
     TRACE("(%p)\n", this);
     locale_facet_ctor_refs(&this->facet, 0);
-    this->facet.vtable = &MSVCP_ctype_base_vtable;
+    this->facet.vtable = &ctype_base_vtable;
     return this;
 }
 
@@ -1621,7 +1621,7 @@ locale_id ctype_char_id = {0};
 size_t ctype_char_table_size = 256;
 
 /* ??_7?$ctype@D@std@@6B@ */
-extern const vtable_ptr MSVCP_ctype_char_vtable;
+extern const vtable_ptr ctype_char_vtable;
 
 /* ?_Id_func@?$ctype@D@std@@SAAAVid@locale@2@XZ */
 /* ?_Id_func@?$ctype@D@std@@SAAEAVid@locale@2@XZ */
@@ -1673,7 +1673,7 @@ ctype_char* __thiscall ctype_char_ctor_locinfo(ctype_char *this,
 {
     TRACE("(%p %p %Iu)\n", this, locinfo, refs);
     ctype_base_ctor_refs(&this->base, refs);
-    this->base.facet.vtable = &MSVCP_ctype_char_vtable;
+    this->base.facet.vtable = &ctype_char_vtable;
     ctype_char__Init(this, locinfo);
     return this;
 }
@@ -1689,7 +1689,7 @@ ctype_char* __thiscall ctype_char_ctor_table(ctype_char *this,
     TRACE("(%p %p %d %Iu)\n", this, table, delete, refs);
 
     ctype_base_ctor_refs(&this->base, refs);
-    this->base.facet.vtable = &MSVCP_ctype_char_vtable;
+    this->base.facet.vtable = &ctype_char_vtable;
 
     _Locinfo_ctor(&locinfo);
     ctype_char__Init(this, &locinfo);
@@ -2218,9 +2218,9 @@ locale_id ctype_wchar_id = {0};
 locale_id ctype_short_id = {0};
 
 /* ??_7?$ctype@_W@std@@6B@ */
-extern const vtable_ptr MSVCP_ctype_wchar_vtable;
+extern const vtable_ptr ctype_wchar_vtable;
 /* ??_7?$ctype@G@std@@6B@ */
-extern const vtable_ptr MSVCP_ctype_short_vtable;
+extern const vtable_ptr ctype_short_vtable;
 
 /* ?_Id_func@?$ctype@_W@std@@SAAAVid@locale@2@XZ */
 /* ?_Id_func@?$ctype@_W@std@@SAAEAVid@locale@2@XZ */
@@ -2258,7 +2258,7 @@ ctype_wchar* __thiscall ctype_wchar_ctor_locinfo(ctype_wchar *this,
 {
     TRACE("(%p %p %Iu)\n", this, locinfo, refs);
     ctype_base_ctor_refs(&this->base, refs);
-    this->base.facet.vtable = &MSVCP_ctype_wchar_vtable;
+    this->base.facet.vtable = &ctype_wchar_vtable;
     ctype_wchar__Init(this, locinfo);
     return this;
 }
@@ -2270,7 +2270,7 @@ ctype_wchar* __thiscall ctype_short_ctor_locinfo(ctype_wchar *this,
         const _Locinfo *locinfo, size_t refs)
 {
     ctype_wchar *ret = ctype_wchar_ctor_locinfo(this, locinfo, refs);
-    this->base.facet.vtable = &MSVCP_ctype_short_vtable;
+    this->base.facet.vtable = &ctype_short_vtable;
     return ret;
 }
 
@@ -2284,7 +2284,7 @@ ctype_wchar* __thiscall ctype_wchar_ctor_refs(ctype_wchar *this, size_t refs)
     TRACE("(%p %Iu)\n", this, refs);
 
     ctype_base_ctor_refs(&this->base, refs);
-    this->base.facet.vtable = &MSVCP_ctype_wchar_vtable;
+    this->base.facet.vtable = &ctype_wchar_vtable;
 
     _Locinfo_ctor(&locinfo);
     ctype_wchar__Init(this, &locinfo);
@@ -2298,7 +2298,7 @@ DEFINE_THISCALL_WRAPPER(ctype_short_ctor_refs, 8)
 ctype_wchar* __thiscall ctype_short_ctor_refs(ctype_wchar *this, size_t refs)
 {
     ctype_wchar *ret = ctype_wchar_ctor_refs(this, refs);
-    this->base.facet.vtable = &MSVCP_ctype_short_vtable;
+    this->base.facet.vtable = &ctype_short_vtable;
     return ret;
 }
 
@@ -2313,7 +2313,7 @@ ctype_wchar* __thiscall ctype_short_ctor_name(ctype_wchar *this,
     TRACE("(%p %s %Iu)\n", this, debugstr_a(name), refs);
 
     ctype_base_ctor_refs(&this->base, refs);
-    this->base.facet.vtable = &MSVCP_ctype_short_vtable;
+    this->base.facet.vtable = &ctype_short_vtable;
 
     _Locinfo_ctor_cstr(&locinfo, name);
     ctype_wchar__Init(this, &locinfo);
@@ -2336,7 +2336,7 @@ DEFINE_THISCALL_WRAPPER(ctype_short_ctor, 4)
 ctype_wchar* __thiscall ctype_short_ctor(ctype_wchar *this)
 {
     ctype_wchar *ret = ctype_wchar_ctor(this);
-    this->base.facet.vtable = &MSVCP_ctype_short_vtable;
+    this->base.facet.vtable = &ctype_short_vtable;
     return ret;
 }
 
@@ -2749,7 +2749,7 @@ size_t __cdecl ctype_short__Getcat(const locale_facet **facet, const locale *loc
 {
     if(facet && !*facet) {
         ctype_wchar__Getcat(facet, loc);
-        (*(locale_facet**)facet)->vtable = &MSVCP_ctype_short_vtable;
+        (*(locale_facet**)facet)->vtable = &ctype_short_vtable;
     }
 
     return LC_CTYPE;
@@ -3110,7 +3110,7 @@ const wchar_t* __thiscall ctype_wchar_scan_not(const ctype_wchar *this,
 }
 
 /* ??_7codecvt_base@std@@6B@ */
-extern const vtable_ptr MSVCP_codecvt_base_vtable;
+extern const vtable_ptr codecvt_base_vtable;
 
 /* ??0codecvt_base@std@@QAE@I@Z */
 /* ??0codecvt_base@std@@QEAA@_K@Z */
@@ -3119,7 +3119,7 @@ codecvt_base* __thiscall codecvt_base_ctor_refs(codecvt_base *this, size_t refs)
 {
     TRACE("(%p %Iu)\n", this, refs);
     locale_facet_ctor_refs(&this->facet, refs);
-    this->facet.vtable = &MSVCP_codecvt_base_vtable;
+    this->facet.vtable = &codecvt_base_vtable;
     return this;
 }
 
@@ -3239,7 +3239,7 @@ int __thiscall codecvt_base_encoding(const codecvt_base *this)
 locale_id codecvt_char_id = {0};
 
 /* ??_7?$codecvt@DDH@std@@6B@ */
-extern const vtable_ptr MSVCP_codecvt_char_vtable;
+extern const vtable_ptr codecvt_char_vtable;
 
 /* ?_Init@?$codecvt@DDH@std@@IAEXABV_Locinfo@2@@Z */
 /* ?_Init@?$codecvt@DDH@std@@IEAAXAEBV_Locinfo@2@@Z */
@@ -3256,7 +3256,7 @@ codecvt_char* __thiscall codecvt_char_ctor_locinfo(codecvt_char *this, const _Lo
 {
     TRACE("(%p %p %Iu)\n", this, locinfo, refs);
     codecvt_base_ctor_refs(&this->base, refs);
-    this->base.facet.vtable = &MSVCP_codecvt_char_vtable;
+    this->base.facet.vtable = &codecvt_char_vtable;
     return this;
 }
 
@@ -3509,9 +3509,9 @@ locale_id codecvt_wchar_id = {0};
 locale_id codecvt_short_id = {0};
 
 /* ??_7?$codecvt@_WDH@std@@6B@ */
-extern const vtable_ptr MSVCP_codecvt_wchar_vtable;
+extern const vtable_ptr codecvt_wchar_vtable;
 /* ??_7?$codecvt@GDH@std@@6B@ */
-extern const vtable_ptr MSVCP_codecvt_short_vtable;
+extern const vtable_ptr codecvt_short_vtable;
 
 /* ?_Init@?$codecvt@GDH@std@@IAEXABV_Locinfo@2@@Z */
 /* ?_Init@?$codecvt@GDH@std@@IEAAXAEBV_Locinfo@2@@Z */
@@ -3532,7 +3532,7 @@ codecvt_wchar* __thiscall codecvt_wchar_ctor_locinfo(codecvt_wchar *this, const
     TRACE("(%p %p %Iu)\n", this, locinfo, refs);
 
     codecvt_base_ctor_refs(&this->base, refs);
-    this->base.facet.vtable = &MSVCP_codecvt_wchar_vtable;
+    this->base.facet.vtable = &codecvt_wchar_vtable;
 
     codecvt_wchar__Init(this, locinfo);
     return this;
@@ -3546,7 +3546,7 @@ codecvt_wchar* __thiscall codecvt_short_ctor_locinfo(codecvt_wchar *this, const
     TRACE("(%p %p %Iu)\n", this, locinfo, refs);
 
     codecvt_wchar_ctor_locinfo(this, locinfo, refs);
-    this->base.facet.vtable = &MSVCP_codecvt_short_vtable;
+    this->base.facet.vtable = &codecvt_short_vtable;
     return this;
 }
 
@@ -4027,7 +4027,7 @@ int __thiscall codecvt_wchar_length(const codecvt_wchar *this, const _Mbstatet *
 locale_id numpunct_char_id = {0};
 
 /* ??_7?$numpunct@D@std@@6B@ */
-extern const vtable_ptr MSVCP_numpunct_char_vtable;
+extern const vtable_ptr numpunct_char_vtable;
 
 /* ?_Init@?$numpunct@D@std@@IAEXABV_Locinfo@2@_N@Z */
 /* ?_Init@?$numpunct@D@std@@IEAAXAEBV_Locinfo@2@_N@Z */
@@ -4097,7 +4097,7 @@ numpunct_char* __thiscall numpunct_char_ctor_locinfo(numpunct_char *this,
 {
     TRACE("(%p %p %Iu %d)\n", this, locinfo, refs, usedef);
     locale_facet_ctor_refs(&this->facet, refs);
-    this->facet.vtable = &MSVCP_numpunct_char_vtable;
+    this->facet.vtable = &numpunct_char_vtable;
     numpunct_char__Init(this, locinfo, usedef);
     return this;
 }
@@ -4112,7 +4112,7 @@ numpunct_char* __thiscall numpunct_char_ctor_name(numpunct_char *this,
 
     TRACE("(%p %s %Iu %d)\n", this, debugstr_a(name), refs, usedef);
     locale_facet_ctor_refs(&this->facet, refs);
-    this->facet.vtable = &MSVCP_numpunct_char_vtable;
+    this->facet.vtable = &numpunct_char_vtable;
 
     _Locinfo_ctor_cstr(&locinfo, name);
     numpunct_char__Init(this, &locinfo, usedef);
@@ -4357,9 +4357,9 @@ locale_id numpunct_wchar_id = {0};
 locale_id numpunct_short_id = {0};
 
 /* ??_7?$numpunct@_W@std@@6B@ */
-extern const vtable_ptr MSVCP_numpunct_wchar_vtable;
+extern const vtable_ptr numpunct_wchar_vtable;
 /* ??_7?$numpunct@G@std@@6B@ */
-extern const vtable_ptr MSVCP_numpunct_short_vtable;
+extern const vtable_ptr numpunct_short_vtable;
 
 /* ?_Init@?$numpunct@_W@std@@IAEXABV_Locinfo@2@_N@Z */
 /* ?_Init@?$numpunct@_W@std@@IEAAXAEBV_Locinfo@2@_N@Z */
@@ -4442,7 +4442,7 @@ numpunct_wchar* __thiscall numpunct_wchar_ctor_locinfo(numpunct_wchar *this,
 {
     TRACE("(%p %p %Iu %d)\n", this, locinfo, refs, usedef);
     locale_facet_ctor_refs(&this->facet, refs);
-    this->facet.vtable = &MSVCP_numpunct_wchar_vtable;
+    this->facet.vtable = &numpunct_wchar_vtable;
     numpunct_wchar__Init(this, locinfo, usedef);
     return this;
 }
@@ -4454,7 +4454,7 @@ numpunct_wchar* __thiscall numpunct_short_ctor_locinfo(numpunct_wchar *this,
         const _Locinfo *locinfo, size_t refs, bool usedef)
 {
     numpunct_wchar_ctor_locinfo(this, locinfo, refs, usedef);
-    this->facet.vtable = &MSVCP_numpunct_short_vtable;
+    this->facet.vtable = &numpunct_short_vtable;
     return this;
 }
 
@@ -4468,7 +4468,7 @@ numpunct_wchar* __thiscall numpunct_wchar_ctor_name(numpunct_wchar *this,
 
     TRACE("(%p %s %Iu %d)\n", this, debugstr_a(name), refs, usedef);
     locale_facet_ctor_refs(&this->facet, refs);
-    this->facet.vtable = &MSVCP_numpunct_wchar_vtable;
+    this->facet.vtable = &numpunct_wchar_vtable;
 
     _Locinfo_ctor_cstr(&locinfo, name);
     numpunct_wchar__Init(this, &locinfo, usedef);
@@ -4483,7 +4483,7 @@ numpunct_wchar* __thiscall numpunct_short_ctor_name(numpunct_wchar *this,
         const char *name, size_t refs, bool usedef)
 {
     numpunct_wchar_ctor_name(this, name, refs, usedef);
-    this->facet.vtable = &MSVCP_numpunct_short_vtable;
+    this->facet.vtable = &numpunct_short_vtable;
     return this;
 }
 
@@ -4502,7 +4502,7 @@ DEFINE_THISCALL_WRAPPER(numpunct_short_ctor_refs, 8)
 numpunct_wchar* __thiscall numpunct_short_ctor_refs(numpunct_wchar *this, size_t refs)
 {
     numpunct_wchar_ctor_refs(this, refs);
-    this->facet.vtable = &MSVCP_numpunct_short_vtable;
+    this->facet.vtable = &numpunct_short_vtable;
     return this;
 }
 
@@ -4918,9 +4918,9 @@ locale_id num_get_wchar_id = {0};
 locale_id num_get_short_id = {0};
 
 /* ??_7?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_num_get_wchar_vtable;
+extern const vtable_ptr num_get_wchar_vtable;
 /* ??_7?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_num_get_short_vtable;
+extern const vtable_ptr num_get_short_vtable;
 
 /* ?_Init@?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@IAEXABV_Locinfo@2@@Z */
 /* ?_Init@?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@IEAAXAEBV_Locinfo@2@@Z */
@@ -4944,7 +4944,7 @@ num_get* __thiscall num_get_wchar_ctor_locinfo(num_get *this,
     TRACE("(%p %p %Iu)\n", this, locinfo, refs);
 
     locale_facet_ctor_refs(&this->facet, refs);
-    this->facet.vtable = &MSVCP_num_get_wchar_vtable;
+    this->facet.vtable = &num_get_wchar_vtable;
 
     num_get_wchar__Init(this, locinfo);
     return this;
@@ -4957,7 +4957,7 @@ num_get* __thiscall num_get_short_ctor_locinfo(num_get *this,
         const _Locinfo *locinfo, size_t refs)
 {
     num_get_wchar_ctor_locinfo(this, locinfo, refs);
-    this->facet.vtable = &MSVCP_num_get_short_vtable;
+    this->facet.vtable = &num_get_short_vtable;
     return this;
 }
 
@@ -4982,7 +4982,7 @@ DEFINE_THISCALL_WRAPPER(num_get_short_ctor_refs, 8)
 num_get* __thiscall num_get_short_ctor_refs(num_get *this, size_t refs)
 {
     num_get_wchar_ctor_refs(this, refs);
-    this->facet.vtable = &MSVCP_num_get_short_vtable;
+    this->facet.vtable = &num_get_short_vtable;
     return this;
 }
 
@@ -5100,7 +5100,7 @@ size_t __cdecl num_get_short__Getcat(const locale_facet **facet, const locale *l
 {
     if(facet && !*facet) {
         num_get_wchar__Getcat(facet, loc);
-        (*(locale_facet**)facet)->vtable = &MSVCP_num_get_short_vtable;
+        (*(locale_facet**)facet)->vtable = &num_get_short_vtable;
     }
 
     return LC_NUMERIC;
@@ -6203,7 +6203,7 @@ istreambuf_iterator_wchar *__thiscall num_get_wchar_get_bool(const num_get *this
 locale_id num_get_char_id = {0};
 
 /* ??_7?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_num_get_char_vtable;
+extern const vtable_ptr num_get_char_vtable;
 
 /* ?_Init@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IAEXABV_Locinfo@2@@Z */
 /* ?_Init@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IEAAXAEBV_Locinfo@2@@Z */
@@ -6225,7 +6225,7 @@ num_get* __thiscall num_get_char_ctor_locinfo(num_get *this,
     TRACE("(%p %p %Iu)\n", this, locinfo, refs);
 
     locale_facet_ctor_refs(&this->facet, refs);
-    this->facet.vtable = &MSVCP_num_get_char_vtable;
+    this->facet.vtable = &num_get_char_vtable;
 
     num_get_char__Init(this, locinfo);
     return this;
@@ -7155,7 +7155,7 @@ istreambuf_iterator_char *__thiscall num_get_char_get_bool(const num_get *this,
 locale_id num_put_char_id = {0};
 
 /* num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_num_put_char_vtable;
+extern const vtable_ptr num_put_char_vtable;
 
 /* ?_Init@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IAEXABV_Locinfo@2@@Z */
 /* ?_Init@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IEAAXAEBV_Locinfo@2@@Z */
@@ -7176,7 +7176,7 @@ num_put* __thiscall num_put_char_ctor_locinfo(num_put *this, const _Locinfo *loc
     TRACE("(%p %p %Iu)\n", this, locinfo, refs);
 
     locale_facet_ctor_refs(&this->facet, refs);
-    this->facet.vtable = &MSVCP_num_put_char_vtable;
+    this->facet.vtable = &num_put_char_vtable;
 
     num_put_char__Init(this, locinfo);
     return this;
@@ -7900,9 +7900,9 @@ locale_id num_put_wchar_id = {0};
 locale_id num_put_short_id = {0};
 
 /* num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_num_put_wchar_vtable;
+extern const vtable_ptr num_put_wchar_vtable;
 /* num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_num_put_short_vtable;
+extern const vtable_ptr num_put_short_vtable;
 
 /* ?_Init@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@IAEXABV_Locinfo@2@@Z */
 /* ?_Init@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@IEAAXAEBV_Locinfo@2@@Z */
@@ -7923,7 +7923,7 @@ num_put* __thiscall num_put_wchar_ctor_locinfo(num_put *this, const _Locinfo *lo
     TRACE("(%p %p %Iu)\n", this, locinfo, refs);
 
     locale_facet_ctor_refs(&this->facet, refs);
-    this->facet.vtable = &MSVCP_num_put_wchar_vtable;
+    this->facet.vtable = &num_put_wchar_vtable;
 
     num_put_wchar__Init(this, locinfo);
     return this;
@@ -7935,7 +7935,7 @@ DEFINE_THISCALL_WRAPPER(num_put_short_ctor_locinfo, 12)
 num_put* __thiscall num_put_short_ctor_locinfo(num_put *this, const _Locinfo *locinfo, size_t refs)
 {
     num_put_wchar_ctor_locinfo(this, locinfo, refs);
-    this->facet.vtable = &MSVCP_num_put_short_vtable;
+    this->facet.vtable = &num_put_short_vtable;
     return this;
 }
 
@@ -7960,7 +7960,7 @@ DEFINE_THISCALL_WRAPPER(num_put_short_ctor_refs, 8)
 num_put* __thiscall num_put_short_ctor_refs(num_put *this, size_t refs)
 {
     num_put_wchar_ctor_refs(this, refs);
-    this->facet.vtable = &MSVCP_num_put_short_vtable;
+    this->facet.vtable = &num_put_short_vtable;
     return this;
 }
 
@@ -8988,7 +8988,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_bool(const num_put *this
 locale_id time_put_char_id = {0};
 
 /* ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_time_put_char_vtable;
+extern const vtable_ptr time_put_char_vtable;
 
 /* ?_Init@?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IAEXABV_Locinfo@2@@Z */
 /* ?_Init@?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IEAAXAEBV_Locinfo@2@@Z */
@@ -9009,7 +9009,7 @@ time_put* __thiscall time_put_char_ctor_locinfo(time_put *this, const _Locinfo *
 {
     TRACE("(%p %p %Iu)\n", this, locinfo, refs);
     locale_facet_ctor_refs(&this->facet, refs);
-    this->facet.vtable = &MSVCP_time_put_char_vtable;
+    this->facet.vtable = &time_put_char_vtable;
     time_put_char__Init(this, locinfo);
     return this;
 }
@@ -9299,9 +9299,9 @@ locale_id time_put_wchar_id = {0};
 locale_id time_put_short_id = {0};
 
 /* ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_time_put_wchar_vtable;
+extern const vtable_ptr time_put_wchar_vtable;
 /* ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_time_put_short_vtable;
+extern const vtable_ptr time_put_short_vtable;
 
 /* ?_Init@?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@IAEXABV_Locinfo@2@@Z */
 /* ?_Init@?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@IEAAXAEBV_Locinfo@2@@Z */
@@ -9324,7 +9324,7 @@ time_put* __thiscall time_put_wchar_ctor_locinfo(time_put *this, const _Locinfo
 {
     TRACE("(%p %p %Iu)\n", this, locinfo, refs);
     locale_facet_ctor_refs(&this->facet, refs);
-    this->facet.vtable = &MSVCP_time_put_wchar_vtable;
+    this->facet.vtable = &time_put_wchar_vtable;
     time_put_wchar__Init(this, locinfo);
     return this;
 }
@@ -9335,7 +9335,7 @@ DEFINE_THISCALL_WRAPPER(time_put_short_ctor_locinfo, 12)
 time_put* __thiscall time_put_short_ctor_locinfo(time_put *this, const _Locinfo *locinfo, size_t refs)
 {
     time_put_wchar_ctor_locinfo(this, locinfo, refs);
-    this->facet.vtable = &MSVCP_time_put_short_vtable;
+    this->facet.vtable = &time_put_short_vtable;
     return this;
 }
 
@@ -9360,7 +9360,7 @@ DEFINE_THISCALL_WRAPPER(time_put_short_ctor_name, 12)
 time_put* __thiscall time_put_short_ctor_name(time_put *this, const char *name, size_t refs)
 {
     time_put_wchar_ctor_name(this, name, refs);
-    this->facet.vtable = &MSVCP_time_put_short_vtable;
+    this->facet.vtable = &time_put_short_vtable;
     return this;
 }
 
@@ -9385,7 +9385,7 @@ DEFINE_THISCALL_WRAPPER(time_put_short_ctor_refs, 8)
 time_put* __thiscall time_put_short_ctor_refs(time_put *this, size_t refs)
 {
     time_put_wchar_ctor_refs(this, refs);
-    this->facet.vtable = &MSVCP_time_put_short_vtable;
+    this->facet.vtable = &time_put_short_vtable;
     return this;
 }
 
@@ -9403,7 +9403,7 @@ DEFINE_THISCALL_WRAPPER(time_put_short_ctor, 4)
 time_put* __thiscall time_put_short_ctor(time_put *this)
 {
     time_put_wchar_ctor(this);
-    this->facet.vtable = &MSVCP_time_put_short_vtable;
+    this->facet.vtable = &time_put_short_vtable;
     return this;
 }
 
@@ -9763,7 +9763,7 @@ ostreambuf_iterator_wchar* __thiscall time_put_wchar_put_format(const time_put *
 locale_id time_get_char_id = {0};
 
 /* ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_time_get_char_vtable;
+extern const vtable_ptr time_get_char_vtable;
 
 /* ?_Init@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IAEXABV_Locinfo@2@@Z */
 /* ?_Init@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IEAAXAEBV_Locinfo@2@@Z */
@@ -9810,7 +9810,7 @@ time_get_char* __thiscall time_get_char_ctor_locinfo(time_get_char *this,
 {
     TRACE("(%p %p %Iu)\n", this, locinfo, refs);
     locale_facet_ctor_refs(&this->facet, refs);
-    this->facet.vtable = &MSVCP_time_get_char_vtable;
+    this->facet.vtable = &time_get_char_vtable;
     time_get_char__Init(this, locinfo);
     return this;
 }
@@ -10638,7 +10638,7 @@ istreambuf_iterator_char* __thiscall time_get_char_get_fmt(const time_get_char *
 locale_id time_get_wchar_id = {0};
 
 /* ??_7?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ */
-extern const vtable_ptr MSVCP_time_get_wchar_vtable;
+extern const vtable_ptr time_get_wchar_vtable;
 
 #if _MSVCP_VER >=110
 static wchar_t* create_time_get_str(const wchar_t *str)
@@ -10711,7 +10711,7 @@ time_get_wchar* __thiscall time_get_wchar_ctor_locinfo(time_get_wchar *this,
 {
     TRACE("(%p %p %Iu)\n", this, locinfo, refs);
     locale_facet_ctor_refs(&this->facet, refs);
-    this->facet.vtable = &MSVCP_time_get_wchar_vtable;
+    this->facet.vtable = &time_get_wchar_vtable;
     time_get_wchar__Init(this, locinfo);
     return this;
 }
@@ -11536,7 +11536,7 @@ istreambuf_iterator_wchar* __thiscall time_get_wchar_get_fmt(const time_get_wcha
 }
 
 /* ??_7_Locimp@locale@std@@6B@ */
-extern const vtable_ptr MSVCP_locale__Locimp_vtable;
+extern const vtable_ptr locale__Locimp_vtable;
 
 /* ??0_Locimp@locale@std@@AAE@_N@Z */
 /* ??0_Locimp@locale@std@@AEAA@_N@Z */
@@ -11547,7 +11547,7 @@ locale__Locimp* __thiscall locale__Locimp_ctor_transparent(locale__Locimp *this,
 
     memset(this, 0, sizeof(locale__Locimp));
     locale_facet_ctor_refs(&this->facet, 1);
-    this->facet.vtable = &MSVCP_locale__Locimp_vtable;
+    this->facet.vtable = &locale__Locimp_vtable;
     this->transparent = transparent;
     locale_string_char_ctor_cstr(&this->name, "*");
     return this;
@@ -11574,7 +11574,7 @@ locale__Locimp* __thiscall locale__Locimp_copy_ctor(locale__Locimp *this, const
     _Lockit_ctor_locktype(&lock, _LOCK_LOCALE);
     memcpy(this, copy, sizeof(locale__Locimp));
     locale_facet_ctor_refs(&this->facet, 1);
-    this->facet.vtable = &MSVCP_locale__Locimp_vtable;
+    this->facet.vtable = &locale__Locimp_vtable;
     if(copy->facetvec) {
         this->facetvec = MSVCRT_operator_new(copy->facet_cnt*sizeof(locale_facet*));
         if(!this->facetvec) {
diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c
index f70de9e5600..b9fc8500fbc 100644
--- a/dlls/msvcp90/misc.c
+++ b/dlls/msvcp90/misc.c
@@ -1058,11 +1058,11 @@ static custom_category iostream_category;
 DEFINE_RTTI_DATA0(error_category, 0, ".?AVerror_category@std@@")
 DEFINE_RTTI_DATA1(iostream_category, 0, &error_category_rtti_base_descriptor, ".?AV_Iostream_error_category@std@@")
 
-extern const vtable_ptr MSVCP_iostream_category_vtable;
+extern const vtable_ptr iostream_category_vtable;
 
 static void iostream_category_ctor(custom_category *this)
 {
-    this->base.vtable = &MSVCP_iostream_category_vtable;
+    this->base.vtable = &iostream_category_vtable;
     this->type = "iostream";
 }
 
@@ -1140,11 +1140,11 @@ const error_category* __cdecl std_iostream_category(void)
 static custom_category system_category;
 DEFINE_RTTI_DATA1(system_category, 0, &error_category_rtti_base_descriptor, ".?AV_System_error_category@std@@")
 
-extern const vtable_ptr MSVCP_system_category_vtable;
+extern const vtable_ptr system_category_vtable;
 
 static void system_category_ctor(custom_category *this)
 {
-    this->base.vtable = &MSVCP_system_category_vtable;
+    this->base.vtable = &system_category_vtable;
     this->type = "system";
 }
 
@@ -1159,11 +1159,11 @@ const error_category* __cdecl std_system_category(void)
 static custom_category generic_category;
 DEFINE_RTTI_DATA1(generic_category, 0, &error_category_rtti_base_descriptor, ".?AV_Generic_error_category@std@@")
 
-extern const vtable_ptr MSVCP_generic_category_vtable;
+extern const vtable_ptr generic_category_vtable;
 
 static void generic_category_ctor(custom_category *this)
 {
-    this->base.vtable = &MSVCP_generic_category_vtable;
+    this->base.vtable = &generic_category_vtable;
     this->type = "generic";
 }
 
@@ -1354,7 +1354,7 @@ typedef struct
 DEFINE_RTTI_DATA0(_Pad, 0, ".?AV_Pad@std@@")
 
 /* ??_7_Pad@std@@6B@ */
-extern const vtable_ptr MSVCP__Pad_vtable;
+extern const vtable_ptr _Pad_vtable;
 
 unsigned int __cdecl _Thrd_hardware_concurrency(void)
 {
@@ -1385,7 +1385,7 @@ _Pad* __thiscall _Pad_ctor(_Pad *this)
 {
     TRACE("(%p)\n", this);
 
-    this->vtable = &MSVCP__Pad_vtable;
+    this->vtable = &_Pad_vtable;
     _Cnd_init(&this->cnd);
     _Mtx_init(&this->mtx, 0);
     this->launched = FALSE;
@@ -1413,7 +1413,7 @@ _Pad* __thiscall _Pad_copy_ctor(_Pad *this, const _Pad *copy)
 {
     TRACE("(%p %p)\n", this, copy);
 
-    this->vtable = &MSVCP__Pad_vtable;
+    this->vtable = &_Pad_vtable;
     return _Pad_op_assign(this, copy);
 }
 
@@ -1501,7 +1501,7 @@ typedef struct
     size_t item_size;
 } _Concurrent_queue_base_v4;
 
-extern const vtable_ptr MSVCP__Concurrent_queue_base_v4_vtable;
+extern const vtable_ptr _Concurrent_queue_base_v4_vtable;
 #if _MSVCP_VER == 100
 #define call__Concurrent_queue_base_v4__Move_item call__Concurrent_queue_base_v4__Copy_item
 #define call__Concurrent_queue_base_v4__Copy_item(this,dst,idx,src) CALL_VTBL_FUNC(this, \
@@ -1546,7 +1546,7 @@ _Concurrent_queue_base_v4* __thiscall _Concurrent_queue_base_v4_ctor(
     this->data = MSVCRT_operator_new(sizeof(*this->data));
     memset(this->data, 0, sizeof(*this->data));
 
-    this->vtable = &MSVCP__Concurrent_queue_base_v4_vtable;
+    this->vtable = &_Concurrent_queue_base_v4_vtable;
     this->item_size = size;
 
     /* alloc_count needs to be power of 2 */
@@ -1834,7 +1834,7 @@ typedef struct
     int id;
 } _Runtime_object;
 
-extern const vtable_ptr MSVCP__Runtime_object_vtable;
+extern const vtable_ptr _Runtime_object_vtable;
 
 /* ??0_Runtime_object@details@Concurrency@@QAE@H@Z */
 /* ??0_Runtime_object@details@Concurrency@@QEAA@H@Z */
@@ -1842,7 +1842,7 @@ DEFINE_THISCALL_WRAPPER(_Runtime_object_ctor_id, 8)
 _Runtime_object* __thiscall _Runtime_object_ctor_id(_Runtime_object *this, int id)
 {
     TRACE("(%p %d)\n", this, id);
-    this->vtable = &MSVCP__Runtime_object_vtable;
+    this->vtable = &_Runtime_object_vtable;
     this->id = id;
     return this;
 }
@@ -1853,7 +1853,7 @@ DEFINE_THISCALL_WRAPPER(_Runtime_object_ctor, 4)
 _Runtime_object* __thiscall _Runtime_object_ctor(_Runtime_object *this)
 {
     TRACE("(%p)\n", this);
-    this->vtable = &MSVCP__Runtime_object_vtable;
+    this->vtable = &_Runtime_object_vtable;
     this->id = InterlockedExchangeAdd(&_Runtime_object_id, 2);
     return this;
 }
diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec
index 1fbabe3114c..9274a24b706 100644
--- a/dlls/msvcp90/msvcp90.spec
+++ b/dlls/msvcp90/msvcp90.spec
@@ -2005,54 +2005,54 @@
 # extern ??_7?$_Mpunct@D@std@@6B@
 # extern ??_7?$_Mpunct@G@std@@6B@
 # extern ??_7?$_Mpunct@_W@std@@6B@
-@ extern ??_7?$basic_filebuf@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_filebuf_char_vtable
-@ extern ??_7?$basic_filebuf@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_filebuf_short_vtable
-@ extern ??_7?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_filebuf_wchar_vtable
-@ extern ??_7?$basic_fstream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_fstream_char_vtable
-@ extern ??_7?$basic_fstream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_fstream_short_vtable
-@ extern ??_7?$basic_fstream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_fstream_wchar_vtable
-@ extern ??_7?$basic_ifstream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ifstream_char_vtable
-@ extern ??_7?$basic_ifstream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ifstream_short_vtable
-@ extern ??_7?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ifstream_wchar_vtable
-@ extern ??_7?$basic_ios@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ios_char_vtable
-@ extern ??_7?$basic_ios@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ios_short_vtable
-@ extern ??_7?$basic_ios@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ios_wchar_vtable
-@ extern ??_7?$basic_iostream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_iostream_char_vtable
-@ extern ??_7?$basic_iostream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_iostream_short_vtable
-@ extern ??_7?$basic_iostream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_iostream_wchar_vtable
-@ extern ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_istream_char_vtable
-@ extern ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_istream_short_vtable
-@ extern ??_7?$basic_istream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_istream_wchar_vtable
-@ extern ??_7?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ MSVCP_basic_istringstream_char_vtable
-@ extern ??_7?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ MSVCP_basic_istringstream_short_vtable
-@ extern ??_7?$basic_istringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ MSVCP_basic_istringstream_wchar_vtable
-@ extern ??_7?$basic_ofstream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ofstream_char_vtable
-@ extern ??_7?$basic_ofstream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ofstream_short_vtable
-@ extern ??_7?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ofstream_wchar_vtable
-@ extern ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_ostream_char_vtable
-@ extern ??_7?$basic_ostream@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_ostream_short_vtable
-@ extern ??_7?$basic_ostream@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_ostream_wchar_vtable
-@ extern ??_7?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ MSVCP_basic_ostringstream_char_vtable
-@ extern ??_7?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ MSVCP_basic_ostringstream_short_vtable
-@ extern ??_7?$basic_ostringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ MSVCP_basic_ostringstream_wchar_vtable
-@ extern ??_7?$basic_streambuf@DU?$char_traits@D@std@@@std@@6B@ MSVCP_basic_streambuf_char_vtable
-@ extern ??_7?$basic_streambuf@GU?$char_traits@G@std@@@std@@6B@ MSVCP_basic_streambuf_short_vtable
-@ extern ??_7?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@6B@ MSVCP_basic_streambuf_wchar_vtable
-@ extern ??_7?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ MSVCP_basic_stringbuf_char_vtable
-@ extern ??_7?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ MSVCP_basic_stringbuf_short_vtable
-@ extern ??_7?$basic_stringbuf@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ MSVCP_basic_stringbuf_wchar_vtable
-@ extern ??_7?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ MSVCP_basic_stringstream_char_vtable
-@ extern ??_7?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ MSVCP_basic_stringstream_short_vtable
-@ extern ??_7?$basic_stringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ MSVCP_basic_stringstream_wchar_vtable
-@ extern ??_7?$codecvt@DDH@std@@6B@ MSVCP_codecvt_char_vtable
-@ extern ??_7?$codecvt@GDH@std@@6B@ MSVCP_codecvt_short_vtable
-@ extern ??_7?$codecvt@_WDH@std@@6B@ MSVCP_codecvt_wchar_vtable
-@ extern ??_7?$collate@D@std@@6B@ MSVCP_collate_char_vtable
-@ extern ??_7?$collate@G@std@@6B@ MSVCP_collate_short_vtable
-@ extern ??_7?$collate@_W@std@@6B@ MSVCP_collate_wchar_vtable
-@ extern ??_7?$ctype@D@std@@6B@ MSVCP_ctype_char_vtable
-@ extern ??_7?$ctype@G@std@@6B@ MSVCP_ctype_short_vtable
-@ extern ??_7?$ctype@_W@std@@6B@ MSVCP_ctype_wchar_vtable
+@ extern ??_7?$basic_filebuf@DU?$char_traits@D@std@@@std@@6B@ basic_filebuf_char_vtable
+@ extern ??_7?$basic_filebuf@GU?$char_traits@G@std@@@std@@6B@ basic_filebuf_short_vtable
+@ extern ??_7?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@6B@ basic_filebuf_wchar_vtable
+@ extern ??_7?$basic_fstream@DU?$char_traits@D@std@@@std@@6B@ basic_fstream_char_vtable
+@ extern ??_7?$basic_fstream@GU?$char_traits@G@std@@@std@@6B@ basic_fstream_short_vtable
+@ extern ??_7?$basic_fstream@_WU?$char_traits@_W@std@@@std@@6B@ basic_fstream_wchar_vtable
+@ extern ??_7?$basic_ifstream@DU?$char_traits@D@std@@@std@@6B@ basic_ifstream_char_vtable
+@ extern ??_7?$basic_ifstream@GU?$char_traits@G@std@@@std@@6B@ basic_ifstream_short_vtable
+@ extern ??_7?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@6B@ basic_ifstream_wchar_vtable
+@ extern ??_7?$basic_ios@DU?$char_traits@D@std@@@std@@6B@ basic_ios_char_vtable
+@ extern ??_7?$basic_ios@GU?$char_traits@G@std@@@std@@6B@ basic_ios_short_vtable
+@ extern ??_7?$basic_ios@_WU?$char_traits@_W@std@@@std@@6B@ basic_ios_wchar_vtable
+@ extern ??_7?$basic_iostream@DU?$char_traits@D@std@@@std@@6B@ basic_iostream_char_vtable
+@ extern ??_7?$basic_iostream@GU?$char_traits@G@std@@@std@@6B@ basic_iostream_short_vtable
+@ extern ??_7?$basic_iostream@_WU?$char_traits@_W@std@@@std@@6B@ basic_iostream_wchar_vtable
+@ extern ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@ basic_istream_char_vtable
+@ extern ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@ basic_istream_short_vtable
+@ extern ??_7?$basic_istream@_WU?$char_traits@_W@std@@@std@@6B@ basic_istream_wchar_vtable
+@ extern ??_7?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ basic_istringstream_char_vtable
+@ extern ??_7?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ basic_istringstream_short_vtable
+@ extern ??_7?$basic_istringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ basic_istringstream_wchar_vtable
+@ extern ??_7?$basic_ofstream@DU?$char_traits@D@std@@@std@@6B@ basic_ofstream_char_vtable
+@ extern ??_7?$basic_ofstream@GU?$char_traits@G@std@@@std@@6B@ basic_ofstream_short_vtable
+@ extern ??_7?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@6B@ basic_ofstream_wchar_vtable
+@ extern ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@ basic_ostream_char_vtable
+@ extern ??_7?$basic_ostream@GU?$char_traits@G@std@@@std@@6B@ basic_ostream_short_vtable
+@ extern ??_7?$basic_ostream@_WU?$char_traits@_W@std@@@std@@6B@ basic_ostream_wchar_vtable
+@ extern ??_7?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ basic_ostringstream_char_vtable
+@ extern ??_7?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ basic_ostringstream_short_vtable
+@ extern ??_7?$basic_ostringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ basic_ostringstream_wchar_vtable
+@ extern ??_7?$basic_streambuf@DU?$char_traits@D@std@@@std@@6B@ basic_streambuf_char_vtable
+@ extern ??_7?$basic_streambuf@GU?$char_traits@G@std@@@std@@6B@ basic_streambuf_short_vtable
+@ extern ??_7?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@6B@ basic_streambuf_wchar_vtable
+@ extern ??_7?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ basic_stringbuf_char_vtable
+@ extern ??_7?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ basic_stringbuf_short_vtable
+@ extern ??_7?$basic_stringbuf@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ basic_stringbuf_wchar_vtable
+@ extern ??_7?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@ basic_stringstream_char_vtable
+@ extern ??_7?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@ basic_stringstream_short_vtable
+@ extern ??_7?$basic_stringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@6B@ basic_stringstream_wchar_vtable
+@ extern ??_7?$codecvt@DDH@std@@6B@ codecvt_char_vtable
+@ extern ??_7?$codecvt@GDH@std@@6B@ codecvt_short_vtable
+@ extern ??_7?$codecvt@_WDH@std@@6B@ codecvt_wchar_vtable
+@ extern ??_7?$collate@D@std@@6B@ collate_char_vtable
+@ extern ??_7?$collate@G@std@@6B@ collate_short_vtable
+@ extern ??_7?$collate@_W@std@@6B@ collate_wchar_vtable
+@ extern ??_7?$ctype@D@std@@6B@ ctype_char_vtable
+@ extern ??_7?$ctype@G@std@@6B@ ctype_short_vtable
+@ extern ??_7?$ctype@_W@std@@6B@ ctype_wchar_vtable
 # extern ??_7?$messages@D@std@@6B@
 # extern ??_7?$messages@G@std@@6B@
 # extern ??_7?$messages@_W@std@@6B@
@@ -2068,28 +2068,28 @@
 # extern ??_7?$moneypunct@G$0A@@std@@6B@
 # extern ??_7?$moneypunct@_W$00@std@@6B@
 # extern ??_7?$moneypunct@_W$0A@@std@@6B@
-@ extern ??_7?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_num_get_char_vtable
-@ extern ??_7?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_num_get_short_vtable
-@ extern ??_7?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_num_get_wchar_vtable
-@ extern ??_7?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_num_put_char_vtable
-@ extern ??_7?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_num_put_short_vtable
-@ extern ??_7?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_num_put_wchar_vtable
-@ extern ??_7?$numpunct@D@std@@6B@ MSVCP_numpunct_char_vtable
-@ extern ??_7?$numpunct@G@std@@6B@ MSVCP_numpunct_short_vtable
-@ extern ??_7?$numpunct@_W@std@@6B@ MSVCP_numpunct_wchar_vtable
-@ extern ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_get_char_vtable
+@ extern ??_7?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ num_get_char_vtable
+@ extern ??_7?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ num_get_short_vtable
+@ extern ??_7?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ num_get_wchar_vtable
+@ extern ??_7?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ num_put_char_vtable
+@ extern ??_7?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ num_put_short_vtable
+@ extern ??_7?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ num_put_wchar_vtable
+@ extern ??_7?$numpunct@D@std@@6B@ numpunct_char_vtable
+@ extern ??_7?$numpunct@G@std@@6B@ numpunct_short_vtable
+@ extern ??_7?$numpunct@_W@std@@6B@ numpunct_wchar_vtable
+@ extern ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ time_get_char_vtable
 # extern ??_7?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
-@ extern ??_7?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_get_wchar_vtable
-@ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable
-@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable
-@ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable
-@ extern ??_7_Locimp@locale@std@@6B@ MSVCP_locale__Locimp_vtable
-@ extern ??_7codecvt_base@std@@6B@ MSVCP_codecvt_base_vtable
-@ extern ??_7ctype_base@std@@6B@ MSVCP_ctype_base_vtable
-@ extern ??_7ios_base@std@@6B@ MSVCP_ios_base_vtable
+@ extern ??_7?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ time_get_wchar_vtable
+@ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ time_put_char_vtable
+@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ time_put_short_vtable
+@ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ time_put_wchar_vtable
+@ extern ??_7_Locimp@locale@std@@6B@ locale__Locimp_vtable
+@ extern ??_7codecvt_base@std@@6B@ codecvt_base_vtable
+@ extern ??_7ctype_base@std@@6B@ ctype_base_vtable
+@ extern ??_7ios_base@std@@6B@ ios_base_vtable
 # extern ??_7messages_base@std@@6B@
 # extern ??_7money_base@std@@6B@
-@ extern ??_7strstreambuf@std@@6B@ MSVCP_strstreambuf_vtable
+@ extern ??_7strstreambuf@std@@6B@ strstreambuf_vtable
 # extern ??_7time_base@std@@6B@
 @ extern ??_8?$basic_fstream@DU?$char_traits@D@std@@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@ basic_fstream_char_vbtable1
 @ extern ??_8?$basic_fstream@DU?$char_traits@D@std@@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@ basic_fstream_char_vbtable2