diff --git a/api/config/settings/common.py b/api/config/settings/common.py
index 258958825..8642a7d8b 100644
--- a/api/config/settings/common.py
+++ b/api/config/settings/common.py
@@ -316,6 +316,7 @@ MIDDLEWARE = (
         "django.contrib.messages.middleware.MessageMiddleware",
         "funkwhale_api.users.middleware.RecordActivityMiddleware",
         "funkwhale_api.common.middleware.ThrottleStatusMiddleware",
+        "allauth.account.middleware.AccountMiddleware",
     )
     + tuple(plugins.trigger_filter(plugins.MIDDLEWARES_AFTER, [], enabled=True))
 )
diff --git a/api/dev-requirements.txt b/api/dev-requirements.txt
new file mode 100644
index 000000000..65659971c
--- /dev/null
+++ b/api/dev-requirements.txt
@@ -0,0 +1,183 @@
+aiohttp==3.8.6 ; python_version >= "3.8" and python_version < "3.12"
+aioresponses==0.7.6 ; python_version >= "3.8" and python_version < "3.12"
+aiosignal==1.3.1 ; python_version >= "3.8" and python_version < "3.12"
+amqp==5.3.1 ; python_version >= "3.8" and python_version < "3.12"
+anyio==4.5.2 ; python_version >= "3.8" and python_version < "3.12"
+appnope==0.1.4 ; python_version >= "3.8" and python_version < "3.12" and sys_platform == "darwin"
+arrow==1.2.3 ; python_version >= "3.8" and python_version < "3.12"
+asgiref==3.8.1 ; python_version >= "3.8" and python_version < "3.12"
+astroid==2.15.8 ; python_version >= "3.8" and python_version < "3.12"
+async-timeout==4.0.3 ; python_version >= "3.8" and python_version < "3.12"
+asynctest==0.13.0 ; python_version >= "3.8" and python_version < "3.12"
+attrs==25.3.0 ; python_version >= "3.8" and python_version < "3.12"
+autobahn==23.1.2 ; python_version >= "3.8" and python_version < "3.12"
+automat==24.8.1 ; python_version >= "3.8" and python_version < "3.12"
+backcall==0.2.0 ; python_version >= "3.8" and python_version < "3.12"
+backports-zoneinfo==0.2.1 ; python_version == "3.8"
+billiard==3.6.4.0 ; python_version >= "3.8" and python_version < "3.12"
+black==23.3.0 ; python_version >= "3.8" and python_version < "3.12"
+bleach==5.0.1 ; python_version >= "3.8" and python_version < "3.12"
+boto3==1.26.161 ; python_version >= "3.8" and python_version < "3.12"
+botocore==1.29.165 ; python_version >= "3.8" and python_version < "3.12"
+cachetools==5.5.2 ; python_version >= "3.8" and python_version < "3.12"
+celery==5.2.7 ; python_version >= "3.8" and python_version < "3.12"
+certifi==2025.1.31 ; python_version >= "3.8" and python_version < "3.12"
+cffi==1.17.1 ; python_version >= "3.8" and python_version < "3.12"
+channels-redis==4.1.0 ; python_version >= "3.8" and python_version < "3.12"
+channels==4.0.0 ; python_version >= "3.8" and python_version < "3.12"
+charset-normalizer==3.4.1 ; python_version >= "3.8" and python_version < "3.12"
+click-didyoumean==0.3.1 ; python_version >= "3.8" and python_version < "3.12"
+click-plugins==1.1.1 ; python_version >= "3.8" and python_version < "3.12"
+click-repl==0.3.0 ; python_version >= "3.8" and python_version < "3.12"
+click==8.1.7 ; python_version >= "3.8" and python_version < "3.12"
+colorama==0.4.6 ; python_version >= "3.8" and python_version < "3.12" and (platform_system == "Windows" or sys_platform == "win32")
+constantly==23.10.4 ; python_version >= "3.8" and python_version < "3.12"
+coverage==6.5.0 ; python_version >= "3.8" and python_version < "3.12"
+cryptography==38.0.4 ; python_version >= "3.8" and python_version < "3.12"
+daphne==4.1.2 ; python_version >= "3.8" and python_version < "3.12"
+debugpy==1.6.7.post1 ; python_version >= "3.8" and python_version < "3.12"
+decorator==5.2.1 ; python_version >= "3.8" and python_version < "3.12"
+defusedxml==0.7.1 ; python_version >= "3.8" and python_version < "3.12"
+dill==0.3.9 ; python_version >= "3.8" and python_version < "3.12"
+dj-rest-auth==7.0.0 ; python_version >= "3.8" and python_version < "3.12"
+django-allauth==0.60.0 ; python_version >= "3.8" and python_version < "3.12"
+django-auth-ldap==4.1.0 ; python_version >= "3.8" and python_version < "3.12"
+django-cache-memoize==0.1.10 ; python_version >= "3.8" and python_version < "3.12"
+django-cacheops==6.1 ; python_version >= "3.8" and python_version < "3.12"
+django-cleanup==6.0.0 ; python_version >= "3.8" and python_version < "3.12"
+django-cors-headers==3.13.0 ; python_version >= "3.8" and python_version < "3.12"
+django-coverage-plugin==3.0.0 ; python_version >= "3.8" and python_version < "3.12"
+django-debug-toolbar==3.8.1 ; python_version >= "3.8" and python_version < "3.12"
+django-dynamic-preferences==1.14.0 ; python_version >= "3.8" and python_version < "3.12"
+django-environ==0.10.0 ; python_version >= "3.8" and python_version < "3.12"
+django-extensions==3.2.3 ; python_version >= "3.8" and python_version < "3.12"
+django-filter==22.1 ; python_version >= "3.8" and python_version < "3.12"
+django-oauth-toolkit==2.2.0 ; python_version >= "3.8" and python_version < "3.12"
+django-redis==5.2.0 ; python_version >= "3.8" and python_version < "3.12"
+django-storages==1.13.2 ; python_version >= "3.8" and python_version < "3.12"
+django-versatileimagefield==2.2 ; python_version >= "3.8" and python_version < "3.12"
+django==3.2.24 ; python_version >= "3.8" and python_version < "3.12"
+djangorestframework==3.14.0 ; python_version >= "3.8" and python_version < "3.12"
+drf-spectacular==0.26.5 ; python_version >= "3.8" and python_version < "3.12"
+exceptiongroup==1.2.2 ; python_version >= "3.8" and python_version < "3.11"
+factory-boy==3.2.1 ; python_version >= "3.8" and python_version < "3.12"
+faker==15.3.4 ; python_version >= "3.8" and python_version < "3.12"
+feedparser==6.0.11 ; python_version >= "3.8" and python_version < "3.12"
+flake8==3.9.2 ; python_version >= "3.8" and python_version < "3.12"
+frozendict==2.4.6 ; python_version >= "3.8" and python_version < "3.12"
+frozenlist==1.5.0 ; python_version >= "3.8" and python_version < "3.12"
+funcy==1.18 ; python_version >= "3.8" and python_version < "3.12"
+gunicorn==20.1.0 ; python_version >= "3.8" and python_version < "3.12"
+h11==0.14.0 ; python_version >= "3.8" and python_version < "3.12"
+httptools==0.6.4 ; python_version >= "3.8" and python_version < "3.12"
+hyperlink==21.0.0 ; python_version >= "3.8" and python_version < "3.12"
+idna==3.10 ; python_version >= "3.8" and python_version < "3.12"
+importlib-metadata==8.5.0 ; python_version >= "3.8" and python_version < "3.10"
+importlib-resources==6.4.5 ; python_version == "3.8"
+incremental==22.10.0 ; python_version >= "3.8" and python_version < "3.12"
+inflection==0.5.1 ; python_version >= "3.8" and python_version < "3.12"
+iniconfig==2.1.0 ; python_version >= "3.8" and python_version < "3.12"
+ipdb==0.13.13 ; python_version >= "3.8" and python_version < "3.12"
+ipython==7.34.0 ; python_version >= "3.8" and python_version < "3.12"
+isort==5.13.2 ; python_version >= "3.8" and python_version < "3.12"
+jedi==0.19.2 ; python_version >= "3.8" and python_version < "3.12"
+jmespath==1.0.1 ; python_version >= "3.8" and python_version < "3.12"
+jsonschema-specifications==2023.12.1 ; python_version >= "3.8" and python_version < "3.12"
+jsonschema==4.23.0 ; python_version >= "3.8" and python_version < "3.12"
+jwcrypto==1.5.6 ; python_version >= "3.8" and python_version < "3.12"
+kombu==5.2.4 ; python_version >= "3.8" and python_version < "3.12"
+lazy-object-proxy==1.10.0 ; python_version >= "3.8" and python_version < "3.12"
+lxml==5.3.2 ; python_version >= "3.8" and python_version < "3.12"
+markdown==3.4.4 ; python_version >= "3.8" and python_version < "3.12"
+matplotlib-inline==0.1.7 ; python_version >= "3.8" and python_version < "3.12"
+mccabe==0.6.1 ; python_version >= "3.8" and python_version < "3.12"
+msgpack==1.1.0 ; python_version >= "3.8" and python_version < "3.12"
+multidict==6.1.0 ; python_version >= "3.8" and python_version < "3.12"
+musicbrainzngs==0.7.1 ; python_version >= "3.8" and python_version < "3.12"
+mutagen==1.46.0 ; python_version >= "3.8" and python_version < "3.12"
+mypy-extensions==1.0.0 ; python_version >= "3.8" and python_version < "3.12"
+oauthlib==3.2.2 ; python_version >= "3.8" and python_version < "3.12"
+packaging==24.2 ; python_version >= "3.8" and python_version < "3.12"
+parso==0.8.4 ; python_version >= "3.8" and python_version < "3.12"
+pathspec==0.12.1 ; python_version >= "3.8" and python_version < "3.12"
+persisting-theory==1.0 ; python_version >= "3.8" and python_version < "3.12"
+pexpect==4.9.0 ; python_version >= "3.8" and python_version < "3.12" and sys_platform != "win32"
+pickleshare==0.7.5 ; python_version >= "3.8" and python_version < "3.12"
+pillow==9.3.0 ; python_version >= "3.8" and python_version < "3.12"
+pkgutil-resolve-name==1.3.10 ; python_version == "3.8"
+platformdirs==4.3.6 ; python_version >= "3.8" and python_version < "3.12"
+pluggy==1.5.0 ; python_version >= "3.8" and python_version < "3.12"
+pluralizer==1.2.0 ; python_version >= "3.8" and python_version < "3.12"
+prompt-toolkit==3.0.43 ; python_version >= "3.8" and python_version < "3.12"
+propcache==0.2.0 ; python_version >= "3.8" and python_version < "3.12"
+psycopg2==2.9.9 ; python_version >= "3.8" and python_version < "3.12"
+ptyprocess==0.7.0 ; python_version >= "3.8" and python_version < "3.12" and sys_platform != "win32"
+pyasn1-modules==0.4.2 ; python_version >= "3.8" and python_version < "3.12"
+pyasn1==0.6.1 ; python_version >= "3.8" and python_version < "3.12"
+pycodestyle==2.7.0 ; python_version >= "3.8" and python_version < "3.12"
+pycountry==22.3.5 ; python_version >= "3.8" and python_version < "3.12"
+pycparser==2.22 ; python_version >= "3.8" and python_version < "3.12"
+pydub==0.25.1 ; python_version >= "3.8" and python_version < "3.12"
+pyflakes==2.3.1 ; python_version >= "3.8" and python_version < "3.12"
+pygments==2.19.1 ; python_version >= "3.8" and python_version < "3.12"
+pyjwt==2.10.1 ; python_version == "3.11"
+pyjwt==2.9.0 ; python_version >= "3.8" and python_version < "3.11"
+pyld==2.0.4 ; python_version >= "3.8" and python_version < "3.12"
+pylint-django==2.5.5 ; python_version >= "3.8" and python_version < "3.12"
+pylint-plugin-utils==0.8.2 ; python_version >= "3.8" and python_version < "3.12"
+pylint==2.17.7 ; python_version >= "3.8" and python_version < "3.12"
+pyopenssl==23.2.0 ; python_version >= "3.8" and python_version < "3.12"
+pytest-asyncio==0.21.0 ; python_version >= "3.8" and python_version < "3.12"
+pytest-cov==4.0.0 ; python_version >= "3.8" and python_version < "3.12"
+pytest-django==4.5.2 ; python_version >= "3.8" and python_version < "3.12"
+pytest-env==0.8.2 ; python_version >= "3.8" and python_version < "3.12"
+pytest-mock==3.10.0 ; python_version >= "3.8" and python_version < "3.12"
+pytest-randomly==3.12.0 ; python_version >= "3.8" and python_version < "3.12"
+pytest-sugar==0.9.7 ; python_version >= "3.8" and python_version < "3.12"
+pytest==7.4.4 ; python_version >= "3.8" and python_version < "3.12"
+python-dateutil==2.9.0.post0 ; python_version >= "3.8" and python_version < "3.12"
+python-dotenv==1.0.1 ; python_version >= "3.8" and python_version < "3.12"
+python-ldap==3.4.4 ; python_version >= "3.8" and python_version < "3.12"
+python-magic==0.4.27 ; python_version >= "3.8" and python_version < "3.12"
+python3-openid==3.2.0 ; python_version >= "3.8" and python_version < "3.12"
+pytz==2025.2 ; python_version >= "3.8" and python_version < "3.12"
+pyyaml==6.0.2 ; python_version >= "3.8" and python_version < "3.12"
+redis==4.5.5 ; python_version >= "3.8" and python_version < "3.12"
+referencing==0.35.1 ; python_version >= "3.8" and python_version < "3.12"
+requests-http-message-signatures==0.3.1 ; python_version >= "3.8" and python_version < "3.12"
+requests-mock==1.10.0 ; python_version >= "3.8" and python_version < "3.12"
+requests-oauthlib==2.0.0 ; python_version >= "3.8" and python_version < "3.12"
+requests==2.28.2 ; python_version >= "3.8" and python_version < "3.12"
+rpds-py==0.20.1 ; python_version >= "3.8" and python_version < "3.12"
+s3transfer==0.6.2 ; python_version >= "3.8" and python_version < "3.12"
+sentry-sdk==1.19.1 ; python_version >= "3.8" and python_version < "3.12"
+service-identity==21.1.0 ; python_version >= "3.8" and python_version < "3.12"
+setuptools==60.10.0 ; python_version >= "3.8" and python_version < "3.12"
+sgmllib3k==1.0.0 ; python_version >= "3.8" and python_version < "3.12"
+six==1.17.0 ; python_version >= "3.8" and python_version < "3.12"
+sniffio==1.3.1 ; python_version >= "3.8" and python_version < "3.12"
+sqlparse==0.5.3 ; python_version >= "3.8" and python_version < "3.12"
+termcolor==2.4.0 ; python_version >= "3.8" and python_version < "3.12"
+tomli==2.2.1 ; python_version >= "3.8" and python_version < "3.11"
+tomlkit==0.13.2 ; python_version >= "3.8" and python_version < "3.12"
+traitlets==5.14.3 ; python_version >= "3.8" and python_version < "3.12"
+twisted-iocpsupport==1.0.4 ; python_version >= "3.8" and python_version < "3.12" and platform_system == "Windows"
+twisted==24.3.0 ; python_version >= "3.8" and python_version < "3.12"
+txaio==23.1.1 ; python_version >= "3.8" and python_version < "3.12"
+typing-extensions==4.13.2 ; python_version >= "3.8" and python_version < "3.12"
+unicode-slugify==0.1.5 ; python_version >= "3.8" and python_version < "3.12"
+unidecode==1.3.7 ; python_version >= "3.8" and python_version < "3.12"
+uritemplate==4.1.1 ; python_version >= "3.8" and python_version < "3.12"
+urllib3==1.26.20 ; python_version >= "3.8" and python_version < "3.12"
+uvicorn==0.20.0 ; python_version >= "3.8" and python_version < "3.12"
+uvloop==0.21.0 ; python_version >= "3.8" and python_version < "3.12" and sys_platform != "win32" and sys_platform != "cygwin" and platform_python_implementation != "PyPy"
+vine==5.1.0 ; python_version >= "3.8" and python_version < "3.12"
+watchdog==2.2.1 ; python_version >= "3.8" and python_version < "3.12"
+watchfiles==0.24.0 ; python_version >= "3.8" and python_version < "3.12"
+wcwidth==0.2.13 ; python_version >= "3.8" and python_version < "3.12"
+webencodings==0.5.1 ; python_version >= "3.8" and python_version < "3.12"
+websockets==13.1 ; python_version >= "3.8" and python_version < "3.12"
+wrapt==1.17.2 ; python_version >= "3.8" and python_version < "3.12"
+yarl==1.15.2 ; python_version >= "3.8" and python_version < "3.12"
+zipp==3.20.2 ; python_version >= "3.8" and python_version < "3.10"
+zope-interface==7.2 ; python_version >= "3.8" and python_version < "3.12"
diff --git a/api/funquail_api/__init__.py b/api/funkwhale_api/__init__.py
similarity index 66%
rename from api/funquail_api/__init__.py
rename to api/funkwhale_api/__init__.py
index 65f51f90b..646b6149e 100644
--- a/api/funquail_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,4 +1,4 @@
 from importlib.metadata import version as get_version
 
-version = get_version("funquail_api")
+version = get_version("funkwhale_api")
 __version__ = version
diff --git a/api/funquail_api/activity/__init__.py b/api/funkwhale_api/activity/__init__.py
similarity index 100%
rename from api/funquail_api/activity/__init__.py
rename to api/funkwhale_api/activity/__init__.py
diff --git a/api/funquail_api/activity/apps.py b/api/funkwhale_api/activity/apps.py
similarity index 87%
rename from api/funquail_api/activity/apps.py
rename to api/funkwhale_api/activity/apps.py
index a9d36d4b4..9ca0ccc91 100644
--- a/api/funquail_api/activity/apps.py
+++ b/api/funkwhale_api/activity/apps.py
@@ -4,7 +4,7 @@ from . import record
 
 
 class ActivityConfig(AppConfig):
-    name = "funquail_api.activity"
+    name = "funkwhale_api.activity"
 
     def ready(self):
         super().ready()
diff --git a/api/funquail_api/activity/record.py b/api/funkwhale_api/activity/record.py
similarity index 100%
rename from api/funquail_api/activity/record.py
rename to api/funkwhale_api/activity/record.py
diff --git a/api/funquail_api/activity/serializers.py b/api/funkwhale_api/activity/serializers.py
similarity index 94%
rename from api/funquail_api/activity/serializers.py
rename to api/funkwhale_api/activity/serializers.py
index ee6ce3337..6df3a5870 100644
--- a/api/funquail_api/activity/serializers.py
+++ b/api/funkwhale_api/activity/serializers.py
@@ -1,6 +1,6 @@
 from rest_framework import serializers
 
-from funquail_api.activity import record
+from funkwhale_api.activity import record
 
 
 class ModelSerializer(serializers.ModelSerializer):
diff --git a/api/funquail_api/activity/utils.py b/api/funkwhale_api/activity/utils.py
similarity index 92%
rename from api/funquail_api/activity/utils.py
rename to api/funkwhale_api/activity/utils.py
index 69d273bf1..8d7cb3bd3 100644
--- a/api/funquail_api/activity/utils.py
+++ b/api/funkwhale_api/activity/utils.py
@@ -1,8 +1,8 @@
 from django.db import models
 
-from funquail_api.common import fields
-from funquail_api.favorites.models import TrackFavorite
-from funquail_api.history.models import Listening
+from funkwhale_api.common import fields
+from funkwhale_api.favorites.models import TrackFavorite
+from funkwhale_api.history.models import Listening
 
 
 def combined_recent(limit, **kwargs):
diff --git a/api/funquail_api/activity/views.py b/api/funkwhale_api/activity/views.py
similarity index 83%
rename from api/funquail_api/activity/views.py
rename to api/funkwhale_api/activity/views.py
index 48671cd14..4938301a5 100644
--- a/api/funquail_api/activity/views.py
+++ b/api/funkwhale_api/activity/views.py
@@ -2,8 +2,8 @@ from drf_spectacular.utils import extend_schema
 from rest_framework import viewsets
 from rest_framework.response import Response
 
-from funquail_api.common.permissions import ConditionalAuthentication
-from funquail_api.favorites.models import TrackFavorite
+from funkwhale_api.common.permissions import ConditionalAuthentication
+from funkwhale_api.favorites.models import TrackFavorite
 
 from . import serializers, utils
 
diff --git a/api/funquail_api/audio/__init__.py b/api/funkwhale_api/audio/__init__.py
similarity index 100%
rename from api/funquail_api/audio/__init__.py
rename to api/funkwhale_api/audio/__init__.py
diff --git a/api/funquail_api/audio/admin.py b/api/funkwhale_api/audio/admin.py
similarity index 86%
rename from api/funquail_api/audio/admin.py
rename to api/funkwhale_api/audio/admin.py
index ba36e6cf5..5cde8cc87 100644
--- a/api/funquail_api/audio/admin.py
+++ b/api/funkwhale_api/audio/admin.py
@@ -1,4 +1,4 @@
-from funquail_api.common import admin
+from funkwhale_api.common import admin
 
 from . import models
 
diff --git a/api/funquail_api/audio/categories.py b/api/funkwhale_api/audio/categories.py
similarity index 100%
rename from api/funquail_api/audio/categories.py
rename to api/funkwhale_api/audio/categories.py
diff --git a/api/funquail_api/audio/dynamic_preferences_registry.py b/api/funkwhale_api/audio/dynamic_preferences_registry.py
similarity index 100%
rename from api/funquail_api/audio/dynamic_preferences_registry.py
rename to api/funkwhale_api/audio/dynamic_preferences_registry.py
diff --git a/api/funquail_api/audio/factories.py b/api/funkwhale_api/audio/factories.py
similarity index 88%
rename from api/funquail_api/audio/factories.py
rename to api/funkwhale_api/audio/factories.py
index 79a406db9..a08340e85 100644
--- a/api/funquail_api/audio/factories.py
+++ b/api/funkwhale_api/audio/factories.py
@@ -2,10 +2,10 @@ import uuid
 
 import factory
 
-from funquail_api.factories import NoUpdateOnCreate, registry
-from funquail_api.federation import actors
-from funquail_api.federation import factories as federation_factories
-from funquail_api.music import factories as music_factories
+from funkwhale_api.factories import NoUpdateOnCreate, registry
+from funkwhale_api.federation import actors
+from funkwhale_api.federation import factories as federation_factories
+from funkwhale_api.music import factories as music_factories
 
 from . import models
 
diff --git a/api/funquail_api/audio/filters.py b/api/funkwhale_api/audio/filters.py
similarity index 93%
rename from api/funquail_api/audio/filters.py
rename to api/funkwhale_api/audio/filters.py
index e88b66f41..eb9960031 100644
--- a/api/funquail_api/audio/filters.py
+++ b/api/funkwhale_api/audio/filters.py
@@ -1,10 +1,10 @@
 import django_filters
 from django.db.models import Q
 
-from funquail_api.common import fields
-from funquail_api.common import filters as common_filters
-from funquail_api.federation import actors
-from funquail_api.moderation import filters as moderation_filters
+from funkwhale_api.common import fields
+from funkwhale_api.common import filters as common_filters
+from funkwhale_api.federation import actors
+from funkwhale_api.moderation import filters as moderation_filters
 
 from . import models
 
diff --git a/api/funquail_api/audio/migrations/0001_initial.py b/api/funkwhale_api/audio/migrations/0001_initial.py
similarity index 100%
rename from api/funquail_api/audio/migrations/0001_initial.py
rename to api/funkwhale_api/audio/migrations/0001_initial.py
diff --git a/api/funquail_api/audio/migrations/0002_channel_metadata.py b/api/funkwhale_api/audio/migrations/0002_channel_metadata.py
similarity index 73%
rename from api/funquail_api/audio/migrations/0002_channel_metadata.py
rename to api/funkwhale_api/audio/migrations/0002_channel_metadata.py
index c5e8bd713..c7a1806f1 100644
--- a/api/funquail_api/audio/migrations/0002_channel_metadata.py
+++ b/api/funkwhale_api/audio/migrations/0002_channel_metadata.py
@@ -3,7 +3,7 @@
 import django.contrib.postgres.fields.jsonb
 import django.core.serializers.json
 from django.db import migrations
-import funquail_api.audio.models
+import funkwhale_api.audio.models
 
 
 class Migration(migrations.Migration):
@@ -16,6 +16,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='channel',
             name='metadata',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funquail_api.audio.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
+            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funkwhale_api.audio.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
         ),
     ]
diff --git a/api/funquail_api/audio/migrations/0003_channel_rss_url.py b/api/funkwhale_api/audio/migrations/0003_channel_rss_url.py
similarity index 100%
rename from api/funquail_api/audio/migrations/0003_channel_rss_url.py
rename to api/funkwhale_api/audio/migrations/0003_channel_rss_url.py
diff --git a/api/funquail_api/audio/migrations/0004_alter_channel_metadata.py b/api/funkwhale_api/audio/migrations/0004_alter_channel_metadata.py
similarity index 64%
rename from api/funquail_api/audio/migrations/0004_alter_channel_metadata.py
rename to api/funkwhale_api/audio/migrations/0004_alter_channel_metadata.py
index 41b462846..64001dcb3 100644
--- a/api/funquail_api/audio/migrations/0004_alter_channel_metadata.py
+++ b/api/funkwhale_api/audio/migrations/0004_alter_channel_metadata.py
@@ -2,7 +2,7 @@
 
 import django.core.serializers.json
 from django.db import migrations, models
-import funquail_api.audio.models
+import funkwhale_api.audio.models
 
 
 class Migration(migrations.Migration):
@@ -15,6 +15,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='channel',
             name='metadata',
-            field=models.JSONField(blank=True, default=funquail_api.audio.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
+            field=models.JSONField(blank=True, default=funkwhale_api.audio.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
         ),
     ]
diff --git a/api/funquail_api/audio/migrations/__init__.py b/api/funkwhale_api/audio/migrations/__init__.py
similarity index 100%
rename from api/funquail_api/audio/migrations/__init__.py
rename to api/funkwhale_api/audio/migrations/__init__.py
diff --git a/api/funquail_api/audio/models.py b/api/funkwhale_api/audio/models.py
similarity index 92%
rename from api/funquail_api/audio/models.py
rename to api/funkwhale_api/audio/models.py
index 68e947021..93a4d873d 100644
--- a/api/funquail_api/audio/models.py
+++ b/api/funkwhale_api/audio/models.py
@@ -9,10 +9,10 @@ from django.dispatch import receiver
 from django.urls import reverse
 from django.utils import timezone
 
-from funquail_api.federation import keys
-from funquail_api.federation import models as federation_models
-from funquail_api.federation import utils as federation_utils
-from funquail_api.users import models as user_models
+from funkwhale_api.federation import keys
+from funkwhale_api.federation import models as federation_models
+from funkwhale_api.federation import utils as federation_utils
+from funkwhale_api.users import models as user_models
 
 
 def empty_dict():
@@ -21,7 +21,7 @@ def empty_dict():
 
 class ChannelQuerySet(models.QuerySet):
     def external_rss(self, include=True):
-        from funquail_api.federation import actors
+        from funkwhale_api.federation import actors
 
         query = models.Q(
             attributed_to=actors.get_service_actor(),
diff --git a/api/funquail_api/audio/renderers.py b/api/funkwhale_api/audio/renderers.py
similarity index 95%
rename from api/funquail_api/audio/renderers.py
rename to api/funkwhale_api/audio/renderers.py
index f24cebcb1..79294ca3d 100644
--- a/api/funquail_api/audio/renderers.py
+++ b/api/funkwhale_api/audio/renderers.py
@@ -2,7 +2,7 @@ import xml.etree.ElementTree as ET
 
 from rest_framework import negotiation, renderers
 
-from funquail_api.subsonic.renderers import dict_to_xml_tree
+from funkwhale_api.subsonic.renderers import dict_to_xml_tree
 
 
 class PodcastRSSRenderer(renderers.JSONRenderer):
diff --git a/api/funquail_api/audio/serializers.py b/api/funkwhale_api/audio/serializers.py
similarity index 97%
rename from api/funquail_api/audio/serializers.py
rename to api/funkwhale_api/audio/serializers.py
index e8357dca6..3c830fd80 100644
--- a/api/funquail_api/audio/serializers.py
+++ b/api/funkwhale_api/audio/serializers.py
@@ -16,20 +16,20 @@ from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers
 
-from funquail_api.common import locales, preferences
-from funquail_api.common import serializers as common_serializers
-from funquail_api.common import session
-from funquail_api.common import utils as common_utils
-from funquail_api.federation import actors
-from funquail_api.federation import models as federation_models
-from funquail_api.federation import serializers as federation_serializers
-from funquail_api.federation import utils as federation_utils
-from funquail_api.moderation import mrf
-from funquail_api.music import models as music_models
-from funquail_api.music.serializers import COVER_WRITE_FIELD, CoverField
-from funquail_api.tags import models as tags_models
-from funquail_api.tags import serializers as tags_serializers
-from funquail_api.users import serializers as users_serializers
+from funkwhale_api.common import locales, preferences
+from funkwhale_api.common import serializers as common_serializers
+from funkwhale_api.common import session
+from funkwhale_api.common import utils as common_utils
+from funkwhale_api.federation import actors
+from funkwhale_api.federation import models as federation_models
+from funkwhale_api.federation import serializers as federation_serializers
+from funkwhale_api.federation import utils as federation_utils
+from funkwhale_api.moderation import mrf
+from funkwhale_api.music import models as music_models
+from funkwhale_api.music.serializers import COVER_WRITE_FIELD, CoverField
+from funkwhale_api.tags import models as tags_models
+from funkwhale_api.tags import serializers as tags_serializers
+from funkwhale_api.users import serializers as users_serializers
 
 from . import categories, models
 
diff --git a/api/funquail_api/audio/spa_views.py b/api/funkwhale_api/audio/spa_views.py
similarity index 94%
rename from api/funquail_api/audio/spa_views.py
rename to api/funkwhale_api/audio/spa_views.py
index 432988daf..1ca0cfe09 100644
--- a/api/funquail_api/audio/spa_views.py
+++ b/api/funkwhale_api/audio/spa_views.py
@@ -5,9 +5,9 @@ from django.db.models import Q
 from django.urls import reverse
 from rest_framework import serializers
 
-from funquail_api.common import middleware, preferences, utils
-from funquail_api.federation import utils as federation_utils
-from funquail_api.music import spa_views
+from funkwhale_api.common import middleware, preferences, utils
+from funkwhale_api.federation import utils as federation_utils
+from funkwhale_api.music import spa_views
 
 from . import models
 
diff --git a/api/funquail_api/audio/tasks.py b/api/funkwhale_api/audio/tasks.py
similarity index 96%
rename from api/funquail_api/audio/tasks.py
rename to api/funkwhale_api/audio/tasks.py
index 6f20b7531..0d117eaae 100644
--- a/api/funquail_api/audio/tasks.py
+++ b/api/funkwhale_api/audio/tasks.py
@@ -5,7 +5,7 @@ from django.conf import settings
 from django.db import transaction
 from django.utils import timezone
 
-from funquail_api.taskapp import celery
+from funkwhale_api.taskapp import celery
 
 from . import models, serializers
 
diff --git a/api/funquail_api/audio/views.py b/api/funkwhale_api/audio/views.py
similarity index 94%
rename from api/funquail_api/audio/views.py
rename to api/funkwhale_api/audio/views.py
index 2aeeb9406..3333e26a5 100644
--- a/api/funquail_api/audio/views.py
+++ b/api/funkwhale_api/audio/views.py
@@ -7,17 +7,17 @@ from rest_framework import decorators, exceptions, mixins
 from rest_framework import permissions as rest_permissions
 from rest_framework import response, viewsets
 
-from funquail_api.common import locales, permissions, preferences
-from funquail_api.common import utils as common_utils
-from funquail_api.common.mixins import MultipleLookupDetailMixin
-from funquail_api.federation import actors
-from funquail_api.federation import models as federation_models
-from funquail_api.federation import routes
-from funquail_api.federation import tasks as federation_tasks
-from funquail_api.federation import utils as federation_utils
-from funquail_api.music import models as music_models
-from funquail_api.music import views as music_views
-from funquail_api.users.oauth import permissions as oauth_permissions
+from funkwhale_api.common import locales, permissions, preferences
+from funkwhale_api.common import utils as common_utils
+from funkwhale_api.common.mixins import MultipleLookupDetailMixin
+from funkwhale_api.federation import actors
+from funkwhale_api.federation import models as federation_models
+from funkwhale_api.federation import routes
+from funkwhale_api.federation import tasks as federation_tasks
+from funkwhale_api.federation import utils as federation_utils
+from funkwhale_api.music import models as music_models
+from funkwhale_api.music import views as music_views
+from funkwhale_api.users.oauth import permissions as oauth_permissions
 
 from . import categories, filters, models, renderers, serializers
 
diff --git a/api/funquail_api/cli/__init__.py b/api/funkwhale_api/cli/__init__.py
similarity index 100%
rename from api/funquail_api/cli/__init__.py
rename to api/funkwhale_api/cli/__init__.py
diff --git a/api/funquail_api/cli/base.py b/api/funkwhale_api/cli/base.py
similarity index 100%
rename from api/funquail_api/cli/base.py
rename to api/funkwhale_api/cli/base.py
diff --git a/api/funquail_api/cli/library.py b/api/funkwhale_api/cli/library.py
similarity index 96%
rename from api/funquail_api/cli/library.py
rename to api/funkwhale_api/cli/library.py
index 8400cb40b..14b5ef038 100644
--- a/api/funquail_api/cli/library.py
+++ b/api/funkwhale_api/cli/library.py
@@ -1,6 +1,6 @@
 import click
 
-from funquail_api.music import tasks
+from funkwhale_api.music import tasks
 
 from . import base
 
diff --git a/api/funquail_api/cli/main.py b/api/funkwhale_api/cli/main.py
similarity index 100%
rename from api/funquail_api/cli/main.py
rename to api/funkwhale_api/cli/main.py
diff --git a/api/funquail_api/cli/media.py b/api/funkwhale_api/cli/media.py
similarity index 95%
rename from api/funquail_api/cli/media.py
rename to api/funkwhale_api/cli/media.py
index 9ddcf30e9..57be179c2 100644
--- a/api/funquail_api/cli/media.py
+++ b/api/funkwhale_api/cli/media.py
@@ -5,8 +5,8 @@ from django.core.files.storage import default_storage
 from versatileimagefield import settings as vif_settings
 from versatileimagefield.image_warmer import VersatileImageFieldWarmer
 
-from funquail_api.common import utils as common_utils
-from funquail_api.common.models import Attachment
+from funkwhale_api.common import utils as common_utils
+from funkwhale_api.common.models import Attachment
 
 from . import base
 
diff --git a/api/funquail_api/cli/plugins.py b/api/funkwhale_api/cli/plugins.py
similarity index 100%
rename from api/funquail_api/cli/plugins.py
rename to api/funkwhale_api/cli/plugins.py
diff --git a/api/funquail_api/cli/users.py b/api/funkwhale_api/cli/users.py
similarity index 98%
rename from api/funquail_api/cli/users.py
rename to api/funkwhale_api/cli/users.py
index 765130da0..53054b587 100644
--- a/api/funquail_api/cli/users.py
+++ b/api/funkwhale_api/cli/users.py
@@ -1,8 +1,8 @@
 import click
 from django.db import transaction
 
-from funquail_api.federation import models as federation_models
-from funquail_api.users import models, serializers, tasks
+from funkwhale_api.federation import models as federation_models
+from funkwhale_api.users import models, serializers, tasks
 
 from . import base, utils
 
diff --git a/api/funkwhale_api/cli/utils.py b/api/funkwhale_api/cli/utils.py
new file mode 100644
index 000000000..08dd1a6fa
--- /dev/null
+++ b/api/funkwhale_api/cli/utils.py
@@ -0,0 +1,3 @@
+import logging
+
+logger = logging.getLogger("funkwhale_api.cli")
diff --git a/api/funquail_api/common/__init__.py b/api/funkwhale_api/common/__init__.py
similarity index 100%
rename from api/funquail_api/common/__init__.py
rename to api/funkwhale_api/common/__init__.py
diff --git a/api/funquail_api/common/admin.py b/api/funkwhale_api/common/admin.py
similarity index 100%
rename from api/funquail_api/common/admin.py
rename to api/funkwhale_api/common/admin.py
diff --git a/api/funquail_api/common/apps.py b/api/funkwhale_api/common/apps.py
similarity index 94%
rename from api/funquail_api/common/apps.py
rename to api/funkwhale_api/common/apps.py
index 5521f24b5..e60966248 100644
--- a/api/funquail_api/common/apps.py
+++ b/api/funkwhale_api/common/apps.py
@@ -7,7 +7,7 @@ from . import mutations, utils
 
 
 class CommonConfig(AppConfig):
-    name = "funquail_api.common"
+    name = "funkwhale_api.common"
 
     def ready(self):
         super().ready()
diff --git a/api/funquail_api/common/authentication.py b/api/funkwhale_api/common/authentication.py
similarity index 97%
rename from api/funquail_api/common/authentication.py
rename to api/funkwhale_api/common/authentication.py
index b183a8e6a..9e63d580d 100644
--- a/api/funquail_api/common/authentication.py
+++ b/api/funkwhale_api/common/authentication.py
@@ -6,7 +6,7 @@ from oauth2_provider.contrib.rest_framework.authentication import (
 )
 from rest_framework import exceptions
 
-from funquail_api.users import models as users_models
+from funkwhale_api.users import models as users_models
 
 
 class UnverifiedEmail(Exception):
diff --git a/api/funquail_api/common/cache.py b/api/funkwhale_api/common/cache.py
similarity index 100%
rename from api/funquail_api/common/cache.py
rename to api/funkwhale_api/common/cache.py
diff --git a/api/funquail_api/common/channels.py b/api/funkwhale_api/common/channels.py
similarity index 100%
rename from api/funquail_api/common/channels.py
rename to api/funkwhale_api/common/channels.py
diff --git a/api/funquail_api/common/consumers.py b/api/funkwhale_api/common/consumers.py
similarity index 94%
rename from api/funquail_api/common/consumers.py
rename to api/funkwhale_api/common/consumers.py
index 6445e6b18..9db4138ff 100644
--- a/api/funquail_api/common/consumers.py
+++ b/api/funkwhale_api/common/consumers.py
@@ -1,6 +1,6 @@
 from channels.generic.websocket import JsonWebsocketConsumer
 
-from funquail_api.common import channels
+from funkwhale_api.common import channels
 
 
 class JsonAuthConsumer(JsonWebsocketConsumer):
diff --git a/api/funquail_api/common/decorators.py b/api/funkwhale_api/common/decorators.py
similarity index 100%
rename from api/funquail_api/common/decorators.py
rename to api/funkwhale_api/common/decorators.py
diff --git a/api/funquail_api/common/dynamic_preferences_registry.py b/api/funkwhale_api/common/dynamic_preferences_registry.py
similarity index 100%
rename from api/funquail_api/common/dynamic_preferences_registry.py
rename to api/funkwhale_api/common/dynamic_preferences_registry.py
diff --git a/api/funquail_api/common/factories.py b/api/funkwhale_api/common/factories.py
similarity index 89%
rename from api/funquail_api/common/factories.py
rename to api/funkwhale_api/common/factories.py
index cf83a225b..4f64af654 100644
--- a/api/funquail_api/common/factories.py
+++ b/api/funkwhale_api/common/factories.py
@@ -1,7 +1,7 @@
 import factory
 
-from funquail_api.factories import NoUpdateOnCreate, registry
-from funquail_api.federation import factories as federation_factories
+from funkwhale_api.factories import NoUpdateOnCreate, registry
+from funkwhale_api.federation import factories as federation_factories
 
 
 @registry.register
diff --git a/api/funquail_api/common/fields.py b/api/funkwhale_api/common/fields.py
similarity index 100%
rename from api/funquail_api/common/fields.py
rename to api/funkwhale_api/common/fields.py
diff --git a/api/funquail_api/common/filters.py b/api/funkwhale_api/common/filters.py
similarity index 99%
rename from api/funquail_api/common/filters.py
rename to api/funkwhale_api/common/filters.py
index 891f2883f..65f5e008d 100644
--- a/api/funquail_api/common/filters.py
+++ b/api/funkwhale_api/common/filters.py
@@ -198,7 +198,7 @@ class ActorScopeFilter(filters.CharFilter):
         return queryset.filter(query).distinct()
 
     def get_query(self, scope, user, actor):
-        from funquail_api.federation import models as federation_models
+        from funkwhale_api.federation import models as federation_models
 
         if scope == "me":
             return self.filter_me(actor)
diff --git a/api/funquail_api/common/locales.py b/api/funkwhale_api/common/locales.py
similarity index 100%
rename from api/funquail_api/common/locales.py
rename to api/funkwhale_api/common/locales.py
diff --git a/api/funquail_api/common/management/__init__.py b/api/funkwhale_api/common/management/__init__.py
similarity index 100%
rename from api/funquail_api/common/management/__init__.py
rename to api/funkwhale_api/common/management/__init__.py
diff --git a/api/funquail_api/common/management/commands/__init__.py b/api/funkwhale_api/common/management/commands/__init__.py
similarity index 100%
rename from api/funquail_api/common/management/commands/__init__.py
rename to api/funkwhale_api/common/management/commands/__init__.py
diff --git a/api/funquail_api/common/management/commands/createsuperuser.py b/api/funkwhale_api/common/management/commands/createsuperuser.py
similarity index 100%
rename from api/funquail_api/common/management/commands/createsuperuser.py
rename to api/funkwhale_api/common/management/commands/createsuperuser.py
diff --git a/api/funquail_api/common/management/commands/gitpod.py b/api/funkwhale_api/common/management/commands/gitpod.py
similarity index 91%
rename from api/funquail_api/common/management/commands/gitpod.py
rename to api/funkwhale_api/common/management/commands/gitpod.py
index d5762182a..c07d44c56 100644
--- a/api/funquail_api/common/management/commands/gitpod.py
+++ b/api/funkwhale_api/common/management/commands/gitpod.py
@@ -5,9 +5,9 @@ import uvicorn
 from django.core.management import call_command
 from django.core.management.commands.migrate import Command as BaseCommand
 
-from funquail_api.common import preferences
-from funquail_api.music.models import Library
-from funquail_api.users.models import User
+from funkwhale_api.common import preferences
+from funkwhale_api.music.models import Library
+from funkwhale_api.users.models import User
 
 
 class Command(BaseCommand):
@@ -73,6 +73,6 @@ class Command(BaseCommand):
             reload=True,
             reload_dirs=[
                 "/workspace/funkwhale/api/config/",
-                "/workspace/funkwhale/api/funquail_api/",
+                "/workspace/funkwhale/api/funkwhale_api/",
             ],
         )
