diff --git a/dlls/commdlg/cdlg_Ja.rc b/dlls/commdlg/cdlg_Ja.rc
index 507fc536ddb..59f211afcd6 100644
--- a/dlls/commdlg/cdlg_Ja.rc
+++ b/dlls/commdlg/cdlg_Ja.rc
@@ -25,7 +25,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "ファイルを開く"
-FONT 8, "ＭＳ Ｐゴシック"
+FONT 8, "ＭＳ UI ゴシック"
 {
  LTEXT "ファイル名(&N):", 1090, 6, 6, 76, 9
  EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
@@ -47,7 +47,7 @@ FONT 8, "
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "名前をつけて保存"
-FONT 8, "ＭＳ Ｐゴシック"
+FONT 8, "ＭＳ UI ゴシック"
 {
  LTEXT "ファイル名(&N):", 1090, 6, 6, 76, 9
  EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
@@ -69,7 +69,7 @@ FONT 8, "
 PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "印刷"
-FONT 8, "ＭＳ Ｐゴシック"
+FONT 8, "ＭＳ UI ゴシック"
 {
  LTEXT "使用するﾌﾟﾘﾝﾀ:", 1088, 6, 6, 40, 9
  LTEXT "通常使うﾌﾟﾘﾝﾀ", 1089, 60, 6, 150, 9
@@ -92,7 +92,7 @@ FONT 8, "
 PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "プリンタの設定"
-FONT 8, "ＭＳ Ｐゴシック"
+FONT 8, "ＭＳ UI ゴシック"
 {
  GROUPBOX "プリンタの選択", 1072, 6, 10, 180, 65, BS_GROUPBOX
  RADIOBUTTON "通常使うプリンタ(&D)", 1056, 16, 20, 80, 12
@@ -118,7 +118,7 @@ FONT 8, "
 CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "フォントの指定"
-FONT 8, "ＭＳ Ｐゴシック"
+FONT 8, "ＭＳ UI ゴシック"
 {
     LTEXT           "ﾌｫﾝﾄ名(&F):",1088 ,6,3,40,9
     COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
@@ -150,7 +150,7 @@ FONT 8, "
 CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "色の設定"
-FONT 8, "ＭＳ Ｐゴシック"
+FONT 8, "ＭＳ UI ゴシック"
 {
  LTEXT "基本色(&B):",   1088, 4,    4,  140, 10
  LTEXT "作成した色(&C):",  1089, 4,   106, 140, 10
@@ -184,7 +184,7 @@ FONT 8, "
 FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "文字列の検索"
-FONT 8, "ＭＳ Ｐゴシック"
+FONT 8, "ＭＳ UI ゴシック"
 {
  LTEXT "検索する文字列(&N):", -1, 4, 8, 42, 8
  EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
@@ -203,7 +203,7 @@ FONT 8, "
 REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "文字列の置換"
-FONT 8, "ＭＳ Ｐゴシック"
+FONT 8, "ＭＳ UI ゴシック"
 {
  LTEXT "置換前の文字列(&N):", -1, 4, 9, 48, 8
  EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
@@ -224,7 +224,7 @@ PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 186
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
       DS_CONTEXTHELP | DS_3DLOOK
 CAPTION "印刷"
-FONT 8, "ＭＳ Ｐゴシック"
+FONT 8, "ＭＳ UI ゴシック"
 {
     DEFPUSHBUTTON   "OK",     IDOK,     180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON
     PUSHBUTTON      "ｷｬﾝｾﾙ", IDCANCEL, 232,164, 48,14, WS_GROUP
@@ -264,7 +264,7 @@ PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 178
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
       DS_CONTEXTHELP | DS_3DLOOK
 CAPTION "印刷の設定"
-FONT 8, "ＭＳ Ｐゴシック"
+FONT 8, "ＭＳ UI ゴシック"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
     PUSHBUTTON      "Cancel",IDCANCEL,232,156,48,14
@@ -298,7 +298,7 @@ END
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
 CAPTION "ﾌｧｲﾙを開く"
-FONT 8, "ＭＳ Ｐゴシック"
+FONT 8, "ＭＳ UI ゴシック"
 {
     LTEXT	"ﾌｧｲﾙの場所(&I):",IDC_LOOKINSTATIC,5,6,52,8, SS_NOTIFY
     COMBOBOX	IDC_LOOKIN,56,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
diff --git a/dlls/user/resources/user32_Ja.rc b/dlls/user/resources/user32_Ja.rc
index 63583d088b0..c9a9de47502 100644
--- a/dlls/user/resources/user32_Ja.rc
+++ b/dlls/user/resources/user32_Ja.rc
@@ -51,7 +51,7 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 
 MSGBOX DIALOG 100, 80, 216, 168
 STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-FONT 8, "ＭＳ Ｐゴシック"
+FONT 8, "ＭＳ UI ゴシック"
 BEGIN
         ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE
         LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP
diff --git a/objects/gdiobj.c b/objects/gdiobj.c
index 70b6929e475..7d3add35956 100644
--- a/objects/gdiobj.c
+++ b/objects/gdiobj.c
@@ -354,7 +354,7 @@ static const struct DefaultFontInfo default_fonts[] =
         { /* DefaultGuiFont */
          -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, SHIFTJIS_CHARSET,
            0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS,
-           {'M','S',' ','P','G','o','t','h','i','c','\0'}
+           {'M','S',' ','U','I',' ','G','o','t','h','i','c','\0'}
         },
     },
     {   GB2312_CHARSET,