From 54c6d2210233ff36b2afaf56108032ef0959166c Mon Sep 17 00:00:00 2001
From: Shin'ya Minazuki <shinyoukai@laidback.moe>
Date: Sat, 24 Jan 2026 16:16:49 -0300
Subject: [PATCH] =?UTF-8?q?=E9=9F=B3=E6=A5=BD=E3=81=A7=E6=A5=BD=E3=81=97?=
 =?UTF-8?q?=E3=81=BF=E3=81=BE=E3=81=97=E3=82=87=E3=81=86=EF=BC=81-Let's=20?=
 =?UTF-8?q?have=20fun=20with=20music!-?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Shin'ya Minazuki <shinyoukai@laidback.moe>
---
 .env.dev                                      |   6 +-
 .gitlab/issue_templates/Bug.md                |   2 +-
 Makefile                                      |   1 -
 README.md                                     |  29 +----
 api/Readme.md                                 |  16 +--
 api/config/plugins.py                         |   2 +-
 api/config/settings/common.py                 | 114 +++++++++---------
 api/config/settings/local.py                  |   6 +-
 api/config/settings/testing.py                |   2 +-
 api/config/urls/api.py                        |   2 +-
 api/docker/server.sh                          |   2 +-
 .../__init__.py                               |   0
 .../activity/__init__.py                      |   0
 .../activity/apps.py                          |   0
 .../activity/record.py                        |   0
 .../activity/serializers.py                   |   0
 .../activity/utils.py                         |   0
 .../activity/views.py                         |   0
 .../audio/__init__.py                         |   0
 .../audio/admin.py                            |   0
 .../audio/categories.py                       |   0
 .../audio/dynamic_preferences_registry.py     |   0
 .../audio/factories.py                        |   0
 .../audio/filters.py                          |   0
 .../audio/migrations/0001_initial.py          |   0
 .../audio/migrations/0002_channel_metadata.py |   0
 .../audio/migrations/0003_channel_rss_url.py  |   0
 .../migrations/0004_alter_channel_metadata.py |   0
 .../audio/migrations/__init__.py              |   0
 .../audio/models.py                           |   0
 .../audio/renderers.py                        |   0
 .../audio/serializers.py                      |   0
 .../audio/spa_views.py                        |   4 +-
 .../audio/tasks.py                            |   0
 .../audio/views.py                            |   2 +-
 .../cli/__init__.py                           |   0
 .../cli/base.py                               |   0
 .../cli/library.py                            |   0
 .../cli/main.py                               |   0
 .../cli/media.py                              |   0
 .../cli/plugins.py                            |   2 +-
 .../cli/users.py                              |   4 +-
 .../cli/utils.py                              |   0
 .../common/__init__.py                        |   0
 .../common/admin.py                           |   0
 .../common/apps.py                            |   0
 .../common/authentication.py                  |   0
 .../common/cache.py                           |   0
 .../common/channels.py                        |   0
 .../common/consumers.py                       |   0
 .../common/decorators.py                      |   0
 .../common/dynamic_preferences_registry.py    |   0
 .../common/factories.py                       |   0
 .../common/fields.py                          |   0
 .../common/filters.py                         |   0
 .../common/locales.py                         |   0
 .../common/management/__init__.py             |   0
 .../common/management/commands/__init__.py    |   0
 .../management/commands/createsuperuser.py    |   2 +-
 .../common/management/commands/gitpod.py      |   2 +-
 .../management/commands/inplace_to_s3.py      |   0
 .../management/commands/load_test_data.py     |   0
 .../management/commands/makemigrations.py     |   2 +-
 .../common/management/commands/migrate.py     |   0
 .../common/management/commands/script.py      |   0
 .../common/management/commands/testdata.py    |   0
 .../common/middleware.py                      |  12 +-
 .../common/migrations/0001_initial.py         |   0
 .../common/migrations/0002_mutation.py        |   0
 .../common/migrations/0003_cit_extension.py   |   0
 .../migrations/0004_auto_20191111_1338.py     |   0
 .../migrations/0005_auto_20191125_1421.py     |   0
 .../common/migrations/0006_content.py         |   0
 .../migrations/0007_auto_20200116_1610.py     |   0
 .../migrations/0008_auto_20200701_1317.py     |   0
 .../migrations/0009_auto_20220627_1915.py     |   0
 .../common/migrations/__init__.py             |   0
 .../common/mixins.py                          |   0
 .../common/models.py                          |   0
 .../common/mutations.py                       |   0
 .../common/pagination.py                      |   2 +-
 .../common/permissions.py                     |   0
 .../common/preferences.py                     |   0
 .../common/renderers.py                       |   0
 .../common/routers.py                         |   0
 .../common/scripts/__init__.py                |   0
 .../common/scripts/create_actors.py           |   0
 .../common/scripts/create_image_variations.py |   0
 .../delete_pre_017_federated_uploads.py       |   0
 .../django_permissions_to_user_permissions.py |   0
 .../scripts/migrate_to_user_libraries.py      |   4 +-
 .../common/scripts/test.py                    |   0
 .../common/search.py                          |   0
 .../common/serializers.py                     |   0
 .../common/session.py                         |   6 +-
 .../common/signals.py                         |   0
 .../common/storage.py                         |   0
 .../common/tasks.py                           |   0
 .../common/throttling.py                      |   8 +-
 .../common/utils.py                           |   6 +-
 .../common/validators.py                      |   0
 .../common/views.py                           |   0
 .../contrib/__init__.py                       |   0
 .../contrib/listenbrainz/__init__.py          |   0
 .../contrib/listenbrainz/client.py            |   0
 .../contrib/listenbrainz/funkwhale_ready.py   |   4 +-
 .../contrib/listenbrainz/funkwhale_startup.py |   2 +-
 .../contrib/maloja/__init__.py                |   0
 .../contrib/maloja/funkwhale_ready.py         |   0
 .../contrib/maloja/funkwhale_startup.py       |   2 +-
 .../contrib/scrobbler/README.rst              |   4 +-
 .../contrib/scrobbler/__init__.py             |   0
 .../contrib/scrobbler/funkwhale_ready.py      |   0
 .../contrib/scrobbler/funkwhale_startup.py    |   2 +-
 .../contrib/scrobbler/scrobbler.py            |   0
 .../contrib/sites/__init__.py                 |   0
 .../contrib/sites/migrations/0001_initial.py  |   0
 .../0002_set_site_domain_and_name.py          |   0
 .../migrations/0003_auto_20171214_2205.py     |   0
 .../migrations/0004_alter_site_options.py     |   0
 .../contrib/sites/migrations/__init__.py      |   0
 .../factories.py                              |   4 +-
 .../favorites/__init__.py                     |   0
 .../favorites/activities.py                   |   0
 .../favorites/admin.py                        |   0
 .../favorites/consumers.py                    |   0
 .../favorites/factories.py                    |   0
 .../favorites/filters.py                      |   0
 .../favorites/migrations/0001_initial.py      |   0
 .../favorites/migrations/__init__.py          |   0
 .../favorites/models.py                       |   0
 .../favorites/serializers.py                  |   0
 .../favorites/urls.py                         |   0
 .../favorites/views.py                        |   0
 .../federation/__init__.py                    |   0
 .../federation/activity.py                    |   4 +-
 .../federation/actors.py                      |   0
 .../federation/admin.py                       |   0
 .../federation/api_serializers.py             |   0
 .../federation/api_urls.py                    |   0
 .../federation/api_views.py                   |   2 +-
 .../federation/authentication.py              |   0
 .../federation/contexts.py                    |   4 +-
 .../federation/decorators.py                  |   0
 .../dynamic_preferences_registry.py           |   0
 .../federation/exceptions.py                  |   0
 .../federation/factories.py                   |   0
 .../federation/fields.py                      |   0
 .../federation/filters.py                     |   0
 .../federation/jsonld.py                      |   2 +-
 .../federation/keys.py                        |   0
 .../federation/library.py                     |   0
 .../federation/management/__init__.py         |   0
 .../management/commands/__init__.py           |   0
 .../management/commands/fix_federation_ids.py |   0
 .../federation/migrations/0001_initial.py     |   0
 .../migrations/0002_auto_20180403_1620.py     |   0
 .../migrations/0003_auto_20180407_1010.py     |   0
 .../migrations/0004_auto_20180410_2025.py     |   0
 .../migrations/0005_auto_20180413_1723.py     |   0
 .../migrations/0006_auto_20180521_1702.py     |   0
 .../migrations/0007_auto_20180807_1748.py     |   0
 .../migrations/0008_auto_20180807_1748.py     |   0
 .../migrations/0009_auto_20180822_1956.py     |   0
 .../migrations/0010_auto_20180904_2011.py     |   0
 .../migrations/0011_auto_20180910_1902.py     |   0
 .../migrations/0012_auto_20180920_1803.py     |   0
 .../migrations/0013_auto_20181226_1935.py     |   0
 .../migrations/0014_auto_20181205_0958.py     |   0
 .../migrations/0015_populate_domains.py       |   0
 .../migrations/0016_auto_20181227_1605.py     |   0
 .../migrations/0017_auto_20190130_0926.py     |   0
 .../federation/migrations/0018_fetch.py       |   0
 .../migrations/0019_auto_20190611_0851.py     |   0
 .../migrations/0020_auto_20190730_0846.py     |   0
 .../migrations/0021_auto_20191029_1257.py     |   0
 .../migrations/0022_auto_20191204_1539.py     |   0
 .../migrations/0023_actor_summary_obj.py      |   0
 .../migrations/0024_actor_attachment_icon.py  |   0
 .../migrations/0025_auto_20200317_0820.py     |   0
 .../migrations/0026_public_key_format.py      |   0
 .../migrations/0027_auto_20220627_1915.py     |   0
 .../migrations/0028_auto_20221027_1141.py     |   0
 .../federation/migrations/__init__.py         |   0
 .../federation/models.py                      |   0
 .../federation/mrf_policies.py                |   0
 .../federation/parsers.py                     |   0
 .../federation/renderers.py                   |   0
 .../federation/routes.py                      |   0
 .../federation/schema_org.py                  |   0
 .../federation/serializers.py                 |   0
 .../federation/signing.py                     |   0
 .../federation/spa_views.py                   |   2 +-
 .../federation/tasks.py                       |   2 +-
 .../federation/urls.py                        |   0
 .../federation/utils.py                       |   2 +-
 .../federation/views.py                       |   2 +-
 .../federation/webfinger.py                   |   0
 .../history/__init__.py                       |   0
 .../history/activities.py                     |   0
 .../history/admin.py                          |   0
 .../history/factories.py                      |   0
 .../history/filters.py                        |   0
 .../history/migrations/0001_initial.py        |   0
 .../migrations/0002_auto_20180325_1433.py     |   0
 .../history/migrations/__init__.py            |   0
 .../history/models.py                         |   0
 .../history/serializers.py                    |   0
 .../history/urls.py                           |   0
 .../history/views.py                          |   0
 .../instance/__init__.py                      |   0
 .../instance/consumers.py                     |   0
 .../instance/dynamic_preferences_registry.py  |   6 +-
 .../instance/pwa-manifest.json                |   4 +-
 .../instance/serializers.py                   |   6 +-
 .../instance/stats.py                         |   0
 .../instance/urls.py                          |   0
 .../instance/urls_v2.py                       |   0
 .../instance/views.py                         |   0
 api/{funkwhale_api => funquail_api}/main.py   |   0
 .../manage/__init__.py                        |   0
 .../manage/filters.py                         |   0
 .../manage/serializers.py                     |   0
 .../manage/urls.py                            |   0
 .../manage/views.py                           |   0
 .../moderation/__init__.py                    |   0
 .../moderation/admin.py                       |   0
 .../moderation/apps.py                        |   0
 .../dynamic_preferences_registry.py           |   0
 .../moderation/factories.py                   |   0
 .../moderation/filters.py                     |   0
 .../moderation/management/__init__.py         |   0
 .../management/commands/__init__.py           |   0
 .../management/commands/mrf_check.py          |   0
 .../moderation/migrations/0001_initial.py     |   0
 .../migrations/0002_auto_20190213_0927.py     |   0
 .../moderation/migrations/0003_report.py      |   0
 .../moderation/migrations/0004_note.py        |   0
 .../migrations/0005_auto_20200317_0820.py     |   0
 .../migrations/0006_auto_20200803_1222.py     |   0
 .../migrations/0007_auto_20220627_1915.py     |   0
 .../moderation/migrations/__init__.py         |   0
 .../moderation/models.py                      |   0
 .../moderation/mrf.py                         |   0
 .../moderation/mrf_policies.py                |   0
 .../moderation/serializers.py                 |   0
 .../moderation/signals.py                     |   0
 .../moderation/tasks.py                       |  12 +-
 .../moderation/urls.py                        |   0
 .../moderation/utils.py                       |   0
 .../moderation/views.py                       |   0
 .../music/__init__.py                         |   0
 .../music/admin.py                            |   0
 .../music/dynamic_preferences_registry.py     |   0
 .../music/factories.py                        |   0
 .../music/fake_data.py                        |   0
 .../music/filters.py                          |   0
 .../music/importers.py                        |   0
 .../music/licenses.py                         |   0
 .../music/management/__init__.py              |   0
 .../music/management/commands/__init__.py     |   0
 .../commands/check_inplace_files.py           |   0
 .../management/commands/check_licenses.py     |   0
 .../management/commands/create_library.py     |   0
 .../music/management/commands/fix_uploads.py  |   0
 .../commands/generate_typesense_index.py      |   4 +-
 .../music/management/commands/import_files.py |   4 +-
 .../management/commands/prune_library.py      |   0
 .../commands/prune_skipped_uploads.py         |   0
 .../commands/rebuild_music_permissions.py     |   0
 .../music/metadata.py                         |   0
 .../music/migrations/0001_initial.py          |   0
 .../migrations/0002_auto_20151215_1645.py     |   0
 .../migrations/0003_auto_20151222_2233.py     |   0
 .../music/migrations/0004_track_tags.py       |   0
 .../music/migrations/0005_deduplicate.py      |   0
 .../music/migrations/0006_unique_mbid.py      |   0
 .../music/migrations/0007_track_position.py   |   0
 .../migrations/0008_auto_20160529_1456.py     |   0
 .../migrations/0009_auto_20160920_1614.py     |   0
 .../migrations/0010_auto_20160920_1742.py     |   0
 .../music/migrations/0011_rename_files.py     |   0
 .../migrations/0012_auto_20161122_1905.py     |   0
 .../migrations/0013_auto_20171213_2211.py     |   0
 .../migrations/0014_importjob_track_file.py   |   0
 .../0015_bind_track_file_to_import_job.py     |   0
 .../0016_trackfile_acoustid_track_id.py       |   0
 .../migrations/0017_auto_20171227_1728.py     |   0
 .../migrations/0018_auto_20180218_1554.py     |   0
 .../migrations/0019_populate_mimetypes.py     |   0
 .../migrations/0020_importbatch_status.py     |   0
 .../migrations/0021_populate_batch_status.py  |   0
 .../0022_importbatch_import_request.py        |   0
 .../migrations/0023_auto_20180407_1010.py     |   0
 .../music/migrations/0024_populate_uuid.py    |   0
 .../migrations/0025_auto_20180419_2023.py     |   0
 .../0026_trackfile_accessed_date.py           |   0
 .../migrations/0027_auto_20180515_1808.py     |   0
 .../0028_importjob_replace_if_duplicate.py    |   0
 .../migrations/0029_auto_20180807_1748.py     |   0
 .../migrations/0030_auto_20180825_1411.py     |   0
 .../migrations/0031_auto_20180914_2007.py     |   0
 .../migrations/0032_track_file_to_upload.py   |   0
 .../migrations/0033_auto_20181023_1837.py     |   0
 .../migrations/0034_auto_20181127_0325.py     |   0
 .../migrations/0035_auto_20181203_1515.py     |   0
 .../migrations/0036_track_disc_number.py      |   0
 .../migrations/0037_auto_20190103_1757.py     |   0
 .../music/migrations/0038_attributed_to.py    |   0
 .../migrations/0039_auto_20190423_0820.py     |   0
 .../migrations/0040_auto_20191021_1318.py     |   0
 .../migrations/0041_auto_20191021_1705.py     |   0
 .../migrations/0042_album_attachment_cover.py |   0
 .../migrations/0043_album_cover_attachment.py |   0
 .../music/migrations/0044_full_text_search.py |   0
 .../0045_full_text_search_stop_words.py       |   0
 .../migrations/0046_auto_20200113_1018.py     |   0
 .../migrations/0047_auto_20200116_1246.py     |   0
 .../migrations/0048_auto_20200120_0900.py     |   0
 .../migrations/0049_auto_20200122_1020.py     |   0
 .../migrations/0050_auto_20200129_1344.py     |   0
 .../migrations/0051_auto_20200319_1249.py     |   0
 .../migrations/0052_auto_20200505_0810.py     |   0
 .../0053_denormalize_audio_permissions.py     |   0
 .../0054_alter_uploadversion_mimetype.py      |   0
 .../migrations/0055_auto_20220627_1915.py     |   0
 .../0056_alter_artist_content_category.py     |   0
 .../migrations/0057_auto_20221118_2108.py     |   0
 .../music/migrations/__init__.py              |   0
 .../music/models.py                           |   4 +-
 .../music/mutations.py                        |   0
 .../music/serializers.py                      |   4 +-
 .../music/signals.py                          |   0
 .../music/spa_views.py                        |  26 ++--
 .../music/tasks.py                            |   0
 .../music/utils.py                            |   0
 .../music/views.py                            |   0
 .../musicbrainz/__init__.py                   |   0
 .../musicbrainz/client.py                     |   2 +-
 .../musicbrainz/urls.py                       |   0
 .../musicbrainz/views.py                      |   0
 .../playlists/__init__.py                     |   0
 .../playlists/admin.py                        |   0
 .../playlists/dynamic_preferences_registry.py |   0
 .../playlists/factories.py                    |   0
 .../playlists/filters.py                      |   0
 .../playlists/migrations/0001_initial.py      |   0
 .../migrations/0002_auto_20180316_2217.py     |   0
 .../migrations/0003_auto_20180319_1214.py     |   0
 .../migrations/0004_auto_20180320_1713.py     |   0
 .../playlists/migrations/__init__.py          |   0
 .../playlists/models.py                       |   0
 .../playlists/serializers.py                  |   0
 .../playlists/views.py                        |   0
 .../providers/__init__.py                     |   0
 .../providers/urls.py                         |   0
 .../radios/__init__.py                        |   0
 .../radios/admin.py                           |   0
 .../radios/factories.py                       |   0
 .../radios/filters.py                         |   0
 .../radios/filtersets.py                      |   0
 .../radios/lb_recommendations.py              |  10 +-
 .../radios/migrations/0001_initial.py         |   0
 .../0002_radiosession_session_key.py          |   0
 .../migrations/0003_auto_20160521_1708.py     |   0
 .../migrations/0004_auto_20180107_1813.py     |   0
 .../migrations/0005_auto_20200803_1222.py     |   0
 .../migrations/0006_alter_radio_config.py     |   0
 .../migrations/0006_radiosession_config.py    |   0
 .../migrations/0007_merge_20220715_0801.py    |   0
 .../radios/migrations/__init__.py             |   0
 .../radios/models.py                          |   0
 .../radios/radios.py                          |   2 +-
 .../radios/radios_v2.py                       |   2 +-
 .../radios/registries.py                      |   0
 .../radios/registries_v2.py                   |   0
 .../radios/serializers.py                     |   0
 .../radios/urls.py                            |   0
 .../radios/urls_v2.py                         |   0
 .../radios/views.py                           |   0
 .../requests/__init__.py                      |   0
 .../requests/migrations/0001_initial.py       |   0
 .../requests/migrations/__init__.py           |   0
 .../requests/models.py                        |   0
 api/{funkwhale_api => funquail_api}/schema.py |   0
 .../images/podcasts-cover-placeholder.png     | Bin
 .../static/music/sample1.ogg                  | Bin
 .../subsonic/__init__.py                      |   0
 .../subsonic/authentication.py                |   0
 .../subsonic/dynamic_preferences_registry.py  |   2 +-
 .../subsonic/filters.py                       |   0
 .../subsonic/negotiation.py                   |   0
 .../subsonic/renderers.py                     |   0
 .../subsonic/serializers.py                   |   0
 .../subsonic/views.py                         |   0
 .../tags/__init__.py                          |   0
 .../tags/admin.py                             |   0
 .../tags/factories.py                         |   0
 .../tags/filters.py                           |   0
 .../tags/migrations/0001_initial.py           |   0
 .../migrations/0002_auto_20200803_1222.py     |   0
 .../tags/migrations/__init__.py               |   0
 .../tags/models.py                            |   0
 .../tags/serializers.py                       |   0
 .../tags/tasks.py                             |   0
 .../tags/views.py                             |   0
 .../taskapp/__init__.py                       |   0
 .../taskapp/celery.py                         |   0
 .../email/email_confirmation_message.txt      |   0
 .../registration/password_reset_email.html    |   0
 .../typesense/__init__.py                     |   0
 .../typesense/factories.py                    |   0
 .../typesense/tasks.py                        |   0
 .../typesense/utils.py                        |   0
 .../users/__init__.py                         |   0
 .../users/adapters.py                         |   8 +-
 .../users/admin.py                            |   0
 .../users/api_urls.py                         |   0
 .../users/auth_backends.py                    |   0
 .../users/authentication.py                   |   0
 .../users/dynamic_preferences_registry.py     |   0
 .../users/factories.py                        |   0
 .../users/middleware.py                       |   0
 .../users/migrations/0001_initial.py          |   0
 .../migrations/0002_auto_20171214_2205.py     |   0
 .../migrations/0003_auto_20171226_1357.py     |   0
 .../migrations/0004_user_privacy_level.py     |   0
 .../0005_user_subsonic_api_token.py           |   0
 .../migrations/0006_auto_20180517_2324.py     |   0
 .../migrations/0007_auto_20180524_2009.py     |   0
 .../migrations/0008_auto_20180617_1531.py     |   0
 .../migrations/0009_auto_20180619_2024.py     |   0
 .../users/migrations/0010_user_avatar.py      |   0
 .../migrations/0011_auto_20180721_1317.py     |   0
 .../migrations/0012_user_upload_quota.py      |   0
 .../migrations/0013_auto_20181206_1008.py     |   0
 .../users/migrations/0014_oauth.py            |   0
 .../migrations/0015_application_scope.py      |   0
 .../migrations/0016_auto_20190920_0857.py     |   2 +-
 .../users/migrations/0017_actor_avatar.py     |   0
 .../migrations/0018_auto_20200705_0829.py     |   0
 .../migrations/0019_auto_20200718_0741.py     |   0
 .../migrations/0020_application_token.py      |   0
 .../migrations/0021_auto_20210703_1810.py     |   0
 .../migrations/0022_alter_user_settings.py    |   0
 .../migrations/0022_auto_20221119_1819.py     |   0
 .../migrations/0023_merge_20221125_1902.py    |   0
 .../users/migrations/__init__.py              |   0
 .../users/models.py                           |   4 +-
 .../users/mutations.py                        |   0
 .../users/oauth/__init__.py                   |   0
 .../users/oauth/permissions.py                |   0
 .../users/oauth/scopes.py                     |   0
 .../users/oauth/serializers.py                |   0
 .../users/oauth/server.py                     |   0
 .../users/oauth/tasks.py                      |   0
 .../users/oauth/urls.py                       |   0
 .../users/oauth/views.py                      |   0
 .../users/rest_auth_urls.py                   |   0
 .../users/serializers.py                      |   0
 .../users/tasks.py                            |   0
 .../users/views.py                            |   0
 .../users/wordlist.txt                        |   0
 api/pyproject.toml                            |  32 ++---
 api/tests/audio/test_spa_views.py             |  12 +-
 api/tests/audio/test_views.py                 |   2 +-
 api/tests/common/test_middleware.py           |  28 ++---
 api/tests/common/test_pagination.py           |   2 +-
 api/tests/common/test_scripts.py              |   4 +-
 api/tests/common/test_session.py              |   4 +-
 api/tests/common/test_throttling.py           |  12 +-
 api/tests/common/test_utils.py                |   4 +-
 api/tests/conftest.py                         |   4 +-
 api/tests/federation/test_serializers.py      |   2 +-
 api/tests/federation/test_spa_views.py        |   2 +-
 api/tests/federation/test_tasks.py            |   2 +-
 api/tests/federation/test_utils.py            |   2 +-
 api/tests/federation/test_views.py            |  16 +--
 api/tests/instance/test_nodeinfo.py           |   2 +-
 api/tests/moderation/test_tasks.py            |   8 +-
 api/tests/music/test_activity.py              |   2 +-
 api/tests/music/test_spa_views.py             |  36 +++---
 api/tests/music/test_views.py                 |  24 ++--
 api/tests/users/test_activity.py              |   2 +-
 api/tests/users/test_models.py                |   2 +-
 api/tests/users/test_views.py                 |   6 +-
 changes/template.md.j2                        |   2 +-
 deploy/FreeBSD/README.md                      |  10 +-
 deploy/FreeBSD/funkwhale_beat                 |  39 ------
 deploy/FreeBSD/funkwhale_server               |  38 ------
 deploy/FreeBSD/funkwhale_worker               |  39 ------
 deploy/FreeBSD/funquail_beat                  |  39 ++++++
 deploy/FreeBSD/funquail_server                |  38 ++++++
 deploy/FreeBSD/funquail_worker                |  39 ++++++
 deploy/Gentoo/README.md                       |   8 +-
 .../Gentoo/{funkwhale_beat => funquail_beat}  |  22 ++--
 .../{funkwhale_server => funquail_server}     |  22 ++--
 .../{funkwhale_worker => funquail_worker}     |  22 ++--
 deploy/apache.conf                            |  56 ++++-----
 deploy/docker-compose.yml                     |  26 ++--
 ..._proxy.conf => docker.funquail_proxy.conf} |   0
 deploy/docker.proxy.template                  |  14 +--
 deploy/env.prod.sample                        |  54 ++++-----
 deploy/funkwhale-beat.service                 |  18 ---
 deploy/funkwhale-server.service               |  22 ----
 deploy/funkwhale-worker.service               |  20 ---
 deploy/funkwhale.target                       |   6 -
 deploy/funquail-beat.service                  |  18 +++
 deploy/funquail-server.service                |  22 ++++
 deploy/funquail-worker.service                |  20 +++
 deploy/funquail.target                        |   6 +
 ...nkwhale_proxy.conf => funquail_proxy.conf} |   0
 deploy/nginx.template                         |  56 ++++-----
 docs/Makefile                                 |   6 -
 CHANGELOG.md => old/CHANGELOG.md              |   0
 CONTRIBUTING.md => old/CONTRIBUTING.md        |   0
 old/README.md                                 |  26 ++++
 517 files changed, 637 insertions(+), 639 deletions(-)
 rename api/{funkwhale_api => funquail_api}/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/activity/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/activity/apps.py (100%)
 rename api/{funkwhale_api => funquail_api}/activity/record.py (100%)
 rename api/{funkwhale_api => funquail_api}/activity/serializers.py (100%)
 rename api/{funkwhale_api => funquail_api}/activity/utils.py (100%)
 rename api/{funkwhale_api => funquail_api}/activity/views.py (100%)
 rename api/{funkwhale_api => funquail_api}/audio/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/audio/admin.py (100%)
 rename api/{funkwhale_api => funquail_api}/audio/categories.py (100%)
 rename api/{funkwhale_api => funquail_api}/audio/dynamic_preferences_registry.py (100%)
 rename api/{funkwhale_api => funquail_api}/audio/factories.py (100%)
 rename api/{funkwhale_api => funquail_api}/audio/filters.py (100%)
 rename api/{funkwhale_api => funquail_api}/audio/migrations/0001_initial.py (100%)
 rename api/{funkwhale_api => funquail_api}/audio/migrations/0002_channel_metadata.py (100%)
 rename api/{funkwhale_api => funquail_api}/audio/migrations/0003_channel_rss_url.py (100%)
 rename api/{funkwhale_api => funquail_api}/audio/migrations/0004_alter_channel_metadata.py (100%)
 rename api/{funkwhale_api => funquail_api}/audio/migrations/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/audio/models.py (100%)
 rename api/{funkwhale_api => funquail_api}/audio/renderers.py (100%)
 rename api/{funkwhale_api => funquail_api}/audio/serializers.py (100%)
 rename api/{funkwhale_api => funquail_api}/audio/spa_views.py (96%)
 rename api/{funkwhale_api => funquail_api}/audio/tasks.py (100%)
 rename api/{funkwhale_api => funquail_api}/audio/views.py (99%)
 rename api/{funkwhale_api => funquail_api}/cli/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/cli/base.py (100%)
 rename api/{funkwhale_api => funquail_api}/cli/library.py (100%)
 rename api/{funkwhale_api => funquail_api}/cli/main.py (100%)
 rename api/{funkwhale_api => funquail_api}/cli/media.py (100%)
 rename api/{funkwhale_api => funquail_api}/cli/plugins.py (91%)
 rename api/{funkwhale_api => funquail_api}/cli/users.py (98%)
 rename api/{funkwhale_api => funquail_api}/cli/utils.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/admin.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/apps.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/authentication.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/cache.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/channels.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/consumers.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/decorators.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/dynamic_preferences_registry.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/factories.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/fields.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/filters.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/locales.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/management/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/management/commands/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/management/commands/createsuperuser.py (88%)
 rename api/{funkwhale_api => funquail_api}/common/management/commands/gitpod.py (96%)
 rename api/{funkwhale_api => funquail_api}/common/management/commands/inplace_to_s3.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/management/commands/load_test_data.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/management/commands/makemigrations.py (88%)
 rename api/{funkwhale_api => funquail_api}/common/management/commands/migrate.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/management/commands/script.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/management/commands/testdata.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/middleware.py (97%)
 rename api/{funkwhale_api => funquail_api}/common/migrations/0001_initial.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/migrations/0002_mutation.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/migrations/0003_cit_extension.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/migrations/0004_auto_20191111_1338.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/migrations/0005_auto_20191125_1421.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/migrations/0006_content.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/migrations/0007_auto_20200116_1610.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/migrations/0008_auto_20200701_1317.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/migrations/0009_auto_20220627_1915.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/migrations/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/mixins.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/models.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/mutations.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/pagination.py (94%)
 rename api/{funkwhale_api => funquail_api}/common/permissions.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/preferences.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/renderers.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/routers.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/scripts/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/scripts/create_actors.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/scripts/create_image_variations.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/scripts/delete_pre_017_federated_uploads.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/scripts/django_permissions_to_user_permissions.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/scripts/migrate_to_user_libraries.py (97%)
 rename api/{funkwhale_api => funquail_api}/common/scripts/test.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/search.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/serializers.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/session.py (78%)
 rename api/{funkwhale_api => funquail_api}/common/signals.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/storage.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/tasks.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/throttling.py (95%)
 rename api/{funkwhale_api => funquail_api}/common/utils.py (98%)
 rename api/{funkwhale_api => funquail_api}/common/validators.py (100%)
 rename api/{funkwhale_api => funquail_api}/common/views.py (100%)
 rename api/{funkwhale_api => funquail_api}/contrib/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/contrib/listenbrainz/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/contrib/listenbrainz/client.py (100%)
 rename api/{funkwhale_api => funquail_api}/contrib/listenbrainz/funkwhale_ready.py (93%)
 rename api/{funkwhale_api => funquail_api}/contrib/listenbrainz/funkwhale_startup.py (82%)
 rename api/{funkwhale_api => funquail_api}/contrib/maloja/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/contrib/maloja/funkwhale_ready.py (100%)
 rename api/{funkwhale_api => funquail_api}/contrib/maloja/funkwhale_startup.py (86%)
 rename api/{funkwhale_api => funquail_api}/contrib/scrobbler/README.rst (68%)
 rename api/{funkwhale_api => funquail_api}/contrib/scrobbler/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/contrib/scrobbler/funkwhale_ready.py (100%)
 rename api/{funkwhale_api => funquail_api}/contrib/scrobbler/funkwhale_startup.py (91%)
 rename api/{funkwhale_api => funquail_api}/contrib/scrobbler/scrobbler.py (100%)
 rename api/{funkwhale_api => funquail_api}/contrib/sites/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/contrib/sites/migrations/0001_initial.py (100%)
 rename api/{funkwhale_api => funquail_api}/contrib/sites/migrations/0002_set_site_domain_and_name.py (100%)
 rename api/{funkwhale_api => funquail_api}/contrib/sites/migrations/0003_auto_20171214_2205.py (100%)
 rename api/{funkwhale_api => funquail_api}/contrib/sites/migrations/0004_alter_site_options.py (100%)
 rename api/{funkwhale_api => funquail_api}/contrib/sites/migrations/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/factories.py (98%)
 rename api/{funkwhale_api => funquail_api}/favorites/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/favorites/activities.py (100%)
 rename api/{funkwhale_api => funquail_api}/favorites/admin.py (100%)
 rename api/{funkwhale_api => funquail_api}/favorites/consumers.py (100%)
 rename api/{funkwhale_api => funquail_api}/favorites/factories.py (100%)
 rename api/{funkwhale_api => funquail_api}/favorites/filters.py (100%)
 rename api/{funkwhale_api => funquail_api}/favorites/migrations/0001_initial.py (100%)
 rename api/{funkwhale_api => funquail_api}/favorites/migrations/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/favorites/models.py (100%)
 rename api/{funkwhale_api => funquail_api}/favorites/serializers.py (100%)
 rename api/{funkwhale_api => funquail_api}/favorites/urls.py (100%)
 rename api/{funkwhale_api => funquail_api}/favorites/views.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/activity.py (99%)
 rename api/{funkwhale_api => funquail_api}/federation/actors.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/admin.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/api_serializers.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/api_urls.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/api_views.py (99%)
 rename api/{funkwhale_api => funquail_api}/federation/authentication.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/contexts.py (99%)
 rename api/{funkwhale_api => funquail_api}/federation/decorators.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/dynamic_preferences_registry.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/exceptions.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/factories.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/fields.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/filters.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/jsonld.py (99%)
 rename api/{funkwhale_api => funquail_api}/federation/keys.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/library.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/management/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/management/commands/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/management/commands/fix_federation_ids.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0001_initial.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0002_auto_20180403_1620.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0003_auto_20180407_1010.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0004_auto_20180410_2025.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0005_auto_20180413_1723.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0006_auto_20180521_1702.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0007_auto_20180807_1748.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0008_auto_20180807_1748.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0009_auto_20180822_1956.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0010_auto_20180904_2011.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0011_auto_20180910_1902.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0012_auto_20180920_1803.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0013_auto_20181226_1935.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0014_auto_20181205_0958.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0015_populate_domains.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0016_auto_20181227_1605.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0017_auto_20190130_0926.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0018_fetch.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0019_auto_20190611_0851.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0020_auto_20190730_0846.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0021_auto_20191029_1257.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0022_auto_20191204_1539.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0023_actor_summary_obj.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0024_actor_attachment_icon.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0025_auto_20200317_0820.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0026_public_key_format.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0027_auto_20220627_1915.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/0028_auto_20221027_1141.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/migrations/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/models.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/mrf_policies.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/parsers.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/renderers.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/routes.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/schema_org.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/serializers.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/signing.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/spa_views.py (98%)
 rename api/{funkwhale_api => funquail_api}/federation/tasks.py (99%)
 rename api/{funkwhale_api => funquail_api}/federation/urls.py (100%)
 rename api/{funkwhale_api => funquail_api}/federation/utils.py (99%)
 rename api/{funkwhale_api => funquail_api}/federation/views.py (99%)
 rename api/{funkwhale_api => funquail_api}/federation/webfinger.py (100%)
 rename api/{funkwhale_api => funquail_api}/history/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/history/activities.py (100%)
 rename api/{funkwhale_api => funquail_api}/history/admin.py (100%)
 rename api/{funkwhale_api => funquail_api}/history/factories.py (100%)
 rename api/{funkwhale_api => funquail_api}/history/filters.py (100%)
 rename api/{funkwhale_api => funquail_api}/history/migrations/0001_initial.py (100%)
 rename api/{funkwhale_api => funquail_api}/history/migrations/0002_auto_20180325_1433.py (100%)
 rename api/{funkwhale_api => funquail_api}/history/migrations/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/history/models.py (100%)
 rename api/{funkwhale_api => funquail_api}/history/serializers.py (100%)
 rename api/{funkwhale_api => funquail_api}/history/urls.py (100%)
 rename api/{funkwhale_api => funquail_api}/history/views.py (100%)
 rename api/{funkwhale_api => funquail_api}/instance/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/instance/consumers.py (100%)
 rename api/{funkwhale_api => funquail_api}/instance/dynamic_preferences_registry.py (97%)
 rename api/{funkwhale_api => funquail_api}/instance/pwa-manifest.json (94%)
 rename api/{funkwhale_api => funquail_api}/instance/serializers.py (98%)
 rename api/{funkwhale_api => funquail_api}/instance/stats.py (100%)
 rename api/{funkwhale_api => funquail_api}/instance/urls.py (100%)
 rename api/{funkwhale_api => funquail_api}/instance/urls_v2.py (100%)
 rename api/{funkwhale_api => funquail_api}/instance/views.py (100%)
 rename api/{funkwhale_api => funquail_api}/main.py (100%)
 rename api/{funkwhale_api => funquail_api}/manage/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/manage/filters.py (100%)
 rename api/{funkwhale_api => funquail_api}/manage/serializers.py (100%)
 rename api/{funkwhale_api => funquail_api}/manage/urls.py (100%)
 rename api/{funkwhale_api => funquail_api}/manage/views.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/admin.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/apps.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/dynamic_preferences_registry.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/factories.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/filters.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/management/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/management/commands/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/management/commands/mrf_check.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/migrations/0001_initial.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/migrations/0002_auto_20190213_0927.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/migrations/0003_report.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/migrations/0004_note.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/migrations/0005_auto_20200317_0820.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/migrations/0006_auto_20200803_1222.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/migrations/0007_auto_20220627_1915.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/migrations/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/models.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/mrf.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/mrf_policies.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/serializers.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/signals.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/tasks.py (96%)
 rename api/{funkwhale_api => funquail_api}/moderation/urls.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/utils.py (100%)
 rename api/{funkwhale_api => funquail_api}/moderation/views.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/admin.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/dynamic_preferences_registry.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/factories.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/fake_data.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/filters.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/importers.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/licenses.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/management/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/management/commands/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/management/commands/check_inplace_files.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/management/commands/check_licenses.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/management/commands/create_library.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/management/commands/fix_uploads.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/management/commands/generate_typesense_index.py (78%)
 rename api/{funkwhale_api => funquail_api}/music/management/commands/import_files.py (99%)
 rename api/{funkwhale_api => funquail_api}/music/management/commands/prune_library.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/management/commands/prune_skipped_uploads.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/management/commands/rebuild_music_permissions.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/metadata.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0001_initial.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0002_auto_20151215_1645.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0003_auto_20151222_2233.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0004_track_tags.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0005_deduplicate.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0006_unique_mbid.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0007_track_position.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0008_auto_20160529_1456.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0009_auto_20160920_1614.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0010_auto_20160920_1742.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0011_rename_files.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0012_auto_20161122_1905.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0013_auto_20171213_2211.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0014_importjob_track_file.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0015_bind_track_file_to_import_job.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0016_trackfile_acoustid_track_id.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0017_auto_20171227_1728.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0018_auto_20180218_1554.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0019_populate_mimetypes.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0020_importbatch_status.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0021_populate_batch_status.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0022_importbatch_import_request.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0023_auto_20180407_1010.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0024_populate_uuid.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0025_auto_20180419_2023.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0026_trackfile_accessed_date.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0027_auto_20180515_1808.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0028_importjob_replace_if_duplicate.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0029_auto_20180807_1748.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0030_auto_20180825_1411.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0031_auto_20180914_2007.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0032_track_file_to_upload.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0033_auto_20181023_1837.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0034_auto_20181127_0325.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0035_auto_20181203_1515.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0036_track_disc_number.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0037_auto_20190103_1757.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0038_attributed_to.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0039_auto_20190423_0820.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0040_auto_20191021_1318.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0041_auto_20191021_1705.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0042_album_attachment_cover.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0043_album_cover_attachment.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0044_full_text_search.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0045_full_text_search_stop_words.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0046_auto_20200113_1018.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0047_auto_20200116_1246.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0048_auto_20200120_0900.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0049_auto_20200122_1020.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0050_auto_20200129_1344.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0051_auto_20200319_1249.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0052_auto_20200505_0810.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0053_denormalize_audio_permissions.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0054_alter_uploadversion_mimetype.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0055_auto_20220627_1915.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0056_alter_artist_content_category.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/0057_auto_20221118_2108.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/migrations/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/models.py (99%)
 rename api/{funkwhale_api => funquail_api}/music/mutations.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/serializers.py (99%)
 rename api/{funkwhale_api => funquail_api}/music/signals.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/spa_views.py (93%)
 rename api/{funkwhale_api => funquail_api}/music/tasks.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/utils.py (100%)
 rename api/{funkwhale_api => funquail_api}/music/views.py (100%)
 rename api/{funkwhale_api => funquail_api}/musicbrainz/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/musicbrainz/client.py (97%)
 rename api/{funkwhale_api => funquail_api}/musicbrainz/urls.py (100%)
 rename api/{funkwhale_api => funquail_api}/musicbrainz/views.py (100%)
 rename api/{funkwhale_api => funquail_api}/playlists/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/playlists/admin.py (100%)
 rename api/{funkwhale_api => funquail_api}/playlists/dynamic_preferences_registry.py (100%)
 rename api/{funkwhale_api => funquail_api}/playlists/factories.py (100%)
 rename api/{funkwhale_api => funquail_api}/playlists/filters.py (100%)
 rename api/{funkwhale_api => funquail_api}/playlists/migrations/0001_initial.py (100%)
 rename api/{funkwhale_api => funquail_api}/playlists/migrations/0002_auto_20180316_2217.py (100%)
 rename api/{funkwhale_api => funquail_api}/playlists/migrations/0003_auto_20180319_1214.py (100%)
 rename api/{funkwhale_api => funquail_api}/playlists/migrations/0004_auto_20180320_1713.py (100%)
 rename api/{funkwhale_api => funquail_api}/playlists/migrations/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/playlists/models.py (100%)
 rename api/{funkwhale_api => funquail_api}/playlists/serializers.py (100%)
 rename api/{funkwhale_api => funquail_api}/playlists/views.py (100%)
 rename api/{funkwhale_api => funquail_api}/providers/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/providers/urls.py (100%)
 rename api/{funkwhale_api => funquail_api}/radios/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/radios/admin.py (100%)
 rename api/{funkwhale_api => funquail_api}/radios/factories.py (100%)
 rename api/{funkwhale_api => funquail_api}/radios/filters.py (100%)
 rename api/{funkwhale_api => funquail_api}/radios/filtersets.py (100%)
 rename api/{funkwhale_api => funquail_api}/radios/lb_recommendations.py (92%)
 rename api/{funkwhale_api => funquail_api}/radios/migrations/0001_initial.py (100%)
 rename api/{funkwhale_api => funquail_api}/radios/migrations/0002_radiosession_session_key.py (100%)
 rename api/{funkwhale_api => funquail_api}/radios/migrations/0003_auto_20160521_1708.py (100%)
 rename api/{funkwhale_api => funquail_api}/radios/migrations/0004_auto_20180107_1813.py (100%)
 rename api/{funkwhale_api => funquail_api}/radios/migrations/0005_auto_20200803_1222.py (100%)
 rename api/{funkwhale_api => funquail_api}/radios/migrations/0006_alter_radio_config.py (100%)
 rename api/{funkwhale_api => funquail_api}/radios/migrations/0006_radiosession_config.py (100%)
 rename api/{funkwhale_api => funquail_api}/radios/migrations/0007_merge_20220715_0801.py (100%)
 rename api/{funkwhale_api => funquail_api}/radios/migrations/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/radios/models.py (100%)
 rename api/{funkwhale_api => funquail_api}/radios/radios.py (99%)
 rename api/{funkwhale_api => funquail_api}/radios/radios_v2.py (99%)
 rename api/{funkwhale_api => funquail_api}/radios/registries.py (100%)
 rename api/{funkwhale_api => funquail_api}/radios/registries_v2.py (100%)
 rename api/{funkwhale_api => funquail_api}/radios/serializers.py (100%)
 rename api/{funkwhale_api => funquail_api}/radios/urls.py (100%)
 rename api/{funkwhale_api => funquail_api}/radios/urls_v2.py (100%)
 rename api/{funkwhale_api => funquail_api}/radios/views.py (100%)
 rename api/{funkwhale_api => funquail_api}/requests/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/requests/migrations/0001_initial.py (100%)
 rename api/{funkwhale_api => funquail_api}/requests/migrations/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/requests/models.py (100%)
 rename api/{funkwhale_api => funquail_api}/schema.py (100%)
 rename api/{funkwhale_api => funquail_api}/static/images/podcasts-cover-placeholder.png (100%)
 rename api/{funkwhale_api => funquail_api}/static/music/sample1.ogg (100%)
 rename api/{funkwhale_api => funquail_api}/subsonic/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/subsonic/authentication.py (100%)
 rename api/{funkwhale_api => funquail_api}/subsonic/dynamic_preferences_registry.py (90%)
 rename api/{funkwhale_api => funquail_api}/subsonic/filters.py (100%)
 rename api/{funkwhale_api => funquail_api}/subsonic/negotiation.py (100%)
 rename api/{funkwhale_api => funquail_api}/subsonic/renderers.py (100%)
 rename api/{funkwhale_api => funquail_api}/subsonic/serializers.py (100%)
 rename api/{funkwhale_api => funquail_api}/subsonic/views.py (100%)
 rename api/{funkwhale_api => funquail_api}/tags/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/tags/admin.py (100%)
 rename api/{funkwhale_api => funquail_api}/tags/factories.py (100%)
 rename api/{funkwhale_api => funquail_api}/tags/filters.py (100%)
 rename api/{funkwhale_api => funquail_api}/tags/migrations/0001_initial.py (100%)
 rename api/{funkwhale_api => funquail_api}/tags/migrations/0002_auto_20200803_1222.py (100%)
 rename api/{funkwhale_api => funquail_api}/tags/migrations/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/tags/models.py (100%)
 rename api/{funkwhale_api => funquail_api}/tags/serializers.py (100%)
 rename api/{funkwhale_api => funquail_api}/tags/tasks.py (100%)
 rename api/{funkwhale_api => funquail_api}/tags/views.py (100%)
 rename api/{funkwhale_api => funquail_api}/taskapp/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/taskapp/celery.py (100%)
 rename api/{funkwhale_api => funquail_api}/templates/account/email/email_confirmation_message.txt (100%)
 rename api/{funkwhale_api => funquail_api}/templates/registration/password_reset_email.html (100%)
 rename api/{funkwhale_api => funquail_api}/typesense/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/typesense/factories.py (100%)
 rename api/{funkwhale_api => funquail_api}/typesense/tasks.py (100%)
 rename api/{funkwhale_api => funquail_api}/typesense/utils.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/adapters.py (78%)
 rename api/{funkwhale_api => funquail_api}/users/admin.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/api_urls.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/auth_backends.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/authentication.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/dynamic_preferences_registry.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/factories.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/middleware.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0001_initial.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0002_auto_20171214_2205.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0003_auto_20171226_1357.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0004_user_privacy_level.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0005_user_subsonic_api_token.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0006_auto_20180517_2324.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0007_auto_20180524_2009.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0008_auto_20180617_1531.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0009_auto_20180619_2024.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0010_user_avatar.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0011_auto_20180721_1317.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0012_user_upload_quota.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0013_auto_20181206_1008.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0014_oauth.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0015_application_scope.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0016_auto_20190920_0857.py (96%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0017_actor_avatar.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0018_auto_20200705_0829.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0019_auto_20200718_0741.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0020_application_token.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0021_auto_20210703_1810.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0022_alter_user_settings.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0022_auto_20221119_1819.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/0023_merge_20221125_1902.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/migrations/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/models.py (99%)
 rename api/{funkwhale_api => funquail_api}/users/mutations.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/oauth/__init__.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/oauth/permissions.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/oauth/scopes.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/oauth/serializers.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/oauth/server.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/oauth/tasks.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/oauth/urls.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/oauth/views.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/rest_auth_urls.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/serializers.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/tasks.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/views.py (100%)
 rename api/{funkwhale_api => funquail_api}/users/wordlist.txt (100%)
 delete mode 100755 deploy/FreeBSD/funkwhale_beat
 delete mode 100755 deploy/FreeBSD/funkwhale_server
 delete mode 100755 deploy/FreeBSD/funkwhale_worker
 create mode 100755 deploy/FreeBSD/funquail_beat
 create mode 100755 deploy/FreeBSD/funquail_server
 create mode 100755 deploy/FreeBSD/funquail_worker
 rename deploy/Gentoo/{funkwhale_beat => funquail_beat} (54%)
 rename deploy/Gentoo/{funkwhale_server => funquail_server} (58%)
 rename deploy/Gentoo/{funkwhale_worker => funquail_worker} (53%)
 rename deploy/{docker.funkwhale_proxy.conf => docker.funquail_proxy.conf} (100%)
 delete mode 100644 deploy/funkwhale-beat.service
 delete mode 100644 deploy/funkwhale-server.service
 delete mode 100644 deploy/funkwhale-worker.service
 delete mode 100644 deploy/funkwhale.target
 create mode 100644 deploy/funquail-beat.service
 create mode 100644 deploy/funquail-server.service
 create mode 100644 deploy/funquail-worker.service
 create mode 100644 deploy/funquail.target
 rename deploy/{funkwhale_proxy.conf => funquail_proxy.conf} (100%)
 rename CHANGELOG.md => old/CHANGELOG.md (100%)
 rename CONTRIBUTING.md => old/CONTRIBUTING.md (100%)
 create mode 100644 old/README.md

diff --git a/.env.dev b/.env.dev
index d041167ba..f7220eccf 100644
--- a/.env.dev
+++ b/.env.dev
@@ -2,15 +2,15 @@ DJANGO_ALLOWED_HOSTS=.funkwhale.test,localhost,nginx,0.0.0.0,127.0.0.1,.gitpod.i
 DJANGO_SETTINGS_MODULE=config.settings.local
 DJANGO_SECRET_KEY=dev
 C_FORCE_ROOT=true
-FUNKWHALE_HOSTNAME=localhost
-FUNKWHALE_PROTOCOL=http
+FUNQUAIL_HOSTNAME=localhost
+FUNQUAIL_PROTOCOL=http
 PYTHONDONTWRITEBYTECODE=true
 VUE_PORT=8080
 MUSIC_DIRECTORY_PATH=/music
 BROWSABLE_API_ENABLED=True
 FORWARDED_PROTO=http
 LDAP_ENABLED=False
-FUNKWHALE_SPA_HTML_ROOT=http://nginx/
+FUNQUAIL_SPA_HTML_ROOT=http://nginx/
 PYTHONTRACEMALLOC=0
 MEDIA_ROOT=/data/media
 
diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index 1570482a6..fe5de8945 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -41,7 +41,7 @@ Describe the expected behaviour.
 The version of your instance can be found on the footer : Source code (x.y)
 -->
 
-**Funkwhale version(s) affected**: x.y
+**FunQuail version(s) affected**: x.y
 
 <!--
 If relevant, share additional context here like:
diff --git a/Makefile b/Makefile
index e1f64e782..71fc7fe7c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 SHELL := bash
-CPU_CORES := $(shell N=$$(nproc); echo $$(( $$N > 4 ? 4 : $$N )))
 
 BAKE_FILES = \
 	docker-bake.json \
diff --git a/README.md b/README.md
index 2400701de..16d2ed2c1 100644
--- a/README.md
+++ b/README.md
@@ -1,26 +1,5 @@
-# Funkwhale
+# FunQuail
+A platform for uploading, sharing, and publishing audio content across the federated[^1] web.\
+Curate your music library, listen to podcasts, or create your own content and share it with the world.
 
-[![The Funkwhale logo](./front/src/assets/logo/logo-full-500.png)](https://funkwhale.audio)
-
-Funkwhale is a platform for uploading, sharing, and publishing audio content across the federated web. Curate your music library, listen to podcasts, or create your own content and share it with the world.
-
-## Contribute
-
-Want to help make Funkwhale even better? We welcome contributions from across the community. Whether you are a designer, a translator, a technical writer, or a developer, we look forward to seeing your work!
-
-You can find contribution information in our [documentation hub](https://docs.funkwhale.audio).
-
-- [Developer guides](https://docs.funkwhale.audio/developer/index.html)
-- [Contributor guides](https://docs.funkwhale.audio/contributing.html)
-
-## Get help
-
-Got a question or need help? Head over to our [forum](https://forum.funkwhale.audio/t/support) and open up a discussion.
-
-## Report a security issue
-
-If you find a security issue or vulnerability, please report it on our [GitLab instance](https://dev.funkwhale.audio/funkwhale/funkwhale/-/issues). When you open your issue, select the **This issue is confidential and should only be visible to team members with at least Reporter access** option. This ensures developers can verify and patch the issue before disclosing it.
-
-## Code of conduct
-
-The Funkwhale collective adheres to a [code of conduct](https://funkwhale.audio/code-of-conduct) in all our community spaces. Please familiarize yourself with this code and follow it when participating in discussions in our spaces.
+This project began existence as a hard-fork of [Funkwhale](https://funkwhale.audio).
diff --git a/api/Readme.md b/api/Readme.md
index 6ed9a57fc..c3ec09334 100644
--- a/api/Readme.md
+++ b/api/Readme.md
@@ -1,12 +1,12 @@
-# Funkwhale API
+# FunQuail API
 
-This is the Funkwhale API. Check out our [API explorer](https://docs.funkwhale.audio/swagger/) for interactive documentation.
+This is the FunQuail API. Check out our [API explorer](https://funquail.laidback.moe/docs/swagger/) for interactive documentation.
 
 ## OAuth Authentication
 
-Funkwhale uses the OAuth [authorization grant flow](https://tools.ietf.org/html/rfc6749#section-4.1) for external apps. This flow is a secure way to authenticate apps that requires a user's explicit consent to perform actions. You can use our demo server at <https://demo.funkwhale.audio> for testing purposes.
+FunQuail uses the OAuth [authorization grant flow](https://tools.ietf.org/html/rfc6749#section-4.1) for external apps. This flow is a secure way to authenticate apps that requires a user's explicit consent to perform actions. You can use our demo server at <https://demo.funkwhale.audio> for testing purposes.
 
-To authenticate with the Funkwhale API:
+To authenticate with the FunQuail API:
 
 1. Create an application by sending a `POST` request to `api/v1/oauth/apps`. Include your scopes and redirect URI (use `urn:ietf:wg:oauth:2.0:oob`
    to get an authorization code you can copy)
@@ -15,7 +15,7 @@ To authenticate with the Funkwhale API:
 4. Use your access token to authenticate your calls with the following format: `Authorization: Bearer <token>`
 5. Refresh your access token by sending a refresh request to `/api/v1/oauth/token`
 
-For more detailed instructions, see [our API authentication documentation](https://docs.funkwhale.audio/developers/authentication.html).
+For more detailed instructions, see [our API authentication documentation](https://funquail.laidback.moe/docs/developers/authentication.html).
 
 ## Application token authentication
 
@@ -23,7 +23,7 @@ If you have an account on your target pod, you can create an application at `/se
 
 ## Rate limiting
 
-Funkwhale supports rate-limiting as of version 0.2.0. Pod admins can choose to rate limit specific endpoints to prevent abuse and improve the stability of the service. If the server drops a request due to rate-limiting, it returns a `429` status code.
+FunQuail supports rate-limiting as of version 0.2.0. Pod admins can choose to rate limit specific endpoints to prevent abuse and improve the stability of the service. If the server drops a request due to rate-limiting, it returns a `429` status code.
 
 Each API call returns HTTP headers to pass the following information:
 
@@ -32,8 +32,8 @@ Each API call returns HTTP headers to pass the following information:
 - How many more requests in the scope can be made within the rate-limit timeframe (`X-RateLimit-Remaining`)
 - How much time does the client need to wait to send another request (`Retry-After`)
 
-For more information, check our [rate limit documentation](https://docs.funkwhale.audio/developer/api/rate-limit.html)
+For more information, check our [rate limit documentation](https://funquail.laidback.moe/docs/developer/api/rate-limit.html)
 
 ## Resources
 
-For more information about API usage, refer to [our API documentation](https://docs.funkwhale.audio/api.html).
+For more information about API usage, refer to [our API documentation](https://funquail.laidback.moe/docs/api.html).
diff --git a/api/config/plugins.py b/api/config/plugins.py
index ddd5afbb5..0aa5147e6 100644
--- a/api/config/plugins.py
+++ b/api/config/plugins.py
@@ -81,7 +81,7 @@ def load_settings(name, settings):
         "text": django_settings.ENV,
     }
     values = {}
-    prefix = f"FUNKWHALE_PLUGIN_{name.upper()}"
+    prefix = f"FUNQUAIL_PLUGIN_{name.upper()}"
     for s in settings:
         key = "_".join([prefix, s["name"].upper()])
         value = mapping[s["type"]](key, default=s.get("default", None))
diff --git a/api/config/settings/common.py b/api/config/settings/common.py
index b7040a707..258958825 100644
--- a/api/config/settings/common.py
+++ b/api/config/settings/common.py
@@ -19,7 +19,7 @@ LOGLEVEL = (
     "DEBUG" if env.bool("DEBUG", False) else env("LOGLEVEL", default="info").upper()
 )
 """
-Default logging level for the Funkwhale processes.
+Default logging level for the FunQuail processes.
 
 .. note::
     The `DEBUG` variable overrides the `LOGLEVEL` if it is set to `TRUE`.
@@ -39,7 +39,7 @@ Available levels:
 IS_DOCKER_SETUP = env.bool("IS_DOCKER_SETUP", False)
 
 
-if env("FUNKWHALE_SENTRY_DSN", default=None) is not None:
+if env("FUNQUAIL_SENTRY_DSN", default=None) is not None:
     import sentry_sdk
     from sentry_sdk.integrations.celery import CeleryIntegration
     from sentry_sdk.integrations.django import DjangoIntegration
@@ -47,15 +47,15 @@ if env("FUNKWHALE_SENTRY_DSN", default=None) is not None:
     from funkwhale_api import __version__ as version
 
     sentry_sdk.init(
-        dsn=env("FUNKWHALE_SENTRY_DSN"),
+        dsn=env("FUNQUAIL_SENTRY_DSN"),
         integrations=[DjangoIntegration(), CeleryIntegration()],
-        traces_sample_rate=env("FUNKWHALE_SENTRY_SR", default=0.25),
+        traces_sample_rate=env("FUNQUAIL_SENTRY_SR", default=0.25),
         send_default_pii=False,
         environment="api",
         debug=env.bool("DEBUG", False),
         release=version,
     )
-    sentry_sdk.set_tag("instance", env("FUNKWHALE_HOSTNAME"))
+    sentry_sdk.set_tag("instance", env("FUNQUAIL_HOSTNAME"))
 
 LOGGING_CONFIG = None
 logging.config.dictConfig(
@@ -114,24 +114,24 @@ else:
         logger.info("Loaded env file at %s/.env", path)
         break
 
-FUNKWHALE_PLUGINS_PATH = env(
-    "FUNKWHALE_PLUGINS_PATH", default="/srv/funkwhale/plugins/"
+FUNQUAIL_PLUGINS_PATH = env(
+    "FUNQUAIL_PLUGINS_PATH", default="/srv/funkwhale/plugins/"
 )
 """
-Path to a directory containing Funkwhale plugins.
+Path to a directory containing FunQuail plugins.
 These are imported at runtime.
 """
-sys.path.append(FUNKWHALE_PLUGINS_PATH)
+sys.path.append(FUNQUAIL_PLUGINS_PATH)
 CORE_PLUGINS = [
     "funkwhale_api.contrib.scrobbler",
     "funkwhale_api.contrib.listenbrainz",
     "funkwhale_api.contrib.maloja",
 ]
 
-LOAD_CORE_PLUGINS = env.bool("FUNKWHALE_LOAD_CORE_PLUGINS", default=True)
-PLUGINS = [p for p in env.list("FUNKWHALE_PLUGINS", default=[]) if p]
+LOAD_CORE_PLUGINS = env.bool("FUNQUAIL_LOAD_CORE_PLUGINS", default=True)
+PLUGINS = [p for p in env.list("FUNQUAIL_PLUGINS", default=[]) if p]
 """
-List of Funkwhale plugins to load.
+List of FunQuail plugins to load.
 """
 if LOAD_CORE_PLUGINS:
     PLUGINS = CORE_PLUGINS + PLUGINS
@@ -149,40 +149,40 @@ from .. import plugins  # noqa
 plugins.startup.autodiscover([p + ".funkwhale_startup" for p in PLUGINS])
 DEPENDENCIES = plugins.trigger_filter(plugins.PLUGINS_DEPENDENCIES, [], enabled=True)
 plugins.install_dependencies(DEPENDENCIES)
-FUNKWHALE_HOSTNAME = None
-FUNKWHALE_HOSTNAME_SUFFIX = env("FUNKWHALE_HOSTNAME_SUFFIX", default=None)
-FUNKWHALE_HOSTNAME_PREFIX = env("FUNKWHALE_HOSTNAME_PREFIX", default=None)
-if FUNKWHALE_HOSTNAME_PREFIX and FUNKWHALE_HOSTNAME_SUFFIX:
+FUNQUAIL_HOSTNAME = None
+FUNQUAIL_HOSTNAME_SUFFIX = env("FUNQUAIL_HOSTNAME_SUFFIX", default=None)
+FUNQUAIL_HOSTNAME_PREFIX = env("FUNQUAIL_HOSTNAME_PREFIX", default=None)
+if FUNQUAIL_HOSTNAME_PREFIX and FUNQUAIL_HOSTNAME_SUFFIX:
     # We're in traefik case, in development
-    FUNKWHALE_HOSTNAME = "{}.{}".format(
-        FUNKWHALE_HOSTNAME_PREFIX, FUNKWHALE_HOSTNAME_SUFFIX
+    FUNQUAIL_HOSTNAME = "{}.{}".format(
+        FUNQUAIL_HOSTNAME_PREFIX, FUNQUAIL_HOSTNAME_SUFFIX
     )
-    FUNKWHALE_PROTOCOL = env("FUNKWHALE_PROTOCOL", default="https")
+    FUNQUAIL_PROTOCOL = env("FUNQUAIL_PROTOCOL", default="https")
 else:
     try:
-        FUNKWHALE_HOSTNAME = env("FUNKWHALE_HOSTNAME")
+        FUNQUAIL_HOSTNAME = env("FUNQUAIL_HOSTNAME")
         """
-        Hostname of your Funkwhale pod, e.g. ``mypod.audio``.
+        Hostname of your FunQuail pod, e.g. ``mypod.audio``.
         """
 
-        FUNKWHALE_PROTOCOL = env("FUNKWHALE_PROTOCOL", default="https")
+        FUNQUAIL_PROTOCOL = env("FUNQUAIL_PROTOCOL", default="https")
         """
         Protocol end users will use to access your pod, either
         ``http`` or ``https``.
         """
     except Exception:
-        FUNKWHALE_URL = env("FUNKWHALE_URL")
-        _parsed = urlsplit(FUNKWHALE_URL)
-        FUNKWHALE_HOSTNAME = _parsed.netloc
-        FUNKWHALE_PROTOCOL = _parsed.scheme
+        FUNQUAIL_URL = env("FUNQUAIL_URL")
+        _parsed = urlsplit(FUNQUAIL_URL)
+        FUNQUAIL_HOSTNAME = _parsed.netloc
+        FUNQUAIL_PROTOCOL = _parsed.scheme
 
-FUNKWHALE_PROTOCOL = FUNKWHALE_PROTOCOL.lower()
-FUNKWHALE_HOSTNAME = FUNKWHALE_HOSTNAME.lower()
-FUNKWHALE_URL = f"{FUNKWHALE_PROTOCOL}://{FUNKWHALE_HOSTNAME}"
-FUNKWHALE_SPA_HTML_ROOT = env("FUNKWHALE_SPA_HTML_ROOT", default=FUNKWHALE_URL)
+FUNQUAIL_PROTOCOL = FUNQUAIL_PROTOCOL.lower()
+FUNQUAIL_HOSTNAME = FUNQUAIL_HOSTNAME.lower()
+FUNQUAIL_URL = f"{FUNQUAIL_PROTOCOL}://{FUNQUAIL_HOSTNAME}"
+FUNQUAIL_SPA_HTML_ROOT = env("FUNQUAIL_SPA_HTML_ROOT", default=FUNQUAIL_URL)
 """
 URL or path to the Web Application files.
-Funkwhale needs access to it so that it can inject <meta> tags relevant
+FunQuail needs access to it so that it can inject <meta> tags relevant
 to the given page (e.g page title, cover, etc.).
 
 If a URL is specified, the index.html file will be fetched through HTTP.
@@ -193,20 +193,20 @@ Use something like ``/srv/funkwhale/front/dist/`` if the web processes shows
 request errors related to this.
 """
 
-FUNKWHALE_SPA_HTML_CACHE_DURATION = env.int(
-    "FUNKWHALE_SPA_HTML_CACHE_DURATION", default=60 * 15
+FUNQUAIL_SPA_HTML_CACHE_DURATION = env.int(
+    "FUNQUAIL_SPA_HTML_CACHE_DURATION", default=60 * 15
 )
-FUNKWHALE_EMBED_URL = env("FUNKWHALE_EMBED_URL", default=FUNKWHALE_URL + "/embed.html")
-FUNKWHALE_SPA_REWRITE_MANIFEST = env.bool(
-    "FUNKWHALE_SPA_REWRITE_MANIFEST", default=True
+FUNQUAIL_EMBED_URL = env("FUNQUAIL_EMBED_URL", default=FUNQUAIL_URL + "/embed.html")
+FUNQUAIL_SPA_REWRITE_MANIFEST = env.bool(
+    "FUNQUAIL_SPA_REWRITE_MANIFEST", default=True
 )
-FUNKWHALE_SPA_REWRITE_MANIFEST_URL = env.bool(
-    "FUNKWHALE_SPA_REWRITE_MANIFEST_URL", default=None
+FUNQUAIL_SPA_REWRITE_MANIFEST_URL = env.bool(
+    "FUNQUAIL_SPA_REWRITE_MANIFEST_URL", default=None
 )
 
-APP_NAME = "Funkwhale"
+APP_NAME = "FunQuail"
 
-FEDERATION_HOSTNAME = env("FEDERATION_HOSTNAME", default=FUNKWHALE_HOSTNAME).lower()
+FEDERATION_HOSTNAME = env("FEDERATION_HOSTNAME", default=FUNQUAIL_HOSTNAME).lower()
 FEDERATION_SERVICE_ACTOR_USERNAME = env(
     "FEDERATION_SERVICE_ACTOR_USERNAME", default="service"
 )
@@ -219,9 +219,9 @@ actor or channel.
 More pages means more content will be loaded, but will require more resources.
 """
 
-ALLOWED_HOSTS = env.list("DJANGO_ALLOWED_HOSTS", default=[]) + [FUNKWHALE_HOSTNAME]
+ALLOWED_HOSTS = env.list("DJANGO_ALLOWED_HOSTS", default=[]) + [FUNQUAIL_HOSTNAME]
 """
-List of allowed hostnames for which the Funkwhale server will answer.
+List of allowed hostnames for which the FunQuail server will answer.
 """
 
 # APP CONFIGURATION
@@ -286,7 +286,7 @@ LOCAL_APPS = (
 
 ADDITIONAL_APPS = env.list("ADDITIONAL_APPS", default=[])
 """
-List of Django apps to load in addition to Funkwhale plugins and apps.
+List of Django apps to load in addition to FunQuail plugins and apps.
 """
 INSTALLED_APPS = (
     LOCAL_APPS
@@ -341,11 +341,11 @@ FIXTURE_DIRS = (str(APPS_DIR.path("fixtures")),)
 # EMAIL
 # ------------------------------------------------------------------------------
 DEFAULT_FROM_EMAIL = env(
-    "DEFAULT_FROM_EMAIL", default=f"Funkwhale <noreply@{FUNKWHALE_HOSTNAME}>"
+    "DEFAULT_FROM_EMAIL", default=f"FunQuail <noreply@{FUNQUAIL_HOSTNAME}>"
 )
 """
 The name and email address used to send system emails.
-Defaults to ``Funkwhale <noreply@yourdomain>``.
+Defaults to ``FunQuail <noreply@yourdomain>``.
 
 Available formats:
 
@@ -353,7 +353,7 @@ Available formats:
 - ``<Email address>``
 
 """
-EMAIL_SUBJECT_PREFIX = env("EMAIL_SUBJECT_PREFIX", default="[Funkwhale] ")
+EMAIL_SUBJECT_PREFIX = env("EMAIL_SUBJECT_PREFIX", default="[FunQuail] ")
 """
 Subject prefix for system emails.
 """
@@ -542,7 +542,7 @@ STATIC_ROOT = env("STATIC_ROOT", default=str(ROOT_DIR("staticfiles")))
 The path where static files are collected.
 """
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#static-url
-STATIC_URL = env("STATIC_URL", default=FUNKWHALE_URL + "/staticfiles/")
+STATIC_URL = env("STATIC_URL", default=FUNQUAIL_URL + "/staticfiles/")
 DEFAULT_FILE_STORAGE = "funkwhale_api.common.storage.ASCIIFileSystemStorage"
 
 PROXY_MEDIA = env.bool("PROXY_MEDIA", default=True)
@@ -652,10 +652,10 @@ The path where you store media files (such as album covers or audio tracks)
 on your system. Make sure this directory actually exists.
 """
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#media-url
-MEDIA_URL = env("MEDIA_URL", default=FUNKWHALE_URL + "/media/")
+MEDIA_URL = env("MEDIA_URL", default=FUNQUAIL_URL + "/media/")
 """
 The URL from which your pod serves media files. Change this if you're hosting media
-files on a separate domain, or if you host Funkwhale on a non-standard port.
+files on a separate domain, or if you host FunQuail on a non-standard port.
 """
 FILE_UPLOAD_PERMISSIONS = 0o644
 
@@ -663,7 +663,7 @@ ATTACHMENTS_UNATTACHED_PRUNE_DELAY = env.int(
     "ATTACHMENTS_UNATTACHED_PRUNE_DELAY", default=3600 * 24
 )
 """
-The delay in seconds before Funkwhale prunes uploaded but detached attachments
+The delay in seconds before FunQuail prunes uploaded but detached attachments
 from the system.
 """
 
@@ -991,7 +991,7 @@ Validators include password length, common words, similarity with username.
 """
 if DISABLE_PASSWORD_VALIDATORS:
     AUTH_PASSWORD_VALIDATORS = []
-ACCOUNT_ADAPTER = "funkwhale_api.users.adapters.FunkwhaleAccountAdapter"
+ACCOUNT_ADAPTER = "funkwhale_api.users.adapters.FunQuailAccountAdapter"
 CORS_ORIGIN_ALLOW_ALL = True
 # CORS_ORIGIN_WHITELIST = (
 #     'localhost',
@@ -1000,7 +1000,7 @@ CORS_ORIGIN_ALLOW_ALL = True
 CORS_ALLOW_CREDENTIALS = True
 
 REST_FRAMEWORK = {
-    "DEFAULT_PAGINATION_CLASS": "funkwhale_api.common.pagination.FunkwhalePagination",
+    "DEFAULT_PAGINATION_CLASS": "funkwhale_api.common.pagination.FunQuailPagination",
     "PAGE_SIZE": 25,
     "DEFAULT_PARSER_CLASSES": (
         "rest_framework.parsers.JSONParser",
@@ -1034,7 +1034,7 @@ of the service, especially on public pods .
 if THROTTLING_ENABLED:
     REST_FRAMEWORK["DEFAULT_THROTTLE_CLASSES"] = env.list(
         "THROTTLE_CLASSES",
-        default=["funkwhale_api.common.throttling.FunkwhaleThrottle"],
+        default=["funkwhale_api.common.throttling.FunQuailThrottle"],
     )
 
 THROTTLING_SCOPES = {
@@ -1296,7 +1296,7 @@ Default timeout for external requests.
 
 MUSIC_DIRECTORY_PATH = env("MUSIC_DIRECTORY_PATH", default=None)
 """
-The path on your server where Funkwhale places
+The path on your server where FunQuail places
 files from in-place imports. This path needs to be
 readable by the webserver and ``api`` and ``worker``
 processes.
@@ -1408,9 +1408,9 @@ INSTANCE_SUPPORT_MESSAGE_DELAY = env.int("INSTANCE_SUPPORT_MESSAGE_DELAY", defau
 The number of days before your pod shows the "support your pod" message.
 The timer starts after the user signs up.
 """
-FUNKWHALE_SUPPORT_MESSAGE_DELAY = env.int("FUNKWHALE_SUPPORT_MESSAGE_DELAY", default=15)
+FUNQUAIL_SUPPORT_MESSAGE_DELAY = env.int("FUNQUAIL_SUPPORT_MESSAGE_DELAY", default=15)
 """
-The number of days before your pod shows the "support Funkwhale" message.
+The number of days before your pod shows the "support FunQuail" message.
 The timer starts after the user signs up.
 """
 
@@ -1466,7 +1466,7 @@ IGNORE_FORWARDED_HOST_AND_PROTO = env.bool(
     "IGNORE_FORWARDED_HOST_AND_PROTO", default=True
 )
 """
-Use :attr:`FUNKWHALE_HOSTNAME` and :attr:`FUNKWHALE_PROTOCOL`
+Use :attr:`FUNQUAIL_HOSTNAME` and :attr:`FUNQUAIL_PROTOCOL`
 instead of request header.
 """
 
diff --git a/api/config/settings/local.py b/api/config/settings/local.py
index b1dc93f19..1a620145f 100644
--- a/api/config/settings/local.py
+++ b/api/config/settings/local.py
@@ -100,7 +100,7 @@ CSRF_TRUSTED_ORIGINS = [o for o in ALLOWED_HOSTS]
 
 REST_FRAMEWORK["DEFAULT_SCHEMA_CLASS"] = "funkwhale_api.schema.CustomAutoSchema"
 SPECTACULAR_SETTINGS = {
-    "TITLE": "Funkwhale API",
+    "TITLE": "FunQuail API",
     "DESCRIPTION": open("Readme.md").read(),
     "VERSION": funkwhale_version,
     "SCHEMA_PATH_PREFIX": "/api/(v[0-9])?",
@@ -112,7 +112,7 @@ SPECTACULAR_SETTINGS = {
     "SERVERS": [
         {"url": "https://demo.funkwhale.audio", "description": "Demo Server"},
         {
-            "url": "https://funkwhale.audio",
+            "url": "https://funquail.laidback.moe",
             "description": "Read server with real content",
         },
         {
@@ -121,7 +121,7 @@ SPECTACULAR_SETTINGS = {
             "variables": {
                 "domain": {
                     "default": "yourdomain",
-                    "description": "Your Funkwhale Domain",
+                    "description": "Your FunQuail Domain",
                 },
                 "protocol": {"enum": ["http", "https"], "default": "https"},
             },
diff --git a/api/config/settings/testing.py b/api/config/settings/testing.py
index ab763b84d..9ff44917e 100644
--- a/api/config/settings/testing.py
+++ b/api/config/settings/testing.py
@@ -1,6 +1,6 @@
 import os
 
-os.environ.setdefault("FUNKWHALE_URL", "http://funkwhale.dev")
+os.environ.setdefault("FUNQUAIL_URL", "http://funkwhale.dev")
 
 from .common import *  # noqa
 
diff --git a/api/config/urls/api.py b/api/config/urls/api.py
index fd33e26cb..90814fc71 100644
--- a/api/config/urls/api.py
+++ b/api/config/urls/api.py
@@ -70,7 +70,7 @@ v1_patterns += [
         r"^",
         include(("funkwhale_api.users.api_urls", "users"), namespace="users"),
     ),
-    # XXX: remove if Funkwhale 1.1
+    # XXX: remove if FunQuail 1.1
     url(
         r"^users/",
         include(("funkwhale_api.users.api_urls", "users"), namespace="users-nested"),
diff --git a/api/docker/server.sh b/api/docker/server.sh
index 50ec5f7b7..8ef200dbb 100755
--- a/api/docker/server.sh
+++ b/api/docker/server.sh
@@ -7,7 +7,7 @@ funkwhale-manage migrate
 
 # shellcheck disable=SC2086
 exec gunicorn config.asgi:application \
-    --workers "${FUNKWHALE_WEB_WORKERS-1}" \
+    --workers "${FUNQUAIL_WEB_WORKERS-1}" \
     --worker-class uvicorn.workers.UvicornWorker \
     --bind 0.0.0.0:5000 \
     ${GUNICORN_ARGS-}
diff --git a/api/funkwhale_api/__init__.py b/api/funquail_api/__init__.py
similarity index 100%
rename from api/funkwhale_api/__init__.py
rename to api/funquail_api/__init__.py
diff --git a/api/funkwhale_api/activity/__init__.py b/api/funquail_api/activity/__init__.py
similarity index 100%
rename from api/funkwhale_api/activity/__init__.py
rename to api/funquail_api/activity/__init__.py
diff --git a/api/funkwhale_api/activity/apps.py b/api/funquail_api/activity/apps.py
similarity index 100%
rename from api/funkwhale_api/activity/apps.py
rename to api/funquail_api/activity/apps.py
diff --git a/api/funkwhale_api/activity/record.py b/api/funquail_api/activity/record.py
similarity index 100%
rename from api/funkwhale_api/activity/record.py
rename to api/funquail_api/activity/record.py
diff --git a/api/funkwhale_api/activity/serializers.py b/api/funquail_api/activity/serializers.py
similarity index 100%
rename from api/funkwhale_api/activity/serializers.py
rename to api/funquail_api/activity/serializers.py
diff --git a/api/funkwhale_api/activity/utils.py b/api/funquail_api/activity/utils.py
similarity index 100%
rename from api/funkwhale_api/activity/utils.py
rename to api/funquail_api/activity/utils.py
diff --git a/api/funkwhale_api/activity/views.py b/api/funquail_api/activity/views.py
similarity index 100%
rename from api/funkwhale_api/activity/views.py
rename to api/funquail_api/activity/views.py
diff --git a/api/funkwhale_api/audio/__init__.py b/api/funquail_api/audio/__init__.py
similarity index 100%
rename from api/funkwhale_api/audio/__init__.py
rename to api/funquail_api/audio/__init__.py
diff --git a/api/funkwhale_api/audio/admin.py b/api/funquail_api/audio/admin.py
similarity index 100%
rename from api/funkwhale_api/audio/admin.py
rename to api/funquail_api/audio/admin.py
diff --git a/api/funkwhale_api/audio/categories.py b/api/funquail_api/audio/categories.py
similarity index 100%
rename from api/funkwhale_api/audio/categories.py
rename to api/funquail_api/audio/categories.py
diff --git a/api/funkwhale_api/audio/dynamic_preferences_registry.py b/api/funquail_api/audio/dynamic_preferences_registry.py
similarity index 100%
rename from api/funkwhale_api/audio/dynamic_preferences_registry.py
rename to api/funquail_api/audio/dynamic_preferences_registry.py
diff --git a/api/funkwhale_api/audio/factories.py b/api/funquail_api/audio/factories.py
similarity index 100%
rename from api/funkwhale_api/audio/factories.py
rename to api/funquail_api/audio/factories.py
diff --git a/api/funkwhale_api/audio/filters.py b/api/funquail_api/audio/filters.py
similarity index 100%
rename from api/funkwhale_api/audio/filters.py
rename to api/funquail_api/audio/filters.py
diff --git a/api/funkwhale_api/audio/migrations/0001_initial.py b/api/funquail_api/audio/migrations/0001_initial.py
similarity index 100%
rename from api/funkwhale_api/audio/migrations/0001_initial.py
rename to api/funquail_api/audio/migrations/0001_initial.py
diff --git a/api/funkwhale_api/audio/migrations/0002_channel_metadata.py b/api/funquail_api/audio/migrations/0002_channel_metadata.py
similarity index 100%
rename from api/funkwhale_api/audio/migrations/0002_channel_metadata.py
rename to api/funquail_api/audio/migrations/0002_channel_metadata.py
diff --git a/api/funkwhale_api/audio/migrations/0003_channel_rss_url.py b/api/funquail_api/audio/migrations/0003_channel_rss_url.py
similarity index 100%
rename from api/funkwhale_api/audio/migrations/0003_channel_rss_url.py
rename to api/funquail_api/audio/migrations/0003_channel_rss_url.py
diff --git a/api/funkwhale_api/audio/migrations/0004_alter_channel_metadata.py b/api/funquail_api/audio/migrations/0004_alter_channel_metadata.py
similarity index 100%
rename from api/funkwhale_api/audio/migrations/0004_alter_channel_metadata.py
rename to api/funquail_api/audio/migrations/0004_alter_channel_metadata.py
diff --git a/api/funkwhale_api/audio/migrations/__init__.py b/api/funquail_api/audio/migrations/__init__.py
similarity index 100%
rename from api/funkwhale_api/audio/migrations/__init__.py
rename to api/funquail_api/audio/migrations/__init__.py
diff --git a/api/funkwhale_api/audio/models.py b/api/funquail_api/audio/models.py
similarity index 100%
rename from api/funkwhale_api/audio/models.py
rename to api/funquail_api/audio/models.py
diff --git a/api/funkwhale_api/audio/renderers.py b/api/funquail_api/audio/renderers.py
similarity index 100%
rename from api/funkwhale_api/audio/renderers.py
rename to api/funquail_api/audio/renderers.py
diff --git a/api/funkwhale_api/audio/serializers.py b/api/funquail_api/audio/serializers.py
similarity index 100%
rename from api/funkwhale_api/audio/serializers.py
rename to api/funquail_api/audio/serializers.py
diff --git a/api/funkwhale_api/audio/spa_views.py b/api/funquail_api/audio/spa_views.py
similarity index 96%
rename from api/funkwhale_api/audio/spa_views.py
rename to api/funquail_api/audio/spa_views.py
index 2be4e4c87..1ca0cfe09 100644
--- a/api/funkwhale_api/audio/spa_views.py
+++ b/api/funquail_api/audio/spa_views.py
@@ -25,7 +25,7 @@ def channel_detail(query, redirect_to_ap):
         raise middleware.ApiRedirect(obj.actor.fid)
 
     obj_url = utils.join_url(
-        settings.FUNKWHALE_URL,
+        settings.FUNQUAIL_URL,
         utils.spa_reverse(
             "channel_detail", kwargs={"username": obj.actor.full_username}
         ),
@@ -72,7 +72,7 @@ def channel_detail(query, redirect_to_ap):
                 "rel": "alternate",
                 "type": "application/json+oembed",
                 "href": (
-                    utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
+                    utils.join_url(settings.FUNQUAIL_URL, reverse("api:v1:oembed"))
                     + f"?format=json&url={urllib.parse.quote_plus(obj_url)}"
                 ),
             }
diff --git a/api/funkwhale_api/audio/tasks.py b/api/funquail_api/audio/tasks.py
similarity index 100%
rename from api/funkwhale_api/audio/tasks.py
rename to api/funquail_api/audio/tasks.py
diff --git a/api/funkwhale_api/audio/views.py b/api/funquail_api/audio/views.py
similarity index 99%
rename from api/funkwhale_api/audio/views.py
rename to api/funquail_api/audio/views.py
index 83a3b6f1f..3333e26a5 100644
--- a/api/funkwhale_api/audio/views.py
+++ b/api/funquail_api/audio/views.py
@@ -116,7 +116,7 @@ class ChannelViewSet(
             opml = serializers.get_opml(
                 channels=queryset,
                 date=timezone.now(),
-                title="Funkwhale channels OPML export",
+                title="FunQuail channels OPML export",
             )
             xml_body = renderers.render_xml(renderers.dict_to_xml_tree("opml", opml))
             return http.HttpResponse(xml_body, content_type="application/xml")
diff --git a/api/funkwhale_api/cli/__init__.py b/api/funquail_api/cli/__init__.py
similarity index 100%
rename from api/funkwhale_api/cli/__init__.py
rename to api/funquail_api/cli/__init__.py
diff --git a/api/funkwhale_api/cli/base.py b/api/funquail_api/cli/base.py
similarity index 100%
rename from api/funkwhale_api/cli/base.py
rename to api/funquail_api/cli/base.py
diff --git a/api/funkwhale_api/cli/library.py b/api/funquail_api/cli/library.py
similarity index 100%
rename from api/funkwhale_api/cli/library.py
rename to api/funquail_api/cli/library.py
diff --git a/api/funkwhale_api/cli/main.py b/api/funquail_api/cli/main.py
similarity index 100%
rename from api/funkwhale_api/cli/main.py
rename to api/funquail_api/cli/main.py
diff --git a/api/funkwhale_api/cli/media.py b/api/funquail_api/cli/media.py
similarity index 100%
rename from api/funkwhale_api/cli/media.py
rename to api/funquail_api/cli/media.py
diff --git a/api/funkwhale_api/cli/plugins.py b/api/funquail_api/cli/plugins.py
similarity index 91%
rename from api/funkwhale_api/cli/plugins.py
rename to api/funquail_api/cli/plugins.py
index bcc10786f..1d42dfd6a 100644
--- a/api/funkwhale_api/cli/plugins.py
+++ b/api/funquail_api/cli/plugins.py
@@ -24,7 +24,7 @@ def install(plugin):
         return click.echo("No plugin provided")
 
     click.echo("Installing plugins…")
-    pip_install(list(plugin), settings.FUNKWHALE_PLUGINS_PATH)
+    pip_install(list(plugin), settings.FUNQUAIL_PLUGINS_PATH)
 
 
 def pip_install(deps, target):
diff --git a/api/funkwhale_api/cli/users.py b/api/funquail_api/cli/users.py
similarity index 98%
rename from api/funkwhale_api/cli/users.py
rename to api/funquail_api/cli/users.py
index c9c7aaa47..53054b587 100644
--- a/api/funkwhale_api/cli/users.py
+++ b/api/funquail_api/cli/users.py
@@ -133,7 +133,7 @@ def users():
     "--password",
     prompt="Password (leave empty to have a random one generated)",
     hide_input=True,
-    envvar="FUNKWHALE_CLI_USER_PASSWORD",
+    envvar="FUNQUAIL_CLI_USER_PASSWORD",
     default="",
     help="If empty, a random password will be generated and displayed in console output",
 )
@@ -207,7 +207,7 @@ def delete(username, hard):
 @click.option("--permission-library/--no-permission-library", default=None)
 @click.option("--permission-moderation/--no-permission-moderation", default=None)
 @click.option("--permission-settings/--no-permission-settings", default=None)
-@click.option("--password", default=None, envvar="FUNKWHALE_CLI_USER_UPDATE_PASSWORD")
+@click.option("--password", default=None, envvar="FUNQUAIL_CLI_USER_UPDATE_PASSWORD")
 @click.option(
     "-q",
     "--upload-quota",
diff --git a/api/funkwhale_api/cli/utils.py b/api/funquail_api/cli/utils.py
similarity index 100%
rename from api/funkwhale_api/cli/utils.py
rename to api/funquail_api/cli/utils.py
diff --git a/api/funkwhale_api/common/__init__.py b/api/funquail_api/common/__init__.py
similarity index 100%
rename from api/funkwhale_api/common/__init__.py
rename to api/funquail_api/common/__init__.py
diff --git a/api/funkwhale_api/common/admin.py b/api/funquail_api/common/admin.py
similarity index 100%
rename from api/funkwhale_api/common/admin.py
rename to api/funquail_api/common/admin.py
diff --git a/api/funkwhale_api/common/apps.py b/api/funquail_api/common/apps.py
similarity index 100%
rename from api/funkwhale_api/common/apps.py
rename to api/funquail_api/common/apps.py
diff --git a/api/funkwhale_api/common/authentication.py b/api/funquail_api/common/authentication.py
similarity index 100%
rename from api/funkwhale_api/common/authentication.py
rename to api/funquail_api/common/authentication.py
diff --git a/api/funkwhale_api/common/cache.py b/api/funquail_api/common/cache.py
similarity index 100%
rename from api/funkwhale_api/common/cache.py
rename to api/funquail_api/common/cache.py
diff --git a/api/funkwhale_api/common/channels.py b/api/funquail_api/common/channels.py
similarity index 100%
rename from api/funkwhale_api/common/channels.py
rename to api/funquail_api/common/channels.py
diff --git a/api/funkwhale_api/common/consumers.py b/api/funquail_api/common/consumers.py
similarity index 100%
rename from api/funkwhale_api/common/consumers.py
rename to api/funquail_api/common/consumers.py
diff --git a/api/funkwhale_api/common/decorators.py b/api/funquail_api/common/decorators.py
similarity index 100%
rename from api/funkwhale_api/common/decorators.py
rename to api/funquail_api/common/decorators.py
diff --git a/api/funkwhale_api/common/dynamic_preferences_registry.py b/api/funquail_api/common/dynamic_preferences_registry.py
similarity index 100%
rename from api/funkwhale_api/common/dynamic_preferences_registry.py
rename to api/funquail_api/common/dynamic_preferences_registry.py
diff --git a/api/funkwhale_api/common/factories.py b/api/funquail_api/common/factories.py
similarity index 100%
rename from api/funkwhale_api/common/factories.py
rename to api/funquail_api/common/factories.py
diff --git a/api/funkwhale_api/common/fields.py b/api/funquail_api/common/fields.py
similarity index 100%
rename from api/funkwhale_api/common/fields.py
rename to api/funquail_api/common/fields.py
diff --git a/api/funkwhale_api/common/filters.py b/api/funquail_api/common/filters.py
similarity index 100%
rename from api/funkwhale_api/common/filters.py
rename to api/funquail_api/common/filters.py
diff --git a/api/funkwhale_api/common/locales.py b/api/funquail_api/common/locales.py
similarity index 100%
rename from api/funkwhale_api/common/locales.py
rename to api/funquail_api/common/locales.py
diff --git a/api/funkwhale_api/common/management/__init__.py b/api/funquail_api/common/management/__init__.py
similarity index 100%
rename from api/funkwhale_api/common/management/__init__.py
rename to api/funquail_api/common/management/__init__.py
diff --git a/api/funkwhale_api/common/management/commands/__init__.py b/api/funquail_api/common/management/commands/__init__.py
similarity index 100%
rename from api/funkwhale_api/common/management/commands/__init__.py
rename to api/funquail_api/common/management/commands/__init__.py
diff --git a/api/funkwhale_api/common/management/commands/createsuperuser.py b/api/funquail_api/common/management/commands/createsuperuser.py
similarity index 88%
rename from api/funkwhale_api/common/management/commands/createsuperuser.py
rename to api/funquail_api/common/management/commands/createsuperuser.py
index 49a59753f..58d9f5fcc 100644
--- a/api/funkwhale_api/common/management/commands/createsuperuser.py
+++ b/api/funquail_api/common/management/commands/createsuperuser.py
@@ -14,7 +14,7 @@ class Command(BaseCommand):
         """
         if not os.environ.get("FORCE") == "1":
             raise CommandError(
-                "Running createsuperuser on your Funkwhale instance bypasses some of our checks "
+                "Running createsuperuser on your FunQuail instance bypasses some of our checks "
                 "which can lead to unexpected behavior of your instance. We therefore suggest to "
                 "run `funkwhale-manage fw users create --superuser` instead."
             )
diff --git a/api/funkwhale_api/common/management/commands/gitpod.py b/api/funquail_api/common/management/commands/gitpod.py
similarity index 96%
rename from api/funkwhale_api/common/management/commands/gitpod.py
rename to api/funquail_api/common/management/commands/gitpod.py
index 3887c7f3c..c07d44c56 100644
--- a/api/funkwhale_api/common/management/commands/gitpod.py
+++ b/api/funquail_api/common/management/commands/gitpod.py
@@ -32,7 +32,7 @@ class Command(BaseCommand):
         self.stdout.write("")
         self.stdout.write("Available commands:")
         self.stdout.write("init - Initialize gitpod workspace")
-        self.stdout.write("dev - Run Funkwhale in development mode with debug server")
+        self.stdout.write("dev - Run FunQuail in development mode with debug server")
         self.stdout.write("")
 
     def init(self):
diff --git a/api/funkwhale_api/common/management/commands/inplace_to_s3.py b/api/funquail_api/common/management/commands/inplace_to_s3.py
similarity index 100%
rename from api/funkwhale_api/common/management/commands/inplace_to_s3.py
rename to api/funquail_api/common/management/commands/inplace_to_s3.py
diff --git a/api/funkwhale_api/common/management/commands/load_test_data.py b/api/funquail_api/common/management/commands/load_test_data.py
similarity index 100%
rename from api/funkwhale_api/common/management/commands/load_test_data.py
rename to api/funquail_api/common/management/commands/load_test_data.py
diff --git a/api/funkwhale_api/common/management/commands/makemigrations.py b/api/funquail_api/common/management/commands/makemigrations.py
similarity index 88%
rename from api/funkwhale_api/common/management/commands/makemigrations.py
rename to api/funquail_api/common/management/commands/makemigrations.py
index f8530f1a7..8e61f5b27 100644
--- a/api/funkwhale_api/common/management/commands/makemigrations.py
+++ b/api/funquail_api/common/management/commands/makemigrations.py
@@ -14,7 +14,7 @@ class Command(BaseCommand):
         force = os.environ.get("FORCE") == "1"
         if not force:
             raise CommandError(
-                "Running makemigrations on your Funkwhale instance can have desastrous"
+                "Running makemigrations on your FunQuail instance can have desastrous"
                 " consequences. This command is disabled, and should only be run in "
                 "development environments."
             )
diff --git a/api/funkwhale_api/common/management/commands/migrate.py b/api/funquail_api/common/management/commands/migrate.py
similarity index 100%
rename from api/funkwhale_api/common/management/commands/migrate.py
rename to api/funquail_api/common/management/commands/migrate.py
diff --git a/api/funkwhale_api/common/management/commands/script.py b/api/funquail_api/common/management/commands/script.py
similarity index 100%
rename from api/funkwhale_api/common/management/commands/script.py
rename to api/funquail_api/common/management/commands/script.py
diff --git a/api/funkwhale_api/common/management/commands/testdata.py b/api/funquail_api/common/management/commands/testdata.py
similarity index 100%
rename from api/funkwhale_api/common/management/commands/testdata.py
rename to api/funquail_api/common/management/commands/testdata.py
diff --git a/api/funkwhale_api/common/middleware.py b/api/funquail_api/common/middleware.py
similarity index 97%
rename from api/funkwhale_api/common/middleware.py
rename to api/funquail_api/common/middleware.py
index 63ba1b378..d0944e5d4 100644
--- a/api/funkwhale_api/common/middleware.py
+++ b/api/funquail_api/common/middleware.py
@@ -31,11 +31,11 @@ def should_fallback_to_spa(path):
 
 
 def serve_spa(request):
-    html = get_spa_html(settings.FUNKWHALE_SPA_HTML_ROOT)
+    html = get_spa_html(settings.FUNQUAIL_SPA_HTML_ROOT)
     head, tail = html.split("</head>", 1)
-    if settings.FUNKWHALE_SPA_REWRITE_MANIFEST:
+    if settings.FUNQUAIL_SPA_REWRITE_MANIFEST:
         new_url = (
-            settings.FUNKWHALE_SPA_REWRITE_MANIFEST_URL
+            settings.FUNQUAIL_SPA_REWRITE_MANIFEST_URL
             or federation_utils.full_url(urls.reverse("api:v1:instance:spa-manifest"))
         )
         title = preferences.get("instance__name")
@@ -128,7 +128,7 @@ def get_spa_file(spa_url, name):
     response.raise_for_status()
     response.encoding = "utf-8"
     content = response.text
-    caches["local"].set(cache_key, content, settings.FUNKWHALE_SPA_HTML_CACHE_DURATION)
+    caches["local"].set(cache_key, content, settings.FUNQUAIL_SPA_HTML_CACHE_DURATION)
     return content
 
 
@@ -151,13 +151,13 @@ def get_default_head_tags(path):
             "tag": "meta",
             "property": "og:image",
             "content": utils.join_url(
-                settings.FUNKWHALE_URL, "/android-chrome-512x512.png"
+                settings.FUNQUAIL_URL, "/android-chrome-512x512.png"
             ),
         },
         {
             "tag": "meta",
             "property": "og:url",
-            "content": utils.join_url(settings.FUNKWHALE_URL, path),
+            "content": utils.join_url(settings.FUNQUAIL_URL, path),
         },
     ]
 
diff --git a/api/funkwhale_api/common/migrations/0001_initial.py b/api/funquail_api/common/migrations/0001_initial.py
similarity index 100%
rename from api/funkwhale_api/common/migrations/0001_initial.py
rename to api/funquail_api/common/migrations/0001_initial.py
diff --git a/api/funkwhale_api/common/migrations/0002_mutation.py b/api/funquail_api/common/migrations/0002_mutation.py
similarity index 100%
rename from api/funkwhale_api/common/migrations/0002_mutation.py
rename to api/funquail_api/common/migrations/0002_mutation.py
diff --git a/api/funkwhale_api/common/migrations/0003_cit_extension.py b/api/funquail_api/common/migrations/0003_cit_extension.py
similarity index 100%
rename from api/funkwhale_api/common/migrations/0003_cit_extension.py
rename to api/funquail_api/common/migrations/0003_cit_extension.py
diff --git a/api/funkwhale_api/common/migrations/0004_auto_20191111_1338.py b/api/funquail_api/common/migrations/0004_auto_20191111_1338.py
similarity index 100%
rename from api/funkwhale_api/common/migrations/0004_auto_20191111_1338.py
rename to api/funquail_api/common/migrations/0004_auto_20191111_1338.py
diff --git a/api/funkwhale_api/common/migrations/0005_auto_20191125_1421.py b/api/funquail_api/common/migrations/0005_auto_20191125_1421.py
similarity index 100%
rename from api/funkwhale_api/common/migrations/0005_auto_20191125_1421.py
rename to api/funquail_api/common/migrations/0005_auto_20191125_1421.py
diff --git a/api/funkwhale_api/common/migrations/0006_content.py b/api/funquail_api/common/migrations/0006_content.py
similarity index 100%
rename from api/funkwhale_api/common/migrations/0006_content.py
rename to api/funquail_api/common/migrations/0006_content.py
diff --git a/api/funkwhale_api/common/migrations/0007_auto_20200116_1610.py b/api/funquail_api/common/migrations/0007_auto_20200116_1610.py
similarity index 100%
rename from api/funkwhale_api/common/migrations/0007_auto_20200116_1610.py
rename to api/funquail_api/common/migrations/0007_auto_20200116_1610.py
diff --git a/api/funkwhale_api/common/migrations/0008_auto_20200701_1317.py b/api/funquail_api/common/migrations/0008_auto_20200701_1317.py
similarity index 100%
rename from api/funkwhale_api/common/migrations/0008_auto_20200701_1317.py
rename to api/funquail_api/common/migrations/0008_auto_20200701_1317.py
diff --git a/api/funkwhale_api/common/migrations/0009_auto_20220627_1915.py b/api/funquail_api/common/migrations/0009_auto_20220627_1915.py
similarity index 100%
rename from api/funkwhale_api/common/migrations/0009_auto_20220627_1915.py
rename to api/funquail_api/common/migrations/0009_auto_20220627_1915.py
diff --git a/api/funkwhale_api/common/migrations/__init__.py b/api/funquail_api/common/migrations/__init__.py
similarity index 100%
rename from api/funkwhale_api/common/migrations/__init__.py
rename to api/funquail_api/common/migrations/__init__.py
diff --git a/api/funkwhale_api/common/mixins.py b/api/funquail_api/common/mixins.py
similarity index 100%
rename from api/funkwhale_api/common/mixins.py
rename to api/funquail_api/common/mixins.py
diff --git a/api/funkwhale_api/common/models.py b/api/funquail_api/common/models.py
similarity index 100%
rename from api/funkwhale_api/common/models.py
rename to api/funquail_api/common/models.py
diff --git a/api/funkwhale_api/common/mutations.py b/api/funquail_api/common/mutations.py
similarity index 100%
rename from api/funkwhale_api/common/mutations.py
rename to api/funquail_api/common/mutations.py
diff --git a/api/funkwhale_api/common/pagination.py b/api/funquail_api/common/pagination.py
similarity index 94%
rename from api/funkwhale_api/common/pagination.py
rename to api/funquail_api/common/pagination.py
index ec7c27dc4..5c24fcb85 100644
--- a/api/funkwhale_api/common/pagination.py
+++ b/api/funquail_api/common/pagination.py
@@ -1,7 +1,7 @@
 from rest_framework.pagination import PageNumberPagination, _positive_int
 
 
-class FunkwhalePagination(PageNumberPagination):
+class FunQuailPagination(PageNumberPagination):
     page_size_query_param = "page_size"
     default_max_page_size = 50
     default_page_size = None
diff --git a/api/funkwhale_api/common/permissions.py b/api/funquail_api/common/permissions.py
similarity index 100%
rename from api/funkwhale_api/common/permissions.py
rename to api/funquail_api/common/permissions.py
diff --git a/api/funkwhale_api/common/preferences.py b/api/funquail_api/common/preferences.py
similarity index 100%
rename from api/funkwhale_api/common/preferences.py
rename to api/funquail_api/common/preferences.py
diff --git a/api/funkwhale_api/common/renderers.py b/api/funquail_api/common/renderers.py
similarity index 100%
rename from api/funkwhale_api/common/renderers.py
rename to api/funquail_api/common/renderers.py
diff --git a/api/funkwhale_api/common/routers.py b/api/funquail_api/common/routers.py
similarity index 100%
rename from api/funkwhale_api/common/routers.py
rename to api/funquail_api/common/routers.py
diff --git a/api/funkwhale_api/common/scripts/__init__.py b/api/funquail_api/common/scripts/__init__.py
similarity index 100%
rename from api/funkwhale_api/common/scripts/__init__.py
rename to api/funquail_api/common/scripts/__init__.py
diff --git a/api/funkwhale_api/common/scripts/create_actors.py b/api/funquail_api/common/scripts/create_actors.py
similarity index 100%
rename from api/funkwhale_api/common/scripts/create_actors.py
rename to api/funquail_api/common/scripts/create_actors.py
diff --git a/api/funkwhale_api/common/scripts/create_image_variations.py b/api/funquail_api/common/scripts/create_image_variations.py
similarity index 100%
rename from api/funkwhale_api/common/scripts/create_image_variations.py
rename to api/funquail_api/common/scripts/create_image_variations.py
diff --git a/api/funkwhale_api/common/scripts/delete_pre_017_federated_uploads.py b/api/funquail_api/common/scripts/delete_pre_017_federated_uploads.py
similarity index 100%
rename from api/funkwhale_api/common/scripts/delete_pre_017_federated_uploads.py
rename to api/funquail_api/common/scripts/delete_pre_017_federated_uploads.py
diff --git a/api/funkwhale_api/common/scripts/django_permissions_to_user_permissions.py b/api/funquail_api/common/scripts/django_permissions_to_user_permissions.py
similarity index 100%
rename from api/funkwhale_api/common/scripts/django_permissions_to_user_permissions.py
rename to api/funquail_api/common/scripts/django_permissions_to_user_permissions.py
diff --git a/api/funkwhale_api/common/scripts/migrate_to_user_libraries.py b/api/funquail_api/common/scripts/migrate_to_user_libraries.py
similarity index 97%
rename from api/funkwhale_api/common/scripts/migrate_to_user_libraries.py
rename to api/funquail_api/common/scripts/migrate_to_user_libraries.py
index de6788eb2..d68093021 100644
--- a/api/funkwhale_api/common/scripts/migrate_to_user_libraries.py
+++ b/api/funquail_api/common/scripts/migrate_to_user_libraries.py
@@ -99,7 +99,7 @@ def update_orphan_uploads(open_api, stdout):
 def set_fid(queryset, path, stdout):
     model = queryset.model._meta.label
     qs = queryset.filter(fid=None)
-    base_url = f"{settings.FUNKWHALE_URL}{path}"
+    base_url = f"{settings.FUNQUAIL_URL}{path}"
     stdout.write(f"* Assigning federation ids to {model} entries (path: {base_url})")
     new_fid = functions.Concat(Value(base_url), F("uuid"), output_field=CharField())
     total = qs.update(fid=new_fid)
@@ -119,7 +119,7 @@ def generate_actor_urls(part, stdout):
     stdout.write(f"* Update {field} for local actors...")
 
     queryset = federation_models.Actor.objects.local().filter(**{field: None})
-    base_url = f"{settings.FUNKWHALE_URL}/federation/actors/"
+    base_url = f"{settings.FUNQUAIL_URL}/federation/actors/"
 
     new_field = functions.Concat(
         Value(base_url),
diff --git a/api/funkwhale_api/common/scripts/test.py b/api/funquail_api/common/scripts/test.py
similarity index 100%
rename from api/funkwhale_api/common/scripts/test.py
rename to api/funquail_api/common/scripts/test.py
diff --git a/api/funkwhale_api/common/search.py b/api/funquail_api/common/search.py
similarity index 100%
rename from api/funkwhale_api/common/search.py
rename to api/funquail_api/common/search.py
diff --git a/api/funkwhale_api/common/serializers.py b/api/funquail_api/common/serializers.py
similarity index 100%
rename from api/funkwhale_api/common/serializers.py
rename to api/funquail_api/common/serializers.py
diff --git a/api/funkwhale_api/common/session.py b/api/funquail_api/common/session.py
similarity index 78%
rename from api/funkwhale_api/common/session.py
rename to api/funquail_api/common/session.py
index 23fd28306..2d1d96a6d 100644
--- a/api/funkwhale_api/common/session.py
+++ b/api/funquail_api/common/session.py
@@ -4,7 +4,7 @@ from django.conf import settings
 import funkwhale_api
 
 
-class FunkwhaleSession(requests.Session):
+class FunQuailSession(requests.Session):
     def request(self, *args, **kwargs):
         kwargs.setdefault("verify", settings.EXTERNAL_REQUESTS_VERIFY_SSL)
         kwargs.setdefault("timeout", settings.EXTERNAL_REQUESTS_TIMEOUT)
@@ -13,11 +13,11 @@ class FunkwhaleSession(requests.Session):
 
 def get_user_agent():
     return "python-requests (funkwhale/{}; +{})".format(
-        funkwhale_api.__version__, settings.FUNKWHALE_URL
+        funkwhale_api.__version__, settings.FUNQUAIL_URL
     )
 
 
 def get_session():
-    s = FunkwhaleSession()
+    s = FunQuailSession()
     s.headers["User-Agent"] = get_user_agent()
     return s
diff --git a/api/funkwhale_api/common/signals.py b/api/funquail_api/common/signals.py
similarity index 100%
rename from api/funkwhale_api/common/signals.py
rename to api/funquail_api/common/signals.py
diff --git a/api/funkwhale_api/common/storage.py b/api/funquail_api/common/storage.py
similarity index 100%
rename from api/funkwhale_api/common/storage.py
rename to api/funquail_api/common/storage.py
diff --git a/api/funkwhale_api/common/tasks.py b/api/funquail_api/common/tasks.py
similarity index 100%
rename from api/funkwhale_api/common/tasks.py
rename to api/funquail_api/common/tasks.py
diff --git a/api/funkwhale_api/common/throttling.py b/api/funquail_api/common/throttling.py
similarity index 95%
rename from api/funkwhale_api/common/throttling.py
rename to api/funquail_api/common/throttling.py
index 264bb92c5..432ca6b01 100644
--- a/api/funkwhale_api/common/throttling.py
+++ b/api/funquail_api/common/throttling.py
@@ -34,7 +34,7 @@ def get_scope_for_action_and_ident_type(action, ident_type, view_conf={}):
 
 def get_status(ident, now):
     data = []
-    throttle = FunkwhaleThrottle()
+    throttle = FunQuailThrottle()
     for key in sorted(settings.THROTTLING_RATES.keys()):
         conf = settings.THROTTLING_RATES[key]
         row_data = {"id": key, "rate": conf["rate"], "description": conf["description"]}
@@ -79,7 +79,7 @@ def get_status(ident, now):
     return data
 
 
-class FunkwhaleThrottle(rest_throttling.SimpleRateThrottle):
+class FunQuailThrottle(rest_throttling.SimpleRateThrottle):
     def __init__(self):
         pass
 
@@ -132,7 +132,7 @@ DummyView = collections.namedtuple("DummyView", "action throttling_scopes")
 
 def check_request(request, scope):
     """
-    A simple wrapper around FunkwhaleThrottle for views that aren't API views
+    A simple wrapper around FunQuailThrottle for views that aren't API views
     or cannot use rest_framework automatic throttling.
 
     Raise TooManyRequests if limit is reached.
@@ -144,7 +144,7 @@ def check_request(request, scope):
         action=scope,
         throttling_scopes={scope: {"anonymous": scope, "authenticated": scope}},
     )
-    throttle = FunkwhaleThrottle()
+    throttle = FunQuailThrottle()
     if not throttle.allow_request(request, view):
         raise TooManyRequests()
     return True
diff --git a/api/funkwhale_api/common/utils.py b/api/funquail_api/common/utils.py
similarity index 98%
rename from api/funkwhale_api/common/utils.py
rename to api/funquail_api/common/utils.py
index 19d43ad82..cdc1cc505 100644
--- a/api/funkwhale_api/common/utils.py
+++ b/api/funquail_api/common/utils.py
@@ -452,7 +452,7 @@ def update_modification_date(obj, field="modification_date", date=None):
 
 def monkey_patch_request_build_absolute_uri():
     """
-    Since we have FUNKWHALE_HOSTNAME and PROTOCOL hardcoded in settings, we can
+    Since we have FUNQUAIL_HOSTNAME and PROTOCOL hardcoded in settings, we can
     override django's multisite logic which can break when reverse proxy aren't configured
     properly.
     """
@@ -460,14 +460,14 @@ def monkey_patch_request_build_absolute_uri():
 
     def scheme(self):
         if settings.IGNORE_FORWARDED_HOST_AND_PROTO:
-            return settings.FUNKWHALE_PROTOCOL
+            return settings.FUNQUAIL_PROTOCOL
         return builtin_scheme.fget(self)
 
     builtin_get_host = request.HttpRequest.get_host
 
     def get_host(self):
         if settings.IGNORE_FORWARDED_HOST_AND_PROTO:
-            return settings.FUNKWHALE_HOSTNAME
+            return settings.FUNQUAIL_HOSTNAME
         return builtin_get_host(self)
 
     request.HttpRequest.scheme = property(scheme)
diff --git a/api/funkwhale_api/common/validators.py b/api/funquail_api/common/validators.py
similarity index 100%
rename from api/funkwhale_api/common/validators.py
rename to api/funquail_api/common/validators.py
diff --git a/api/funkwhale_api/common/views.py b/api/funquail_api/common/views.py
similarity index 100%
rename from api/funkwhale_api/common/views.py
rename to api/funquail_api/common/views.py
diff --git a/api/funkwhale_api/contrib/__init__.py b/api/funquail_api/contrib/__init__.py
similarity index 100%
rename from api/funkwhale_api/contrib/__init__.py
rename to api/funquail_api/contrib/__init__.py
diff --git a/api/funkwhale_api/contrib/listenbrainz/__init__.py b/api/funquail_api/contrib/listenbrainz/__init__.py
similarity index 100%
rename from api/funkwhale_api/contrib/listenbrainz/__init__.py
rename to api/funquail_api/contrib/listenbrainz/__init__.py
diff --git a/api/funkwhale_api/contrib/listenbrainz/client.py b/api/funquail_api/contrib/listenbrainz/client.py
similarity index 100%
rename from api/funkwhale_api/contrib/listenbrainz/client.py
rename to api/funquail_api/contrib/listenbrainz/client.py
diff --git a/api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py b/api/funquail_api/contrib/listenbrainz/funkwhale_ready.py
similarity index 93%
rename from api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py
rename to api/funquail_api/contrib/listenbrainz/funkwhale_ready.py
index 81b391840..e67590f40 100644
--- a/api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py
+++ b/api/funquail_api/contrib/listenbrainz/funkwhale_ready.py
@@ -23,9 +23,9 @@ def get_track(track):
     title = track.title
     album = None
     additional_info = {
-        "media_player": "Funkwhale",
+        "media_player": "FunQuail",
         "media_player_version": funkwhale_api.__version__,
-        "submission_client": "Funkwhale ListenBrainz plugin",
+        "submission_client": "FunQuail ListenBrainz plugin",
         "submission_client_version": PLUGIN["version"],
         "tracknumber": track.position,
         "discnumber": track.disc_number,
diff --git a/api/funkwhale_api/contrib/listenbrainz/funkwhale_startup.py b/api/funquail_api/contrib/listenbrainz/funkwhale_startup.py
similarity index 82%
rename from api/funkwhale_api/contrib/listenbrainz/funkwhale_startup.py
rename to api/funquail_api/contrib/listenbrainz/funkwhale_startup.py
index 16f58b3f4..29734429b 100644
--- a/api/funkwhale_api/contrib/listenbrainz/funkwhale_startup.py
+++ b/api/funquail_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://docs.funkwhale.audio/users/builtinplugins.html#listenbrainz-plugin",  # noqa
+    homepage="https://funquail.laidback.moe/docs/users/builtinplugins.html#listenbrainz-plugin",  # noqa
     version="0.3",
     user=True,
     conf=[
diff --git a/api/funkwhale_api/contrib/maloja/__init__.py b/api/funquail_api/contrib/maloja/__init__.py
similarity index 100%
rename from api/funkwhale_api/contrib/maloja/__init__.py
rename to api/funquail_api/contrib/maloja/__init__.py
diff --git a/api/funkwhale_api/contrib/maloja/funkwhale_ready.py b/api/funquail_api/contrib/maloja/funkwhale_ready.py
similarity index 100%
rename from api/funkwhale_api/contrib/maloja/funkwhale_ready.py
rename to api/funquail_api/contrib/maloja/funkwhale_ready.py
diff --git a/api/funkwhale_api/contrib/maloja/funkwhale_startup.py b/api/funquail_api/contrib/maloja/funkwhale_startup.py
similarity index 86%
rename from api/funkwhale_api/contrib/maloja/funkwhale_startup.py
rename to api/funquail_api/contrib/maloja/funkwhale_startup.py
index 266ab32b3..508e81fab 100644
--- a/api/funkwhale_api/contrib/maloja/funkwhale_startup.py
+++ b/api/funquail_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://docs.funkwhale.audio/users/builtinplugins.html#maloja-plugin",
+    homepage="https://funquail.laidback.moe/docs/users/builtinplugins.html#maloja-plugin",
     version="0.2",
     user=True,
     conf=[
diff --git a/api/funkwhale_api/contrib/scrobbler/README.rst b/api/funquail_api/contrib/scrobbler/README.rst
similarity index 68%
rename from api/funkwhale_api/contrib/scrobbler/README.rst
rename to api/funquail_api/contrib/scrobbler/README.rst
index c5e787ec4..b0bd30749 100644
--- a/api/funkwhale_api/contrib/scrobbler/README.rst
+++ b/api/funquail_api/contrib/scrobbler/README.rst
@@ -6,5 +6,5 @@ A plugin that enables scrobbling to ListenBrainz and Last.fm.
 If you're scrobbling to last.fm, you will need to create an `API account <https://www.last.fm/api/account/create>`_
 and add two variables two your .env file:
 
-- ``FUNKWHALE_PLUGIN_SCROBBLER_LASTFM_API_KEY=apikey``
-- ``FUNKWHALE_PLUGIN_SCROBBLER_LASTFM_API_SECRET=apisecret``
+- ``FUNQUAIL_PLUGIN_SCROBBLER_LASTFM_API_KEY=apikey``
+- ``FUNQUAIL_PLUGIN_SCROBBLER_LASTFM_API_SECRET=apisecret``
diff --git a/api/funkwhale_api/contrib/scrobbler/__init__.py b/api/funquail_api/contrib/scrobbler/__init__.py
similarity index 100%
rename from api/funkwhale_api/contrib/scrobbler/__init__.py
rename to api/funquail_api/contrib/scrobbler/__init__.py
diff --git a/api/funkwhale_api/contrib/scrobbler/funkwhale_ready.py b/api/funquail_api/contrib/scrobbler/funkwhale_ready.py
similarity index 100%
rename from api/funkwhale_api/contrib/scrobbler/funkwhale_ready.py
rename to api/funquail_api/contrib/scrobbler/funkwhale_ready.py
diff --git a/api/funkwhale_api/contrib/scrobbler/funkwhale_startup.py b/api/funquail_api/contrib/scrobbler/funkwhale_startup.py
similarity index 91%
rename from api/funkwhale_api/contrib/scrobbler/funkwhale_startup.py
rename to api/funquail_api/contrib/scrobbler/funkwhale_startup.py
index 38b0c1a73..b77e69f88 100644
--- a/api/funkwhale_api/contrib/scrobbler/funkwhale_startup.py
+++ b/api/funquail_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://docs.funkwhale.audio/users/builtinplugins.html#scrobbler-plugin",  # noqa
+    homepage="https://funquail.laidback.moe/docs/users/builtinplugins.html#scrobbler-plugin",  # noqa
     version="0.1",
     user=True,
     conf=[
diff --git a/api/funkwhale_api/contrib/scrobbler/scrobbler.py b/api/funquail_api/contrib/scrobbler/scrobbler.py
similarity index 100%
rename from api/funkwhale_api/contrib/scrobbler/scrobbler.py
rename to api/funquail_api/contrib/scrobbler/scrobbler.py
diff --git a/api/funkwhale_api/contrib/sites/__init__.py b/api/funquail_api/contrib/sites/__init__.py
similarity index 100%
rename from api/funkwhale_api/contrib/sites/__init__.py
rename to api/funquail_api/contrib/sites/__init__.py
diff --git a/api/funkwhale_api/contrib/sites/migrations/0001_initial.py b/api/funquail_api/contrib/sites/migrations/0001_initial.py
similarity index 100%
rename from api/funkwhale_api/contrib/sites/migrations/0001_initial.py
rename to api/funquail_api/contrib/sites/migrations/0001_initial.py
diff --git a/api/funkwhale_api/contrib/sites/migrations/0002_set_site_domain_and_name.py b/api/funquail_api/contrib/sites/migrations/0002_set_site_domain_and_name.py
similarity index 100%
rename from api/funkwhale_api/contrib/sites/migrations/0002_set_site_domain_and_name.py
rename to api/funquail_api/contrib/sites/migrations/0002_set_site_domain_and_name.py
diff --git a/api/funkwhale_api/contrib/sites/migrations/0003_auto_20171214_2205.py b/api/funquail_api/contrib/sites/migrations/0003_auto_20171214_2205.py
similarity index 100%
rename from api/funkwhale_api/contrib/sites/migrations/0003_auto_20171214_2205.py
rename to api/funquail_api/contrib/sites/migrations/0003_auto_20171214_2205.py
diff --git a/api/funkwhale_api/contrib/sites/migrations/0004_alter_site_options.py b/api/funquail_api/contrib/sites/migrations/0004_alter_site_options.py
similarity index 100%
rename from api/funkwhale_api/contrib/sites/migrations/0004_alter_site_options.py
rename to api/funquail_api/contrib/sites/migrations/0004_alter_site_options.py
diff --git a/api/funkwhale_api/contrib/sites/migrations/__init__.py b/api/funquail_api/contrib/sites/migrations/__init__.py
similarity index 100%
rename from api/funkwhale_api/contrib/sites/migrations/__init__.py
rename to api/funquail_api/contrib/sites/migrations/__init__.py
diff --git a/api/funkwhale_api/factories.py b/api/funquail_api/factories.py
similarity index 98%
rename from api/funkwhale_api/factories.py
rename to api/funquail_api/factories.py
index 8a2c6f76f..ece00006c 100644
--- a/api/funkwhale_api/factories.py
+++ b/api/funquail_api/factories.py
@@ -308,7 +308,7 @@ TAGS_DATA = {
 }
 
 
-class FunkwhaleProvider(internet_provider.Provider):
+class FunQuailProvider(internet_provider.Provider):
     """
     Our own faker data generator, since built-in ones are sometimes
     not random enough
@@ -359,4 +359,4 @@ class FunkwhaleProvider(internet_provider.Provider):
         )
 
 
-factory.Faker.add_provider(FunkwhaleProvider)
+factory.Faker.add_provider(FunQuailProvider)
diff --git a/api/funkwhale_api/favorites/__init__.py b/api/funquail_api/favorites/__init__.py
similarity index 100%
rename from api/funkwhale_api/favorites/__init__.py
rename to api/funquail_api/favorites/__init__.py
diff --git a/api/funkwhale_api/favorites/activities.py b/api/funquail_api/favorites/activities.py
similarity index 100%
rename from api/funkwhale_api/favorites/activities.py
rename to api/funquail_api/favorites/activities.py
diff --git a/api/funkwhale_api/favorites/admin.py b/api/funquail_api/favorites/admin.py
similarity index 100%
rename from api/funkwhale_api/favorites/admin.py
rename to api/funquail_api/favorites/admin.py
diff --git a/api/funkwhale_api/favorites/consumers.py b/api/funquail_api/favorites/consumers.py
similarity index 100%
rename from api/funkwhale_api/favorites/consumers.py
rename to api/funquail_api/favorites/consumers.py
diff --git a/api/funkwhale_api/favorites/factories.py b/api/funquail_api/favorites/factories.py
similarity index 100%
rename from api/funkwhale_api/favorites/factories.py
rename to api/funquail_api/favorites/factories.py
diff --git a/api/funkwhale_api/favorites/filters.py b/api/funquail_api/favorites/filters.py
similarity index 100%
rename from api/funkwhale_api/favorites/filters.py
rename to api/funquail_api/favorites/filters.py
diff --git a/api/funkwhale_api/favorites/migrations/0001_initial.py b/api/funquail_api/favorites/migrations/0001_initial.py
similarity index 100%
rename from api/funkwhale_api/favorites/migrations/0001_initial.py
rename to api/funquail_api/favorites/migrations/0001_initial.py
diff --git a/api/funkwhale_api/favorites/migrations/__init__.py b/api/funquail_api/favorites/migrations/__init__.py
similarity index 100%
rename from api/funkwhale_api/favorites/migrations/__init__.py
rename to api/funquail_api/favorites/migrations/__init__.py
diff --git a/api/funkwhale_api/favorites/models.py b/api/funquail_api/favorites/models.py
similarity index 100%
rename from api/funkwhale_api/favorites/models.py
rename to api/funquail_api/favorites/models.py
diff --git a/api/funkwhale_api/favorites/serializers.py b/api/funquail_api/favorites/serializers.py
similarity index 100%
rename from api/funkwhale_api/favorites/serializers.py
rename to api/funquail_api/favorites/serializers.py
diff --git a/api/funkwhale_api/favorites/urls.py b/api/funquail_api/favorites/urls.py
similarity index 100%
rename from api/funkwhale_api/favorites/urls.py
rename to api/funquail_api/favorites/urls.py
diff --git a/api/funkwhale_api/favorites/views.py b/api/funquail_api/favorites/views.py
similarity index 100%
rename from api/funkwhale_api/favorites/views.py
rename to api/funquail_api/favorites/views.py
diff --git a/api/funkwhale_api/federation/__init__.py b/api/funquail_api/federation/__init__.py
similarity index 100%
rename from api/funkwhale_api/federation/__init__.py
rename to api/funquail_api/federation/__init__.py
diff --git a/api/funkwhale_api/federation/activity.py b/api/funquail_api/federation/activity.py
similarity index 99%
rename from api/funkwhale_api/federation/activity.py
rename to api/funquail_api/federation/activity.py
index dedea8dd8..593ab0dd0 100644
--- a/api/funkwhale_api/federation/activity.py
+++ b/api/funquail_api/federation/activity.py
@@ -49,7 +49,7 @@ ACTIVITY_TYPES = [
     "View",
 ]
 
-FUNKWHALE_OBJECT_TYPES = [
+FUNQUAIL_OBJECT_TYPES = [
     ("Domain", "Domain"),
     ("Artist", "Artist"),
     ("Album", "Album"),
@@ -80,7 +80,7 @@ OBJECT_TYPES = (
         "Video",
     ]
     + ACTIVITY_TYPES
-    + FUNKWHALE_OBJECT_TYPES
+    + FUNQUAIL_OBJECT_TYPES
 )
 
 
diff --git a/api/funkwhale_api/federation/actors.py b/api/funquail_api/federation/actors.py
similarity index 100%
rename from api/funkwhale_api/federation/actors.py
rename to api/funquail_api/federation/actors.py
diff --git a/api/funkwhale_api/federation/admin.py b/api/funquail_api/federation/admin.py
similarity index 100%
rename from api/funkwhale_api/federation/admin.py
rename to api/funquail_api/federation/admin.py
diff --git a/api/funkwhale_api/federation/api_serializers.py b/api/funquail_api/federation/api_serializers.py
similarity index 100%
rename from api/funkwhale_api/federation/api_serializers.py
rename to api/funquail_api/federation/api_serializers.py
diff --git a/api/funkwhale_api/federation/api_urls.py b/api/funquail_api/federation/api_urls.py
similarity index 100%
rename from api/funkwhale_api/federation/api_urls.py
rename to api/funquail_api/federation/api_urls.py
diff --git a/api/funkwhale_api/federation/api_views.py b/api/funquail_api/federation/api_views.py
similarity index 99%
rename from api/funkwhale_api/federation/api_views.py
rename to api/funquail_api/federation/api_views.py
index e9d7bff01..94d9817f3 100644
--- a/api/funkwhale_api/federation/api_views.py
+++ b/api/funquail_api/federation/api_views.py
@@ -298,7 +298,7 @@ class ActorViewSet(mixins.RetrieveModelMixin, viewsets.GenericViewSet):
             domain__instance_policy__block_all=True,
         )
         if preferences.get("moderation__allow_list_enabled"):
-            query = Q(domain_id=settings.FUNKWHALE_HOSTNAME) | Q(domain__allowed=True)
+            query = Q(domain_id=settings.FUNQUAIL_HOSTNAME) | Q(domain__allowed=True)
             qs = qs.filter(query)
         return qs
 
diff --git a/api/funkwhale_api/federation/authentication.py b/api/funquail_api/federation/authentication.py
similarity index 100%
rename from api/funkwhale_api/federation/authentication.py
rename to api/funquail_api/federation/authentication.py
diff --git a/api/funkwhale_api/federation/contexts.py b/api/funquail_api/federation/contexts.py
similarity index 99%
rename from api/funkwhale_api/federation/contexts.py
rename to api/funquail_api/federation/contexts.py
index 351b4f7e2..08308b2c1 100644
--- a/api/funkwhale_api/federation/contexts.py
+++ b/api/funquail_api/federation/contexts.py
@@ -281,13 +281,13 @@ CONTEXTS = [
     {
         "shortId": "FW",
         "contextUrl": None,
-        "documentUrl": "https://funkwhale.audio/ns",
+        "documentUrl": "https://funquail.laidback.moe/ns",
         "document": {
             "@context": {
                 "id": "@id",
                 "type": "@type",
                 "as": "https://www.w3.org/ns/activitystreams#",
-                "fw": "https://funkwhale.audio/ns#",
+                "fw": "https://funquail.laidback.moe/ns#",
                 "schema": "http://schema.org#",
                 "xsd": "http://www.w3.org/2001/XMLSchema#",
                 "Album": "fw:Album",
diff --git a/api/funkwhale_api/federation/decorators.py b/api/funquail_api/federation/decorators.py
similarity index 100%
rename from api/funkwhale_api/federation/decorators.py
rename to api/funquail_api/federation/decorators.py
diff --git a/api/funkwhale_api/federation/dynamic_preferences_registry.py b/api/funquail_api/federation/dynamic_preferences_registry.py
similarity index 100%
rename from api/funkwhale_api/federation/dynamic_preferences_registry.py
rename to api/funquail_api/federation/dynamic_preferences_registry.py
diff --git a/api/funkwhale_api/federation/exceptions.py b/api/funquail_api/federation/exceptions.py
similarity index 100%
rename from api/funkwhale_api/federation/exceptions.py
rename to api/funquail_api/federation/exceptions.py
diff --git a/api/funkwhale_api/federation/factories.py b/api/funquail_api/federation/factories.py
similarity index 100%
rename from api/funkwhale_api/federation/factories.py
rename to api/funquail_api/federation/factories.py
diff --git a/api/funkwhale_api/federation/fields.py b/api/funquail_api/federation/fields.py
similarity index 100%
rename from api/funkwhale_api/federation/fields.py
rename to api/funquail_api/federation/fields.py
diff --git a/api/funkwhale_api/federation/filters.py b/api/funquail_api/federation/filters.py
similarity index 100%
rename from api/funkwhale_api/federation/filters.py
rename to api/funquail_api/federation/filters.py
diff --git a/api/funkwhale_api/federation/jsonld.py b/api/funquail_api/federation/jsonld.py
similarity index 99%
rename from api/funkwhale_api/federation/jsonld.py
rename to api/funquail_api/federation/jsonld.py
index 101b7fb92..73d17ebc3 100644
--- a/api/funkwhale_api/federation/jsonld.py
+++ b/api/funquail_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://funkwhale.audio/ns",
+        "https://funquail.laidback.moe/ns",
         {
             "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
             "Hashtag": "as:Hashtag",
diff --git a/api/funkwhale_api/federation/keys.py b/api/funquail_api/federation/keys.py
similarity index 100%
rename from api/funkwhale_api/federation/keys.py
rename to api/funquail_api/federation/keys.py
diff --git a/api/funkwhale_api/federation/library.py b/api/funquail_api/federation/library.py
similarity index 100%
rename from api/funkwhale_api/federation/library.py
rename to api/funquail_api/federation/library.py
diff --git a/api/funkwhale_api/federation/management/__init__.py b/api/funquail_api/federation/management/__init__.py
similarity index 100%
rename from api/funkwhale_api/federation/management/__init__.py
rename to api/funquail_api/federation/management/__init__.py
diff --git a/api/funkwhale_api/federation/management/commands/__init__.py b/api/funquail_api/federation/management/commands/__init__.py
similarity index 100%
rename from api/funkwhale_api/federation/management/commands/__init__.py
rename to api/funquail_api/federation/management/commands/__init__.py
diff --git a/api/funkwhale_api/federation/management/commands/fix_federation_ids.py b/api/funquail_api/federation/management/commands/fix_federation_ids.py
similarity index 100%
rename from api/funkwhale_api/federation/management/commands/fix_federation_ids.py
rename to api/funquail_api/federation/management/commands/fix_federation_ids.py
diff --git a/api/funkwhale_api/federation/migrations/0001_initial.py b/api/funquail_api/federation/migrations/0001_initial.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0001_initial.py
rename to api/funquail_api/federation/migrations/0001_initial.py
diff --git a/api/funkwhale_api/federation/migrations/0002_auto_20180403_1620.py b/api/funquail_api/federation/migrations/0002_auto_20180403_1620.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0002_auto_20180403_1620.py
rename to api/funquail_api/federation/migrations/0002_auto_20180403_1620.py
diff --git a/api/funkwhale_api/federation/migrations/0003_auto_20180407_1010.py b/api/funquail_api/federation/migrations/0003_auto_20180407_1010.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0003_auto_20180407_1010.py
rename to api/funquail_api/federation/migrations/0003_auto_20180407_1010.py
diff --git a/api/funkwhale_api/federation/migrations/0004_auto_20180410_2025.py b/api/funquail_api/federation/migrations/0004_auto_20180410_2025.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0004_auto_20180410_2025.py
rename to api/funquail_api/federation/migrations/0004_auto_20180410_2025.py
diff --git a/api/funkwhale_api/federation/migrations/0005_auto_20180413_1723.py b/api/funquail_api/federation/migrations/0005_auto_20180413_1723.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0005_auto_20180413_1723.py
rename to api/funquail_api/federation/migrations/0005_auto_20180413_1723.py
diff --git a/api/funkwhale_api/federation/migrations/0006_auto_20180521_1702.py b/api/funquail_api/federation/migrations/0006_auto_20180521_1702.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0006_auto_20180521_1702.py
rename to api/funquail_api/federation/migrations/0006_auto_20180521_1702.py
diff --git a/api/funkwhale_api/federation/migrations/0007_auto_20180807_1748.py b/api/funquail_api/federation/migrations/0007_auto_20180807_1748.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0007_auto_20180807_1748.py
rename to api/funquail_api/federation/migrations/0007_auto_20180807_1748.py
diff --git a/api/funkwhale_api/federation/migrations/0008_auto_20180807_1748.py b/api/funquail_api/federation/migrations/0008_auto_20180807_1748.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0008_auto_20180807_1748.py
rename to api/funquail_api/federation/migrations/0008_auto_20180807_1748.py
diff --git a/api/funkwhale_api/federation/migrations/0009_auto_20180822_1956.py b/api/funquail_api/federation/migrations/0009_auto_20180822_1956.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0009_auto_20180822_1956.py
rename to api/funquail_api/federation/migrations/0009_auto_20180822_1956.py
diff --git a/api/funkwhale_api/federation/migrations/0010_auto_20180904_2011.py b/api/funquail_api/federation/migrations/0010_auto_20180904_2011.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0010_auto_20180904_2011.py
rename to api/funquail_api/federation/migrations/0010_auto_20180904_2011.py
diff --git a/api/funkwhale_api/federation/migrations/0011_auto_20180910_1902.py b/api/funquail_api/federation/migrations/0011_auto_20180910_1902.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0011_auto_20180910_1902.py
rename to api/funquail_api/federation/migrations/0011_auto_20180910_1902.py
diff --git a/api/funkwhale_api/federation/migrations/0012_auto_20180920_1803.py b/api/funquail_api/federation/migrations/0012_auto_20180920_1803.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0012_auto_20180920_1803.py
rename to api/funquail_api/federation/migrations/0012_auto_20180920_1803.py
diff --git a/api/funkwhale_api/federation/migrations/0013_auto_20181226_1935.py b/api/funquail_api/federation/migrations/0013_auto_20181226_1935.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0013_auto_20181226_1935.py
rename to api/funquail_api/federation/migrations/0013_auto_20181226_1935.py
diff --git a/api/funkwhale_api/federation/migrations/0014_auto_20181205_0958.py b/api/funquail_api/federation/migrations/0014_auto_20181205_0958.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0014_auto_20181205_0958.py
rename to api/funquail_api/federation/migrations/0014_auto_20181205_0958.py
diff --git a/api/funkwhale_api/federation/migrations/0015_populate_domains.py b/api/funquail_api/federation/migrations/0015_populate_domains.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0015_populate_domains.py
rename to api/funquail_api/federation/migrations/0015_populate_domains.py
diff --git a/api/funkwhale_api/federation/migrations/0016_auto_20181227_1605.py b/api/funquail_api/federation/migrations/0016_auto_20181227_1605.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0016_auto_20181227_1605.py
rename to api/funquail_api/federation/migrations/0016_auto_20181227_1605.py
diff --git a/api/funkwhale_api/federation/migrations/0017_auto_20190130_0926.py b/api/funquail_api/federation/migrations/0017_auto_20190130_0926.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0017_auto_20190130_0926.py
rename to api/funquail_api/federation/migrations/0017_auto_20190130_0926.py
diff --git a/api/funkwhale_api/federation/migrations/0018_fetch.py b/api/funquail_api/federation/migrations/0018_fetch.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0018_fetch.py
rename to api/funquail_api/federation/migrations/0018_fetch.py
diff --git a/api/funkwhale_api/federation/migrations/0019_auto_20190611_0851.py b/api/funquail_api/federation/migrations/0019_auto_20190611_0851.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0019_auto_20190611_0851.py
rename to api/funquail_api/federation/migrations/0019_auto_20190611_0851.py
diff --git a/api/funkwhale_api/federation/migrations/0020_auto_20190730_0846.py b/api/funquail_api/federation/migrations/0020_auto_20190730_0846.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0020_auto_20190730_0846.py
rename to api/funquail_api/federation/migrations/0020_auto_20190730_0846.py
diff --git a/api/funkwhale_api/federation/migrations/0021_auto_20191029_1257.py b/api/funquail_api/federation/migrations/0021_auto_20191029_1257.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0021_auto_20191029_1257.py
rename to api/funquail_api/federation/migrations/0021_auto_20191029_1257.py
diff --git a/api/funkwhale_api/federation/migrations/0022_auto_20191204_1539.py b/api/funquail_api/federation/migrations/0022_auto_20191204_1539.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0022_auto_20191204_1539.py
rename to api/funquail_api/federation/migrations/0022_auto_20191204_1539.py
diff --git a/api/funkwhale_api/federation/migrations/0023_actor_summary_obj.py b/api/funquail_api/federation/migrations/0023_actor_summary_obj.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0023_actor_summary_obj.py
rename to api/funquail_api/federation/migrations/0023_actor_summary_obj.py
diff --git a/api/funkwhale_api/federation/migrations/0024_actor_attachment_icon.py b/api/funquail_api/federation/migrations/0024_actor_attachment_icon.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0024_actor_attachment_icon.py
rename to api/funquail_api/federation/migrations/0024_actor_attachment_icon.py
diff --git a/api/funkwhale_api/federation/migrations/0025_auto_20200317_0820.py b/api/funquail_api/federation/migrations/0025_auto_20200317_0820.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0025_auto_20200317_0820.py
rename to api/funquail_api/federation/migrations/0025_auto_20200317_0820.py
diff --git a/api/funkwhale_api/federation/migrations/0026_public_key_format.py b/api/funquail_api/federation/migrations/0026_public_key_format.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0026_public_key_format.py
rename to api/funquail_api/federation/migrations/0026_public_key_format.py
diff --git a/api/funkwhale_api/federation/migrations/0027_auto_20220627_1915.py b/api/funquail_api/federation/migrations/0027_auto_20220627_1915.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0027_auto_20220627_1915.py
rename to api/funquail_api/federation/migrations/0027_auto_20220627_1915.py
diff --git a/api/funkwhale_api/federation/migrations/0028_auto_20221027_1141.py b/api/funquail_api/federation/migrations/0028_auto_20221027_1141.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/0028_auto_20221027_1141.py
rename to api/funquail_api/federation/migrations/0028_auto_20221027_1141.py
diff --git a/api/funkwhale_api/federation/migrations/__init__.py b/api/funquail_api/federation/migrations/__init__.py
similarity index 100%
rename from api/funkwhale_api/federation/migrations/__init__.py
rename to api/funquail_api/federation/migrations/__init__.py
diff --git a/api/funkwhale_api/federation/models.py b/api/funquail_api/federation/models.py
similarity index 100%
rename from api/funkwhale_api/federation/models.py
rename to api/funquail_api/federation/models.py
diff --git a/api/funkwhale_api/federation/mrf_policies.py b/api/funquail_api/federation/mrf_policies.py
similarity index 100%
rename from api/funkwhale_api/federation/mrf_policies.py
rename to api/funquail_api/federation/mrf_policies.py
diff --git a/api/funkwhale_api/federation/parsers.py b/api/funquail_api/federation/parsers.py
similarity index 100%
rename from api/funkwhale_api/federation/parsers.py
rename to api/funquail_api/federation/parsers.py
diff --git a/api/funkwhale_api/federation/renderers.py b/api/funquail_api/federation/renderers.py
similarity index 100%
rename from api/funkwhale_api/federation/renderers.py
rename to api/funquail_api/federation/renderers.py
diff --git a/api/funkwhale_api/federation/routes.py b/api/funquail_api/federation/routes.py
similarity index 100%
rename from api/funkwhale_api/federation/routes.py
rename to api/funquail_api/federation/routes.py
diff --git a/api/funkwhale_api/federation/schema_org.py b/api/funquail_api/federation/schema_org.py
similarity index 100%
rename from api/funkwhale_api/federation/schema_org.py
rename to api/funquail_api/federation/schema_org.py
diff --git a/api/funkwhale_api/federation/serializers.py b/api/funquail_api/federation/serializers.py
similarity index 100%
rename from api/funkwhale_api/federation/serializers.py
rename to api/funquail_api/federation/serializers.py
diff --git a/api/funkwhale_api/federation/signing.py b/api/funquail_api/federation/signing.py
similarity index 100%
rename from api/funkwhale_api/federation/signing.py
rename to api/funquail_api/federation/signing.py
diff --git a/api/funkwhale_api/federation/spa_views.py b/api/funquail_api/federation/spa_views.py
similarity index 98%
rename from api/funkwhale_api/federation/spa_views.py
rename to api/funquail_api/federation/spa_views.py
index c5e05abb9..caf62d876 100644
--- a/api/funkwhale_api/federation/spa_views.py
+++ b/api/funquail_api/federation/spa_views.py
@@ -29,7 +29,7 @@ def actor_detail_username(request, username, redirect_to_ap):
     if redirect_to_ap:
         raise middleware.ApiRedirect(obj.fid)
     obj_url = utils.join_url(
-        settings.FUNKWHALE_URL,
+        settings.FUNQUAIL_URL,
         utils.spa_reverse("actor_detail", kwargs={"username": obj.preferred_username}),
     )
     metas = [
diff --git a/api/funkwhale_api/federation/tasks.py b/api/funquail_api/federation/tasks.py
similarity index 99%
rename from api/funkwhale_api/federation/tasks.py
rename to api/funquail_api/federation/tasks.py
index 46e990685..b0f638fc0 100644
--- a/api/funkwhale_api/federation/tasks.py
+++ b/api/funquail_api/federation/tasks.py
@@ -632,7 +632,7 @@ def fetch_collection(url, max_pages, channel, is_page=False):
 def check_all_remote_instance_availability():
     domains = models.Domain.objects.all().prefetch_related()
     for domain in domains:
-        if domain.name == settings.FUNKWHALE_HOSTNAME:
+        if domain.name == settings.FUNQUAIL_HOSTNAME:
             # No need to check the instance itself: Its always reachable
             domain.reachable = True
             domain.last_successful_contact = timezone.now()
diff --git a/api/funkwhale_api/federation/urls.py b/api/funquail_api/federation/urls.py
similarity index 100%
rename from api/funkwhale_api/federation/urls.py
rename to api/funquail_api/federation/urls.py
diff --git a/api/funkwhale_api/federation/utils.py b/api/funquail_api/federation/utils.py
similarity index 99%
rename from api/funkwhale_api/federation/utils.py
rename to api/funquail_api/federation/utils.py
index cd24dcb68..2f6eb5706 100644
--- a/api/funkwhale_api/federation/utils.py
+++ b/api/funquail_api/federation/utils.py
@@ -20,7 +20,7 @@ def full_url(path):
     """
     if path.startswith("http://") or path.startswith("https://"):
         return path
-    root = settings.FUNKWHALE_URL
+    root = settings.FUNQUAIL_URL
     if path.startswith("/") and root.endswith("/"):
         return root + path[1:]
     elif not path.startswith("/") and not root.endswith("/"):
diff --git a/api/funkwhale_api/federation/views.py b/api/funquail_api/federation/views.py
similarity index 99%
rename from api/funkwhale_api/federation/views.py
rename to api/funquail_api/federation/views.py
index 6a79597fa..99c988d51 100644
--- a/api/funkwhale_api/federation/views.py
+++ b/api/funquail_api/federation/views.py
@@ -28,7 +28,7 @@ from . import (
 
 def redirect_to_html(public_url):
     response = HttpResponse(status=302)
-    response["Location"] = common_utils.join_url(settings.FUNKWHALE_URL, public_url)
+    response["Location"] = common_utils.join_url(settings.FUNQUAIL_URL, public_url)
     return response
 
 
diff --git a/api/funkwhale_api/federation/webfinger.py b/api/funquail_api/federation/webfinger.py
similarity index 100%
rename from api/funkwhale_api/federation/webfinger.py
rename to api/funquail_api/federation/webfinger.py
diff --git a/api/funkwhale_api/history/__init__.py b/api/funquail_api/history/__init__.py
similarity index 100%
rename from api/funkwhale_api/history/__init__.py
rename to api/funquail_api/history/__init__.py
diff --git a/api/funkwhale_api/history/activities.py b/api/funquail_api/history/activities.py
similarity index 100%
rename from api/funkwhale_api/history/activities.py
rename to api/funquail_api/history/activities.py
diff --git a/api/funkwhale_api/history/admin.py b/api/funquail_api/history/admin.py
similarity index 100%
rename from api/funkwhale_api/history/admin.py
rename to api/funquail_api/history/admin.py
diff --git a/api/funkwhale_api/history/factories.py b/api/funquail_api/history/factories.py
similarity index 100%
rename from api/funkwhale_api/history/factories.py
rename to api/funquail_api/history/factories.py
diff --git a/api/funkwhale_api/history/filters.py b/api/funquail_api/history/filters.py
similarity index 100%
rename from api/funkwhale_api/history/filters.py
rename to api/funquail_api/history/filters.py
diff --git a/api/funkwhale_api/history/migrations/0001_initial.py b/api/funquail_api/history/migrations/0001_initial.py
similarity index 100%
rename from api/funkwhale_api/history/migrations/0001_initial.py
rename to api/funquail_api/history/migrations/0001_initial.py
diff --git a/api/funkwhale_api/history/migrations/0002_auto_20180325_1433.py b/api/funquail_api/history/migrations/0002_auto_20180325_1433.py
similarity index 100%
rename from api/funkwhale_api/history/migrations/0002_auto_20180325_1433.py
rename to api/funquail_api/history/migrations/0002_auto_20180325_1433.py
diff --git a/api/funkwhale_api/history/migrations/__init__.py b/api/funquail_api/history/migrations/__init__.py
similarity index 100%
rename from api/funkwhale_api/history/migrations/__init__.py
rename to api/funquail_api/history/migrations/__init__.py
diff --git a/api/funkwhale_api/history/models.py b/api/funquail_api/history/models.py
similarity index 100%
rename from api/funkwhale_api/history/models.py
rename to api/funquail_api/history/models.py
diff --git a/api/funkwhale_api/history/serializers.py b/api/funquail_api/history/serializers.py
similarity index 100%
rename from api/funkwhale_api/history/serializers.py
rename to api/funquail_api/history/serializers.py
diff --git a/api/funkwhale_api/history/urls.py b/api/funquail_api/history/urls.py
similarity index 100%
rename from api/funkwhale_api/history/urls.py
rename to api/funquail_api/history/urls.py
diff --git a/api/funkwhale_api/history/views.py b/api/funquail_api/history/views.py
similarity index 100%
rename from api/funkwhale_api/history/views.py
rename to api/funquail_api/history/views.py
diff --git a/api/funkwhale_api/instance/__init__.py b/api/funquail_api/instance/__init__.py
similarity index 100%
rename from api/funkwhale_api/instance/__init__.py
rename to api/funquail_api/instance/__init__.py
diff --git a/api/funkwhale_api/instance/consumers.py b/api/funquail_api/instance/consumers.py
similarity index 100%
rename from api/funkwhale_api/instance/consumers.py
rename to api/funquail_api/instance/consumers.py
diff --git a/api/funkwhale_api/instance/dynamic_preferences_registry.py b/api/funquail_api/instance/dynamic_preferences_registry.py
similarity index 97%
rename from api/funkwhale_api/instance/dynamic_preferences_registry.py
rename to api/funquail_api/instance/dynamic_preferences_registry.py
index 402fe7e16..38cc3c66d 100644
--- a/api/funkwhale_api/instance/dynamic_preferences_registry.py
+++ b/api/funquail_api/instance/dynamic_preferences_registry.py
@@ -94,15 +94,15 @@ class InstanceSupportMessage(types.StringPreference):
 
 
 @global_preferences_registry.register
-class InstanceFunkwhaleSupportMessageEnabled(types.BooleanPreference):
+class InstanceFunQuailSupportMessageEnabled(types.BooleanPreference):
     show_in_api = True
     section = instance
     name = "funkwhale_support_message_enabled"
-    verbose_name = "Funkwhale Support message"
+    verbose_name = "FunQuail Support message"
     default = True
     help_text = (
         "If this is enabled, we will periodically display a message to encourage "
-        "local users to support Funkwhale."
+        "local users to support FunQuail."
     )
 
 
diff --git a/api/funkwhale_api/instance/pwa-manifest.json b/api/funquail_api/instance/pwa-manifest.json
similarity index 94%
rename from api/funkwhale_api/instance/pwa-manifest.json
rename to api/funquail_api/instance/pwa-manifest.json
index 815076139..5c90f068f 100644
--- a/api/funkwhale_api/instance/pwa-manifest.json
+++ b/api/funquail_api/instance/pwa-manifest.json
@@ -1,7 +1,7 @@
 {
-  "name": "Funkwhale",
+  "name": "FunQuail",
   "categories": ["music", "entertainment"],
-  "short_name": "Funkwhale",
+  "short_name": "FunQuail",
   "description": "Your free and federated audio platform",
   "icons": [
     {
diff --git a/api/funkwhale_api/instance/serializers.py b/api/funquail_api/instance/serializers.py
similarity index 98%
rename from api/funkwhale_api/instance/serializers.py
rename to api/funquail_api/instance/serializers.py
index 7856df065..b5a2c50ad 100644
--- a/api/funkwhale_api/instance/serializers.py
+++ b/api/funquail_api/instance/serializers.py
@@ -20,7 +20,7 @@ class SoftwareSerializer_v2(SoftwareSerializer):
         return "https://dev.funkwhale.audio/funkwhale/funkwhale"
 
     def get_homepage(self, obj):
-        return "https://funkwhale.audio"
+        return "https://funquail.laidback.moe"
 
 
 class ServicesSerializer(serializers.Serializer):
@@ -296,8 +296,8 @@ class SpaManifestShortcutSerializer(serializers.Serializer):
 
 
 class SpaManifestSerializer(serializers.Serializer):
-    name = serializers.CharField(default="Funkwhale")
-    short_name = serializers.CharField(default="Funkwhale")
+    name = serializers.CharField(default="FunQuail")
+    short_name = serializers.CharField(default="FunQuail")
     display = serializers.CharField(required=False)
     background_color = serializers.CharField(required=False)
     lang = serializers.CharField(required=False)
diff --git a/api/funkwhale_api/instance/stats.py b/api/funquail_api/instance/stats.py
similarity index 100%
rename from api/funkwhale_api/instance/stats.py
rename to api/funquail_api/instance/stats.py
diff --git a/api/funkwhale_api/instance/urls.py b/api/funquail_api/instance/urls.py
similarity index 100%
rename from api/funkwhale_api/instance/urls.py
rename to api/funquail_api/instance/urls.py
diff --git a/api/funkwhale_api/instance/urls_v2.py b/api/funquail_api/instance/urls_v2.py
similarity index 100%
rename from api/funkwhale_api/instance/urls_v2.py
rename to api/funquail_api/instance/urls_v2.py
diff --git a/api/funkwhale_api/instance/views.py b/api/funquail_api/instance/views.py
similarity index 100%
rename from api/funkwhale_api/instance/views.py
rename to api/funquail_api/instance/views.py
diff --git a/api/funkwhale_api/main.py b/api/funquail_api/main.py
similarity index 100%
rename from api/funkwhale_api/main.py
rename to api/funquail_api/main.py
diff --git a/api/funkwhale_api/manage/__init__.py b/api/funquail_api/manage/__init__.py
similarity index 100%
rename from api/funkwhale_api/manage/__init__.py
rename to api/funquail_api/manage/__init__.py
diff --git a/api/funkwhale_api/manage/filters.py b/api/funquail_api/manage/filters.py
similarity index 100%
rename from api/funkwhale_api/manage/filters.py
rename to api/funquail_api/manage/filters.py
diff --git a/api/funkwhale_api/manage/serializers.py b/api/funquail_api/manage/serializers.py
similarity index 100%
rename from api/funkwhale_api/manage/serializers.py
rename to api/funquail_api/manage/serializers.py
diff --git a/api/funkwhale_api/manage/urls.py b/api/funquail_api/manage/urls.py
similarity index 100%
rename from api/funkwhale_api/manage/urls.py
rename to api/funquail_api/manage/urls.py
diff --git a/api/funkwhale_api/manage/views.py b/api/funquail_api/manage/views.py
similarity index 100%
rename from api/funkwhale_api/manage/views.py
rename to api/funquail_api/manage/views.py
diff --git a/api/funkwhale_api/moderation/__init__.py b/api/funquail_api/moderation/__init__.py
similarity index 100%
rename from api/funkwhale_api/moderation/__init__.py
rename to api/funquail_api/moderation/__init__.py
diff --git a/api/funkwhale_api/moderation/admin.py b/api/funquail_api/moderation/admin.py
similarity index 100%
rename from api/funkwhale_api/moderation/admin.py
rename to api/funquail_api/moderation/admin.py
diff --git a/api/funkwhale_api/moderation/apps.py b/api/funquail_api/moderation/apps.py
similarity index 100%
rename from api/funkwhale_api/moderation/apps.py
rename to api/funquail_api/moderation/apps.py
diff --git a/api/funkwhale_api/moderation/dynamic_preferences_registry.py b/api/funquail_api/moderation/dynamic_preferences_registry.py
similarity index 100%
rename from api/funkwhale_api/moderation/dynamic_preferences_registry.py
rename to api/funquail_api/moderation/dynamic_preferences_registry.py
diff --git a/api/funkwhale_api/moderation/factories.py b/api/funquail_api/moderation/factories.py
similarity index 100%
rename from api/funkwhale_api/moderation/factories.py
rename to api/funquail_api/moderation/factories.py
diff --git a/api/funkwhale_api/moderation/filters.py b/api/funquail_api/moderation/filters.py
similarity index 100%
rename from api/funkwhale_api/moderation/filters.py
rename to api/funquail_api/moderation/filters.py
diff --git a/api/funkwhale_api/moderation/management/__init__.py b/api/funquail_api/moderation/management/__init__.py
similarity index 100%
rename from api/funkwhale_api/moderation/management/__init__.py
rename to api/funquail_api/moderation/management/__init__.py
diff --git a/api/funkwhale_api/moderation/management/commands/__init__.py b/api/funquail_api/moderation/management/commands/__init__.py
similarity index 100%
rename from api/funkwhale_api/moderation/management/commands/__init__.py
rename to api/funquail_api/moderation/management/commands/__init__.py
diff --git a/api/funkwhale_api/moderation/management/commands/mrf_check.py b/api/funquail_api/moderation/management/commands/mrf_check.py
similarity index 100%
rename from api/funkwhale_api/moderation/management/commands/mrf_check.py
rename to api/funquail_api/moderation/management/commands/mrf_check.py
diff --git a/api/funkwhale_api/moderation/migrations/0001_initial.py b/api/funquail_api/moderation/migrations/0001_initial.py
similarity index 100%
rename from api/funkwhale_api/moderation/migrations/0001_initial.py
rename to api/funquail_api/moderation/migrations/0001_initial.py
diff --git a/api/funkwhale_api/moderation/migrations/0002_auto_20190213_0927.py b/api/funquail_api/moderation/migrations/0002_auto_20190213_0927.py
similarity index 100%
rename from api/funkwhale_api/moderation/migrations/0002_auto_20190213_0927.py
rename to api/funquail_api/moderation/migrations/0002_auto_20190213_0927.py
diff --git a/api/funkwhale_api/moderation/migrations/0003_report.py b/api/funquail_api/moderation/migrations/0003_report.py
similarity index 100%
rename from api/funkwhale_api/moderation/migrations/0003_report.py
rename to api/funquail_api/moderation/migrations/0003_report.py
diff --git a/api/funkwhale_api/moderation/migrations/0004_note.py b/api/funquail_api/moderation/migrations/0004_note.py
similarity index 100%
rename from api/funkwhale_api/moderation/migrations/0004_note.py
rename to api/funquail_api/moderation/migrations/0004_note.py
diff --git a/api/funkwhale_api/moderation/migrations/0005_auto_20200317_0820.py b/api/funquail_api/moderation/migrations/0005_auto_20200317_0820.py
similarity index 100%
rename from api/funkwhale_api/moderation/migrations/0005_auto_20200317_0820.py
rename to api/funquail_api/moderation/migrations/0005_auto_20200317_0820.py
diff --git a/api/funkwhale_api/moderation/migrations/0006_auto_20200803_1222.py b/api/funquail_api/moderation/migrations/0006_auto_20200803_1222.py
similarity index 100%
rename from api/funkwhale_api/moderation/migrations/0006_auto_20200803_1222.py
rename to api/funquail_api/moderation/migrations/0006_auto_20200803_1222.py
diff --git a/api/funkwhale_api/moderation/migrations/0007_auto_20220627_1915.py b/api/funquail_api/moderation/migrations/0007_auto_20220627_1915.py
similarity index 100%
rename from api/funkwhale_api/moderation/migrations/0007_auto_20220627_1915.py
rename to api/funquail_api/moderation/migrations/0007_auto_20220627_1915.py
diff --git a/api/funkwhale_api/moderation/migrations/__init__.py b/api/funquail_api/moderation/migrations/__init__.py
similarity index 100%
rename from api/funkwhale_api/moderation/migrations/__init__.py
rename to api/funquail_api/moderation/migrations/__init__.py
diff --git a/api/funkwhale_api/moderation/models.py b/api/funquail_api/moderation/models.py
similarity index 100%
rename from api/funkwhale_api/moderation/models.py
rename to api/funquail_api/moderation/models.py
diff --git a/api/funkwhale_api/moderation/mrf.py b/api/funquail_api/moderation/mrf.py
similarity index 100%
rename from api/funkwhale_api/moderation/mrf.py
rename to api/funquail_api/moderation/mrf.py
diff --git a/api/funkwhale_api/moderation/mrf_policies.py b/api/funquail_api/moderation/mrf_policies.py
similarity index 100%
rename from api/funkwhale_api/moderation/mrf_policies.py
rename to api/funquail_api/moderation/mrf_policies.py
diff --git a/api/funkwhale_api/moderation/serializers.py b/api/funquail_api/moderation/serializers.py
similarity index 100%
rename from api/funkwhale_api/moderation/serializers.py
rename to api/funquail_api/moderation/serializers.py
diff --git a/api/funkwhale_api/moderation/signals.py b/api/funquail_api/moderation/signals.py
similarity index 100%
rename from api/funkwhale_api/moderation/signals.py
rename to api/funquail_api/moderation/signals.py
diff --git a/api/funkwhale_api/moderation/tasks.py b/api/funquail_api/moderation/tasks.py
similarity index 96%
rename from api/funkwhale_api/moderation/tasks.py
rename to api/funquail_api/moderation/tasks.py
index a77a06417..1984d0aa7 100644
--- a/api/funkwhale_api/moderation/tasks.py
+++ b/api/funquail_api/moderation/tasks.py
@@ -62,7 +62,7 @@ def send_new_report_email_to_moderators(report):
         report.submitter.full_username if report.submitter else report.submitter_email
     )
     subject = "[{} moderation - {}] New report from {}".format(
-        settings.FUNKWHALE_HOSTNAME, report.get_type_display(), submitter_repr
+        settings.FUNQUAIL_HOSTNAME, report.get_type_display(), submitter_repr
     )
     detail_url = federation_utils.full_url(f"/manage/moderation/reports/{report.uuid}")
     unresolved_reports_url = federation_utils.full_url(
@@ -103,7 +103,7 @@ def send_new_report_email_to_moderators(report):
         "—",
         "",
         "You are receiving this e-mail because you are a moderator for {}.".format(
-            settings.FUNKWHALE_HOSTNAME
+            settings.FUNQUAIL_HOSTNAME
         ),
     ]
 
@@ -169,7 +169,7 @@ def notify_mods_signup_request_pending(obj):
     moderators = get_moderators()
     submitter_repr = obj.submitter.preferred_username
     subject = "[{} moderation] New sign-up request from {}".format(
-        settings.FUNKWHALE_HOSTNAME, submitter_repr
+        settings.FUNQUAIL_HOSTNAME, submitter_repr
     )
     detail_url = federation_utils.full_url(f"/manage/moderation/requests/{obj.uuid}")
     unresolved_requests_url = federation_utils.full_url(
@@ -189,7 +189,7 @@ def notify_mods_signup_request_pending(obj):
         "—",
         "",
         "You are receiving this e-mail because you are a moderator for {}.".format(
-            settings.FUNKWHALE_HOSTNAME
+            settings.FUNQUAIL_HOSTNAME
         ),
     ]
 
@@ -213,7 +213,7 @@ def notify_submitter_signup_request_approved(user_request):
     if not submitter_email:
         logger.warning("User %s has no e-mail address configured", submitter_repr)
         return
-    subject = f"Welcome to {settings.FUNKWHALE_HOSTNAME}, {submitter_repr}!"
+    subject = f"Welcome to {settings.FUNQUAIL_HOSTNAME}, {submitter_repr}!"
     login_url = federation_utils.full_url("/login")
     body = [
         f"Hi {submitter_repr} and welcome,",
@@ -239,7 +239,7 @@ def notify_submitter_signup_request_refused(user_request):
         logger.warning("User %s has no e-mail address configured", submitter_repr)
         return
     subject = "Your account request at {} was refused".format(
-        settings.FUNKWHALE_HOSTNAME
+        settings.FUNQUAIL_HOSTNAME
     )
     body = [
         f"Hi {submitter_repr},",
diff --git a/api/funkwhale_api/moderation/urls.py b/api/funquail_api/moderation/urls.py
similarity index 100%
rename from api/funkwhale_api/moderation/urls.py
rename to api/funquail_api/moderation/urls.py
diff --git a/api/funkwhale_api/moderation/utils.py b/api/funquail_api/moderation/utils.py
similarity index 100%
rename from api/funkwhale_api/moderation/utils.py
rename to api/funquail_api/moderation/utils.py
diff --git a/api/funkwhale_api/moderation/views.py b/api/funquail_api/moderation/views.py
similarity index 100%
rename from api/funkwhale_api/moderation/views.py
rename to api/funquail_api/moderation/views.py
diff --git a/api/funkwhale_api/music/__init__.py b/api/funquail_api/music/__init__.py
similarity index 100%
rename from api/funkwhale_api/music/__init__.py
rename to api/funquail_api/music/__init__.py
diff --git a/api/funkwhale_api/music/admin.py b/api/funquail_api/music/admin.py
similarity index 100%
rename from api/funkwhale_api/music/admin.py
rename to api/funquail_api/music/admin.py
diff --git a/api/funkwhale_api/music/dynamic_preferences_registry.py b/api/funquail_api/music/dynamic_preferences_registry.py
similarity index 100%
rename from api/funkwhale_api/music/dynamic_preferences_registry.py
rename to api/funquail_api/music/dynamic_preferences_registry.py
diff --git a/api/funkwhale_api/music/factories.py b/api/funquail_api/music/factories.py
similarity index 100%
rename from api/funkwhale_api/music/factories.py
rename to api/funquail_api/music/factories.py
diff --git a/api/funkwhale_api/music/fake_data.py b/api/funquail_api/music/fake_data.py
similarity index 100%
rename from api/funkwhale_api/music/fake_data.py
rename to api/funquail_api/music/fake_data.py
diff --git a/api/funkwhale_api/music/filters.py b/api/funquail_api/music/filters.py
similarity index 100%
rename from api/funkwhale_api/music/filters.py
rename to api/funquail_api/music/filters.py
diff --git a/api/funkwhale_api/music/importers.py b/api/funquail_api/music/importers.py
similarity index 100%
rename from api/funkwhale_api/music/importers.py
rename to api/funquail_api/music/importers.py
diff --git a/api/funkwhale_api/music/licenses.py b/api/funquail_api/music/licenses.py
similarity index 100%
rename from api/funkwhale_api/music/licenses.py
rename to api/funquail_api/music/licenses.py
diff --git a/api/funkwhale_api/music/management/__init__.py b/api/funquail_api/music/management/__init__.py
similarity index 100%
rename from api/funkwhale_api/music/management/__init__.py
rename to api/funquail_api/music/management/__init__.py
diff --git a/api/funkwhale_api/music/management/commands/__init__.py b/api/funquail_api/music/management/commands/__init__.py
similarity index 100%
rename from api/funkwhale_api/music/management/commands/__init__.py
rename to api/funquail_api/music/management/commands/__init__.py
diff --git a/api/funkwhale_api/music/management/commands/check_inplace_files.py b/api/funquail_api/music/management/commands/check_inplace_files.py
similarity index 100%
rename from api/funkwhale_api/music/management/commands/check_inplace_files.py
rename to api/funquail_api/music/management/commands/check_inplace_files.py
diff --git a/api/funkwhale_api/music/management/commands/check_licenses.py b/api/funquail_api/music/management/commands/check_licenses.py
similarity index 100%
rename from api/funkwhale_api/music/management/commands/check_licenses.py
rename to api/funquail_api/music/management/commands/check_licenses.py
diff --git a/api/funkwhale_api/music/management/commands/create_library.py b/api/funquail_api/music/management/commands/create_library.py
similarity index 100%
rename from api/funkwhale_api/music/management/commands/create_library.py
rename to api/funquail_api/music/management/commands/create_library.py
diff --git a/api/funkwhale_api/music/management/commands/fix_uploads.py b/api/funquail_api/music/management/commands/fix_uploads.py
similarity index 100%
rename from api/funkwhale_api/music/management/commands/fix_uploads.py
rename to api/funquail_api/music/management/commands/fix_uploads.py
diff --git a/api/funkwhale_api/music/management/commands/generate_typesense_index.py b/api/funquail_api/music/management/commands/generate_typesense_index.py
similarity index 78%
rename from api/funkwhale_api/music/management/commands/generate_typesense_index.py
rename to api/funquail_api/music/management/commands/generate_typesense_index.py
index f2280f49f..6bf5f4b0c 100644
--- a/api/funkwhale_api/music/management/commands/generate_typesense_index.py
+++ b/api/funquail_api/music/management/commands/generate_typesense_index.py
@@ -5,8 +5,8 @@ from funkwhale_api.typesense import tasks
 
 class Command(BaseCommand):
     help = """
-    Trigger the generation of a new typesense index for canonical Funkwhale tracks metadata.
-    This is use to resolve Funkwhale tracks to MusicBrainz ids"""
+    Trigger the generation of a new typesense index for canonical FunQuail tracks metadata.
+    This is use to resolve FunQuail tracks to MusicBrainz ids"""
 
     def handle(self, *args, **kwargs):
         tasks.build_canonical_index.delay()
diff --git a/api/funkwhale_api/music/management/commands/import_files.py b/api/funquail_api/music/management/commands/import_files.py
similarity index 99%
rename from api/funkwhale_api/music/management/commands/import_files.py
rename to api/funquail_api/music/management/commands/import_files.py
index 08c02138b..3fc5fd9df 100644
--- a/api/funkwhale_api/music/management/commands/import_files.py
+++ b/api/funquail_api/music/management/commands/import_files.py
@@ -286,8 +286,8 @@ class Command(BaseCommand):
 
         import_url = "{}://{}/library/{}/upload?{}"
         import_url = import_url.format(
-            settings.FUNKWHALE_PROTOCOL,
-            settings.FUNKWHALE_HOSTNAME,
+            settings.FUNQUAIL_PROTOCOL,
+            settings.FUNQUAIL_HOSTNAME,
             str(library.uuid),
             urllib.parse.urlencode([("import", reference)]),
         )
diff --git a/api/funkwhale_api/music/management/commands/prune_library.py b/api/funquail_api/music/management/commands/prune_library.py
similarity index 100%
rename from api/funkwhale_api/music/management/commands/prune_library.py
rename to api/funquail_api/music/management/commands/prune_library.py
diff --git a/api/funkwhale_api/music/management/commands/prune_skipped_uploads.py b/api/funquail_api/music/management/commands/prune_skipped_uploads.py
similarity index 100%
rename from api/funkwhale_api/music/management/commands/prune_skipped_uploads.py
rename to api/funquail_api/music/management/commands/prune_skipped_uploads.py
diff --git a/api/funkwhale_api/music/management/commands/rebuild_music_permissions.py b/api/funquail_api/music/management/commands/rebuild_music_permissions.py
similarity index 100%
rename from api/funkwhale_api/music/management/commands/rebuild_music_permissions.py
rename to api/funquail_api/music/management/commands/rebuild_music_permissions.py
diff --git a/api/funkwhale_api/music/metadata.py b/api/funquail_api/music/metadata.py
similarity index 100%
rename from api/funkwhale_api/music/metadata.py
rename to api/funquail_api/music/metadata.py
diff --git a/api/funkwhale_api/music/migrations/0001_initial.py b/api/funquail_api/music/migrations/0001_initial.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0001_initial.py
rename to api/funquail_api/music/migrations/0001_initial.py
diff --git a/api/funkwhale_api/music/migrations/0002_auto_20151215_1645.py b/api/funquail_api/music/migrations/0002_auto_20151215_1645.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0002_auto_20151215_1645.py
rename to api/funquail_api/music/migrations/0002_auto_20151215_1645.py
diff --git a/api/funkwhale_api/music/migrations/0003_auto_20151222_2233.py b/api/funquail_api/music/migrations/0003_auto_20151222_2233.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0003_auto_20151222_2233.py
rename to api/funquail_api/music/migrations/0003_auto_20151222_2233.py
diff --git a/api/funkwhale_api/music/migrations/0004_track_tags.py b/api/funquail_api/music/migrations/0004_track_tags.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0004_track_tags.py
rename to api/funquail_api/music/migrations/0004_track_tags.py
diff --git a/api/funkwhale_api/music/migrations/0005_deduplicate.py b/api/funquail_api/music/migrations/0005_deduplicate.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0005_deduplicate.py
rename to api/funquail_api/music/migrations/0005_deduplicate.py
diff --git a/api/funkwhale_api/music/migrations/0006_unique_mbid.py b/api/funquail_api/music/migrations/0006_unique_mbid.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0006_unique_mbid.py
rename to api/funquail_api/music/migrations/0006_unique_mbid.py
diff --git a/api/funkwhale_api/music/migrations/0007_track_position.py b/api/funquail_api/music/migrations/0007_track_position.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0007_track_position.py
rename to api/funquail_api/music/migrations/0007_track_position.py
diff --git a/api/funkwhale_api/music/migrations/0008_auto_20160529_1456.py b/api/funquail_api/music/migrations/0008_auto_20160529_1456.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0008_auto_20160529_1456.py
rename to api/funquail_api/music/migrations/0008_auto_20160529_1456.py
diff --git a/api/funkwhale_api/music/migrations/0009_auto_20160920_1614.py b/api/funquail_api/music/migrations/0009_auto_20160920_1614.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0009_auto_20160920_1614.py
rename to api/funquail_api/music/migrations/0009_auto_20160920_1614.py
diff --git a/api/funkwhale_api/music/migrations/0010_auto_20160920_1742.py b/api/funquail_api/music/migrations/0010_auto_20160920_1742.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0010_auto_20160920_1742.py
rename to api/funquail_api/music/migrations/0010_auto_20160920_1742.py
diff --git a/api/funkwhale_api/music/migrations/0011_rename_files.py b/api/funquail_api/music/migrations/0011_rename_files.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0011_rename_files.py
rename to api/funquail_api/music/migrations/0011_rename_files.py
diff --git a/api/funkwhale_api/music/migrations/0012_auto_20161122_1905.py b/api/funquail_api/music/migrations/0012_auto_20161122_1905.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0012_auto_20161122_1905.py
rename to api/funquail_api/music/migrations/0012_auto_20161122_1905.py
diff --git a/api/funkwhale_api/music/migrations/0013_auto_20171213_2211.py b/api/funquail_api/music/migrations/0013_auto_20171213_2211.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0013_auto_20171213_2211.py
rename to api/funquail_api/music/migrations/0013_auto_20171213_2211.py
diff --git a/api/funkwhale_api/music/migrations/0014_importjob_track_file.py b/api/funquail_api/music/migrations/0014_importjob_track_file.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0014_importjob_track_file.py
rename to api/funquail_api/music/migrations/0014_importjob_track_file.py
diff --git a/api/funkwhale_api/music/migrations/0015_bind_track_file_to_import_job.py b/api/funquail_api/music/migrations/0015_bind_track_file_to_import_job.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0015_bind_track_file_to_import_job.py
rename to api/funquail_api/music/migrations/0015_bind_track_file_to_import_job.py
diff --git a/api/funkwhale_api/music/migrations/0016_trackfile_acoustid_track_id.py b/api/funquail_api/music/migrations/0016_trackfile_acoustid_track_id.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0016_trackfile_acoustid_track_id.py
rename to api/funquail_api/music/migrations/0016_trackfile_acoustid_track_id.py
diff --git a/api/funkwhale_api/music/migrations/0017_auto_20171227_1728.py b/api/funquail_api/music/migrations/0017_auto_20171227_1728.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0017_auto_20171227_1728.py
rename to api/funquail_api/music/migrations/0017_auto_20171227_1728.py
diff --git a/api/funkwhale_api/music/migrations/0018_auto_20180218_1554.py b/api/funquail_api/music/migrations/0018_auto_20180218_1554.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0018_auto_20180218_1554.py
rename to api/funquail_api/music/migrations/0018_auto_20180218_1554.py
diff --git a/api/funkwhale_api/music/migrations/0019_populate_mimetypes.py b/api/funquail_api/music/migrations/0019_populate_mimetypes.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0019_populate_mimetypes.py
rename to api/funquail_api/music/migrations/0019_populate_mimetypes.py
diff --git a/api/funkwhale_api/music/migrations/0020_importbatch_status.py b/api/funquail_api/music/migrations/0020_importbatch_status.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0020_importbatch_status.py
rename to api/funquail_api/music/migrations/0020_importbatch_status.py
diff --git a/api/funkwhale_api/music/migrations/0021_populate_batch_status.py b/api/funquail_api/music/migrations/0021_populate_batch_status.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0021_populate_batch_status.py
rename to api/funquail_api/music/migrations/0021_populate_batch_status.py
diff --git a/api/funkwhale_api/music/migrations/0022_importbatch_import_request.py b/api/funquail_api/music/migrations/0022_importbatch_import_request.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0022_importbatch_import_request.py
rename to api/funquail_api/music/migrations/0022_importbatch_import_request.py
diff --git a/api/funkwhale_api/music/migrations/0023_auto_20180407_1010.py b/api/funquail_api/music/migrations/0023_auto_20180407_1010.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0023_auto_20180407_1010.py
rename to api/funquail_api/music/migrations/0023_auto_20180407_1010.py
diff --git a/api/funkwhale_api/music/migrations/0024_populate_uuid.py b/api/funquail_api/music/migrations/0024_populate_uuid.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0024_populate_uuid.py
rename to api/funquail_api/music/migrations/0024_populate_uuid.py
diff --git a/api/funkwhale_api/music/migrations/0025_auto_20180419_2023.py b/api/funquail_api/music/migrations/0025_auto_20180419_2023.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0025_auto_20180419_2023.py
rename to api/funquail_api/music/migrations/0025_auto_20180419_2023.py
diff --git a/api/funkwhale_api/music/migrations/0026_trackfile_accessed_date.py b/api/funquail_api/music/migrations/0026_trackfile_accessed_date.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0026_trackfile_accessed_date.py
rename to api/funquail_api/music/migrations/0026_trackfile_accessed_date.py
diff --git a/api/funkwhale_api/music/migrations/0027_auto_20180515_1808.py b/api/funquail_api/music/migrations/0027_auto_20180515_1808.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0027_auto_20180515_1808.py
rename to api/funquail_api/music/migrations/0027_auto_20180515_1808.py
diff --git a/api/funkwhale_api/music/migrations/0028_importjob_replace_if_duplicate.py b/api/funquail_api/music/migrations/0028_importjob_replace_if_duplicate.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0028_importjob_replace_if_duplicate.py
rename to api/funquail_api/music/migrations/0028_importjob_replace_if_duplicate.py
diff --git a/api/funkwhale_api/music/migrations/0029_auto_20180807_1748.py b/api/funquail_api/music/migrations/0029_auto_20180807_1748.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0029_auto_20180807_1748.py
rename to api/funquail_api/music/migrations/0029_auto_20180807_1748.py
diff --git a/api/funkwhale_api/music/migrations/0030_auto_20180825_1411.py b/api/funquail_api/music/migrations/0030_auto_20180825_1411.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0030_auto_20180825_1411.py
rename to api/funquail_api/music/migrations/0030_auto_20180825_1411.py
diff --git a/api/funkwhale_api/music/migrations/0031_auto_20180914_2007.py b/api/funquail_api/music/migrations/0031_auto_20180914_2007.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0031_auto_20180914_2007.py
rename to api/funquail_api/music/migrations/0031_auto_20180914_2007.py
diff --git a/api/funkwhale_api/music/migrations/0032_track_file_to_upload.py b/api/funquail_api/music/migrations/0032_track_file_to_upload.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0032_track_file_to_upload.py
rename to api/funquail_api/music/migrations/0032_track_file_to_upload.py
diff --git a/api/funkwhale_api/music/migrations/0033_auto_20181023_1837.py b/api/funquail_api/music/migrations/0033_auto_20181023_1837.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0033_auto_20181023_1837.py
rename to api/funquail_api/music/migrations/0033_auto_20181023_1837.py
diff --git a/api/funkwhale_api/music/migrations/0034_auto_20181127_0325.py b/api/funquail_api/music/migrations/0034_auto_20181127_0325.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0034_auto_20181127_0325.py
rename to api/funquail_api/music/migrations/0034_auto_20181127_0325.py
diff --git a/api/funkwhale_api/music/migrations/0035_auto_20181203_1515.py b/api/funquail_api/music/migrations/0035_auto_20181203_1515.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0035_auto_20181203_1515.py
rename to api/funquail_api/music/migrations/0035_auto_20181203_1515.py
diff --git a/api/funkwhale_api/music/migrations/0036_track_disc_number.py b/api/funquail_api/music/migrations/0036_track_disc_number.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0036_track_disc_number.py
rename to api/funquail_api/music/migrations/0036_track_disc_number.py
diff --git a/api/funkwhale_api/music/migrations/0037_auto_20190103_1757.py b/api/funquail_api/music/migrations/0037_auto_20190103_1757.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0037_auto_20190103_1757.py
rename to api/funquail_api/music/migrations/0037_auto_20190103_1757.py
diff --git a/api/funkwhale_api/music/migrations/0038_attributed_to.py b/api/funquail_api/music/migrations/0038_attributed_to.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0038_attributed_to.py
rename to api/funquail_api/music/migrations/0038_attributed_to.py
diff --git a/api/funkwhale_api/music/migrations/0039_auto_20190423_0820.py b/api/funquail_api/music/migrations/0039_auto_20190423_0820.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0039_auto_20190423_0820.py
rename to api/funquail_api/music/migrations/0039_auto_20190423_0820.py
diff --git a/api/funkwhale_api/music/migrations/0040_auto_20191021_1318.py b/api/funquail_api/music/migrations/0040_auto_20191021_1318.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0040_auto_20191021_1318.py
rename to api/funquail_api/music/migrations/0040_auto_20191021_1318.py
diff --git a/api/funkwhale_api/music/migrations/0041_auto_20191021_1705.py b/api/funquail_api/music/migrations/0041_auto_20191021_1705.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0041_auto_20191021_1705.py
rename to api/funquail_api/music/migrations/0041_auto_20191021_1705.py
diff --git a/api/funkwhale_api/music/migrations/0042_album_attachment_cover.py b/api/funquail_api/music/migrations/0042_album_attachment_cover.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0042_album_attachment_cover.py
rename to api/funquail_api/music/migrations/0042_album_attachment_cover.py
diff --git a/api/funkwhale_api/music/migrations/0043_album_cover_attachment.py b/api/funquail_api/music/migrations/0043_album_cover_attachment.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0043_album_cover_attachment.py
rename to api/funquail_api/music/migrations/0043_album_cover_attachment.py
diff --git a/api/funkwhale_api/music/migrations/0044_full_text_search.py b/api/funquail_api/music/migrations/0044_full_text_search.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0044_full_text_search.py
rename to api/funquail_api/music/migrations/0044_full_text_search.py
diff --git a/api/funkwhale_api/music/migrations/0045_full_text_search_stop_words.py b/api/funquail_api/music/migrations/0045_full_text_search_stop_words.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0045_full_text_search_stop_words.py
rename to api/funquail_api/music/migrations/0045_full_text_search_stop_words.py
diff --git a/api/funkwhale_api/music/migrations/0046_auto_20200113_1018.py b/api/funquail_api/music/migrations/0046_auto_20200113_1018.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0046_auto_20200113_1018.py
rename to api/funquail_api/music/migrations/0046_auto_20200113_1018.py
diff --git a/api/funkwhale_api/music/migrations/0047_auto_20200116_1246.py b/api/funquail_api/music/migrations/0047_auto_20200116_1246.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0047_auto_20200116_1246.py
rename to api/funquail_api/music/migrations/0047_auto_20200116_1246.py
diff --git a/api/funkwhale_api/music/migrations/0048_auto_20200120_0900.py b/api/funquail_api/music/migrations/0048_auto_20200120_0900.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0048_auto_20200120_0900.py
rename to api/funquail_api/music/migrations/0048_auto_20200120_0900.py
diff --git a/api/funkwhale_api/music/migrations/0049_auto_20200122_1020.py b/api/funquail_api/music/migrations/0049_auto_20200122_1020.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0049_auto_20200122_1020.py
rename to api/funquail_api/music/migrations/0049_auto_20200122_1020.py
diff --git a/api/funkwhale_api/music/migrations/0050_auto_20200129_1344.py b/api/funquail_api/music/migrations/0050_auto_20200129_1344.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0050_auto_20200129_1344.py
rename to api/funquail_api/music/migrations/0050_auto_20200129_1344.py
diff --git a/api/funkwhale_api/music/migrations/0051_auto_20200319_1249.py b/api/funquail_api/music/migrations/0051_auto_20200319_1249.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0051_auto_20200319_1249.py
rename to api/funquail_api/music/migrations/0051_auto_20200319_1249.py
diff --git a/api/funkwhale_api/music/migrations/0052_auto_20200505_0810.py b/api/funquail_api/music/migrations/0052_auto_20200505_0810.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0052_auto_20200505_0810.py
rename to api/funquail_api/music/migrations/0052_auto_20200505_0810.py
diff --git a/api/funkwhale_api/music/migrations/0053_denormalize_audio_permissions.py b/api/funquail_api/music/migrations/0053_denormalize_audio_permissions.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0053_denormalize_audio_permissions.py
rename to api/funquail_api/music/migrations/0053_denormalize_audio_permissions.py
diff --git a/api/funkwhale_api/music/migrations/0054_alter_uploadversion_mimetype.py b/api/funquail_api/music/migrations/0054_alter_uploadversion_mimetype.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0054_alter_uploadversion_mimetype.py
rename to api/funquail_api/music/migrations/0054_alter_uploadversion_mimetype.py
diff --git a/api/funkwhale_api/music/migrations/0055_auto_20220627_1915.py b/api/funquail_api/music/migrations/0055_auto_20220627_1915.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0055_auto_20220627_1915.py
rename to api/funquail_api/music/migrations/0055_auto_20220627_1915.py
diff --git a/api/funkwhale_api/music/migrations/0056_alter_artist_content_category.py b/api/funquail_api/music/migrations/0056_alter_artist_content_category.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0056_alter_artist_content_category.py
rename to api/funquail_api/music/migrations/0056_alter_artist_content_category.py
diff --git a/api/funkwhale_api/music/migrations/0057_auto_20221118_2108.py b/api/funquail_api/music/migrations/0057_auto_20221118_2108.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/0057_auto_20221118_2108.py
rename to api/funquail_api/music/migrations/0057_auto_20221118_2108.py
diff --git a/api/funkwhale_api/music/migrations/__init__.py b/api/funquail_api/music/migrations/__init__.py
similarity index 100%
rename from api/funkwhale_api/music/migrations/__init__.py
rename to api/funquail_api/music/migrations/__init__.py
diff --git a/api/funkwhale_api/music/models.py b/api/funquail_api/music/models.py
similarity index 99%
rename from api/funkwhale_api/music/models.py
rename to api/funquail_api/music/models.py
index fca044a16..e715b4b90 100644
--- a/api/funkwhale_api/music/models.py
+++ b/api/funquail_api/music/models.py
@@ -579,7 +579,7 @@ class Track(APIModelMixin):
     def get_activity_url(self):
         if self.mbid:
             return f"https://musicbrainz.org/recording/{self.mbid}"
-        return settings.FUNKWHALE_URL + f"/tracks/{self.pk}"
+        return settings.FUNQUAIL_URL + f"/tracks/{self.pk}"
 
     @classmethod
     def get_or_create_from_title(cls, title, **kwargs):
@@ -1173,7 +1173,7 @@ class LibraryQuerySet(models.QuerySet):
         )
         domains_reachable = federation_models.Domain.objects.filter(
             reachable=True
-        ) | federation_models.Domain.objects.filter(name=settings.FUNKWHALE_HOSTNAME)
+        ) | federation_models.Domain.objects.filter(name=settings.FUNQUAIL_HOSTNAME)
 
         return self.filter(
             me_query
diff --git a/api/funkwhale_api/music/mutations.py b/api/funquail_api/music/mutations.py
similarity index 100%
rename from api/funkwhale_api/music/mutations.py
rename to api/funquail_api/music/mutations.py
diff --git a/api/funkwhale_api/music/serializers.py b/api/funquail_api/music/serializers.py
similarity index 99%
rename from api/funkwhale_api/music/serializers.py
rename to api/funquail_api/music/serializers.py
index 46a118817..22a163e0b 100644
--- a/api/funkwhale_api/music/serializers.py
+++ b/api/funquail_api/music/serializers.py
@@ -579,7 +579,7 @@ class TrackActivitySerializer(activity_serializers.ModelSerializer):
 
 
 def get_embed_url(type, id):
-    return settings.FUNKWHALE_EMBED_URL + f"?type={type}&id={id}"
+    return settings.FUNQUAIL_EMBED_URL + f"?type={type}&id={id}"
 
 
 class OembedSerializer(serializers.Serializer):
@@ -601,7 +601,7 @@ class OembedSerializer(serializers.Serializer):
             "version": "1.0",
             "type": "rich",
             "provider_name": settings.APP_NAME,
-            "provider_url": settings.FUNKWHALE_URL,
+            "provider_url": settings.FUNQUAIL_URL,
             "height": validated_data.get("maxheight") or 400,
             "width": validated_data.get("maxwidth") or 600,
         }
diff --git a/api/funkwhale_api/music/signals.py b/api/funquail_api/music/signals.py
similarity index 100%
rename from api/funkwhale_api/music/signals.py
rename to api/funquail_api/music/signals.py
diff --git a/api/funkwhale_api/music/spa_views.py b/api/funquail_api/music/spa_views.py
similarity index 93%
rename from api/funkwhale_api/music/spa_views.py
rename to api/funquail_api/music/spa_views.py
index 3102d8635..31e7edef3 100644
--- a/api/funkwhale_api/music/spa_views.py
+++ b/api/funquail_api/music/spa_views.py
@@ -38,7 +38,7 @@ def library_track(request, pk, redirect_to_ap):
         raise middleware.ApiRedirect(redirect_url)
 
     track_url = utils.join_url(
-        settings.FUNKWHALE_URL,
+        settings.FUNQUAIL_URL,
         utils.spa_reverse("library_track", kwargs={"pk": obj.pk}),
     )
     metas = [
@@ -51,7 +51,7 @@ def library_track(request, pk, redirect_to_ap):
             "tag": "meta",
             "property": "music:musician",
             "content": utils.join_url(
-                settings.FUNKWHALE_URL,
+                settings.FUNQUAIL_URL,
                 utils.spa_reverse("library_artist", kwargs={"pk": obj.artist.pk}),
             ),
         },
@@ -63,7 +63,7 @@ def library_track(request, pk, redirect_to_ap):
                 "tag": "meta",
                 "property": "music:album",
                 "content": utils.join_url(
-                    settings.FUNKWHALE_URL,
+                    settings.FUNQUAIL_URL,
                     utils.spa_reverse("library_album", kwargs={"pk": obj.album.pk}),
                 ),
             },
@@ -90,7 +90,7 @@ def library_track(request, pk, redirect_to_ap):
             {
                 "tag": "meta",
                 "property": "og:audio",
-                "content": utils.join_url(settings.FUNKWHALE_URL, obj.listen_url),
+                "content": utils.join_url(settings.FUNQUAIL_URL, obj.listen_url),
             }
         )
         if preferences.get("federation__enabled"):
@@ -108,7 +108,7 @@ def library_track(request, pk, redirect_to_ap):
                 "rel": "alternate",
                 "type": "application/json+oembed",
                 "href": (
-                    utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
+                    utils.join_url(settings.FUNQUAIL_URL, reverse("api:v1:oembed"))
                     + f"?format=json&url={urllib.parse.quote_plus(track_url)}"
                 ),
             }
@@ -129,7 +129,7 @@ def library_album(request, pk, redirect_to_ap):
         raise middleware.ApiRedirect(obj.fid)
 
     album_url = utils.join_url(
-        settings.FUNKWHALE_URL,
+        settings.FUNQUAIL_URL,
         utils.spa_reverse("library_album", kwargs={"pk": obj.pk}),
     )
     metas = [
@@ -140,7 +140,7 @@ def library_album(request, pk, redirect_to_ap):
             "tag": "meta",
             "property": "music:musician",
             "content": utils.join_url(
-                settings.FUNKWHALE_URL,
+                settings.FUNQUAIL_URL,
                 utils.spa_reverse("library_artist", kwargs={"pk": obj.artist.pk}),
             ),
         },
@@ -180,7 +180,7 @@ def library_album(request, pk, redirect_to_ap):
                 "rel": "alternate",
                 "type": "application/json+oembed",
                 "href": (
-                    utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
+                    utils.join_url(settings.FUNQUAIL_URL, reverse("api:v1:oembed"))
                     + f"?format=json&url={urllib.parse.quote_plus(album_url)}"
                 ),
             }
@@ -201,7 +201,7 @@ def library_artist(request, pk, redirect_to_ap):
         raise middleware.ApiRedirect(obj.fid)
 
     artist_url = utils.join_url(
-        settings.FUNKWHALE_URL,
+        settings.FUNQUAIL_URL,
         utils.spa_reverse("library_artist", kwargs={"pk": obj.pk}),
     )
     # we use latest album's cover as artist image
@@ -244,7 +244,7 @@ def library_artist(request, pk, redirect_to_ap):
                 "rel": "alternate",
                 "type": "application/json+oembed",
                 "href": (
-                    utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
+                    utils.join_url(settings.FUNQUAIL_URL, reverse("api:v1:oembed"))
                     + f"?format=json&url={urllib.parse.quote_plus(artist_url)}"
                 ),
             }
@@ -261,7 +261,7 @@ def library_playlist(request, pk, redirect_to_ap):
     except playlists_models.Playlist.DoesNotExist:
         return []
     obj_url = utils.join_url(
-        settings.FUNKWHALE_URL,
+        settings.FUNQUAIL_URL,
         utils.spa_reverse("library_playlist", kwargs={"pk": obj.pk}),
     )
     # we use the first playlist track's album's cover as image
@@ -296,7 +296,7 @@ def library_playlist(request, pk, redirect_to_ap):
                 "rel": "alternate",
                 "type": "application/json+oembed",
                 "href": (
-                    utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
+                    utils.join_url(settings.FUNQUAIL_URL, reverse("api:v1:oembed"))
                     + f"?format=json&url={urllib.parse.quote_plus(obj_url)}"
                 ),
             }
@@ -317,7 +317,7 @@ def library_library(request, uuid, redirect_to_ap):
         raise middleware.ApiRedirect(obj.fid)
 
     library_url = utils.join_url(
-        settings.FUNKWHALE_URL,
+        settings.FUNQUAIL_URL,
         utils.spa_reverse("library_library", kwargs={"uuid": obj.uuid}),
     )
     metas = [
diff --git a/api/funkwhale_api/music/tasks.py b/api/funquail_api/music/tasks.py
similarity index 100%
rename from api/funkwhale_api/music/tasks.py
rename to api/funquail_api/music/tasks.py
diff --git a/api/funkwhale_api/music/utils.py b/api/funquail_api/music/utils.py
similarity index 100%
rename from api/funkwhale_api/music/utils.py
rename to api/funquail_api/music/utils.py
diff --git a/api/funkwhale_api/music/views.py b/api/funquail_api/music/views.py
similarity index 100%
rename from api/funkwhale_api/music/views.py
rename to api/funquail_api/music/views.py
diff --git a/api/funkwhale_api/musicbrainz/__init__.py b/api/funquail_api/musicbrainz/__init__.py
similarity index 100%
rename from api/funkwhale_api/musicbrainz/__init__.py
rename to api/funquail_api/musicbrainz/__init__.py
diff --git a/api/funkwhale_api/musicbrainz/client.py b/api/funquail_api/musicbrainz/client.py
similarity index 97%
rename from api/funkwhale_api/musicbrainz/client.py
rename to api/funquail_api/musicbrainz/client.py
index 5e96346d7..189580ae3 100644
--- a/api/funkwhale_api/musicbrainz/client.py
+++ b/api/funquail_api/musicbrainz/client.py
@@ -5,7 +5,7 @@ from django.conf import settings
 from funkwhale_api import __version__
 
 _api = musicbrainzngs
-_api.set_useragent("funkwhale", str(__version__), settings.FUNKWHALE_URL)
+_api.set_useragent("funkwhale", str(__version__), settings.FUNQUAIL_URL)
 _api.set_hostname(settings.MUSICBRAINZ_HOSTNAME)
 
 
diff --git a/api/funkwhale_api/musicbrainz/urls.py b/api/funquail_api/musicbrainz/urls.py
similarity index 100%
rename from api/funkwhale_api/musicbrainz/urls.py
rename to api/funquail_api/musicbrainz/urls.py
diff --git a/api/funkwhale_api/musicbrainz/views.py b/api/funquail_api/musicbrainz/views.py
similarity index 100%
rename from api/funkwhale_api/musicbrainz/views.py
rename to api/funquail_api/musicbrainz/views.py
diff --git a/api/funkwhale_api/playlists/__init__.py b/api/funquail_api/playlists/__init__.py
similarity index 100%
rename from api/funkwhale_api/playlists/__init__.py
rename to api/funquail_api/playlists/__init__.py
diff --git a/api/funkwhale_api/playlists/admin.py b/api/funquail_api/playlists/admin.py
similarity index 100%
rename from api/funkwhale_api/playlists/admin.py
rename to api/funquail_api/playlists/admin.py
diff --git a/api/funkwhale_api/playlists/dynamic_preferences_registry.py b/api/funquail_api/playlists/dynamic_preferences_registry.py
similarity index 100%
rename from api/funkwhale_api/playlists/dynamic_preferences_registry.py
rename to api/funquail_api/playlists/dynamic_preferences_registry.py
diff --git a/api/funkwhale_api/playlists/factories.py b/api/funquail_api/playlists/factories.py
similarity index 100%
rename from api/funkwhale_api/playlists/factories.py
rename to api/funquail_api/playlists/factories.py
diff --git a/api/funkwhale_api/playlists/filters.py b/api/funquail_api/playlists/filters.py
similarity index 100%
rename from api/funkwhale_api/playlists/filters.py
rename to api/funquail_api/playlists/filters.py
diff --git a/api/funkwhale_api/playlists/migrations/0001_initial.py b/api/funquail_api/playlists/migrations/0001_initial.py
similarity index 100%
rename from api/funkwhale_api/playlists/migrations/0001_initial.py
rename to api/funquail_api/playlists/migrations/0001_initial.py
diff --git a/api/funkwhale_api/playlists/migrations/0002_auto_20180316_2217.py b/api/funquail_api/playlists/migrations/0002_auto_20180316_2217.py
similarity index 100%
rename from api/funkwhale_api/playlists/migrations/0002_auto_20180316_2217.py
rename to api/funquail_api/playlists/migrations/0002_auto_20180316_2217.py
diff --git a/api/funkwhale_api/playlists/migrations/0003_auto_20180319_1214.py b/api/funquail_api/playlists/migrations/0003_auto_20180319_1214.py
similarity index 100%
rename from api/funkwhale_api/playlists/migrations/0003_auto_20180319_1214.py
rename to api/funquail_api/playlists/migrations/0003_auto_20180319_1214.py
diff --git a/api/funkwhale_api/playlists/migrations/0004_auto_20180320_1713.py b/api/funquail_api/playlists/migrations/0004_auto_20180320_1713.py
similarity index 100%
rename from api/funkwhale_api/playlists/migrations/0004_auto_20180320_1713.py
rename to api/funquail_api/playlists/migrations/0004_auto_20180320_1713.py
diff --git a/api/funkwhale_api/playlists/migrations/__init__.py b/api/funquail_api/playlists/migrations/__init__.py
similarity index 100%
rename from api/funkwhale_api/playlists/migrations/__init__.py
rename to api/funquail_api/playlists/migrations/__init__.py
diff --git a/api/funkwhale_api/playlists/models.py b/api/funquail_api/playlists/models.py
similarity index 100%
rename from api/funkwhale_api/playlists/models.py
rename to api/funquail_api/playlists/models.py
diff --git a/api/funkwhale_api/playlists/serializers.py b/api/funquail_api/playlists/serializers.py
similarity index 100%
rename from api/funkwhale_api/playlists/serializers.py
rename to api/funquail_api/playlists/serializers.py
diff --git a/api/funkwhale_api/playlists/views.py b/api/funquail_api/playlists/views.py
similarity index 100%
rename from api/funkwhale_api/playlists/views.py
rename to api/funquail_api/playlists/views.py
diff --git a/api/funkwhale_api/providers/__init__.py b/api/funquail_api/providers/__init__.py
similarity index 100%
rename from api/funkwhale_api/providers/__init__.py
rename to api/funquail_api/providers/__init__.py
diff --git a/api/funkwhale_api/providers/urls.py b/api/funquail_api/providers/urls.py
similarity index 100%
rename from api/funkwhale_api/providers/urls.py
rename to api/funquail_api/providers/urls.py
diff --git a/api/funkwhale_api/radios/__init__.py b/api/funquail_api/radios/__init__.py
similarity index 100%
rename from api/funkwhale_api/radios/__init__.py
rename to api/funquail_api/radios/__init__.py
diff --git a/api/funkwhale_api/radios/admin.py b/api/funquail_api/radios/admin.py
similarity index 100%
rename from api/funkwhale_api/radios/admin.py
rename to api/funquail_api/radios/admin.py
diff --git a/api/funkwhale_api/radios/factories.py b/api/funquail_api/radios/factories.py
similarity index 100%
rename from api/funkwhale_api/radios/factories.py
rename to api/funquail_api/radios/factories.py
diff --git a/api/funkwhale_api/radios/filters.py b/api/funquail_api/radios/filters.py
similarity index 100%
rename from api/funkwhale_api/radios/filters.py
rename to api/funquail_api/radios/filters.py
diff --git a/api/funkwhale_api/radios/filtersets.py b/api/funquail_api/radios/filtersets.py
similarity index 100%
rename from api/funkwhale_api/radios/filtersets.py
rename to api/funquail_api/radios/filtersets.py
diff --git a/api/funkwhale_api/radios/lb_recommendations.py b/api/funquail_api/radios/lb_recommendations.py
similarity index 92%
rename from api/funkwhale_api/radios/lb_recommendations.py
rename to api/funquail_api/radios/lb_recommendations.py
index c7ddc35c7..6466915b0 100644
--- a/api/funkwhale_api/radios/lb_recommendations.py
+++ b/api/funquail_api/radios/lb_recommendations.py
@@ -61,7 +61,7 @@
 #         for recommended_recording in recommendations.playlists[0].recordings
 #     ]
 
-#     logger.info("Searching for MusicBrainz ID in Funkwhale database")
+#     logger.info("Searching for MusicBrainz ID in FunQuail database")
 
 #     qs_recommended = (
 #         music_models.Track.objects.all()
@@ -78,18 +78,18 @@
 #     cached_match_mbid = [str(i) for i in cached_match.keys()]
 
 #     if qs_recommended and cached_match_mbid:
-#         logger.info("MusicBrainz IDs found in Funkwhale database and redis")
+#         logger.info("MusicBrainz IDs found in FunQuail database and redis")
 #         qs_recommended_mbid.extend(cached_match_mbid)
 #         mbids_found = qs_recommended_mbid
 #     elif qs_recommended and not cached_match_mbid:
-#         logger.info("MusicBrainz IDs found in Funkwhale database")
+#         logger.info("MusicBrainz IDs found in FunQuail database")
 #         mbids_found = qs_recommended_mbid
 #     elif not qs_recommended and cached_match_mbid:
 #         logger.info("MusicBrainz IDs found in redis cache")
 #         mbids_found = cached_match_mbid
 #     else:
 #         logger.info(
-#             "Couldn't find any matches in Funkwhale database. Trying to match all"
+#             "Couldn't find any matches in FunQuail database. Trying to match all"
 #         )
 #         mbids_found = []
 
@@ -97,7 +97,7 @@
 #         i for i in recommendations.playlists[0].recordings if i.mbid not in mbids_found
 #     ]
 
-#     logger.info("Matching missing MusicBrainz ID to Funkwhale track")
+#     logger.info("Matching missing MusicBrainz ID to FunQuail track")
 
 #     start_time_resolv = time.time()
 #     utils.resolve_recordings_to_fw_track(recommended_recordings_not_found)
diff --git a/api/funkwhale_api/radios/migrations/0001_initial.py b/api/funquail_api/radios/migrations/0001_initial.py
similarity index 100%
rename from api/funkwhale_api/radios/migrations/0001_initial.py
rename to api/funquail_api/radios/migrations/0001_initial.py
diff --git a/api/funkwhale_api/radios/migrations/0002_radiosession_session_key.py b/api/funquail_api/radios/migrations/0002_radiosession_session_key.py
similarity index 100%
rename from api/funkwhale_api/radios/migrations/0002_radiosession_session_key.py
rename to api/funquail_api/radios/migrations/0002_radiosession_session_key.py
diff --git a/api/funkwhale_api/radios/migrations/0003_auto_20160521_1708.py b/api/funquail_api/radios/migrations/0003_auto_20160521_1708.py
similarity index 100%
rename from api/funkwhale_api/radios/migrations/0003_auto_20160521_1708.py
rename to api/funquail_api/radios/migrations/0003_auto_20160521_1708.py
diff --git a/api/funkwhale_api/radios/migrations/0004_auto_20180107_1813.py b/api/funquail_api/radios/migrations/0004_auto_20180107_1813.py
similarity index 100%
rename from api/funkwhale_api/radios/migrations/0004_auto_20180107_1813.py
rename to api/funquail_api/radios/migrations/0004_auto_20180107_1813.py
diff --git a/api/funkwhale_api/radios/migrations/0005_auto_20200803_1222.py b/api/funquail_api/radios/migrations/0005_auto_20200803_1222.py
similarity index 100%
rename from api/funkwhale_api/radios/migrations/0005_auto_20200803_1222.py
rename to api/funquail_api/radios/migrations/0005_auto_20200803_1222.py
diff --git a/api/funkwhale_api/radios/migrations/0006_alter_radio_config.py b/api/funquail_api/radios/migrations/0006_alter_radio_config.py
similarity index 100%
rename from api/funkwhale_api/radios/migrations/0006_alter_radio_config.py
rename to api/funquail_api/radios/migrations/0006_alter_radio_config.py
diff --git a/api/funkwhale_api/radios/migrations/0006_radiosession_config.py b/api/funquail_api/radios/migrations/0006_radiosession_config.py
similarity index 100%
rename from api/funkwhale_api/radios/migrations/0006_radiosession_config.py
rename to api/funquail_api/radios/migrations/0006_radiosession_config.py
diff --git a/api/funkwhale_api/radios/migrations/0007_merge_20220715_0801.py b/api/funquail_api/radios/migrations/0007_merge_20220715_0801.py
similarity index 100%
rename from api/funkwhale_api/radios/migrations/0007_merge_20220715_0801.py
rename to api/funquail_api/radios/migrations/0007_merge_20220715_0801.py
diff --git a/api/funkwhale_api/radios/migrations/__init__.py b/api/funquail_api/radios/migrations/__init__.py
similarity index 100%
rename from api/funkwhale_api/radios/migrations/__init__.py
rename to api/funquail_api/radios/migrations/__init__.py
diff --git a/api/funkwhale_api/radios/models.py b/api/funquail_api/radios/models.py
similarity index 100%
rename from api/funkwhale_api/radios/models.py
rename to api/funquail_api/radios/models.py
diff --git a/api/funkwhale_api/radios/radios.py b/api/funquail_api/radios/radios.py
similarity index 99%
rename from api/funkwhale_api/radios/radios.py
rename to api/funquail_api/radios/radios.py
index d80c01910..1f97c29c3 100644
--- a/api/funkwhale_api/radios/radios.py
+++ b/api/funquail_api/radios/radios.py
@@ -423,7 +423,7 @@ class Troi(SessionRadio):
     The config data should follow :
     {"patch": "troi_patch_name", "troi_arg1":"troi_arg_1", "troi_arg2": ...}
     Validation of the config (args) is done by troi during track fetch.
-    Funkwhale only checks if the patch is implemented
+    FunQuail only checks if the patch is implemented
     """
 
     config = serializers.JSONField(required=True)
diff --git a/api/funkwhale_api/radios/radios_v2.py b/api/funquail_api/radios/radios_v2.py
similarity index 99%
rename from api/funkwhale_api/radios/radios_v2.py
rename to api/funquail_api/radios/radios_v2.py
index dc7290980..06a0d4e7f 100644
--- a/api/funkwhale_api/radios/radios_v2.py
+++ b/api/funquail_api/radios/radios_v2.py
@@ -463,7 +463,7 @@ class Troi(SessionRadio):
     The config data should follow :
     {"patch": "troi_patch_name", "troi_arg1":"troi_arg_1", "troi_arg2": ...}
     Validation of the config (args) is done by troi during track fetch.
-    Funkwhale only checks if the patch is implemented
+    FunQuail only checks if the patch is implemented
     """
 
     config = serializers.JSONField(required=True)
diff --git a/api/funkwhale_api/radios/registries.py b/api/funquail_api/radios/registries.py
similarity index 100%
rename from api/funkwhale_api/radios/registries.py
rename to api/funquail_api/radios/registries.py
diff --git a/api/funkwhale_api/radios/registries_v2.py b/api/funquail_api/radios/registries_v2.py
similarity index 100%
rename from api/funkwhale_api/radios/registries_v2.py
rename to api/funquail_api/radios/registries_v2.py
diff --git a/api/funkwhale_api/radios/serializers.py b/api/funquail_api/radios/serializers.py
similarity index 100%
rename from api/funkwhale_api/radios/serializers.py
rename to api/funquail_api/radios/serializers.py
diff --git a/api/funkwhale_api/radios/urls.py b/api/funquail_api/radios/urls.py
similarity index 100%
rename from api/funkwhale_api/radios/urls.py
rename to api/funquail_api/radios/urls.py
diff --git a/api/funkwhale_api/radios/urls_v2.py b/api/funquail_api/radios/urls_v2.py
similarity index 100%
rename from api/funkwhale_api/radios/urls_v2.py
rename to api/funquail_api/radios/urls_v2.py
diff --git a/api/funkwhale_api/radios/views.py b/api/funquail_api/radios/views.py
similarity index 100%
rename from api/funkwhale_api/radios/views.py
rename to api/funquail_api/radios/views.py
diff --git a/api/funkwhale_api/requests/__init__.py b/api/funquail_api/requests/__init__.py
similarity index 100%
rename from api/funkwhale_api/requests/__init__.py
rename to api/funquail_api/requests/__init__.py
diff --git a/api/funkwhale_api/requests/migrations/0001_initial.py b/api/funquail_api/requests/migrations/0001_initial.py
similarity index 100%
rename from api/funkwhale_api/requests/migrations/0001_initial.py
rename to api/funquail_api/requests/migrations/0001_initial.py
diff --git a/api/funkwhale_api/requests/migrations/__init__.py b/api/funquail_api/requests/migrations/__init__.py
similarity index 100%
rename from api/funkwhale_api/requests/migrations/__init__.py
rename to api/funquail_api/requests/migrations/__init__.py
diff --git a/api/funkwhale_api/requests/models.py b/api/funquail_api/requests/models.py
similarity index 100%
rename from api/funkwhale_api/requests/models.py
rename to api/funquail_api/requests/models.py
diff --git a/api/funkwhale_api/schema.py b/api/funquail_api/schema.py
similarity index 100%
rename from api/funkwhale_api/schema.py
rename to api/funquail_api/schema.py
diff --git a/api/funkwhale_api/static/images/podcasts-cover-placeholder.png b/api/funquail_api/static/images/podcasts-cover-placeholder.png
similarity index 100%
rename from api/funkwhale_api/static/images/podcasts-cover-placeholder.png
rename to api/funquail_api/static/images/podcasts-cover-placeholder.png
diff --git a/api/funkwhale_api/static/music/sample1.ogg b/api/funquail_api/static/music/sample1.ogg
similarity index 100%
rename from api/funkwhale_api/static/music/sample1.ogg
rename to api/funquail_api/static/music/sample1.ogg
diff --git a/api/funkwhale_api/subsonic/__init__.py b/api/funquail_api/subsonic/__init__.py
similarity index 100%
rename from api/funkwhale_api/subsonic/__init__.py
rename to api/funquail_api/subsonic/__init__.py
diff --git a/api/funkwhale_api/subsonic/authentication.py b/api/funquail_api/subsonic/authentication.py
similarity index 100%
rename from api/funkwhale_api/subsonic/authentication.py
rename to api/funquail_api/subsonic/authentication.py
diff --git a/api/funkwhale_api/subsonic/dynamic_preferences_registry.py b/api/funquail_api/subsonic/dynamic_preferences_registry.py
similarity index 90%
rename from api/funkwhale_api/subsonic/dynamic_preferences_registry.py
rename to api/funquail_api/subsonic/dynamic_preferences_registry.py
index 439d16de3..1c1e790b5 100644
--- a/api/funkwhale_api/subsonic/dynamic_preferences_registry.py
+++ b/api/funquail_api/subsonic/dynamic_preferences_registry.py
@@ -12,7 +12,7 @@ class APIAutenticationRequired(types.BooleanPreference):
     default = True
     verbose_name = "Enabled Subsonic API"
     help_text = (
-        "Funkwhale supports a subset of the Subsonic API, that makes "
+        "FunQuail supports a subset of the Subsonic API, that makes "
         "it compatible with existing clients such as DSub for Android "
         "or Clementine for desktop. However, Subsonic protocol is less "
         "than ideal in terms of security and you can disable this feature "
diff --git a/api/funkwhale_api/subsonic/filters.py b/api/funquail_api/subsonic/filters.py
similarity index 100%
rename from api/funkwhale_api/subsonic/filters.py
rename to api/funquail_api/subsonic/filters.py
diff --git a/api/funkwhale_api/subsonic/negotiation.py b/api/funquail_api/subsonic/negotiation.py
similarity index 100%
rename from api/funkwhale_api/subsonic/negotiation.py
rename to api/funquail_api/subsonic/negotiation.py
diff --git a/api/funkwhale_api/subsonic/renderers.py b/api/funquail_api/subsonic/renderers.py
similarity index 100%
rename from api/funkwhale_api/subsonic/renderers.py
rename to api/funquail_api/subsonic/renderers.py
diff --git a/api/funkwhale_api/subsonic/serializers.py b/api/funquail_api/subsonic/serializers.py
similarity index 100%
rename from api/funkwhale_api/subsonic/serializers.py
rename to api/funquail_api/subsonic/serializers.py
diff --git a/api/funkwhale_api/subsonic/views.py b/api/funquail_api/subsonic/views.py
similarity index 100%
rename from api/funkwhale_api/subsonic/views.py
rename to api/funquail_api/subsonic/views.py
diff --git a/api/funkwhale_api/tags/__init__.py b/api/funquail_api/tags/__init__.py
similarity index 100%
rename from api/funkwhale_api/tags/__init__.py
rename to api/funquail_api/tags/__init__.py
diff --git a/api/funkwhale_api/tags/admin.py b/api/funquail_api/tags/admin.py
similarity index 100%
rename from api/funkwhale_api/tags/admin.py
rename to api/funquail_api/tags/admin.py
diff --git a/api/funkwhale_api/tags/factories.py b/api/funquail_api/tags/factories.py
similarity index 100%
rename from api/funkwhale_api/tags/factories.py
rename to api/funquail_api/tags/factories.py
diff --git a/api/funkwhale_api/tags/filters.py b/api/funquail_api/tags/filters.py
similarity index 100%
rename from api/funkwhale_api/tags/filters.py
rename to api/funquail_api/tags/filters.py
diff --git a/api/funkwhale_api/tags/migrations/0001_initial.py b/api/funquail_api/tags/migrations/0001_initial.py
similarity index 100%
rename from api/funkwhale_api/tags/migrations/0001_initial.py
rename to api/funquail_api/tags/migrations/0001_initial.py
diff --git a/api/funkwhale_api/tags/migrations/0002_auto_20200803_1222.py b/api/funquail_api/tags/migrations/0002_auto_20200803_1222.py
similarity index 100%
rename from api/funkwhale_api/tags/migrations/0002_auto_20200803_1222.py
rename to api/funquail_api/tags/migrations/0002_auto_20200803_1222.py
diff --git a/api/funkwhale_api/tags/migrations/__init__.py b/api/funquail_api/tags/migrations/__init__.py
similarity index 100%
rename from api/funkwhale_api/tags/migrations/__init__.py
rename to api/funquail_api/tags/migrations/__init__.py
diff --git a/api/funkwhale_api/tags/models.py b/api/funquail_api/tags/models.py
similarity index 100%
rename from api/funkwhale_api/tags/models.py
rename to api/funquail_api/tags/models.py
diff --git a/api/funkwhale_api/tags/serializers.py b/api/funquail_api/tags/serializers.py
similarity index 100%
rename from api/funkwhale_api/tags/serializers.py
rename to api/funquail_api/tags/serializers.py
diff --git a/api/funkwhale_api/tags/tasks.py b/api/funquail_api/tags/tasks.py
similarity index 100%
rename from api/funkwhale_api/tags/tasks.py
rename to api/funquail_api/tags/tasks.py
diff --git a/api/funkwhale_api/tags/views.py b/api/funquail_api/tags/views.py
similarity index 100%
rename from api/funkwhale_api/tags/views.py
rename to api/funquail_api/tags/views.py
diff --git a/api/funkwhale_api/taskapp/__init__.py b/api/funquail_api/taskapp/__init__.py
similarity index 100%
rename from api/funkwhale_api/taskapp/__init__.py
rename to api/funquail_api/taskapp/__init__.py
diff --git a/api/funkwhale_api/taskapp/celery.py b/api/funquail_api/taskapp/celery.py
similarity index 100%
rename from api/funkwhale_api/taskapp/celery.py
rename to api/funquail_api/taskapp/celery.py
diff --git a/api/funkwhale_api/templates/account/email/email_confirmation_message.txt b/api/funquail_api/templates/account/email/email_confirmation_message.txt
similarity index 100%
rename from api/funkwhale_api/templates/account/email/email_confirmation_message.txt
rename to api/funquail_api/templates/account/email/email_confirmation_message.txt
diff --git a/api/funkwhale_api/templates/registration/password_reset_email.html b/api/funquail_api/templates/registration/password_reset_email.html
similarity index 100%
rename from api/funkwhale_api/templates/registration/password_reset_email.html
rename to api/funquail_api/templates/registration/password_reset_email.html
diff --git a/api/funkwhale_api/typesense/__init__.py b/api/funquail_api/typesense/__init__.py
similarity index 100%
rename from api/funkwhale_api/typesense/__init__.py
rename to api/funquail_api/typesense/__init__.py
diff --git a/api/funkwhale_api/typesense/factories.py b/api/funquail_api/typesense/factories.py
similarity index 100%
rename from api/funkwhale_api/typesense/factories.py
rename to api/funquail_api/typesense/factories.py
diff --git a/api/funkwhale_api/typesense/tasks.py b/api/funquail_api/typesense/tasks.py
similarity index 100%
rename from api/funkwhale_api/typesense/tasks.py
rename to api/funquail_api/typesense/tasks.py
diff --git a/api/funkwhale_api/typesense/utils.py b/api/funquail_api/typesense/utils.py
similarity index 100%
rename from api/funkwhale_api/typesense/utils.py
rename to api/funquail_api/typesense/utils.py
diff --git a/api/funkwhale_api/users/__init__.py b/api/funquail_api/users/__init__.py
similarity index 100%
rename from api/funkwhale_api/users/__init__.py
rename to api/funquail_api/users/__init__.py
diff --git a/api/funkwhale_api/users/adapters.py b/api/funquail_api/users/adapters.py
similarity index 78%
rename from api/funkwhale_api/users/adapters.py
rename to api/funquail_api/users/adapters.py
index 436ed2d77..f5607c081 100644
--- a/api/funkwhale_api/users/adapters.py
+++ b/api/funquail_api/users/adapters.py
@@ -5,16 +5,16 @@ from dynamic_preferences.registries import global_preferences_registry
 
 def get_email_context():
     context = {}
-    context["funkwhale_url"] = settings.FUNKWHALE_URL
+    context["funkwhale_url"] = settings.FUNQUAIL_URL
     manager = global_preferences_registry.manager()
     context["funkwhale_site_name"] = (
-        manager["instance__name"] or settings.FUNKWHALE_HOSTNAME
+        manager["instance__name"] or settings.FUNQUAIL_HOSTNAME
     )
-    context["funkwhale_site_domain"] = settings.FUNKWHALE_HOSTNAME
+    context["funkwhale_site_domain"] = settings.FUNQUAIL_HOSTNAME
     return context
 
 
-class FunkwhaleAccountAdapter(DefaultAccountAdapter):
+class FunQuailAccountAdapter(DefaultAccountAdapter):
     def is_open_for_signup(self, request):
         manager = global_preferences_registry.manager()
         return manager["users__registration_enabled"]
diff --git a/api/funkwhale_api/users/admin.py b/api/funquail_api/users/admin.py
similarity index 100%
rename from api/funkwhale_api/users/admin.py
rename to api/funquail_api/users/admin.py
diff --git a/api/funkwhale_api/users/api_urls.py b/api/funquail_api/users/api_urls.py
similarity index 100%
rename from api/funkwhale_api/users/api_urls.py
rename to api/funquail_api/users/api_urls.py
diff --git a/api/funkwhale_api/users/auth_backends.py b/api/funquail_api/users/auth_backends.py
similarity index 100%
rename from api/funkwhale_api/users/auth_backends.py
rename to api/funquail_api/users/auth_backends.py
diff --git a/api/funkwhale_api/users/authentication.py b/api/funquail_api/users/authentication.py
similarity index 100%
rename from api/funkwhale_api/users/authentication.py
rename to api/funquail_api/users/authentication.py
diff --git a/api/funkwhale_api/users/dynamic_preferences_registry.py b/api/funquail_api/users/dynamic_preferences_registry.py
similarity index 100%
rename from api/funkwhale_api/users/dynamic_preferences_registry.py
rename to api/funquail_api/users/dynamic_preferences_registry.py
diff --git a/api/funkwhale_api/users/factories.py b/api/funquail_api/users/factories.py
similarity index 100%
rename from api/funkwhale_api/users/factories.py
rename to api/funquail_api/users/factories.py
diff --git a/api/funkwhale_api/users/middleware.py b/api/funquail_api/users/middleware.py
similarity index 100%
rename from api/funkwhale_api/users/middleware.py
rename to api/funquail_api/users/middleware.py
diff --git a/api/funkwhale_api/users/migrations/0001_initial.py b/api/funquail_api/users/migrations/0001_initial.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0001_initial.py
rename to api/funquail_api/users/migrations/0001_initial.py
diff --git a/api/funkwhale_api/users/migrations/0002_auto_20171214_2205.py b/api/funquail_api/users/migrations/0002_auto_20171214_2205.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0002_auto_20171214_2205.py
rename to api/funquail_api/users/migrations/0002_auto_20171214_2205.py
diff --git a/api/funkwhale_api/users/migrations/0003_auto_20171226_1357.py b/api/funquail_api/users/migrations/0003_auto_20171226_1357.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0003_auto_20171226_1357.py
rename to api/funquail_api/users/migrations/0003_auto_20171226_1357.py
diff --git a/api/funkwhale_api/users/migrations/0004_user_privacy_level.py b/api/funquail_api/users/migrations/0004_user_privacy_level.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0004_user_privacy_level.py
rename to api/funquail_api/users/migrations/0004_user_privacy_level.py
diff --git a/api/funkwhale_api/users/migrations/0005_user_subsonic_api_token.py b/api/funquail_api/users/migrations/0005_user_subsonic_api_token.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0005_user_subsonic_api_token.py
rename to api/funquail_api/users/migrations/0005_user_subsonic_api_token.py
diff --git a/api/funkwhale_api/users/migrations/0006_auto_20180517_2324.py b/api/funquail_api/users/migrations/0006_auto_20180517_2324.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0006_auto_20180517_2324.py
rename to api/funquail_api/users/migrations/0006_auto_20180517_2324.py
diff --git a/api/funkwhale_api/users/migrations/0007_auto_20180524_2009.py b/api/funquail_api/users/migrations/0007_auto_20180524_2009.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0007_auto_20180524_2009.py
rename to api/funquail_api/users/migrations/0007_auto_20180524_2009.py
diff --git a/api/funkwhale_api/users/migrations/0008_auto_20180617_1531.py b/api/funquail_api/users/migrations/0008_auto_20180617_1531.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0008_auto_20180617_1531.py
rename to api/funquail_api/users/migrations/0008_auto_20180617_1531.py
diff --git a/api/funkwhale_api/users/migrations/0009_auto_20180619_2024.py b/api/funquail_api/users/migrations/0009_auto_20180619_2024.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0009_auto_20180619_2024.py
rename to api/funquail_api/users/migrations/0009_auto_20180619_2024.py
diff --git a/api/funkwhale_api/users/migrations/0010_user_avatar.py b/api/funquail_api/users/migrations/0010_user_avatar.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0010_user_avatar.py
rename to api/funquail_api/users/migrations/0010_user_avatar.py
diff --git a/api/funkwhale_api/users/migrations/0011_auto_20180721_1317.py b/api/funquail_api/users/migrations/0011_auto_20180721_1317.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0011_auto_20180721_1317.py
rename to api/funquail_api/users/migrations/0011_auto_20180721_1317.py
diff --git a/api/funkwhale_api/users/migrations/0012_user_upload_quota.py b/api/funquail_api/users/migrations/0012_user_upload_quota.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0012_user_upload_quota.py
rename to api/funquail_api/users/migrations/0012_user_upload_quota.py
diff --git a/api/funkwhale_api/users/migrations/0013_auto_20181206_1008.py b/api/funquail_api/users/migrations/0013_auto_20181206_1008.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0013_auto_20181206_1008.py
rename to api/funquail_api/users/migrations/0013_auto_20181206_1008.py
diff --git a/api/funkwhale_api/users/migrations/0014_oauth.py b/api/funquail_api/users/migrations/0014_oauth.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0014_oauth.py
rename to api/funquail_api/users/migrations/0014_oauth.py
diff --git a/api/funkwhale_api/users/migrations/0015_application_scope.py b/api/funquail_api/users/migrations/0015_application_scope.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0015_application_scope.py
rename to api/funquail_api/users/migrations/0015_application_scope.py
diff --git a/api/funkwhale_api/users/migrations/0016_auto_20190920_0857.py b/api/funquail_api/users/migrations/0016_auto_20190920_0857.py
similarity index 96%
rename from api/funkwhale_api/users/migrations/0016_auto_20190920_0857.py
rename to api/funquail_api/users/migrations/0016_auto_20190920_0857.py
index a3fc6cf26..5b0c4b2d9 100644
--- a/api/funkwhale_api/users/migrations/0016_auto_20190920_0857.py
+++ b/api/funquail_api/users/migrations/0016_auto_20190920_0857.py
@@ -15,7 +15,7 @@ def set_display_date(apps, schema_editor):
     User = apps.get_model("users", "User")
     now = django.utils.timezone.now()
     instance_support_message_display_date = now + datetime.timedelta(days=settings.INSTANCE_SUPPORT_MESSAGE_DELAY)
-    funkwhale_support_message_display_date = now + datetime.timedelta(days=settings.FUNKWHALE_SUPPORT_MESSAGE_DELAY)
+    funkwhale_support_message_display_date = now + datetime.timedelta(days=settings.FUNQUAIL_SUPPORT_MESSAGE_DELAY)
 
     User.objects.update(instance_support_message_display_date=instance_support_message_display_date)
     User.objects.update(funkwhale_support_message_display_date=funkwhale_support_message_display_date)
diff --git a/api/funkwhale_api/users/migrations/0017_actor_avatar.py b/api/funquail_api/users/migrations/0017_actor_avatar.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0017_actor_avatar.py
rename to api/funquail_api/users/migrations/0017_actor_avatar.py
diff --git a/api/funkwhale_api/users/migrations/0018_auto_20200705_0829.py b/api/funquail_api/users/migrations/0018_auto_20200705_0829.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0018_auto_20200705_0829.py
rename to api/funquail_api/users/migrations/0018_auto_20200705_0829.py
diff --git a/api/funkwhale_api/users/migrations/0019_auto_20200718_0741.py b/api/funquail_api/users/migrations/0019_auto_20200718_0741.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0019_auto_20200718_0741.py
rename to api/funquail_api/users/migrations/0019_auto_20200718_0741.py
diff --git a/api/funkwhale_api/users/migrations/0020_application_token.py b/api/funquail_api/users/migrations/0020_application_token.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0020_application_token.py
rename to api/funquail_api/users/migrations/0020_application_token.py
diff --git a/api/funkwhale_api/users/migrations/0021_auto_20210703_1810.py b/api/funquail_api/users/migrations/0021_auto_20210703_1810.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0021_auto_20210703_1810.py
rename to api/funquail_api/users/migrations/0021_auto_20210703_1810.py
diff --git a/api/funkwhale_api/users/migrations/0022_alter_user_settings.py b/api/funquail_api/users/migrations/0022_alter_user_settings.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0022_alter_user_settings.py
rename to api/funquail_api/users/migrations/0022_alter_user_settings.py
diff --git a/api/funkwhale_api/users/migrations/0022_auto_20221119_1819.py b/api/funquail_api/users/migrations/0022_auto_20221119_1819.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0022_auto_20221119_1819.py
rename to api/funquail_api/users/migrations/0022_auto_20221119_1819.py
diff --git a/api/funkwhale_api/users/migrations/0023_merge_20221125_1902.py b/api/funquail_api/users/migrations/0023_merge_20221125_1902.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/0023_merge_20221125_1902.py
rename to api/funquail_api/users/migrations/0023_merge_20221125_1902.py
diff --git a/api/funkwhale_api/users/migrations/__init__.py b/api/funquail_api/users/migrations/__init__.py
similarity index 100%
rename from api/funkwhale_api/users/migrations/__init__.py
rename to api/funquail_api/users/migrations/__init__.py
diff --git a/api/funkwhale_api/users/models.py b/api/funquail_api/users/models.py
similarity index 99%
rename from api/funkwhale_api/users/models.py
rename to api/funquail_api/users/models.py
index ad9523c45..c3da397d1 100644
--- a/api/funkwhale_api/users/models.py
+++ b/api/funquail_api/users/models.py
@@ -93,7 +93,7 @@ def get_default_instance_support_message_display_date():
 
 def get_default_funkwhale_support_message_display_date():
     return timezone.now() + datetime.timedelta(
-        days=settings.FUNKWHALE_SUPPORT_MESSAGE_DELAY
+        days=settings.FUNQUAIL_SUPPORT_MESSAGE_DELAY
     )
 
 
@@ -241,7 +241,7 @@ class User(AbstractUser):
             self.update_subsonic_api_token()
 
     def get_activity_url(self):
-        return settings.FUNKWHALE_URL + f"/@{self.username}"
+        return settings.FUNQUAIL_URL + f"/@{self.username}"
 
     def record_activity(self):
         """
diff --git a/api/funkwhale_api/users/mutations.py b/api/funquail_api/users/mutations.py
similarity index 100%
rename from api/funkwhale_api/users/mutations.py
rename to api/funquail_api/users/mutations.py
diff --git a/api/funkwhale_api/users/oauth/__init__.py b/api/funquail_api/users/oauth/__init__.py
similarity index 100%
rename from api/funkwhale_api/users/oauth/__init__.py
rename to api/funquail_api/users/oauth/__init__.py
diff --git a/api/funkwhale_api/users/oauth/permissions.py b/api/funquail_api/users/oauth/permissions.py
similarity index 100%
rename from api/funkwhale_api/users/oauth/permissions.py
rename to api/funquail_api/users/oauth/permissions.py
diff --git a/api/funkwhale_api/users/oauth/scopes.py b/api/funquail_api/users/oauth/scopes.py
similarity index 100%
rename from api/funkwhale_api/users/oauth/scopes.py
rename to api/funquail_api/users/oauth/scopes.py
diff --git a/api/funkwhale_api/users/oauth/serializers.py b/api/funquail_api/users/oauth/serializers.py
similarity index 100%
rename from api/funkwhale_api/users/oauth/serializers.py
rename to api/funquail_api/users/oauth/serializers.py
diff --git a/api/funkwhale_api/users/oauth/server.py b/api/funquail_api/users/oauth/server.py
similarity index 100%
rename from api/funkwhale_api/users/oauth/server.py
rename to api/funquail_api/users/oauth/server.py
diff --git a/api/funkwhale_api/users/oauth/tasks.py b/api/funquail_api/users/oauth/tasks.py
similarity index 100%
rename from api/funkwhale_api/users/oauth/tasks.py
rename to api/funquail_api/users/oauth/tasks.py
diff --git a/api/funkwhale_api/users/oauth/urls.py b/api/funquail_api/users/oauth/urls.py
similarity index 100%
rename from api/funkwhale_api/users/oauth/urls.py
rename to api/funquail_api/users/oauth/urls.py
diff --git a/api/funkwhale_api/users/oauth/views.py b/api/funquail_api/users/oauth/views.py
similarity index 100%
rename from api/funkwhale_api/users/oauth/views.py
rename to api/funquail_api/users/oauth/views.py
diff --git a/api/funkwhale_api/users/rest_auth_urls.py b/api/funquail_api/users/rest_auth_urls.py
similarity index 100%
rename from api/funkwhale_api/users/rest_auth_urls.py
rename to api/funquail_api/users/rest_auth_urls.py
diff --git a/api/funkwhale_api/users/serializers.py b/api/funquail_api/users/serializers.py
similarity index 100%
rename from api/funkwhale_api/users/serializers.py
rename to api/funquail_api/users/serializers.py
diff --git a/api/funkwhale_api/users/tasks.py b/api/funquail_api/users/tasks.py
similarity index 100%
rename from api/funkwhale_api/users/tasks.py
rename to api/funquail_api/users/tasks.py
diff --git a/api/funkwhale_api/users/views.py b/api/funquail_api/users/views.py
similarity index 100%
rename from api/funkwhale_api/users/views.py
rename to api/funquail_api/users/views.py
diff --git a/api/funkwhale_api/users/wordlist.txt b/api/funquail_api/users/wordlist.txt
similarity index 100%
rename from api/funkwhale_api/users/wordlist.txt
rename to api/funquail_api/users/wordlist.txt
diff --git a/api/pyproject.toml b/api/pyproject.toml
index 7b9b2a2e6..4fead585a 100644
--- a/api/pyproject.toml
+++ b/api/pyproject.toml
@@ -1,16 +1,16 @@
 [tool.poetry]
-name = "funkwhale-api"
+name = "funquail-api"
 version = "1.4.1"
-description = "Funkwhale API"
+description = "FunQuail API"
 
-authors = ["Funkwhale Collective"]
-homepage = "https://funkwhale.audio"
-repository = "https://dev.funkwhale.audio/funkwhale/funkwhale"
-documentation = "https://docs.funkwhale.audio"
+authors = ["FunQuail Developers"]
+homepage = "https://funquail.laidback.moe"
+repository = "https://git.prometheus.systems/funquail-team/funquail"
+documentation = "https://funquail.laidback.moe/docs"
 license = "AGPL-3.0-only"
 
 packages = [
-  { include = "funkwhale_api" },
+  { include = "funquail_api" },
   { include = "config" },
 ]
 include = [
@@ -22,7 +22,7 @@ include = [
 exclude = ["tests"]
 
 [tool.poetry.scripts]
-funkwhale-manage = 'funkwhale_api.main:main'
+funquail-manage = 'funquail_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",
-  "FUNKWHALE_HOSTNAME_SUFFIX=",
-  "FUNKWHALE_HOSTNAME_PREFIX=",
-  "FUNKWHALE_HOSTNAME=test.federation",
+  "FUNQUAIL_HOSTNAME_SUFFIX=",
+  "FUNQUAIL_HOSTNAME_PREFIX=",
+  "FUNQUAIL_HOSTNAME=test.federation",
   "FEDERATION_HOSTNAME=test.federation",
-  "FUNKWHALE_URL=https://test.federation",
+  "FUNQUAIL_URL=https://test.federation",
   "DEBUG_TOOLBAR_ENABLED=False",
   "DEBUG=False",
   "WEAK_PASSWORDS=True",
   "CREATE_IMAGE_THUMBNAILS=False",
   "FORCE_HTTPS_URLS=False",
-  "FUNKWHALE_SPA_HTML_ROOT=http://noop/",
+  "FUNQUAIL_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",
-  "FUNKWHALE_PLUGINS=",
+  "FUNQUAIL_PLUGINS=",
   "MUSIC_DIRECTORY_PATH=/music",
 ]
 
 [tool.coverage.run]
 plugins = ["django_coverage_plugin"]
-source = ["funkwhale_api"]
+source = ["funquail_api"]
 omit = [
   "*migrations*",
   "*tests*",
-  "funkwhale_api/schema.py",
+  "funquail_api/schema.py",
 ]
diff --git a/api/tests/audio/test_spa_views.py b/api/tests/audio/test_spa_views.py
index e95e4bc0b..cf5c09f32 100644
--- a/api/tests/audio/test_spa_views.py
+++ b/api/tests/audio/test_spa_views.py
@@ -24,7 +24,7 @@ def test_channel_detail(attribute, spa_html, no_api_auth, client, factories, set
         {
             "tag": "meta",
             "property": "og:url",
-            "content": utils.join_url(settings.FUNKWHALE_URL, detail_url),
+            "content": utils.join_url(settings.FUNQUAIL_URL, detail_url),
         },
         {"tag": "meta", "property": "og:title", "content": channel.artist.name},
         {"tag": "meta", "property": "og:type", "content": "profile"},
@@ -51,10 +51,10 @@ def test_channel_detail(attribute, spa_html, no_api_auth, client, factories, set
             "rel": "alternate",
             "type": "application/json+oembed",
             "href": (
-                utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
+                utils.join_url(settings.FUNQUAIL_URL, reverse("api:v1:oembed"))
                 + "?format=json&url={}".format(
                     urllib.parse.quote_plus(
-                        utils.join_url(settings.FUNKWHALE_URL, detail_url)
+                        utils.join_url(settings.FUNQUAIL_URL, detail_url)
                     )
                 )
             ),
@@ -76,8 +76,8 @@ def test_channel_detail(attribute, spa_html, no_api_auth, client, factories, set
 
 
 def test_oembed_channel(factories, no_api_auth, api_client, settings):
-    settings.FUNKWHALE_URL = "http://test"
-    settings.FUNKWHALE_EMBED_URL = "http://embed"
+    settings.FUNQUAIL_URL = "http://test"
+    settings.FUNQUAIL_EMBED_URL = "http://embed"
     channel = factories["audio.Channel"](artist__with_cover=True)
     artist = channel.artist
     url = reverse("api:v1:oembed")
@@ -87,7 +87,7 @@ def test_oembed_channel(factories, no_api_auth, api_client, settings):
         "version": "1.0",
         "type": "rich",
         "provider_name": settings.APP_NAME,
-        "provider_url": settings.FUNKWHALE_URL,
+        "provider_url": settings.FUNQUAIL_URL,
         "height": 400,
         "width": 600,
         "title": artist.name,
diff --git a/api/tests/audio/test_views.py b/api/tests/audio/test_views.py
index 1a1e46d65..cf357e926 100644
--- a/api/tests/audio/test_views.py
+++ b/api/tests/audio/test_views.py
@@ -93,7 +93,7 @@ def test_channel_list_opml(factories, logged_in_api_client, now):
     channel1 = factories["audio.Channel"]()
     channel2 = factories["audio.Channel"]()
     expected_xml = serializers.get_opml(
-        channels=[channel2, channel1], title="Funkwhale channels OPML export", date=now
+        channels=[channel2, channel1], title="FunQuail channels OPML export", date=now
     )
     expected_content = renderers.render_xml(
         renderers.dict_to_xml_tree("opml", expected_xml)
diff --git a/api/tests/common/test_middleware.py b/api/tests/common/test_middleware.py
index ff37ca380..0dd6d3824 100644
--- a/api/tests/common/test_middleware.py
+++ b/api/tests/common/test_middleware.py
@@ -53,12 +53,12 @@ def test_should_fallback(path, expected, mocker):
 
 
 def test_serve_spa_from_cache(mocker, settings, preferences, no_api_auth):
-    preferences["instance__name"] = 'Best Funkwhale "pod"'
+    preferences["instance__name"] = 'Best FunQuail "pod"'
     request = mocker.Mock(path="/", META={})
     get_spa_html = mocker.patch.object(
         middleware,
         "get_spa_html",
-        return_value="<html><head><title>Funkwhale</title></head></html>",
+        return_value="<html><head><title>FunQuail</title></head></html>",
     )
     mocker.patch.object(
         middleware,
@@ -91,26 +91,26 @@ def test_serve_spa_from_cache(mocker, settings, preferences, no_api_auth):
         '<meta content="default site name" property="og:site_name" />',
         "</head></html>",
     ]
-    get_spa_html.assert_called_once_with(settings.FUNKWHALE_SPA_HTML_ROOT)
+    get_spa_html.assert_called_once_with(settings.FUNQUAIL_SPA_HTML_ROOT)
     get_request_head_tags.assert_called_once_with(request)
     assert response.content == "\n".join(expected).encode()
 
 
 def test_get_default_head_tags(preferences, settings):
-    settings.APP_NAME = "Funkwhale"
+    settings.APP_NAME = "FunQuail"
     preferences["instance__name"] = "Hello"
     preferences["instance__short_description"] = "World"
 
     expected = [
         {"tag": "meta", "property": "og:type", "content": "website"},
-        {"tag": "meta", "property": "og:site_name", "content": "Hello - Funkwhale"},
+        {"tag": "meta", "property": "og:site_name", "content": "Hello - FunQuail"},
         {"tag": "meta", "property": "og:description", "content": "World"},
         {
             "tag": "meta",
             "property": "og:image",
-            "content": settings.FUNKWHALE_URL + "/android-chrome-512x512.png",
+            "content": settings.FUNQUAIL_URL + "/android-chrome-512x512.png",
         },
-        {"tag": "meta", "property": "og:url", "content": settings.FUNKWHALE_URL + "/"},
+        {"tag": "meta", "property": "og:url", "content": settings.FUNQUAIL_URL + "/"},
     ]
 
     assert middleware.get_default_head_tags("/") == expected
@@ -131,7 +131,7 @@ def test_get_spa_html_from_http(local_cache, r_mock, mocker, settings):
     cache_set.assert_called_once_with(
         f"spa-file:{url}:index.html",
         "hello world",
-        settings.FUNKWHALE_SPA_HTML_CACHE_DURATION,
+        settings.FUNQUAIL_SPA_HTML_CACHE_DURATION,
     )
 
 
@@ -291,8 +291,8 @@ def test_throttle_status_middleware_returns_proper_response(mocker):
     ],
 )
 def test_rewrite_manifest_json_url(link, new_url, expected, mocker, settings):
-    settings.FUNKWHALE_SPA_REWRITE_MANIFEST = True
-    settings.FUNKWHALE_SPA_REWRITE_MANIFEST_URL = new_url
+    settings.FUNQUAIL_SPA_REWRITE_MANIFEST = True
+    settings.FUNQUAIL_SPA_REWRITE_MANIFEST_URL = new_url
     spa_html = "<html><head><link rel=before>{}<link rel=after></head></html>".format(
         link
     )
@@ -315,8 +315,8 @@ def test_rewrite_manifest_json_url(link, new_url, expected, mocker, settings):
 
 
 def test_rewrite_manifest_json_url_rewrite_disabled(mocker, settings):
-    settings.FUNKWHALE_SPA_REWRITE_MANIFEST = False
-    settings.FUNKWHALE_SPA_REWRITE_MANIFEST_URL = "custom_url"
+    settings.FUNQUAIL_SPA_REWRITE_MANIFEST = False
+    settings.FUNQUAIL_SPA_REWRITE_MANIFEST_URL = "custom_url"
     spa_html = "<html><head><link href=/manifest.json rel=manifest></head></html>"
     request = mocker.Mock(path="/", META={})
     mocker.patch.object(middleware, "get_spa_html", return_value=spa_html)
@@ -335,8 +335,8 @@ def test_rewrite_manifest_json_url_rewrite_disabled(mocker, settings):
 
 
 def test_rewrite_manifest_json_url_rewrite_default_url(mocker, settings):
-    settings.FUNKWHALE_SPA_REWRITE_MANIFEST = True
-    settings.FUNKWHALE_SPA_REWRITE_MANIFEST_URL = None
+    settings.FUNQUAIL_SPA_REWRITE_MANIFEST = True
+    settings.FUNQUAIL_SPA_REWRITE_MANIFEST_URL = None
     spa_html = "<html><head><link href=/manifest.json rel=manifest></head></html>"
     expected_url = federation_utils.full_url(reverse("api:v1:instance:spa-manifest"))
     request = mocker.Mock(path="/", META={})
diff --git a/api/tests/common/test_pagination.py b/api/tests/common/test_pagination.py
index cacbe740c..3398eb87c 100644
--- a/api/tests/common/test_pagination.py
+++ b/api/tests/common/test_pagination.py
@@ -17,7 +17,7 @@ from funkwhale_api.common import pagination
 def test_funkwhale_pagination_uses_view_page_size(
     view_max_page_size, view_default_page_size, request_page_size, expected, mocker
 ):
-    p = pagination.FunkwhalePagination()
+    p = pagination.FunQuailPagination()
 
     p.view = mocker.Mock(
         max_page_size=view_max_page_size, default_page_size=view_default_page_size
diff --git a/api/tests/common/test_scripts.py b/api/tests/common/test_scripts.py
index 35368dcc7..f5d334ea8 100644
--- a/api/tests/common/test_scripts.py
+++ b/api/tests/common/test_scripts.py
@@ -145,7 +145,7 @@ def test_migrate_to_user_libraries_generate_fids(
         if i == 0:
             assert o.fid == existing_fid
         else:
-            assert o.fid == template.format(settings.FUNKWHALE_URL, path, o.uuid)
+            assert o.fid == template.format(settings.FUNQUAIL_URL, path, o.uuid)
             # we also ensure the path we insert match the one that is generated
             # by the app on objects creation, as a safe guard for typos
             assert base_path == o.fid.replace(str(o.uuid), "")
@@ -175,7 +175,7 @@ def test_migrate_to_user_libraries_generate_actor_urls(
 
     assert getattr(local, field) is None
     expected = "{}/federation/actors/{}/{}".format(
-        settings.FUNKWHALE_URL, local.preferred_username, part
+        settings.FUNQUAIL_URL, local.preferred_username, part
     )
     ok_url = getattr(ok, field)
 
diff --git a/api/tests/common/test_session.py b/api/tests/common/test_session.py
index 531543455..42404fc2e 100644
--- a/api/tests/common/test_session.py
+++ b/api/tests/common/test_session.py
@@ -3,10 +3,10 @@ from funkwhale_api.common import session
 
 
 def test_get_user_agent(settings):
-    settings.FUNKWHALE_URL = "https://test.com"
+    settings.FUNQUAIL_URL = "https://test.com"
     "http.rb/3.0.0 (Mastodon/2.2.0; +https://mastodon.eliotberriot.com/)"
     expected = "python-requests (funkwhale/{}; +{})".format(
-        funkwhale_api.__version__, settings.FUNKWHALE_URL
+        funkwhale_api.__version__, settings.FUNQUAIL_URL
     )
     assert session.get_user_agent() == expected
 
diff --git a/api/tests/common/test_throttling.py b/api/tests/common/test_throttling.py
index 16cd44196..f060e7b4f 100644
--- a/api/tests/common/test_throttling.py
+++ b/api/tests/common/test_throttling.py
@@ -142,7 +142,7 @@ def test_throttle_anonymous(
     view = mocker.Mock(**view_args)
 
     cache_key = throttling.get_cache_key("test", ident)
-    throttle = throttling.FunkwhaleThrottle()
+    throttle = throttling.FunQuailThrottle()
 
     history = [time.time() for _ in range(previous_requests)]
     throttle.cache.set(cache_key, history)
@@ -205,7 +205,7 @@ def test_throttle_authenticated(
     view = mocker.Mock(**view_args)
 
     cache_key = throttling.get_cache_key("test", ident)
-    throttle = throttling.FunkwhaleThrottle()
+    throttle = throttling.FunQuailThrottle()
 
     history = [time.time() for _ in range(previous_requests)]
     throttle.cache.set(cache_key, history)
@@ -223,7 +223,7 @@ def throttle_successive(settings, mocker, api_request):
         action="retrieve", throttling_scopes={"retrieve": {"anonymous": "test"}}
     )
 
-    throttle = throttling.FunkwhaleThrottle()
+    throttle = throttling.FunQuailThrottle()
 
     assert throttle.allow_request(request, view) is True
     assert throttle.allow_request(request, view) is True
@@ -232,7 +232,7 @@ def throttle_successive(settings, mocker, api_request):
 
 
 def test_throttle_attach_info(mocker):
-    throttle = throttling.FunkwhaleThrottle()
+    throttle = throttling.FunQuailThrottle()
     request = mocker.Mock()
     setattr(throttle, "num_requests", 300)
     setattr(throttle, "duration", 3600)
@@ -254,7 +254,7 @@ def test_throttle_attach_info(mocker):
 
 @pytest.mark.parametrize("method", ["throttle_success", "throttle_failure"])
 def test_throttle_calls_attach_info(method, mocker):
-    throttle = throttling.FunkwhaleThrottle()
+    throttle = throttling.FunQuailThrottle()
     setattr(throttle, "key", "noop")
     setattr(throttle, "now", "noop")
     setattr(throttle, "duration", "noop")
@@ -272,7 +272,7 @@ def test_allow_request(api_request, settings, mocker):
     settings.THROTTLING_RATES = {"test": {"rate": "2/s"}}
     ip = "92.92.92.92"
     request = api_request.get("/", HTTP_X_FORWARDED_FOR=ip)
-    allow_request = mocker.spy(throttling.FunkwhaleThrottle, "allow_request")
+    allow_request = mocker.spy(throttling.FunQuailThrottle, "allow_request")
     action = "test"
     throttling_scopes = {"test": {"anonymous": "test", "authenticated": "test"}}
     throttling.check_request(request, action)
diff --git a/api/tests/common/test_utils.py b/api/tests/common/test_utils.py
index 10eff9810..71326d663 100644
--- a/api/tests/common/test_utils.py
+++ b/api/tests/common/test_utils.py
@@ -261,8 +261,8 @@ def test_monkey_patch_request_build_absolute_uri(
 ):
     settings.IGNORE_FORWARDED_HOST_AND_PROTO = ignore
     settings.ALLOWED_HOSTS = "*"
-    settings.FUNKWHALE_HOSTNAME = hostname
-    settings.FUNKWHALE_PROTOCOL = protocol
+    settings.FUNQUAIL_HOSTNAME = hostname
+    settings.FUNQUAIL_PROTOCOL = protocol
     request = fake_request.get("/", **meta)
 
     assert request.build_absolute_uri(path) == expected
diff --git a/api/tests/conftest.py b/api/tests/conftest.py
index d241db5a7..60ba42556 100644
--- a/api/tests/conftest.py
+++ b/api/tests/conftest.py
@@ -371,9 +371,9 @@ def stdout():
 
 @pytest.fixture
 def spa_html(r_mock, settings):
-    settings.FUNKWHALE_SPA_HTML_ROOT = "http://noop/"
+    settings.FUNQUAIL_SPA_HTML_ROOT = "http://noop/"
     yield r_mock.get(
-        settings.FUNKWHALE_SPA_HTML_ROOT + "index.html", text="<head></head>"
+        settings.FUNQUAIL_SPA_HTML_ROOT + "index.html", text="<head></head>"
     )
 
 
diff --git a/api/tests/federation/test_serializers.py b/api/tests/federation/test_serializers.py
index 117873c7e..fdd1703b4 100644
--- a/api/tests/federation/test_serializers.py
+++ b/api/tests/federation/test_serializers.py
@@ -1393,7 +1393,7 @@ def test_local_actor_serializer_to_ap(factories, settings):
         {
             "type": "Link",
             "href": "https://{}/@{}".format(
-                settings.FUNKWHALE_HOSTNAME, ac.preferred_username
+                settings.FUNQUAIL_HOSTNAME, ac.preferred_username
             ),
             "mediaType": "text/html",
         }
diff --git a/api/tests/federation/test_spa_views.py b/api/tests/federation/test_spa_views.py
index e7a4719be..489505dd7 100644
--- a/api/tests/federation/test_spa_views.py
+++ b/api/tests/federation/test_spa_views.py
@@ -13,7 +13,7 @@ def test_channel_detail(spa_html, no_api_auth, client, factories, settings):
         {
             "tag": "meta",
             "property": "og:url",
-            "content": utils.join_url(settings.FUNKWHALE_URL, url),
+            "content": utils.join_url(settings.FUNQUAIL_URL, url),
         },
         {"tag": "meta", "property": "og:title", "content": actor.display_name},
         {"tag": "meta", "property": "og:type", "content": "profile"},
diff --git a/api/tests/federation/test_tasks.py b/api/tests/federation/test_tasks.py
index 7f19981a6..178cd5728 100644
--- a/api/tests/federation/test_tasks.py
+++ b/api/tests/federation/test_tasks.py
@@ -698,6 +698,6 @@ def test_check_remote_instance_unreachable(factories, r_mock):
 
 def test_check_all_remote_instance_skips_local(settings, factories, r_mock):
     domain = factories["federation.Domain"]()
-    settings.FUNKWHALE_HOSTNAME = domain.name
+    settings.FUNQUAIL_HOSTNAME = domain.name
     tasks.check_all_remote_instance_availability()
     assert not r_mock.called
diff --git a/api/tests/federation/test_utils.py b/api/tests/federation/test_utils.py
index 876d38e4a..0be55b621 100644
--- a/api/tests/federation/test_utils.py
+++ b/api/tests/federation/test_utils.py
@@ -15,7 +15,7 @@ from funkwhale_api.federation import exceptions, utils
     ],
 )
 def test_full_url(settings, url, path, expected):
-    settings.FUNKWHALE_URL = url
+    settings.FUNQUAIL_URL = url
     assert utils.full_url(path) == expected
 
 
diff --git a/api/tests/federation/test_views.py b/api/tests/federation/test_views.py
index 3227ec720..f1bd3098b 100644
--- a/api/tests/federation/test_views.py
+++ b/api/tests/federation/test_views.py
@@ -53,7 +53,7 @@ def test_wellknown_nodeinfo(db, preferences, api_client, settings):
             {
                 "rel": "http://nodeinfo.diaspora.software/ns/schema/2.0",
                 "href": "{}{}".format(
-                    settings.FUNKWHALE_URL, reverse("api:v1:instance:nodeinfo-2.0")
+                    settings.FUNQUAIL_URL, reverse("api:v1:instance:nodeinfo-2.0")
                 ),
             }
         ]
@@ -413,7 +413,7 @@ def test_music_library_retrieve_redirects_to_html_if_header_set(
     url = reverse("federation:music:libraries-detail", kwargs={"uuid": library.uuid})
     response = api_client.get(url, HTTP_ACCEPT="text/html")
     expected_url = utils.join_url(
-        settings.FUNKWHALE_URL,
+        settings.FUNQUAIL_URL,
         utils.spa_reverse("library_library", kwargs={"uuid": library.uuid}),
     )
     assert response.status_code == 302
@@ -431,7 +431,7 @@ def test_actor_retrieve_redirects_to_html_if_header_set(
     )
     response = api_client.get(url, HTTP_ACCEPT="text/html")
     expected_url = utils.join_url(
-        settings.FUNKWHALE_URL,
+        settings.FUNQUAIL_URL,
         utils.spa_reverse(
             "actor_detail", kwargs={"username": actor.preferred_username}
         ),
@@ -451,7 +451,7 @@ def test_channel_actor_retrieve_redirects_to_html_if_header_set(
     )
     response = api_client.get(url, HTTP_ACCEPT="text/html")
     expected_url = utils.join_url(
-        settings.FUNKWHALE_URL,
+        settings.FUNQUAIL_URL,
         utils.spa_reverse(
             "channel_detail", kwargs={"username": channel.actor.preferred_username}
         ),
@@ -471,7 +471,7 @@ def test_upload_retrieve_redirects_to_html_if_header_set(
     )
     response = api_client.get(url, HTTP_ACCEPT="text/html")
     expected_url = utils.join_url(
-        settings.FUNKWHALE_URL,
+        settings.FUNQUAIL_URL,
         utils.spa_reverse("library_track", kwargs={"pk": upload.track.pk}),
     )
     assert response.status_code == 302
@@ -489,7 +489,7 @@ def test_track_retrieve_redirects_to_html_if_header_set(
     )
     response = api_client.get(url, HTTP_ACCEPT="text/html")
     expected_url = utils.join_url(
-        settings.FUNKWHALE_URL,
+        settings.FUNQUAIL_URL,
         utils.spa_reverse("library_track", kwargs={"pk": track.pk}),
     )
     assert response.status_code == 302
@@ -507,7 +507,7 @@ def test_album_retrieve_redirects_to_html_if_header_set(
     )
     response = api_client.get(url, HTTP_ACCEPT="text/html")
     expected_url = utils.join_url(
-        settings.FUNKWHALE_URL,
+        settings.FUNQUAIL_URL,
         utils.spa_reverse("library_album", kwargs={"pk": album.pk}),
     )
     assert response.status_code == 302
@@ -525,7 +525,7 @@ def test_artist_retrieve_redirects_to_html_if_header_set(
     )
     response = api_client.get(url, HTTP_ACCEPT="text/html")
     expected_url = utils.join_url(
-        settings.FUNKWHALE_URL,
+        settings.FUNQUAIL_URL,
         utils.spa_reverse("library_artist", kwargs={"pk": artist.pk}),
     )
     assert response.status_code == 302
diff --git a/api/tests/instance/test_nodeinfo.py b/api/tests/instance/test_nodeinfo.py
index e8896e3bd..7909b0b1d 100644
--- a/api/tests/instance/test_nodeinfo.py
+++ b/api/tests/instance/test_nodeinfo.py
@@ -102,7 +102,7 @@ def test_nodeinfo_21(api_client):
                 ("name", "funkwhale"),
                 ("version", api_version),
                 ("repository", "https://dev.funkwhale.audio/funkwhale/funkwhale"),
-                ("homepage", "https://funkwhale.audio"),
+                ("homepage", "https://funquail.laidback.moe"),
             ]
         ),
         "protocols": ["activitypub"],
diff --git a/api/tests/moderation/test_tasks.py b/api/tests/moderation/test_tasks.py
index 48e445c15..4d0f9fd6b 100644
--- a/api/tests/moderation/test_tasks.py
+++ b/api/tests/moderation/test_tasks.py
@@ -31,7 +31,7 @@ def test_report_created_signal_sends_email_to_mods(factories, mailoutbox, settin
     for i, mod in enumerate([mod1, mod2]):
         m = mailoutbox[i]
         assert m.subject == "[{} moderation - {}] New report from {}".format(
-            settings.FUNKWHALE_HOSTNAME,
+            settings.FUNQUAIL_HOSTNAME,
             report.get_type_display(),
             report.submitter.full_username,
         )
@@ -63,7 +63,7 @@ def test_signup_request_pending_sends_email_to_mods(factories, mailoutbox, setti
     for i, mod in enumerate([mod1, mod2]):
         m = mailoutbox[i]
         assert m.subject == "[{} moderation] New sign-up request from {}".format(
-            settings.FUNKWHALE_HOSTNAME,
+            settings.FUNQUAIL_HOSTNAME,
             signup_request.submitter.preferred_username,
         )
         assert detail_url in m.body
@@ -89,7 +89,7 @@ def test_approved_request_sends_email_to_submitter_and_set_active(
     m = mailoutbox[-1]
     login_url = federation_utils.full_url("/login")
     assert m.subject == "Welcome to {}, {}!".format(
-        settings.FUNKWHALE_HOSTNAME,
+        settings.FUNQUAIL_HOSTNAME,
         signup_request.submitter.preferred_username,
     )
     assert login_url in m.body
@@ -115,7 +115,7 @@ def test_refused_request_sends_email_to_submitter(
     assert len(mailoutbox) == 1
     m = mailoutbox[-1]
     assert m.subject == "Your account request at {} was refused".format(
-        settings.FUNKWHALE_HOSTNAME,
+        settings.FUNQUAIL_HOSTNAME,
     )
     assert "test@pod.example" in m.body
     assert list(m.to) == [user.email]
diff --git a/api/tests/music/test_activity.py b/api/tests/music/test_activity.py
index 813b49599..40e256b7c 100644
--- a/api/tests/music/test_activity.py
+++ b/api/tests/music/test_activity.py
@@ -9,7 +9,7 @@ def test_get_track_activity_url_mbid(factories):
 
 def test_get_track_activity_url_no_mbid(settings, factories):
     track = factories["music.Track"](mbid=None)
-    expected = settings.FUNKWHALE_URL + f"/tracks/{track.pk}"
+    expected = settings.FUNQUAIL_URL + f"/tracks/{track.pk}"
     assert track.get_activity_url() == expected
 
 
diff --git a/api/tests/music/test_spa_views.py b/api/tests/music/test_spa_views.py
index 391b5cc2e..0b3c78923 100644
--- a/api/tests/music/test_spa_views.py
+++ b/api/tests/music/test_spa_views.py
@@ -22,7 +22,7 @@ def test_library_track(spa_html, no_api_auth, client, factories, settings):
         {
             "tag": "meta",
             "property": "og:url",
-            "content": utils.join_url(settings.FUNKWHALE_URL, url),
+            "content": utils.join_url(settings.FUNQUAIL_URL, url),
         },
         {"tag": "meta", "property": "og:title", "content": track.title},
         {"tag": "meta", "property": "og:type", "content": "music.song"},
@@ -40,7 +40,7 @@ def test_library_track(spa_html, no_api_auth, client, factories, settings):
             "tag": "meta",
             "property": "music:musician",
             "content": utils.join_url(
-                settings.FUNKWHALE_URL,
+                settings.FUNQUAIL_URL,
                 utils.spa_reverse("library_artist", kwargs={"pk": track.artist.pk}),
             ),
         },
@@ -48,7 +48,7 @@ def test_library_track(spa_html, no_api_auth, client, factories, settings):
             "tag": "meta",
             "property": "music:album",
             "content": utils.join_url(
-                settings.FUNKWHALE_URL,
+                settings.FUNQUAIL_URL,
                 utils.spa_reverse("library_album", kwargs={"pk": track.album.pk}),
             ),
         },
@@ -60,7 +60,7 @@ def test_library_track(spa_html, no_api_auth, client, factories, settings):
         {
             "tag": "meta",
             "property": "og:audio",
-            "content": utils.join_url(settings.FUNKWHALE_URL, track.listen_url),
+            "content": utils.join_url(settings.FUNQUAIL_URL, track.listen_url),
         },
         {
             "tag": "link",
@@ -73,9 +73,9 @@ def test_library_track(spa_html, no_api_auth, client, factories, settings):
             "rel": "alternate",
             "type": "application/json+oembed",
             "href": (
-                utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
+                utils.join_url(settings.FUNQUAIL_URL, reverse("api:v1:oembed"))
                 + "?format=json&url={}".format(
-                    urllib.parse.quote_plus(utils.join_url(settings.FUNKWHALE_URL, url))
+                    urllib.parse.quote_plus(utils.join_url(settings.FUNQUAIL_URL, url))
                 )
             ),
         },
@@ -108,7 +108,7 @@ def test_library_album(spa_html, no_api_auth, client, factories, settings):
         {
             "tag": "meta",
             "property": "og:url",
-            "content": utils.join_url(settings.FUNKWHALE_URL, url),
+            "content": utils.join_url(settings.FUNQUAIL_URL, url),
         },
         {"tag": "meta", "property": "og:title", "content": album.title},
         {"tag": "meta", "property": "og:type", "content": "music.album"},
@@ -116,7 +116,7 @@ def test_library_album(spa_html, no_api_auth, client, factories, settings):
             "tag": "meta",
             "property": "music:musician",
             "content": utils.join_url(
-                settings.FUNKWHALE_URL,
+                settings.FUNQUAIL_URL,
                 utils.spa_reverse("library_artist", kwargs={"pk": album.artist.pk}),
             ),
         },
@@ -141,9 +141,9 @@ def test_library_album(spa_html, no_api_auth, client, factories, settings):
             "rel": "alternate",
             "type": "application/json+oembed",
             "href": (
-                utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
+                utils.join_url(settings.FUNQUAIL_URL, reverse("api:v1:oembed"))
                 + "?format=json&url={}".format(
-                    urllib.parse.quote_plus(utils.join_url(settings.FUNKWHALE_URL, url))
+                    urllib.parse.quote_plus(utils.join_url(settings.FUNQUAIL_URL, url))
                 )
             ),
         },
@@ -175,7 +175,7 @@ def test_library_artist(spa_html, no_api_auth, client, factories, settings):
         {
             "tag": "meta",
             "property": "og:url",
-            "content": utils.join_url(settings.FUNKWHALE_URL, url),
+            "content": utils.join_url(settings.FUNQUAIL_URL, url),
         },
         {"tag": "meta", "property": "og:title", "content": artist.name},
         {"tag": "meta", "property": "og:type", "content": "profile"},
@@ -195,9 +195,9 @@ def test_library_artist(spa_html, no_api_auth, client, factories, settings):
             "rel": "alternate",
             "type": "application/json+oembed",
             "href": (
-                utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
+                utils.join_url(settings.FUNQUAIL_URL, reverse("api:v1:oembed"))
                 + "?format=json&url={}".format(
-                    urllib.parse.quote_plus(utils.join_url(settings.FUNKWHALE_URL, url))
+                    urllib.parse.quote_plus(utils.join_url(settings.FUNQUAIL_URL, url))
                 )
             ),
         },
@@ -232,7 +232,7 @@ def test_library_playlist(spa_html, no_api_auth, client, factories, settings):
         {
             "tag": "meta",
             "property": "og:url",
-            "content": utils.join_url(settings.FUNKWHALE_URL, url),
+            "content": utils.join_url(settings.FUNQUAIL_URL, url),
         },
         {"tag": "meta", "property": "og:title", "content": playlist.name},
         {"tag": "meta", "property": "og:type", "content": "music.playlist"},
@@ -246,9 +246,9 @@ def test_library_playlist(spa_html, no_api_auth, client, factories, settings):
             "rel": "alternate",
             "type": "application/json+oembed",
             "href": (
-                utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
+                utils.join_url(settings.FUNQUAIL_URL, reverse("api:v1:oembed"))
                 + "?format=json&url={}".format(
-                    urllib.parse.quote_plus(utils.join_url(settings.FUNKWHALE_URL, url))
+                    urllib.parse.quote_plus(utils.join_url(settings.FUNQUAIL_URL, url))
                 )
             ),
         },
@@ -279,7 +279,7 @@ def test_library_playlist_empty(spa_html, no_api_auth, client, factories, settin
         {
             "tag": "meta",
             "property": "og:url",
-            "content": utils.join_url(settings.FUNKWHALE_URL, url),
+            "content": utils.join_url(settings.FUNQUAIL_URL, url),
         },
         {"tag": "meta", "property": "og:title", "content": playlist.name},
         {"tag": "meta", "property": "og:type", "content": "music.playlist"},
@@ -301,7 +301,7 @@ def test_library_library(spa_html, no_api_auth, client, factories, settings):
         {
             "tag": "meta",
             "property": "og:url",
-            "content": utils.join_url(settings.FUNKWHALE_URL, url),
+            "content": utils.join_url(settings.FUNQUAIL_URL, url),
         },
         {"tag": "meta", "property": "og:type", "content": "website"},
         {"tag": "meta", "property": "og:title", "content": library.name},
diff --git a/api/tests/music/test_views.py b/api/tests/music/test_views.py
index 1e347f4b5..fdd854897 100644
--- a/api/tests/music/test_views.py
+++ b/api/tests/music/test_views.py
@@ -1022,8 +1022,8 @@ def test_detail_license(api_client, preferences):
 
 
 def test_oembed_track(factories, no_api_auth, api_client, settings):
-    settings.FUNKWHALE_URL = "http://test"
-    settings.FUNKWHALE_EMBED_URL = "http://embed"
+    settings.FUNQUAIL_URL = "http://test"
+    settings.FUNQUAIL_EMBED_URL = "http://embed"
     track = factories["music.Track"](album__with_cover=True)
     url = reverse("api:v1:oembed")
     track_url = f"https://test.com/library/tracks/{track.pk}"
@@ -1032,7 +1032,7 @@ def test_oembed_track(factories, no_api_auth, api_client, settings):
         "version": "1.0",
         "type": "rich",
         "provider_name": settings.APP_NAME,
-        "provider_url": settings.FUNKWHALE_URL,
+        "provider_url": settings.FUNQUAIL_URL,
         "height": 150,
         "width": 600,
         "title": f"{track.title} by {track.artist.name}",
@@ -1057,8 +1057,8 @@ def test_oembed_track(factories, no_api_auth, api_client, settings):
 
 
 def test_oembed_album(factories, no_api_auth, api_client, settings):
-    settings.FUNKWHALE_URL = "http://test"
-    settings.FUNKWHALE_EMBED_URL = "http://embed"
+    settings.FUNQUAIL_URL = "http://test"
+    settings.FUNQUAIL_EMBED_URL = "http://embed"
     track = factories["music.Track"](album__with_cover=True)
     album = track.album
     url = reverse("api:v1:oembed")
@@ -1068,7 +1068,7 @@ def test_oembed_album(factories, no_api_auth, api_client, settings):
         "version": "1.0",
         "type": "rich",
         "provider_name": settings.APP_NAME,
-        "provider_url": settings.FUNKWHALE_URL,
+        "provider_url": settings.FUNQUAIL_URL,
         "height": 400,
         "width": 600,
         "title": f"{album.title} by {album.artist.name}",
@@ -1093,8 +1093,8 @@ def test_oembed_album(factories, no_api_auth, api_client, settings):
 
 
 def test_oembed_artist(factories, no_api_auth, api_client, settings):
-    settings.FUNKWHALE_URL = "http://test"
-    settings.FUNKWHALE_EMBED_URL = "http://embed"
+    settings.FUNQUAIL_URL = "http://test"
+    settings.FUNQUAIL_EMBED_URL = "http://embed"
     track = factories["music.Track"](album__with_cover=True)
     album = track.album
     artist = track.artist
@@ -1105,7 +1105,7 @@ def test_oembed_artist(factories, no_api_auth, api_client, settings):
         "version": "1.0",
         "type": "rich",
         "provider_name": settings.APP_NAME,
-        "provider_url": settings.FUNKWHALE_URL,
+        "provider_url": settings.FUNQUAIL_URL,
         "height": 400,
         "width": 600,
         "title": artist.name,
@@ -1130,8 +1130,8 @@ def test_oembed_artist(factories, no_api_auth, api_client, settings):
 
 
 def test_oembed_playlist(factories, no_api_auth, api_client, settings):
-    settings.FUNKWHALE_URL = "http://test"
-    settings.FUNKWHALE_EMBED_URL = "http://embed"
+    settings.FUNQUAIL_URL = "http://test"
+    settings.FUNQUAIL_EMBED_URL = "http://embed"
     playlist = factories["playlists.Playlist"](privacy_level="everyone")
     track = factories["music.Upload"](
         playable=True, track__album__with_cover=True
@@ -1144,7 +1144,7 @@ def test_oembed_playlist(factories, no_api_auth, api_client, settings):
         "version": "1.0",
         "type": "rich",
         "provider_name": settings.APP_NAME,
-        "provider_url": settings.FUNKWHALE_URL,
+        "provider_url": settings.FUNQUAIL_URL,
         "height": 400,
         "width": 600,
         "title": playlist.name,
diff --git a/api/tests/users/test_activity.py b/api/tests/users/test_activity.py
index cfacff997..d4a4d6f62 100644
--- a/api/tests/users/test_activity.py
+++ b/api/tests/users/test_activity.py
@@ -4,7 +4,7 @@ from funkwhale_api.users import serializers
 def test_get_user_activity_url(settings, factories):
     user = factories["users.User"]()
     assert user.get_activity_url() == "{}/@{}".format(
-        settings.FUNKWHALE_URL, user.username
+        settings.FUNQUAIL_URL, user.username
     )
 
 
diff --git a/api/tests/users/test_models.py b/api/tests/users/test_models.py
index 5a3f9dc55..24f338de7 100644
--- a/api/tests/users/test_models.py
+++ b/api/tests/users/test_models.py
@@ -234,7 +234,7 @@ def test_user_get_quota_status(factories, preferences, mocker):
     "setting_name, field",
     [
         ("INSTANCE_SUPPORT_MESSAGE_DELAY", "instance_support_message_display_date"),
-        ("FUNKWHALE_SUPPORT_MESSAGE_DELAY", "funkwhale_support_message_display_date"),
+        ("FUNQUAIL_SUPPORT_MESSAGE_DELAY", "funkwhale_support_message_display_date"),
     ],
 )
 def test_creating_user_set_support_display_date(
diff --git a/api/tests/users/test_views.py b/api/tests/users/test_views.py
index 432f371fb..41da0da93 100644
--- a/api/tests/users/test_views.py
+++ b/api/tests/users/test_views.py
@@ -166,7 +166,7 @@ def test_can_request_password_reset(
 
     confirmation_message = mailoutbox[-1]
     assert "Hello world" in confirmation_message.body
-    assert settings.FUNKWHALE_HOSTNAME in confirmation_message.body
+    assert settings.FUNQUAIL_HOSTNAME in confirmation_message.body
 
 
 def test_user_can_patch_his_own_settings(logged_in_api_client):
@@ -327,7 +327,7 @@ def test_creating_user_sends_confirmation_email(
 
     confirmation_message = mailoutbox[-1]
     assert "Hello world" in confirmation_message.body
-    assert settings.FUNKWHALE_HOSTNAME in confirmation_message.body
+    assert settings.FUNQUAIL_HOSTNAME in confirmation_message.body
 
 
 def test_user_account_deletion_requires_valid_password(logged_in_api_client):
@@ -425,7 +425,7 @@ def test_signup_with_approval_enabled(
 
     confirmation_message = mailoutbox[-1]
     assert "confirm" in confirmation_message.body
-    assert settings.FUNKWHALE_HOSTNAME in confirmation_message.body
+    assert settings.FUNQUAIL_HOSTNAME in confirmation_message.body
 
 
 def test_signup_with_approval_enabled_validation_error(
diff --git a/changes/template.md.j2 b/changes/template.md.j2
index 6393117f2..133566739 100644
--- a/changes/template.md.j2
+++ b/changes/template.md.j2
@@ -1,6 +1,6 @@
 ## {{ versiondata.version }} ({{ versiondata.date }})
 
-Upgrade instructions are available at https://docs.funkwhale.audio/administrator/upgrade/index.html
+Upgrade instructions are available at https://funquail.laidback.moe/docs/administrator/upgrade/index.html
 
 {% for section, _ in sections.items() %}
 {% if sections[section] %}
diff --git a/deploy/FreeBSD/README.md b/deploy/FreeBSD/README.md
index 5880f2b39..19073561d 100644
--- a/deploy/FreeBSD/README.md
+++ b/deploy/FreeBSD/README.md
@@ -3,19 +3,19 @@
 Copy the file in `/usr/local/etc/rc.d`
 
 ```
-# cp /path/to/funkwhale/deploy/FreeBSD/funkwhale_* /usr/local/etc/rc.d
+# cp /path/to/funquail/deploy/FreeBSD/funquail_* /usr/local/etc/rc.d
 ```
 
 If not add executable bit to the files.
 
 ```
-# chmod +x /usr/local/etc/rc.d/funkwhale_*
+# chmod +x /usr/local/etc/rc.d/funquail_*
 ```
 
 Enable services in rc.conf
 
 ```
-# sysrc funkwhale_server=YES
-# sysrc funkwhale_worker=YES
-# sysrc funkwhale_beat=YES
+# sysrc funquail_server=YES
+# sysrc funquail_worker=YES
+# sysrc funquail_beat=YES
 ```
diff --git a/deploy/FreeBSD/funkwhale_beat b/deploy/FreeBSD/funkwhale_beat
deleted file mode 100755
index 2c15ecfcf..000000000
--- a/deploy/FreeBSD/funkwhale_beat
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC2034
-
-# PROVIDE: funkwhale_beat
-# REQUIRE: LOGIN postgresql nginx redis
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to enable funkwhale_beat:
-# funkwhale_beat (bool):        Set it to "YES" to enable Funkwhale task beat.
-#                               Default is "NO".
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
-
-# shellcheck disable=SC1091
-. /etc/rc.subr
-
-desc="Funkwhale beat"
-name="funkwhale_beat"
-rcvar="funkwhale_beat_enable"
-
-load_rc_config "$name"
-
-: "${funkwhale_beat_enable:=NO}"
-
-funkwhale_beat_chdir="/usr/local/www/funkwhale/api"
-funkwhale_beat_user="funkwhale"
-funkwhale_beat_env="$(grep -v '^#' /usr/local/www/funkwhale/config/.env | xargs)"
-pidfile="/var/run/funkwhale/${name##funkwhale_}.pid"
-command_interpreter="/usr/local/www/funkwhale/venv/bin/python3"
-
-command="/usr/local/www/funkwhale/venv/bin/celery"
-command_args="\
---app funkwhale_api.taskapp \
-beat \
---loglevel INFO \
---pidfile $pidfile \
->> /var/log/funkwhale/${name##funkwhale_}.log 2>&1 &"
-
-run_rc_command "$1"
diff --git a/deploy/FreeBSD/funkwhale_server b/deploy/FreeBSD/funkwhale_server
deleted file mode 100755
index 9878dcf85..000000000
--- a/deploy/FreeBSD/funkwhale_server
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC2034
-
-# PROVIDE: funkwhale_server
-# REQUIRE: LOGIN postgresql nginx redis
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to enable funkwhale_server:
-# funkwhale_server (bool):        Set it to "YES" to enable Funkwhale web server.
-#                                 Default is "NO".
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
-
-# shellcheck disable=SC1091
-. /etc/rc.subr
-
-desc="Funkwhale server"
-name="funkwhale_server"
-rcvar="funkwhale_server_enable"
-
-load_rc_config "$name"
-
-: "${funkwhale_server_enable:=NO}"
-
-funkwhale_server_chdir="/usr/local/www/funkwhale/api"
-funkwhale_server_user="funkwhale"
-funkwhale_server_env="$(grep -v '^#' /usr/local/www/funkwhale/config/.env | xargs)"
-command_interpreter="/usr/local/www/funkwhale/venv/bin/python3"
-
-command="/usr/local/www/funkwhale/venv/bin/gunicorn"
-command_args="\
-config.asgi:application \
---workers 4 \
---worker-class uvicorn.workers.UvicornWorker \
---bind 127.0.0.1:5000 \
->> /var/log/funkwhale/${name##funkwhale_}.log 2>&1 &"
-
-run_rc_command "$1"
diff --git a/deploy/FreeBSD/funkwhale_worker b/deploy/FreeBSD/funkwhale_worker
deleted file mode 100755
index a88c881e6..000000000
--- a/deploy/FreeBSD/funkwhale_worker
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC2034
-
-# PROVIDE: funkwhale_worker
-# REQUIRE: LOGIN postgresql nginx redis
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to enable funkwhale_worker:
-# funkwhale_worker (bool):        Set it to "YES" to enable Funkwhale task worker.
-#                                 Default is "NO".
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
-
-# shellcheck disable=SC1091
-. /etc/rc.subr
-
-desc="Funkwhale worker"
-name="funkwhale_worker"
-rcvar="funkwhale_worker_enable"
-
-load_rc_config "$name"
-
-: "${funkwhale_worker_enable:=NO}"
-
-funkwhale_worker_chdir="/usr/local/www/funkwhale/api"
-funkwhale_worker_user="funkwhale"
-funkwhale_worker_env=$(grep -v '^#' /usr/local/www/funkwhale/config/.env | xargs)
-pidfile="/var/run/funkwhale/${name##funkwhale_}.pid"
-command_interpreter="/usr/local/www/funkwhale/venv/bin/python3"
-
-command="/usr/local/www/funkwhale/venv/bin/celery"
-command_args="\
---app funkwhale_api.taskapp \
-worker \
---loglevel INFO \
---pidfile $pidfile \
->> /var/log/funkwhale/${name##funkwhale_}.log 2>&1 &"
-
-run_rc_command "$1"
diff --git a/deploy/FreeBSD/funquail_beat b/deploy/FreeBSD/funquail_beat
new file mode 100755
index 000000000..8b38170ba
--- /dev/null
+++ b/deploy/FreeBSD/funquail_beat
@@ -0,0 +1,39 @@
+#!/bin/sh
+# shellcheck disable=SC2034
+
+# PROVIDE: funquail_beat
+# REQUIRE: LOGIN postgresql nginx redis
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf to enable funquail_beat:
+# funquail_beat (bool):        Set it to "YES" to enable FunQuail task beat.
+#                               Default is "NO".
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
+
+# shellcheck disable=SC1091
+. /etc/rc.subr
+
+desc="FunQuail beat"
+name="funquail_beat"
+rcvar="funquail_beat_enable"
+
+load_rc_config "$name"
+
+: "${funquail_beat_enable:=NO}"
+
+funquail_beat_chdir="/usr/local/www/funquail/api"
+funquail_beat_user="funquail"
+funquail_beat_env="$(grep -v '^#' /usr/local/www/funquail/config/.env | xargs)"
+pidfile="/var/run/funquail/${name##funquail_}.pid"
+command_interpreter="/usr/local/www/funquail/venv/bin/python3"
+
+command="/usr/local/www/funquail/venv/bin/celery"
+command_args="\
+--app funquail_api.taskapp \
+beat \
+--loglevel INFO \
+--pidfile $pidfile \
+>> /var/log/funquail/${name##funquail_}.log 2>&1 &"
+
+run_rc_command "$1"
diff --git a/deploy/FreeBSD/funquail_server b/deploy/FreeBSD/funquail_server
new file mode 100755
index 000000000..5577de4d9
--- /dev/null
+++ b/deploy/FreeBSD/funquail_server
@@ -0,0 +1,38 @@
+#!/bin/sh
+# shellcheck disable=SC2034
+
+# PROVIDE: funquail_server
+# REQUIRE: LOGIN postgresql nginx redis
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf to enable funquail_server:
+# funquail_server (bool):        Set it to "YES" to enable FunQuail web server.
+#                                 Default is "NO".
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
+
+# shellcheck disable=SC1091
+. /etc/rc.subr
+
+desc="FunQuail server"
+name="funquail_server"
+rcvar="funquail_server_enable"
+
+load_rc_config "$name"
+
+: "${funquail_server_enable:=NO}"
+
+funquail_server_chdir="/usr/local/www/funquail/api"
+funquail_server_user="funquail"
+funquail_server_env="$(grep -v '^#' /usr/local/www/funquail/config/.env | xargs)"
+command_interpreter="/usr/local/www/funquail/venv/bin/python3"
+
+command="/usr/local/www/funquail/venv/bin/gunicorn"
+command_args="\
+config.asgi:application \
+--workers 4 \
+--worker-class uvicorn.workers.UvicornWorker \
+--bind 127.0.0.1:5000 \
+>> /var/log/funquail/${name##funquail_}.log 2>&1 &"
+
+run_rc_command "$1"
diff --git a/deploy/FreeBSD/funquail_worker b/deploy/FreeBSD/funquail_worker
new file mode 100755
index 000000000..5fad6801a
--- /dev/null
+++ b/deploy/FreeBSD/funquail_worker
@@ -0,0 +1,39 @@
+#!/bin/sh
+# shellcheck disable=SC2034
+
+# PROVIDE: funquail_worker
+# REQUIRE: LOGIN postgresql nginx redis
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf to enable funquail_worker:
+# funquail_worker (bool):        Set it to "YES" to enable FunQuail task worker.
+#                                 Default is "NO".
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
+
+# shellcheck disable=SC1091
+. /etc/rc.subr
+
+desc="FunQuail worker"
+name="funquail_worker"
+rcvar="funquail_worker_enable"
+
+load_rc_config "$name"
+
+: "${funquail_worker_enable:=NO}"
+
+funquail_worker_chdir="/usr/local/www/funquail/api"
+funquail_worker_user="funquail"
+funquail_worker_env=$(grep -v '^#' /usr/local/www/funquail/config/.env | xargs)
+pidfile="/var/run/funquail/${name##funquail_}.pid"
+command_interpreter="/usr/local/www/funquail/venv/bin/python3"
+
+command="/usr/local/www/funquail/venv/bin/celery"
+command_args="\
+--app funquail_api.taskapp \
+worker \
+--loglevel INFO \
+--pidfile $pidfile \
+>> /var/log/funquail/${name##funquail_}.log 2>&1 &"
+
+run_rc_command "$1"
diff --git a/deploy/Gentoo/README.md b/deploy/Gentoo/README.md
index 04cbc1a3b..a3ed390dd 100644
--- a/deploy/Gentoo/README.md
+++ b/deploy/Gentoo/README.md
@@ -3,17 +3,17 @@
 Copy the files to `/etc/init.d/`
 
 ```
-# cp /path/to/scripts/funkwhale_* /etc/init.d/
+# cp /path/to/scripts/funquail_* /etc/init.d/
 ```
 
 Make the files executable:
 
 ```
-# chmod +x /etc/init.d/funkwhale_*
+# chmod +x /etc/init.d/funquail_*
 ```
 
-Starting funkwhale_server will automatically start the other two, as well as nginx and redis.
+Starting funquail_server will automatically start the other two, as well as nginx and redis.
 
 ```
-# rc-service funkwhale_server start
+# rc-service funquail_server start
 ```
diff --git a/deploy/Gentoo/funkwhale_beat b/deploy/Gentoo/funquail_beat
similarity index 54%
rename from deploy/Gentoo/funkwhale_beat
rename to deploy/Gentoo/funquail_beat
index 71c64477e..f1a3cbbd2 100755
--- a/deploy/Gentoo/funkwhale_beat
+++ b/deploy/Gentoo/funquail_beat
@@ -1,25 +1,25 @@
 #!/sbin/openrc-run
 # shellcheck shell=bash
 
-NAME="funkwhalebeat"
+NAME="funquailbeat"
 PIDFILE="/var/run/$NAME.pid"
-USER="funkwhale"
-WORKDIR="/srv/funkwhale/api"
-Celery="/srv/funkwhale/venv/bin/celery"
-BEAT_ARGS="--app funkwhale_api.taskapp beat --loglevel INFO"
+USER="funquail"
+WORKDIR="/srv/funquail/api"
+Celery="/srv/funquail/venv/bin/celery"
+BEAT_ARGS="--app funquail_api.taskapp beat --loglevel INFO"
 
 depend() {
   need net
 }
 
 start() {
-  ebegin "Starting Funkwhale Beat"
-  cd /srv/funkwhale/api || exit 1
+  ebegin "Starting FunQuail Beat"
+  cd /srv/funquail/api || exit 1
 
   # shellcheck disable=SC1091
-  set -a && source /srv/funkwhale/config/.env && set +a
+  set -a && source /srv/funquail/config/.env && set +a
 
-  echo "Starting Funkwhale Beat"
+  echo "Starting FunQuail Beat"
   # shellcheck disable=SC2086
   start-stop-daemon --start \
     --user "$USER" \
@@ -29,13 +29,13 @@ start() {
     --exec "$Celery" \
     -- $BEAT_ARGS \
     >> /var/log/funk/worker.log 2>&1 &
-  echo "Funkwhale Beat started"
+  echo "FunQuail Beat started"
   echo
   eend $?
 }
 
 stop() {
-  ebegin "Stopping Funkwhale Beat"
+  ebegin "Stopping FunQuail Beat"
   start-stop-daemon --stop --pidfile "$PIDFILE"
   eend $?
 }
diff --git a/deploy/Gentoo/funkwhale_server b/deploy/Gentoo/funquail_server
similarity index 58%
rename from deploy/Gentoo/funkwhale_server
rename to deploy/Gentoo/funquail_server
index 2f2d2702f..10953abd1 100755
--- a/deploy/Gentoo/funkwhale_server
+++ b/deploy/Gentoo/funquail_server
@@ -1,25 +1,25 @@
 #!/sbin/openrc-run
 # shellcheck shell=bash
 
-NAME="funkwhaleserver"
+NAME="funquailserver"
 PIDFILE="/var/run/$NAME.pid"
-USER="funkwhale"
+USER="funquail"
 DAEMON_ARGS="config.asgi:application --workers 4 --worker-class uvicorn.workers.UvicornWorker --bind 127.0.0.1:5000"
-Gunicorn="/srv/funkwhale/venv/bin/gunicorn"
-WORKDIR="/srv/funkwhale/api"
+Gunicorn="/srv/funquail/venv/bin/gunicorn"
+WORKDIR="/srv/funquail/api"
 
 depend() {
-  need net redis postgresql nginx funkwhale_beat funkwhale_worker
+  need net redis postgresql nginx funquail_beat funquail_worker
 }
 
 start() {
-  ebegin "Starting Funkwhale Server"
-  cd /srv/funkwhale/api || exit 1
+  ebegin "Starting FunQuail Server"
+  cd /srv/funquail/api || exit 1
 
   # shellcheck disable=SC1091
-  set -a && source /srv/funkwhale/config/.env && set +a
+  set -a && source /srv/funquail/config/.env && set +a
 
-  echo "Starting Funkwhale Server"
+  echo "Starting FunQuail Server"
   # shellcheck disable=SC2086
   start-stop-daemon --start \
     --user "$USER" \
@@ -29,13 +29,13 @@ start() {
     --exec "$Gunicorn" \
     -- $DAEMON_ARGS \
     >> /var/log/funk/server.log 2>&1 &
-  echo "Funkwhale Server started"
+  echo "FunQuail Server started"
   echo
   eend $?
 }
 
 stop() {
-  ebegin "Stopping Funkwhale"
+  ebegin "Stopping FunQuail"
   start-stop-daemon --stop --pidfile "$PIDFILE"
   eend $?
 }
diff --git a/deploy/Gentoo/funkwhale_worker b/deploy/Gentoo/funquail_worker
similarity index 53%
rename from deploy/Gentoo/funkwhale_worker
rename to deploy/Gentoo/funquail_worker
index 5a39514e1..4059ba5b7 100755
--- a/deploy/Gentoo/funkwhale_worker
+++ b/deploy/Gentoo/funquail_worker
@@ -1,25 +1,25 @@
 #!/sbin/openrc-run
 # shellcheck shell=bash
 
-NAME="funkwhaleworker"
+NAME="funquailworker"
 PIDFILE="/var/run/$NAME.pid"
-USER="funkwhale"
-WORKDIR="/srv/funkwhale/api"
-Celery="/srv/funkwhale/venv/bin/celery"
-WORKER_ARGS="--app funkwhale_api.taskapp worker --loglevel INFO"
+USER="funquail"
+WORKDIR="/srv/funquail/api"
+Celery="/srv/funquail/venv/bin/celery"
+WORKER_ARGS="--app funquail_api.taskapp worker --loglevel INFO"
 
 depend() {
   need net
 }
 
 start() {
-  ebegin "Starting Funkwhale Worker"
-  cd /srv/funkwhale/api || exit 1
+  ebegin "Starting FunQuail Worker"
+  cd /srv/funquail/api || exit 1
 
   # shellcheck disable=SC1091
-  set -a && source /srv/funkwhale/config/.env && set +a
+  set -a && source /srv/funquail/config/.env && set +a
 
-  echo "Starting Funkwhale Worker"
+  echo "Starting FunQuail Worker"
   # shellcheck disable=SC2086
   start-stop-daemon --start \
     --user "$USER" \
@@ -29,13 +29,13 @@ start() {
     --exec "$Celery" \
     -- $WORKER_ARGS \
     >> /var/log/funk/worker.log 2>&1 &
-  echo "Funkwhale Worker started"
+  echo "FunQuail Worker started"
   echo
   eend $?
 }
 
 stop() {
-  ebegin "Stopping Funkwhale Worker"
+  ebegin "Stopping FunQuail Worker"
   start-stop-daemon --stop --pidfile "$PIDFILE"
   eend $?
 }
diff --git a/deploy/apache.conf b/deploy/apache.conf
index a95e6a55d..399d2dd7c 100644
--- a/deploy/apache.conf
+++ b/deploy/apache.conf
@@ -1,21 +1,21 @@
 # Following variables MUST be modified according to your setup
-Define funkwhale-sn funkwhale.yourdomain.com
+Define funquail-sn funquail.yourdomain.com
 
 # Following variables should be modified according to your setup and if you
 # use different configuration than what is described in our installation guide.
-Define funkwhale-api http://localhost:5000
-Define funkwhale-api-ws ws://localhost:5000
-Define FUNKWHALE_ROOT_PATH /srv/funkwhale
-Define MUSIC_DIRECTORY_PATH ${FUNKWHALE_ROOT_PATH}/data/music
-Define MEDIA_DIRECTORY_PATH ${FUNKWHALE_ROOT_PATH}/data/media
+Define funquail-api http://localhost:5000
+Define funquail-api-ws ws://localhost:5000
+Define FUNQUAIL_ROOT_PATH /srv/funquail
+Define MUSIC_DIRECTORY_PATH ${FUNQUAIL_ROOT_PATH}/data/music
+Define MEDIA_DIRECTORY_PATH ${FUNQUAIL_ROOT_PATH}/data/media
 
 # HTTP requests redirected to HTTPS
 <VirtualHost *:80>
-   ServerName ${funkwhale-sn}
+   ServerName ${funquail-sn}
 
    # Default is to force https
    RewriteEngine on
-   RewriteCond %{SERVER_NAME} =${funkwhale-sn}
+   RewriteCond %{SERVER_NAME} =${funquail-sn}
    RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,QSA,R=permanent]
 
    <Location "/.well-known/acme-challenge/">
@@ -27,22 +27,22 @@ Define MEDIA_DIRECTORY_PATH ${FUNKWHALE_ROOT_PATH}/data/media
 
 <IfModule mod_ssl.c>
 <VirtualHost *:443>
-   ServerName ${funkwhale-sn}
+   ServerName ${funquail-sn}
 
    # Path to ErrorLog and access log
-   ErrorLog ${APACHE_LOG_DIR}/funkwhale/error.log
-   CustomLog ${APACHE_LOG_DIR}/funkwhale/access.log combined
+   ErrorLog ${APACHE_LOG_DIR}/funquail/error.log
+   CustomLog ${APACHE_LOG_DIR}/funquail/access.log combined
 
    # TLS
    # Feel free to use your own configuration for SSL here or simply remove the
    # lines and move the configuration to the previous server block if you
-   # don't want to run funkwhale behind https (this is not recommended)
+   # don't want to run funquail behind https (this is not recommended)
    # have a look here for let's encrypt configuration:
    # https://certbot.eff.org/lets-encrypt/debianstretch-apache.html
    SSLEngine on
    SSLProxyEngine On
-   SSLCertificateFile /etc/letsencrypt/live/${funkwhale-sn}/fullchain.pem
-   SSLCertificateKeyFile /etc/letsencrypt/live/${funkwhale-sn}/privkey.pem
+   SSLCertificateFile /etc/letsencrypt/live/${funquail-sn}/fullchain.pem
+   SSLCertificateKeyFile /etc/letsencrypt/live/${funquail-sn}/privkey.pem
    Include /etc/letsencrypt/options-ssl-apache.conf
 
    # Tell the api that the client is using https
@@ -70,34 +70,34 @@ Define MEDIA_DIRECTORY_PATH ${FUNKWHALE_ROOT_PATH}/data/media
       # similar to nginx 'client_max_body_size 100M;'
       LimitRequestBody 104857600
 
-      ProxyPass ${funkwhale-api}/
-      ProxyPassReverse ${funkwhale-api}/
+      ProxyPass ${funquail-api}/
+      ProxyPassReverse ${funquail-api}/
    </Location>
    <Location "/federation">
-      ProxyPass ${funkwhale-api}/federation
-      ProxyPassReverse ${funkwhale-api}/federation
+      ProxyPass ${funquail-api}/federation
+      ProxyPassReverse ${funquail-api}/federation
    </Location>
 
    # You can comment this if you don't plan to use the Subsonic API
    <Location "/rest">
-      ProxyPass ${funkwhale-api}/api/subsonic/rest
-      ProxyPassReverse ${funkwhale-api}/api/subsonic/rest
+      ProxyPass ${funquail-api}/api/subsonic/rest
+      ProxyPassReverse ${funquail-api}/api/subsonic/rest
    </Location>
 
    <Location "/.well-known/">
-      ProxyPass ${funkwhale-api}/.well-known/
-      ProxyPassReverse ${funkwhale-api}/.well-known/
+      ProxyPass ${funquail-api}/.well-known/
+      ProxyPassReverse ${funquail-api}/.well-known/
    </Location>
 
    <Location "/front">
       ProxyPass  "!"
    </Location>
-   Alias /front ${FUNKWHALE_ROOT_PATH}/front/dist
+   Alias /front ${FUNQUAIL_ROOT_PATH}/front/dist
 
    <Location "/assets">
       ProxyPass  "!"
    </Location>
-   Alias /assets ${FUNKWHALE_ROOT_PATH}/front/dist/assets
+   Alias /assets ${FUNQUAIL_ROOT_PATH}/front/dist/assets
 
    <Location "/media">
       ProxyPass  "!"
@@ -107,21 +107,21 @@ Define MEDIA_DIRECTORY_PATH ${FUNKWHALE_ROOT_PATH}/data/media
    <Location "/staticfiles">
       ProxyPass  "!"
    </Location>
-   Alias /staticfiles ${FUNKWHALE_ROOT_PATH}/data/static
+   Alias /staticfiles ${FUNQUAIL_ROOT_PATH}/data/static
 
    # Activating WebSockets
    <Location "/api/v1/activity">
-	   ProxyPass ${funkwhale-api-ws}/api/v1/activity
+	   ProxyPass ${funquail-api-ws}/api/v1/activity
    </Location>
 
    # Setting appropriate access levels to serve frontend
-   <Directory "${FUNKWHALE_ROOT_PATH}/data/static">
+   <Directory "${FUNQUAIL_ROOT_PATH}/data/static">
       Options FollowSymLinks
       AllowOverride None
       Require all granted
    </Directory>
 
-   <Directory "${FUNKWHALE_ROOT_PATH}/front/dist">
+   <Directory "${FUNQUAIL_ROOT_PATH}/front/dist">
       Options FollowSymLinks
       AllowOverride None
       Require all granted
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index b947a6dbc..aea3bbb49 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -19,7 +19,7 @@ services:
 
   celeryworker:
     restart: unless-stopped
-    image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
+    image: funquail/api:${FUNQUAIL_VERSION:-latest}
     depends_on:
       - postgres
       - redis
@@ -31,25 +31,25 @@ services:
     # By default, a worker will span a number of process equal to your number
     # of CPUs. You can adjust this, by explicitly setting the --concurrency
     # flag:
-    #   celery -A funkwhale_api.taskapp worker -l INFO --concurrency=4
+    #   celery -A funquail_api.taskapp worker -l INFO --concurrency=4
     command:
       - celery
-      - --app=funkwhale_api.taskapp
+      - --app=funquail_api.taskapp
       - worker
       - --loglevel=INFO
       - --concurrency=${CELERYD_CONCURRENCY-0}
     environment:
       - C_FORCE_ROOT=true
     volumes:
-      - "${MUSIC_DIRECTORY_SERVE_PATH-/srv/funkwhale/data/music}:${MUSIC_DIRECTORY_PATH-/music}:ro"
+      - "${MUSIC_DIRECTORY_SERVE_PATH-/srv/funquail/data/music}:${MUSIC_DIRECTORY_PATH-/music}:ro"
       - "${MEDIA_ROOT}:${MEDIA_ROOT}"
 
   celerybeat:
     restart: unless-stopped
-    image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
+    image: funquail/api:${FUNQUAIL_VERSION:-latest}
     command:
       - celery
-      - --app=funkwhale_api.taskapp
+      - --app=funquail_api.taskapp
       - beat
       - --loglevel=INFO
     depends_on:
@@ -59,19 +59,19 @@ services:
 
   api:
     restart: unless-stopped
-    image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
+    image: funquail/api:${FUNQUAIL_VERSION:-latest}
     depends_on:
       - postgres
       - redis
     env_file: .env
     volumes:
-      - "${MUSIC_DIRECTORY_SERVE_PATH-/srv/funkwhale/data/music}:${MUSIC_DIRECTORY_PATH-/music}:ro"
+      - "${MUSIC_DIRECTORY_SERVE_PATH-/srv/funquail/data/music}:${MUSIC_DIRECTORY_PATH-/music}:ro"
       - "${MEDIA_ROOT}:${MEDIA_ROOT}"
       - "${STATIC_ROOT}:${STATIC_ROOT}"
 
   front:
     restart: unless-stopped
-    image: funkwhale/front:${FUNKWHALE_VERSION:-latest}
+    image: funquail/front:${FUNQUAIL_VERSION:-latest}
     depends_on:
       - api
     env_file:
@@ -83,15 +83,15 @@ services:
       # Uncomment if you want to use your previous nginx config, please let us
       # know what special configuration you need, so we can support it with out
       # upstream nginx configuration!
-      #- "./nginx/funkwhale.template:/etc/nginx/templates/default.conf.template:ro"
-      #- "./nginx/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro"
+      #- "./nginx/funquail.template:/etc/nginx/templates/default.conf.template:ro"
+      #- "./nginx/funquail_proxy.conf:/etc/nginx/funquail_proxy.conf:ro"
 
-      - "${MUSIC_DIRECTORY_SERVE_PATH-/srv/funkwhale/data/music}:${MUSIC_DIRECTORY_PATH-/music}:ro"
+      - "${MUSIC_DIRECTORY_SERVE_PATH-/srv/funquail/data/music}:${MUSIC_DIRECTORY_PATH-/music}:ro"
       - "${MEDIA_ROOT}:${MEDIA_ROOT}:ro"
       - "${STATIC_ROOT}:/usr/share/nginx/html/staticfiles:ro"
     ports:
       # override those variables in your .env file if needed
-      - "${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT}:80"
+      - "${FUNQUAIL_API_IP}:${FUNQUAIL_API_PORT}:80"
 
   typesense:
     restart: unless-stopped
diff --git a/deploy/docker.funkwhale_proxy.conf b/deploy/docker.funquail_proxy.conf
similarity index 100%
rename from deploy/docker.funkwhale_proxy.conf
rename to deploy/docker.funquail_proxy.conf
diff --git a/deploy/docker.proxy.template b/deploy/docker.proxy.template
index ff9d5e4fe..f08e34291 100644
--- a/deploy/docker.proxy.template
+++ b/deploy/docker.proxy.template
@@ -1,5 +1,5 @@
 upstream fw {
-    server ${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT};
+    server ${FUNQUAIL_API_IP}:${FUNQUAIL_API_PORT};
 }
 
 # Required for websocket support.
@@ -12,7 +12,7 @@ server {
     listen 80;
     listen [::]:80;
     # update this to match your instance name
-    server_name ${FUNKWHALE_HOSTNAME};
+    server_name ${FUNQUAIL_HOSTNAME};
 
     # useful for Let's Encrypt
     location /.well-known/acme-challenge/ {
@@ -28,20 +28,20 @@ server {
     listen      443 ssl http2;
     listen [::]:443 ssl http2;
 
-    server_name ${FUNKWHALE_HOSTNAME};
+    server_name ${FUNQUAIL_HOSTNAME};
 
     # TLS
     # Feel free to use your own configuration for SSL here or simply remove the
     # lines and move the configuration to the previous server block if you
-    # don't want to run funkwhale behind https (this is not recommended)
+    # don't want to run funquail behind https (this is not recommended)
     # have a look here for let's encrypt configuration:
     # https://certbot.eff.org/all-instructions/#debian-9-stretch-nginx
     ssl_protocols TLSv1.2;
     ssl_ciphers HIGH:!MEDIUM:!LOW:!aNULL:!NULL:!SHA;
     ssl_prefer_server_ciphers on;
     ssl_session_cache shared:SSL:10m;
-    ssl_certificate     /etc/letsencrypt/live/${FUNKWHALE_HOSTNAME}/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/${FUNKWHALE_HOSTNAME}/privkey.pem;
+    ssl_certificate     /etc/letsencrypt/live/${FUNQUAIL_HOSTNAME}/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/${FUNQUAIL_HOSTNAME}/privkey.pem;
 
     # HSTS
     add_header Strict-Transport-Security "max-age=31536000";
@@ -78,7 +78,7 @@ server {
     # end of compression settings
 
     location / {
-        include /etc/nginx/funkwhale_proxy.conf;
+        include /etc/nginx/funquail_proxy.conf;
         proxy_pass http://fw;
     }
 
diff --git a/deploy/env.prod.sample b/deploy/env.prod.sample
index 1ea36c651..942cde352 100644
--- a/deploy/env.prod.sample
+++ b/deploy/env.prod.sample
@@ -1,10 +1,10 @@
 # If you have any doubts about what a setting does,
-# check https://docs.funkwhale.audio/configuration.html#configuration-reference
+# check https://docs.funquail.audio/configuration.html#configuration-reference
 
 # If you're tweaking this file from the template, ensure you edit at least the
 # following variables:
 # - DJANGO_SECRET_KEY
-# - FUNKWHALE_HOSTNAME
+# - FUNQUAIL_HOSTNAME
 # - EMAIL_CONFIG and DEFAULT_FROM_EMAIL if you plan to send e-mails)
 # On non-docker setup **only**, you'll also have to tweak/uncomment those variables:
 # - DATABASE_URL
@@ -25,7 +25,7 @@
 # The tag of the image we should use
 # (it will be interpolated in docker-compose file)
 # You can comment or ignore this if you're not using docker
-FUNKWHALE_VERSION=latest
+FUNQUAIL_VERSION=latest
 
 # End of Docker-only configuration
 
@@ -33,24 +33,24 @@ FUNKWHALE_VERSION=latest
 # ---------------------
 
 # Set this variables to bind the API server to another interface/port
-# example: FUNKWHALE_API_IP=0.0.0.0
-# example: FUNKWHALE_API_PORT=5678
-FUNKWHALE_API_IP=127.0.0.1
-FUNKWHALE_API_PORT=5000
+# example: FUNQUAIL_API_IP=0.0.0.0
+# example: FUNQUAIL_API_PORT=5678
+FUNQUAIL_API_IP=127.0.0.1
+FUNQUAIL_API_PORT=5000
 # The number of web workers to start in parallel. Higher means you can handle
 # more concurrent requests, but also leads to higher CPU/Memory usage
-FUNKWHALE_WEB_WORKERS=4
+FUNQUAIL_WEB_WORKERS=4
 # Replace this by the definitive, public domain you will use for
 # your instance. It cannot be changed after initial deployment
 # without breaking your instance.
-FUNKWHALE_HOSTNAME=yourdomain.funkwhale
-FUNKWHALE_PROTOCOL=https
+FUNQUAIL_HOSTNAME=yourdomain.funquail
+FUNQUAIL_PROTOCOL=https
 
 # Log level (debug, info, warning, error, critical)
 LOGLEVEL=error
 
 # Configure e-mail sending using this variale
-# By default, funkwhale will output e-mails sent to stdout
+# By default, funquail will output e-mails sent to stdout
 # here are a few examples for this setting
 # EMAIL_CONFIG=consolemail://         # output e-mails to console (the default)
 # EMAIL_CONFIG=dummymail://          # disable e-mail sending completely
@@ -72,7 +72,7 @@ LOGLEVEL=error
 # The e-mail address to use to send system e-mails.
 # DEFAULT_FROM_EMAIL=noreply@yourdomain
 
-# Depending on the reverse proxy used in front of your funkwhale instance,
+# Depending on the reverse proxy used in front of your funquail instance,
 # the API will use different kind of headers to serve audio files
 # Allowed values: nginx, apache2
 REVERSE_PROXY_TYPE=nginx
@@ -82,9 +82,9 @@ REVERSE_PROXY_TYPE=nginx
 # Database configuration
 # Examples:
 #  DATABASE_URL=postgresql://<user>:<password>@<host>:<port>/<database>
-#  DATABASE_URL=postgresql://funkwhale:passw0rd@localhost:5432/funkwhale_database
+#  DATABASE_URL=postgresql://funquail:passw0rd@localhost:5432/funquail_database
 # Use the next one if you followed Debian installation guide
-# DATABASE_URL=postgresql://funkwhale@:5432/funkwhale
+# DATABASE_URL=postgresql://funquail@:5432/funquail
 
 # Cache configuration
 # Examples:
@@ -113,12 +113,12 @@ REVERSE_PROXY_TYPE=nginx
 # Where media files (such as album covers or audio tracks) should be stored
 # on your system?
 # (Ensure this directory actually exists)
-MEDIA_ROOT=/srv/funkwhale/data/media
+MEDIA_ROOT=/srv/funquail/data/media
 
 # Where static files (such as API css or icons) should be compiled
 # on your system?
 # (Ensure this directory actually exists)
-STATIC_ROOT=/srv/funkwhale/data/static
+STATIC_ROOT=/srv/funquail/data/static
 
 # which settings module should django use?
 # You don't have to touch this unless you really know what you're doing
@@ -136,18 +136,18 @@ DJANGO_SECRET_KEY=
 # in place imports.
 # Typical docker setup:
 #   MUSIC_DIRECTORY_PATH=/music  # docker-only
-#   MUSIC_DIRECTORY_SERVE_PATH=/srv/funkwhale/data/music
+#   MUSIC_DIRECTORY_SERVE_PATH=/srv/funquail/data/music
 # Typical non-docker setup:
-#   MUSIC_DIRECTORY_PATH=/srv/funkwhale/data/music
+#   MUSIC_DIRECTORY_PATH=/srv/funquail/data/music
 #   # MUSIC_DIRECTORY_SERVE_PATH= # stays commented, not needed
 
-MUSIC_DIRECTORY_PATH=/srv/funkwhale/data/music
-MUSIC_DIRECTORY_SERVE_PATH=/srv/funkwhale/data/music
+MUSIC_DIRECTORY_PATH=/srv/funquail/data/music
+MUSIC_DIRECTORY_SERVE_PATH=/srv/funquail/data/music
 
 # LDAP settings
-# Use the following options to allow authentication on your Funkwhale instance
+# Use the following options to allow authentication on your FunQuail instance
 # using a LDAP directory.
-# Have a look at https://docs.funkwhale.audio/installation/ldap.html for
+# Have a look at https://docs.funquail.audio/installation/ldap.html for
 # detailed instructions.
 
 # LDAP_ENABLED=False
@@ -158,13 +158,13 @@ MUSIC_DIRECTORY_SERVE_PATH=/srv/funkwhale/data/music
 # LDAP_START_TLS=False
 # LDAP_ROOT_DN=dc=domain,dc=com
 
-FUNKWHALE_FRONTEND_PATH=/srv/funkwhale/front/dist
+FUNQUAIL_FRONTEND_PATH=/srv/funquail/front/dist
 
 # Nginx related configuration
 NGINX_MAX_BODY_SIZE=100M
 
 ## External storages configuration
-# Funkwhale can store uploaded files on Amazon S3 and S3-compatible storages (such as Minio)
+# FunQuail can store uploaded files on Amazon S3 and S3-compatible storages (such as Minio)
 # Uncomment and fill the variables below
 
 AWS_ACCESS_KEY_ID=
@@ -201,6 +201,6 @@ AWS_STORAGE_BUCKET_NAME=
 
 # AWS_DEFAULT_ACL=
 
-# Funkwhale allows collecting errors using Sentry compatible APIs. If you want
-# to help us improving Funkwhale, feel free to use our instance:
-#FUNKWHALE_SENTRY_DSN=https://5840197379c64f65aad3c5c09274994d@am.funkwhale.audio/1
+# FunQuail allows collecting errors using Sentry compatible APIs. If you want
+# to help us improving FunQuail, feel free to use our instance:
+#FUNQUAIL_SENTRY_DSN=https://5840197379c64f65aad3c5c09274994d@am.funquail.audio/1
diff --git a/deploy/funkwhale-beat.service b/deploy/funkwhale-beat.service
deleted file mode 100644
index 8ceb2dd06..000000000
--- a/deploy/funkwhale-beat.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Funkwhale celery beat process
-After=redis.service postgresql.service
-PartOf=funkwhale.target
-
-[Service]
-User=funkwhale
-# adapt this depending on the path of your funkwhale installation
-WorkingDirectory=/srv/funkwhale/api
-EnvironmentFile=/srv/funkwhale/config/.env
-
-ExecStart=/srv/funkwhale/venv/bin/celery \
-    --app funkwhale_api.taskapp \
-    beat \
-    --loglevel INFO
-
-[Install]
-WantedBy=multi-user.target
diff --git a/deploy/funkwhale-server.service b/deploy/funkwhale-server.service
deleted file mode 100644
index 0a0503d51..000000000
--- a/deploy/funkwhale-server.service
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description=Funkwhale application server
-After=redis.service postgresql.service
-PartOf=funkwhale.target
-
-[Service]
-User=funkwhale
-# adapt this depending on the path of your funkwhale installation
-WorkingDirectory=/srv/funkwhale/api
-EnvironmentFile=/srv/funkwhale/config/.env
-
-Type=notify
-KillMode=mixed
-ExecStart=/srv/funkwhale/venv/bin/gunicorn \
-    config.asgi:application \
-    --workers ${FUNKWHALE_WEB_WORKERS} \
-    --worker-class uvicorn.workers.UvicornWorker \
-    --bind ${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT}
-ExecReload=/bin/kill -s HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/deploy/funkwhale-worker.service b/deploy/funkwhale-worker.service
deleted file mode 100644
index 3386f7023..000000000
--- a/deploy/funkwhale-worker.service
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-Description=Funkwhale celery worker
-After=redis.service postgresql.service
-PartOf=funkwhale.target
-
-[Service]
-User=funkwhale
-# adapt this depending on the path of your funkwhale installation
-WorkingDirectory=/srv/funkwhale/api
-Environment="CELERYD_CONCURRENCY=0"
-EnvironmentFile=/srv/funkwhale/config/.env
-
-ExecStart=/srv/funkwhale/venv/bin/celery \
-    --app funkwhale_api.taskapp \
-    worker \
-    --loglevel INFO \
-    --concurrency=${CELERYD_CONCURRENCY}
-
-[Install]
-WantedBy=multi-user.target
diff --git a/deploy/funkwhale.target b/deploy/funkwhale.target
deleted file mode 100644
index 2ec9b3f62..000000000
--- a/deploy/funkwhale.target
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Funkwhale
-Wants=funkwhale-server.service funkwhale-worker.service funkwhale-beat.service
-
-[Install]
-WantedBy=multi-user.target
diff --git a/deploy/funquail-beat.service b/deploy/funquail-beat.service
new file mode 100644
index 000000000..077138059
--- /dev/null
+++ b/deploy/funquail-beat.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=FunQuail celery beat process
+After=redis.service postgresql.service
+PartOf=funquail.target
+
+[Service]
+User=funquail
+# adapt this depending on the path of your funquail installation
+WorkingDirectory=/srv/funquail/api
+EnvironmentFile=/srv/funquail/config/.env
+
+ExecStart=/srv/funquail/venv/bin/celery \
+    --app funquail_api.taskapp \
+    beat \
+    --loglevel INFO
+
+[Install]
+WantedBy=multi-user.target
diff --git a/deploy/funquail-server.service b/deploy/funquail-server.service
new file mode 100644
index 000000000..4735ec4c6
--- /dev/null
+++ b/deploy/funquail-server.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=FunQuail application server
+After=redis.service postgresql.service
+PartOf=funquail.target
+
+[Service]
+User=funquail
+# adapt this depending on the path of your funquail installation
+WorkingDirectory=/srv/funquail/api
+EnvironmentFile=/srv/funquail/config/.env
+
+Type=notify
+KillMode=mixed
+ExecStart=/srv/funquail/venv/bin/gunicorn \
+    config.asgi:application \
+    --workers ${FUNQUAIL_WEB_WORKERS} \
+    --worker-class uvicorn.workers.UvicornWorker \
+    --bind ${FUNQUAIL_API_IP}:${FUNQUAIL_API_PORT}
+ExecReload=/bin/kill -s HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/deploy/funquail-worker.service b/deploy/funquail-worker.service
new file mode 100644
index 000000000..6d3232dd5
--- /dev/null
+++ b/deploy/funquail-worker.service
@@ -0,0 +1,20 @@
+[Unit]
+Description=FunQuail celery worker
+After=redis.service postgresql.service
+PartOf=funquail.target
+
+[Service]
+User=funquail
+# adapt this depending on the path of your funquail installation
+WorkingDirectory=/srv/funquail/api
+Environment="CELERYD_CONCURRENCY=0"
+EnvironmentFile=/srv/funquail/config/.env
+
+ExecStart=/srv/funquail/venv/bin/celery \
+    --app funquail_api.taskapp \
+    worker \
+    --loglevel INFO \
+    --concurrency=${CELERYD_CONCURRENCY}
+
+[Install]
+WantedBy=multi-user.target
diff --git a/deploy/funquail.target b/deploy/funquail.target
new file mode 100644
index 000000000..ee1147e95
--- /dev/null
+++ b/deploy/funquail.target
@@ -0,0 +1,6 @@
+[Unit]
+Description=FunQuail
+Wants=funquail-server.service funquail-worker.service funquail-beat.service
+
+[Install]
+WantedBy=multi-user.target
diff --git a/deploy/funkwhale_proxy.conf b/deploy/funquail_proxy.conf
similarity index 100%
rename from deploy/funkwhale_proxy.conf
rename to deploy/funquail_proxy.conf
diff --git a/deploy/nginx.template b/deploy/nginx.template
index d306f8af4..bae29d52f 100644
--- a/deploy/nginx.template
+++ b/deploy/nginx.template
@@ -1,7 +1,7 @@
 
-upstream funkwhale-api {
+upstream funquail-api {
     # depending on your setup, you may want to update this
-    server ${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT};
+    server ${FUNQUAIL_API_IP}:${FUNQUAIL_API_PORT};
 }
 
 # Required for websocket support.
@@ -14,7 +14,7 @@ server {
     listen 80;
     listen [::]:80;
     # update this to match your instance name
-    server_name ${FUNKWHALE_HOSTNAME};
+    server_name ${FUNQUAIL_HOSTNAME};
 
     # useful for Let's Encrypt
     location /.well-known/acme-challenge/ {
@@ -30,27 +30,27 @@ server {
     listen      443 ssl http2;
     listen [::]:443 ssl http2;
 
-    server_name ${FUNKWHALE_HOSTNAME};
+    server_name ${FUNQUAIL_HOSTNAME};
 
     # TLS
     # Feel free to use your own configuration for SSL here or simply remove the
     # lines and move the configuration to the previous server block if you
-    # don't want to run funkwhale behind https (this is not recommended)
+    # don't want to run funquail behind https (this is not recommended)
     # have a look here for let's encrypt configuration:
     # https://certbot.eff.org/all-instructions/#debian-9-stretch-nginx
     ssl_protocols TLSv1.2;
     ssl_ciphers HIGH:!MEDIUM:!LOW:!aNULL:!NULL:!SHA;
     ssl_prefer_server_ciphers on;
     ssl_session_cache shared:SSL:10m;
-    ssl_certificate     /etc/letsencrypt/live/${FUNKWHALE_HOSTNAME}/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/${FUNKWHALE_HOSTNAME}/privkey.pem;
+    ssl_certificate     /etc/letsencrypt/live/${FUNQUAIL_HOSTNAME}/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/${FUNQUAIL_HOSTNAME}/privkey.pem;
 
     # HSTS
     add_header Strict-Transport-Security "max-age=31536000";
 
 
     # General configs
-    root ${FUNKWHALE_FRONTEND_PATH};
+    root ${FUNQUAIL_FRONTEND_PATH};
     client_max_body_size ${NGINX_MAX_BODY_SIZE};
     charset utf-8;
 
@@ -87,42 +87,42 @@ server {
     add_header Service-Worker-Allowed "/";
 
     location /api/ {
-        include /etc/nginx/funkwhale_proxy.conf;
+        include /etc/nginx/funquail_proxy.conf;
         # This is needed if you have file import via upload enabled.
         client_max_body_size ${NGINX_MAX_BODY_SIZE};
-        proxy_pass   http://funkwhale-api;
+        proxy_pass   http://funquail-api;
     }
 
     location ~ ^/library/(albums|tracks|artists|playlists)/ {
-        include /etc/nginx/funkwhale_proxy.conf;
-        proxy_pass   http://funkwhale-api;
+        include /etc/nginx/funquail_proxy.conf;
+        proxy_pass   http://funquail-api;
     }
 
     location /channels/ {
-        include /etc/nginx/funkwhale_proxy.conf;
-        proxy_pass   http://funkwhale-api;
+        include /etc/nginx/funquail_proxy.conf;
+        proxy_pass   http://funquail-api;
     }
 
     location ~ ^/@(vite-plugin-pwa|vite|id)/ {
-        include /etc/nginx/funkwhale_proxy.conf;
-        alias ${FUNKWHALE_FRONTEND_PATH}/;
+        include /etc/nginx/funquail_proxy.conf;
+        alias ${FUNQUAIL_FRONTEND_PATH}/;
         try_files $uri $uri/ /index.html;
     }
 
     location /@ {
-        include /etc/nginx/funkwhale_proxy.conf;
-        proxy_pass   http://funkwhale-api;
+        include /etc/nginx/funquail_proxy.conf;
+        proxy_pass   http://funquail-api;
     }
 
     location / {
         expires 1d;
-        include /etc/nginx/funkwhale_proxy.conf;
-        alias ${FUNKWHALE_FRONTEND_PATH}/;
+        include /etc/nginx/funquail_proxy.conf;
+        alias ${FUNQUAIL_FRONTEND_PATH}/;
         try_files $uri $uri/ /index.html;
     }
 
     location ~ "/(front/)?embed.html" {
-        alias ${FUNKWHALE_FRONTEND_PATH}/embed.html;
+        alias ${FUNQUAIL_FRONTEND_PATH}/embed.html;
         add_header Content-Security-Policy "connect-src https: http: 'self'; default-src 'self'; script-src 'self' unpkg.com 'unsafe-inline' 'unsafe-eval'; style-src https: http: 'self' 'unsafe-inline'; img-src https: http: 'self' data:; font-src https: http: 'self' data:; object-src 'none'; media-src https: http: 'self' data:";
         add_header Referrer-Policy "strict-origin-when-cross-origin";
 
@@ -130,19 +130,19 @@ server {
     }
 
     location /federation/ {
-        include /etc/nginx/funkwhale_proxy.conf;
-        proxy_pass   http://funkwhale-api;
+        include /etc/nginx/funquail_proxy.conf;
+        proxy_pass   http://funquail-api;
     }
 
     # You can comment this if you do not plan to use the Subsonic API.
     location /rest/ {
-        include /etc/nginx/funkwhale_proxy.conf;
-        proxy_pass   http://funkwhale-api/api/subsonic/rest/;
+        include /etc/nginx/funquail_proxy.conf;
+        proxy_pass   http://funquail-api/api/subsonic/rest/;
     }
 
     location /.well-known/ {
-        include /etc/nginx/funkwhale_proxy.conf;
-        proxy_pass   http://funkwhale-api;
+        include /etc/nginx/funquail_proxy.conf;
+        proxy_pass   http://funquail-api;
     }
 
     # Allow direct access to only specific subdirectories in /media
@@ -189,7 +189,7 @@ server {
 
     location /manifest.json {
         # If the reverse proxy is terminating SSL, nginx gets confused and redirects to http, hence the full URL
-        return 302 ${FUNKWHALE_PROTOCOL}://${FUNKWHALE_HOSTNAME}/api/v1/instance/spa-manifest.json;
+        return 302 ${FUNQUAIL_PROTOCOL}://${FUNQUAIL_HOSTNAME}/api/v1/instance/spa-manifest.json;
     }
 
     location /staticfiles/ {
diff --git a/docs/Makefile b/docs/Makefile
index c82c289fa..3fa08768d 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,10 +1,4 @@
 SHELL = bash
-UNAME := $(shell uname)
-ifeq ($(UNAME), Linux)
-CPU_CORES = $(shell N=$$(nproc); echo $$(( $$N > 4 ? 4 : $$N )))
-else
-CPU_CORES = $(shell N=$$(sysctl -n hw.physicalcpu); echo $$(( $$N > 4 ? 4 : $$N )))
-endif
 
 # Install
 VENV = .venv
diff --git a/CHANGELOG.md b/old/CHANGELOG.md
similarity index 100%
rename from CHANGELOG.md
rename to old/CHANGELOG.md
diff --git a/CONTRIBUTING.md b/old/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to old/CONTRIBUTING.md
diff --git a/old/README.md b/old/README.md
new file mode 100644
index 000000000..2400701de
--- /dev/null
+++ b/old/README.md
@@ -0,0 +1,26 @@
+# Funkwhale
+
+[![The Funkwhale logo](./front/src/assets/logo/logo-full-500.png)](https://funkwhale.audio)
+
+Funkwhale is a platform for uploading, sharing, and publishing audio content across the federated web. Curate your music library, listen to podcasts, or create your own content and share it with the world.
+
+## Contribute
+
+Want to help make Funkwhale even better? We welcome contributions from across the community. Whether you are a designer, a translator, a technical writer, or a developer, we look forward to seeing your work!
+
+You can find contribution information in our [documentation hub](https://docs.funkwhale.audio).
+
+- [Developer guides](https://docs.funkwhale.audio/developer/index.html)
+- [Contributor guides](https://docs.funkwhale.audio/contributing.html)
+
+## Get help
+
+Got a question or need help? Head over to our [forum](https://forum.funkwhale.audio/t/support) and open up a discussion.
+
+## Report a security issue
+
+If you find a security issue or vulnerability, please report it on our [GitLab instance](https://dev.funkwhale.audio/funkwhale/funkwhale/-/issues). When you open your issue, select the **This issue is confidential and should only be visible to team members with at least Reporter access** option. This ensures developers can verify and patch the issue before disclosing it.
+
+## Code of conduct
+
+The Funkwhale collective adheres to a [code of conduct](https://funkwhale.audio/code-of-conduct) in all our community spaces. Please familiarize yourself with this code and follow it when participating in discussions in our spaces.