diff --git a/api/funquail_api/common/management/commands/inplace_to_s3.py b/api/funkwhale_api/common/management/commands/inplace_to_s3.py
similarity index 98%
rename from api/funquail_api/common/management/commands/inplace_to_s3.py
rename to api/funkwhale_api/common/management/commands/inplace_to_s3.py
index 8581bb726..e973b8466 100644
--- a/api/funquail_api/common/management/commands/inplace_to_s3.py
+++ b/api/funkwhale_api/common/management/commands/inplace_to_s3.py
@@ -4,7 +4,7 @@ from argparse import RawTextHelpFormatter
 from django.core.management.base import BaseCommand
 from django.db import transaction
 
-from funquail_api.music import models
+from funkwhale_api.music import models
 
 
 class Command(BaseCommand):
diff --git a/api/funquail_api/common/management/commands/load_test_data.py b/api/funkwhale_api/common/management/commands/load_test_data.py
similarity index 96%
rename from api/funquail_api/common/management/commands/load_test_data.py
rename to api/funkwhale_api/common/management/commands/load_test_data.py
index dc2c79bf6..f9997a331 100644
--- a/api/funquail_api/common/management/commands/load_test_data.py
+++ b/api/funkwhale_api/common/management/commands/load_test_data.py
@@ -5,11 +5,11 @@ from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.db import transaction
 
-from funquail_api.federation import keys
-from funquail_api.federation import models as federation_models
-from funquail_api.music import models as music_models
-from funquail_api.tags import models as tags_models
-from funquail_api.users import models as users_models
+from funkwhale_api.federation import keys
+from funkwhale_api.federation import models as federation_models
+from funkwhale_api.music import models as music_models
+from funkwhale_api.tags import models as tags_models
+from funkwhale_api.users import models as users_models
 
 BATCH_SIZE = 500
 
@@ -236,7 +236,7 @@ class Command(BaseCommand):
     def handle(self, *args, **options):
         from django.apps import apps
 
-        from funquail_api import factories
+        from funkwhale_api import factories
 
         app_names = [app.name for app in apps.app_configs.values()]
         factories.registry.autodiscover(app_names)
@@ -267,7 +267,7 @@ class Command(BaseCommand):
         self.stdout.write(self.style.SUCCESS("Done!"))
 
     def create_batch(self, row, results, options, count):
-        from funquail_api import factories
+        from funkwhale_api import factories
 
         if row["id"] in results:
             # already generated
diff --git a/api/funquail_api/common/management/commands/makemigrations.py b/api/funkwhale_api/common/management/commands/makemigrations.py
similarity index 100%
rename from api/funquail_api/common/management/commands/makemigrations.py
rename to api/funkwhale_api/common/management/commands/makemigrations.py
diff --git a/api/funquail_api/common/management/commands/migrate.py b/api/funkwhale_api/common/management/commands/migrate.py
similarity index 100%
rename from api/funquail_api/common/management/commands/migrate.py
rename to api/funkwhale_api/common/management/commands/migrate.py
diff --git a/api/funquail_api/common/management/commands/script.py b/api/funkwhale_api/common/management/commands/script.py
similarity index 95%
rename from api/funquail_api/common/management/commands/script.py
rename to api/funkwhale_api/common/management/commands/script.py
index 887764f5c..ab165f626 100644
--- a/api/funquail_api/common/management/commands/script.py
+++ b/api/funkwhale_api/common/management/commands/script.py
@@ -1,10 +1,10 @@
 from django.core.management.base import BaseCommand, CommandError
 
-from funquail_api.common import scripts
+from funkwhale_api.common import scripts
 
 
 class Command(BaseCommand):
-    help = "Run a specific script from funquail_api/common/scripts/"
+    help = "Run a specific script from funkwhale_api/common/scripts/"
 
     def add_arguments(self, parser):
         parser.add_argument("script_name", nargs="?", type=str)
diff --git a/api/funquail_api/common/management/commands/testdata.py b/api/funkwhale_api/common/management/commands/testdata.py
similarity index 94%
rename from api/funquail_api/common/management/commands/testdata.py
rename to api/funkwhale_api/common/management/commands/testdata.py
index cb21cb0cc..fa7ae631b 100644
--- a/api/funquail_api/common/management/commands/testdata.py
+++ b/api/funkwhale_api/common/management/commands/testdata.py
@@ -1,7 +1,7 @@
 from django.core.management.commands.migrate import Command as BaseCommand
 
-from funquail_api.federation import factories
-from funquail_api.federation.models import Actor
+from funkwhale_api.federation import factories
+from funkwhale_api.federation.models import Actor
 
 
 class Command(BaseCommand):
diff --git a/api/funquail_api/common/middleware.py b/api/funkwhale_api/common/middleware.py
similarity index 99%
rename from api/funquail_api/common/middleware.py
rename to api/funkwhale_api/common/middleware.py
index 1a73b4a74..d0944e5d4 100644
--- a/api/funquail_api/common/middleware.py
+++ b/api/funkwhale_api/common/middleware.py
@@ -15,7 +15,7 @@ from django.core.cache import caches
 from django.middleware import csrf
 from rest_framework import views
 
-from funquail_api.federation import utils as federation_utils
+from funkwhale_api.federation import utils as federation_utils
 
 from . import preferences, session, throttling, utils
 
diff --git a/api/funquail_api/common/migrations/0001_initial.py b/api/funkwhale_api/common/migrations/0001_initial.py
similarity index 100%
rename from api/funquail_api/common/migrations/0001_initial.py
rename to api/funkwhale_api/common/migrations/0001_initial.py
diff --git a/api/funquail_api/common/migrations/0002_mutation.py b/api/funkwhale_api/common/migrations/0002_mutation.py
similarity index 100%
rename from api/funquail_api/common/migrations/0002_mutation.py
rename to api/funkwhale_api/common/migrations/0002_mutation.py
diff --git a/api/funquail_api/common/migrations/0003_cit_extension.py b/api/funkwhale_api/common/migrations/0003_cit_extension.py
similarity index 100%
rename from api/funquail_api/common/migrations/0003_cit_extension.py
rename to api/funkwhale_api/common/migrations/0003_cit_extension.py
diff --git a/api/funquail_api/common/migrations/0004_auto_20191111_1338.py b/api/funkwhale_api/common/migrations/0004_auto_20191111_1338.py
similarity index 79%
rename from api/funquail_api/common/migrations/0004_auto_20191111_1338.py
rename to api/funkwhale_api/common/migrations/0004_auto_20191111_1338.py
index 164569ac4..f35c9e11f 100644
--- a/api/funquail_api/common/migrations/0004_auto_20191111_1338.py
+++ b/api/funkwhale_api/common/migrations/0004_auto_20191111_1338.py
@@ -5,8 +5,8 @@ import django.core.serializers.json
 from django.db import migrations, models
 import django.db.models.deletion
 import django.utils.timezone
-import funquail_api.common.models
-import funquail_api.common.validators
+import funkwhale_api.common.models
+import funkwhale_api.common.validators
 import uuid
 import versatileimagefield.fields
 
@@ -28,7 +28,7 @@ class Migration(migrations.Migration):
                 ('last_fetch_date', models.DateTimeField(blank=True, null=True)),
                 ('size', models.IntegerField(blank=True, null=True)),
                 ('mimetype', models.CharField(blank=True, max_length=200, null=True)),
-                ('file', versatileimagefield.fields.VersatileImageField(max_length=255, upload_to=funquail_api.common.models.get_file_path, validators=[funquail_api.common.validators.ImageDimensionsValidator(min_height=50, min_width=50), funquail_api.common.validators.FileValidator(allowed_extensions=['png', 'jpg', 'jpeg'], max_size=5242880)])),
+                ('file', versatileimagefield.fields.VersatileImageField(max_length=255, upload_to=funkwhale_api.common.models.get_file_path, validators=[funkwhale_api.common.validators.ImageDimensionsValidator(min_height=50, min_width=50), funkwhale_api.common.validators.FileValidator(allowed_extensions=['png', 'jpg', 'jpeg'], max_size=5242880)])),
                 ('actor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='attachments', to='federation.Actor', null=True)),
             ],
         ),
diff --git a/api/funquail_api/common/migrations/0005_auto_20191125_1421.py b/api/funkwhale_api/common/migrations/0005_auto_20191125_1421.py
similarity index 100%
rename from api/funquail_api/common/migrations/0005_auto_20191125_1421.py
rename to api/funkwhale_api/common/migrations/0005_auto_20191125_1421.py
diff --git a/api/funquail_api/common/migrations/0006_content.py b/api/funkwhale_api/common/migrations/0006_content.py
similarity index 100%
rename from api/funquail_api/common/migrations/0006_content.py
rename to api/funkwhale_api/common/migrations/0006_content.py
diff --git a/api/funquail_api/common/migrations/0007_auto_20200116_1610.py b/api/funkwhale_api/common/migrations/0007_auto_20200116_1610.py
similarity index 100%
rename from api/funquail_api/common/migrations/0007_auto_20200116_1610.py
rename to api/funkwhale_api/common/migrations/0007_auto_20200116_1610.py
diff --git a/api/funquail_api/common/migrations/0008_auto_20200701_1317.py b/api/funkwhale_api/common/migrations/0008_auto_20200701_1317.py
similarity index 100%
rename from api/funquail_api/common/migrations/0008_auto_20200701_1317.py
rename to api/funkwhale_api/common/migrations/0008_auto_20200701_1317.py
diff --git a/api/funquail_api/common/migrations/0009_auto_20220627_1915.py b/api/funkwhale_api/common/migrations/0009_auto_20220627_1915.py
similarity index 100%
rename from api/funquail_api/common/migrations/0009_auto_20220627_1915.py
rename to api/funkwhale_api/common/migrations/0009_auto_20220627_1915.py
diff --git a/api/funquail_api/common/migrations/__init__.py b/api/funkwhale_api/common/migrations/__init__.py
similarity index 100%
rename from api/funquail_api/common/migrations/__init__.py
rename to api/funkwhale_api/common/migrations/__init__.py
diff --git a/api/funquail_api/common/mixins.py b/api/funkwhale_api/common/mixins.py
similarity index 100%
rename from api/funquail_api/common/mixins.py
rename to api/funkwhale_api/common/mixins.py
diff --git a/api/funquail_api/common/models.py b/api/funkwhale_api/common/models.py
similarity index 99%
rename from api/funquail_api/common/models.py
rename to api/funkwhale_api/common/models.py
index eac4cc33e..ebd705813 100644
--- a/api/funquail_api/common/models.py
+++ b/api/funkwhale_api/common/models.py
@@ -16,7 +16,7 @@ from django.utils import timezone
 from versatileimagefield.fields import VersatileImageField
 from versatileimagefield.image_warmer import VersatileImageFieldWarmer
 
-from funquail_api.federation import utils as federation_utils
+from funkwhale_api.federation import utils as federation_utils
 
 from . import utils, validators
 
diff --git a/api/funquail_api/common/mutations.py b/api/funkwhale_api/common/mutations.py
similarity index 100%
rename from api/funquail_api/common/mutations.py
rename to api/funkwhale_api/common/mutations.py
diff --git a/api/funquail_api/common/pagination.py b/api/funkwhale_api/common/pagination.py
similarity index 100%
rename from api/funquail_api/common/pagination.py
rename to api/funkwhale_api/common/pagination.py
diff --git a/api/funquail_api/common/permissions.py b/api/funkwhale_api/common/permissions.py
similarity index 97%
rename from api/funquail_api/common/permissions.py
rename to api/funkwhale_api/common/permissions.py
index dcdcfece4..13ff696c8 100644
--- a/api/funquail_api/common/permissions.py
+++ b/api/funkwhale_api/common/permissions.py
@@ -4,7 +4,7 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.http import Http404
 from rest_framework.permissions import BasePermission
 
-from funquail_api.common import preferences
+from funkwhale_api.common import preferences
 
 
 class ConditionalAuthentication(BasePermission):
diff --git a/api/funquail_api/common/preferences.py b/api/funkwhale_api/common/preferences.py
similarity index 100%
rename from api/funquail_api/common/preferences.py
rename to api/funkwhale_api/common/preferences.py
diff --git a/api/funquail_api/common/renderers.py b/api/funkwhale_api/common/renderers.py
similarity index 100%
rename from api/funquail_api/common/renderers.py
rename to api/funkwhale_api/common/renderers.py
diff --git a/api/funquail_api/common/routers.py b/api/funkwhale_api/common/routers.py
similarity index 100%
rename from api/funquail_api/common/routers.py
rename to api/funkwhale_api/common/routers.py
diff --git a/api/funquail_api/common/scripts/__init__.py b/api/funkwhale_api/common/scripts/__init__.py
similarity index 100%
rename from api/funquail_api/common/scripts/__init__.py
rename to api/funkwhale_api/common/scripts/__init__.py
diff --git a/api/funquail_api/common/scripts/create_actors.py b/api/funkwhale_api/common/scripts/create_actors.py
similarity index 92%
rename from api/funquail_api/common/scripts/create_actors.py
rename to api/funkwhale_api/common/scripts/create_actors.py
index 3ac8bd016..920ec6cb1 100644
--- a/api/funquail_api/common/scripts/create_actors.py
+++ b/api/funkwhale_api/common/scripts/create_actors.py
@@ -3,7 +3,7 @@ Compute different sizes of image used for Album covers and User avatars
 """
 from django.db.utils import IntegrityError
 
-from funquail_api.users.models import User, create_actor
+from funkwhale_api.users.models import User, create_actor
 
 
 def main(command, **kwargs):
diff --git a/api/funquail_api/common/scripts/create_image_variations.py b/api/funkwhale_api/common/scripts/create_image_variations.py
similarity index 94%
rename from api/funquail_api/common/scripts/create_image_variations.py
rename to api/funkwhale_api/common/scripts/create_image_variations.py
index 5337aceb1..45b1b3880 100644
--- a/api/funquail_api/common/scripts/create_image_variations.py
+++ b/api/funkwhale_api/common/scripts/create_image_variations.py
@@ -4,7 +4,7 @@ Compute different sizes of image used for Album covers and User avatars
 
 from versatileimagefield.image_warmer import VersatileImageFieldWarmer
 
-from funquail_api.common.models import Attachment
+from funkwhale_api.common.models import Attachment
 
 MODELS = [
     (Attachment, "file", "attachment_square"),
diff --git a/api/funquail_api/common/scripts/delete_pre_017_federated_uploads.py b/api/funkwhale_api/common/scripts/delete_pre_017_federated_uploads.py
similarity index 88%
rename from api/funquail_api/common/scripts/delete_pre_017_federated_uploads.py
rename to api/funkwhale_api/common/scripts/delete_pre_017_federated_uploads.py
index 2158fb42c..c27a0a5f8 100644
--- a/api/funquail_api/common/scripts/delete_pre_017_federated_uploads.py
+++ b/api/funkwhale_api/common/scripts/delete_pre_017_federated_uploads.py
@@ -2,7 +2,7 @@
 Compute different sizes of image used for Album covers and User avatars
 """
 
-from funquail_api.music.models import Upload
+from funkwhale_api.music.models import Upload
 
 
 def main(command, **kwargs):
diff --git a/api/funquail_api/common/scripts/django_permissions_to_user_permissions.py b/api/funkwhale_api/common/scripts/django_permissions_to_user_permissions.py
similarity index 95%
rename from api/funquail_api/common/scripts/django_permissions_to_user_permissions.py
rename to api/funkwhale_api/common/scripts/django_permissions_to_user_permissions.py
index 64837a5f9..8fb15f06b 100644
--- a/api/funquail_api/common/scripts/django_permissions_to_user_permissions.py
+++ b/api/funkwhale_api/common/scripts/django_permissions_to_user_permissions.py
@@ -5,7 +5,7 @@ following the work done in #152.
 from django.contrib.auth.models import Permission
 from django.db.models import Q
 
-from funquail_api.users import models
+from funkwhale_api.users import models
 
 mapping = {
     "dynamic_preferences.change_globalpreferencemodel": "settings",
diff --git a/api/funquail_api/common/scripts/migrate_to_user_libraries.py b/api/funkwhale_api/common/scripts/migrate_to_user_libraries.py
similarity index 96%
rename from api/funquail_api/common/scripts/migrate_to_user_libraries.py
rename to api/funkwhale_api/common/scripts/migrate_to_user_libraries.py
index cea24e170..d68093021 100644
--- a/api/funquail_api/common/scripts/migrate_to_user_libraries.py
+++ b/api/funkwhale_api/common/scripts/migrate_to_user_libraries.py
@@ -14,10 +14,10 @@ This command will also generate federation ids for existing resources.
 from django.conf import settings
 from django.db.models import CharField, F, Value, functions
 
-from funquail_api.common import preferences
-from funquail_api.federation import models as federation_models
-from funquail_api.music import models
-from funquail_api.users.models import User
+from funkwhale_api.common import preferences
+from funkwhale_api.federation import models as federation_models
+from funkwhale_api.music import models
+from funkwhale_api.users.models import User
 
 
 def create_libraries(open_api, stdout):
diff --git a/api/funquail_api/common/scripts/test.py b/api/funkwhale_api/common/scripts/test.py
similarity index 100%
rename from api/funquail_api/common/scripts/test.py
rename to api/funkwhale_api/common/scripts/test.py
diff --git a/api/funquail_api/common/search.py b/api/funkwhale_api/common/search.py
similarity index 100%
rename from api/funquail_api/common/search.py
rename to api/funkwhale_api/common/search.py
diff --git a/api/funquail_api/common/serializers.py b/api/funkwhale_api/common/serializers.py
similarity index 99%
rename from api/funquail_api/common/serializers.py
rename to api/funkwhale_api/common/serializers.py
index a8082d680..96f5beddd 100644
--- a/api/funquail_api/common/serializers.py
+++ b/api/funkwhale_api/common/serializers.py
@@ -230,7 +230,7 @@ class StripExifImageField(serializers.ImageField):
         )
 
 
-from funquail_api.federation import serializers as federation_serializers  # noqa
+from funkwhale_api.federation import serializers as federation_serializers  # noqa
 
 TARGET_ID_TYPE_MAPPING = {
     "music.Track": ("id", "track"),
diff --git a/api/funquail_api/common/session.py b/api/funkwhale_api/common/session.py
similarity index 87%
rename from api/funquail_api/common/session.py
rename to api/funkwhale_api/common/session.py
index 9b1315094..2d1d96a6d 100644
--- a/api/funquail_api/common/session.py
+++ b/api/funkwhale_api/common/session.py
@@ -1,7 +1,7 @@
 import requests
 from django.conf import settings
 
-import funquail_api
+import funkwhale_api
 
 
 class FunQuailSession(requests.Session):
@@ -13,7 +13,7 @@ class FunQuailSession(requests.Session):
 
 def get_user_agent():
     return "python-requests (funkwhale/{}; +{})".format(
-        funquail_api.__version__, settings.FUNQUAIL_URL
+        funkwhale_api.__version__, settings.FUNQUAIL_URL
     )
 
 
diff --git a/api/funquail_api/common/signals.py b/api/funkwhale_api/common/signals.py
similarity index 100%
rename from api/funquail_api/common/signals.py
rename to api/funkwhale_api/common/signals.py
diff --git a/api/funquail_api/common/storage.py b/api/funkwhale_api/common/storage.py
similarity index 100%
rename from api/funquail_api/common/storage.py
rename to api/funkwhale_api/common/storage.py
diff --git a/api/funquail_api/common/tasks.py b/api/funkwhale_api/common/tasks.py
similarity index 97%
rename from api/funquail_api/common/tasks.py
rename to api/funkwhale_api/common/tasks.py
index ee44e7343..b91b96abc 100644
--- a/api/funquail_api/common/tasks.py
+++ b/api/funkwhale_api/common/tasks.py
@@ -8,8 +8,8 @@ from django.db import transaction
 from django.dispatch import receiver
 from django.utils import timezone
 
-from funquail_api.common import channels
-from funquail_api.taskapp import celery
+from funkwhale_api.common import channels
+from funkwhale_api.taskapp import celery
 
 from . import models, serializers, session, signals
 
diff --git a/api/funquail_api/common/throttling.py b/api/funkwhale_api/common/throttling.py
similarity index 100%
rename from api/funquail_api/common/throttling.py
rename to api/funkwhale_api/common/throttling.py
diff --git a/api/funquail_api/common/utils.py b/api/funkwhale_api/common/utils.py
similarity index 99%
rename from api/funquail_api/common/utils.py
rename to api/funkwhale_api/common/utils.py
index 4e7cdcbb4..cdc1cc505 100644
--- a/api/funquail_api/common/utils.py
+++ b/api/funkwhale_api/common/utils.py
@@ -155,7 +155,7 @@ def media_url(path):
     ):
         return join_url(settings.MEDIA_URL, path)
 
-    from funquail_api.federation import utils as federation_utils
+    from funkwhale_api.federation import utils as federation_utils
 
     return federation_utils.full_url(path)
 
