diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00c4f1fdc..71e638ed7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -950,7 +950,7 @@ elseif(WIN32)
     endif()
     target_sources(${PROJECT_NAME} PRIVATE
             core/windows/win_vmem.cpp
-            shell/windows/reicast.rc)
+            shell/windows/flycast.rc)
 
     target_link_libraries(${PROJECT_NAME} PRIVATE dsound opengl32 winmm ws2_32 wsock32 xinput9_1_0)
 endif()
diff --git a/core/core.mk b/core/core.mk
index 8c8684ca6..abf60375e 100755
--- a/core/core.mk
+++ b/core/core.mk
@@ -254,7 +254,7 @@ RZDCY_FILES += $(LIBZIP_DIR)/zip_add.c \
 endif
 
 $(VERSION_HEADER):
-	echo "#define REICAST_VERSION \"`git describe --tags --always`\"" > $(VERSION_HEADER)
+	echo "#define GIT_VERSION \"`git describe --tags --always`\"" > $(VERSION_HEADER)
 	echo "#define GIT_HASH \"`git rev-parse --short HEAD`\"" >> $(VERSION_HEADER)
 	echo "#define BUILD_DATE \"`date '+%Y-%m-%d %H:%M:%S %Z'`\"" >> $(VERSION_HEADER)
 
diff --git a/core/rend/gui.cpp b/core/rend/gui.cpp
index 042f338a2..a30fdaca3 100644
--- a/core/rend/gui.cpp
+++ b/core/rend/gui.cpp
@@ -1580,7 +1580,7 @@ static void gui_display_settings()
 			ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, normal_padding);
 		    if (ImGui::CollapsingHeader("Flycast", ImGuiTreeNodeFlags_DefaultOpen))
 		    {
-				ImGui::Text("Version: %s", REICAST_VERSION);
+				ImGui::Text("Version: %s", GIT_VERSION);
 				ImGui::Text("Git Hash: %s", GIT_HASH);
 				ImGui::Text("Build Date: %s", BUILD_DATE);
 		    }
diff --git a/core/version.h.in b/core/version.h.in
index 1a6e14a77..e37579f26 100644
--- a/core/version.h.in
+++ b/core/version.h.in
@@ -1,8 +1,5 @@
-/*
- *	reicast: version.h
- */
 #pragma once
 
-#define REICAST_VERSION "@GIT_VERSION@"
+#define GIT_VERSION		"@GIT_VERSION@"
 #define GIT_HASH		"@GIT_HASH@"
 #define BUILD_DATE		"@BUILD_TIMESTAMP@"
\ No newline at end of file
diff --git a/shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj b/shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj
index 186a0c9e4..36de35cc1 100644
--- a/shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj
+++ b/shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj
@@ -2594,7 +2594,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "echo \"#define REICAST_VERSION \\\"`git describe --tags --always`\\\"\" > $SRCROOT/../../../core/version.h\necho \"#define GIT_HASH \\\"`git rev-parse --short HEAD`\\\"\" >> $SRCROOT/../../../core/version.h\necho \"#define BUILD_DATE \\\"`date '+%Y-%m-%d %H:%M:%S %Z'`\\\"\" >> $SRCROOT/../../../core/version.h\ncd $SRCROOT/../../../core/deps/miniupnpc; sh ./updateminiupnpcstrings.sh\n";
+			shellScript = "echo \"#define GIT_VERSION \\\"`git describe --tags --always`\\\"\" > $SRCROOT/../../../core/version.h\necho \"#define GIT_HASH \\\"`git rev-parse --short HEAD`\\\"\" >> $SRCROOT/../../../core/version.h\necho \"#define BUILD_DATE \\\"`date '+%Y-%m-%d %H:%M:%S %Z'`\\\"\" >> $SRCROOT/../../../core/version.h\ncd $SRCROOT/../../../core/deps/miniupnpc; sh ./updateminiupnpcstrings.sh\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
diff --git a/shell/linux/Makefile b/shell/linux/Makefile
index 8e1995b33..9c1ee6ca1 100644
--- a/shell/linux/Makefile
+++ b/shell/linux/Makefile
@@ -482,8 +482,8 @@ OBJECTS:=$(OBJECTS:.S=.build_obj)
 OBJECTS:=$(patsubst $(RZDCY_SRC_DIR)/%,$(BUILDDIR)/%,$(OBJECTS))
 
 ifdef FOR_WINDOWS
-OBJECTS += $(BUILDDIR)/reicastres.build_obj
-$(BUILDDIR)/reicastres.build_obj: $(LOCAL_PATH)/../windows/reicast.rc $(LOCAL_PATH)/../windows/flycast.ico $(RZDCY_SRC_DIR)/version.h
+OBJECTS += $(BUILDDIR)/flycastres.build_obj
+$(BUILDDIR)/flycastres.build_obj: $(LOCAL_PATH)/../windows/flycast.rc $(LOCAL_PATH)/../windows/flycast.ico $(RZDCY_SRC_DIR)/version.h
 	$(WINDRES) $< $@
 
 endif
diff --git a/shell/windows/reicast.rc b/shell/windows/flycast.rc
similarity index 70%
rename from shell/windows/reicast.rc
rename to shell/windows/flycast.rc
index 4f9e08461..b745d482b 100644
--- a/shell/windows/reicast.rc
+++ b/shell/windows/flycast.rc
@@ -1,39 +1,39 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-#include "../../core/version.h"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON1               ICON                    "flycast.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-
-1 VERSIONINFO
-FILEVERSION     1,0,0,0
-PRODUCTVERSION  1,0,0,0
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    BEGIN
-      VALUE "CompanyName", "Flycast Team"
-      VALUE "FileDescription", "Flycast"
-      VALUE "FileVersion", REICAST_VERSION
-      VALUE "InternalName", "reicast"
-      VALUE "LegalCopyright", "Copyright (c) Reicast contributors. All rights reserved."
-      VALUE "OriginalFilename", "flycast.exe"
-      VALUE "ProductName", "Flycast"
-      VALUE "ProductVersion", REICAST_VERSION
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x409, 1252
-  END
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+#include "../../core/version.h"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON                    "flycast.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+
+1 VERSIONINFO
+FILEVERSION     1,0,0,0
+PRODUCTVERSION  1,0,0,0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    BEGIN
+      VALUE "CompanyName", "Flycast Team"
+      VALUE "FileDescription", "Flycast is a multiplatform Sega Dreamcast, Naomi and Atomiswave emulator"
+      VALUE "FileVersion", GIT_VERSION
+      VALUE "InternalName", "flycast"
+      VALUE "LegalCopyright", "Copyright various authors. Released under the GNU General Public License."
+      VALUE "OriginalFilename", "flycast.exe"
+      VALUE "ProductName", "Flycast"
+      VALUE "ProductVersion", GIT_VERSION
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x409, 1252
+  END
 END
\ No newline at end of file
diff --git a/shell/windows/resource.h b/shell/windows/resource.h
index ad4c5aebf..3f20691e9 100644
--- a/shell/windows/resource.h
+++ b/shell/windows/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by reicast.rc
+// Used by flycast.rc
 //
 #define IDI_ICON1                       105