diff --git a/gfx/common/vulkan_common.c b/gfx/common/vulkan_common.c
index 2b69f989fd..b63a69615d 100644
--- a/gfx/common/vulkan_common.c
+++ b/gfx/common/vulkan_common.c
@@ -2034,9 +2034,9 @@ bool vulkan_context_init(gfx_ctx_vulkan_data_t *vk,
 
    use_instance_ext = vulkan_find_instance_extensions(instance_extensions, ext_count);
 
-   app.pApplicationName              = "RetroArch";
+   app.pApplicationName              = msg_hash_to_str(MSG_PROGRAM);
    app.applicationVersion            = 0;
-   app.pEngineName                   = "RetroArch";
+   app.pEngineName                   = msg_hash_to_str(MSG_PROGRAM);
    app.engineVersion                 = 0;
    app.apiVersion                    = VK_MAKE_VERSION(1, 0, 18);
 
diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.c
index 3fffc9e97e..a0f6c408b7 100644
--- a/gfx/common/win32_common.c
+++ b/gfx/common/win32_common.c
@@ -1000,7 +1000,8 @@ bool win32_window_create(void *data, unsigned style,
       user_height= g_win32_pos_height;
    }
    main_window.hwnd = CreateWindowEx(0,
-         "RetroArch", "RetroArch",
+         msg_hash_to_str(MSG_PROGRAM),
+         msg_hash_to_str(MSG_PROGRAM),
          style,
          fullscreen ? mon_rect->left : g_win32_pos_x,
          fullscreen ? mon_rect->top  : g_win32_pos_y,
@@ -1441,7 +1442,7 @@ void win32_window_reset(void)
 void win32_destroy_window(void)
 {
 #ifndef _XBOX
-   UnregisterClass("RetroArch", GetModuleHandle(NULL));
+   UnregisterClass(msg_hash_to_str(MSG_PROGRAM), GetModuleHandle(NULL));
 #if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x500 /* 2K */
    UnregisterDeviceNotification(notification_handler);
 #endif