diff --git a/api/funquail_api/common/validators.py b/api/funkwhale_api/common/validators.py
similarity index 100%
rename from api/funquail_api/common/validators.py
rename to api/funkwhale_api/common/validators.py
diff --git a/api/funquail_api/common/views.py b/api/funkwhale_api/common/views.py
similarity index 98%
rename from api/funquail_api/common/views.py
rename to api/funkwhale_api/common/views.py
index ae1db9764..51c46e2e0 100644
--- a/api/funquail_api/common/views.py
+++ b/api/funkwhale_api/common/views.py
@@ -16,11 +16,11 @@ from rest_framework import (
 from rest_framework.decorators import action
 
 from config import plugins
-from funquail_api.common.serializers import (
+from funkwhale_api.common.serializers import (
     ErrorDetailSerializer,
     TextPreviewSerializer,
 )
-from funquail_api.users.oauth import permissions as oauth_permissions
+from funkwhale_api.users.oauth import permissions as oauth_permissions
 
 from . import filters, models, mutations, serializers, signals, tasks, throttling, utils
 
diff --git a/api/funquail_api/contrib/__init__.py b/api/funkwhale_api/contrib/__init__.py
similarity index 100%
rename from api/funquail_api/contrib/__init__.py
rename to api/funkwhale_api/contrib/__init__.py
diff --git a/api/funquail_api/contrib/listenbrainz/__init__.py b/api/funkwhale_api/contrib/listenbrainz/__init__.py
similarity index 100%
rename from api/funquail_api/contrib/listenbrainz/__init__.py
rename to api/funkwhale_api/contrib/listenbrainz/__init__.py
diff --git a/api/funquail_api/contrib/listenbrainz/client.py b/api/funkwhale_api/contrib/listenbrainz/client.py
similarity index 100%
rename from api/funquail_api/contrib/listenbrainz/client.py
rename to api/funkwhale_api/contrib/listenbrainz/client.py
diff --git a/api/funquail_api/contrib/listenbrainz/funkwhale_ready.py b/api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py
similarity index 94%
rename from api/funquail_api/contrib/listenbrainz/funkwhale_ready.py
rename to api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py
index 517c12674..e67590f40 100644
--- a/api/funquail_api/contrib/listenbrainz/funkwhale_ready.py
+++ b/api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py
@@ -1,4 +1,4 @@
-import funquail_api
+import funkwhale_api
 from config import plugins
 
 from .client import ListenBrainzClient, Track
@@ -24,7 +24,7 @@ def get_track(track):
     album = None
     additional_info = {
         "media_player": "FunQuail",
-        "media_player_version": funquail_api.__version__,
+        "media_player_version": funkwhale_api.__version__,
         "submission_client": "FunQuail ListenBrainz plugin",
         "submission_client_version": PLUGIN["version"],
         "tracknumber": track.position,
diff --git a/api/funquail_api/contrib/listenbrainz/funkwhale_startup.py b/api/funkwhale_api/contrib/listenbrainz/funkwhale_startup.py
similarity index 82%
rename from api/funquail_api/contrib/listenbrainz/funkwhale_startup.py
rename to api/funkwhale_api/contrib/listenbrainz/funkwhale_startup.py
index 29734429b..073f1121e 100644
--- a/api/funquail_api/contrib/listenbrainz/funkwhale_startup.py
+++ b/api/funkwhale_api/contrib/listenbrainz/funkwhale_startup.py
@@ -4,7 +4,7 @@ PLUGIN = plugins.get_plugin_config(
     name="listenbrainz",
     label="ListenBrainz",
     description="A plugin that allows you to submit your listens to ListenBrainz.",
-    homepage="https://funquail.laidback.moe/docs/users/builtinplugins.html#listenbrainz-plugin",  # noqa
+    homepage="https://funkwhale.laidback.moe/docs/users/builtinplugins.html#listenbrainz-plugin",  # noqa
     version="0.3",
     user=True,
     conf=[
diff --git a/api/funquail_api/contrib/maloja/__init__.py b/api/funkwhale_api/contrib/maloja/__init__.py
similarity index 100%
rename from api/funquail_api/contrib/maloja/__init__.py
rename to api/funkwhale_api/contrib/maloja/__init__.py
diff --git a/api/funquail_api/contrib/maloja/funkwhale_ready.py b/api/funkwhale_api/contrib/maloja/funkwhale_ready.py
similarity index 100%
rename from api/funquail_api/contrib/maloja/funkwhale_ready.py
rename to api/funkwhale_api/contrib/maloja/funkwhale_ready.py
diff --git a/api/funquail_api/contrib/maloja/funkwhale_startup.py b/api/funkwhale_api/contrib/maloja/funkwhale_startup.py
similarity index 86%
rename from api/funquail_api/contrib/maloja/funkwhale_startup.py
rename to api/funkwhale_api/contrib/maloja/funkwhale_startup.py
index 508e81fab..dbe8ea0b0 100644
--- a/api/funquail_api/contrib/maloja/funkwhale_startup.py
+++ b/api/funkwhale_api/contrib/maloja/funkwhale_startup.py
@@ -4,7 +4,7 @@ PLUGIN = plugins.get_plugin_config(
     name="maloja",
     label="Maloja",
     description="A plugin that allows you to submit your listens to your Maloja server.",
-    homepage="https://funquail.laidback.moe/docs/users/builtinplugins.html#maloja-plugin",
+    homepage="https://funkwhale.laidback.moe/docs/users/builtinplugins.html#maloja-plugin",
     version="0.2",
     user=True,
     conf=[
diff --git a/api/funquail_api/contrib/scrobbler/README.rst b/api/funkwhale_api/contrib/scrobbler/README.rst
similarity index 100%
rename from api/funquail_api/contrib/scrobbler/README.rst
rename to api/funkwhale_api/contrib/scrobbler/README.rst
diff --git a/api/funquail_api/contrib/scrobbler/__init__.py b/api/funkwhale_api/contrib/scrobbler/__init__.py
similarity index 100%
rename from api/funquail_api/contrib/scrobbler/__init__.py
rename to api/funkwhale_api/contrib/scrobbler/__init__.py
diff --git a/api/funquail_api/contrib/scrobbler/funkwhale_ready.py b/api/funkwhale_api/contrib/scrobbler/funkwhale_ready.py
similarity index 100%
rename from api/funquail_api/contrib/scrobbler/funkwhale_ready.py
rename to api/funkwhale_api/contrib/scrobbler/funkwhale_ready.py
diff --git a/api/funquail_api/contrib/scrobbler/funkwhale_startup.py b/api/funkwhale_api/contrib/scrobbler/funkwhale_startup.py
similarity index 91%
rename from api/funquail_api/contrib/scrobbler/funkwhale_startup.py
rename to api/funkwhale_api/contrib/scrobbler/funkwhale_startup.py
index b77e69f88..4dd6558ec 100644
--- a/api/funquail_api/contrib/scrobbler/funkwhale_startup.py
+++ b/api/funkwhale_api/contrib/scrobbler/funkwhale_startup.py
@@ -7,7 +7,7 @@ PLUGIN = plugins.get_plugin_config(
         "A plugin that enables scrobbling to ListenBrainz and Last.fm. "
         "It must be configured on the server if you use Last.fm."
     ),
-    homepage="https://funquail.laidback.moe/docs/users/builtinplugins.html#scrobbler-plugin",  # noqa
+    homepage="https://funkwhale.laidback.moe/docs/users/builtinplugins.html#scrobbler-plugin",  # noqa
     version="0.1",
     user=True,
     conf=[
diff --git a/api/funquail_api/contrib/scrobbler/scrobbler.py b/api/funkwhale_api/contrib/scrobbler/scrobbler.py
similarity index 100%
rename from api/funquail_api/contrib/scrobbler/scrobbler.py
rename to api/funkwhale_api/contrib/scrobbler/scrobbler.py
diff --git a/api/funquail_api/contrib/sites/__init__.py b/api/funkwhale_api/contrib/sites/__init__.py
similarity index 100%
rename from api/funquail_api/contrib/sites/__init__.py
rename to api/funkwhale_api/contrib/sites/__init__.py
diff --git a/api/funquail_api/contrib/sites/migrations/0001_initial.py b/api/funkwhale_api/contrib/sites/migrations/0001_initial.py
similarity index 100%
rename from api/funquail_api/contrib/sites/migrations/0001_initial.py
rename to api/funkwhale_api/contrib/sites/migrations/0001_initial.py
diff --git a/api/funquail_api/contrib/sites/migrations/0002_set_site_domain_and_name.py b/api/funkwhale_api/contrib/sites/migrations/0002_set_site_domain_and_name.py
similarity index 91%
rename from api/funquail_api/contrib/sites/migrations/0002_set_site_domain_and_name.py
rename to api/funkwhale_api/contrib/sites/migrations/0002_set_site_domain_and_name.py
index 6fe9af0dc..7b091708c 100644
--- a/api/funquail_api/contrib/sites/migrations/0002_set_site_domain_and_name.py
+++ b/api/funkwhale_api/contrib/sites/migrations/0002_set_site_domain_and_name.py
@@ -10,7 +10,7 @@ def update_site_forward(apps, schema_editor):
     Site = apps.get_model("sites", "Site")
     Site.objects.update_or_create(
         id=settings.SITE_ID,
-        defaults={"domain": "funkwhale.io", "name": "funquail_api"},
+        defaults={"domain": "funkwhale.io", "name": "funkwhale_api"},
     )
 
 
diff --git a/api/funquail_api/contrib/sites/migrations/0003_auto_20171214_2205.py b/api/funkwhale_api/contrib/sites/migrations/0003_auto_20171214_2205.py
similarity index 100%
rename from api/funquail_api/contrib/sites/migrations/0003_auto_20171214_2205.py
rename to api/funkwhale_api/contrib/sites/migrations/0003_auto_20171214_2205.py
diff --git a/api/funquail_api/contrib/sites/migrations/0004_alter_site_options.py b/api/funkwhale_api/contrib/sites/migrations/0004_alter_site_options.py
similarity index 100%
rename from api/funquail_api/contrib/sites/migrations/0004_alter_site_options.py
rename to api/funkwhale_api/contrib/sites/migrations/0004_alter_site_options.py
diff --git a/api/funquail_api/contrib/sites/migrations/__init__.py b/api/funkwhale_api/contrib/sites/migrations/__init__.py
similarity index 100%
rename from api/funquail_api/contrib/sites/migrations/__init__.py
rename to api/funkwhale_api/contrib/sites/migrations/__init__.py
diff --git a/api/funquail_api/factories.py b/api/funkwhale_api/factories.py
similarity index 100%
rename from api/funquail_api/factories.py
rename to api/funkwhale_api/factories.py
diff --git a/api/funquail_api/favorites/__init__.py b/api/funkwhale_api/favorites/__init__.py
similarity index 100%
rename from api/funquail_api/favorites/__init__.py
rename to api/funkwhale_api/favorites/__init__.py
diff --git a/api/funquail_api/favorites/activities.py b/api/funkwhale_api/favorites/activities.py
similarity index 83%
rename from api/funquail_api/favorites/activities.py
rename to api/funkwhale_api/favorites/activities.py
index 108705aad..294194e06 100644
--- a/api/funquail_api/favorites/activities.py
+++ b/api/funkwhale_api/favorites/activities.py
@@ -1,5 +1,5 @@
-from funquail_api.activity import record
-from funquail_api.common import channels
+from funkwhale_api.activity import record
+from funkwhale_api.common import channels
 
 from . import serializers
 
diff --git a/api/funquail_api/favorites/admin.py b/api/funkwhale_api/favorites/admin.py
similarity index 83%
rename from api/funquail_api/favorites/admin.py
rename to api/funkwhale_api/favorites/admin.py
index 9a42e7a5c..05530b0c6 100644
--- a/api/funquail_api/favorites/admin.py
+++ b/api/funkwhale_api/favorites/admin.py
@@ -1,4 +1,4 @@
-from funquail_api.common import admin
+from funkwhale_api.common import admin
 
 from . import models
 
diff --git a/api/funquail_api/favorites/consumers.py b/api/funkwhale_api/favorites/consumers.py
similarity index 100%
rename from api/funquail_api/favorites/consumers.py
rename to api/funkwhale_api/favorites/consumers.py
diff --git a/api/funquail_api/favorites/factories.py b/api/funkwhale_api/favorites/factories.py
similarity index 60%
rename from api/funquail_api/favorites/factories.py
rename to api/funkwhale_api/favorites/factories.py
index 818aa8e4b..df2f47335 100644
--- a/api/funquail_api/favorites/factories.py
+++ b/api/funkwhale_api/favorites/factories.py
@@ -1,8 +1,8 @@
 import factory
 
-from funquail_api.factories import NoUpdateOnCreate, registry
-from funquail_api.music.factories import TrackFactory
-from funquail_api.users.factories import UserFactory
+from funkwhale_api.factories import NoUpdateOnCreate, registry
+from funkwhale_api.music.factories import TrackFactory
+from funkwhale_api.users.factories import UserFactory
 
 
 @registry.register
diff --git a/api/funquail_api/favorites/filters.py b/api/funkwhale_api/favorites/filters.py
similarity index 74%
rename from api/funquail_api/favorites/filters.py
rename to api/funkwhale_api/favorites/filters.py
index 1cee53200..32c07a646 100644
--- a/api/funquail_api/favorites/filters.py
+++ b/api/funkwhale_api/favorites/filters.py
@@ -1,6 +1,6 @@
-from funquail_api.common import fields
-from funquail_api.common import filters as common_filters
-from funquail_api.moderation import filters as moderation_filters
+from funkwhale_api.common import fields
+from funkwhale_api.common import filters as common_filters
+from funkwhale_api.moderation import filters as moderation_filters
 
 from . import models
 
diff --git a/api/funquail_api/favorites/migrations/0001_initial.py b/api/funkwhale_api/favorites/migrations/0001_initial.py
similarity index 100%
rename from api/funquail_api/favorites/migrations/0001_initial.py
rename to api/funkwhale_api/favorites/migrations/0001_initial.py
diff --git a/api/funquail_api/favorites/migrations/__init__.py b/api/funkwhale_api/favorites/migrations/__init__.py
similarity index 100%
rename from api/funquail_api/favorites/migrations/__init__.py
rename to api/funkwhale_api/favorites/migrations/__init__.py
diff --git a/api/funquail_api/favorites/models.py b/api/funkwhale_api/favorites/models.py
similarity index 94%
rename from api/funquail_api/favorites/models.py
rename to api/funkwhale_api/favorites/models.py
index 6f29a9008..5cba39f35 100644
--- a/api/funquail_api/favorites/models.py
+++ b/api/funkwhale_api/favorites/models.py
@@ -1,7 +1,7 @@
 from django.db import models
 from django.utils import timezone
 
-from funquail_api.music.models import Track
+from funkwhale_api.music.models import Track
 
 
 class TrackFavorite(models.Model):
diff --git a/api/funquail_api/favorites/serializers.py b/api/funkwhale_api/favorites/serializers.py
similarity index 84%
rename from api/funquail_api/favorites/serializers.py
rename to api/funkwhale_api/favorites/serializers.py
index 3eb4107ff..205732b74 100644
--- a/api/funquail_api/favorites/serializers.py
+++ b/api/funkwhale_api/favorites/serializers.py
@@ -1,10 +1,10 @@
 from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers
 
-from funquail_api.activity import serializers as activity_serializers
-from funquail_api.federation import serializers as federation_serializers
-from funquail_api.music.serializers import TrackActivitySerializer, TrackSerializer
-from funquail_api.users.serializers import UserActivitySerializer, UserBasicSerializer
+from funkwhale_api.activity import serializers as activity_serializers
+from funkwhale_api.federation import serializers as federation_serializers
+from funkwhale_api.music.serializers import TrackActivitySerializer, TrackSerializer
+from funkwhale_api.users.serializers import UserActivitySerializer, UserBasicSerializer
 
 from . import models
 
diff --git a/api/funquail_api/favorites/urls.py b/api/funkwhale_api/favorites/urls.py
similarity index 78%
rename from api/funquail_api/favorites/urls.py
rename to api/funkwhale_api/favorites/urls.py
index ec49f95d1..51f307803 100644
--- a/api/funquail_api/favorites/urls.py
+++ b/api/funkwhale_api/favorites/urls.py
@@ -1,4 +1,4 @@
-from funquail_api.common import routers
+from funkwhale_api.common import routers
 
 from . import views
 
diff --git a/api/funquail_api/favorites/views.py b/api/funkwhale_api/favorites/views.py
similarity index 93%
rename from api/funquail_api/favorites/views.py
rename to api/funkwhale_api/favorites/views.py
index b2414c692..6a87d3b15 100644
--- a/api/funquail_api/favorites/views.py
+++ b/api/funkwhale_api/favorites/views.py
@@ -4,11 +4,11 @@ from rest_framework import mixins, status, viewsets
 from rest_framework.decorators import action
 from rest_framework.response import Response
 
-from funquail_api.activity import record
-from funquail_api.common import fields, permissions
-from funquail_api.music import utils as music_utils
-from funquail_api.music.models import Track
-from funquail_api.users.oauth import permissions as oauth_permissions
+from funkwhale_api.activity import record
+from funkwhale_api.common import fields, permissions
+from funkwhale_api.music import utils as music_utils
+from funkwhale_api.music.models import Track
+from funkwhale_api.users.oauth import permissions as oauth_permissions
 
 from . import filters, models, serializers
 
diff --git a/api/funquail_api/federation/__init__.py b/api/funkwhale_api/federation/__init__.py
similarity index 100%
rename from api/funquail_api/federation/__init__.py
rename to api/funkwhale_api/federation/__init__.py
diff --git a/api/funquail_api/federation/activity.py b/api/funkwhale_api/federation/activity.py
similarity index 98%
rename from api/funquail_api/federation/activity.py
rename to api/funkwhale_api/federation/activity.py
index 13d7418de..593ab0dd0 100644
--- a/api/funquail_api/federation/activity.py
+++ b/api/funkwhale_api/federation/activity.py
@@ -7,8 +7,8 @@ from django.core.cache import cache
 from django.db import IntegrityError, transaction
 from django.db.models import Q
 
-from funquail_api.common import channels
-from funquail_api.common import utils as funkwhale_utils
+from funkwhale_api.common import channels
+from funkwhale_api.common import utils as funkwhale_utils
 
 from . import contexts
 
@@ -91,7 +91,7 @@ def should_reject(fid, actor_id=None, payload={}):
     if fid is None and actor_id is None:
         return False
 
-    from funquail_api.moderation import models as moderation_models
+    from funkwhale_api.moderation import models as moderation_models
 
     policies = moderation_models.InstancePolicy.objects.active()
 
@@ -119,7 +119,7 @@ def should_reject(fid, actor_id=None, payload={}):
 
 @transaction.atomic
 def receive(activity, on_behalf_of, inbox_actor=None):
-    from funquail_api.moderation import mrf
+    from funkwhale_api.moderation import mrf
 
     from . import models, serializers, tasks
     from .routes import inbox
@@ -301,7 +301,7 @@ class OutboxRouter(Router):
         and may yield data that should be persisted in the Activity model
         for further delivery.
         """
-        from funquail_api.common import preferences
+        from funkwhale_api.common import preferences
 
         from . import models, tasks
 
diff --git a/api/funquail_api/federation/actors.py b/api/funkwhale_api/federation/actors.py
similarity index 94%
rename from api/funquail_api/federation/actors.py
rename to api/funkwhale_api/federation/actors.py
index 319571ebf..86864d591 100644
--- a/api/funquail_api/federation/actors.py
+++ b/api/funkwhale_api/federation/actors.py
@@ -4,8 +4,8 @@ import logging
 from django.conf import settings
 from django.utils import timezone
 
-from funquail_api.common import preferences, session
-from funquail_api.users import models as users_models
+from funkwhale_api.common import preferences, session
+from funkwhale_api.users import models as users_models
 
 from . import keys, models, serializers
 
diff --git a/api/funquail_api/federation/admin.py b/api/funkwhale_api/federation/admin.py
similarity index 98%
rename from api/funquail_api/federation/admin.py
rename to api/funkwhale_api/federation/admin.py
index 33ca59e38..f7d079c93 100644
--- a/api/funquail_api/federation/admin.py
+++ b/api/funkwhale_api/federation/admin.py
@@ -1,4 +1,4 @@
-from funquail_api.common import admin
+from funkwhale_api.common import admin
 
 from . import models, tasks
 
diff --git a/api/funquail_api/federation/api_serializers.py b/api/funkwhale_api/federation/api_serializers.py
similarity index 96%
rename from api/funquail_api/federation/api_serializers.py
rename to api/funkwhale_api/federation/api_serializers.py
index ea2ecf85c..bee31bbeb 100644
--- a/api/funquail_api/federation/api_serializers.py
+++ b/api/funkwhale_api/federation/api_serializers.py
@@ -8,11 +8,11 @@ from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers
 
-from funquail_api.audio import models as audio_models
-from funquail_api.common import fields as common_fields
-from funquail_api.common import serializers as common_serializers
-from funquail_api.music import models as music_models
-from funquail_api.users import serializers as users_serializers
+from funkwhale_api.audio import models as audio_models
+from funkwhale_api.common import fields as common_fields
+from funkwhale_api.common import serializers as common_serializers
+from funkwhale_api.music import models as music_models
+from funkwhale_api.users import serializers as users_serializers
 
 from . import filters, models
 from . import serializers as federation_serializers
diff --git a/api/funquail_api/federation/api_urls.py b/api/funkwhale_api/federation/api_urls.py
similarity index 92%
rename from api/funquail_api/federation/api_urls.py
rename to api/funkwhale_api/federation/api_urls.py
index 6bc945026..df5bfb2f0 100644
--- a/api/funquail_api/federation/api_urls.py
+++ b/api/funkwhale_api/federation/api_urls.py
@@ -1,4 +1,4 @@
-from funquail_api.common import routers
+from funkwhale_api.common import routers
 
 from . import api_views
 
diff --git a/api/funquail_api/federation/api_views.py b/api/funkwhale_api/federation/api_views.py
similarity index 96%
rename from api/funquail_api/federation/api_views.py
rename to api/funkwhale_api/federation/api_views.py
index 642890762..94d9817f3 100644
--- a/api/funquail_api/federation/api_views.py
+++ b/api/funkwhale_api/federation/api_views.py
@@ -5,13 +5,13 @@ from django.db.models import Count, Q
 from drf_spectacular.utils import extend_schema, extend_schema_view
 from rest_framework import decorators, mixins, permissions, response, viewsets
 
-from funquail_api.common import preferences
-from funquail_api.common import utils as common_utils
-from funquail_api.common.permissions import ConditionalAuthentication
-from funquail_api.music import models as music_models
-from funquail_api.music import serializers as music_serializers
-from funquail_api.music import views as music_views
-from funquail_api.users.oauth import permissions as oauth_permissions
+from funkwhale_api.common import preferences
+from funkwhale_api.common import utils as common_utils
+from funkwhale_api.common.permissions import ConditionalAuthentication
+from funkwhale_api.music import models as music_models
+from funkwhale_api.music import serializers as music_serializers
+from funkwhale_api.music import views as music_views
+from funkwhale_api.users.oauth import permissions as oauth_permissions
 
 from . import (
     activity,
diff --git a/api/funquail_api/federation/authentication.py b/api/funkwhale_api/federation/authentication.py
similarity index 97%
rename from api/funquail_api/federation/authentication.py
rename to api/funkwhale_api/federation/authentication.py
index b7ab580ec..171b66106 100644
--- a/api/funquail_api/federation/authentication.py
+++ b/api/funkwhale_api/federation/authentication.py
@@ -8,8 +8,8 @@ from django.utils import timezone
 from rest_framework import authentication
 from rest_framework import exceptions as rest_exceptions
 
-from funquail_api.common import preferences
-from funquail_api.moderation import models as moderation_models
+from funkwhale_api.common import preferences
+from funkwhale_api.moderation import models as moderation_models
 
 from . import actors, exceptions, keys, models, signing, tasks, utils
 
diff --git a/api/funquail_api/federation/contexts.py b/api/funkwhale_api/federation/contexts.py
similarity index 99%
rename from api/funquail_api/federation/contexts.py
rename to api/funkwhale_api/federation/contexts.py
index 08308b2c1..01b06b743 100644
--- a/api/funquail_api/federation/contexts.py
+++ b/api/funkwhale_api/federation/contexts.py
@@ -281,13 +281,13 @@ CONTEXTS = [
     {
         "shortId": "FW",
         "contextUrl": None,
-        "documentUrl": "https://funquail.laidback.moe/ns",
+        "documentUrl": "https://funkwhale.laidback.moe/ns",
         "document": {
             "@context": {
                 "id": "@id",
                 "type": "@type",
                 "as": "https://www.w3.org/ns/activitystreams#",
-                "fw": "https://funquail.laidback.moe/ns#",
+                "fw": "https://funkwhale.laidback.moe/ns#",
                 "schema": "http://schema.org#",
                 "xsd": "http://www.w3.org/2001/XMLSchema#",
                 "Album": "fw:Album",
diff --git a/api/funquail_api/federation/decorators.py b/api/funkwhale_api/federation/decorators.py
similarity index 97%
rename from api/funquail_api/federation/decorators.py
rename to api/funkwhale_api/federation/decorators.py
index 88ffba0f6..756054e39 100644
--- a/api/funquail_api/federation/decorators.py
+++ b/api/funkwhale_api/federation/decorators.py
@@ -2,7 +2,7 @@ from django.db import transaction
 from drf_spectacular.utils import OpenApiParameter, extend_schema
 from rest_framework import decorators, permissions, response, status
 
-from funquail_api.common import utils as common_utils
+from funkwhale_api.common import utils as common_utils
 
 from . import api_serializers, filters, models, tasks, utils
 
diff --git a/api/funquail_api/federation/dynamic_preferences_registry.py b/api/funkwhale_api/federation/dynamic_preferences_registry.py
similarity index 100%
rename from api/funquail_api/federation/dynamic_preferences_registry.py
rename to api/funkwhale_api/federation/dynamic_preferences_registry.py
diff --git a/api/funquail_api/federation/exceptions.py b/api/funkwhale_api/federation/exceptions.py
similarity index 100%
rename from api/funquail_api/federation/exceptions.py
rename to api/funkwhale_api/federation/exceptions.py
diff --git a/api/funquail_api/federation/factories.py b/api/funkwhale_api/federation/factories.py
similarity index 98%
rename from api/funquail_api/federation/factories.py
rename to api/funkwhale_api/federation/factories.py
index 280ae5fca..f6a20990b 100644
--- a/api/funquail_api/federation/factories.py
+++ b/api/funkwhale_api/federation/factories.py
@@ -7,8 +7,8 @@ from django.conf import settings
 from django.utils import timezone
 from django.utils.http import http_date
 
-from funquail_api.factories import NoUpdateOnCreate, registry
-from funquail_api.users import factories as user_factories
+from funkwhale_api.factories import NoUpdateOnCreate, registry
+from funkwhale_api.users import factories as user_factories
 
 from . import keys, models
 
@@ -137,7 +137,7 @@ class ActorFactory(NoUpdateOnCreate, factory.django.DjangoModelFactory):
     def local(self, create, extracted, **kwargs):
         if not extracted and not kwargs:
             return
-        from funquail_api.users.factories import UserFactory
+        from funkwhale_api.users.factories import UserFactory
 
         self.domain = models.Domain.objects.get_or_create(
             name=settings.FEDERATION_HOSTNAME
diff --git a/api/funquail_api/federation/fields.py b/api/funkwhale_api/federation/fields.py
similarity index 100%
rename from api/funquail_api/federation/fields.py
rename to api/funkwhale_api/federation/fields.py
diff --git a/api/funquail_api/federation/filters.py b/api/funkwhale_api/federation/filters.py
similarity index 97%
rename from api/funquail_api/federation/filters.py
rename to api/funkwhale_api/federation/filters.py
index b4124282f..a57bc4071 100644
--- a/api/funquail_api/federation/filters.py
+++ b/api/funkwhale_api/federation/filters.py
@@ -1,6 +1,6 @@
 import django_filters.widgets
 
-from funquail_api.common import fields
+from funkwhale_api.common import fields
 
 from . import models
 
diff --git a/api/funquail_api/federation/jsonld.py b/api/funkwhale_api/federation/jsonld.py
similarity index 99%
rename from api/funquail_api/federation/jsonld.py
rename to api/funkwhale_api/federation/jsonld.py
index 73d17ebc3..b5c5d5ba1 100644
--- a/api/funquail_api/federation/jsonld.py
+++ b/api/funkwhale_api/federation/jsonld.py
@@ -236,7 +236,7 @@ def get_default_context():
     return [
         "https://www.w3.org/ns/activitystreams",
         "https://w3id.org/security/v1",
-        "https://funquail.laidback.moe/ns",
+        "https://funkwhale.laidback.moe/ns",
         {
             "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
             "Hashtag": "as:Hashtag",
diff --git a/api/funquail_api/federation/keys.py b/api/funkwhale_api/federation/keys.py
similarity index 100%
rename from api/funquail_api/federation/keys.py
rename to api/funkwhale_api/federation/keys.py
diff --git a/api/funquail_api/federation/library.py b/api/funkwhale_api/federation/library.py
similarity index 97%
rename from api/funquail_api/federation/library.py
rename to api/funkwhale_api/federation/library.py
index 7a7e8a518..abd82d097 100644
--- a/api/funquail_api/federation/library.py
+++ b/api/funkwhale_api/federation/library.py
@@ -1,6 +1,6 @@
 import requests
 
-from funquail_api.common import session
+from funkwhale_api.common import session
 
 from . import serializers, signing
 
diff --git a/api/funquail_api/federation/management/__init__.py b/api/funkwhale_api/federation/management/__init__.py
similarity index 100%
rename from api/funquail_api/federation/management/__init__.py
rename to api/funkwhale_api/federation/management/__init__.py
diff --git a/api/funquail_api/federation/management/commands/__init__.py b/api/funkwhale_api/federation/management/commands/__init__.py
similarity index 100%
rename from api/funquail_api/federation/management/commands/__init__.py
rename to api/funkwhale_api/federation/management/commands/__init__.py
diff --git a/api/funquail_api/federation/management/commands/fix_federation_ids.py b/api/funkwhale_api/federation/management/commands/fix_federation_ids.py
similarity index 96%
rename from api/funquail_api/federation/management/commands/fix_federation_ids.py
rename to api/funkwhale_api/federation/management/commands/fix_federation_ids.py
index 1308374c4..2ee2eb8a1 100644
--- a/api/funquail_api/federation/management/commands/fix_federation_ids.py
+++ b/api/funkwhale_api/federation/management/commands/fix_federation_ids.py
@@ -1,8 +1,8 @@
 from django.core.management.base import BaseCommand, CommandError
 
-from funquail_api.common import utils
-from funquail_api.federation import models as federation_models
-from funquail_api.music import models as music_models
+from funkwhale_api.common import utils
+from funkwhale_api.federation import models as federation_models
+from funkwhale_api.music import models as music_models
 
 MODELS = [
     (music_models.Artist, ["fid"]),
diff --git a/api/funquail_api/federation/migrations/0001_initial.py b/api/funkwhale_api/federation/migrations/0001_initial.py
similarity index 100%
rename from api/funquail_api/federation/migrations/0001_initial.py
rename to api/funkwhale_api/federation/migrations/0001_initial.py
diff --git a/api/funquail_api/federation/migrations/0002_auto_20180403_1620.py b/api/funkwhale_api/federation/migrations/0002_auto_20180403_1620.py
similarity index 100%
rename from api/funquail_api/federation/migrations/0002_auto_20180403_1620.py
rename to api/funkwhale_api/federation/migrations/0002_auto_20180403_1620.py
diff --git a/api/funquail_api/federation/migrations/0003_auto_20180407_1010.py b/api/funkwhale_api/federation/migrations/0003_auto_20180407_1010.py
similarity index 100%
rename from api/funquail_api/federation/migrations/0003_auto_20180407_1010.py
rename to api/funkwhale_api/federation/migrations/0003_auto_20180407_1010.py
diff --git a/api/funquail_api/federation/migrations/0004_auto_20180410_2025.py b/api/funkwhale_api/federation/migrations/0004_auto_20180410_2025.py
similarity index 100%
rename from api/funquail_api/federation/migrations/0004_auto_20180410_2025.py
rename to api/funkwhale_api/federation/migrations/0004_auto_20180410_2025.py
diff --git a/api/funquail_api/federation/migrations/0005_auto_20180413_1723.py b/api/funkwhale_api/federation/migrations/0005_auto_20180413_1723.py
similarity index 88%
rename from api/funquail_api/federation/migrations/0005_auto_20180413_1723.py
rename to api/funkwhale_api/federation/migrations/0005_auto_20180413_1723.py
index 60c9ec0b8..0b2029e95 100644
--- a/api/funquail_api/federation/migrations/0005_auto_20180413_1723.py
+++ b/api/funkwhale_api/federation/migrations/0005_auto_20180413_1723.py
@@ -3,7 +3,7 @@
 import django.contrib.postgres.fields.jsonb
 import django.core.serializers.json
 from django.db import migrations, models
-import funquail_api.federation.models
+import funkwhale_api.federation.models
 
 
 class Migration(migrations.Migration):
@@ -17,7 +17,7 @@ class Migration(migrations.Migration):
             field=models.FileField(
                 blank=True,
                 null=True,
-                upload_to=funquail_api.federation.models.get_file_path,
+                upload_to=funkwhale_api.federation.models.get_file_path,
             ),
         ),
         migrations.AlterField(
diff --git a/api/funquail_api/federation/migrations/0006_auto_20180521_1702.py b/api/funkwhale_api/federation/migrations/0006_auto_20180521_1702.py
similarity index 100%
rename from api/funquail_api/federation/migrations/0006_auto_20180521_1702.py
rename to api/funkwhale_api/federation/migrations/0006_auto_20180521_1702.py
diff --git a/api/funquail_api/federation/migrations/0007_auto_20180807_1748.py b/api/funkwhale_api/federation/migrations/0007_auto_20180807_1748.py
similarity index 100%
rename from api/funquail_api/federation/migrations/0007_auto_20180807_1748.py
rename to api/funkwhale_api/federation/migrations/0007_auto_20180807_1748.py
diff --git a/api/funquail_api/federation/migrations/0008_auto_20180807_1748.py b/api/funkwhale_api/federation/migrations/0008_auto_20180807_1748.py
similarity index 100%
rename from api/funquail_api/federation/migrations/0008_auto_20180807_1748.py
rename to api/funkwhale_api/federation/migrations/0008_auto_20180807_1748.py
diff --git a/api/funquail_api/federation/migrations/0009_auto_20180822_1956.py b/api/funkwhale_api/federation/migrations/0009_auto_20180822_1956.py
similarity index 88%
rename from api/funquail_api/federation/migrations/0009_auto_20180822_1956.py
rename to api/funkwhale_api/federation/migrations/0009_auto_20180822_1956.py
index 6e49c726a..042a86143 100644
--- a/api/funquail_api/federation/migrations/0009_auto_20180822_1956.py
+++ b/api/funkwhale_api/federation/migrations/0009_auto_20180822_1956.py
@@ -4,7 +4,7 @@ import django.contrib.postgres.fields.jsonb
 import django.core.serializers.json
 from django.db import migrations, models
 import django.db.models.deletion
-import funquail_api.federation.models
+import funkwhale_api.federation.models
 
 
 class Migration(migrations.Migration):
@@ -27,7 +27,7 @@ class Migration(migrations.Migration):
             model_name="activity",
             name="payload",
             field=django.contrib.postgres.fields.jsonb.JSONField(
-                default=funquail_api.federation.models.empty_dict,
+                default=funkwhale_api.federation.models.empty_dict,
                 encoder=django.core.serializers.json.DjangoJSONEncoder,
                 max_length=50000,
             ),
@@ -36,7 +36,7 @@ class Migration(migrations.Migration):
             model_name="librarytrack",
             name="metadata",
             field=django.contrib.postgres.fields.jsonb.JSONField(
-                default=funquail_api.federation.models.empty_dict,
+                default=funkwhale_api.federation.models.empty_dict,
                 encoder=django.core.serializers.json.DjangoJSONEncoder,
                 max_length=10000,
             ),
diff --git a/api/funquail_api/federation/migrations/0010_auto_20180904_2011.py b/api/funkwhale_api/federation/migrations/0010_auto_20180904_2011.py
similarity index 100%
rename from api/funquail_api/federation/migrations/0010_auto_20180904_2011.py
rename to api/funkwhale_api/federation/migrations/0010_auto_20180904_2011.py
diff --git a/api/funquail_api/federation/migrations/0011_auto_20180910_1902.py b/api/funkwhale_api/federation/migrations/0011_auto_20180910_1902.py
similarity index 100%
rename from api/funquail_api/federation/migrations/0011_auto_20180910_1902.py
rename to api/funkwhale_api/federation/migrations/0011_auto_20180910_1902.py
diff --git a/api/funquail_api/federation/migrations/0012_auto_20180920_1803.py b/api/funkwhale_api/federation/migrations/0012_auto_20180920_1803.py
similarity index 100%
rename from api/funquail_api/federation/migrations/0012_auto_20180920_1803.py
rename to api/funkwhale_api/federation/migrations/0012_auto_20180920_1803.py
diff --git a/api/funquail_api/federation/migrations/0013_auto_20181226_1935.py b/api/funkwhale_api/federation/migrations/0013_auto_20181226_1935.py
similarity index 100%
rename from api/funquail_api/federation/migrations/0013_auto_20181226_1935.py
rename to api/funkwhale_api/federation/migrations/0013_auto_20181226_1935.py
diff --git a/api/funquail_api/federation/migrations/0014_auto_20181205_0958.py b/api/funkwhale_api/federation/migrations/0014_auto_20181205_0958.py
similarity index 100%
rename from api/funquail_api/federation/migrations/0014_auto_20181205_0958.py
rename to api/funkwhale_api/federation/migrations/0014_auto_20181205_0958.py
diff --git a/api/funquail_api/federation/migrations/0015_populate_domains.py b/api/funkwhale_api/federation/migrations/0015_populate_domains.py
similarity index 100%
rename from api/funquail_api/federation/migrations/0015_populate_domains.py
rename to api/funkwhale_api/federation/migrations/0015_populate_domains.py
diff --git a/api/funquail_api/federation/migrations/0016_auto_20181227_1605.py b/api/funkwhale_api/federation/migrations/0016_auto_20181227_1605.py
similarity index 83%
rename from api/funquail_api/federation/migrations/0016_auto_20181227_1605.py
rename to api/funkwhale_api/federation/migrations/0016_auto_20181227_1605.py
index 3fe75be9c..8b705e72f 100644
--- a/api/funquail_api/federation/migrations/0016_auto_20181227_1605.py
+++ b/api/funkwhale_api/federation/migrations/0016_auto_20181227_1605.py
@@ -2,7 +2,7 @@
 
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations, models
-import funquail_api.federation.models
+import funkwhale_api.federation.models
 
 
 class Migration(migrations.Migration):
@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
             model_name="domain",
             name="nodeinfo",
             field=django.contrib.postgres.fields.jsonb.JSONField(
-                default=funquail_api.federation.models.empty_dict, max_length=50000
+                default=funkwhale_api.federation.models.empty_dict, max_length=50000
             ),
         ),
         migrations.AddField(
diff --git a/api/funquail_api/federation/migrations/0017_auto_20190130_0926.py b/api/funkwhale_api/federation/migrations/0017_auto_20190130_0926.py
similarity index 80%
rename from api/funquail_api/federation/migrations/0017_auto_20190130_0926.py
rename to api/funkwhale_api/federation/migrations/0017_auto_20190130_0926.py
index 194010242..7c025fa48 100644
--- a/api/funquail_api/federation/migrations/0017_auto_20190130_0926.py
+++ b/api/funkwhale_api/federation/migrations/0017_auto_20190130_0926.py
@@ -3,8 +3,8 @@
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations, models
 import django.db.models.deletion
-import funquail_api.common.validators
-import funquail_api.federation.models
+import funkwhale_api.common.validators
+import funkwhale_api.federation.models
 
 
 class Migration(migrations.Migration):
@@ -26,11 +26,11 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='domain',
             name='name',
-            field=models.CharField(max_length=255, primary_key=True, serialize=False, validators=[funquail_api.common.validators.DomainValidator()]),
+            field=models.CharField(max_length=255, primary_key=True, serialize=False, validators=[funkwhale_api.common.validators.DomainValidator()]),
         ),
         migrations.AlterField(
             model_name='domain',
             name='nodeinfo',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funquail_api.federation.models.empty_dict, max_length=50000),
+            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funkwhale_api.federation.models.empty_dict, max_length=50000),
         ),
     ]
diff --git a/api/funquail_api/federation/migrations/0018_fetch.py b/api/funkwhale_api/federation/migrations/0018_fetch.py
similarity index 89%
rename from api/funquail_api/federation/migrations/0018_fetch.py
rename to api/funkwhale_api/federation/migrations/0018_fetch.py
index 010672b19..11789024f 100644
--- a/api/funquail_api/federation/migrations/0018_fetch.py
+++ b/api/funkwhale_api/federation/migrations/0018_fetch.py
@@ -5,7 +5,7 @@ import django.core.serializers.json
 from django.db import migrations, models
 import django.db.models.deletion
 import django.utils.timezone
-import funquail_api.federation.models
+import funkwhale_api.federation.models
 
 
 class Migration(migrations.Migration):
@@ -25,7 +25,7 @@ class Migration(migrations.Migration):
                 ('fetch_date', models.DateTimeField(blank=True, null=True)),
                 ('object_id', models.IntegerField(null=True)),
                 ('status', models.CharField(choices=[('pending', 'Pending'), ('errored', 'Errored'), ('finished', 'Finished'), ('skipped', 'Skipped')], default='pending', max_length=20)),
-                ('detail', django.contrib.postgres.fields.jsonb.JSONField(default=funquail_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000)),
+                ('detail', django.contrib.postgres.fields.jsonb.JSONField(default=funkwhale_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000)),
                 ('actor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='fetches', to='federation.Actor')),
                 ('object_content_type', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')),
             ],
diff --git a/api/funquail_api/federation/migrations/0019_auto_20190611_0851.py b/api/funkwhale_api/federation/migrations/0019_auto_20190611_0851.py
similarity index 92%
rename from api/funquail_api/federation/migrations/0019_auto_20190611_0851.py
rename to api/funkwhale_api/federation/migrations/0019_auto_20190611_0851.py
index 1c72d4bb4..4ae5e31fb 100644
--- a/api/funquail_api/federation/migrations/0019_auto_20190611_0851.py
+++ b/api/funkwhale_api/federation/migrations/0019_auto_20190611_0851.py
@@ -3,7 +3,7 @@
 import django.contrib.postgres.fields.jsonb
 import django.core.serializers.json
 from django.db import migrations, models
-import funquail_api.federation.models
+import funkwhale_api.federation.models
 
 
 class Migration(migrations.Migration):
diff --git a/api/funquail_api/federation/migrations/0020_auto_20190730_0846.py b/api/funkwhale_api/federation/migrations/0020_auto_20190730_0846.py
similarity index 64%
rename from api/funquail_api/federation/migrations/0020_auto_20190730_0846.py
rename to api/funkwhale_api/federation/migrations/0020_auto_20190730_0846.py
index 1ab5dab0b..efed1d306 100644
--- a/api/funquail_api/federation/migrations/0020_auto_20190730_0846.py
+++ b/api/funkwhale_api/federation/migrations/0020_auto_20190730_0846.py
@@ -3,7 +3,7 @@
 import django.contrib.postgres.fields.jsonb
 import django.core.serializers.json
 from django.db import migrations
-import funquail_api.federation.models
+import funkwhale_api.federation.models
 
 
 class Migration(migrations.Migration):
@@ -16,16 +16,16 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='activity',
             name='payload',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funquail_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
+            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funkwhale_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
         ),
         migrations.AlterField(
             model_name='fetch',
             name='detail',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funquail_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
+            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funkwhale_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
         ),
         migrations.AlterField(
             model_name='librarytrack',
             name='metadata',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funquail_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=10000),
+            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funkwhale_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=10000),
         ),
     ]
diff --git a/api/funquail_api/federation/migrations/0021_auto_20191029_1257.py b/api/funkwhale_api/federation/migrations/0021_auto_20191029_1257.py
similarity index 100%
rename from api/funquail_api/federation/migrations/0021_auto_20191029_1257.py
rename to api/funkwhale_api/federation/migrations/0021_auto_20191029_1257.py
diff --git a/api/funquail_api/federation/migrations/0022_auto_20191204_1539.py b/api/funkwhale_api/federation/migrations/0022_auto_20191204_1539.py
similarity index 100%
rename from api/funquail_api/federation/migrations/0022_auto_20191204_1539.py
rename to api/funkwhale_api/federation/migrations/0022_auto_20191204_1539.py
diff --git a/api/funquail_api/federation/migrations/0023_actor_summary_obj.py b/api/funkwhale_api/federation/migrations/0023_actor_summary_obj.py
similarity index 100%
rename from api/funquail_api/federation/migrations/0023_actor_summary_obj.py
rename to api/funkwhale_api/federation/migrations/0023_actor_summary_obj.py
diff --git a/api/funquail_api/federation/migrations/0024_actor_attachment_icon.py b/api/funkwhale_api/federation/migrations/0024_actor_attachment_icon.py
similarity index 100%
rename from api/funquail_api/federation/migrations/0024_actor_attachment_icon.py
rename to api/funkwhale_api/federation/migrations/0024_actor_attachment_icon.py
diff --git a/api/funquail_api/federation/migrations/0025_auto_20200317_0820.py b/api/funkwhale_api/federation/migrations/0025_auto_20200317_0820.py
similarity index 100%
rename from api/funquail_api/federation/migrations/0025_auto_20200317_0820.py
rename to api/funkwhale_api/federation/migrations/0025_auto_20200317_0820.py
diff --git a/api/funquail_api/federation/migrations/0026_public_key_format.py b/api/funkwhale_api/federation/migrations/0026_public_key_format.py
similarity index 100%
rename from api/funquail_api/federation/migrations/0026_public_key_format.py
rename to api/funkwhale_api/federation/migrations/0026_public_key_format.py
diff --git a/api/funquail_api/federation/migrations/0027_auto_20220627_1915.py b/api/funkwhale_api/federation/migrations/0027_auto_20220627_1915.py
similarity index 64%
rename from api/funquail_api/federation/migrations/0027_auto_20220627_1915.py
rename to api/funkwhale_api/federation/migrations/0027_auto_20220627_1915.py
index eb5250a1a..1ec4e49f2 100644
--- a/api/funquail_api/federation/migrations/0027_auto_20220627_1915.py
+++ b/api/funkwhale_api/federation/migrations/0027_auto_20220627_1915.py
@@ -2,7 +2,7 @@
 
 import django.core.serializers.json
 from django.db import migrations, models
-import funquail_api.federation.models
+import funkwhale_api.federation.models
 
 
 class Migration(migrations.Migration):
@@ -15,7 +15,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='activity',
             name='payload',
-            field=models.JSONField(blank=True, default=funquail_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
+            field=models.JSONField(blank=True, default=funkwhale_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
         ),
         migrations.AlterField(
             model_name='actor',
@@ -25,12 +25,12 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='domain',
             name='nodeinfo',
-            field=models.JSONField(blank=True, default=funquail_api.federation.models.empty_dict, max_length=50000),
+            field=models.JSONField(blank=True, default=funkwhale_api.federation.models.empty_dict, max_length=50000),
         ),
         migrations.AlterField(
             model_name='fetch',
             name='detail',
-            field=models.JSONField(blank=True, default=funquail_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
+            field=models.JSONField(blank=True, default=funkwhale_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
         ),
         migrations.AlterField(
             model_name='follow',
@@ -45,6 +45,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='librarytrack',
             name='metadata',
-            field=models.JSONField(blank=True, default=funquail_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=10000),
+            field=models.JSONField(blank=True, default=funkwhale_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=10000),
         ),
     ]
diff --git a/api/funquail_api/federation/migrations/0028_auto_20221027_1141.py b/api/funkwhale_api/federation/migrations/0028_auto_20221027_1141.py
similarity index 100%
rename from api/funquail_api/federation/migrations/0028_auto_20221027_1141.py
rename to api/funkwhale_api/federation/migrations/0028_auto_20221027_1141.py
diff --git a/api/funquail_api/federation/migrations/__init__.py b/api/funkwhale_api/federation/migrations/__init__.py
similarity index 100%
rename from api/funquail_api/federation/migrations/__init__.py
rename to api/funkwhale_api/federation/migrations/__init__.py
diff --git a/api/funquail_api/federation/models.py b/api/funkwhale_api/federation/models.py
similarity index 97%
rename from api/funquail_api/federation/models.py
rename to api/funkwhale_api/federation/models.py
index 25f737a1f..8ead384df 100644
--- a/api/funquail_api/federation/models.py
+++ b/api/funkwhale_api/federation/models.py
@@ -14,10 +14,10 @@ from django.dispatch import receiver
 from django.urls import reverse
 from django.utils import timezone
 
-from funquail_api.common import session
-from funquail_api.common import utils as common_utils
-from funquail_api.common import validators as common_validators
-from funquail_api.music import utils as music_utils
+from funkwhale_api.common import session
+from funkwhale_api.common import utils as common_utils
+from funkwhale_api.common import validators as common_validators
+from funkwhale_api.music import utils as music_utils
 
 from . import utils as federation_utils
 
@@ -144,7 +144,7 @@ class Domain(models.Model):
         super().save(**kwargs)
 
     def get_stats(self):
-        from funquail_api.music import models as music_models
+        from funkwhale_api.music import models as music_models
 
         data = Domain.objects.filter(pk=self.pk).aggregate(
             outbox_activities=models.Count("actors__outbox_activities", distinct=True),
@@ -283,8 +283,8 @@ class Actor(models.Model):
         return data
 
     def get_stats(self):
-        from funquail_api.moderation import models as moderation_models
-        from funquail_api.music import models as music_models
+        from funkwhale_api.moderation import models as moderation_models
+        from funkwhale_api.music import models as music_models
 
         data = Actor.objects.filter(pk=self.pk).aggregate(
             outbox_activities=models.Count("outbox_activities", distinct=True),
@@ -618,7 +618,7 @@ def set_approved_updated(sender, instance, update_fields, **kwargs):
 
 @receiver(post_save, sender=LibraryFollow)
 def update_denormalization_follow_approved(sender, instance, created, **kwargs):
-    from funquail_api.music import models as music_models
+    from funkwhale_api.music import models as music_models
 
     updated = getattr(instance, "_approved_updated", False)
 
@@ -632,7 +632,7 @@ def update_denormalization_follow_approved(sender, instance, created, **kwargs):
 
 @receiver(post_delete, sender=LibraryFollow)
 def update_denormalization_follow_deleted(sender, instance, **kwargs):
-    from funquail_api.music import models as music_models
+    from funkwhale_api.music import models as music_models
 
     if instance.actor.is_local:
         music_models.TrackActor.objects.filter(
diff --git a/api/funquail_api/federation/mrf_policies.py b/api/funkwhale_api/federation/mrf_policies.py
similarity index 88%
rename from api/funquail_api/federation/mrf_policies.py
rename to api/funkwhale_api/federation/mrf_policies.py
index ffed293f0..df0ebd7a6 100644
--- a/api/funquail_api/federation/mrf_policies.py
+++ b/api/funkwhale_api/federation/mrf_policies.py
@@ -1,4 +1,4 @@
-from funquail_api.moderation import mrf
+from funkwhale_api.moderation import mrf
 
 from . import activity
 
diff --git a/api/funquail_api/federation/parsers.py b/api/funkwhale_api/federation/parsers.py
similarity index 100%
rename from api/funquail_api/federation/parsers.py
rename to api/funkwhale_api/federation/parsers.py
diff --git a/api/funquail_api/federation/renderers.py b/api/funkwhale_api/federation/renderers.py
similarity index 100%
rename from api/funquail_api/federation/renderers.py
rename to api/funkwhale_api/federation/renderers.py
diff --git a/api/funquail_api/federation/routes.py b/api/funkwhale_api/federation/routes.py
similarity index 99%
rename from api/funquail_api/federation/routes.py
rename to api/funkwhale_api/federation/routes.py
index 5ddec76f6..cd0b94b5c 100644
--- a/api/funquail_api/federation/routes.py
+++ b/api/funkwhale_api/federation/routes.py
@@ -3,7 +3,7 @@ import uuid
 
 from django.db.models import Q
 
-from funquail_api.music import models as music_models
+from funkwhale_api.music import models as music_models
 
 from . import activity, actors, models, serializers
 
diff --git a/api/funquail_api/federation/schema_org.py b/api/funkwhale_api/federation/schema_org.py
similarity index 100%
rename from api/funquail_api/federation/schema_org.py
rename to api/funkwhale_api/federation/schema_org.py
diff --git a/api/funquail_api/federation/serializers.py b/api/funkwhale_api/federation/serializers.py
similarity index 99%
rename from api/funquail_api/federation/serializers.py
rename to api/funkwhale_api/federation/serializers.py
index ee7cc32a5..c96cd8f38 100644
--- a/api/funquail_api/federation/serializers.py
+++ b/api/funkwhale_api/federation/serializers.py
@@ -10,15 +10,15 @@ from django.urls import reverse
 from django.utils import timezone
 from rest_framework import serializers
 
-from funquail_api.common import models as common_models
-from funquail_api.common import utils as common_utils
-from funquail_api.moderation import models as moderation_models
-from funquail_api.moderation import serializers as moderation_serializers
-from funquail_api.moderation import signals as moderation_signals
-from funquail_api.music import licenses
-from funquail_api.music import models as music_models
-from funquail_api.music import tasks as music_tasks
-from funquail_api.tags import models as tags_models
+from funkwhale_api.common import models as common_models
+from funkwhale_api.common import utils as common_utils
+from funkwhale_api.moderation import models as moderation_models
+from funkwhale_api.moderation import serializers as moderation_serializers
+from funkwhale_api.moderation import signals as moderation_signals
+from funkwhale_api.music import licenses
+from funkwhale_api.music import models as music_models
+from funkwhale_api.music import tasks as music_tasks
+from funkwhale_api.tags import models as tags_models
 
 from . import activity, actors, contexts, jsonld, models, utils
 
@@ -471,7 +471,7 @@ class ActorSerializer(jsonld.JsonLdSerializer):
 
 
 def create_or_update_channel(actor, rss_url, attributed_to_fid, **validated_data):
-    from funquail_api.audio import models as audio_models
+    from funkwhale_api.audio import models as audio_models
 
     attributed_to = actors.get_actor(attributed_to_fid)
     artist_defaults = {
@@ -1476,7 +1476,7 @@ class TrackSerializer(MusicEntitySerializer):
         return d
 
     def create(self, validated_data):
-        from funquail_api.music import tasks as music_tasks
+        from funkwhale_api.music import tasks as music_tasks
 
         references = {}
         actors_to_fetch = set()
diff --git a/api/funquail_api/federation/signing.py b/api/funkwhale_api/federation/signing.py
similarity index 100%
rename from api/funquail_api/federation/signing.py
rename to api/funkwhale_api/federation/signing.py
diff --git a/api/funquail_api/federation/spa_views.py b/api/funkwhale_api/federation/spa_views.py
similarity index 92%
rename from api/funquail_api/federation/spa_views.py
rename to api/funkwhale_api/federation/spa_views.py
index bb8d9b2be..caf62d876 100644
--- a/api/funquail_api/federation/spa_views.py
+++ b/api/funkwhale_api/federation/spa_views.py
@@ -1,8 +1,8 @@
 from django.conf import settings
 from rest_framework import serializers
 
-from funquail_api.common import middleware, preferences, utils
-from funquail_api.federation import utils as federation_utils
+from funkwhale_api.common import middleware, preferences, utils
+from funkwhale_api.federation import utils as federation_utils
 
 from . import models
 
diff --git a/api/funquail_api/federation/tasks.py b/api/funkwhale_api/federation/tasks.py
similarity index 98%
rename from api/funquail_api/federation/tasks.py
rename to api/funkwhale_api/federation/tasks.py
index 7b126f896..b0f638fc0 100644
--- a/api/funquail_api/federation/tasks.py
+++ b/api/funkwhale_api/federation/tasks.py
@@ -12,13 +12,13 @@ from django.utils import timezone
 from dynamic_preferences.registries import global_preferences_registry
 from requests.exceptions import RequestException
 
-from funquail_api.audio import models as audio_models
-from funquail_api.common import models as common_models
-from funquail_api.common import preferences, session
-from funquail_api.common import utils as common_utils
-from funquail_api.moderation import mrf
-from funquail_api.music import models as music_models
-from funquail_api.taskapp import celery
+from funkwhale_api.audio import models as audio_models
+from funkwhale_api.common import models as common_models
+from funkwhale_api.common import preferences, session
+from funkwhale_api.common import utils as common_utils
+from funkwhale_api.moderation import mrf
+from funkwhale_api.music import models as music_models
+from funkwhale_api.taskapp import celery
 
 from . import (
     activity,
diff --git a/api/funquail_api/federation/urls.py b/api/funkwhale_api/federation/urls.py
similarity index 100%
rename from api/funquail_api/federation/urls.py
rename to api/funkwhale_api/federation/urls.py
diff --git a/api/funquail_api/federation/utils.py b/api/funkwhale_api/federation/utils.py
similarity index 98%
rename from api/funquail_api/federation/utils.py
rename to api/funkwhale_api/federation/utils.py
index 4ad9f5b4a..2f6eb5706 100644
--- a/api/funquail_api/federation/utils.py
+++ b/api/funkwhale_api/federation/utils.py
@@ -8,8 +8,8 @@ from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import CharField, Q, Value
 
-from funquail_api.common import session
-from funquail_api.moderation import mrf
+from funkwhale_api.common import session
+from funkwhale_api.moderation import mrf
 
 from . import exceptions, signing
 
diff --git a/api/funquail_api/federation/views.py b/api/funkwhale_api/federation/views.py
similarity index 98%
rename from api/funquail_api/federation/views.py
rename to api/funkwhale_api/federation/views.py
index 655df18c5..99c988d51 100644
--- a/api/funquail_api/federation/views.py
+++ b/api/funkwhale_api/federation/views.py
@@ -7,12 +7,12 @@ from django.urls import reverse
 from rest_framework import exceptions, mixins, permissions, response, viewsets
 from rest_framework.decorators import action
 
-from funquail_api.common import preferences
-from funquail_api.common import utils as common_utils
-from funquail_api.federation import utils as federation_utils
-from funquail_api.moderation import models as moderation_models
-from funquail_api.music import models as music_models
-from funquail_api.music import utils as music_utils
+from funkwhale_api.common import preferences
+from funkwhale_api.common import utils as common_utils
+from funkwhale_api.federation import utils as federation_utils
+from funkwhale_api.moderation import models as moderation_models
+from funkwhale_api.music import models as music_models
+from funkwhale_api.music import utils as music_utils
 
 from . import (
     activity,
diff --git a/api/funquail_api/federation/webfinger.py b/api/funkwhale_api/federation/webfinger.py
similarity index 97%
rename from api/funquail_api/federation/webfinger.py
rename to api/funkwhale_api/federation/webfinger.py
index 0579eb0fc..1d46961f1 100644
--- a/api/funquail_api/federation/webfinger.py
+++ b/api/funkwhale_api/federation/webfinger.py
@@ -1,7 +1,7 @@
 from django import forms
 from django.conf import settings
 
-from funquail_api.common import session
+from funkwhale_api.common import session
 
 from . import serializers
 
diff --git a/api/funquail_api/history/__init__.py b/api/funkwhale_api/history/__init__.py
similarity index 100%
rename from api/funquail_api/history/__init__.py
rename to api/funkwhale_api/history/__init__.py
diff --git a/api/funquail_api/history/activities.py b/api/funkwhale_api/history/activities.py
similarity index 82%
rename from api/funquail_api/history/activities.py
rename to api/funkwhale_api/history/activities.py
index c268ab85b..b63de1f26 100644
--- a/api/funquail_api/history/activities.py
+++ b/api/funkwhale_api/history/activities.py
@@ -1,5 +1,5 @@
-from funquail_api.activity import record
-from funquail_api.common import channels
+from funkwhale_api.activity import record
+from funkwhale_api.common import channels
 
 from . import serializers
 
diff --git a/api/funquail_api/history/admin.py b/api/funkwhale_api/history/admin.py
similarity index 87%
rename from api/funquail_api/history/admin.py
rename to api/funkwhale_api/history/admin.py
index e84efa834..6aac94d0a 100644
--- a/api/funquail_api/history/admin.py
+++ b/api/funkwhale_api/history/admin.py
@@ -1,4 +1,4 @@
-from funquail_api.common import admin
+from funkwhale_api.common import admin
 
 from . import models
 
diff --git a/api/funquail_api/history/factories.py b/api/funkwhale_api/history/factories.py
similarity index 62%
rename from api/funquail_api/history/factories.py
rename to api/funkwhale_api/history/factories.py
index ed8afed33..bae8da505 100644
--- a/api/funquail_api/history/factories.py
+++ b/api/funkwhale_api/history/factories.py
@@ -1,8 +1,8 @@
 import factory
 
-from funquail_api.factories import NoUpdateOnCreate, registry
-from funquail_api.music import factories
-from funquail_api.users.factories import UserFactory
+from funkwhale_api.factories import NoUpdateOnCreate, registry
+from funkwhale_api.music import factories
+from funkwhale_api.users.factories import UserFactory
 
 
 @registry.register
diff --git a/api/funquail_api/history/filters.py b/api/funkwhale_api/history/filters.py
similarity index 80%
rename from api/funquail_api/history/filters.py
rename to api/funkwhale_api/history/filters.py
index 1c9de9027..1e88f1b22 100644
--- a/api/funquail_api/history/filters.py
+++ b/api/funkwhale_api/history/filters.py
@@ -1,7 +1,7 @@
 import django_filters
 
-from funquail_api.common import filters as common_filters
-from funquail_api.moderation import filters as moderation_filters
+from funkwhale_api.common import filters as common_filters
+from funkwhale_api.moderation import filters as moderation_filters
 
 from . import models
 
diff --git a/api/funquail_api/history/migrations/0001_initial.py b/api/funkwhale_api/history/migrations/0001_initial.py
similarity index 100%
rename from api/funquail_api/history/migrations/0001_initial.py
rename to api/funkwhale_api/history/migrations/0001_initial.py
diff --git a/api/funquail_api/history/migrations/0002_auto_20180325_1433.py b/api/funkwhale_api/history/migrations/0002_auto_20180325_1433.py
similarity index 100%
rename from api/funquail_api/history/migrations/0002_auto_20180325_1433.py
rename to api/funkwhale_api/history/migrations/0002_auto_20180325_1433.py
diff --git a/api/funquail_api/history/migrations/__init__.py b/api/funkwhale_api/history/migrations/__init__.py
similarity index 100%
rename from api/funquail_api/history/migrations/__init__.py
rename to api/funkwhale_api/history/migrations/__init__.py
diff --git a/api/funquail_api/history/models.py b/api/funkwhale_api/history/models.py
similarity index 93%
rename from api/funquail_api/history/models.py
rename to api/funkwhale_api/history/models.py
index d78d19520..648c16cd8 100644
--- a/api/funquail_api/history/models.py
+++ b/api/funkwhale_api/history/models.py
@@ -1,7 +1,7 @@
 from django.db import models
 from django.utils import timezone
 
-from funquail_api.music.models import Track
+from funkwhale_api.music.models import Track
 
 
 class Listening(models.Model):
diff --git a/api/funquail_api/history/serializers.py b/api/funkwhale_api/history/serializers.py
similarity index 83%
rename from api/funquail_api/history/serializers.py
rename to api/funkwhale_api/history/serializers.py
index 910c2adc1..66ce34f21 100644
--- a/api/funquail_api/history/serializers.py
+++ b/api/funkwhale_api/history/serializers.py
@@ -1,10 +1,10 @@
 from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers
 
-from funquail_api.activity import serializers as activity_serializers
-from funquail_api.federation import serializers as federation_serializers
-from funquail_api.music.serializers import TrackActivitySerializer, TrackSerializer
-from funquail_api.users.serializers import UserActivitySerializer, UserBasicSerializer
+from funkwhale_api.activity import serializers as activity_serializers
+from funkwhale_api.federation import serializers as federation_serializers
+from funkwhale_api.music.serializers import TrackActivitySerializer, TrackSerializer
+from funkwhale_api.users.serializers import UserActivitySerializer, UserBasicSerializer
 
 from . import models
 
diff --git a/api/funquail_api/history/urls.py b/api/funkwhale_api/history/urls.py
similarity index 79%
rename from api/funquail_api/history/urls.py
rename to api/funkwhale_api/history/urls.py
index 55b9430b3..c22e58062 100644
--- a/api/funquail_api/history/urls.py
+++ b/api/funkwhale_api/history/urls.py
@@ -1,4 +1,4 @@
-from funquail_api.common import routers
+from funkwhale_api.common import routers
 
 from . import views
 
diff --git a/api/funquail_api/history/views.py b/api/funkwhale_api/history/views.py
similarity index 87%
rename from api/funquail_api/history/views.py
rename to api/funkwhale_api/history/views.py
index 563d7bb2f..812ed38ae 100644
--- a/api/funquail_api/history/views.py
+++ b/api/funkwhale_api/history/views.py
@@ -2,11 +2,11 @@ from django.db.models import Prefetch
 from rest_framework import mixins, viewsets
 
 from config import plugins
-from funquail_api.activity import record
-from funquail_api.common import fields, permissions
-from funquail_api.music import utils as music_utils
-from funquail_api.music.models import Track
-from funquail_api.users.oauth import permissions as oauth_permissions
+from funkwhale_api.activity import record
+from funkwhale_api.common import fields, permissions
+from funkwhale_api.music import utils as music_utils
+from funkwhale_api.music.models import Track
+from funkwhale_api.users.oauth import permissions as oauth_permissions
 
 from . import filters, models, serializers
 
diff --git a/api/funquail_api/instance/__init__.py b/api/funkwhale_api/instance/__init__.py
similarity index 100%
rename from api/funquail_api/instance/__init__.py
rename to api/funkwhale_api/instance/__init__.py
diff --git a/api/funquail_api/instance/consumers.py b/api/funkwhale_api/instance/consumers.py
similarity index 73%
rename from api/funquail_api/instance/consumers.py
rename to api/funkwhale_api/instance/consumers.py
index 61a2bbe91..bb213a001 100644
--- a/api/funquail_api/instance/consumers.py
+++ b/api/funkwhale_api/instance/consumers.py
@@ -1,4 +1,4 @@
-from funquail_api.common.consumers import JsonAuthConsumer
+from funkwhale_api.common.consumers import JsonAuthConsumer
 
 
 class InstanceActivityConsumer(JsonAuthConsumer):
diff --git a/api/funquail_api/instance/dynamic_preferences_registry.py b/api/funkwhale_api/instance/dynamic_preferences_registry.py
similarity index 100%
rename from api/funquail_api/instance/dynamic_preferences_registry.py
rename to api/funkwhale_api/instance/dynamic_preferences_registry.py
diff --git a/api/funquail_api/instance/pwa-manifest.json b/api/funkwhale_api/instance/pwa-manifest.json
similarity index 100%
rename from api/funquail_api/instance/pwa-manifest.json
rename to api/funkwhale_api/instance/pwa-manifest.json
diff --git a/api/funquail_api/instance/serializers.py b/api/funkwhale_api/instance/serializers.py
similarity index 99%
rename from api/funquail_api/instance/serializers.py
rename to api/funkwhale_api/instance/serializers.py
index 33ccc7e63..6071d7582 100644
--- a/api/funquail_api/instance/serializers.py
+++ b/api/funkwhale_api/instance/serializers.py
@@ -1,7 +1,7 @@
 from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers
 
-from funquail_api.federation.utils import full_url
+from funkwhale_api.federation.utils import full_url
 
 
 class SoftwareSerializer(serializers.Serializer):
@@ -20,7 +20,7 @@ class SoftwareSerializer_v2(SoftwareSerializer):
         return "https://dev.funkwhale.audio/funkwhale/funkwhale"
 
     def get_homepage(self, obj):
-        return "https://funquail.laidback.moe"
+        return "https://funkwhale.laidback.moe"
 
 
 class ServicesSerializer(serializers.Serializer):
diff --git a/api/funquail_api/instance/stats.py b/api/funkwhale_api/instance/stats.py
similarity index 92%
rename from api/funquail_api/instance/stats.py
rename to api/funkwhale_api/instance/stats.py
index 0b588ed4b..9353eb53e 100644
--- a/api/funquail_api/instance/stats.py
+++ b/api/funkwhale_api/instance/stats.py
@@ -3,10 +3,10 @@ import datetime
 from django.db.models import Count, F, Sum
 from django.utils import timezone
 
-from funquail_api.favorites.models import TrackFavorite
-from funquail_api.history.models import Listening
-from funquail_api.music import models
-from funquail_api.users.models import User
+from funkwhale_api.favorites.models import TrackFavorite
+from funkwhale_api.history.models import Listening
+from funkwhale_api.music import models
+from funkwhale_api.users.models import User
 
 
 def get():
diff --git a/api/funquail_api/instance/urls.py b/api/funkwhale_api/instance/urls.py
similarity index 91%
rename from api/funquail_api/instance/urls.py
rename to api/funkwhale_api/instance/urls.py
index 0bc15a7bb..62baa5021 100644
--- a/api/funquail_api/instance/urls.py
+++ b/api/funkwhale_api/instance/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls import url
 
-from funquail_api.common import routers
+from funkwhale_api.common import routers
 
 from . import views
 
diff --git a/api/funquail_api/instance/urls_v2.py b/api/funkwhale_api/instance/urls_v2.py
similarity index 100%
rename from api/funquail_api/instance/urls_v2.py
rename to api/funkwhale_api/instance/urls_v2.py
diff --git a/api/funquail_api/instance/views.py b/api/funkwhale_api/instance/views.py
similarity index 93%
rename from api/funquail_api/instance/views.py
rename to api/funkwhale_api/instance/views.py
index f309d51ab..3272a95d8 100644
--- a/api/funquail_api/instance/views.py
+++ b/api/funkwhale_api/instance/views.py
@@ -14,14 +14,14 @@ from rest_framework import generics, views
 from rest_framework.renderers import JSONRenderer
 from rest_framework.response import Response
 
-from funquail_api import __version__ as funkwhale_version
-from funquail_api.common import preferences
-from funquail_api.common.renderers import ActivityStreamRenderer
-from funquail_api.federation.actors import get_service_actor
-from funquail_api.federation.models import Domain
-from funquail_api.moderation.models import REPORT_TYPES
-from funquail_api.music.utils import SUPPORTED_EXTENSIONS
-from funquail_api.users.oauth import permissions as oauth_permissions
+from funkwhale_api import __version__ as funkwhale_version
+from funkwhale_api.common import preferences
+from funkwhale_api.common.renderers import ActivityStreamRenderer
+from funkwhale_api.federation.actors import get_service_actor
+from funkwhale_api.federation.models import Domain
+from funkwhale_api.moderation.models import REPORT_TYPES
+from funkwhale_api.music.utils import SUPPORTED_EXTENSIONS
+from funkwhale_api.users.oauth import permissions as oauth_permissions
 
 from . import serializers, stats
 
diff --git a/api/funquail_api/main.py b/api/funkwhale_api/main.py
similarity index 94%
rename from api/funquail_api/main.py
rename to api/funkwhale_api/main.py
index b56628ef6..2a6ab18c2 100755
--- a/api/funquail_api/main.py
+++ b/api/funkwhale_api/main.py
@@ -21,7 +21,7 @@ def main():
     if len(sys.argv) > 1 and sys.argv[1] in ["fw", "funkwhale"]:
         django.setup()
 
-        from funquail_api.cli import main as cli
+        from funkwhale_api.cli import main as cli
 
         sys.argv = sys.argv[1:]
         cli.invoke()
diff --git a/api/funquail_api/manage/__init__.py b/api/funkwhale_api/manage/__init__.py
similarity index 100%
rename from api/funquail_api/manage/__init__.py
rename to api/funkwhale_api/manage/__init__.py
diff --git a/api/funquail_api/manage/filters.py b/api/funkwhale_api/manage/filters.py
similarity index 95%
rename from api/funquail_api/manage/filters.py
rename to api/funkwhale_api/manage/filters.py
index 2132a0660..fb283de99 100644
--- a/api/funquail_api/manage/filters.py
+++ b/api/funkwhale_api/manage/filters.py
@@ -3,18 +3,18 @@ from django import forms
 from django.db.models import Q
 from django_filters import rest_framework as filters
 
-from funquail_api.audio import models as audio_models
-from funquail_api.common import fields
-from funquail_api.common import filters as common_filters
-from funquail_api.common import search
-from funquail_api.federation import models as federation_models
-from funquail_api.federation import utils as federation_utils
-from funquail_api.moderation import models as moderation_models
-from funquail_api.moderation import serializers as moderation_serializers
-from funquail_api.moderation import utils as moderation_utils
-from funquail_api.music import models as music_models
-from funquail_api.tags import models as tags_models
-from funquail_api.users import models as users_models
+from funkwhale_api.audio import models as audio_models
+from funkwhale_api.common import fields
+from funkwhale_api.common import filters as common_filters
+from funkwhale_api.common import search
+from funkwhale_api.federation import models as federation_models
+from funkwhale_api.federation import utils as federation_utils
+from funkwhale_api.moderation import models as moderation_models
+from funkwhale_api.moderation import serializers as moderation_serializers
+from funkwhale_api.moderation import utils as moderation_utils
+from funkwhale_api.music import models as music_models
+from funkwhale_api.tags import models as tags_models
+from funkwhale_api.users import models as users_models
 
 
 class ActorField(forms.CharField):
diff --git a/api/funquail_api/manage/serializers.py b/api/funkwhale_api/manage/serializers.py
similarity index 96%
rename from api/funquail_api/manage/serializers.py
rename to api/funkwhale_api/manage/serializers.py
index 70e68e1c8..e097fc88f 100644
--- a/api/funquail_api/manage/serializers.py
+++ b/api/funkwhale_api/manage/serializers.py
@@ -4,20 +4,20 @@ from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers
 
-from funquail_api.audio import models as audio_models
-from funquail_api.common import fields as common_fields
-from funquail_api.common import serializers as common_serializers
-from funquail_api.common import utils as common_utils
-from funquail_api.federation import fields as federation_fields
-from funquail_api.federation import models as federation_models
-from funquail_api.federation import tasks as federation_tasks
-from funquail_api.moderation import models as moderation_models
-from funquail_api.moderation import serializers as moderation_serializers
-from funquail_api.moderation import utils as moderation_utils
-from funquail_api.music import models as music_models
-from funquail_api.music import serializers as music_serializers
-from funquail_api.tags import models as tags_models
-from funquail_api.users import models as users_models
+from funkwhale_api.audio import models as audio_models
+from funkwhale_api.common import fields as common_fields
+from funkwhale_api.common import serializers as common_serializers
+from funkwhale_api.common import utils as common_utils
+from funkwhale_api.federation import fields as federation_fields
+from funkwhale_api.federation import models as federation_models
+from funkwhale_api.federation import tasks as federation_tasks
+from funkwhale_api.moderation import models as moderation_models
+from funkwhale_api.moderation import serializers as moderation_serializers
+from funkwhale_api.moderation import utils as moderation_utils
+from funkwhale_api.music import models as music_models
+from funkwhale_api.music import serializers as music_serializers
+from funkwhale_api.tags import models as tags_models
+from funkwhale_api.users import models as users_models
 
 from . import filters
 
diff --git a/api/funquail_api/manage/urls.py b/api/funkwhale_api/manage/urls.py
similarity index 97%
rename from api/funquail_api/manage/urls.py
rename to api/funkwhale_api/manage/urls.py
index 6b619338d..9cf6acced 100644
--- a/api/funquail_api/manage/urls.py
+++ b/api/funkwhale_api/manage/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls import include, url
 
-from funquail_api.common import routers
+from funkwhale_api.common import routers
 
 from . import views
 
diff --git a/api/funquail_api/manage/views.py b/api/funkwhale_api/manage/views.py
similarity index 95%
rename from api/funquail_api/manage/views.py
rename to api/funkwhale_api/manage/views.py
index 6b55b33bd..4de9b5e96 100644
--- a/api/funquail_api/manage/views.py
+++ b/api/funkwhale_api/manage/views.py
@@ -6,24 +6,24 @@ from drf_spectacular.utils import extend_schema
 from rest_framework import decorators as rest_decorators
 from rest_framework import mixins, response, viewsets
 
-from funquail_api.audio import models as audio_models
-from funquail_api.common import decorators
-from funquail_api.common import models as common_models
-from funquail_api.common import preferences
-from funquail_api.common import utils as common_utils
-from funquail_api.common.mixins import MultipleLookupDetailMixin
-from funquail_api.favorites import models as favorites_models
-from funquail_api.federation import models as federation_models
-from funquail_api.federation import tasks as federation_tasks
-from funquail_api.federation import utils as federation_utils
-from funquail_api.history import models as history_models
-from funquail_api.moderation import models as moderation_models
-from funquail_api.moderation import tasks as moderation_tasks
-from funquail_api.music import models as music_models
-from funquail_api.music import views as music_views
-from funquail_api.playlists import models as playlists_models
-from funquail_api.tags import models as tags_models
-from funquail_api.users import models as users_models
+from funkwhale_api.audio import models as audio_models
+from funkwhale_api.common import decorators
+from funkwhale_api.common import models as common_models
+from funkwhale_api.common import preferences
+from funkwhale_api.common import utils as common_utils
+from funkwhale_api.common.mixins import MultipleLookupDetailMixin
+from funkwhale_api.favorites import models as favorites_models
+from funkwhale_api.federation import models as federation_models
+from funkwhale_api.federation import tasks as federation_tasks
+from funkwhale_api.federation import utils as federation_utils
+from funkwhale_api.history import models as history_models
+from funkwhale_api.moderation import models as moderation_models
+from funkwhale_api.moderation import tasks as moderation_tasks
+from funkwhale_api.music import models as music_models
+from funkwhale_api.music import views as music_views
+from funkwhale_api.playlists import models as playlists_models
+from funkwhale_api.tags import models as tags_models
+from funkwhale_api.users import models as users_models
 
 from . import filters, serializers
 
diff --git a/api/funquail_api/moderation/__init__.py b/api/funkwhale_api/moderation/__init__.py
similarity index 100%
rename from api/funquail_api/moderation/__init__.py
rename to api/funkwhale_api/moderation/__init__.py
diff --git a/api/funquail_api/moderation/admin.py b/api/funkwhale_api/moderation/admin.py
similarity index 96%
rename from api/funquail_api/moderation/admin.py
rename to api/funkwhale_api/moderation/admin.py
index 88cf4b5bd..1a44ea283 100644
--- a/api/funquail_api/moderation/admin.py
+++ b/api/funkwhale_api/moderation/admin.py
@@ -1,4 +1,4 @@
-from funquail_api.common import admin
+from funkwhale_api.common import admin
 
 from . import models
 
diff --git a/api/funquail_api/moderation/apps.py b/api/funkwhale_api/moderation/apps.py
similarity index 86%
rename from api/funquail_api/moderation/apps.py
rename to api/funkwhale_api/moderation/apps.py
index 8c8e52623..840393af1 100644
--- a/api/funquail_api/moderation/apps.py
+++ b/api/funkwhale_api/moderation/apps.py
@@ -4,7 +4,7 @@ from . import mrf
 
 
 class ModerationConfig(AppConfig):
-    name = "funquail_api.moderation"
+    name = "funkwhale_api.moderation"
 
     def ready(self):
         super().ready()
diff --git a/api/funquail_api/moderation/dynamic_preferences_registry.py b/api/funkwhale_api/moderation/dynamic_preferences_registry.py
similarity index 95%
rename from api/funquail_api/moderation/dynamic_preferences_registry.py
rename to api/funkwhale_api/moderation/dynamic_preferences_registry.py
index ba3157384..bda9b5952 100644
--- a/api/funquail_api/moderation/dynamic_preferences_registry.py
+++ b/api/funkwhale_api/moderation/dynamic_preferences_registry.py
@@ -3,9 +3,9 @@ from dynamic_preferences import types
 from dynamic_preferences.registries import global_preferences_registry
 from rest_framework import serializers
 
-from funquail_api.common import preferences as common_preferences
-from funquail_api.common import serializers as common_serializers
-from funquail_api.common import utils as common_utils
+from funkwhale_api.common import preferences as common_preferences
+from funkwhale_api.common import serializers as common_serializers
+from funkwhale_api.common import utils as common_utils
 
 from . import models
 
diff --git a/api/funquail_api/moderation/factories.py b/api/funkwhale_api/moderation/factories.py
similarity index 91%
rename from api/funquail_api/moderation/factories.py
rename to api/funkwhale_api/moderation/factories.py
index 6289b7f4b..5b681c6dd 100644
--- a/api/funquail_api/moderation/factories.py
+++ b/api/funkwhale_api/moderation/factories.py
@@ -1,9 +1,9 @@
 import factory
 
-from funquail_api.factories import NoUpdateOnCreate, registry
-from funquail_api.federation import factories as federation_factories
-from funquail_api.music import factories as music_factories
-from funquail_api.users import factories as users_factories
+from funkwhale_api.factories import NoUpdateOnCreate, registry
+from funkwhale_api.federation import factories as federation_factories
+from funkwhale_api.music import factories as music_factories
+from funkwhale_api.users import factories as users_factories
 
 from . import serializers
 
diff --git a/api/funquail_api/moderation/filters.py b/api/funkwhale_api/moderation/filters.py
similarity index 100%
rename from api/funquail_api/moderation/filters.py
rename to api/funkwhale_api/moderation/filters.py
diff --git a/api/funquail_api/moderation/management/__init__.py b/api/funkwhale_api/moderation/management/__init__.py
similarity index 100%
rename from api/funquail_api/moderation/management/__init__.py
rename to api/funkwhale_api/moderation/management/__init__.py
diff --git a/api/funquail_api/moderation/management/commands/__init__.py b/api/funkwhale_api/moderation/management/commands/__init__.py
similarity index 100%
rename from api/funquail_api/moderation/management/commands/__init__.py
rename to api/funkwhale_api/moderation/management/commands/__init__.py
diff --git a/api/funquail_api/moderation/management/commands/mrf_check.py b/api/funkwhale_api/moderation/management/commands/mrf_check.py
similarity index 96%
rename from api/funquail_api/moderation/management/commands/mrf_check.py
rename to api/funkwhale_api/moderation/management/commands/mrf_check.py
index 408339e8e..72594c65c 100644
--- a/api/funquail_api/moderation/management/commands/mrf_check.py
+++ b/api/funkwhale_api/moderation/management/commands/mrf_check.py
@@ -6,9 +6,9 @@ import uuid
 from django.core import validators
 from django.core.management.base import BaseCommand, CommandError
 
-from funquail_api.common import session
-from funquail_api.federation import models
-from funquail_api.moderation import mrf
+from funkwhale_api.common import session
+from funkwhale_api.federation import models
+from funkwhale_api.moderation import mrf
 
 
 def is_uuid(v):
diff --git a/api/funquail_api/moderation/migrations/0001_initial.py b/api/funkwhale_api/moderation/migrations/0001_initial.py
similarity index 100%
rename from api/funquail_api/moderation/migrations/0001_initial.py
rename to api/funkwhale_api/moderation/migrations/0001_initial.py
diff --git a/api/funquail_api/moderation/migrations/0002_auto_20190213_0927.py b/api/funkwhale_api/moderation/migrations/0002_auto_20190213_0927.py
similarity index 100%
rename from api/funquail_api/moderation/migrations/0002_auto_20190213_0927.py
rename to api/funkwhale_api/moderation/migrations/0002_auto_20190213_0927.py
diff --git a/api/funquail_api/moderation/migrations/0003_report.py b/api/funkwhale_api/moderation/migrations/0003_report.py
similarity index 100%
rename from api/funquail_api/moderation/migrations/0003_report.py
rename to api/funkwhale_api/moderation/migrations/0003_report.py
diff --git a/api/funquail_api/moderation/migrations/0004_note.py b/api/funkwhale_api/moderation/migrations/0004_note.py
similarity index 100%
rename from api/funquail_api/moderation/migrations/0004_note.py
rename to api/funkwhale_api/moderation/migrations/0004_note.py
diff --git a/api/funquail_api/moderation/migrations/0005_auto_20200317_0820.py b/api/funkwhale_api/moderation/migrations/0005_auto_20200317_0820.py
similarity index 100%
rename from api/funquail_api/moderation/migrations/0005_auto_20200317_0820.py
rename to api/funkwhale_api/moderation/migrations/0005_auto_20200317_0820.py
diff --git a/api/funquail_api/moderation/migrations/0006_auto_20200803_1222.py b/api/funkwhale_api/moderation/migrations/0006_auto_20200803_1222.py
similarity index 100%
rename from api/funquail_api/moderation/migrations/0006_auto_20200803_1222.py
rename to api/funkwhale_api/moderation/migrations/0006_auto_20200803_1222.py
diff --git a/api/funquail_api/moderation/migrations/0007_auto_20220627_1915.py b/api/funkwhale_api/moderation/migrations/0007_auto_20220627_1915.py
similarity index 100%
rename from api/funquail_api/moderation/migrations/0007_auto_20220627_1915.py
rename to api/funkwhale_api/moderation/migrations/0007_auto_20220627_1915.py
diff --git a/api/funquail_api/moderation/migrations/__init__.py b/api/funkwhale_api/moderation/migrations/__init__.py
similarity index 100%
rename from api/funquail_api/moderation/migrations/__init__.py
rename to api/funkwhale_api/moderation/migrations/__init__.py
diff --git a/api/funquail_api/moderation/models.py b/api/funkwhale_api/moderation/models.py
similarity index 97%
rename from api/funquail_api/moderation/models.py
rename to api/funkwhale_api/moderation/models.py
index cdea7af56..f45441dbe 100644
--- a/api/funquail_api/moderation/models.py
+++ b/api/funkwhale_api/moderation/models.py
@@ -10,9 +10,9 @@ from django.dispatch import receiver
 from django.urls import reverse
 from django.utils import timezone
 
-from funquail_api.common import models as common_models
-from funquail_api.federation import models as federation_models
-from funquail_api.federation import utils as federation_utils
+from funkwhale_api.common import models as common_models
+from funkwhale_api.federation import models as federation_models
+from funkwhale_api.federation import utils as federation_utils
 
 
 class InstancePolicyQuerySet(models.QuerySet):
diff --git a/api/funquail_api/moderation/mrf.py b/api/funkwhale_api/moderation/mrf.py
similarity index 100%
rename from api/funquail_api/moderation/mrf.py
rename to api/funkwhale_api/moderation/mrf.py
diff --git a/api/funquail_api/moderation/mrf_policies.py b/api/funkwhale_api/moderation/mrf_policies.py
similarity index 88%
rename from api/funquail_api/moderation/mrf_policies.py
rename to api/funkwhale_api/moderation/mrf_policies.py
index 9958ccf54..264baed37 100644
--- a/api/funquail_api/moderation/mrf_policies.py
+++ b/api/funkwhale_api/moderation/mrf_policies.py
@@ -1,8 +1,8 @@
 import urllib.parse
 
-from funquail_api.common import preferences, utils
-from funquail_api.federation import models as federation_models
-from funquail_api.moderation import mrf
+from funkwhale_api.common import preferences, utils
+from funkwhale_api.federation import models as federation_models
+from funkwhale_api.moderation import mrf
 
 
 @mrf.inbox.register(name="allow_list")
diff --git a/api/funquail_api/moderation/serializers.py b/api/funkwhale_api/moderation/serializers.py
similarity index 95%
rename from api/funquail_api/moderation/serializers.py
rename to api/funkwhale_api/moderation/serializers.py
index 775c021be..382d81aa8 100644
--- a/api/funquail_api/moderation/serializers.py
+++ b/api/funkwhale_api/moderation/serializers.py
@@ -6,13 +6,13 @@ from django.conf import settings
 from django.core.serializers.json import DjangoJSONEncoder
 from rest_framework import serializers
 
-from funquail_api.audio import models as audio_models
-from funquail_api.common import fields as common_fields
-from funquail_api.common import preferences
-from funquail_api.federation import models as federation_models
-from funquail_api.federation import utils as federation_utils
-from funquail_api.music import models as music_models
-from funquail_api.playlists import models as playlists_models
+from funkwhale_api.audio import models as audio_models
+from funkwhale_api.common import fields as common_fields
+from funkwhale_api.common import preferences
+from funkwhale_api.federation import models as federation_models
+from funkwhale_api.federation import utils as federation_utils
+from funkwhale_api.music import models as music_models
+from funkwhale_api.playlists import models as playlists_models
 
 from . import models, tasks
 
diff --git a/api/funquail_api/moderation/signals.py b/api/funkwhale_api/moderation/signals.py
similarity index 100%
rename from api/funquail_api/moderation/signals.py
rename to api/funkwhale_api/moderation/signals.py
diff --git a/api/funquail_api/moderation/tasks.py b/api/funkwhale_api/moderation/tasks.py
similarity index 96%
rename from api/funquail_api/moderation/tasks.py
rename to api/funkwhale_api/moderation/tasks.py
index 9cf2dd2d9..1984d0aa7 100644
--- a/api/funquail_api/moderation/tasks.py
+++ b/api/funkwhale_api/moderation/tasks.py
@@ -5,10 +5,10 @@ from django.core import mail
 from django.db import transaction
 from django.dispatch import receiver
 
-from funquail_api.common import channels, preferences, utils
-from funquail_api.federation import utils as federation_utils
-from funquail_api.taskapp import celery
-from funquail_api.users import models as users_models
+from funkwhale_api.common import channels, preferences, utils
+from funkwhale_api.federation import utils as federation_utils
+from funkwhale_api.taskapp import celery
+from funkwhale_api.users import models as users_models
 
 from . import models, signals
 
@@ -145,7 +145,7 @@ def user_request_handle(user_request, new_status, old_status=None):
 
 
 def broadcast_user_request_created(user_request):
-    from funquail_api.manage import serializers as manage_serializers
+    from funkwhale_api.manage import serializers as manage_serializers
 
     channels.group_send(
         "admin.moderation",
diff --git a/api/funquail_api/moderation/urls.py b/api/funkwhale_api/moderation/urls.py
similarity index 84%
rename from api/funquail_api/moderation/urls.py
rename to api/funkwhale_api/moderation/urls.py
index e64c039a1..597aacadb 100644
--- a/api/funquail_api/moderation/urls.py
+++ b/api/funkwhale_api/moderation/urls.py
@@ -1,4 +1,4 @@
-from funquail_api.common import routers
+from funkwhale_api.common import routers
 
 from . import views
 
diff --git a/api/funquail_api/moderation/utils.py b/api/funkwhale_api/moderation/utils.py
similarity index 95%
rename from api/funquail_api/moderation/utils.py
rename to api/funkwhale_api/moderation/utils.py
index 1a5dd753b..a08bc1ea0 100644
--- a/api/funquail_api/moderation/utils.py
+++ b/api/funkwhale_api/moderation/utils.py
@@ -1,6 +1,6 @@
 from rest_framework import serializers
 
-from funquail_api.federation import models as federation_models
+from funkwhale_api.federation import models as federation_models
 
 from . import models
 from . import serializers as moderation_serializers
diff --git a/api/funquail_api/moderation/views.py b/api/funkwhale_api/moderation/views.py
similarity index 95%
rename from api/funquail_api/moderation/views.py
rename to api/funkwhale_api/moderation/views.py
index 6e523aabe..71e139bc7 100644
--- a/api/funquail_api/moderation/views.py
+++ b/api/funkwhale_api/moderation/views.py
@@ -1,8 +1,8 @@
 from django.db import IntegrityError
 from rest_framework import mixins, response, status, viewsets
 
-from funquail_api.federation import routes
-from funquail_api.federation import utils as federation_utils
+from funkwhale_api.federation import routes
+from funkwhale_api.federation import utils as federation_utils
 
 from . import models, serializers
 
diff --git a/api/funquail_api/music/__init__.py b/api/funkwhale_api/music/__init__.py
similarity index 100%
rename from api/funquail_api/music/__init__.py
rename to api/funkwhale_api/music/__init__.py
diff --git a/api/funquail_api/music/admin.py b/api/funkwhale_api/music/admin.py
similarity index 98%
rename from api/funquail_api/music/admin.py
rename to api/funkwhale_api/music/admin.py
index 382d78101..7e6a79450 100644
--- a/api/funquail_api/music/admin.py
+++ b/api/funkwhale_api/music/admin.py
@@ -1,4 +1,4 @@
-from funquail_api.common import admin
+from funkwhale_api.common import admin
 
 from . import models
 
diff --git a/api/funquail_api/music/dynamic_preferences_registry.py b/api/funkwhale_api/music/dynamic_preferences_registry.py
similarity index 100%
rename from api/funquail_api/music/dynamic_preferences_registry.py
rename to api/funkwhale_api/music/dynamic_preferences_registry.py
diff --git a/api/funquail_api/music/factories.py b/api/funkwhale_api/music/factories.py
similarity index 93%
rename from api/funquail_api/music/factories.py
rename to api/funkwhale_api/music/factories.py
index b9b82f104..cf9b11a0a 100644
--- a/api/funquail_api/music/factories.py
+++ b/api/funkwhale_api/music/factories.py
@@ -2,12 +2,12 @@ import os
 
 import factory
 
-from funquail_api.common import factories as common_factories
-from funquail_api.factories import NoUpdateOnCreate, registry
-from funquail_api.federation import factories as federation_factories
-from funquail_api.music import licenses
-from funquail_api.tags import factories as tags_factories
-from funquail_api.users import factories as users_factories
+from funkwhale_api.common import factories as common_factories
+from funkwhale_api.factories import NoUpdateOnCreate, registry
+from funkwhale_api.federation import factories as federation_factories
+from funkwhale_api.music import licenses
+from funkwhale_api.tags import factories as tags_factories
+from funkwhale_api.users import factories as users_factories
 
 SAMPLES_PATH = os.path.join(
     os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))),
@@ -191,7 +191,7 @@ class UploadFactory(NoUpdateOnCreate, factory.django.DjangoModelFactory):
     def channel(self, created, extracted, **kwargs):
         if not extracted:
             return
-        from funquail_api.audio import factories as audio_factories
+        from funkwhale_api.audio import factories as audio_factories
 
         audio_factories.ChannelFactory(
             library=self.library, artist=self.track.artist, **kwargs
diff --git a/api/funquail_api/music/fake_data.py b/api/funkwhale_api/music/fake_data.py
similarity index 93%
rename from api/funquail_api/music/fake_data.py
rename to api/funkwhale_api/music/fake_data.py
index 2a4b8a8e0..204060404 100644
--- a/api/funquail_api/music/fake_data.py
+++ b/api/funkwhale_api/music/fake_data.py
@@ -3,7 +3,7 @@ Populates the database with fake data
 """
 import random
 
-from funquail_api.music import factories
+from funkwhale_api.music import factories
 
 
 def create_data(count=25):
diff --git a/api/funquail_api/music/filters.py b/api/funkwhale_api/music/filters.py
similarity index 96%
rename from api/funquail_api/music/filters.py
rename to api/funkwhale_api/music/filters.py
index a6c968c14..94fa15e14 100644
--- a/api/funquail_api/music/filters.py
+++ b/api/funkwhale_api/music/filters.py
@@ -2,13 +2,13 @@ import django_filters
 from django.db.models import Q
 from django_filters import rest_framework as filters
 
-from funquail_api.audio import filters as audio_filters
-from funquail_api.audio import models as audio_models
-from funquail_api.common import fields
-from funquail_api.common import filters as common_filters
-from funquail_api.common import search
-from funquail_api.moderation import filters as moderation_filters
-from funquail_api.tags import filters as tags_filters
+from funkwhale_api.audio import filters as audio_filters
+from funkwhale_api.audio import models as audio_models
+from funkwhale_api.common import fields
+from funkwhale_api.common import filters as common_filters
+from funkwhale_api.common import search
+from funkwhale_api.moderation import filters as moderation_filters
+from funkwhale_api.tags import filters as tags_filters
 
 from . import models, utils
 
diff --git a/api/funquail_api/music/importers.py b/api/funkwhale_api/music/importers.py
similarity index 100%
rename from api/funquail_api/music/importers.py
rename to api/funkwhale_api/music/importers.py
diff --git a/api/funquail_api/music/licenses.py b/api/funkwhale_api/music/licenses.py
similarity index 100%
rename from api/funquail_api/music/licenses.py
rename to api/funkwhale_api/music/licenses.py
diff --git a/api/funquail_api/music/management/__init__.py b/api/funkwhale_api/music/management/__init__.py
similarity index 100%
rename from api/funquail_api/music/management/__init__.py
rename to api/funkwhale_api/music/management/__init__.py
diff --git a/api/funquail_api/music/management/commands/__init__.py b/api/funkwhale_api/music/management/commands/__init__.py
similarity index 100%
rename from api/funquail_api/music/management/commands/__init__.py
rename to api/funkwhale_api/music/management/commands/__init__.py
diff --git a/api/funquail_api/music/management/commands/check_inplace_files.py b/api/funkwhale_api/music/management/commands/check_inplace_files.py
similarity index 98%
rename from api/funquail_api/music/management/commands/check_inplace_files.py
rename to api/funkwhale_api/music/management/commands/check_inplace_files.py
index e0f3de0fd..6754a2592 100644
--- a/api/funquail_api/music/management/commands/check_inplace_files.py
+++ b/api/funkwhale_api/music/management/commands/check_inplace_files.py
@@ -4,7 +4,7 @@ from argparse import RawTextHelpFormatter
 from django.core.management.base import BaseCommand
 from django.db import transaction
 
-from funquail_api.music import models
+from funkwhale_api.music import models
 
 
 def progress(buffer, count, total, status=""):
diff --git a/api/funquail_api/music/management/commands/check_licenses.py b/api/funkwhale_api/music/management/commands/check_licenses.py
similarity index 96%
rename from api/funquail_api/music/management/commands/check_licenses.py
rename to api/funkwhale_api/music/management/commands/check_licenses.py
index dff6798b0..9fe3c7179 100644
--- a/api/funquail_api/music/management/commands/check_licenses.py
+++ b/api/funkwhale_api/music/management/commands/check_licenses.py
@@ -1,7 +1,7 @@
 import requests.exceptions
 from django.core.management.base import BaseCommand, CommandError
 
-from funquail_api.music import licenses
+from funkwhale_api.music import licenses
 
 
 class Command(BaseCommand):
diff --git a/api/funquail_api/music/management/commands/create_library.py b/api/funkwhale_api/music/management/commands/create_library.py
similarity index 94%
rename from api/funquail_api/music/management/commands/create_library.py
rename to api/funkwhale_api/music/management/commands/create_library.py
index 4a4f428c0..8b2073947 100644
--- a/api/funquail_api/music/management/commands/create_library.py
+++ b/api/funkwhale_api/music/management/commands/create_library.py
@@ -1,7 +1,7 @@
 from django.core.management.base import BaseCommand
 
-from funquail_api.federation.models import Actor
-from funquail_api.music.models import Library
+from funkwhale_api.federation.models import Actor
+from funkwhale_api.music.models import Library
 
 
 class Command(BaseCommand):
diff --git a/api/funquail_api/music/management/commands/fix_uploads.py b/api/funkwhale_api/music/management/commands/fix_uploads.py
similarity index 98%
rename from api/funquail_api/music/management/commands/fix_uploads.py
rename to api/funkwhale_api/music/management/commands/fix_uploads.py
index 6c9ec21df..bd87328d6 100644
--- a/api/funquail_api/music/management/commands/fix_uploads.py
+++ b/api/funkwhale_api/music/management/commands/fix_uploads.py
@@ -2,8 +2,8 @@ from django.core.management.base import BaseCommand
 from django.db import transaction
 from django.db.models import Q
 
-from funquail_api.common import utils as common_utils
-from funquail_api.music import models, utils
+from funkwhale_api.common import utils as common_utils
+from funkwhale_api.music import models, utils
 
 
 class Command(BaseCommand):
diff --git a/api/funquail_api/music/management/commands/generate_typesense_index.py b/api/funkwhale_api/music/management/commands/generate_typesense_index.py
similarity index 90%
rename from api/funquail_api/music/management/commands/generate_typesense_index.py
rename to api/funkwhale_api/music/management/commands/generate_typesense_index.py
index 3537fb966..6bf5f4b0c 100644
--- a/api/funquail_api/music/management/commands/generate_typesense_index.py
+++ b/api/funkwhale_api/music/management/commands/generate_typesense_index.py
@@ -1,6 +1,6 @@
 from django.core.management.base import BaseCommand
 
-from funquail_api.typesense import tasks
+from funkwhale_api.typesense import tasks
 
 
 class Command(BaseCommand):
diff --git a/api/funquail_api/music/management/commands/import_files.py b/api/funkwhale_api/music/management/commands/import_files.py
similarity index 99%
rename from api/funquail_api/music/management/commands/import_files.py
rename to api/funkwhale_api/music/management/commands/import_files.py
index a9b858773..3fc5fd9df 100644
--- a/api/funquail_api/music/management/commands/import_files.py
+++ b/api/funkwhale_api/music/management/commands/import_files.py
@@ -20,8 +20,8 @@ from django.db.utils import IntegrityError
 from django.utils import timezone
 from rest_framework import serializers
 
-from funquail_api.common import utils as common_utils
-from funquail_api.music import models, tasks, utils
+from funkwhale_api.common import utils as common_utils
+from funkwhale_api.music import models, tasks, utils
 
 
 def crawl_dir(dir, extensions, recursive=True, ignored=[]):
diff --git a/api/funquail_api/music/management/commands/prune_library.py b/api/funkwhale_api/music/management/commands/prune_library.py
similarity index 99%
rename from api/funquail_api/music/management/commands/prune_library.py
rename to api/funkwhale_api/music/management/commands/prune_library.py
index 79d048187..512afe875 100644
--- a/api/funquail_api/music/management/commands/prune_library.py
+++ b/api/funkwhale_api/music/management/commands/prune_library.py
@@ -3,7 +3,7 @@ from argparse import RawTextHelpFormatter
 from django.core.management.base import BaseCommand, CommandError
 from django.db import transaction
 
-from funquail_api.music import models, tasks
+from funkwhale_api.music import models, tasks
 
 
 class Command(BaseCommand):
diff --git a/api/funquail_api/music/management/commands/prune_skipped_uploads.py b/api/funkwhale_api/music/management/commands/prune_skipped_uploads.py
similarity index 96%
rename from api/funquail_api/music/management/commands/prune_skipped_uploads.py
rename to api/funkwhale_api/music/management/commands/prune_skipped_uploads.py
index 5fcc13056..604cba36c 100644
--- a/api/funquail_api/music/management/commands/prune_skipped_uploads.py
+++ b/api/funkwhale_api/music/management/commands/prune_skipped_uploads.py
@@ -1,7 +1,7 @@
 from django.core.management.base import BaseCommand
 from django.db import transaction
 
-from funquail_api.music import models
+from funkwhale_api.music import models
 
 
 class Command(BaseCommand):
diff --git a/api/funquail_api/music/management/commands/rebuild_music_permissions.py b/api/funkwhale_api/music/management/commands/rebuild_music_permissions.py
similarity index 95%
rename from api/funquail_api/music/management/commands/rebuild_music_permissions.py
rename to api/funkwhale_api/music/management/commands/rebuild_music_permissions.py
index e90d18e0b..96b7e61cb 100644
--- a/api/funquail_api/music/management/commands/rebuild_music_permissions.py
+++ b/api/funkwhale_api/music/management/commands/rebuild_music_permissions.py
@@ -4,8 +4,8 @@ from django.core.management.base import BaseCommand, CommandError
 from django.db import transaction
 from django.db.models import Q
 
-from funquail_api.federation.models import Actor
-from funquail_api.music.models import Library, TrackActor
+from funkwhale_api.federation.models import Actor
+from funkwhale_api.music.models import Library, TrackActor
 
 
 class Command(BaseCommand):
diff --git a/api/funquail_api/music/metadata.py b/api/funkwhale_api/music/metadata.py
similarity index 99%
rename from api/funquail_api/music/metadata.py
rename to api/funkwhale_api/music/metadata.py
index a3b989c27..479e210e0 100644
--- a/api/funquail_api/music/metadata.py
+++ b/api/funkwhale_api/music/metadata.py
@@ -10,7 +10,7 @@ import mutagen.oggtheora
 import mutagen.oggvorbis
 from rest_framework import serializers
 
-from funquail_api.tags import models as tags_models
+from funkwhale_api.tags import models as tags_models
 
 logger = logging.getLogger(__name__)
 NODEFAULT = object()
diff --git a/api/funquail_api/music/migrations/0001_initial.py b/api/funkwhale_api/music/migrations/0001_initial.py
similarity index 100%
rename from api/funquail_api/music/migrations/0001_initial.py
rename to api/funkwhale_api/music/migrations/0001_initial.py
diff --git a/api/funquail_api/music/migrations/0002_auto_20151215_1645.py b/api/funkwhale_api/music/migrations/0002_auto_20151215_1645.py
similarity index 100%
rename from api/funquail_api/music/migrations/0002_auto_20151215_1645.py
rename to api/funkwhale_api/music/migrations/0002_auto_20151215_1645.py
diff --git a/api/funquail_api/music/migrations/0003_auto_20151222_2233.py b/api/funkwhale_api/music/migrations/0003_auto_20151222_2233.py
similarity index 100%
rename from api/funquail_api/music/migrations/0003_auto_20151222_2233.py
rename to api/funkwhale_api/music/migrations/0003_auto_20151222_2233.py
diff --git a/api/funquail_api/music/migrations/0004_track_tags.py b/api/funkwhale_api/music/migrations/0004_track_tags.py
similarity index 100%
rename from api/funquail_api/music/migrations/0004_track_tags.py
rename to api/funkwhale_api/music/migrations/0004_track_tags.py
diff --git a/api/funquail_api/music/migrations/0005_deduplicate.py b/api/funkwhale_api/music/migrations/0005_deduplicate.py
similarity index 100%
rename from api/funquail_api/music/migrations/0005_deduplicate.py
rename to api/funkwhale_api/music/migrations/0005_deduplicate.py
diff --git a/api/funquail_api/music/migrations/0006_unique_mbid.py b/api/funkwhale_api/music/migrations/0006_unique_mbid.py
similarity index 100%
rename from api/funquail_api/music/migrations/0006_unique_mbid.py
rename to api/funkwhale_api/music/migrations/0006_unique_mbid.py
diff --git a/api/funquail_api/music/migrations/0007_track_position.py b/api/funkwhale_api/music/migrations/0007_track_position.py
similarity index 100%
rename from api/funquail_api/music/migrations/0007_track_position.py
rename to api/funkwhale_api/music/migrations/0007_track_position.py
diff --git a/api/funquail_api/music/migrations/0008_auto_20160529_1456.py b/api/funkwhale_api/music/migrations/0008_auto_20160529_1456.py
similarity index 100%
rename from api/funquail_api/music/migrations/0008_auto_20160529_1456.py
rename to api/funkwhale_api/music/migrations/0008_auto_20160529_1456.py
diff --git a/api/funquail_api/music/migrations/0009_auto_20160920_1614.py b/api/funkwhale_api/music/migrations/0009_auto_20160920_1614.py
similarity index 100%
rename from api/funquail_api/music/migrations/0009_auto_20160920_1614.py
rename to api/funkwhale_api/music/migrations/0009_auto_20160920_1614.py
diff --git a/api/funquail_api/music/migrations/0010_auto_20160920_1742.py b/api/funkwhale_api/music/migrations/0010_auto_20160920_1742.py
similarity index 100%
rename from api/funquail_api/music/migrations/0010_auto_20160920_1742.py
rename to api/funkwhale_api/music/migrations/0010_auto_20160920_1742.py
diff --git a/api/funquail_api/music/migrations/0011_rename_files.py b/api/funkwhale_api/music/migrations/0011_rename_files.py
similarity index 100%
rename from api/funquail_api/music/migrations/0011_rename_files.py
rename to api/funkwhale_api/music/migrations/0011_rename_files.py
diff --git a/api/funquail_api/music/migrations/0012_auto_20161122_1905.py b/api/funkwhale_api/music/migrations/0012_auto_20161122_1905.py
similarity index 100%
rename from api/funquail_api/music/migrations/0012_auto_20161122_1905.py
rename to api/funkwhale_api/music/migrations/0012_auto_20161122_1905.py
diff --git a/api/funquail_api/music/migrations/0013_auto_20171213_2211.py b/api/funkwhale_api/music/migrations/0013_auto_20171213_2211.py
similarity index 100%
rename from api/funquail_api/music/migrations/0013_auto_20171213_2211.py
rename to api/funkwhale_api/music/migrations/0013_auto_20171213_2211.py
diff --git a/api/funquail_api/music/migrations/0014_importjob_track_file.py b/api/funkwhale_api/music/migrations/0014_importjob_track_file.py
similarity index 100%
rename from api/funquail_api/music/migrations/0014_importjob_track_file.py
rename to api/funkwhale_api/music/migrations/0014_importjob_track_file.py
diff --git a/api/funquail_api/music/migrations/0015_bind_track_file_to_import_job.py b/api/funkwhale_api/music/migrations/0015_bind_track_file_to_import_job.py
similarity index 100%
rename from api/funquail_api/music/migrations/0015_bind_track_file_to_import_job.py
rename to api/funkwhale_api/music/migrations/0015_bind_track_file_to_import_job.py
diff --git a/api/funquail_api/music/migrations/0016_trackfile_acoustid_track_id.py b/api/funkwhale_api/music/migrations/0016_trackfile_acoustid_track_id.py
similarity index 100%
rename from api/funquail_api/music/migrations/0016_trackfile_acoustid_track_id.py
rename to api/funkwhale_api/music/migrations/0016_trackfile_acoustid_track_id.py
diff --git a/api/funquail_api/music/migrations/0017_auto_20171227_1728.py b/api/funkwhale_api/music/migrations/0017_auto_20171227_1728.py
similarity index 100%
rename from api/funquail_api/music/migrations/0017_auto_20171227_1728.py
rename to api/funkwhale_api/music/migrations/0017_auto_20171227_1728.py
diff --git a/api/funquail_api/music/migrations/0018_auto_20180218_1554.py b/api/funkwhale_api/music/migrations/0018_auto_20180218_1554.py
similarity index 100%
rename from api/funquail_api/music/migrations/0018_auto_20180218_1554.py
rename to api/funkwhale_api/music/migrations/0018_auto_20180218_1554.py
diff --git a/api/funquail_api/music/migrations/0019_populate_mimetypes.py b/api/funkwhale_api/music/migrations/0019_populate_mimetypes.py
similarity index 93%
rename from api/funquail_api/music/migrations/0019_populate_mimetypes.py
rename to api/funkwhale_api/music/migrations/0019_populate_mimetypes.py
index 149151de1..11678efbc 100644
--- a/api/funquail_api/music/migrations/0019_populate_mimetypes.py
+++ b/api/funkwhale_api/music/migrations/0019_populate_mimetypes.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import migrations
-from funquail_api.music.utils import guess_mimetype
+from funkwhale_api.music.utils import guess_mimetype
 
 
 def populate_mimetype(apps, schema_editor):
diff --git a/api/funquail_api/music/migrations/0020_importbatch_status.py b/api/funkwhale_api/music/migrations/0020_importbatch_status.py
similarity index 100%
rename from api/funquail_api/music/migrations/0020_importbatch_status.py
rename to api/funkwhale_api/music/migrations/0020_importbatch_status.py
diff --git a/api/funquail_api/music/migrations/0021_populate_batch_status.py b/api/funkwhale_api/music/migrations/0021_populate_batch_status.py
similarity index 90%
rename from api/funquail_api/music/migrations/0021_populate_batch_status.py
rename to api/funkwhale_api/music/migrations/0021_populate_batch_status.py
index 9684b71d7..065384a97 100644
--- a/api/funquail_api/music/migrations/0021_populate_batch_status.py
+++ b/api/funkwhale_api/music/migrations/0021_populate_batch_status.py
@@ -5,7 +5,7 @@ from django.db import migrations
 
 
 def populate_status(apps, schema_editor):
-    from funquail_api.music.utils import compute_status
+    from funkwhale_api.music.utils import compute_status
 
     ImportBatch = apps.get_model("music", "ImportBatch")
 
diff --git a/api/funquail_api/music/migrations/0022_importbatch_import_request.py b/api/funkwhale_api/music/migrations/0022_importbatch_import_request.py
similarity index 100%
rename from api/funquail_api/music/migrations/0022_importbatch_import_request.py
rename to api/funkwhale_api/music/migrations/0022_importbatch_import_request.py
diff --git a/api/funquail_api/music/migrations/0023_auto_20180407_1010.py b/api/funkwhale_api/music/migrations/0023_auto_20180407_1010.py
similarity index 100%
rename from api/funquail_api/music/migrations/0023_auto_20180407_1010.py
rename to api/funkwhale_api/music/migrations/0023_auto_20180407_1010.py
diff --git a/api/funquail_api/music/migrations/0024_populate_uuid.py b/api/funkwhale_api/music/migrations/0024_populate_uuid.py
similarity index 100%
rename from api/funquail_api/music/migrations/0024_populate_uuid.py
rename to api/funkwhale_api/music/migrations/0024_populate_uuid.py
diff --git a/api/funquail_api/music/migrations/0025_auto_20180419_2023.py b/api/funkwhale_api/music/migrations/0025_auto_20180419_2023.py
similarity index 100%
rename from api/funquail_api/music/migrations/0025_auto_20180419_2023.py
rename to api/funkwhale_api/music/migrations/0025_auto_20180419_2023.py
diff --git a/api/funquail_api/music/migrations/0026_trackfile_accessed_date.py b/api/funkwhale_api/music/migrations/0026_trackfile_accessed_date.py
similarity index 100%
rename from api/funquail_api/music/migrations/0026_trackfile_accessed_date.py
rename to api/funkwhale_api/music/migrations/0026_trackfile_accessed_date.py
diff --git a/api/funquail_api/music/migrations/0027_auto_20180515_1808.py b/api/funkwhale_api/music/migrations/0027_auto_20180515_1808.py
similarity index 100%
rename from api/funquail_api/music/migrations/0027_auto_20180515_1808.py
rename to api/funkwhale_api/music/migrations/0027_auto_20180515_1808.py
diff --git a/api/funquail_api/music/migrations/0028_importjob_replace_if_duplicate.py b/api/funkwhale_api/music/migrations/0028_importjob_replace_if_duplicate.py
similarity index 100%
rename from api/funquail_api/music/migrations/0028_importjob_replace_if_duplicate.py
rename to api/funkwhale_api/music/migrations/0028_importjob_replace_if_duplicate.py
diff --git a/api/funquail_api/music/migrations/0029_auto_20180807_1748.py b/api/funkwhale_api/music/migrations/0029_auto_20180807_1748.py
similarity index 100%
rename from api/funquail_api/music/migrations/0029_auto_20180807_1748.py
rename to api/funkwhale_api/music/migrations/0029_auto_20180807_1748.py
diff --git a/api/funquail_api/music/migrations/0030_auto_20180825_1411.py b/api/funkwhale_api/music/migrations/0030_auto_20180825_1411.py
similarity index 92%
rename from api/funquail_api/music/migrations/0030_auto_20180825_1411.py
rename to api/funkwhale_api/music/migrations/0030_auto_20180825_1411.py
index c28557a4c..8c799dacb 100644
--- a/api/funquail_api/music/migrations/0030_auto_20180825_1411.py
+++ b/api/funkwhale_api/music/migrations/0030_auto_20180825_1411.py
@@ -5,7 +5,7 @@ import django.core.serializers.json
 from django.db import migrations, models
 import django.db.models.deletion
 import django.utils.timezone
-import funquail_api.music.models
+import funkwhale_api.music.models
 
 
 class Migration(migrations.Migration):
@@ -68,7 +68,7 @@ class Migration(migrations.Migration):
             model_name="trackfile",
             name="import_details",
             field=django.contrib.postgres.fields.jsonb.JSONField(
-                default=funquail_api.music.models.empty_dict,
+                default=funkwhale_api.music.models.empty_dict,
                 encoder=django.core.serializers.json.DjangoJSONEncoder,
                 max_length=50000,
             ),
@@ -77,7 +77,7 @@ class Migration(migrations.Migration):
             model_name="trackfile",
             name="import_metadata",
             field=django.contrib.postgres.fields.jsonb.JSONField(
-                default=funquail_api.music.models.empty_dict,
+                default=funkwhale_api.music.models.empty_dict,
                 encoder=django.core.serializers.json.DjangoJSONEncoder,
                 max_length=50000,
             ),
@@ -86,7 +86,7 @@ class Migration(migrations.Migration):
             model_name="trackfile",
             name="import_reference",
             field=models.CharField(
-                default=funquail_api.music.models.get_import_reference, max_length=50
+                default=funkwhale_api.music.models.get_import_reference, max_length=50
             ),
         ),
         migrations.AddField(
@@ -107,7 +107,7 @@ class Migration(migrations.Migration):
             model_name="trackfile",
             name="metadata",
             field=django.contrib.postgres.fields.jsonb.JSONField(
-                default=funquail_api.music.models.empty_dict,
+                default=funkwhale_api.music.models.empty_dict,
                 encoder=django.core.serializers.json.DjangoJSONEncoder,
                 max_length=50000,
             ),
@@ -121,7 +121,7 @@ class Migration(migrations.Migration):
             model_name="trackfile",
             name="audio_file",
             field=models.FileField(
-                max_length=255, upload_to=funquail_api.music.models.get_file_path
+                max_length=255, upload_to=funkwhale_api.music.models.get_file_path
             ),
         ),
         migrations.AlterField(
diff --git a/api/funquail_api/music/migrations/0031_auto_20180914_2007.py b/api/funkwhale_api/music/migrations/0031_auto_20180914_2007.py
similarity index 100%
rename from api/funquail_api/music/migrations/0031_auto_20180914_2007.py
rename to api/funkwhale_api/music/migrations/0031_auto_20180914_2007.py
diff --git a/api/funquail_api/music/migrations/0032_track_file_to_upload.py b/api/funkwhale_api/music/migrations/0032_track_file_to_upload.py
similarity index 100%
rename from api/funquail_api/music/migrations/0032_track_file_to_upload.py
rename to api/funkwhale_api/music/migrations/0032_track_file_to_upload.py
diff --git a/api/funquail_api/music/migrations/0033_auto_20181023_1837.py b/api/funkwhale_api/music/migrations/0033_auto_20181023_1837.py
similarity index 96%
rename from api/funquail_api/music/migrations/0033_auto_20181023_1837.py
rename to api/funkwhale_api/music/migrations/0033_auto_20181023_1837.py
index 56382a963..003349b53 100644
--- a/api/funquail_api/music/migrations/0033_auto_20181023_1837.py
+++ b/api/funkwhale_api/music/migrations/0033_auto_20181023_1837.py
@@ -3,7 +3,7 @@
 from django.db import migrations, models
 import django.db.models.deletion
 import django.utils.timezone
-import funquail_api.music.models
+import funkwhale_api.music.models
 
 
 class Migration(migrations.Migration):
@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
                 ('mimetype', models.CharField(choices=[('audio/ogg', 'ogg'), ('audio/mpeg', 'mp3'), ('audio/x-flac', 'flac')], max_length=50)),
                 ('creation_date', models.DateTimeField(default=django.utils.timezone.now)),
                 ('accessed_date', models.DateTimeField(blank=True, null=True)),
-                ('audio_file', models.FileField(max_length=255, upload_to=funquail_api.music.models.get_file_path)),
+                ('audio_file', models.FileField(max_length=255, upload_to=funkwhale_api.music.models.get_file_path)),
                 ('bitrate', models.PositiveIntegerField()),
                 ('size', models.IntegerField()),
                 ('upload', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='versions', to='music.Upload')),
diff --git a/api/funquail_api/music/migrations/0034_auto_20181127_0325.py b/api/funkwhale_api/music/migrations/0034_auto_20181127_0325.py
similarity index 100%
rename from api/funquail_api/music/migrations/0034_auto_20181127_0325.py
rename to api/funkwhale_api/music/migrations/0034_auto_20181127_0325.py
diff --git a/api/funquail_api/music/migrations/0035_auto_20181203_1515.py b/api/funkwhale_api/music/migrations/0035_auto_20181203_1515.py
similarity index 100%
rename from api/funquail_api/music/migrations/0035_auto_20181203_1515.py
rename to api/funkwhale_api/music/migrations/0035_auto_20181203_1515.py
diff --git a/api/funquail_api/music/migrations/0036_track_disc_number.py b/api/funkwhale_api/music/migrations/0036_track_disc_number.py
similarity index 100%
rename from api/funquail_api/music/migrations/0036_track_disc_number.py
rename to api/funkwhale_api/music/migrations/0036_track_disc_number.py
diff --git a/api/funquail_api/music/migrations/0037_auto_20190103_1757.py b/api/funkwhale_api/music/migrations/0037_auto_20190103_1757.py
similarity index 100%
rename from api/funquail_api/music/migrations/0037_auto_20190103_1757.py
rename to api/funkwhale_api/music/migrations/0037_auto_20190103_1757.py
diff --git a/api/funquail_api/music/migrations/0038_attributed_to.py b/api/funkwhale_api/music/migrations/0038_attributed_to.py
similarity index 100%
rename from api/funquail_api/music/migrations/0038_attributed_to.py
rename to api/funkwhale_api/music/migrations/0038_attributed_to.py
diff --git a/api/funquail_api/music/migrations/0039_auto_20190423_0820.py b/api/funkwhale_api/music/migrations/0039_auto_20190423_0820.py
similarity index 100%
rename from api/funquail_api/music/migrations/0039_auto_20190423_0820.py
rename to api/funkwhale_api/music/migrations/0039_auto_20190423_0820.py
diff --git a/api/funquail_api/music/migrations/0040_auto_20191021_1318.py b/api/funkwhale_api/music/migrations/0040_auto_20191021_1318.py
similarity index 97%
rename from api/funquail_api/music/migrations/0040_auto_20191021_1318.py
rename to api/funkwhale_api/music/migrations/0040_auto_20191021_1318.py
index 8d6a41abe..eb5e6abc0 100644
--- a/api/funquail_api/music/migrations/0040_auto_20191021_1318.py
+++ b/api/funkwhale_api/music/migrations/0040_auto_20191021_1318.py
@@ -5,7 +5,7 @@ import django.contrib.postgres.fields.jsonb
 import django.core.serializers.json
 from django.db import migrations, models
 import django.db.models.deletion
-import funquail_api.music.models
+import funkwhale_api.music.models
 
 
 class Migration(migrations.Migration):
diff --git a/api/funquail_api/music/migrations/0041_auto_20191021_1705.py b/api/funkwhale_api/music/migrations/0041_auto_20191021_1705.py
similarity index 78%
rename from api/funquail_api/music/migrations/0041_auto_20191021_1705.py
rename to api/funkwhale_api/music/migrations/0041_auto_20191021_1705.py
index d9b5d981b..cd98e7707 100644
--- a/api/funquail_api/music/migrations/0041_auto_20191021_1705.py
+++ b/api/funkwhale_api/music/migrations/0041_auto_20191021_1705.py
@@ -4,7 +4,7 @@ import django.contrib.postgres.fields.jsonb
 import django.core.serializers.json
 from django.db import migrations, models
 import django.db.models.deletion
-import funquail_api.music.models
+import funkwhale_api.music.models
 
 
 class Migration(migrations.Migration):
@@ -27,17 +27,17 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='upload',
             name='import_details',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funquail_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
+            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funkwhale_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
         ),
         migrations.AlterField(
             model_name='upload',
             name='import_metadata',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funquail_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
+            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funkwhale_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
         ),
         migrations.AlterField(
             model_name='upload',
             name='metadata',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funquail_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
+            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funkwhale_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
         ),
         migrations.AlterField(
             model_name='uploadversion',
diff --git a/api/funquail_api/music/migrations/0042_album_attachment_cover.py b/api/funkwhale_api/music/migrations/0042_album_attachment_cover.py
similarity index 100%
rename from api/funquail_api/music/migrations/0042_album_attachment_cover.py
rename to api/funkwhale_api/music/migrations/0042_album_attachment_cover.py
diff --git a/api/funquail_api/music/migrations/0043_album_cover_attachment.py b/api/funkwhale_api/music/migrations/0043_album_cover_attachment.py
similarity index 100%
rename from api/funquail_api/music/migrations/0043_album_cover_attachment.py
rename to api/funkwhale_api/music/migrations/0043_album_cover_attachment.py
diff --git a/api/funquail_api/music/migrations/0044_full_text_search.py b/api/funkwhale_api/music/migrations/0044_full_text_search.py
similarity index 100%
rename from api/funquail_api/music/migrations/0044_full_text_search.py
rename to api/funkwhale_api/music/migrations/0044_full_text_search.py
diff --git a/api/funquail_api/music/migrations/0045_full_text_search_stop_words.py b/api/funkwhale_api/music/migrations/0045_full_text_search_stop_words.py
similarity index 100%
rename from api/funquail_api/music/migrations/0045_full_text_search_stop_words.py
rename to api/funkwhale_api/music/migrations/0045_full_text_search_stop_words.py
diff --git a/api/funquail_api/music/migrations/0046_auto_20200113_1018.py b/api/funkwhale_api/music/migrations/0046_auto_20200113_1018.py
similarity index 100%
rename from api/funquail_api/music/migrations/0046_auto_20200113_1018.py
rename to api/funkwhale_api/music/migrations/0046_auto_20200113_1018.py
diff --git a/api/funquail_api/music/migrations/0047_auto_20200116_1246.py b/api/funkwhale_api/music/migrations/0047_auto_20200116_1246.py
similarity index 100%
rename from api/funquail_api/music/migrations/0047_auto_20200116_1246.py
rename to api/funkwhale_api/music/migrations/0047_auto_20200116_1246.py
diff --git a/api/funquail_api/music/migrations/0048_auto_20200120_0900.py b/api/funkwhale_api/music/migrations/0048_auto_20200120_0900.py
similarity index 100%
rename from api/funquail_api/music/migrations/0048_auto_20200120_0900.py
rename to api/funkwhale_api/music/migrations/0048_auto_20200120_0900.py
diff --git a/api/funquail_api/music/migrations/0049_auto_20200122_1020.py b/api/funkwhale_api/music/migrations/0049_auto_20200122_1020.py
similarity index 100%
rename from api/funquail_api/music/migrations/0049_auto_20200122_1020.py
rename to api/funkwhale_api/music/migrations/0049_auto_20200122_1020.py
diff --git a/api/funquail_api/music/migrations/0050_auto_20200129_1344.py b/api/funkwhale_api/music/migrations/0050_auto_20200129_1344.py
similarity index 100%
rename from api/funquail_api/music/migrations/0050_auto_20200129_1344.py
rename to api/funkwhale_api/music/migrations/0050_auto_20200129_1344.py
diff --git a/api/funquail_api/music/migrations/0051_auto_20200319_1249.py b/api/funkwhale_api/music/migrations/0051_auto_20200319_1249.py
similarity index 100%
rename from api/funquail_api/music/migrations/0051_auto_20200319_1249.py
rename to api/funkwhale_api/music/migrations/0051_auto_20200319_1249.py
diff --git a/api/funquail_api/music/migrations/0052_auto_20200505_0810.py b/api/funkwhale_api/music/migrations/0052_auto_20200505_0810.py
similarity index 100%
rename from api/funquail_api/music/migrations/0052_auto_20200505_0810.py
rename to api/funkwhale_api/music/migrations/0052_auto_20200505_0810.py
diff --git a/api/funquail_api/music/migrations/0053_denormalize_audio_permissions.py b/api/funkwhale_api/music/migrations/0053_denormalize_audio_permissions.py
similarity index 90%
rename from api/funquail_api/music/migrations/0053_denormalize_audio_permissions.py
rename to api/funkwhale_api/music/migrations/0053_denormalize_audio_permissions.py
index 1a88903c0..374cda1d5 100644
--- a/api/funquail_api/music/migrations/0053_denormalize_audio_permissions.py
+++ b/api/funkwhale_api/music/migrations/0053_denormalize_audio_permissions.py
@@ -5,7 +5,7 @@ This migration is disabled until settings.MUSIC_USE_DENORMALIZATION is set to de
 from __future__ import unicode_literals
 
 from django.db import migrations
-from funquail_api.music.utils import guess_mimetype
+from funkwhale_api.music.utils import guess_mimetype
 
 
 def denormalize(apps, schema_editor):
@@ -13,7 +13,7 @@ def denormalize(apps, schema_editor):
     if not Upload.objects.count():
         print('Skipping…')
 
-    from funquail_api.music.models import TrackActor, Library
+    from funkwhale_api.music.models import TrackActor, Library
     libraries = Library.objects.all()
     objs = []
     total_libraries = len(libraries)
diff --git a/api/funquail_api/music/migrations/0054_alter_uploadversion_mimetype.py b/api/funkwhale_api/music/migrations/0054_alter_uploadversion_mimetype.py
similarity index 100%
rename from api/funquail_api/music/migrations/0054_alter_uploadversion_mimetype.py
rename to api/funkwhale_api/music/migrations/0054_alter_uploadversion_mimetype.py
diff --git a/api/funquail_api/music/migrations/0055_auto_20220627_1915.py b/api/funkwhale_api/music/migrations/0055_auto_20220627_1915.py
similarity index 52%
rename from api/funquail_api/music/migrations/0055_auto_20220627_1915.py
rename to api/funkwhale_api/music/migrations/0055_auto_20220627_1915.py
index a71dcadc4..8ebed5c8c 100644
--- a/api/funquail_api/music/migrations/0055_auto_20220627_1915.py
+++ b/api/funkwhale_api/music/migrations/0055_auto_20220627_1915.py
@@ -2,7 +2,7 @@
 
 import django.core.serializers.json
 from django.db import migrations, models
-import funquail_api.music.models
+import funkwhale_api.music.models
 
 
 class Migration(migrations.Migration):
@@ -15,16 +15,16 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='upload',
             name='import_details',
-            field=models.JSONField(blank=True, default=funquail_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
+            field=models.JSONField(blank=True, default=funkwhale_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
         ),
         migrations.AlterField(
             model_name='upload',
             name='import_metadata',
-            field=models.JSONField(blank=True, default=funquail_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
+            field=models.JSONField(blank=True, default=funkwhale_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
         ),
         migrations.AlterField(
             model_name='upload',
             name='metadata',
-            field=models.JSONField(blank=True, default=funquail_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
+            field=models.JSONField(blank=True, default=funkwhale_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000),
         ),
     ]
diff --git a/api/funquail_api/music/migrations/0056_alter_artist_content_category.py b/api/funkwhale_api/music/migrations/0056_alter_artist_content_category.py
similarity index 100%
rename from api/funquail_api/music/migrations/0056_alter_artist_content_category.py
rename to api/funkwhale_api/music/migrations/0056_alter_artist_content_category.py
diff --git a/api/funquail_api/music/migrations/0057_auto_20221118_2108.py b/api/funkwhale_api/music/migrations/0057_auto_20221118_2108.py
similarity index 100%
rename from api/funquail_api/music/migrations/0057_auto_20221118_2108.py
rename to api/funkwhale_api/music/migrations/0057_auto_20221118_2108.py
diff --git a/api/funquail_api/music/migrations/__init__.py b/api/funkwhale_api/music/migrations/__init__.py
similarity index 100%
rename from api/funquail_api/music/migrations/__init__.py
rename to api/funkwhale_api/music/migrations/__init__.py
diff --git a/api/funquail_api/music/models.py b/api/funkwhale_api/music/models.py
similarity index 98%
rename from api/funquail_api/music/models.py
rename to api/funkwhale_api/music/models.py
index 873862427..e715b4b90 100644
--- a/api/funquail_api/music/models.py
+++ b/api/funkwhale_api/music/models.py
@@ -23,14 +23,14 @@ from django.dispatch import receiver
 from django.urls import reverse
 from django.utils import timezone
 
-from funquail_api import musicbrainz
-from funquail_api.common import fields
-from funquail_api.common import models as common_models
-from funquail_api.common import session
-from funquail_api.common import utils as common_utils
-from funquail_api.federation import models as federation_models
-from funquail_api.federation import utils as federation_utils
-from funquail_api.tags import models as tags_models
+from funkwhale_api import musicbrainz
+from funkwhale_api.common import fields
+from funkwhale_api.common import models as common_models
+from funkwhale_api.common import session
+from funkwhale_api.common import utils as common_utils
+from funkwhale_api.federation import models as federation_models
+from funkwhale_api.federation import utils as federation_utils
+from funkwhale_api.tags import models as tags_models
 
 from . import importers, metadata, utils
 
@@ -783,7 +783,7 @@ class Upload(models.Model):
         return parsed.hostname
 
     def download_audio_from_remote(self, actor):
-        from funquail_api.federation import signing
+        from funkwhale_api.federation import signing
 
         if actor:
             auth = signing.get_auth(actor.private_key, actor.private_key_id)
@@ -1153,7 +1153,7 @@ class LibraryQuerySet(models.QuerySet):
         )
 
     def viewable_by(self, actor):
-        from funquail_api.federation.models import Follow, LibraryFollow
+        from funkwhale_api.federation.models import Follow, LibraryFollow
 
         if actor is None:
             return self.filter(privacy_level="everyone")
diff --git a/api/funquail_api/music/mutations.py b/api/funkwhale_api/music/mutations.py
similarity index 93%
rename from api/funquail_api/music/mutations.py
rename to api/funkwhale_api/music/mutations.py
index 193ff6c0d..7cd2918d6 100644
--- a/api/funquail_api/music/mutations.py
+++ b/api/funkwhale_api/music/mutations.py
@@ -1,10 +1,10 @@
-from funquail_api.common import models as common_models
-from funquail_api.common import mutations
-from funquail_api.common import serializers as common_serializers
-from funquail_api.common import utils as common_utils
-from funquail_api.federation import routes
-from funquail_api.tags import models as tags_models
-from funquail_api.tags import serializers as tags_serializers
+from funkwhale_api.common import models as common_models
+from funkwhale_api.common import mutations
+from funkwhale_api.common import serializers as common_serializers
+from funkwhale_api.common import utils as common_utils
+from funkwhale_api.federation import routes
+from funkwhale_api.tags import models as tags_models
+from funkwhale_api.tags import serializers as tags_serializers
 
 from . import models
 
diff --git a/api/funquail_api/music/serializers.py b/api/funkwhale_api/music/serializers.py
similarity index 97%
rename from api/funquail_api/music/serializers.py
rename to api/funkwhale_api/music/serializers.py
index 45481fbdd..22a163e0b 100644
--- a/api/funquail_api/music/serializers.py
+++ b/api/funkwhale_api/music/serializers.py
@@ -7,16 +7,16 @@ from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers
 
-from funquail_api.activity import serializers as activity_serializers
-from funquail_api.common import models as common_models
-from funquail_api.common import serializers as common_serializers
-from funquail_api.common import utils as common_utils
-from funquail_api.federation import routes
-from funquail_api.federation import utils as federation_utils
-from funquail_api.federation.serializers import APIActorSerializer
-from funquail_api.playlists import models as playlists_models
-from funquail_api.tags import models as tag_models
-from funquail_api.tags import serializers as tags_serializers
+from funkwhale_api.activity import serializers as activity_serializers
+from funkwhale_api.common import models as common_models
+from funkwhale_api.common import serializers as common_serializers
+from funkwhale_api.common import utils as common_utils
+from funkwhale_api.federation import routes
+from funkwhale_api.federation import utils as federation_utils
+from funkwhale_api.federation.serializers import APIActorSerializer
+from funkwhale_api.playlists import models as playlists_models
+from funkwhale_api.tags import models as tag_models
+from funkwhale_api.tags import serializers as tags_serializers
 
 from . import filters, models, tasks, utils
 
@@ -339,7 +339,7 @@ class LibraryForOwnerSerializer(serializers.ModelSerializer):
 
 
 class UploadSerializer(serializers.ModelSerializer):
-    from funquail_api.audio.serializers import ChannelSerializer
+    from funkwhale_api.audio.serializers import ChannelSerializer
 
     track = TrackSerializer(required=False, allow_null=True)
     library = common_serializers.RelatedField(
@@ -693,7 +693,7 @@ class OembedSerializer(serializers.Serializer):
                 common_utils.spa_reverse("library_artist", kwargs={"pk": artist.pk})
             )
         elif match.url_name == "channel_detail":
-            from funquail_api.audio.models import Channel
+            from funkwhale_api.audio.models import Channel
 
             kwargs = {}
             if "uuid" in match.kwargs:
diff --git a/api/funquail_api/music/signals.py b/api/funkwhale_api/music/signals.py
similarity index 100%
rename from api/funquail_api/music/signals.py
rename to api/funkwhale_api/music/signals.py
diff --git a/api/funquail_api/music/spa_views.py b/api/funkwhale_api/music/spa_views.py
similarity index 98%
rename from api/funquail_api/music/spa_views.py
rename to api/funkwhale_api/music/spa_views.py
index 8696ad825..31e7edef3 100644
--- a/api/funquail_api/music/spa_views.py
+++ b/api/funkwhale_api/music/spa_views.py
@@ -4,8 +4,8 @@ from django.conf import settings
 from django.db.models import Q
 from django.urls import reverse
 
-from funquail_api.common import middleware, preferences, utils
-from funquail_api.playlists import models as playlists_models
+from funkwhale_api.common import middleware, preferences, utils
+from funkwhale_api.playlists import models as playlists_models
 
 from . import models, serializers
 
diff --git a/api/funquail_api/music/tasks.py b/api/funkwhale_api/music/tasks.py
similarity index 98%
rename from api/funquail_api/music/tasks.py
rename to api/funkwhale_api/music/tasks.py
index 8915656f9..54801967c 100644
--- a/api/funquail_api/music/tasks.py
+++ b/api/funkwhale_api/music/tasks.py
@@ -12,16 +12,16 @@ from django.utils import timezone
 from musicbrainzngs import ResponseError
 from requests.exceptions import RequestException
 
-from funquail_api import musicbrainz
-from funquail_api.common import channels, preferences
-from funquail_api.common import utils as common_utils
-from funquail_api.federation import library as lb
-from funquail_api.federation import routes
-from funquail_api.federation import utils as federation_utils
-from funquail_api.music.management.commands import import_files
-from funquail_api.tags import models as tags_models
-from funquail_api.tags import tasks as tags_tasks
-from funquail_api.taskapp import celery
+from funkwhale_api import musicbrainz
+from funkwhale_api.common import channels, preferences
+from funkwhale_api.common import utils as common_utils
+from funkwhale_api.federation import library as lb
+from funkwhale_api.federation import routes
+from funkwhale_api.federation import utils as federation_utils
+from funkwhale_api.music.management.commands import import_files
+from funkwhale_api.tags import models as tags_models
+from funkwhale_api.tags import tasks as tags_tasks
+from funkwhale_api.taskapp import celery
 
 from . import licenses, metadata, models, signals
 
@@ -77,7 +77,7 @@ def get_cover_from_fs(dir_path):
 
 @celery.app.task(name="music.library.schedule_remote_scan")
 def schedule_scan_for_all_remote_libraries():
-    from funquail_api.federation import actors
+    from funkwhale_api.federation import actors
 
     libraries = models.Library.objects.all().prefetch_related()
     actor = actors.get_service_actor()
diff --git a/api/funquail_api/music/utils.py b/api/funkwhale_api/music/utils.py
similarity index 94%
rename from api/funquail_api/music/utils.py
rename to api/funkwhale_api/music/utils.py
index 61b85f10a..a81e2cff0 100644
--- a/api/funquail_api/music/utils.py
+++ b/api/funkwhale_api/music/utils.py
@@ -9,10 +9,10 @@ from django.conf import settings
 from django.core.cache import cache
 from django.db.models import F
 
-from funquail_api.common import throttling
-from funquail_api.common.search import get_fts_query  # noqa
-from funquail_api.common.search import get_query  # noqa
-from funquail_api.common.search import normalize_query  # noqa
+from funkwhale_api.common import throttling
+from funkwhale_api.common.search import get_fts_query  # noqa
+from funkwhale_api.common.search import get_query  # noqa
+from funkwhale_api.common.search import normalize_query  # noqa
 
 
 def guess_mimetype(f):
diff --git a/api/funquail_api/music/views.py b/api/funkwhale_api/music/views.py
similarity index 97%
rename from api/funquail_api/music/views.py
rename to api/funkwhale_api/music/views.py
index 78b813392..20942a952 100644
--- a/api/funquail_api/music/views.py
+++ b/api/funkwhale_api/music/views.py
@@ -17,21 +17,21 @@ from rest_framework import views, viewsets
 from rest_framework.decorators import action
 from rest_framework.response import Response
 
-from funquail_api.common import decorators as common_decorators
-from funquail_api.common import permissions as common_permissions
-from funquail_api.common import preferences
-from funquail_api.common import utils as common_utils
-from funquail_api.common import views as common_views
-from funquail_api.federation import actors
-from funquail_api.federation import api_serializers as federation_api_serializers
-from funquail_api.federation import decorators as federation_decorators
-from funquail_api.federation import models as federation_models
-from funquail_api.federation import routes
-from funquail_api.federation import tasks as federation_tasks
-from funquail_api.federation.authentication import SignatureAuthentication
-from funquail_api.tags.models import Tag, TaggedItem
-from funquail_api.users.authentication import ScopedTokenAuthentication
-from funquail_api.users.oauth import permissions as oauth_permissions
+from funkwhale_api.common import decorators as common_decorators
+from funkwhale_api.common import permissions as common_permissions
+from funkwhale_api.common import preferences
+from funkwhale_api.common import utils as common_utils
+from funkwhale_api.common import views as common_views
+from funkwhale_api.federation import actors
+from funkwhale_api.federation import api_serializers as federation_api_serializers
+from funkwhale_api.federation import decorators as federation_decorators
+from funkwhale_api.federation import models as federation_models
+from funkwhale_api.federation import routes
+from funkwhale_api.federation import tasks as federation_tasks
+from funkwhale_api.federation.authentication import SignatureAuthentication
+from funkwhale_api.tags.models import Tag, TaggedItem
+from funkwhale_api.users.authentication import ScopedTokenAuthentication
+from funkwhale_api.users.oauth import permissions as oauth_permissions
 
 from . import filters, licenses, models, serializers, tasks, utils
 
diff --git a/api/funquail_api/musicbrainz/__init__.py b/api/funkwhale_api/musicbrainz/__init__.py
similarity index 100%
rename from api/funquail_api/musicbrainz/__init__.py
rename to api/funkwhale_api/musicbrainz/__init__.py
diff --git a/api/funquail_api/musicbrainz/client.py b/api/funkwhale_api/musicbrainz/client.py
similarity index 98%
rename from api/funquail_api/musicbrainz/client.py
rename to api/funkwhale_api/musicbrainz/client.py
index af79b40b7..189580ae3 100644
--- a/api/funquail_api/musicbrainz/client.py
+++ b/api/funkwhale_api/musicbrainz/client.py
@@ -2,7 +2,7 @@ import musicbrainzngs
 from cache_memoize import cache_memoize
 from django.conf import settings
 
-from funquail_api import __version__
+from funkwhale_api import __version__
 
 _api = musicbrainzngs
 _api.set_useragent("funkwhale", str(__version__), settings.FUNQUAIL_URL)
diff --git a/api/funquail_api/musicbrainz/urls.py b/api/funkwhale_api/musicbrainz/urls.py
similarity index 95%
rename from api/funquail_api/musicbrainz/urls.py
rename to api/funkwhale_api/musicbrainz/urls.py
index 233d6ace6..aac5cf6ec 100644
--- a/api/funquail_api/musicbrainz/urls.py
+++ b/api/funkwhale_api/musicbrainz/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls import url
 
-from funquail_api.common import routers
+from funkwhale_api.common import routers
 
 from . import views
 
diff --git a/api/funquail_api/musicbrainz/views.py b/api/funkwhale_api/musicbrainz/views.py
similarity index 96%
rename from api/funquail_api/musicbrainz/views.py
rename to api/funkwhale_api/musicbrainz/views.py
index 07a5f770f..43d285784 100644
--- a/api/funquail_api/musicbrainz/views.py
+++ b/api/funkwhale_api/musicbrainz/views.py
@@ -3,7 +3,7 @@ from rest_framework.decorators import action
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
-from funquail_api.common.permissions import ConditionalAuthentication
+from funkwhale_api.common.permissions import ConditionalAuthentication
 
 from .client import api
 
diff --git a/api/funquail_api/playlists/__init__.py b/api/funkwhale_api/playlists/__init__.py
similarity index 100%
rename from api/funquail_api/playlists/__init__.py
rename to api/funkwhale_api/playlists/__init__.py
diff --git a/api/funquail_api/playlists/admin.py b/api/funkwhale_api/playlists/admin.py
similarity index 91%
rename from api/funquail_api/playlists/admin.py
rename to api/funkwhale_api/playlists/admin.py
index 4d0309e50..056535270 100644
--- a/api/funquail_api/playlists/admin.py
+++ b/api/funkwhale_api/playlists/admin.py
@@ -1,4 +1,4 @@
-from funquail_api.common import admin
+from funkwhale_api.common import admin
 
 from . import models
 
diff --git a/api/funquail_api/playlists/dynamic_preferences_registry.py b/api/funkwhale_api/playlists/dynamic_preferences_registry.py
similarity index 100%
rename from api/funquail_api/playlists/dynamic_preferences_registry.py
rename to api/funkwhale_api/playlists/dynamic_preferences_registry.py
diff --git a/api/funquail_api/playlists/factories.py b/api/funkwhale_api/playlists/factories.py
similarity index 74%
rename from api/funquail_api/playlists/factories.py
rename to api/funkwhale_api/playlists/factories.py
index 209f72ce3..5fbddd997 100644
--- a/api/funquail_api/playlists/factories.py
+++ b/api/funkwhale_api/playlists/factories.py
@@ -1,8 +1,8 @@
 import factory
 
-from funquail_api.factories import NoUpdateOnCreate, registry
-from funquail_api.music.factories import TrackFactory
-from funquail_api.users.factories import UserFactory
+from funkwhale_api.factories import NoUpdateOnCreate, registry
+from funkwhale_api.music.factories import TrackFactory
+from funkwhale_api.users.factories import UserFactory
 
 
 @registry.register
diff --git a/api/funquail_api/playlists/filters.py b/api/funkwhale_api/playlists/filters.py
similarity index 90%
rename from api/funquail_api/playlists/filters.py
rename to api/funkwhale_api/playlists/filters.py
index 9c5789c09..5270eee80 100644
--- a/api/funquail_api/playlists/filters.py
+++ b/api/funkwhale_api/playlists/filters.py
@@ -1,9 +1,9 @@
 from django.db.models import Count
 from django_filters import rest_framework as filters
 
-from funquail_api.common import filters as common_filters
-from funquail_api.music import models as music_models
-from funquail_api.music import utils
+from funkwhale_api.common import filters as common_filters
+from funkwhale_api.music import models as music_models
+from funkwhale_api.music import utils
 
 from . import models
 
diff --git a/api/funquail_api/playlists/migrations/0001_initial.py b/api/funkwhale_api/playlists/migrations/0001_initial.py
similarity index 100%
rename from api/funquail_api/playlists/migrations/0001_initial.py
rename to api/funkwhale_api/playlists/migrations/0001_initial.py
diff --git a/api/funquail_api/playlists/migrations/0002_auto_20180316_2217.py b/api/funkwhale_api/playlists/migrations/0002_auto_20180316_2217.py
similarity index 100%
rename from api/funquail_api/playlists/migrations/0002_auto_20180316_2217.py
rename to api/funkwhale_api/playlists/migrations/0002_auto_20180316_2217.py
diff --git a/api/funquail_api/playlists/migrations/0003_auto_20180319_1214.py b/api/funkwhale_api/playlists/migrations/0003_auto_20180319_1214.py
similarity index 100%
rename from api/funquail_api/playlists/migrations/0003_auto_20180319_1214.py
rename to api/funkwhale_api/playlists/migrations/0003_auto_20180319_1214.py
diff --git a/api/funquail_api/playlists/migrations/0004_auto_20180320_1713.py b/api/funkwhale_api/playlists/migrations/0004_auto_20180320_1713.py
similarity index 100%
rename from api/funquail_api/playlists/migrations/0004_auto_20180320_1713.py
rename to api/funkwhale_api/playlists/migrations/0004_auto_20180320_1713.py
diff --git a/api/funquail_api/playlists/migrations/__init__.py b/api/funkwhale_api/playlists/migrations/__init__.py
similarity index 100%
rename from api/funquail_api/playlists/migrations/__init__.py
rename to api/funkwhale_api/playlists/migrations/__init__.py
diff --git a/api/funquail_api/playlists/models.py b/api/funkwhale_api/playlists/models.py
similarity index 98%
rename from api/funquail_api/playlists/models.py
rename to api/funkwhale_api/playlists/models.py
index a68dad119..74172e8b6 100644
--- a/api/funquail_api/playlists/models.py
+++ b/api/funkwhale_api/playlists/models.py
@@ -4,8 +4,8 @@ from django.db.models.expressions import OuterRef, Subquery
 from django.utils import timezone
 from rest_framework import exceptions
 
-from funquail_api.common import fields, preferences
-from funquail_api.music import models as music_models
+from funkwhale_api.common import fields, preferences
+from funkwhale_api.music import models as music_models
 
 
 class PlaylistQuerySet(models.QuerySet):
diff --git a/api/funquail_api/playlists/serializers.py b/api/funkwhale_api/playlists/serializers.py
similarity index 93%
rename from api/funquail_api/playlists/serializers.py
rename to api/funkwhale_api/playlists/serializers.py
index b5e9ac1f4..09582774e 100644
--- a/api/funquail_api/playlists/serializers.py
+++ b/api/funkwhale_api/playlists/serializers.py
@@ -2,10 +2,10 @@ from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers
 
-from funquail_api.federation import serializers as federation_serializers
-from funquail_api.music.models import Track
-from funquail_api.music.serializers import TrackSerializer
-from funquail_api.users.serializers import UserBasicSerializer
+from funkwhale_api.federation import serializers as federation_serializers
+from funkwhale_api.music.models import Track
+from funkwhale_api.music.serializers import TrackSerializer
+from funkwhale_api.users.serializers import UserBasicSerializer
 
 from . import models
 
diff --git a/api/funquail_api/playlists/views.py b/api/funkwhale_api/playlists/views.py
similarity index 96%
rename from api/funquail_api/playlists/views.py
rename to api/funkwhale_api/playlists/views.py
index 179c29875..0b57a6ef9 100644
--- a/api/funquail_api/playlists/views.py
+++ b/api/funkwhale_api/playlists/views.py
@@ -5,9 +5,9 @@ from rest_framework import exceptions, mixins, viewsets
 from rest_framework.decorators import action
 from rest_framework.response import Response
 
-from funquail_api.common import fields, permissions
-from funquail_api.music import utils as music_utils
-from funquail_api.users.oauth import permissions as oauth_permissions
+from funkwhale_api.common import fields, permissions
+from funkwhale_api.music import utils as music_utils
+from funkwhale_api.users.oauth import permissions as oauth_permissions
 
 from . import filters, models, serializers
 
diff --git a/api/funquail_api/providers/__init__.py b/api/funkwhale_api/providers/__init__.py
similarity index 100%
rename from api/funquail_api/providers/__init__.py
rename to api/funkwhale_api/providers/__init__.py
diff --git a/api/funquail_api/providers/urls.py b/api/funkwhale_api/providers/urls.py
similarity index 59%
rename from api/funquail_api/providers/urls.py
rename to api/funkwhale_api/providers/urls.py
index 8dce65591..dc8afeee7 100644
--- a/api/funquail_api/providers/urls.py
+++ b/api/funkwhale_api/providers/urls.py
@@ -4,7 +4,7 @@ urlpatterns = [
     url(
         r"^musicbrainz/",
         include(
-            ("funquail_api.musicbrainz.urls", "musicbrainz"), namespace="musicbrainz"
+            ("funkwhale_api.musicbrainz.urls", "musicbrainz"), namespace="musicbrainz"
         ),
     )
 ]
diff --git a/api/funquail_api/radios/__init__.py b/api/funkwhale_api/radios/__init__.py
similarity index 100%
rename from api/funquail_api/radios/__init__.py
rename to api/funkwhale_api/radios/__init__.py
diff --git a/api/funquail_api/radios/admin.py b/api/funkwhale_api/radios/admin.py
similarity index 95%
rename from api/funquail_api/radios/admin.py
rename to api/funkwhale_api/radios/admin.py
index 499f6b9a9..0cfd5d925 100644
--- a/api/funquail_api/radios/admin.py
+++ b/api/funkwhale_api/radios/admin.py
@@ -1,4 +1,4 @@
-from funquail_api.common import admin
+from funkwhale_api.common import admin
 
 from . import models
 
diff --git a/api/funquail_api/radios/factories.py b/api/funkwhale_api/radios/factories.py
similarity index 88%
rename from api/funquail_api/radios/factories.py
rename to api/funkwhale_api/radios/factories.py
index 8dc54fa23..f8ff6f6ac 100644
--- a/api/funquail_api/radios/factories.py
+++ b/api/funkwhale_api/radios/factories.py
@@ -1,7 +1,7 @@
 import factory
 
-from funquail_api.factories import NoUpdateOnCreate, registry
-from funquail_api.users.factories import UserFactory
+from funkwhale_api.factories import NoUpdateOnCreate, registry
+from funkwhale_api.users.factories import UserFactory
 
 
 @registry.register
diff --git a/api/funquail_api/radios/filters.py b/api/funkwhale_api/radios/filters.py
similarity index 98%
rename from api/funquail_api/radios/filters.py
rename to api/funkwhale_api/radios/filters.py
index cecdefaec..114236ee0 100644
--- a/api/funquail_api/radios/filters.py
+++ b/api/funkwhale_api/radios/filters.py
@@ -5,8 +5,8 @@ from django.core.exceptions import ValidationError
 from django.db.models import Q, functions
 from django.urls import reverse_lazy
 
-from funquail_api.music import models
-from funquail_api.playlists import models as plt_models
+from funkwhale_api.music import models
+from funkwhale_api.playlists import models as plt_models
 
 
 class RadioFilterRegistry(persisting_theory.Registry):
diff --git a/api/funquail_api/radios/filtersets.py b/api/funkwhale_api/radios/filtersets.py
similarity index 85%
rename from api/funquail_api/radios/filtersets.py
rename to api/funkwhale_api/radios/filtersets.py
index f6a8a7afe..366da9973 100644
--- a/api/funquail_api/radios/filtersets.py
+++ b/api/funkwhale_api/radios/filtersets.py
@@ -1,8 +1,8 @@
 import django_filters
 from django_filters import rest_framework as filters
 
-from funquail_api.common import filters as common_filters
-from funquail_api.music import utils
+from funkwhale_api.common import filters as common_filters
+from funkwhale_api.music import utils
 
 from . import models
 
diff --git a/api/funquail_api/radios/lb_recommendations.py b/api/funkwhale_api/radios/lb_recommendations.py
similarity index 97%
rename from api/funquail_api/radios/lb_recommendations.py
rename to api/funkwhale_api/radios/lb_recommendations.py
index 4be00f4d3..6466915b0 100644
--- a/api/funquail_api/radios/lb_recommendations.py
+++ b/api/funkwhale_api/radios/lb_recommendations.py
@@ -8,8 +8,8 @@
 # from django.db.models import Q
 # from requests.exceptions import ConnectTimeout
 
-# from funquail_api.music import models as music_models
-# from funquail_api.typesense import utils
+# from funkwhale_api.music import models as music_models
+# from funkwhale_api.typesense import utils
 
 # logger = logging.getLogger(__name__)
 
diff --git a/api/funquail_api/radios/migrations/0001_initial.py b/api/funkwhale_api/radios/migrations/0001_initial.py
similarity index 100%
rename from api/funquail_api/radios/migrations/0001_initial.py
rename to api/funkwhale_api/radios/migrations/0001_initial.py
diff --git a/api/funquail_api/radios/migrations/0002_radiosession_session_key.py b/api/funkwhale_api/radios/migrations/0002_radiosession_session_key.py
similarity index 100%
rename from api/funquail_api/radios/migrations/0002_radiosession_session_key.py
rename to api/funkwhale_api/radios/migrations/0002_radiosession_session_key.py
diff --git a/api/funquail_api/radios/migrations/0003_auto_20160521_1708.py b/api/funkwhale_api/radios/migrations/0003_auto_20160521_1708.py
similarity index 100%
rename from api/funquail_api/radios/migrations/0003_auto_20160521_1708.py
rename to api/funkwhale_api/radios/migrations/0003_auto_20160521_1708.py
diff --git a/api/funquail_api/radios/migrations/0004_auto_20180107_1813.py b/api/funkwhale_api/radios/migrations/0004_auto_20180107_1813.py
similarity index 100%
rename from api/funquail_api/radios/migrations/0004_auto_20180107_1813.py
rename to api/funkwhale_api/radios/migrations/0004_auto_20180107_1813.py
diff --git a/api/funquail_api/radios/migrations/0005_auto_20200803_1222.py b/api/funkwhale_api/radios/migrations/0005_auto_20200803_1222.py
similarity index 100%
rename from api/funquail_api/radios/migrations/0005_auto_20200803_1222.py
rename to api/funkwhale_api/radios/migrations/0005_auto_20200803_1222.py
diff --git a/api/funquail_api/radios/migrations/0006_alter_radio_config.py b/api/funkwhale_api/radios/migrations/0006_alter_radio_config.py
similarity index 100%
rename from api/funquail_api/radios/migrations/0006_alter_radio_config.py
rename to api/funkwhale_api/radios/migrations/0006_alter_radio_config.py
diff --git a/api/funquail_api/radios/migrations/0006_radiosession_config.py b/api/funkwhale_api/radios/migrations/0006_radiosession_config.py
similarity index 100%
rename from api/funquail_api/radios/migrations/0006_radiosession_config.py
rename to api/funkwhale_api/radios/migrations/0006_radiosession_config.py
diff --git a/api/funquail_api/radios/migrations/0007_merge_20220715_0801.py b/api/funkwhale_api/radios/migrations/0007_merge_20220715_0801.py
similarity index 100%
rename from api/funquail_api/radios/migrations/0007_merge_20220715_0801.py
rename to api/funkwhale_api/radios/migrations/0007_merge_20220715_0801.py
diff --git a/api/funquail_api/radios/migrations/__init__.py b/api/funkwhale_api/radios/migrations/__init__.py
similarity index 100%
rename from api/funquail_api/radios/migrations/__init__.py
rename to api/funkwhale_api/radios/migrations/__init__.py
diff --git a/api/funquail_api/radios/models.py b/api/funkwhale_api/radios/models.py
similarity index 98%
rename from api/funquail_api/radios/models.py
rename to api/funkwhale_api/radios/models.py
index 1ba761c51..fdd6cd481 100644
--- a/api/funquail_api/radios/models.py
+++ b/api/funkwhale_api/radios/models.py
@@ -5,7 +5,7 @@ from django.db import models
 from django.db.models import JSONField
 from django.utils import timezone
 
-from funquail_api.music.models import Track
+from funkwhale_api.music.models import Track
 
 from . import filters
 
diff --git a/api/funquail_api/radios/radios.py b/api/funkwhale_api/radios/radios.py
similarity index 97%
rename from api/funquail_api/radios/radios.py
rename to api/funkwhale_api/radios/radios.py
index 34d8355f5..1f97c29c3 100644
--- a/api/funquail_api/radios/radios.py
+++ b/api/funkwhale_api/radios/radios.py
@@ -9,11 +9,11 @@ from django.db import connection
 from django.db.models import Q
 from rest_framework import serializers
 
-from funquail_api.federation import fields as federation_fields
-from funquail_api.federation import models as federation_models
-from funquail_api.moderation import filters as moderation_filters
-from funquail_api.music.models import Artist, Library, Track, Upload
-from funquail_api.tags.models import Tag
+from funkwhale_api.federation import fields as federation_fields
+from funkwhale_api.federation import models as federation_models
+from funkwhale_api.moderation import filters as moderation_filters
+from funkwhale_api.music.models import Artist, Library, Track, Upload
+from funkwhale_api.tags.models import Tag
 
 from . import filters, lb_recommendations, models
 from .registries import registry
diff --git a/api/funquail_api/radios/radios_v2.py b/api/funkwhale_api/radios/radios_v2.py
similarity index 98%
rename from api/funquail_api/radios/radios_v2.py
rename to api/funkwhale_api/radios/radios_v2.py
index 617c1391f..06a0d4e7f 100644
--- a/api/funquail_api/radios/radios_v2.py
+++ b/api/funkwhale_api/radios/radios_v2.py
@@ -11,11 +11,11 @@ from django.db import connection
 from django.db.models import Q
 from rest_framework import serializers
 
-from funquail_api.federation import fields as federation_fields
-from funquail_api.federation import models as federation_models
-from funquail_api.moderation import filters as moderation_filters
-from funquail_api.music.models import Artist, Library, Track, Upload
-from funquail_api.tags.models import Tag
+from funkwhale_api.federation import fields as federation_fields
+from funkwhale_api.federation import models as federation_models
+from funkwhale_api.moderation import filters as moderation_filters
+from funkwhale_api.music.models import Artist, Library, Track, Upload
+from funkwhale_api.tags.models import Tag
 
 from . import filters, lb_recommendations, models
 from .registries_v2 import registry
diff --git a/api/funquail_api/radios/registries.py b/api/funkwhale_api/radios/registries.py
similarity index 100%
rename from api/funquail_api/radios/registries.py
rename to api/funkwhale_api/radios/registries.py
diff --git a/api/funquail_api/radios/registries_v2.py b/api/funkwhale_api/radios/registries_v2.py
similarity index 100%
rename from api/funquail_api/radios/registries_v2.py
rename to api/funkwhale_api/radios/registries_v2.py
diff --git a/api/funquail_api/radios/serializers.py b/api/funkwhale_api/radios/serializers.py
similarity index 96%
rename from api/funquail_api/radios/serializers.py
rename to api/funkwhale_api/radios/serializers.py
index 87df6f37e..16886f818 100644
--- a/api/funquail_api/radios/serializers.py
+++ b/api/funkwhale_api/radios/serializers.py
@@ -1,7 +1,7 @@
 from rest_framework import serializers
 
-from funquail_api.music.serializers import TrackSerializer
-from funquail_api.users.serializers import UserBasicSerializer
+from funkwhale_api.music.serializers import TrackSerializer
+from funkwhale_api.users.serializers import UserBasicSerializer
 
 from . import filters, models
 from .radios import registry
diff --git a/api/funquail_api/radios/urls.py b/api/funkwhale_api/radios/urls.py
similarity index 87%
rename from api/funquail_api/radios/urls.py
rename to api/funkwhale_api/radios/urls.py
index 2cde64923..7f1e3864b 100644
--- a/api/funquail_api/radios/urls.py
+++ b/api/funkwhale_api/radios/urls.py
@@ -1,4 +1,4 @@
-from funquail_api.common import routers
+from funkwhale_api.common import routers
 
 from . import views
 
diff --git a/api/funquail_api/radios/urls_v2.py b/api/funkwhale_api/radios/urls_v2.py
similarity index 79%
rename from api/funquail_api/radios/urls_v2.py
rename to api/funkwhale_api/radios/urls_v2.py
index d225f3523..bac76f998 100644
--- a/api/funquail_api/radios/urls_v2.py
+++ b/api/funkwhale_api/radios/urls_v2.py
@@ -1,4 +1,4 @@
-from funquail_api.common import routers
+from funkwhale_api.common import routers
 
 from . import views
 
diff --git a/api/funquail_api/radios/views.py b/api/funkwhale_api/radios/views.py
similarity index 97%
rename from api/funquail_api/radios/views.py
rename to api/funkwhale_api/radios/views.py
index cf0f51c2e..07138ee35 100644
--- a/api/funquail_api/radios/views.py
+++ b/api/funkwhale_api/radios/views.py
@@ -7,10 +7,10 @@ from rest_framework import mixins, status, viewsets
 from rest_framework.decorators import action
 from rest_framework.response import Response
 
-from funquail_api.common import permissions as common_permissions
-from funquail_api.music import utils as music_utils
-from funquail_api.music.serializers import TrackSerializer
-from funquail_api.users.oauth import permissions as oauth_permissions
+from funkwhale_api.common import permissions as common_permissions
+from funkwhale_api.music import utils as music_utils
+from funkwhale_api.music.serializers import TrackSerializer
+from funkwhale_api.users.oauth import permissions as oauth_permissions
 
 from . import filters, filtersets, models, serializers
 
diff --git a/api/funquail_api/requests/__init__.py b/api/funkwhale_api/requests/__init__.py
similarity index 100%
rename from api/funquail_api/requests/__init__.py
rename to api/funkwhale_api/requests/__init__.py
diff --git a/api/funquail_api/requests/migrations/0001_initial.py b/api/funkwhale_api/requests/migrations/0001_initial.py
similarity index 100%
rename from api/funquail_api/requests/migrations/0001_initial.py
rename to api/funkwhale_api/requests/migrations/0001_initial.py
diff --git a/api/funquail_api/requests/migrations/__init__.py b/api/funkwhale_api/requests/migrations/__init__.py
similarity index 100%
rename from api/funquail_api/requests/migrations/__init__.py
rename to api/funkwhale_api/requests/migrations/__init__.py
diff --git a/api/funquail_api/requests/models.py b/api/funkwhale_api/requests/models.py
similarity index 100%
rename from api/funquail_api/requests/models.py
rename to api/funkwhale_api/requests/models.py
diff --git a/api/funquail_api/schema.py b/api/funkwhale_api/schema.py
similarity index 100%
rename from api/funquail_api/schema.py
rename to api/funkwhale_api/schema.py
diff --git a/api/funquail_api/static/images/podcasts-cover-placeholder.png b/api/funkwhale_api/static/images/podcasts-cover-placeholder.png
similarity index 100%
rename from api/funquail_api/static/images/podcasts-cover-placeholder.png
rename to api/funkwhale_api/static/images/podcasts-cover-placeholder.png
diff --git a/api/funquail_api/static/music/sample1.ogg b/api/funkwhale_api/static/music/sample1.ogg
similarity index 100%
rename from api/funquail_api/static/music/sample1.ogg
rename to api/funkwhale_api/static/music/sample1.ogg
diff --git a/api/funquail_api/subsonic/__init__.py b/api/funkwhale_api/subsonic/__init__.py
similarity index 100%
rename from api/funquail_api/subsonic/__init__.py
rename to api/funkwhale_api/subsonic/__init__.py
diff --git a/api/funquail_api/subsonic/authentication.py b/api/funkwhale_api/subsonic/authentication.py
similarity index 97%
rename from api/funquail_api/subsonic/authentication.py
rename to api/funkwhale_api/subsonic/authentication.py
index c67d32d82..195f43d62 100644
--- a/api/funquail_api/subsonic/authentication.py
+++ b/api/funkwhale_api/subsonic/authentication.py
@@ -3,7 +3,7 @@ import hashlib
 
 from rest_framework import authentication, exceptions
 
-from funquail_api.users.models import User
+from funkwhale_api.users.models import User
 
 
 def get_token(salt, password):
diff --git a/api/funquail_api/subsonic/dynamic_preferences_registry.py b/api/funkwhale_api/subsonic/dynamic_preferences_registry.py
similarity index 100%
rename from api/funquail_api/subsonic/dynamic_preferences_registry.py
rename to api/funkwhale_api/subsonic/dynamic_preferences_registry.py
diff --git a/api/funquail_api/subsonic/filters.py b/api/funkwhale_api/subsonic/filters.py
similarity index 91%
rename from api/funquail_api/subsonic/filters.py
rename to api/funkwhale_api/subsonic/filters.py
index 77a93e617..f3fc81111 100644
--- a/api/funquail_api/subsonic/filters.py
+++ b/api/funkwhale_api/subsonic/filters.py
@@ -1,6 +1,6 @@
 from django_filters import rest_framework as filters
 
-from funquail_api.music import models as music_models
+from funkwhale_api.music import models as music_models
 
 
 class AlbumList2FilterSet(filters.FilterSet):
diff --git a/api/funquail_api/subsonic/negotiation.py b/api/funkwhale_api/subsonic/negotiation.py
similarity index 100%
rename from api/funquail_api/subsonic/negotiation.py
rename to api/funkwhale_api/subsonic/negotiation.py
diff --git a/api/funquail_api/subsonic/renderers.py b/api/funkwhale_api/subsonic/renderers.py
similarity index 97%
rename from api/funquail_api/subsonic/renderers.py
rename to api/funkwhale_api/subsonic/renderers.py
index ea06834c0..f11940222 100644
--- a/api/funquail_api/subsonic/renderers.py
+++ b/api/funkwhale_api/subsonic/renderers.py
@@ -3,7 +3,7 @@ import xml.etree.ElementTree as ET
 
 from rest_framework import renderers
 
-import funquail_api
+import funkwhale_api
 
 
 # from https://stackoverflow.com/a/8915039
@@ -31,7 +31,7 @@ ET._serialize_xml = ET._serialize["xml"] = _serialize_xml
 
 def structure_payload(data):
     payload = {
-        "funkwhaleVersion": funquail_api.__version__,
+        "funkwhaleVersion": funkwhale_api.__version__,
         "status": "ok",
         "type": "funkwhale",
         "version": "1.16.0",
diff --git a/api/funquail_api/subsonic/serializers.py b/api/funkwhale_api/subsonic/serializers.py
similarity index 98%
rename from api/funquail_api/subsonic/serializers.py
rename to api/funkwhale_api/subsonic/serializers.py
index efff6c5e3..5a615126b 100644
--- a/api/funquail_api/subsonic/serializers.py
+++ b/api/funkwhale_api/subsonic/serializers.py
@@ -3,9 +3,9 @@ import collections
 from django.db.models import Count, functions
 from rest_framework import serializers
 
-from funquail_api.history import models as history_models
-from funquail_api.music import models as music_models
-from funquail_api.music import utils as music_utils
+from funkwhale_api.history import models as history_models
+from funkwhale_api.music import models as music_models
+from funkwhale_api.music import utils as music_utils
 
 
 def to_subsonic_date(date):
diff --git a/api/funquail_api/subsonic/views.py b/api/funkwhale_api/subsonic/views.py
similarity index 96%
rename from api/funquail_api/subsonic/views.py
rename to api/funkwhale_api/subsonic/views.py
index bb2fe22a9..316cce706 100644
--- a/api/funquail_api/subsonic/views.py
+++ b/api/funkwhale_api/subsonic/views.py
@@ -15,27 +15,27 @@ from rest_framework import renderers, response, viewsets
 from rest_framework.decorators import action
 from rest_framework.serializers import ValidationError
 
-import funquail_api
+import funkwhale_api
 from config import plugins
-from funquail_api.activity import record
-from funquail_api.audio import models as audio_models
-from funquail_api.audio import serializers as audio_serializers
-from funquail_api.audio import views as audio_views
-from funquail_api.common import fields
-from funquail_api.common import models as common_models
-from funquail_api.common import preferences
-from funquail_api.common import tasks as common_tasks
-from funquail_api.common import utils as common_utils
-from funquail_api.favorites.models import TrackFavorite
-from funquail_api.federation import models as federation_models
-from funquail_api.moderation import filters as moderation_filters
-from funquail_api.music import models as music_models
-from funquail_api.music import serializers as music_serializers
-from funquail_api.music import utils
-from funquail_api.music import views as music_views
-from funquail_api.playlists import models as playlists_models
-from funquail_api.tags import models as tags_models
-from funquail_api.users import models as users_models
+from funkwhale_api.activity import record
+from funkwhale_api.audio import models as audio_models
+from funkwhale_api.audio import serializers as audio_serializers
+from funkwhale_api.audio import views as audio_views
+from funkwhale_api.common import fields
+from funkwhale_api.common import models as common_models
+from funkwhale_api.common import preferences
+from funkwhale_api.common import tasks as common_tasks
+from funkwhale_api.common import utils as common_utils
+from funkwhale_api.favorites.models import TrackFavorite
+from funkwhale_api.federation import models as federation_models
+from funkwhale_api.moderation import filters as moderation_filters
+from funkwhale_api.music import models as music_models
+from funkwhale_api.music import serializers as music_serializers
+from funkwhale_api.music import utils
+from funkwhale_api.music import views as music_views
+from funkwhale_api.playlists import models as playlists_models
+from funkwhale_api.tags import models as tags_models
+from funkwhale_api.users import models as users_models
 
 from . import authentication, filters, negotiation, serializers
 
@@ -171,7 +171,7 @@ class SubsonicViewSet(viewsets.GenericViewSet):
             "status": "ok",
             "version": "1.16.0",
             "type": "funkwhale",
-            "funkwhaleVersion": funquail_api.__version__,
+            "funkwhaleVersion": funkwhale_api.__version__,
             "license": {
                 "valid": "true",
                 "email": "valid@valid.license",
diff --git a/api/funquail_api/tags/__init__.py b/api/funkwhale_api/tags/__init__.py
similarity index 100%
rename from api/funquail_api/tags/__init__.py
rename to api/funkwhale_api/tags/__init__.py
diff --git a/api/funquail_api/tags/admin.py b/api/funkwhale_api/tags/admin.py
similarity index 91%
rename from api/funquail_api/tags/admin.py
rename to api/funkwhale_api/tags/admin.py
index 0e76d46b6..bead39331 100644
--- a/api/funquail_api/tags/admin.py
+++ b/api/funkwhale_api/tags/admin.py
@@ -1,4 +1,4 @@
-from funquail_api.common import admin
+from funkwhale_api.common import admin
 
 from . import models
 
diff --git a/api/funquail_api/tags/factories.py b/api/funkwhale_api/tags/factories.py
similarity index 92%
rename from api/funquail_api/tags/factories.py
rename to api/funkwhale_api/tags/factories.py
index 3d14dc1ab..c0c2096df 100644
--- a/api/funquail_api/tags/factories.py
+++ b/api/funkwhale_api/tags/factories.py
@@ -1,6 +1,6 @@
 import factory
 
-from funquail_api.factories import NoUpdateOnCreate, registry
+from funkwhale_api.factories import NoUpdateOnCreate, registry
 
 from . import models
 
diff --git a/api/funquail_api/tags/filters.py b/api/funkwhale_api/tags/filters.py
similarity index 96%
rename from api/funquail_api/tags/filters.py
rename to api/funkwhale_api/tags/filters.py
index a2d7a9130..bcd6894af 100644
--- a/api/funquail_api/tags/filters.py
+++ b/api/funkwhale_api/tags/filters.py
@@ -2,7 +2,7 @@ import django_filters
 from django.db import models as dj_models
 from django_filters import rest_framework as filters
 
-from funquail_api.common import fields
+from funkwhale_api.common import fields
 
 from . import models
 
diff --git a/api/funquail_api/tags/migrations/0001_initial.py b/api/funkwhale_api/tags/migrations/0001_initial.py
similarity index 100%
rename from api/funquail_api/tags/migrations/0001_initial.py
rename to api/funkwhale_api/tags/migrations/0001_initial.py
diff --git a/api/funquail_api/tags/migrations/0002_auto_20200803_1222.py b/api/funkwhale_api/tags/migrations/0002_auto_20200803_1222.py
similarity index 100%
rename from api/funquail_api/tags/migrations/0002_auto_20200803_1222.py
rename to api/funkwhale_api/tags/migrations/0002_auto_20200803_1222.py
diff --git a/api/funquail_api/tags/migrations/__init__.py b/api/funkwhale_api/tags/migrations/__init__.py
similarity index 100%
rename from api/funquail_api/tags/migrations/__init__.py
rename to api/funkwhale_api/tags/migrations/__init__.py
diff --git a/api/funquail_api/tags/models.py b/api/funkwhale_api/tags/models.py
similarity index 100%
rename from api/funquail_api/tags/models.py
rename to api/funkwhale_api/tags/models.py
diff --git a/api/funquail_api/tags/serializers.py b/api/funkwhale_api/tags/serializers.py
similarity index 100%
rename from api/funquail_api/tags/serializers.py
rename to api/funkwhale_api/tags/serializers.py
diff --git a/api/funquail_api/tags/tasks.py b/api/funkwhale_api/tags/tasks.py
similarity index 100%
rename from api/funquail_api/tags/tasks.py
rename to api/funkwhale_api/tags/tasks.py
diff --git a/api/funquail_api/tags/views.py b/api/funkwhale_api/tags/views.py
similarity index 90%
rename from api/funquail_api/tags/views.py
rename to api/funkwhale_api/tags/views.py
index f88316448..91c94840c 100644
--- a/api/funquail_api/tags/views.py
+++ b/api/funkwhale_api/tags/views.py
@@ -2,7 +2,7 @@ import django_filters.rest_framework
 from django.db.models import functions
 from rest_framework import viewsets
 
-from funquail_api.users.oauth import permissions as oauth_permissions
+from funkwhale_api.users.oauth import permissions as oauth_permissions
 
 from . import filters, models, serializers
 
diff --git a/api/funquail_api/taskapp/__init__.py b/api/funkwhale_api/taskapp/__init__.py
similarity index 100%
rename from api/funquail_api/taskapp/__init__.py
rename to api/funkwhale_api/taskapp/__init__.py
diff --git a/api/funquail_api/taskapp/celery.py b/api/funkwhale_api/taskapp/celery.py
similarity index 96%
rename from api/funquail_api/taskapp/celery.py
rename to api/funkwhale_api/taskapp/celery.py
index 828de0649..c271fe20d 100644
--- a/api/funquail_api/taskapp/celery.py
+++ b/api/funkwhale_api/taskapp/celery.py
@@ -15,7 +15,7 @@ if not settings.configured:
         "DJANGO_SETTINGS_MODULE", "config.settings.production"
     )  # pragma: no cover
 
-app = celery.Celery("funquail_api")
+app = celery.Celery("funkwhale_api")
 
 
 @celery.signals.task_failure.connect
@@ -25,7 +25,7 @@ def process_failure(sender, task_id, exception, args, kwargs, traceback, einfo,
 
 
 class CeleryConfig(AppConfig):
-    name = "funquail_api.taskapp"
+    name = "funkwhale_api.taskapp"
     verbose_name = "Celery Config"
 
     def ready(self):
diff --git a/api/funquail_api/templates/account/email/email_confirmation_message.txt b/api/funkwhale_api/templates/account/email/email_confirmation_message.txt
similarity index 100%
rename from api/funquail_api/templates/account/email/email_confirmation_message.txt
rename to api/funkwhale_api/templates/account/email/email_confirmation_message.txt
diff --git a/api/funquail_api/templates/registration/password_reset_email.html b/api/funkwhale_api/templates/registration/password_reset_email.html
similarity index 100%
rename from api/funquail_api/templates/registration/password_reset_email.html
rename to api/funkwhale_api/templates/registration/password_reset_email.html
diff --git a/api/funquail_api/typesense/__init__.py b/api/funkwhale_api/typesense/__init__.py
similarity index 100%
rename from api/funquail_api/typesense/__init__.py
rename to api/funkwhale_api/typesense/__init__.py
diff --git a/api/funquail_api/typesense/factories.py b/api/funkwhale_api/typesense/factories.py
similarity index 100%
rename from api/funquail_api/typesense/factories.py
rename to api/funkwhale_api/typesense/factories.py
diff --git a/api/funquail_api/typesense/tasks.py b/api/funkwhale_api/typesense/tasks.py
similarity index 96%
rename from api/funquail_api/typesense/tasks.py
rename to api/funkwhale_api/typesense/tasks.py
index 05caa3b03..febb96eea 100644
--- a/api/funquail_api/typesense/tasks.py
+++ b/api/funkwhale_api/typesense/tasks.py
@@ -2,8 +2,8 @@ import logging
 
 from django.conf import settings
 
-from funquail_api.music import models as music_models
-from funquail_api.taskapp import celery
+from funkwhale_api.music import models as music_models
+from funkwhale_api.taskapp import celery
 
 from . import utils
 
diff --git a/api/funquail_api/typesense/utils.py b/api/funkwhale_api/typesense/utils.py
similarity index 98%
rename from api/funquail_api/typesense/utils.py
rename to api/funkwhale_api/typesense/utils.py
index f5ac7d861..81f389d56 100644
--- a/api/funquail_api/typesense/utils.py
+++ b/api/funkwhale_api/typesense/utils.py
@@ -6,7 +6,7 @@
 # from django.core.cache import cache
 # from lb_matching_tools.cleaner import MetadataCleaner
 
-# from funquail_api.music import models as music_models
+# from funkwhale_api.music import models as music_models
 
 # logger = logging.getLogger(__name__)
 
diff --git a/api/funquail_api/users/__init__.py b/api/funkwhale_api/users/__init__.py
similarity index 100%
rename from api/funquail_api/users/__init__.py
rename to api/funkwhale_api/users/__init__.py
diff --git a/api/funquail_api/users/adapters.py b/api/funkwhale_api/users/adapters.py
similarity index 100%
rename from api/funquail_api/users/adapters.py
rename to api/funkwhale_api/users/adapters.py
diff --git a/api/funquail_api/users/admin.py b/api/funkwhale_api/users/admin.py
similarity index 98%
rename from api/funquail_api/users/admin.py
rename to api/funkwhale_api/users/admin.py
index 2daf58ba1..b5c3bde36 100644
--- a/api/funquail_api/users/admin.py
+++ b/api/funkwhale_api/users/admin.py
@@ -3,7 +3,7 @@ from django.contrib.auth.admin import UserAdmin as AuthUserAdmin
 from django.contrib.auth.forms import UserChangeForm, UserCreationForm
 from django.utils.translation import ugettext_lazy as _
 
-from funquail_api.common import admin
+from funkwhale_api.common import admin
 
 from . import models
 
diff --git a/api/funquail_api/users/api_urls.py b/api/funkwhale_api/users/api_urls.py
similarity index 87%
rename from api/funquail_api/users/api_urls.py
rename to api/funkwhale_api/users/api_urls.py
index 275854b7d..b0a057028 100644
--- a/api/funquail_api/users/api_urls.py
+++ b/api/funkwhale_api/users/api_urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls import url
 
-from funquail_api.common import routers
+from funkwhale_api.common import routers
 
 from . import views
 
diff --git a/api/funquail_api/users/auth_backends.py b/api/funkwhale_api/users/auth_backends.py
similarity index 96%
rename from api/funquail_api/users/auth_backends.py
rename to api/funkwhale_api/users/auth_backends.py
index 6b4abb5d4..2eb7b08e8 100644
--- a/api/funquail_api/users/auth_backends.py
+++ b/api/funkwhale_api/users/auth_backends.py
@@ -1,7 +1,7 @@
 from allauth.account import auth_backends
 from django.contrib.auth import backends, get_user_model
 
-from funquail_api.common import authentication
+from funkwhale_api.common import authentication
 
 
 # ugly but allauth doesn't offer an easy way to override the querysets
diff --git a/api/funquail_api/users/authentication.py b/api/funkwhale_api/users/authentication.py
similarity index 100%
rename from api/funquail_api/users/authentication.py
rename to api/funkwhale_api/users/authentication.py
diff --git a/api/funquail_api/users/dynamic_preferences_registry.py b/api/funkwhale_api/users/dynamic_preferences_registry.py
similarity index 94%
rename from api/funquail_api/users/dynamic_preferences_registry.py
rename to api/funkwhale_api/users/dynamic_preferences_registry.py
index 3a2651cae..03090f944 100644
--- a/api/funquail_api/users/dynamic_preferences_registry.py
+++ b/api/funkwhale_api/users/dynamic_preferences_registry.py
@@ -1,7 +1,7 @@
 from dynamic_preferences import types
 from dynamic_preferences.registries import global_preferences_registry
 
-from funquail_api.common import preferences as common_preferences
+from funkwhale_api.common import preferences as common_preferences
 
 from . import models
 
diff --git a/api/funquail_api/users/factories.py b/api/funkwhale_api/users/factories.py
similarity index 96%
rename from api/funquail_api/users/factories.py
rename to api/funkwhale_api/users/factories.py
index ec403acda..aa1ab4ca5 100644
--- a/api/funquail_api/users/factories.py
+++ b/api/funkwhale_api/users/factories.py
@@ -4,7 +4,7 @@ import factory
 from django.contrib.auth.models import Permission
 from django.utils import timezone
 
-from funquail_api.factories import ManyToManyFromList, NoUpdateOnCreate, registry
+from funkwhale_api.factories import ManyToManyFromList, NoUpdateOnCreate, registry
 
 from . import models
 
@@ -65,7 +65,7 @@ class InvitationFactory(NoUpdateOnCreate, factory.django.DjangoModelFactory):
     class Params:
         expired = factory.Trait(expiration_date=factory.LazyFunction(timezone.now))
         with_invited_user = factory.Trait(
-            invited_user=factory.SubFactory("funquail_api.users.factories.UserFactory")
+            invited_user=factory.SubFactory("funkwhale_api.users.factories.UserFactory")
         )
 
 
diff --git a/api/funquail_api/users/middleware.py b/api/funkwhale_api/users/middleware.py
similarity index 100%
rename from api/funquail_api/users/middleware.py
rename to api/funkwhale_api/users/middleware.py
diff --git a/api/funquail_api/users/migrations/0001_initial.py b/api/funkwhale_api/users/migrations/0001_initial.py
similarity index 100%
rename from api/funquail_api/users/migrations/0001_initial.py
rename to api/funkwhale_api/users/migrations/0001_initial.py
diff --git a/api/funquail_api/users/migrations/0002_auto_20171214_2205.py b/api/funkwhale_api/users/migrations/0002_auto_20171214_2205.py
similarity index 100%
rename from api/funquail_api/users/migrations/0002_auto_20171214_2205.py
rename to api/funkwhale_api/users/migrations/0002_auto_20171214_2205.py
diff --git a/api/funquail_api/users/migrations/0003_auto_20171226_1357.py b/api/funkwhale_api/users/migrations/0003_auto_20171226_1357.py
similarity index 100%
rename from api/funquail_api/users/migrations/0003_auto_20171226_1357.py
rename to api/funkwhale_api/users/migrations/0003_auto_20171226_1357.py
diff --git a/api/funquail_api/users/migrations/0004_user_privacy_level.py b/api/funkwhale_api/users/migrations/0004_user_privacy_level.py
similarity index 100%
rename from api/funquail_api/users/migrations/0004_user_privacy_level.py
rename to api/funkwhale_api/users/migrations/0004_user_privacy_level.py
diff --git a/api/funquail_api/users/migrations/0005_user_subsonic_api_token.py b/api/funkwhale_api/users/migrations/0005_user_subsonic_api_token.py
similarity index 100%
rename from api/funquail_api/users/migrations/0005_user_subsonic_api_token.py
rename to api/funkwhale_api/users/migrations/0005_user_subsonic_api_token.py
diff --git a/api/funquail_api/users/migrations/0006_auto_20180517_2324.py b/api/funkwhale_api/users/migrations/0006_auto_20180517_2324.py
similarity index 100%
rename from api/funquail_api/users/migrations/0006_auto_20180517_2324.py
rename to api/funkwhale_api/users/migrations/0006_auto_20180517_2324.py
diff --git a/api/funquail_api/users/migrations/0007_auto_20180524_2009.py b/api/funkwhale_api/users/migrations/0007_auto_20180524_2009.py
similarity index 100%
rename from api/funquail_api/users/migrations/0007_auto_20180524_2009.py
rename to api/funkwhale_api/users/migrations/0007_auto_20180524_2009.py
diff --git a/api/funquail_api/users/migrations/0008_auto_20180617_1531.py b/api/funkwhale_api/users/migrations/0008_auto_20180617_1531.py
similarity index 100%
rename from api/funquail_api/users/migrations/0008_auto_20180617_1531.py
rename to api/funkwhale_api/users/migrations/0008_auto_20180617_1531.py
diff --git a/api/funquail_api/users/migrations/0009_auto_20180619_2024.py b/api/funkwhale_api/users/migrations/0009_auto_20180619_2024.py
similarity index 100%
rename from api/funquail_api/users/migrations/0009_auto_20180619_2024.py
rename to api/funkwhale_api/users/migrations/0009_auto_20180619_2024.py
diff --git a/api/funquail_api/users/migrations/0010_user_avatar.py b/api/funkwhale_api/users/migrations/0010_user_avatar.py
similarity index 72%
rename from api/funquail_api/users/migrations/0010_user_avatar.py
rename to api/funkwhale_api/users/migrations/0010_user_avatar.py
index 4eaca63b3..e50aa4061 100644
--- a/api/funquail_api/users/migrations/0010_user_avatar.py
+++ b/api/funkwhale_api/users/migrations/0010_user_avatar.py
@@ -1,8 +1,8 @@
 # Generated by Django 2.0.6 on 2018-07-10 20:09
 
 from django.db import migrations, models
-import funquail_api.common.utils
-import funquail_api.common.validators
+import funkwhale_api.common.utils
+import funkwhale_api.common.validators
 
 
 class Migration(migrations.Migration):
@@ -17,9 +17,9 @@ class Migration(migrations.Migration):
                 blank=True,
                 max_length=150,
                 null=True,
-                upload_to=funquail_api.common.utils.ChunkedPath("users/avatars"),
+                upload_to=funkwhale_api.common.utils.ChunkedPath("users/avatars"),
                 validators=[
-                    funquail_api.common.validators.ImageDimensionsValidator(
+                    funkwhale_api.common.validators.ImageDimensionsValidator(
                         max_height=400, max_width=400, min_height=50, min_width=50
                     )
                 ],
diff --git a/api/funquail_api/users/migrations/0011_auto_20180721_1317.py b/api/funkwhale_api/users/migrations/0011_auto_20180721_1317.py
similarity index 82%
rename from api/funquail_api/users/migrations/0011_auto_20180721_1317.py
rename to api/funkwhale_api/users/migrations/0011_auto_20180721_1317.py
index 139d2475e..5115eed86 100644
--- a/api/funquail_api/users/migrations/0011_auto_20180721_1317.py
+++ b/api/funkwhale_api/users/migrations/0011_auto_20180721_1317.py
@@ -2,8 +2,8 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import funquail_api.common.utils
-import funquail_api.common.validators
+import funkwhale_api.common.utils
+import funkwhale_api.common.validators
 import versatileimagefield.fields
 
 
@@ -33,14 +33,14 @@ class Migration(migrations.Migration):
                 blank=True,
                 max_length=150,
                 null=True,
-                upload_to=funquail_api.common.utils.ChunkedPath(
+                upload_to=funkwhale_api.common.utils.ChunkedPath(
                     "users/avatars", preserve_file_name=False
                 ),
                 validators=[
-                    funquail_api.common.validators.ImageDimensionsValidator(
+                    funkwhale_api.common.validators.ImageDimensionsValidator(
                         min_height=50, min_width=50
                     ),
-                    funquail_api.common.validators.FileValidator(
+                    funkwhale_api.common.validators.FileValidator(
                         allowed_extensions=["png", "jpg", "jpeg", "gif"],
                         max_size=2097152,
                     ),
diff --git a/api/funquail_api/users/migrations/0012_user_upload_quota.py b/api/funkwhale_api/users/migrations/0012_user_upload_quota.py
similarity index 100%
rename from api/funquail_api/users/migrations/0012_user_upload_quota.py
rename to api/funkwhale_api/users/migrations/0012_user_upload_quota.py
diff --git a/api/funquail_api/users/migrations/0013_auto_20181206_1008.py b/api/funkwhale_api/users/migrations/0013_auto_20181206_1008.py
similarity index 100%
rename from api/funquail_api/users/migrations/0013_auto_20181206_1008.py
rename to api/funkwhale_api/users/migrations/0013_auto_20181206_1008.py
diff --git a/api/funquail_api/users/migrations/0014_oauth.py b/api/funkwhale_api/users/migrations/0014_oauth.py
similarity index 100%
rename from api/funquail_api/users/migrations/0014_oauth.py
rename to api/funkwhale_api/users/migrations/0014_oauth.py
diff --git a/api/funquail_api/users/migrations/0015_application_scope.py b/api/funkwhale_api/users/migrations/0015_application_scope.py
similarity index 100%
rename from api/funquail_api/users/migrations/0015_application_scope.py
rename to api/funkwhale_api/users/migrations/0015_application_scope.py
diff --git a/api/funquail_api/users/migrations/0016_auto_20190920_0857.py b/api/funkwhale_api/users/migrations/0016_auto_20190920_0857.py
similarity index 88%
rename from api/funquail_api/users/migrations/0016_auto_20190920_0857.py
rename to api/funkwhale_api/users/migrations/0016_auto_20190920_0857.py
index 31920376b..5b0c4b2d9 100644
--- a/api/funquail_api/users/migrations/0016_auto_20190920_0857.py
+++ b/api/funkwhale_api/users/migrations/0016_auto_20190920_0857.py
@@ -5,7 +5,7 @@ from django.conf import settings
 
 from django.db import migrations, models
 import django.utils.timezone
-import funquail_api.users.models
+import funkwhale_api.users.models
 
 
 def set_display_date(apps, schema_editor):
@@ -36,12 +36,12 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='user',
             name='funkwhale_support_message_display_date',
-            field=models.DateTimeField(blank=True, null=True, default=funquail_api.users.models.get_default_funkwhale_support_message_display_date),
+            field=models.DateTimeField(blank=True, null=True, default=funkwhale_api.users.models.get_default_funkwhale_support_message_display_date),
         ),
         migrations.AddField(
             model_name='user',
             name='instance_support_message_display_date',
-            field=models.DateTimeField(blank=True, null=True, default=funquail_api.users.models.get_default_instance_support_message_display_date),
+            field=models.DateTimeField(blank=True, null=True, default=funkwhale_api.users.models.get_default_instance_support_message_display_date),
         ),
         migrations.RunPython(set_display_date, rewind),
     ]
diff --git a/api/funquail_api/users/migrations/0017_actor_avatar.py b/api/funkwhale_api/users/migrations/0017_actor_avatar.py
similarity index 100%
rename from api/funquail_api/users/migrations/0017_actor_avatar.py
rename to api/funkwhale_api/users/migrations/0017_actor_avatar.py
diff --git a/api/funquail_api/users/migrations/0018_auto_20200705_0829.py b/api/funkwhale_api/users/migrations/0018_auto_20200705_0829.py
similarity index 85%
rename from api/funquail_api/users/migrations/0018_auto_20200705_0829.py
rename to api/funkwhale_api/users/migrations/0018_auto_20200705_0829.py
index c6d4a8678..d07f9aa5b 100644
--- a/api/funquail_api/users/migrations/0018_auto_20200705_0829.py
+++ b/api/funkwhale_api/users/migrations/0018_auto_20200705_0829.py
@@ -2,7 +2,7 @@
 
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations
-import funquail_api.users.models
+import funkwhale_api.users.models
 
 
 class Migration(migrations.Migration):
@@ -15,7 +15,7 @@ class Migration(migrations.Migration):
         migrations.AlterModelManagers(
             name='user',
             managers=[
-                ('objects', funquail_api.users.models.UserManager()),
+                ('objects', funkwhale_api.users.models.UserManager()),
             ],
         ),
         migrations.AddField(
diff --git a/api/funquail_api/users/migrations/0019_auto_20200718_0741.py b/api/funkwhale_api/users/migrations/0019_auto_20200718_0741.py
similarity index 100%
rename from api/funquail_api/users/migrations/0019_auto_20200718_0741.py
rename to api/funkwhale_api/users/migrations/0019_auto_20200718_0741.py
diff --git a/api/funquail_api/users/migrations/0020_application_token.py b/api/funkwhale_api/users/migrations/0020_application_token.py
similarity index 100%
rename from api/funquail_api/users/migrations/0020_application_token.py
rename to api/funkwhale_api/users/migrations/0020_application_token.py
diff --git a/api/funquail_api/users/migrations/0021_auto_20210703_1810.py b/api/funkwhale_api/users/migrations/0021_auto_20210703_1810.py
similarity index 100%
rename from api/funquail_api/users/migrations/0021_auto_20210703_1810.py
rename to api/funkwhale_api/users/migrations/0021_auto_20210703_1810.py
diff --git a/api/funquail_api/users/migrations/0022_alter_user_settings.py b/api/funkwhale_api/users/migrations/0022_alter_user_settings.py
similarity index 100%
rename from api/funquail_api/users/migrations/0022_alter_user_settings.py
rename to api/funkwhale_api/users/migrations/0022_alter_user_settings.py
diff --git a/api/funquail_api/users/migrations/0022_auto_20221119_1819.py b/api/funkwhale_api/users/migrations/0022_auto_20221119_1819.py
similarity index 100%
rename from api/funquail_api/users/migrations/0022_auto_20221119_1819.py
rename to api/funkwhale_api/users/migrations/0022_auto_20221119_1819.py
diff --git a/api/funquail_api/users/migrations/0023_merge_20221125_1902.py b/api/funkwhale_api/users/migrations/0023_merge_20221125_1902.py
similarity index 100%
rename from api/funquail_api/users/migrations/0023_merge_20221125_1902.py
rename to api/funkwhale_api/users/migrations/0023_merge_20221125_1902.py
diff --git a/api/funquail_api/users/migrations/__init__.py b/api/funkwhale_api/users/migrations/__init__.py
similarity index 100%
rename from api/funquail_api/users/migrations/__init__.py
rename to api/funkwhale_api/users/migrations/__init__.py
diff --git a/api/funquail_api/users/models.py b/api/funkwhale_api/users/models.py
similarity index 97%
rename from api/funquail_api/users/models.py
rename to api/funkwhale_api/users/models.py
index 15d756ef6..c3da397d1 100644
--- a/api/funquail_api/users/models.py
+++ b/api/funkwhale_api/users/models.py
@@ -18,12 +18,12 @@ from oauth2_provider import models as oauth2_models
 from oauth2_provider import validators as oauth2_validators
 from versatileimagefield.fields import VersatileImageField
 
-from funquail_api.common import fields, preferences
-from funquail_api.common import utils as common_utils
-from funquail_api.common import validators as common_validators
-from funquail_api.federation import keys
-from funquail_api.federation import models as federation_models
-from funquail_api.federation import utils as federation_utils
+from funkwhale_api.common import fields, preferences
+from funkwhale_api.common import utils as common_utils
+from funkwhale_api.common import validators as common_validators
+from funkwhale_api.federation import keys
+from funkwhale_api.federation import models as federation_models
+from funkwhale_api.federation import utils as federation_utils
 
 
 def get_token(length=5):
diff --git a/api/funquail_api/users/mutations.py b/api/funkwhale_api/users/mutations.py
similarity index 93%
rename from api/funquail_api/users/mutations.py
rename to api/funkwhale_api/users/mutations.py
index 25c44b112..deec6ae77 100644
--- a/api/funquail_api/users/mutations.py
+++ b/api/funkwhale_api/users/mutations.py
@@ -2,8 +2,8 @@ import uuid
 
 from django.db import transaction
 
-from funquail_api.common import mutations, utils
-from funquail_api.federation import models
+from funkwhale_api.common import mutations, utils
+from funkwhale_api.federation import models
 
 from . import tasks
 
diff --git a/api/funquail_api/users/oauth/__init__.py b/api/funkwhale_api/users/oauth/__init__.py
similarity index 100%
rename from api/funquail_api/users/oauth/__init__.py
rename to api/funkwhale_api/users/oauth/__init__.py
diff --git a/api/funquail_api/users/oauth/permissions.py b/api/funkwhale_api/users/oauth/permissions.py
similarity index 98%
rename from api/funquail_api/users/oauth/permissions.py
rename to api/funkwhale_api/users/oauth/permissions.py
index a4c89d693..1bae9a1f0 100644
--- a/api/funquail_api/users/oauth/permissions.py
+++ b/api/funkwhale_api/users/oauth/permissions.py
@@ -1,7 +1,7 @@
 from django.core.exceptions import ImproperlyConfigured
 from rest_framework import permissions
 
-from funquail_api.common import preferences
+from funkwhale_api.common import preferences
 
 from .. import models
 from . import scopes
diff --git a/api/funquail_api/users/oauth/scopes.py b/api/funkwhale_api/users/oauth/scopes.py
similarity index 98%
rename from api/funquail_api/users/oauth/scopes.py
rename to api/funkwhale_api/users/oauth/scopes.py
index 9fcc32587..d8ea4bcfd 100644
--- a/api/funquail_api/users/oauth/scopes.py
+++ b/api/funkwhale_api/users/oauth/scopes.py
@@ -94,7 +94,7 @@ OAUTH_APP_SCOPES = COMMON_SCOPES
 
 
 def get_from_permissions(**permissions):
-    from funquail_api.users import models
+    from funkwhale_api.users import models
 
     final = LOGGED_IN_SCOPES
     for permission_name, value in permissions.items():
diff --git a/api/funquail_api/users/oauth/serializers.py b/api/funkwhale_api/users/oauth/serializers.py
similarity index 100%
rename from api/funquail_api/users/oauth/serializers.py
rename to api/funkwhale_api/users/oauth/serializers.py
diff --git a/api/funquail_api/users/oauth/server.py b/api/funkwhale_api/users/oauth/server.py
similarity index 96%
rename from api/funquail_api/users/oauth/server.py
rename to api/funkwhale_api/users/oauth/server.py
index c3b26646d..08e2e2917 100644
--- a/api/funquail_api/users/oauth/server.py
+++ b/api/funkwhale_api/users/oauth/server.py
@@ -2,7 +2,7 @@ import urllib.parse
 
 import oauthlib.oauth2
 
-from funquail_api.common import authentication
+from funkwhale_api.common import authentication
 
 
 def check(request):
diff --git a/api/funquail_api/users/oauth/tasks.py b/api/funkwhale_api/users/oauth/tasks.py
similarity index 80%
rename from api/funquail_api/users/oauth/tasks.py
rename to api/funkwhale_api/users/oauth/tasks.py
index 07a3ff9f2..c0ca1dcfc 100644
--- a/api/funquail_api/users/oauth/tasks.py
+++ b/api/funkwhale_api/users/oauth/tasks.py
@@ -1,6 +1,6 @@
 from oauth2_provider import models as oauth2_models
 
-from funquail_api.taskapp import celery
+from funkwhale_api.taskapp import celery
 
 
 @celery.app.task(name="oauth.clear_expired_tokens")
diff --git a/api/funquail_api/users/oauth/urls.py b/api/funkwhale_api/users/oauth/urls.py
similarity index 92%
rename from api/funquail_api/users/oauth/urls.py
rename to api/funkwhale_api/users/oauth/urls.py
index e2cc02bb9..98e1c114c 100644
--- a/api/funquail_api/users/oauth/urls.py
+++ b/api/funkwhale_api/users/oauth/urls.py
@@ -1,7 +1,7 @@
 from django.conf.urls import url
 from django.views.decorators.csrf import csrf_exempt
 
-from funquail_api.common import routers
+from funkwhale_api.common import routers
 
 from . import views
 
diff --git a/api/funquail_api/users/oauth/views.py b/api/funkwhale_api/users/oauth/views.py
similarity index 99%
rename from api/funquail_api/users/oauth/views.py
rename to api/funkwhale_api/users/oauth/views.py
index 1ca8cbf5f..9f0677cbf 100644
--- a/api/funquail_api/users/oauth/views.py
+++ b/api/funkwhale_api/users/oauth/views.py
@@ -12,7 +12,7 @@ from oauth2_provider.settings import oauth2_settings
 from rest_framework import mixins, permissions, response, views, viewsets
 from rest_framework.decorators import action
 
-from funquail_api.common import throttling
+from funkwhale_api.common import throttling
 
 from .. import models
 from . import serializers
diff --git a/api/funquail_api/users/rest_auth_urls.py b/api/funkwhale_api/users/rest_auth_urls.py
similarity index 100%
rename from api/funquail_api/users/rest_auth_urls.py
rename to api/funkwhale_api/users/rest_auth_urls.py
diff --git a/api/funquail_api/users/serializers.py b/api/funkwhale_api/users/serializers.py
similarity index 95%
rename from api/funquail_api/users/serializers.py
rename to api/funkwhale_api/users/serializers.py
index d22885df2..4a8747620 100644
--- a/api/funquail_api/users/serializers.py
+++ b/api/funkwhale_api/users/serializers.py
@@ -16,15 +16,15 @@ from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 
-from funquail_api.activity import serializers as activity_serializers
-from funquail_api.common import models as common_models
-from funquail_api.common import preferences
-from funquail_api.common import serializers as common_serializers
-from funquail_api.common import utils as common_utils
-from funquail_api.federation import models as federation_models
-from funquail_api.moderation import models as moderation_models
-from funquail_api.moderation import tasks as moderation_tasks
-from funquail_api.moderation import utils as moderation_utils
+from funkwhale_api.activity import serializers as activity_serializers
+from funkwhale_api.common import models as common_models
+from funkwhale_api.common import preferences
+from funkwhale_api.common import serializers as common_serializers
+from funkwhale_api.common import utils as common_utils
+from funkwhale_api.federation import models as federation_models
+from funkwhale_api.moderation import models as moderation_models
+from funkwhale_api.moderation import tasks as moderation_tasks
+from funkwhale_api.moderation import utils as moderation_utils
 
 from . import adapters
 from . import authentication as users_authentication
diff --git a/api/funquail_api/users/tasks.py b/api/funkwhale_api/users/tasks.py
similarity index 86%
rename from api/funquail_api/users/tasks.py
rename to api/funkwhale_api/users/tasks.py
index 322f19ecf..cad4e50d1 100644
--- a/api/funquail_api/users/tasks.py
+++ b/api/funkwhale_api/users/tasks.py
@@ -1,7 +1,7 @@
 import logging
 
-from funquail_api.federation import tasks as federation_tasks
-from funquail_api.taskapp import celery
+from funkwhale_api.federation import tasks as federation_tasks
+from funkwhale_api.taskapp import celery
 
 from . import models
 
diff --git a/api/funquail_api/users/views.py b/api/funkwhale_api/users/views.py
similarity index 98%
rename from api/funquail_api/users/views.py
rename to api/funkwhale_api/users/views.py
index 69bc1d7b3..0771e5d6e 100644
--- a/api/funquail_api/users/views.py
+++ b/api/funkwhale_api/users/views.py
@@ -11,7 +11,7 @@ from rest_framework import mixins, viewsets
 from rest_framework.decorators import action
 from rest_framework.response import Response
 
-from funquail_api.common import authentication, preferences, throttling
+from funkwhale_api.common import authentication, preferences, throttling
 
 from . import models, serializers, tasks
 
diff --git a/api/funquail_api/users/wordlist.txt b/api/funkwhale_api/users/wordlist.txt
similarity index 100%
rename from api/funquail_api/users/wordlist.txt
rename to api/funkwhale_api/users/wordlist.txt
diff --git a/api/funquail_api/cli/utils.py b/api/funquail_api/cli/utils.py
deleted file mode 100644
index ddad9ada3..000000000
--- a/api/funquail_api/cli/utils.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import logging
-
-logger = logging.getLogger("funquail_api.cli")
diff --git a/api/pyproject.toml b/api/pyproject.toml
index a94d53c89..8aabe0d2a 100644
--- a/api/pyproject.toml
+++ b/api/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
-name = "funquail-api"
-version = "1.4.1"
+name = "funkwhale-api"
+version = "1.4.1+funquail-1.0.0"
 description = "FunQuail API"
 
 authors = ["FunQuail Developers"]
@@ -10,7 +10,7 @@ documentation = "https://funquail.laidback.moe/docs"
 license = "AGPL-3.0-only"
 
 packages = [
-  { include = "funquail_api" },
+  { include = "funkwhale_api" },
   { include = "config" },
 ]
 include = [
@@ -22,7 +22,7 @@ include = [
 exclude = ["tests"]
 
 [tool.poetry.scripts]
-funquail-manage = 'funquail_api.main:main'
+funquail-manage = 'funkwhale_api.main:main'
 
 [tool.poetry.dependencies]
 python = "^3.8,<3.12"
@@ -161,31 +161,31 @@ env = [
   "EMAIL_CONFIG=consolemail://",
   "CELERY_BROKER_URL=memory://",
   "CELERY_TASK_ALWAYS_EAGER=True",
-  "FUNQUAIL_HOSTNAME_SUFFIX=",
-  "FUNQUAIL_HOSTNAME_PREFIX=",
-  "FUNQUAIL_HOSTNAME=test.federation",
+  "FUNKWHALE_HOSTNAME_SUFFIX=",
+  "FUNKWHALE_HOSTNAME_PREFIX=",
+  "FUNKWHALE_HOSTNAME=test.federation",
   "FEDERATION_HOSTNAME=test.federation",
-  "FUNQUAIL_URL=https://test.federation",
+  "FUNKWHALE_URL=https://test.federation",
   "DEBUG_TOOLBAR_ENABLED=False",
   "DEBUG=False",
   "WEAK_PASSWORDS=True",
   "CREATE_IMAGE_THUMBNAILS=False",
   "FORCE_HTTPS_URLS=False",
-  "FUNQUAIL_SPA_HTML_ROOT=http://noop/",
+  "FUNKWHALE_SPA_HTML_ROOT=http://noop/",
   "PROXY_MEDIA=true",
   "MUSIC_USE_DENORMALIZATION=true",
   "EXTERNAL_MEDIA_PROXY_ENABLED=true",
   "DISABLE_PASSWORD_VALIDATORS=false",
   "DISABLE_PASSWORD_VALIDATORS=false",
-  "FUNQUAIL_PLUGINS=",
+  "FUNKWHALE_PLUGINS=",
   "MUSIC_DIRECTORY_PATH=/music",
 ]
 
 [tool.coverage.run]
 plugins = ["django_coverage_plugin"]
-source = ["funquail_api"]
+source = ["funkwhale_api"]
 omit = [
   "*migrations*",
   "*tests*",
-  "funquail_api/schema.py",
+  "funkwhale_api/schema.py",
 ]
diff --git a/api/requirements.txt b/api/requirements.txt
new file mode 100644
index 000000000..b9961fdde
--- /dev/null
+++ b/api/requirements.txt
@@ -0,0 +1,143 @@
+aiohttp==3.8.6 ; python_version >= "3.8" and python_version < "3.12"
+aiosignal==1.3.1 ; python_version >= "3.8" and python_version < "3.12"
+amqp==5.3.1 ; python_version >= "3.8" and python_version < "3.12"
+anyio==4.5.2 ; python_version >= "3.8" and python_version < "3.12"
+appnope==0.1.4 ; python_version >= "3.8" and python_version < "3.12" and sys_platform == "darwin"
+arrow==1.2.3 ; python_version >= "3.8" and python_version < "3.12"
+asgiref==3.8.1 ; python_version >= "3.8" and python_version < "3.12"
+async-timeout==4.0.3 ; python_version >= "3.8" and python_version < "3.12"
+attrs==25.3.0 ; python_version >= "3.8" and python_version < "3.12"
+autobahn==23.1.2 ; python_version >= "3.8" and python_version < "3.12"
+automat==24.8.1 ; python_version >= "3.8" and python_version < "3.12"
+backcall==0.2.0 ; python_version >= "3.8" and python_version < "3.12"
+backports-zoneinfo==0.2.1 ; python_version == "3.8"
+billiard==3.6.4.0 ; python_version >= "3.8" and python_version < "3.12"
+bleach==5.0.1 ; python_version >= "3.8" and python_version < "3.12"
+boto3==1.26.161 ; python_version >= "3.8" and python_version < "3.12"
+botocore==1.29.165 ; python_version >= "3.8" and python_version < "3.12"
+cachetools==5.5.2 ; python_version >= "3.8" and python_version < "3.12"
+celery==5.2.7 ; python_version >= "3.8" and python_version < "3.12"
+certifi==2025.1.31 ; python_version >= "3.8" and python_version < "3.12"
+cffi==1.17.1 ; python_version >= "3.8" and python_version < "3.12"
+channels-redis==4.1.0 ; python_version >= "3.8" and python_version < "3.12"
+channels==4.0.0 ; python_version >= "3.8" and python_version < "3.12"
+charset-normalizer==3.4.1 ; python_version >= "3.8" and python_version < "3.12"
+click-didyoumean==0.3.1 ; python_version >= "3.8" and python_version < "3.12"
+click-plugins==1.1.1 ; python_version >= "3.8" and python_version < "3.12"
+click-repl==0.3.0 ; python_version >= "3.8" and python_version < "3.12"
+click==8.1.7 ; python_version >= "3.8" and python_version < "3.12"
+colorama==0.4.6 ; python_version >= "3.8" and python_version < "3.12" and (platform_system == "Windows" or sys_platform == "win32")
+constantly==23.10.4 ; python_version >= "3.8" and python_version < "3.12"
+cryptography==38.0.4 ; python_version >= "3.8" and python_version < "3.12"
+daphne==4.1.2 ; python_version >= "3.8" and python_version < "3.12"
+decorator==5.2.1 ; python_version >= "3.8" and python_version < "3.12"
+defusedxml==0.7.1 ; python_version >= "3.8" and python_version < "3.12"
+dj-rest-auth==7.0.0 ; python_version >= "3.8" and python_version < "3.12"
+django-allauth==0.60.0 ; python_version >= "3.8" and python_version < "3.12"
+django-auth-ldap==4.1.0 ; python_version >= "3.8" and python_version < "3.12"
+django-cache-memoize==0.1.10 ; python_version >= "3.8" and python_version < "3.12"
+django-cacheops==6.1 ; python_version >= "3.8" and python_version < "3.12"
+django-cleanup==6.0.0 ; python_version >= "3.8" and python_version < "3.12"
+django-cors-headers==3.13.0 ; python_version >= "3.8" and python_version < "3.12"
+django-dynamic-preferences==1.14.0 ; python_version >= "3.8" and python_version < "3.12"
+django-environ==0.10.0 ; python_version >= "3.8" and python_version < "3.12"
+django-filter==22.1 ; python_version >= "3.8" and python_version < "3.12"
+django-oauth-toolkit==2.2.0 ; python_version >= "3.8" and python_version < "3.12"
+django-redis==5.2.0 ; python_version >= "3.8" and python_version < "3.12"
+django-storages==1.13.2 ; python_version >= "3.8" and python_version < "3.12"
+django-versatileimagefield==2.2 ; python_version >= "3.8" and python_version < "3.12"
+django==3.2.24 ; python_version >= "3.8" and python_version < "3.12"
+djangorestframework==3.14.0 ; python_version >= "3.8" and python_version < "3.12"
+drf-spectacular==0.26.5 ; python_version >= "3.8" and python_version < "3.12"
+exceptiongroup==1.2.2 ; python_version >= "3.8" and python_version < "3.11"
+feedparser==6.0.11 ; python_version >= "3.8" and python_version < "3.12"
+frozendict==2.4.6 ; python_version >= "3.8" and python_version < "3.12"
+frozenlist==1.5.0 ; python_version >= "3.8" and python_version < "3.12"
+funcy==1.18 ; python_version >= "3.8" and python_version < "3.12"
+gunicorn==20.1.0 ; python_version >= "3.8" and python_version < "3.12"
+h11==0.14.0 ; python_version >= "3.8" and python_version < "3.12"
+httptools==0.6.4 ; python_version >= "3.8" and python_version < "3.12"
+hyperlink==21.0.0 ; python_version >= "3.8" and python_version < "3.12"
+idna==3.10 ; python_version >= "3.8" and python_version < "3.12"
+importlib-metadata==8.5.0 ; python_version >= "3.8" and python_version < "3.10"
+importlib-resources==6.4.5 ; python_version == "3.8"
+incremental==22.10.0 ; python_version >= "3.8" and python_version < "3.12"
+inflection==0.5.1 ; python_version >= "3.8" and python_version < "3.12"
+ipython==7.34.0 ; python_version >= "3.8" and python_version < "3.12"
+jedi==0.19.2 ; python_version >= "3.8" and python_version < "3.12"
+jmespath==1.0.1 ; python_version >= "3.8" and python_version < "3.12"
+jsonschema-specifications==2023.12.1 ; python_version >= "3.8" and python_version < "3.12"
+jsonschema==4.23.0 ; python_version >= "3.8" and python_version < "3.12"
+jwcrypto==1.5.6 ; python_version >= "3.8" and python_version < "3.12"
+kombu==5.2.4 ; python_version >= "3.8" and python_version < "3.12"
+lxml==5.3.2 ; python_version >= "3.8" and python_version < "3.12"
+markdown==3.4.4 ; python_version >= "3.8" and python_version < "3.12"
+matplotlib-inline==0.1.7 ; python_version >= "3.8" and python_version < "3.12"
+msgpack==1.1.0 ; python_version >= "3.8" and python_version < "3.12"
+multidict==6.1.0 ; python_version >= "3.8" and python_version < "3.12"
+musicbrainzngs==0.7.1 ; python_version >= "3.8" and python_version < "3.12"
+mutagen==1.46.0 ; python_version >= "3.8" and python_version < "3.12"
+oauthlib==3.2.2 ; python_version >= "3.8" and python_version < "3.12"
+parso==0.8.4 ; python_version >= "3.8" and python_version < "3.12"
+persisting-theory==1.0 ; python_version >= "3.8" and python_version < "3.12"
+pexpect==4.9.0 ; python_version >= "3.8" and python_version < "3.12" and sys_platform != "win32"
+pickleshare==0.7.5 ; python_version >= "3.8" and python_version < "3.12"
+pillow==9.3.0 ; python_version >= "3.8" and python_version < "3.12"
+pkgutil-resolve-name==1.3.10 ; python_version == "3.8"
+pluralizer==1.2.0 ; python_version >= "3.8" and python_version < "3.12"
+prompt-toolkit==3.0.43 ; python_version >= "3.8" and python_version < "3.12"
+propcache==0.2.0 ; python_version >= "3.8" and python_version < "3.12"
+psycopg2==2.9.9 ; python_version >= "3.8" and python_version < "3.12"
+ptyprocess==0.7.0 ; python_version >= "3.8" and python_version < "3.12" and sys_platform != "win32"
+pyasn1-modules==0.4.2 ; python_version >= "3.8" and python_version < "3.12"
+pyasn1==0.6.1 ; python_version >= "3.8" and python_version < "3.12"
+pycountry==22.3.5 ; python_version >= "3.8" and python_version < "3.12"
+pycparser==2.22 ; python_version >= "3.8" and python_version < "3.12"
+pydub==0.25.1 ; python_version >= "3.8" and python_version < "3.12"
+pygments==2.19.1 ; python_version >= "3.8" and python_version < "3.12"
+pyjwt==2.10.1 ; python_version == "3.11"
+pyjwt==2.9.0 ; python_version >= "3.8" and python_version < "3.11"
+pyld==2.0.4 ; python_version >= "3.8" and python_version < "3.12"
+pyopenssl==23.2.0 ; python_version >= "3.8" and python_version < "3.12"
+python-dateutil==2.9.0.post0 ; python_version >= "3.8" and python_version < "3.12"
+python-dotenv==1.0.1 ; python_version >= "3.8" and python_version < "3.12"
+python-ldap==3.4.4 ; python_version >= "3.8" and python_version < "3.12"
+python-magic==0.4.27 ; python_version >= "3.8" and python_version < "3.12"
+python3-openid==3.2.0 ; python_version >= "3.8" and python_version < "3.12"
+pytz==2025.2 ; python_version >= "3.8" and python_version < "3.12"
+pyyaml==6.0.2 ; python_version >= "3.8" and python_version < "3.12"
+redis==4.5.5 ; python_version >= "3.8" and python_version < "3.12"
+referencing==0.35.1 ; python_version >= "3.8" and python_version < "3.12"
+requests-http-message-signatures==0.3.1 ; python_version >= "3.8" and python_version < "3.12"
+requests-oauthlib==2.0.0 ; python_version >= "3.8" and python_version < "3.12"
+requests==2.28.2 ; python_version >= "3.8" and python_version < "3.12"
+rpds-py==0.20.1 ; python_version >= "3.8" and python_version < "3.12"
+s3transfer==0.6.2 ; python_version >= "3.8" and python_version < "3.12"
+sentry-sdk==1.19.1 ; python_version >= "3.8" and python_version < "3.12"
+service-identity==21.1.0 ; python_version >= "3.8" and python_version < "3.12"
+setuptools==60.10.0 ; python_version >= "3.8" and python_version < "3.12"
+sgmllib3k==1.0.0 ; python_version >= "3.8" and python_version < "3.12"
+six==1.17.0 ; python_version >= "3.8" and python_version < "3.12"
+sniffio==1.3.1 ; python_version >= "3.8" and python_version < "3.12"
+sqlparse==0.5.3 ; python_version >= "3.8" and python_version < "3.12"
+traitlets==5.14.3 ; python_version >= "3.8" and python_version < "3.12"
+twisted-iocpsupport==1.0.4 ; python_version >= "3.8" and python_version < "3.12" and platform_system == "Windows"
+twisted==24.3.0 ; python_version >= "3.8" and python_version < "3.12"
+txaio==23.1.1 ; python_version >= "3.8" and python_version < "3.12"
+typesense==0.15.1 ; python_version >= "3.8" and python_version < "3.12"
+typing-extensions==4.13.2 ; python_version >= "3.8" and python_version < "3.12"
+unicode-slugify==0.1.5 ; python_version >= "3.8" and python_version < "3.12"
+unidecode==1.3.7 ; python_version >= "3.8" and python_version < "3.12"
+uritemplate==4.1.1 ; python_version >= "3.8" and python_version < "3.12"
+urllib3==1.26.20 ; python_version >= "3.8" and python_version < "3.12"
+uvicorn==0.20.0 ; python_version >= "3.8" and python_version < "3.12"
+uvloop==0.21.0 ; python_version >= "3.8" and python_version < "3.12" and sys_platform != "win32" and sys_platform != "cygwin" and platform_python_implementation != "PyPy"
+vine==5.1.0 ; python_version >= "3.8" and python_version < "3.12"
+watchdog==2.2.1 ; python_version >= "3.8" and python_version < "3.12"
+watchfiles==0.24.0 ; python_version >= "3.8" and python_version < "3.12"
+wcwidth==0.2.13 ; python_version >= "3.8" and python_version < "3.12"
+webencodings==0.5.1 ; python_version >= "3.8" and python_version < "3.12"
+websockets==13.1 ; python_version >= "3.8" and python_version < "3.12"
+yarl==1.15.2 ; python_version >= "3.8" and python_version < "3.12"
+zipp==3.20.2 ; python_version >= "3.8" and python_version < "3.10"
+zope-interface==7.2 ; python_version >= "3.8" and python_version < "3.12"