diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 26a1f1fdea7..e9efcceafc1 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -501,8 +501,8 @@
 @ cdecl -arch=win64 ?wait@event@Concurrency@@QEAA_KI@Z(ptr long) event_wait
 @ cdecl -arch=win32 ?wait_for_multiple@event@Concurrency@@SAIPAPAV12@I_NI@Z(ptr long long long) event_wait_for_multiple
 @ cdecl -arch=win64 ?wait_for_multiple@event@Concurrency@@SA_KPEAPEAV12@_K_NI@Z(ptr long long long) event_wait_for_multiple
-@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) what_exception
-@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) what_exception
+@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) exception_what
+@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) exception_what
 @ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
 @ cdecl -arch=i386 _CIacos()
 @ cdecl -arch=i386 _CIasin()
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index e77a855a263..1de587d6187 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -820,9 +820,9 @@
 @ cdecl -arch=win64 ?wait_for@_Condition_variable@details@Concurrency@@QEAA_NAEAVcritical_section@3@I@Z(ptr ptr long) _Condition_variable_wait_for
 @ cdecl -arch=win32 ?wait_for_multiple@event@Concurrency@@SAIPAPAV12@I_NI@Z(ptr long long long) event_wait_for_multiple
 @ cdecl -arch=win64 ?wait_for_multiple@event@Concurrency@@SA_KPEAPEAV12@_K_NI@Z(ptr long long long) event_wait_for_multiple
-@ cdecl -arch=arm ?what@exception@std@@UBAPBDXZ(ptr) what_exception
-@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) what_exception
-@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) what_exception
+@ cdecl -arch=arm ?what@exception@std@@UBAPBDXZ(ptr) exception_what
+@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) exception_what
+@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) exception_what
 @ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
 @ cdecl -arch=i386 _CIacos()
 @ cdecl -arch=i386 _CIasin()
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index c540c4019bc..7ef93beeeda 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -802,9 +802,9 @@
 @ cdecl -arch=win64 ?wait_for@_Condition_variable@details@Concurrency@@QEAA_NAEAVcritical_section@3@I@Z(ptr ptr long) _Condition_variable_wait_for
 @ cdecl -arch=win32 ?wait_for_multiple@event@Concurrency@@SAIPAPAV12@I_NI@Z(ptr long long long) event_wait_for_multiple
 @ cdecl -arch=win64 ?wait_for_multiple@event@Concurrency@@SA_KPEAPEAV12@_K_NI@Z(ptr long long long) event_wait_for_multiple
-@ cdecl -arch=arm ?what@exception@std@@UBAPBDXZ(ptr) what_exception
-@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) what_exception
-@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) what_exception
+@ cdecl -arch=arm ?what@exception@std@@UBAPBDXZ(ptr) exception_what
+@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) exception_what
+@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) exception_what
 @ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
 @ cdecl -arch=i386 _CIacos()
 @ cdecl -arch=i386 _CIasin()
diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec
index bdf94e26226..9c98892bf55 100644
--- a/dlls/msvcr70/msvcr70.spec
+++ b/dlls/msvcr70/msvcr70.spec
@@ -88,8 +88,8 @@
 @ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) set_unexpected
 @ cdecl ?terminate@@YAXXZ() terminate
 @ cdecl ?unexpected@@YAXXZ() unexpected
-@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) what_exception
-@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) what_exception
+@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) exception_what
+@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) exception_what
 @ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
 @ cdecl -arch=i386 _CIacos()
 @ cdecl -arch=i386 _CIasin()
diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec
index 98d35a337df..d4b53cf2fdc 100644
--- a/dlls/msvcr71/msvcr71.spec
+++ b/dlls/msvcr71/msvcr71.spec
@@ -82,8 +82,8 @@
 @ cdecl ?unexpected@@YAXXZ() unexpected
 @ cdecl ?vswprintf@@YAHPAGIPBGPAD@Z(ptr long wstr ptr) _vsnwprintf
 @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) _vsnwprintf
-@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) what_exception
-@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) what_exception
+@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) exception_what
+@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) exception_what
 @ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
 @ cdecl -arch=i386 _CIacos()
 @ cdecl -arch=i386 _CIasin()
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index ddca7ed9ff7..faf3e70af03 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -128,8 +128,8 @@
 @ cdecl ?terminate@@YAXXZ() terminate
 @ cdecl ?unexpected@@YAXXZ() unexpected
 @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) _vsnwprintf
-@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) what_exception
-@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) what_exception
+@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) exception_what
+@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) exception_what
 @ stub @_calloc_crt@8
 @ cdecl @_malloc_crt@4(long) malloc
 @ stub @_realloc_crt@8
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 5e35ded3570..cd515e9a7ea 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -128,8 +128,8 @@
 @ cdecl ?terminate@@YAXXZ() terminate
 @ cdecl ?unexpected@@YAXXZ() unexpected
 @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) _vsnwprintf
-@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) what_exception
-@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) what_exception
+@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) exception_what
+@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) exception_what
 @ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
 @ cdecl -arch=i386 _CIacos()
 @ cdecl -arch=i386 _CIasin()
diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c
index 638081f5b85..8d92f5763d3 100644
--- a/dlls/msvcrt/cpp.c
+++ b/dlls/msvcrt/cpp.c
@@ -259,8 +259,8 @@ void * __thiscall exception_scalar_dtor(exception * _this, unsigned int flags)
 /******************************************************************
  *		?what@exception@@UBEPBDXZ (MSVCRT.@)
  */
