diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index c4ffcdf43..c2885ebb3 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -27,5 +27,5 @@ jobs:
 
       - uses: actions/upload-artifact@v2
         with:
-          name: reicast-dreamcast-debug.apk
-          path: shell/android-studio/reicast/build/outputs/apk/dreamcast/debug/reicast-dreamcast-debug.apk
+          name: flycast-debug.apk
+          path: shell/android-studio/flycast/build/outputs/apk/dreamcast/debug/flycast-dreamcast-debug.apk
diff --git a/.travis.yml b/.travis.yml
index 3fa911ba7..ce2ea42c2 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ before_deploy:
   - GIT_HASH=`git log --pretty=format:'%h' -n 1`
   - GIT_BUILD=`git describe --all --always`-$GIT_HASH
   - mkdir -p artifacts/$GIT_BUILD/
-  - cp shell/android-studio/reicast/build/outputs/apk/dreamcast/debug/reicast-dreamcast-debug.apk artifacts/$GIT_BUILD/flycast-debug-$GIT_HASH.apk
+  - cp shell/android-studio/flycast/build/outputs/apk/dreamcast/debug/flycast-dreamcast-debug.apk artifacts/$GIT_BUILD/flycast-debug-$GIT_HASH.apk
 
 deploy:
   provider: s3
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80cbe83a3..8c3554d12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -934,8 +934,8 @@ if(ANDROID)
     target_compile_definitions(${PROJECT_NAME} PRIVATE GLES GLES3)
 
     target_sources(${PROJECT_NAME} PRIVATE
-            shell/android-studio/reicast/src/main/jni/src/Android.cpp
-            shell/android-studio/reicast/src/main/jni/src/utils.cpp)
+            shell/android-studio/flycast/src/main/jni/src/Android.cpp
+            shell/android-studio/flycast/src/main/jni/src/utils.cpp)
 
     target_link_libraries(${PROJECT_NAME} PRIVATE android EGL GLESv2 log)
 elseif(APPLE)
@@ -962,7 +962,7 @@ elseif(APPLE)
         MACOSX_BUNDLE_BUNDLE_NAME "Flycast"
         MACOSX_BUNDLE_SHORT_VERSION_STRING "1.0"
         MACOSX_BUNDLE_BUNDLE_VERSION "1"
-        MACOSX_BUNDLE_COPYRIGHT "Copyright © 2019 reicast contributors. All rights reserved."
+        MACOSX_BUNDLE_COPYRIGHT "Copyright © 2019 Flycast contributors. All rights reserved."
         XCODE_ATTRIBUTE_SWIFT_OBJC_BRIDGING_HEADER "shell/apple/emulator-osx/emulator-osx/emulator-osx-Bridging-Header.h"
 		RESOURCE "${XIB}"
 		XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon"
diff --git a/appveyor.yml b/appveyor.yml
index 748ef2be5..2a1e483d8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -27,7 +27,7 @@ build_script:
 
 after_build:
   - cmd: >-      
-      if "%CONFIGURATION%"=="fast" (cd ..\.. && set EXE_PATH=shell\linux\nosym-reicast.exe)
+      if "%CONFIGURATION%"=="fast" (cd ..\.. && set EXE_PATH=shell\linux\nosym-flycast.exe)
       
       mkdir artifacts
       
