diff --git a/bauh/gems/arch/__init__.py b/bauh/gems/arch/__init__.py
index 82b58c24..05169a09 100644
--- a/bauh/gems/arch/__init__.py
+++ b/bauh/gems/arch/__init__.py
@@ -1,5 +1,6 @@
 import os
 
+from bauh import __app_name__
 from bauh.api.paths import CONFIG_DIR, TEMP_DIR, CACHE_DIR
 from bauh.commons import resource
 
@@ -7,14 +8,14 @@ ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
 BUILD_DIR = f'{TEMP_DIR}/arch'
 ARCH_CACHE_DIR = f'{CACHE_DIR}/arch'
 CATEGORIES_FILE_PATH = f'{ARCH_CACHE_DIR}/categories.txt'
-URL_CATEGORIES_FILE = 'https://raw.githubusercontent.com/vinifmor/bauh-files/master/arch/categories.txt'
-URL_GPG_SERVERS = 'https://raw.githubusercontent.com/vinifmor/bauh-files/master/arch/gpgservers.txt'
+URL_CATEGORIES_FILE = f'https://raw.githubusercontent.com/vinifmor/{__app_name__}-files/master/arch/categories.txt'
+URL_GPG_SERVERS = f'https://raw.githubusercontent.com/vinifmor/{__app_name__}-files/master/arch/gpgservers.txt'
 ARCH_CONFIG_DIR = f'{CONFIG_DIR}/arch'
 CUSTOM_MAKEPKG_FILE = f'{ARCH_CONFIG_DIR}/makepkg.conf'
 AUR_INDEX_FILE = f'{ARCH_CACHE_DIR}/aur/index.txt'
 AUR_INDEX_TS_FILE = f'{ARCH_CACHE_DIR}/aur/index.ts'
 CONFIG_FILE = f'{CONFIG_DIR}/arch.yml'
-SUGGESTIONS_FILE = 'https://raw.githubusercontent.com/vinifmor/bauh-files/master/arch/aur_suggestions.txt'
+SUGGESTIONS_FILE = f'https://raw.githubusercontent.com/vinifmor/{__app_name__}-files/master/arch/aur_suggestions.txt'
 UPDATES_IGNORED_FILE = f'{ARCH_CONFIG_DIR}/updates_ignored.txt'
 EDITABLE_PKGBUILDS_FILE = f'{ARCH_CONFIG_DIR}/aur/editable_pkgbuilds.txt'
 IGNORED_REBUILD_CHECK_FILE = f'{ARCH_CONFIG_DIR}/aur/ignored_rebuild_check.txt'