-DEFINE_THISCALL_WRAPPER(what_exception,4)
-const char * __thiscall what_exception(exception * _this)
+DEFINE_THISCALL_WRAPPER(exception_what,4)
+const char * __thiscall exception_what(exception * _this)
 {
   TRACE("(%p) returning %s\n", _this, _this->name);
   return _this->name ? _this->name : "Unknown exception";
@@ -918,46 +918,46 @@ __ASM_BLOCK_BEGIN(vtables)
 
 __ASM_VTABLE(exception,
         VTABLE_ADD_FUNC(exception_vector_dtor)
-        VTABLE_ADD_FUNC(what_exception));
+        VTABLE_ADD_FUNC(exception_what));
 #if _MSVCR_VER >= 80
 __ASM_VTABLE(exception_old,
         VTABLE_ADD_FUNC(exception_vector_dtor)
-        VTABLE_ADD_FUNC(what_exception));
+        VTABLE_ADD_FUNC(exception_what));
 __ASM_VTABLE(bad_alloc,
         VTABLE_ADD_FUNC(exception_vector_dtor)
-        VTABLE_ADD_FUNC(what_exception));
+        VTABLE_ADD_FUNC(exception_what));
 #endif
 __ASM_VTABLE(bad_typeid,
         VTABLE_ADD_FUNC(bad_typeid_vector_dtor)
-        VTABLE_ADD_FUNC(what_exception));
+        VTABLE_ADD_FUNC(exception_what));
 __ASM_VTABLE(bad_cast,
         VTABLE_ADD_FUNC(bad_cast_vector_dtor)
-        VTABLE_ADD_FUNC(what_exception));
+        VTABLE_ADD_FUNC(exception_what));
 __ASM_VTABLE(__non_rtti_object,
         VTABLE_ADD_FUNC(__non_rtti_object_vector_dtor)
-        VTABLE_ADD_FUNC(what_exception));
+        VTABLE_ADD_FUNC(exception_what));
 #if _MSVCR_VER >= 100
 __ASM_VTABLE(scheduler_resource_allocation_error,
         VTABLE_ADD_FUNC(exception_vector_dtor)
-        VTABLE_ADD_FUNC(what_exception));
+        VTABLE_ADD_FUNC(exception_what));
 __ASM_VTABLE(improper_lock,
         VTABLE_ADD_FUNC(exception_vector_dtor)
-        VTABLE_ADD_FUNC(what_exception));
+        VTABLE_ADD_FUNC(exception_what));
 __ASM_VTABLE(invalid_scheduler_policy_key,
         VTABLE_ADD_FUNC(exception_vector_dtor)
-        VTABLE_ADD_FUNC(what_exception));
+        VTABLE_ADD_FUNC(exception_what));
 __ASM_VTABLE(invalid_scheduler_policy_value,
         VTABLE_ADD_FUNC(exception_vector_dtor)
-        VTABLE_ADD_FUNC(what_exception));
+        VTABLE_ADD_FUNC(exception_what));
 __ASM_VTABLE(invalid_scheduler_policy_thread_specification,
         VTABLE_ADD_FUNC(exception_vector_dtor)
-        VTABLE_ADD_FUNC(what_exception));
+        VTABLE_ADD_FUNC(exception_what));
 __ASM_VTABLE(improper_scheduler_attach,
         VTABLE_ADD_FUNC(exception_vector_dtor)
-        VTABLE_ADD_FUNC(what_exception));
+        VTABLE_ADD_FUNC(exception_what));
 __ASM_VTABLE(improper_scheduler_detach,
         VTABLE_ADD_FUNC(exception_vector_dtor)
-        VTABLE_ADD_FUNC(what_exception));
+        VTABLE_ADD_FUNC(exception_what));
 #endif
 
 __ASM_BLOCK_END
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index f80c0af6700..4162bf295cb 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -120,9 +120,9 @@
 @ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) set_unexpected
 @ cdecl ?terminate@@YAXXZ() terminate
 @ cdecl ?unexpected@@YAXXZ() unexpected
-@ cdecl -arch=arm ?what@exception@std@@UBAPBDXZ(ptr) what_exception
-@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) what_exception
-@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) what_exception
+@ cdecl -arch=arm ?what@exception@std@@UBAPBDXZ(ptr) exception_what
+@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) exception_what
+@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) exception_what
 @ cdecl -arch=i386 _CIacos()
 @ cdecl -arch=i386 _CIasin()
 @ cdecl -arch=i386 _CIatan()
diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec
index 7162e5168a4..9436cb9ef4e 100644
--- a/dlls/msvcrtd/msvcrtd.spec
+++ b/dlls/msvcrtd/msvcrtd.spec
@@ -78,8 +78,8 @@
 @ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) set_unexpected
 @ cdecl ?terminate@@YAXXZ() terminate
 @ cdecl ?unexpected@@YAXXZ() unexpected
-@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) what_exception
-@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) what_exception
+@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) exception_what
+@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) exception_what
 @ cdecl -arch=i386 _CIacos()
 @ cdecl -arch=i386 _CIasin()
 @ cdecl -arch=i386 _CIatan()