diff --git a/shell/android-studio/reicast/build.gradle b/shell/android-studio/flycast/build.gradle
similarity index 100%
rename from shell/android-studio/reicast/build.gradle
rename to shell/android-studio/flycast/build.gradle
diff --git a/shell/android-studio/reicast/libs/image-uniload.jar b/shell/android-studio/flycast/libs/image-uniload.jar
similarity index 100%
rename from shell/android-studio/reicast/libs/image-uniload.jar
rename to shell/android-studio/flycast/libs/image-uniload.jar
diff --git a/shell/android-studio/reicast/libs/ouya-sdk.jar b/shell/android-studio/flycast/libs/ouya-sdk.jar
similarity index 100%
rename from shell/android-studio/reicast/libs/ouya-sdk.jar
rename to shell/android-studio/flycast/libs/ouya-sdk.jar
diff --git a/shell/android-studio/reicast/proguard-rules.txt b/shell/android-studio/flycast/proguard-rules.txt
similarity index 100%
rename from shell/android-studio/reicast/proguard-rules.txt
rename to shell/android-studio/flycast/proguard-rules.txt
diff --git a/shell/android-studio/reicast/src/debug/res/drawable-ldpi/ic_launcher.png b/shell/android-studio/flycast/src/debug/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from shell/android-studio/reicast/src/debug/res/drawable-ldpi/ic_launcher.png
rename to shell/android-studio/flycast/src/debug/res/drawable-ldpi/ic_launcher.png
diff --git a/shell/android-studio/reicast/src/debug/res/drawable-mdpi/ic_launcher.png b/shell/android-studio/flycast/src/debug/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from shell/android-studio/reicast/src/debug/res/drawable-mdpi/ic_launcher.png
rename to shell/android-studio/flycast/src/debug/res/drawable-mdpi/ic_launcher.png
diff --git a/shell/android-studio/reicast/src/debug/res/drawable-xhdpi/ic_launcher.png b/shell/android-studio/flycast/src/debug/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from shell/android-studio/reicast/src/debug/res/drawable-xhdpi/ic_launcher.png
rename to shell/android-studio/flycast/src/debug/res/drawable-xhdpi/ic_launcher.png
diff --git a/shell/android-studio/reicast/src/debug/res/drawable-xxhdpi/ic_launcher.png b/shell/android-studio/flycast/src/debug/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from shell/android-studio/reicast/src/debug/res/drawable-xxhdpi/ic_launcher.png
rename to shell/android-studio/flycast/src/debug/res/drawable-xxhdpi/ic_launcher.png
diff --git a/shell/android-studio/reicast/src/dreamcast/AndroidManifest.xml b/shell/android-studio/flycast/src/dreamcast/AndroidManifest.xml
similarity index 100%
rename from shell/android-studio/reicast/src/dreamcast/AndroidManifest.xml
rename to shell/android-studio/flycast/src/dreamcast/AndroidManifest.xml
diff --git a/shell/android-studio/reicast/src/main/AndroidManifest.xml b/shell/android-studio/flycast/src/main/AndroidManifest.xml
similarity index 100%
rename from shell/android-studio/reicast/src/main/AndroidManifest.xml
rename to shell/android-studio/flycast/src/main/AndroidManifest.xml
diff --git a/shell/android-studio/reicast/src/main/assets/buttons.png b/shell/android-studio/flycast/src/main/assets/buttons.png
similarity index 100%
rename from shell/android-studio/reicast/src/main/assets/buttons.png
rename to shell/android-studio/flycast/src/main/assets/buttons.png
diff --git a/shell/android-studio/reicast/src/main/java/com/android/util/FileUtils.java b/shell/android-studio/flycast/src/main/java/com/android/util/FileUtils.java
similarity index 100%
rename from shell/android-studio/reicast/src/main/java/com/android/util/FileUtils.java
rename to shell/android-studio/flycast/src/main/java/com/android/util/FileUtils.java
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/BaseGLActivity.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/BaseGLActivity.java
similarity index 100%
rename from shell/android-studio/reicast/src/main/java/com/reicast/emulator/BaseGLActivity.java
rename to shell/android-studio/flycast/src/main/java/com/reicast/emulator/BaseGLActivity.java
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/Emulator.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/Emulator.java
similarity index 100%
rename from shell/android-studio/reicast/src/main/java/com/reicast/emulator/Emulator.java
rename to shell/android-studio/flycast/src/main/java/com/reicast/emulator/Emulator.java
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/FileBrowser.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/FileBrowser.java
similarity index 100%
rename from shell/android-studio/reicast/src/main/java/com/reicast/emulator/FileBrowser.java
rename to shell/android-studio/flycast/src/main/java/com/reicast/emulator/FileBrowser.java
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/GL2JNIActivity.java
similarity index 100%
rename from shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java
rename to shell/android-studio/flycast/src/main/java/com/reicast/emulator/GL2JNIActivity.java
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/NativeGLActivity.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/NativeGLActivity.java
similarity index 100%
rename from shell/android-studio/reicast/src/main/java/com/reicast/emulator/NativeGLActivity.java
rename to shell/android-studio/flycast/src/main/java/com/reicast/emulator/NativeGLActivity.java
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/Compat.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/config/Compat.java
similarity index 100%
rename from shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/Compat.java
rename to shell/android-studio/flycast/src/main/java/com/reicast/emulator/config/Compat.java
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/Config.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/config/Config.java
similarity index 100%
rename from shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/Config.java
rename to shell/android-studio/flycast/src/main/java/com/reicast/emulator/config/Config.java
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/debug/GenerateLogs.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/debug/GenerateLogs.java
similarity index 100%
rename from shell/android-studio/reicast/src/main/java/com/reicast/emulator/debug/GenerateLogs.java
rename to shell/android-studio/flycast/src/main/java/com/reicast/emulator/debug/GenerateLogs.java
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/AudioBackend.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/emu/AudioBackend.java
similarity index 100%
rename from shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/AudioBackend.java
rename to shell/android-studio/flycast/src/main/java/com/reicast/emulator/emu/AudioBackend.java
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java
similarity index 100%
rename from shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java
rename to shell/android-studio/flycast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GLCFactory.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/emu/GLCFactory.java
similarity index 100%
rename from shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GLCFactory.java
rename to shell/android-studio/flycast/src/main/java/com/reicast/emulator/emu/GLCFactory.java
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GLCFactory14.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/emu/GLCFactory14.java
similarity index 100%
rename from shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GLCFactory14.java
rename to shell/android-studio/flycast/src/main/java/com/reicast/emulator/emu/GLCFactory14.java
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/JNIdc.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/emu/JNIdc.java
similarity index 100%
rename from shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/JNIdc.java
rename to shell/android-studio/flycast/src/main/java/com/reicast/emulator/emu/JNIdc.java
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/NativeGLView.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/emu/NativeGLView.java
similarity index 100%
rename from shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/NativeGLView.java
rename to shell/android-studio/flycast/src/main/java/com/reicast/emulator/emu/NativeGLView.java
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/VirtualJoystickDelegate.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/emu/VirtualJoystickDelegate.java
similarity index 100%
rename from shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/VirtualJoystickDelegate.java
rename to shell/android-studio/flycast/src/main/java/com/reicast/emulator/emu/VirtualJoystickDelegate.java
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/periph/InputDeviceManager.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/periph/InputDeviceManager.java
similarity index 100%
rename from shell/android-studio/reicast/src/main/java/com/reicast/emulator/periph/InputDeviceManager.java
rename to shell/android-studio/flycast/src/main/java/com/reicast/emulator/periph/InputDeviceManager.java
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/periph/SipEmulator.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/periph/SipEmulator.java
similarity index 100%
rename from shell/android-studio/reicast/src/main/java/com/reicast/emulator/periph/SipEmulator.java
rename to shell/android-studio/flycast/src/main/java/com/reicast/emulator/periph/SipEmulator.java
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/periph/VJoy.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/periph/VJoy.java
similarity index 100%
rename from shell/android-studio/reicast/src/main/java/com/reicast/emulator/periph/VJoy.java
rename to shell/android-studio/flycast/src/main/java/com/reicast/emulator/periph/VJoy.java
diff --git a/shell/android-studio/reicast/src/main/jni/src/Android.cpp b/shell/android-studio/flycast/src/main/jni/src/Android.cpp
similarity index 100%
rename from shell/android-studio/reicast/src/main/jni/src/Android.cpp
rename to shell/android-studio/flycast/src/main/jni/src/Android.cpp
diff --git a/shell/android-studio/reicast/src/main/jni/src/android_gamepad.h b/shell/android-studio/flycast/src/main/jni/src/android_gamepad.h
similarity index 100%
rename from shell/android-studio/reicast/src/main/jni/src/android_gamepad.h
rename to shell/android-studio/flycast/src/main/jni/src/android_gamepad.h
diff --git a/shell/android-studio/reicast/src/main/jni/src/utils.cpp b/shell/android-studio/flycast/src/main/jni/src/utils.cpp
similarity index 100%
rename from shell/android-studio/reicast/src/main/jni/src/utils.cpp
rename to shell/android-studio/flycast/src/main/jni/src/utils.cpp
diff --git a/shell/android-studio/reicast/src/main/jni/src/utils.h b/shell/android-studio/flycast/src/main/jni/src/utils.h
similarity index 100%
rename from shell/android-studio/reicast/src/main/jni/src/utils.h
rename to shell/android-studio/flycast/src/main/jni/src/utils.h
diff --git a/shell/android-studio/reicast/src/main/res/drawable-hdpi/ic_launcher.png b/shell/android-studio/flycast/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from shell/android-studio/reicast/src/main/res/drawable-hdpi/ic_launcher.png
rename to shell/android-studio/flycast/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/shell/android-studio/reicast/src/main/res/drawable-ldpi/ic_launcher.png b/shell/android-studio/flycast/src/main/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from shell/android-studio/reicast/src/main/res/drawable-ldpi/ic_launcher.png
rename to shell/android-studio/flycast/src/main/res/drawable-ldpi/ic_launcher.png
diff --git a/shell/android-studio/reicast/src/main/res/drawable-mdpi/ic_launcher.png b/shell/android-studio/flycast/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from shell/android-studio/reicast/src/main/res/drawable-mdpi/ic_launcher.png
rename to shell/android-studio/flycast/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/shell/android-studio/reicast/src/main/res/drawable-xhdpi/ic_banner.png b/shell/android-studio/flycast/src/main/res/drawable-xhdpi/ic_banner.png
similarity index 100%
rename from shell/android-studio/reicast/src/main/res/drawable-xhdpi/ic_banner.png
rename to shell/android-studio/flycast/src/main/res/drawable-xhdpi/ic_banner.png
diff --git a/shell/android-studio/reicast/src/main/res/drawable-xhdpi/ic_launcher.png b/shell/android-studio/flycast/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from shell/android-studio/reicast/src/main/res/drawable-xhdpi/ic_launcher.png
rename to shell/android-studio/flycast/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/shell/android-studio/reicast/src/main/res/drawable-xxhdpi/ic_launcher.png b/shell/android-studio/flycast/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from shell/android-studio/reicast/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to shell/android-studio/flycast/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/shell/android-studio/reicast/src/main/res/drawable/background_dark.xml b/shell/android-studio/flycast/src/main/res/drawable/background_dark.xml
similarity index 100%
rename from shell/android-studio/reicast/src/main/res/drawable/background_dark.xml
rename to shell/android-studio/flycast/src/main/res/drawable/background_dark.xml
diff --git a/shell/android-studio/reicast/src/main/res/mipmap/texture_dark.png b/shell/android-studio/flycast/src/main/res/mipmap/texture_dark.png
similarity index 100%
rename from shell/android-studio/reicast/src/main/res/mipmap/texture_dark.png
rename to shell/android-studio/flycast/src/main/res/mipmap/texture_dark.png
diff --git a/shell/android-studio/reicast/src/main/res/values/colors.xml b/shell/android-studio/flycast/src/main/res/values/colors.xml
similarity index 100%
rename from shell/android-studio/reicast/src/main/res/values/colors.xml
rename to shell/android-studio/flycast/src/main/res/values/colors.xml
diff --git a/shell/android-studio/reicast/src/main/res/values/donottranslate.xml b/shell/android-studio/flycast/src/main/res/values/donottranslate.xml
similarity index 100%
rename from shell/android-studio/reicast/src/main/res/values/donottranslate.xml
rename to shell/android-studio/flycast/src/main/res/values/donottranslate.xml
diff --git a/shell/android-studio/reicast/src/main/res/values/styles.xml b/shell/android-studio/flycast/src/main/res/values/styles.xml
similarity index 100%
rename from shell/android-studio/reicast/src/main/res/values/styles.xml
rename to shell/android-studio/flycast/src/main/res/values/styles.xml
diff --git a/shell/android-studio/reicast/src/main/res/xml/provider_paths.xml b/shell/android-studio/flycast/src/main/res/xml/provider_paths.xml
similarity index 100%
rename from shell/android-studio/reicast/src/main/res/xml/provider_paths.xml
rename to shell/android-studio/flycast/src/main/res/xml/provider_paths.xml
diff --git a/shell/android-studio/settings.gradle b/shell/android-studio/settings.gradle
index 7753ce099..033b93719 100644
--- a/shell/android-studio/settings.gradle
+++ b/shell/android-studio/settings.gradle
@@ -1 +1 @@
-include ':reicast'
+include ':flycast'
diff --git a/shell/linux/Makefile b/shell/linux/Makefile
index 3583320a1..59f5eef05 100644
--- a/shell/linux/Makefile
+++ b/shell/linux/Makefile
@@ -459,9 +459,9 @@ ifdef UNIT_TESTS
 	TEST_SRC_DIR:=$(RZDCY_SRC_DIR)/../tests/src
 	RZDCY_FILES += $(wildcard $(TEST_SRC_DIR)/*.cpp) $(RZDCY_SRC_DIR)/deps/gtest/src/gtest_main.cc $(RZDCY_SRC_DIR)/deps/gtest/src/gtest-all.cc
 else
-	EXECUTABLE_STRIPPED=nosym-reicast.$(PLATFORM_EXT)
+	EXECUTABLE_STRIPPED=nosym-flycast.$(PLATFORM_EXT)
 	DC_PLATFORM=dreamcast
-	EXECUTABLE=reicast.$(PLATFORM_EXT)
+	EXECUTABLE=flycast.$(PLATFORM_EXT)
 	EXECUTABLE_NAME=flycast
 endif
 
@@ -554,27 +554,27 @@ $(BUILDDIR)/%.build_obj : $(RZDCY_SRC_DIR)/%.S $(VERSION_HEADER)
 
 install: $(EXECUTABLE)
 	mkdir -p $(DESTDIR)$(PREFIX)/bin 2>/dev/null || true
-	mkdir -p $(DESTDIR)$(PREFIX)/share/reicast/mappings 2>/dev/null || true
+	mkdir -p $(DESTDIR)$(PREFIX)/share/flycast/mappings 2>/dev/null || true
 	mkdir -p $(DESTDIR)$(MAN_DIR) 2>/dev/null || true
 	mkdir -p $(DESTDIR)$(MENUENTRY_DIR) 2>/dev/null || true
 	mkdir -p $(DESTDIR)$(ICON_DIR) 2>/dev/null || true
 	install -m755 $(EXECUTABLE) $(DESTDIR)$(PREFIX)/bin/$(EXECUTABLE_NAME)
-	install -m644 mappings/controller_generic.cfg $(DESTDIR)$(PREFIX)/share/reicast/mappings
-	install -m644 mappings/controller_pandora.cfg $(DESTDIR)$(PREFIX)/share/reicast/mappings
-	install -m644 mappings/controller_xboxdrv.cfg $(DESTDIR)$(PREFIX)/share/reicast/mappings
-	install -m644 mappings/controller_xpad.cfg $(DESTDIR)$(PREFIX)/share/reicast/mappings
-	install -m644 mappings/keyboard.cfg $(DESTDIR)$(PREFIX)/share/reicast/mappings
+	install -m644 mappings/controller_generic.cfg $(DESTDIR)$(PREFIX)/share/flycast/mappings
+	install -m644 mappings/controller_pandora.cfg $(DESTDIR)$(PREFIX)/share/flycast/mappings
+	install -m644 mappings/controller_xboxdrv.cfg $(DESTDIR)$(PREFIX)/share/flycast/mappings
+	install -m644 mappings/controller_xpad.cfg $(DESTDIR)$(PREFIX)/share/flycast/mappings
+	install -m644 mappings/keyboard.cfg $(DESTDIR)$(PREFIX)/share/flycast/mappings
 	install -m644 man/flycast.1 $(DESTDIR)$(MAN_DIR)
 	install -m644 flycast.desktop $(DESTDIR)$(MENUENTRY_DIR)
 	install -m644 flycast.png $(DESTDIR)$(ICON_DIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/$(EXECUTABLE_NAME)
-	rm -f $(DESTDIR)$(PREFIX)/share/reicast/mappings/controller_generic.cfg
-	rm -f $(DESTDIR)$(PREFIX)/share/reicast/mappings/controller_pandora.cfg
-	rm -f $(DESTDIR)$(PREFIX)/share/reicast/mappings/controller_xboxdrv.cfg
-	rm -f $(DESTDIR)$(PREFIX)/share/reicast/mappings/controller_xpad.cfg
-	rm -f $(DESTDIR)$(PREFIX)/share/reicast/mappings/keyboard.cfg
+	rm -f $(DESTDIR)$(PREFIX)/share/flycast/mappings/controller_generic.cfg
+	rm -f $(DESTDIR)$(PREFIX)/share/flycast/mappings/controller_pandora.cfg
+	rm -f $(DESTDIR)$(PREFIX)/share/flycast/mappings/controller_xboxdrv.cfg
+	rm -f $(DESTDIR)$(PREFIX)/share/flycast/mappings/controller_xpad.cfg
+	rm -f $(DESTDIR)$(PREFIX)/share/flycast/mappings/keyboard.cfg
 	rm -f $(DESTDIR)$(MAN_DIR)/flycast.1
 	rm -f $(DESTDIR)$(MENUENTRY_DIR)/flycast.desktop
 	rm -f $(DESTDIR)$(ICON_DIR)/flycast.png
diff --git a/wercker.yml b/wercker.yml
index 2152bd056..92bcd258f 100644
--- a/wercker.yml
+++ b/wercker.yml
@@ -19,7 +19,7 @@ build:
             code: |
               mkdir s3
               pushd shell/linux
-              mv -f nosym-reicast.elf flycast
+              mv -f nosym-flycast.elf flycast
               gzip flycast
               popd
               mv shell/linux/flycast.gz s3