Completely change project name to yt-dlp (#85)

* All modules and binary names are changed
* All documentation references changed
* yt-dlp no longer loads youtube-dlc config files
* All URLs changed to point to organization account

Co-authored-by: Pccode66
Co-authored-by: pukkandan

927 files changed, 501 insertions, 506 deletions

diff --git a/.github/ISSUE_TEMPLATE/1_broken_site.md b/.github/ISSUE_TEMPLATE/1_broken_site.md
index 3dbc8b43e..4966cbe64 100644
--- a/.github/ISSUE_TEMPLATE/1_broken_site.md
+++ b/.github/ISSUE_TEMPLATE/1_broken_site.md
@@ -20,11 +20,11 @@ assignees: ''
 ## Checklist
 
 <!--
-Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dlc:
-- First of, make sure you are using the latest version of yt-dlp. Run `youtube-dlc --version` and ensure your version is 2021.02.19. If it's not, see https://github.com/pukkandan/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.02.19. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
-- Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in https://github.com/pukkandan/yt-dlp.
-- Search the bugtracker for similar issues: https://github.com/pukkandan/yt-dlp. DO NOT post duplicates.
+- Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in https://github.com/yt-dlp/yt-dlp.
+- Search the bugtracker for similar issues: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
 - Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
 -->
 
@@ -38,8 +38,8 @@ Carefully read and work through this check list in order to prevent the most com
 ## Verbose log
 
 <!--
-Provide the complete verbose output of youtube-dlc that clearly demonstrates the problem.
-Add the `-v` flag to your command line you run youtube-dlc with (`youtube-dlc -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
+Provide the complete verbose output of yt-dlp that clearly demonstrates the problem.
+Add the `-v` flag to your command line you run yt-dlp with (`yt-dlp -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
  [debug] System config: []
  [debug] User config: []
  [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
diff --git a/.github/ISSUE_TEMPLATE/2_site_support_request.md b/.github/ISSUE_TEMPLATE/2_site_support_request.md
index 2bc2d6976..c64dc1ee2 100644
--- a/.github/ISSUE_TEMPLATE/2_site_support_request.md
+++ b/.github/ISSUE_TEMPLATE/2_site_support_request.md
@@ -20,11 +20,11 @@ assignees: ''
 ## Checklist
 
 <!--
-Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dlc:
-- First of, make sure you are using the latest version of yt-dlp. Run `youtube-dlc --version` and ensure your version is 2021.02.19. If it's not, see https://github.com/pukkandan/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.02.19. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
-- Make sure that site you are requesting is not dedicated to copyright infringement, see https://github.com/pukkandan/yt-dlp. yt-dlp does not support such sites. In order for site support request to be accepted all provided example URLs should not violate any copyrights.
-- Search the bugtracker for similar site support requests: https://github.com/pukkandan/yt-dlp. DO NOT post duplicates.
+- Make sure that site you are requesting is not dedicated to copyright infringement, see https://github.com/yt-dlp/yt-dlp. yt-dlp does not support such sites. In order for site support request to be accepted all provided example URLs should not violate any copyrights.
+- Search the bugtracker for similar site support requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
 - Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
 -->
 
diff --git a/.github/ISSUE_TEMPLATE/3_site_feature_request.md b/.github/ISSUE_TEMPLATE/3_site_feature_request.md
index 651d27514..19bdafce6 100644
--- a/.github/ISSUE_TEMPLATE/3_site_feature_request.md
+++ b/.github/ISSUE_TEMPLATE/3_site_feature_request.md
@@ -20,9 +20,9 @@ assignees: ''
 ## Checklist
 
 <!--
-Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dlc:
-- First of, make sure you are using the latest version of yt-dlp. Run `youtube-dlc --version` and ensure your version is 2021.02.19. If it's not, see https://github.com/pukkandan/yt-dlp on how to update. Issues with outdated version will be REJECTED.
-- Search the bugtracker for similar site feature requests: https://github.com/pukkandan/yt-dlp. DO NOT post duplicates.
+Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.02.19. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- Search the bugtracker for similar site feature requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
 - Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
 -->
 
diff --git a/.github/ISSUE_TEMPLATE/4_bug_report.md b/.github/ISSUE_TEMPLATE/4_bug_report.md
index 3c8858def..e7d7c919e 100644
--- a/.github/ISSUE_TEMPLATE/4_bug_report.md
+++ b/.github/ISSUE_TEMPLATE/4_bug_report.md
@@ -20,12 +20,12 @@ assignees: ''
 ## Checklist
 
 <!--
-Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dlc:
-- First of, make sure you are using the latest version of yt-dlp. Run `youtube-dlc --version` and ensure your version is 2021.02.19. If it's not, see https://github.com/pukkandan/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.02.19. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
-- Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in https://github.com/pukkandan/yt-dlp.
-- Search the bugtracker for similar issues: https://github.com/pukkandan/yt-dlp. DO NOT post duplicates.
-- Read bugs section in FAQ: https://github.com/pukkandan/yt-dlp
+- Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in https://github.com/yt-dlp/yt-dlp.
+- Search the bugtracker for similar issues: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
+- Read bugs section in FAQ: https://github.com/yt-dlp/yt-dlp
 - Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
 -->
 
@@ -40,8 +40,8 @@ Carefully read and work through this check list in order to prevent the most com
 ## Verbose log
 
 <!--
-Provide the complete verbose output of youtube-dlc that clearly demonstrates the problem.
-Add the `-v` flag to your command line you run youtube-dlc with (`youtube-dlc -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
+Provide the complete verbose output of yt-dlp that clearly demonstrates the problem.
+Add the `-v` flag to your command line you run yt-dlp with (`yt-dlp -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
  [debug] System config: []
  [debug] User config: []
  [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
diff --git a/.github/ISSUE_TEMPLATE/5_feature_request.md b/.github/ISSUE_TEMPLATE/5_feature_request.md
index 85196e3aa..3a8974b4c 100644
--- a/.github/ISSUE_TEMPLATE/5_feature_request.md
+++ b/.github/ISSUE_TEMPLATE/5_feature_request.md
@@ -20,9 +20,9 @@ assignees: ''
 ## Checklist
 
 <!--
-Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dlc:
-- First of, make sure you are using the latest version of yt-dlp. Run `youtube-dlc --version` and ensure your version is 2021.02.19. If it's not, see https://github.com/pukkandan/yt-dlp on how to update. Issues with outdated version will be REJECTED.
-- Search the bugtracker for similar feature requests: https://github.com/pukkandan/yt-dlp. DO NOT post duplicates.
+Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is 2021.02.19. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- Search the bugtracker for similar feature requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
 - Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
 -->
 
diff --git a/.github/ISSUE_TEMPLATE/6_question.md b/.github/ISSUE_TEMPLATE/6_question.md
index da82dcd2c..dd2857c09 100644
--- a/.github/ISSUE_TEMPLATE/6_question.md
+++ b/.github/ISSUE_TEMPLATE/6_question.md
@@ -20,9 +20,9 @@ assignees: ''
 ## Checklist
 
 <!--
-Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dlc:
-- Look through the README (https://github.com/pukkandan/yt-dlp) and FAQ (https://github.com/pukkandan/yt-dlp) for similar questions
-- Search the bugtracker for similar questions: https://github.com/blackjack4494/yt-dlc
+Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
+- Look through the README (https://github.com/yt-dlp/yt-dlp) and FAQ (https://github.com/yt-dlp/yt-dlp) for similar questions
+- Search the bugtracker for similar questions: https://github.com/yt-dlp/yt-dlp
 - Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
 -->
 
@@ -34,7 +34,7 @@ Carefully read and work through this check list in order to prevent the most com
 ## Question
 
 <!--
-Ask your question in an arbitrary form. Please make sure it's worded well enough to be understood, see https://github.com/blackjack4494/yt-dlc.
+Ask your question in an arbitrary form. Please make sure it's worded well enough to be understood, see https://github.com/yt-dlp/yt-dlp.
 -->
 
 WRITE QUESTION HERE
diff --git a/.github/ISSUE_TEMPLATE_tmpl/1_broken_site.md b/.github/ISSUE_TEMPLATE_tmpl/1_broken_site.md
index 563011ec1..9d346d162 100644
--- a/.github/ISSUE_TEMPLATE_tmpl/1_broken_site.md
+++ b/.github/ISSUE_TEMPLATE_tmpl/1_broken_site.md
@@ -20,11 +20,11 @@ assignees: ''
 ## Checklist
 
 <!--
-Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dlc:
-- First of, make sure you are using the latest version of yt-dlp. Run `youtube-dlc --version` and ensure your version is %(version)s. If it's not, see https://github.com/pukkandan/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is %(version)s. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
-- Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in https://github.com/pukkandan/yt-dlp.
-- Search the bugtracker for similar issues: https://github.com/pukkandan/yt-dlp. DO NOT post duplicates.
+- Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in https://github.com/yt-dlp/yt-dlp.
+- Search the bugtracker for similar issues: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
 - Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
 -->
 
@@ -38,8 +38,8 @@ Carefully read and work through this check list in order to prevent the most com
 ## Verbose log
 
 <!--
-Provide the complete verbose output of youtube-dlc that clearly demonstrates the problem.
-Add the `-v` flag to your command line you run youtube-dlc with (`youtube-dlc -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
+Provide the complete verbose output of yt-dlp that clearly demonstrates the problem.
+Add the `-v` flag to your command line you run yt-dlp with (`yt-dlp -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
  [debug] System config: []
  [debug] User config: []
  [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
diff --git a/.github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md b/.github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md
index 79be45ac9..9e7eb5a20 100644
--- a/.github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md
+++ b/.github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md
@@ -20,11 +20,11 @@ assignees: ''
 ## Checklist
 
 <!--
-Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dlc:
-- First of, make sure you are using the latest version of yt-dlp. Run `youtube-dlc --version` and ensure your version is %(version)s. If it's not, see https://github.com/pukkandan/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is %(version)s. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
-- Make sure that site you are requesting is not dedicated to copyright infringement, see https://github.com/pukkandan/yt-dlp. yt-dlp does not support such sites. In order for site support request to be accepted all provided example URLs should not violate any copyrights.
-- Search the bugtracker for similar site support requests: https://github.com/pukkandan/yt-dlp. DO NOT post duplicates.
+- Make sure that site you are requesting is not dedicated to copyright infringement, see https://github.com/yt-dlp/yt-dlp. yt-dlp does not support such sites. In order for site support request to be accepted all provided example URLs should not violate any copyrights.
+- Search the bugtracker for similar site support requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
 - Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
 -->
 
diff --git a/.github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md b/.github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md
index 8e8c61321..d74b6e279 100644
--- a/.github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md
+++ b/.github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md
@@ -20,9 +20,9 @@ assignees: ''
 ## Checklist
 
 <!--
-Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dlc:
-- First of, make sure you are using the latest version of yt-dlp. Run `youtube-dlc --version` and ensure your version is %(version)s. If it's not, see https://github.com/pukkandan/yt-dlp on how to update. Issues with outdated version will be REJECTED.
-- Search the bugtracker for similar site feature requests: https://github.com/pukkandan/yt-dlp. DO NOT post duplicates.
+Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is %(version)s. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- Search the bugtracker for similar site feature requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
 - Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
 -->
 
diff --git a/.github/ISSUE_TEMPLATE_tmpl/4_bug_report.md b/.github/ISSUE_TEMPLATE_tmpl/4_bug_report.md
index e029bc064..043489941 100644
--- a/.github/ISSUE_TEMPLATE_tmpl/4_bug_report.md
+++ b/.github/ISSUE_TEMPLATE_tmpl/4_bug_report.md
@@ -20,12 +20,12 @@ assignees: ''
 ## Checklist
 
 <!--
-Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dlc:
-- First of, make sure you are using the latest version of yt-dlp. Run `youtube-dlc --version` and ensure your version is %(version)s. If it's not, see https://github.com/pukkandan/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is %(version)s. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
-- Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in https://github.com/pukkandan/yt-dlp.
-- Search the bugtracker for similar issues: https://github.com/pukkandan/yt-dlp. DO NOT post duplicates.
-- Read bugs section in FAQ: https://github.com/pukkandan/yt-dlp
+- Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in https://github.com/yt-dlp/yt-dlp.
+- Search the bugtracker for similar issues: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
+- Read bugs section in FAQ: https://github.com/yt-dlp/yt-dlp
 - Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
 -->
 
@@ -40,8 +40,8 @@ Carefully read and work through this check list in order to prevent the most com
 ## Verbose log
 
 <!--
-Provide the complete verbose output of youtube-dlc that clearly demonstrates the problem.
-Add the `-v` flag to your command line you run youtube-dlc with (`youtube-dlc -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
+Provide the complete verbose output of yt-dlp that clearly demonstrates the problem.
+Add the `-v` flag to your command line you run yt-dlp with (`yt-dlp -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
  [debug] System config: []
  [debug] User config: []
  [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
diff --git a/.github/ISSUE_TEMPLATE_tmpl/5_feature_request.md b/.github/ISSUE_TEMPLATE_tmpl/5_feature_request.md
index fb3809c03..4a0209db1 100644
--- a/.github/ISSUE_TEMPLATE_tmpl/5_feature_request.md
+++ b/.github/ISSUE_TEMPLATE_tmpl/5_feature_request.md
@@ -20,9 +20,9 @@ assignees: ''
 ## Checklist
 
 <!--
-Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dlc:
-- First of, make sure you are using the latest version of yt-dlp. Run `youtube-dlc --version` and ensure your version is %(version)s. If it's not, see https://github.com/pukkandan/yt-dlp on how to update. Issues with outdated version will be REJECTED.
-- Search the bugtracker for similar feature requests: https://github.com/pukkandan/yt-dlp. DO NOT post duplicates.
+Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
+- First of, make sure you are using the latest version of yt-dlp. Run `yt-dlp --version` and ensure your version is %(version)s. If it's not, see https://github.com/yt-dlp/yt-dlp on how to update. Issues with outdated version will be REJECTED.
+- Search the bugtracker for similar feature requests: https://github.com/yt-dlp/yt-dlp. DO NOT post duplicates.
 - Finally, put x into all relevant boxes like this [x] (Dont forget to delete the empty space)
 -->
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index eb30253ee..f711701cb 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -8,7 +8,7 @@
 
 ### Before submitting a *pull request* make sure you have:
 - [ ] At least skimmed through [adding new extractor tutorial](https://github.com/ytdl-org/youtube-dl#adding-support-for-a-new-site) and [youtube-dl coding conventions](https://github.com/ytdl-org/youtube-dl#youtube-dl-coding-conventions) sections
-- [ ] [Searched](https://github.com/pukkandan/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests
+- [ ] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests
 - [ ] Checked the code with [flake8](https://pypi.python.org/pypi/flake8)
 
 ### In order to be accepted and merged into youtube-dl each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check one of the following options:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 58a72c9e5..48dfbafd3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     outputs:
-      ytdlc_version: ${{ steps.bump_version.outputs.ytdlc_version }}
+      ytdlp_version: ${{ steps.bump_version.outputs.ytdlp_version }}
       upload_url: ${{ steps.create_release.outputs.upload_url }}
       sha2_unix: ${{ steps.sha2_file.outputs.sha2_unix }}
 
@@ -27,7 +27,7 @@ jobs:
       id: bump_version
       run: python devscripts/update-version.py
     - name: Print version
-      run: echo "${{ steps.bump_version.outputs.ytdlc_version }}"
+      run: echo "${{ steps.bump_version.outputs.ytdlp_version }}"
     - name: Run Make
       run: make
     - name: Create Release
@@ -36,26 +36,26 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        tag_name: ${{ steps.bump_version.outputs.ytdlc_version }}
-        release_name: yt-dlp ${{ steps.bump_version.outputs.ytdlc_version }}
+        tag_name: ${{ steps.bump_version.outputs.ytdlp_version }}
+        release_name: yt-dlp ${{ steps.bump_version.outputs.ytdlp_version }}
         body: |
           Changelog:
           PLACEHOLDER
         draft: false
         prerelease: false
-    - name: Upload youtube-dlc Unix binary
+    - name: Upload yt-dlp Unix binary
       id: upload-release-asset 
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./youtube-dlc
-        asset_name: youtube-dlc
+        asset_path: ./yt-dlp
+        asset_name: yt-dlp
         asset_content_type: application/octet-stream
-    - name: Get SHA2-256SUMS for youtube-dlc
+    - name: Get SHA2-256SUMS for yt-dlp
       id: sha2_file
-      run: echo "::set-output name=sha2_unix::$(sha256sum youtube-dlc | awk '{print $1}')"
+      run: echo "::set-output name=sha2_unix::$(sha256sum yt-dlp | awk '{print $1}')"
     - name: Install dependencies for pypi
       env:
         PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
@@ -96,22 +96,22 @@ jobs:
       id: bump_version
       run: python devscripts/update-version.py
     - name: Print version
-      run: echo "${{ steps.bump_version.outputs.ytdlc_version }}"
+      run: echo "${{ steps.bump_version.outputs.ytdlp_version }}"
     - name: Run PyInstaller Script
       run: python pyinst.py 64
-    - name: Upload youtube-dlc.exe Windows binary
+    - name: Upload yt-dlp.exe Windows binary
       id: upload-release-windows
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ needs.build_unix.outputs.upload_url }}
-        asset_path: ./dist/youtube-dlc.exe
-        asset_name: youtube-dlc.exe
+        asset_path: ./dist/yt-dlp.exe
+        asset_name: yt-dlp.exe
         asset_content_type: application/vnd.microsoft.portable-executable
-    - name: Get SHA2-256SUMS for youtube-dlc.exe
+    - name: Get SHA2-256SUMS for yt-dlp.exe
       id: sha2_file_win
-      run: echo "::set-output name=sha2_windows::$((Get-FileHash dist\youtube-dlc.exe -Algorithm SHA256).Hash.ToLower())"
+      run: echo "::set-output name=sha2_windows::$((Get-FileHash dist\yt-dlp.exe -Algorithm SHA256).Hash.ToLower())"
 
   build_windows32:
 
@@ -137,33 +137,33 @@ jobs:
       id: bump_version
       run: python devscripts/update-version.py
     - name: Print version
-      run: echo "${{ steps.bump_version.outputs.ytdlc_version }}"
+      run: echo "${{ steps.bump_version.outputs.ytdlp_version }}"
     - name: Run PyInstaller Script for 32 Bit
       run: python pyinst.py 32
-    - name: Upload Executable youtube-dlc_x86.exe
+    - name: Upload Executable yt-dlp_x86.exe
       id: upload-release-windows32
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ needs.build_unix.outputs.upload_url }}
-        asset_path: ./dist/youtube-dlc_x86.exe
-        asset_name: youtube-dlc_x86.exe
+        asset_path: ./dist/yt-dlp_x86.exe
+        asset_name: yt-dlp_x86.exe
         asset_content_type: application/vnd.microsoft.portable-executable
-    - name: Get SHA2-256SUMS for youtube-dlc_x86.exe
+    - name: Get SHA2-256SUMS for yt-dlp_x86.exe
       id: sha2_file_win32
-      run: echo "::set-output name=sha2_windows32::$((Get-FileHash dist\youtube-dlc_x86.exe -Algorithm SHA256).Hash.ToLower())"
+      run: echo "::set-output name=sha2_windows32::$((Get-FileHash dist\yt-dlp_x86.exe -Algorithm SHA256).Hash.ToLower())"
     - name: Make SHA2-256SUMS file
       env:
         SHA2_WINDOWS: ${{ needs.build_windows.outputs.sha2_windows }}
         SHA2_WINDOWS32: ${{ steps.sha2_file_win32.outputs.sha2_windows32 }}
         SHA2_UNIX: ${{ needs.build_unix.outputs.sha2_unix }}
-        YTDLC_VERSION: ${{ needs.build_unix.outputs.ytdlc_version }}
+        YTDLP_VERSION: ${{ needs.build_unix.outputs.ytdlp_version }}
       run: |
-        echo "version:${env:YTDLC_VERSION}" >> SHA2-256SUMS
-        echo "youtube-dlc.exe:${env:SHA2_WINDOWS}" >> SHA2-256SUMS
-        echo "youtube-dlc_x86.exe:${env:SHA2_WINDOWS32}" >> SHA2-256SUMS
-        echo "youtube-dlc:${env:SHA2_UNIX}" >> SHA2-256SUMS
+        echo "version:${env:YTDLP_VERSION}" >> SHA2-256SUMS
+        echo "yt-dlp.exe:${env:SHA2_WINDOWS}" >> SHA2-256SUMS
+        echo "yt-dlp_x86.exe:${env:SHA2_WINDOWS32}" >> SHA2-256SUMS
+        echo "yt-dlp:${env:SHA2_UNIX}" >> SHA2-256SUMS
 
     - name: Upload 256SUMS file
       id: upload-sums
diff --git a/.gitignore b/.gitignore
index 3d5393432..de401472f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,7 @@ README.txt
 # Binary
 youtube-dl
 youtube-dlc
-youtube-dlc.zip
+yt-dlp.zip
 *.exe
 
 # Downloaded
@@ -82,9 +82,7 @@ cookies.txt
 .idea
 *.iml
 .vscode
-*.sublime-workspace
-*.sublime-project
-!yt-dlp.sublime-project
+*.sublime-*
 
 # Lazy extractors
 */extractor/lazy_extractors.py
@@ -92,4 +90,4 @@ cookies.txt
 # Plugins
 ytdlp_plugins/extractor/*
 !ytdlp_plugins/extractor/__init__.py
-!ytdlp_plugins/extractor/sample.py
\ No newline at end of file
+!ytdlp_plugins/extractor/sample.py
diff --git a/Changelog.md b/Changelog.md
index 9114f4cd2..51da29c60 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -141,12 +141,12 @@
 
 ### 2021.01.24
 * **Merge youtube-dl:** Upto [2021.01.24](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.16)
-* Plugin support ([documentation](https://github.com/pukkandan/yt-dlp#plugins))
+* Plugin support ([documentation](https://github.com/yt-dlp/yt-dlp#plugins))
 * **Multiple paths**: New option `-P`/`--paths` to give different paths for different types of files
-    * The syntax is `-P "type:path" -P "type:path"` ([documentation](https://github.com/pukkandan/yt-dlp#:~:text=-P,%20--paths%20TYPE:PATH))
+    * The syntax is `-P "type:path" -P "type:path"` ([documentation](https://github.com/yt-dlp/yt-dlp#:~:text=-P,%20--paths%20TYPE:PATH))
     * Valid types are: home, temp, description, annotation, subtitle, infojson, thumbnail
-    * Additionally, configuration file is taken from home directory or current directory ([documentation](https://github.com/pukkandan/yt-dlp#:~:text=Home%20Configuration))
-* Allow passing different arguments to different external downloaders ([documentation](https://github.com/pukkandan/yt-dlp#:~:text=--downloader-args%20NAME:ARGS))
+    * Additionally, configuration file is taken from home directory or current directory ([documentation](https://github.com/yt-dlp/yt-dlp#:~:text=Home%20Configuration))
+* Allow passing different arguments to different external downloaders ([documentation](https://github.com/yt-dlp/yt-dlp#:~:text=--downloader-args%20NAME:ARGS))
 * [mildom] Add extractor by [nao20010128nao](https://github.com/nao20010128nao)
 * Warn when using old style `--external-downloader-args` and `--post-processor-args`
 * Fix `--no-overwrite` when using `--write-link`
@@ -172,7 +172,7 @@
 * **Merge youtube-dl:** Upto [2021.01.16](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.16)
 * **Configuration files:**
     * Portable configuration file: `./yt-dlp.conf`
-    * Allow the configuration files to be named `yt-dlp` instead of `youtube-dlc`. See [this](https://github.com/pukkandan/yt-dlp#configuration) for details
+    * Allow the configuration files to be named `yt-dlp` instead of `youtube-dlc`. See [this](https://github.com/yt-dlp/yt-dlp#configuration) for details
 * Add PyPI release
 
 
@@ -181,7 +181,7 @@
 * [roosterteeth.com] Fix for bonus episodes by [Zocker1999NET](https://github.com/Zocker1999NET)
 * [tiktok] Fix for when share_info is empty
 * [EmbedThumbnail] Fix bug due to incorrect function name
-* [documentation] Changed sponskrub links to point to [pukkandan/sponskrub](https://github.com/pukkandan/SponSkrub) since I am now providing both linux and windows releases
+* [documentation] Changed sponskrub links to point to [yt-dlp/SponSkrub](https://github.com/yt-dlp/SponSkrub) since I am now providing both linux and windows releases
 * [documentation] Change all links to correctly point to new fork URL
 * [documentation] Fixes typos
 
diff --git a/MANIFEST.in b/MANIFEST.in
index d2cce9a1c..480b5c700 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,8 +2,8 @@ include README.md
 include LICENSE
 include AUTHORS
 include ChangeLog
-include youtube-dlc.bash-completion
-include youtube-dlc.fish
-include youtube-dlc.1
+include yt-dlp.bash-completion
+include yt-dlp.fish
+include yt-dlp.1
 recursive-include docs Makefile conf.py *.rst
 recursive-include test *
diff --git a/Makefile b/Makefile
index f5390c46d..b27f6e695 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-all: youtube-dlc doc man
+all: yt-dlp doc man
 doc: README.md CONTRIBUTING.md issuetemplates supportedsites
-man: README.txt youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish
+man: README.txt yt-dlp.1 yt-dlp.bash-completion yt-dlp.zsh yt-dlp.fish
 
 
 clean:
-	rm -rf youtube-dlc.1.temp.md youtube-dlc.1 youtube-dlc.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dlc.tar.gz youtube-dlc.zsh youtube-dlc.fish youtube_dlc/extractor/lazy_extractors.py *.dump *.part* *.ytdl *.info.json *.mp4 *.m4a *.flv *.mp3 *.avi *.mkv *.webm *.3gp *.wav *.ape *.swf *.jpg *.png *.spec *.frag *.frag.urls *.frag.aria2 CONTRIBUTING.md.tmp youtube-dlc youtube-dlc.exe
+	rm -rf yt-dlp.1.temp.md yt-dlp.1 yt-dlp.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ yt-dlp.tar.gz yt-dlp.zsh yt-dlp.fish yt_dlp/extractor/lazy_extractors.py *.dump *.part* *.ytdl *.info.json *.mp4 *.m4a *.flv *.mp3 *.avi *.mkv *.webm *.3gp *.wav *.ape *.swf *.jpg *.png *.spec *.frag *.frag.urls *.frag.aria2 CONTRIBUTING.md.tmp yt-dlp yt-dlp.exe
 	find . -name "*.pyc" -delete
 	find . -name "*.class" -delete
 
@@ -21,23 +21,23 @@ SYSCONFDIR = $(shell if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then ech
 # set markdown input format to "markdown-smart" for pandoc version 2 and to "markdown" for pandoc prior to version 2
 MARKDOWN = $(shell if [ `pandoc -v | head -n1 | cut -d" " -f2 | head -c1` = "2" ]; then echo markdown-smart; else echo markdown; fi)
 
-install: youtube-dlc youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish
+install: yt-dlp yt-dlp.1 yt-dlp.bash-completion yt-dlp.zsh yt-dlp.fish
 	install -d $(DESTDIR)$(BINDIR)
-	install -m 755 youtube-dlc $(DESTDIR)$(BINDIR)
+	install -m 755 yt-dlp $(DESTDIR)$(BINDIR)
 	install -d $(DESTDIR)$(MANDIR)/man1
-	install -m 644 youtube-dlc.1 $(DESTDIR)$(MANDIR)/man1
+	install -m 644 yt-dlp.1 $(DESTDIR)$(MANDIR)/man1
 	install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
-	install -m 644 youtube-dlc.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dlc
+	install -m 644 yt-dlp.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/yt-dlp
 	install -d $(DESTDIR)$(SHAREDIR)/zsh/site-functions
-	install -m 644 youtube-dlc.zsh $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_youtube-dlc
+	install -m 644 yt-dlp.zsh $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_yt-dlp
 	install -d $(DESTDIR)$(SYSCONFDIR)/fish/completions
-	install -m 644 youtube-dlc.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/youtube-dlc.fish
+	install -m 644 yt-dlp.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/yt-dlp.fish
 
 codetest:
 	flake8 .
 
 test:
-	#nosetests --with-coverage --cover-package=youtube_dlc --cover-html --verbose --processes 4 test
+	#nosetests --with-coverage --cover-package=yt_dlp --cover-html --verbose --processes 4 test
 	nosetests --verbose test
 	$(MAKE) codetest
 
@@ -57,34 +57,34 @@ offlinetest: codetest
 		--exclude test_youtube_signature.py \
 		--exclude test_post_hooks.py
 
-tar: youtube-dlc.tar.gz
+tar: yt-dlp.tar.gz
 
 .PHONY: all clean install test tar bash-completion pypi-files zsh-completion fish-completion ot offlinetest codetest supportedsites
 
-pypi-files: youtube-dlc.bash-completion README.txt youtube-dlc.1 youtube-dlc.fish
+pypi-files: yt-dlp.bash-completion README.txt yt-dlp.1 yt-dlp.fish
 
-youtube-dlc: youtube_dlc/*.py youtube_dlc/*/*.py
+yt-dlp: yt_dlp/*.py yt_dlp/*/*.py
 	mkdir -p zip
-	for d in youtube_dlc youtube_dlc/downloader youtube_dlc/extractor youtube_dlc/postprocessor ; do \
+	for d in yt_dlp yt_dlp/downloader yt_dlp/extractor yt_dlp/postprocessor ; do \
 	  mkdir -p zip/$$d ;\
 	  cp -pPR $$d/*.py zip/$$d/ ;\
 	done
-	touch -t 200001010101 zip/youtube_dlc/*.py zip/youtube_dlc/*/*.py
-	mv zip/youtube_dlc/__main__.py zip/
-	cd zip ; zip -q ../youtube-dlc youtube_dlc/*.py youtube_dlc/*/*.py __main__.py
+	touch -t 200001010101 zip/yt_dlp/*.py zip/yt_dlp/*/*.py
+	mv zip/yt_dlp/__main__.py zip/
+	cd zip ; zip -q ../yt-dlp yt_dlp/*.py yt_dlp/*/*.py __main__.py
 	rm -rf zip
-	echo '#!$(PYTHON)' > youtube-dlc
-	cat youtube-dlc.zip >> youtube-dlc
-	rm youtube-dlc.zip
-	chmod a+x youtube-dlc
+	echo '#!$(PYTHON)' > yt-dlp
+	cat yt-dlp.zip >> yt-dlp
+	rm yt-dlp.zip
+	chmod a+x yt-dlp
 
-README.md: youtube_dlc/*.py youtube_dlc/*/*.py
-	COLUMNS=80 $(PYTHON) youtube_dlc/__main__.py --help | $(PYTHON) devscripts/make_readme.py
+README.md: yt_dlp/*.py yt_dlp/*/*.py
+	COLUMNS=80 $(PYTHON) yt_dlp/__main__.py --help | $(PYTHON) devscripts/make_readme.py
 
 CONTRIBUTING.md: README.md
 	$(PYTHON) devscripts/make_contributing.py README.md CONTRIBUTING.md
 
-issuetemplates: devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.md .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md .github/ISSUE_TEMPLATE_tmpl/4_bug_report.md .github/ISSUE_TEMPLATE_tmpl/5_feature_request.md youtube_dlc/version.py
+issuetemplates: devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.md .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md .github/ISSUE_TEMPLATE_tmpl/4_bug_report.md .github/ISSUE_TEMPLATE_tmpl/5_feature_request.md yt_dlp/version.py
 	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.md .github/ISSUE_TEMPLATE/1_broken_site.md
 	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md .github/ISSUE_TEMPLATE/2_site_support_request.md
 	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md .github/ISSUE_TEMPLATE/3_site_feature_request.md
@@ -97,34 +97,34 @@ supportedsites:
 README.txt: README.md
 	pandoc -f $(MARKDOWN) -t plain README.md -o README.txt
 
-youtube-dlc.1: README.md
-	$(PYTHON) devscripts/prepare_manpage.py youtube-dlc.1.temp.md
-	pandoc -s -f $(MARKDOWN) -t man youtube-dlc.1.temp.md -o youtube-dlc.1
-	rm -f youtube-dlc.1.temp.md
+yt-dlp.1: README.md
+	$(PYTHON) devscripts/prepare_manpage.py yt-dlp.1.temp.md
+	pandoc -s -f $(MARKDOWN) -t man yt-dlp.1.temp.md -o yt-dlp.1
+	rm -f yt-dlp.1.temp.md
 
-youtube-dlc.bash-completion: youtube_dlc/*.py youtube_dlc/*/*.py devscripts/bash-completion.in
+yt-dlp.bash-completion: yt_dlp/*.py yt_dlp/*/*.py devscripts/bash-completion.in
 	$(PYTHON) devscripts/bash-completion.py
 
-bash-completion: youtube-dlc.bash-completion
+bash-completion: yt-dlp.bash-completion
 
-youtube-dlc.zsh: youtube_dlc/*.py youtube_dlc/*/*.py devscripts/zsh-completion.in
+yt-dlp.zsh: yt_dlp/*.py yt_dlp/*/*.py devscripts/zsh-completion.in
 	$(PYTHON) devscripts/zsh-completion.py
 
-zsh-completion: youtube-dlc.zsh
+zsh-completion: yt-dlp.zsh
 
-youtube-dlc.fish: youtube_dlc/*.py youtube_dlc/*/*.py devscripts/fish-completion.in
+yt-dlp.fish: yt_dlp/*.py yt_dlp/*/*.py devscripts/fish-completion.in
 	$(PYTHON) devscripts/fish-completion.py
 
-fish-completion: youtube-dlc.fish
+fish-completion: yt-dlp.fish
 
-lazy-extractors: youtube_dlc/extractor/lazy_extractors.py
+lazy-extractors: yt_dlp/extractor/lazy_extractors.py
 
-_EXTRACTOR_FILES = $(shell find youtube_dlc/extractor -iname '*.py' -and -not -iname 'lazy_extractors.py')
-youtube_dlc/extractor/lazy_extractors.py: devscripts/make_lazy_extractors.py devscripts/lazy_load_template.py $(_EXTRACTOR_FILES)
+_EXTRACTOR_FILES = $(shell find yt_dlp/extractor -iname '*.py' -and -not -iname 'lazy_extractors.py')
+yt_dlp/extractor/lazy_extractors.py: devscripts/make_lazy_extractors.py devscripts/lazy_load_template.py $(_EXTRACTOR_FILES)
 	$(PYTHON) devscripts/make_lazy_extractors.py $@
 
-youtube-dlc.tar.gz: youtube-dlc README.md README.txt youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish ChangeLog AUTHORS
-	@tar -czf youtube-dlc.tar.gz --transform "s|^|youtube-dlc/|" --owner 0 --group 0 \
+yt-dlp.tar.gz: yt-dlp README.md README.txt yt-dlp.1 yt-dlp.bash-completion yt-dlp.zsh yt-dlp.fish ChangeLog AUTHORS
+	@tar -czf yt-dlp.tar.gz --transform "s|^|yt-dlp/|" --owner 0 --group 0 \
 		--exclude '*.DS_Store' \
 		--exclude '*.kate-swp' \
 		--exclude '*.pyc' \
@@ -134,8 +134,8 @@ youtube-dlc.tar.gz: youtube-dlc README.md README.txt youtube-dlc.1 youtube-dlc.b
 		--exclude '.git' \
 		--exclude 'docs/_build' \
 		-- \
-		bin devscripts test youtube_dlc docs \
+		bin devscripts test yt_dlp docs \
 		ChangeLog AUTHORS LICENSE README.md README.txt \
-		Makefile MANIFEST.in youtube-dlc.1 youtube-dlc.bash-completion \
-		youtube-dlc.zsh youtube-dlc.fish setup.py setup.cfg \
-		youtube-dlc
+		Makefile MANIFEST.in yt-dlp.1 yt-dlp.bash-completion \
+		yt-dlp.zsh yt-dlp.fish setup.py setup.cfg \
+		yt-dlp
diff --git a/README.md b/README.md
index 2141e922d..ef1a7bba2 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
 # YT-DLP
 
-[![Release version](https://img.shields.io/github/v/release/pukkandan/yt-dlp?color=brightgreen&label=Release)](https://github.com/pukkandan/yt-dlp/releases/latest)
+[![Release version](https://img.shields.io/github/v/release/yt-dlp/yt-dlp?color=brightgreen&label=Release)](https://github.com/yt-dlp/yt-dlp/releases/latest)
 [![License: Unlicense](https://img.shields.io/badge/License-Unlicense-blue.svg)](LICENSE)
-[![CI Status](https://github.com/pukkandan/yt-dlp/workflows/Core%20Tests/badge.svg?branch=master)](https://github.com/pukkandan/yt-dlp/actions)
+[![CI Status](https://github.com/yt-dlp/yt-dlp/workflows/Core%20Tests/badge.svg?branch=master)](https://github.com/yt-dlp/yt-dlp/actions)
 [![Discord](https://img.shields.io/discord/807245652072857610?color=blue&label=discord&logo=discord)](https://discord.gg/S75JaBna)  
 
-[![Commits](https://img.shields.io/github/commit-activity/m/pukkandan/yt-dlp?label=commits)](https://github.com/pukkandan/yt-dlp/commits)
-[![Last Commit](https://img.shields.io/github/last-commit/pukkandan/yt-dlp/master)](https://github.com/pukkandan/yt-dlp/commits)
-[![Downloads](https://img.shields.io/github/downloads/pukkandan/yt-dlp/total)](https://github.com/pukkandan/yt-dlp/releases/latest)
+[![Commits](https://img.shields.io/github/commit-activity/m/yt-dlp/yt-dlp?label=commits)](https://github.com/yt-dlp/yt-dlp/commits)
+[![Last Commit](https://img.shields.io/github/last-commit/yt-dlp/yt-dlp/master)](https://github.com/yt-dlp/yt-dlp/commits)
+[![Downloads](https://img.shields.io/github/downloads/yt-dlp/yt-dlp/total)](https://github.com/yt-dlp/yt-dlp/releases/latest)
 [![PyPi Downloads](https://img.shields.io/pypi/dm/yt-dlp?label=PyPi)](https://pypi.org/project/yt-dlp)
 
 A command-line program to download videos from youtube.com and many other [video platforms](docs/supportedsites.md)
@@ -52,13 +52,13 @@ This is a fork of [youtube-dlc](https://github.com/blackjack4494/yt-dlc) which i
 # NEW FEATURES
 The major new features from the latest release of [blackjack4494/yt-dlc](https://github.com/blackjack4494/yt-dlc) are:
 
-* **[SponSkrub Integration](#sponskrub-sponsorblock-options)**: You can use [SponSkrub](https://github.com/pukkandan/SponSkrub) to mark/remove sponsor sections in youtube videos by utilizing the [SponsorBlock](https://sponsor.ajay.app) API
+* **[SponSkrub Integration](#sponskrub-sponsorblock-options)**: You can use [SponSkrub](https://github.com/yt-dlp/SponSkrub) to mark/remove sponsor sections in youtube videos by utilizing the [SponsorBlock](https://sponsor.ajay.app) API
 
 * **[Format Sorting](#sorting-formats)**: The default format sorting options have been changed so that higher resolution and better codecs will be now preferred instead of simply using larger bitrate. Furthermore, you can now specify the sort order using `-S`. This allows for much easier format selection that what is possible by simply using `--format` ([examples](#format-selection-examples))
 
 * **Merged with youtube-dl v2021.02.10**: You get all the latest features and patches of [youtube-dl](https://github.com/ytdl-org/youtube-dl) in addition to all the features of [youtube-dlc](https://github.com/blackjack4494/yt-dlc)
 
-* **Merged with animelover1984/youtube-dl**: You get most of the features and improvements from [animelover1984/youtube-dl](https://github.com/animelover1984/youtube-dl) including `--get-comments`, `BiliBiliSearch`, `BilibiliChannel`, Embedding thumbnail in mp4/ogg/opus, Playlist infojson etc. Note that the NicoNico improvements are not available. See [#31](https://github.com/pukkandan/yt-dlp/pull/31) for details.
+* **Merged with animelover1984/youtube-dl**: You get most of the features and improvements from [animelover1984/youtube-dl](https://github.com/animelover1984/youtube-dl) including `--get-comments`, `BiliBiliSearch`, `BilibiliChannel`, Embedding thumbnail in mp4/ogg/opus, Playlist infojson etc. Note that the NicoNico improvements are not available. See [#31](https://github.com/yt-dlp/yt-dlp/pull/31) for details.
 
 * **Youtube improvements**:
     * All Youtube Feeds (`:ytfav`, `:ytwatchlater`, `:ytsubs`, `:ythistory`, `:ytrec`) works correctly and supports downloading multiple pages of content
@@ -73,7 +73,7 @@ The major new features from the latest release of [blackjack4494/yt-dlc](https:/
 
 * **Plugin support**: Extractors can be loaded from an external file. See [plugins](#plugins) for details
 
-* **Multiple paths and output templates**: You can give different [output templates](#output-template) and download paths for different types of files. You can also set a temporary path where intermediary files are downloaded to. See [`--paths`](https://github.com/pukkandan/yt-dlp/#:~:text=-P,%20--paths%20TYPE:PATH) for details
+* **Multiple paths and output templates**: You can give different [output templates](#output-template) and download paths for different types of files. You can also set a temporary path where intermediary files are downloaded to. See [`--paths`](https://github.com/yt-dlp/yt-dlp/#:~:text=-P,%20--paths%20TYPE:PATH) for details
 
 <!-- Relative link doesn't work for "#:~:text=" -->
 
@@ -83,10 +83,10 @@ The major new features from the latest release of [blackjack4494/yt-dlc](https:/
 
 * **Improvements**: Multiple `--postprocessor-args` and `--external-downloader-args`, Date/time formatting in `-o`, faster archive checking, more [format selection options](#format-selection) etc
 
-* **Self-updater**: The releases can be updated using `youtube-dlc -U`
+* **Self-updater**: The releases can be updated using `yt-dlp -U`
 
 
-See [changelog](Changelog.md) or [commits](https://github.com/pukkandan/yt-dlp/commits) for the full list of changes
+See [changelog](Changelog.md) or [commits](https://github.com/yt-dlp/yt-dlp/commits) for the full list of changes
 
 
 **PS**: Some of these changes are already in youtube-dlc, but are still unreleased. See [this](Changelog.md#unreleased-changes-in-blackjack4494yt-dlc) for details
@@ -97,13 +97,13 @@ If you are coming from [youtube-dl](https://github.com/ytdl-org/youtube-dl), the
 # INSTALLATION
 
 You can install yt-dlp using one of the following methods:
-* Download the binary from the [latest release](https://github.com/pukkandan/yt-dlp/releases/latest) (recommended method)
+* Download the binary from the [latest release](https://github.com/yt-dlp/yt-dlp/releases/latest) (recommended method)
 * Use [PyPI package](https://pypi.org/project/yt-dlp): `python -m pip install --upgrade yt-dlp`
-* Use pip+git: `python -m pip install --upgrade git+https://github.com/pukkandan/yt-dlp.git@release`
-* Install master branch: `python -m pip install --upgrade git+https://github.com/pukkandan/yt-dlp`
+* Use pip+git: `python -m pip install --upgrade git+https://github.com/yt-dlp/yt-dlp.git@release`
+* Install master branch: `python -m pip install --upgrade git+https://github.com/yt-dlp/yt-dlp`
 
 ### UPDATE
-Starting from version `2021.02.09`, you can use `youtube-dlc -U` to update if you are using the provided release.
+Starting from version `2021.02.09`, you can use `yt-dlp -U` to update if you are using the provided release.
 If you are using `pip`, simply re-run the same command that was used to install the program.
 
 ### COMPILE
@@ -117,7 +117,7 @@ Once you have all the necessary dependancies installed, just run `py pyinst.py`.
 
 You can also build the executable without any version info or metadata by using:
 
-    pyinstaller.exe youtube_dlc\__main__.py --onefile --name youtube-dlc
+    pyinstaller.exe yt_dlp\__main__.py --onefile --name yt-dlp
 
 **For Unix**:
 You will need the required build tools  
@@ -129,9 +129,9 @@ Then simply type this
 **Note**: In either platform, `devscripts\update-version.py` can be used to automatically update the version number
 
 # DESCRIPTION
-**youtube-dlc** is a command-line program to download videos from youtube.com many other [video platforms](docs/supportedsites.md). It requires the Python interpreter, version 2.6, 2.7, or 3.2+, and it is not platform specific. It should work on your Unix box, on Windows or on macOS. It is released to the public domain, which means you can modify it, redistribute it or use it however you like.
+**yt-dlp** is a command-line program to download videos from youtube.com many other [video platforms](docs/supportedsites.md). It requires the Python interpreter, version 2.6, 2.7, or 3.2+, and it is not platform specific. It should work on your Unix box, on Windows or on macOS. It is released to the public domain, which means you can modify it, redistribute it or use it however you like.
 
-    youtube-dlc [OPTIONS] [--] URL [URL...]
+    yt-dlp [OPTIONS] [--] URL [URL...]
 
 
 # OPTIONS
@@ -561,7 +561,7 @@ Then simply type this
 ## Authentication Options:
     -u, --username USERNAME          Login with this account ID
     -p, --password PASSWORD          Account password. If this option is left
-                                     out, youtube-dlc will ask interactively
+                                     out, yt-dlp will ask interactively
     -2, --twofactor TWOFACTOR        Two-factor authentication code
     -n, --netrc                      Use .netrc authentication data
     --video-password PASSWORD        Video password (vimeo, youku)
@@ -572,7 +572,7 @@ Then simply type this
                                      a list of available MSOs
     --ap-username USERNAME           Multiple-system operator account login
     --ap-password PASSWORD           Multiple-system operator account password.
-                                     If this option is left out, youtube-dlc
+                                     If this option is left out, yt-dlp
                                      will ask interactively
     --ap-list-mso                    List all supported multiple-system
                                      operators
@@ -667,7 +667,7 @@ Then simply type this
                                      (currently supported: srt|ass|vtt|lrc)
 
 ## SponSkrub (SponsorBlock) Options:
-[SponSkrub](https://github.com/pukkandan/SponSkrub) is a utility to
+[SponSkrub](https://github.com/yt-dlp/SponSkrub) is a utility to
     mark/remove sponsor segments from downloaded YouTube videos using
     [SponsorBlock API](https://sponsor.ajay.app)
 
@@ -712,11 +712,11 @@ Then simply type this
 
 # CONFIGURATION
 
-You can configure youtube-dlc by placing any supported command line option to a configuration file. The configuration is loaded from the following locations:
+You can configure yt-dlp by placing any supported command line option to a configuration file. The configuration is loaded from the following locations:
 
 1. **Main Configuration**: The file given by `--config-location`
-1. **Portable Configuration**: `yt-dlp.conf` or `youtube-dlc.conf` in the same directory as the bundled binary. If you are running from source-code (`<root dir>/youtube_dlc/__main__.py`), the root directory is used instead.
-1. **Home Configuration**: `yt-dlp.conf` or `youtube-dlc.conf` in the home path given by `-P "home:<path>"`, or in the current directory if no such path is given
+1. **Portable Configuration**: `yt-dlp.conf` in the same directory as the bundled binary. If you are running from source-code (`<root dir>/yt_dlp/__main__.py`), the root directory is used instead.
+1. **Home Configuration**: `yt-dlp.conf` in the home path given by `-P "home:<path>"`, or in the current directory if no such path is given
 1. **User Configuration**:
     * `%XDG_CONFIG_HOME%/yt-dlp/config` (recommended on Linux/macOS)
     * `%XDG_CONFIG_HOME%/yt-dlp.conf`
@@ -725,10 +725,10 @@ You can configure youtube-dlc by placing any supported command line option to a
     * `~/yt-dlp.conf`
     * `~/yt-dlp.conf.txt`
 
-    If none of these files are found, the search is performed again by replacing `yt-dlp` with `youtube-dlc`. Note that `~` points to `C:\Users\<user name>` on windows. Also, `%XDG_CONFIG_HOME%` defaults to `~/.config` if undefined
-1. **System Configuration**: `/etc/yt-dlp.conf` or `/etc/youtube-dlc.conf`
+    Note that `~` points to `C:\Users\<user name>` on windows. Also, `%XDG_CONFIG_HOME%` defaults to `~/.config` if undefined
+1. **System Configuration**: `/etc/yt-dlp.conf` or `/etc/yt-dlp.conf`
 
-For example, with the following configuration file youtube-dlc will always extract the audio, not copy the mtime, use a proxy and save all videos under `YouTube` directory in your home directory:
+For example, with the following configuration file yt-dlp will always extract the audio, not copy the mtime, use a proxy and save all videos under `YouTube` directory in your home directory:
 ```
 # Lines starting with # are comments
 
@@ -747,11 +747,11 @@ For example, with the following configuration file youtube-dlc will always extra
 
 Note that options in configuration file are just the same options aka switches used in regular command line calls; thus there **must be no whitespace** after `-` or `--`, e.g. `-o` or `--proxy` but not `- o` or `-- proxy`.
 
-You can use `--ignore-config` if you want to disable all configuration files for a particular youtube-dlc run. If `--ignore-config` is found inside any configuration file, no further configuration will be loaded. For example, having the option in the portable configuration file prevents loading of user and system configurations. Additionally, (for backward compatibility) if `--ignore-config` is found inside the system configuration file, the user configuration is not loaded.
+You can use `--ignore-config` if you want to disable all configuration files for a particular yt-dlp run. If `--ignore-config` is found inside any configuration file, no further configuration will be loaded. For example, having the option in the portable configuration file prevents loading of user and system configurations. Additionally, (for backward compatibility) if `--ignore-config` is found inside the system configuration file, the user configuration is not loaded.
 
 ### Authentication with `.netrc` file
 
-You may also want to configure automatic credentials storage for extractors that support authentication (by providing login and password with `--username` and `--password`) in order not to pass credentials as command line arguments on every youtube-dlc execution and prevent tracking plain text passwords in the shell command history. You can achieve this using a [`.netrc` file](https://stackoverflow.com/tags/.netrc/info) on a per extractor basis. For that you will need to create a `.netrc` file in your `$HOME` and restrict permissions to read/write by only you:
+You may also want to configure automatic credentials storage for extractors that support authentication (by providing login and password with `--username` and `--password`) in order not to pass credentials as command line arguments on every yt-dlp execution and prevent tracking plain text passwords in the shell command history. You can achieve this using a [`.netrc` file](https://stackoverflow.com/tags/.netrc/info) on a per extractor basis. For that you will need to create a `.netrc` file in your `$HOME` and restrict permissions to read/write by only you:
 ```
 touch $HOME/.netrc
 chmod a-rwx,u+rw $HOME/.netrc
@@ -765,7 +765,7 @@ For example:
 machine youtube login myaccount@gmail.com password my_youtube_password
 machine twitch login my_twitch_account_name password my_twitch_password
 ```
-To activate authentication with the `.netrc` file you should pass `--netrc` to youtube-dlc or place it in the [configuration file](#configuration).
+To activate authentication with the `.netrc` file you should pass `--netrc` to yt-dlp or place it in the [configuration file](#configuration).
 
 On Windows you may also need to setup the `%HOME%` environment variable manually. For example:
 ```
@@ -778,7 +778,7 @@ The `-o` option is used to indicate a template for the output file names while `
 
 **tl;dr:** [navigate me to examples](#output-template-examples).
 
-The basic usage of `-o` is not to set any template arguments when downloading a single file, like in `youtube-dlc -o funny_video.flv "https://some/video"`. However, it may contain special sequences that will be replaced when downloading each video. The special sequences may be formatted according to [python string formatting operations](https://docs.python.org/2/library/stdtypes.html#string-formatting). For example, `%(NAME)s` or `%(NAME)05d`. To clarify, that is a percent symbol followed by a name in parentheses, followed by formatting operations. Date/time fields can also be formatted according to [strftime formatting](https://docs.python.org/3/library/datetime.html#strftime-and-strptime-format-codes) by specifying it inside the parantheses seperated from the field name using a `>`. For example, `%(duration>%H-%M-%S)s`.
+The basic usage of `-o` is not to set any template arguments when downloading a single file, like in `yt-dlp -o funny_video.flv "https://some/video"`. However, it may contain special sequences that will be replaced when downloading each video. The special sequences may be formatted according to [python string formatting operations](https://docs.python.org/2/library/stdtypes.html#string-formatting). For example, `%(NAME)s` or `%(NAME)05d`. To clarify, that is a percent symbol followed by a name in parentheses, followed by formatting operations. Date/time fields can also be formatted according to [strftime formatting](https://docs.python.org/3/library/datetime.html#strftime-and-strptime-format-codes) by specifying it inside the parantheses seperated from the field name using a `>`. For example, `%(duration>%H-%M-%S)s`.
 
 Additionally, you can set different output templates for the various metadata files seperately from the general output template by specifying the type of file followed by the template seperated by a colon ":". The different filetypes supported are `subtitle|thumbnail|description|annotation|infojson|pl_description|pl_infojson`. For example, `-o '%(title)s.%(ext)s' -o 'thumbnail:%(title)s\%(title)s.%(ext)s'`  will put the thumbnails in a folder with the same name as the video.
 
@@ -873,7 +873,7 @@ Available for the media that is a track or a part of a music album:
 
 Each aforementioned sequence when referenced in an output template will be replaced by the actual value corresponding to the sequence name. Note that some of the sequences are not guaranteed to be present since they depend on the metadata obtained by a particular extractor. Such sequences will be replaced with placeholder value provided with `--output-na-placeholder` (`NA` by default).
 
-For example for `-o %(title)s-%(id)s.%(ext)s` and an mp4 video with title `youtube-dlc test video` and id `BaW_jenozKcj`, this will result in a `youtube-dlc test video-BaW_jenozKcj.mp4` file created in the current directory.
+For example for `-o %(title)s-%(id)s.%(ext)s` and an mp4 video with title `yt-dlp test video` and id `BaW_jenozKcj`, this will result in a `yt-dlp test video-BaW_jenozKcj.mp4` file created in the current directory.
 
 For numeric sequences you can use numeric related formatting, for example, `%(view_count)05d` will result in a string with view count padded with zeros up to 5 characters, like in `00042`.
 
@@ -894,35 +894,35 @@ If you are using an output template inside a Windows batch file then you must es
 Note that on Windows you need to use double quotes instead of single.
 
 ```bash
-$ youtube-dlc --get-filename -o '%(title)s.%(ext)s' BaW_jenozKc
-youtube-dlc test video ''_ä↭𝕐.mp4    # All kinds of weird characters
+$ yt-dlp --get-filename -o '%(title)s.%(ext)s' BaW_jenozKc
+youtube-dl test video ''_ä↭𝕐.mp4    # All kinds of weird characters
 
-$ youtube-dlc --get-filename -o '%(title)s.%(ext)s' BaW_jenozKc --restrict-filenames
-youtube-dlc_test_video_.mp4          # A simple file name
+$ yt-dlp --get-filename -o '%(title)s.%(ext)s' BaW_jenozKc --restrict-filenames
+youtube-dl_test_video_.mp4          # A simple file name
 
 # Download YouTube playlist videos in separate directory indexed by video order in a playlist
-$ youtube-dlc -o '%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s' https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re
+$ yt-dlp -o '%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s' https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re
 
 # Download YouTube playlist videos in seperate directories according to their uploaded year
-$ youtube-dlc -o '%(upload_date>%Y)s/%(title)s.%(ext)s' https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re
+$ yt-dlp -o '%(upload_date>%Y)s/%(title)s.%(ext)s' https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re
 
 # Download all playlists of YouTube channel/user keeping each playlist in separate directory:
-$ youtube-dlc -o '%(uploader)s/%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s' https://www.youtube.com/user/TheLinuxFoundation/playlists
+$ yt-dlp -o '%(uploader)s/%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s' https://www.youtube.com/user/TheLinuxFoundation/playlists
 
 # Download Udemy course keeping each chapter in separate directory under MyVideos directory in your home
-$ youtube-dlc -u user -p password -P '~/MyVideos' -o '%(playlist)s/%(chapter_number)s - %(chapter)s/%(title)s.%(ext)s' https://www.udemy.com/java-tutorial/
+$ yt-dlp -u user -p password -P '~/MyVideos' -o '%(playlist)s/%(chapter_number)s - %(chapter)s/%(title)s.%(ext)s' https://www.udemy.com/java-tutorial/
 
 # Download entire series season keeping each series and each season in separate directory under C:/MyVideos
-$ youtube-dlc -P "C:/MyVideos" -o "%(series)s/%(season_number)s - %(season)s/%(episode_number)s - %(episode)s.%(ext)s" https://videomore.ru/kino_v_detalayah/5_sezon/367617
+$ yt-dlp -P "C:/MyVideos" -o "%(series)s/%(season_number)s - %(season)s/%(episode_number)s - %(episode)s.%(ext)s" https://videomore.ru/kino_v_detalayah/5_sezon/367617
 
 # Stream the video being downloaded to stdout
-$ youtube-dlc -o - BaW_jenozKc
+$ yt-dlp -o - BaW_jenozKc
 ```
 
 # FORMAT SELECTION
 
-By default, youtube-dlc tries to download the best available quality if you **don't** pass any options.
-This is generally equivalent to using `-f bestvideo*+bestaudio/best`. However, if multiple audiostreams is enabled (`--audio-multistreams`), the default format changes to `-f bestvideo+bestaudio/best`. Similarly, if ffmpeg is unavailable, or if you use youtube-dlc to stream to `stdout` (`-o -`), the default becomes `-f best/bestvideo+bestaudio`.
+By default, yt-dlp tries to download the best available quality if you **don't** pass any options.
+This is generally equivalent to using `-f bestvideo*+bestaudio/best`. However, if multiple audiostreams is enabled (`--audio-multistreams`), the default format changes to `-f bestvideo+bestaudio/best`. Similarly, if ffmpeg is unavailable, or if you use yt-dlp to stream to `stdout` (`-o -`), the default becomes `-f best/bestvideo+bestaudio`.
 
 The general syntax for format selection is `--f FORMAT` (or `--format FORMAT`) where `FORMAT` is a *selector expression*, i.e. an expression that describes format or formats you would like to download.
 
@@ -1034,19 +1034,19 @@ Note that on Windows you may need to use double quotes instead of single.
 ```bash
 # Download and merge the best best video-only format and the best audio-only format,
 # or download the best combined format if video-only format is not available
-$ youtube-dlc -f 'bv+ba/b'
+$ yt-dlp -f 'bv+ba/b'
 
 # Download best format that contains video,
 # and if it doesn't already have an audio stream, merge it with best audio-only format
-$ youtube-dlc -f 'bv*+ba/b'
+$ yt-dlp -f 'bv*+ba/b'
 
 # Same as above
-$ youtube-dlc
+$ yt-dlp
 
 # Download the best video-only format and the best audio-only format without merging them
 # For this case, an output template should be used since
 # by default, bestvideo and bestaudio will have the same file name.
-$ youtube-dlc -f 'bv,ba' -o '%(title)s.f%(format_id)s.%(ext)s'
+$ yt-dlp -f 'bv,ba' -o '%(title)s.f%(format_id)s.%(ext)s'
 
 
 
@@ -1054,74 +1054,74 @@ $ youtube-dlc -f 'bv,ba' -o '%(title)s.f%(format_id)s.%(ext)s'
 # and how to use -S to achieve a similar but better result
 
 # Download the worst video available (old method)
-$ youtube-dlc -f 'wv*+wa/w'
+$ yt-dlp -f 'wv*+wa/w'
 
 # Download the best video available but with the smallest resolution
-$ youtube-dlc -S '+res'
+$ yt-dlp -S '+res'
 
 # Download the smallest video available
-$ youtube-dlc -S '+size,+br'
+$ yt-dlp -S '+size,+br'
 
 
 
 # Download the best mp4 video available, or the best video if no mp4 available
-$ youtube-dlc -f 'bv*[ext=mp4]+ba[ext=m4a]/b[ext=mp4] / bv*+ba/b'
+$ yt-dlp -f 'bv*[ext=mp4]+ba[ext=m4a]/b[ext=mp4] / bv*+ba/b'
 
 # Download the best video with the best extension
 # (For video, mp4 > webm > flv. For audio, m4a > aac > mp3 ...)
-$ youtube-dlc -S 'ext'
+$ yt-dlp -S 'ext'
 
 
 
 # Download the best video available but no better than 480p,
 # or the worst video if there is no video under 480p
-$ youtube-dlc -f 'bv*[height<=480]+ba/b[height<=480] / wv*+ba/w'
+$ yt-dlp -f 'bv*[height<=480]+ba/b[height<=480] / wv*+ba/w'
 
 # Download the best video available with the largest height but no better than 480p,
 # or the best video with the smallest resolution if there is no video under 480p
-$ youtube-dlc -S 'height:480'
+$ yt-dlp -S 'height:480'
 
 # Download the best video available with the largest resolution but no better than 480p,
 # or the best video with the smallest resolution if there is no video under 480p
 # Resolution is determined by using the smallest dimension.
 # So this works correctly for vertical videos as well
-$ youtube-dlc -S 'res:480'
+$ yt-dlp -S 'res:480'
 
 
 
 # Download the best video (that also has audio) but no bigger than 50 MB,
 # or the worst video (that also has audio) if there is no video under 50 MB
-$ youtube-dlc -f 'b[filesize<50M] / w'
+$ yt-dlp -f 'b[filesize<50M] / w'
 
 # Download largest video (that also has audio) but no bigger than 50 MB,
 # or the smallest video (that also has audio) if there is no video under 50 MB
-$ youtube-dlc -f 'b' -S 'filesize:50M'
+$ yt-dlp -f 'b' -S 'filesize:50M'
 
 # Download best video (that also has audio) that is closest in size to 50 MB
-$ youtube-dlc -f 'b' -S 'filesize~50M'
+$ yt-dlp -f 'b' -S 'filesize~50M'
 
 
 
 # Download best video available via direct link over HTTP/HTTPS protocol,
 # or the best video available via any protocol if there is no such video
-$ youtube-dlc -f '(bv*+ba/b)[protocol^=http][protocol!*=dash] / (bv*+ba/b)'
+$ yt-dlp -f '(bv*+ba/b)[protocol^=http][protocol!*=dash] / (bv*+ba/b)'
 
 # Download best video available via the best protocol
 # (https/ftps > http/ftp > m3u8_native > m3u8 > http_dash_segments ...)
-$ youtube-dlc -S 'proto'
+$ yt-dlp -S 'proto'
 
 
 
 # Download the best video with h264 codec, or the best video if there is no such video
-$ youtube-dlc -f '(bv*+ba/b)[vcodec^=avc1] / (bv*+ba/b)'
+$ yt-dlp -f '(bv*+ba/b)[vcodec^=avc1] / (bv*+ba/b)'
 
 # Download the best video with best codec no better than h264,
 # or the best video with worst codec if there is no such video
-$ youtube-dlc -S 'codec:h264'
+$ yt-dlp -S 'codec:h264'
 
 # Download the best video with worst codec no worse than h264,
 # or the best video with best codec if there is no such video
-$ youtube-dlc -S '+codec:h264'
+$ yt-dlp -S '+codec:h264'
 
 
 
@@ -1129,26 +1129,26 @@ $ youtube-dlc -S '+codec:h264'
 
 # Download the best video no better than 720p prefering framerate greater than 30,
 # or the worst video (still prefering framerate greater than 30) if there is no such video
-$ youtube-dlc -f '((bv*[fps>30]/bv*)[height<=720]/(wv*[fps>30]/wv*)) + ba / (b[fps>30]/b)[height<=720]/(w[fps>30]/w)'
+$ yt-dlp -f '((bv*[fps>30]/bv*)[height<=720]/(wv*[fps>30]/wv*)) + ba / (b[fps>30]/b)[height<=720]/(w[fps>30]/w)'
 
 # Download the video with the largest resolution no better than 720p,
 # or the video with the smallest resolution available  if there is no such video,
 # prefering larger framerate for formats with the same resolution
-$ youtube-dlc -S 'res:720,fps'
+$ yt-dlp -S 'res:720,fps'
 
 
 
 # Download the video with smallest resolution no worse than 480p,
 # or the video with the largest resolution available if there is no such video,
 # prefering better codec and then larger total bitrate for the same resolution
-$ youtube-dlc -S '+res:480,codec,br'
+$ yt-dlp -S '+res:480,codec,br'
 ```
 
 # PLUGINS
 
 Plugins are loaded from `<root-dir>/ytdlp_plugins/<type>/__init__.py`. Currently only `extractor` plugins are supported. Support for `downloader` and `postprocessor` plugins may be added in the future. See [ytdlp_plugins](ytdlp_plugins) for example.
 
-**Note**: `<root-dir>` is the directory of the binary (`<root-dir>/youtube-dlc`), or the root directory of the module if you are running directly from source-code (`<root dir>/youtube_dlc/__main__.py`)
+**Note**: `<root-dir>` is the directory of the binary (`<root-dir>/yt-dlp`), or the root directory of the module if you are running directly from source-code (`<root dir>/yt_dlp/__main__.py`)
 
 # MORE
 For FAQ, Developer Instructions etc., see the [original README](https://github.com/ytdl-org/youtube-dl#faq)
diff --git a/devscripts/bash-completion.in b/devscripts/bash-completion.in
index 1bf41f2cc..21f52798e 100644
--- a/devscripts/bash-completion.in
+++ b/devscripts/bash-completion.in
@@ -1,4 +1,4 @@
-__youtube_dlc()
+__yt_dlp()
 {
     local cur prev opts fileopts diropts keywords
     COMPREPLY=()
@@ -26,4 +26,4 @@ __youtube_dlc()
     fi
 }
 
-complete -F __youtube_dlc youtube-dlc
+complete -F __yt_dlp yt-dlp
diff --git a/devscripts/bash-completion.py b/devscripts/bash-completion.py
index d68c9b1cc..66c3d14f7 100755
--- a/devscripts/bash-completion.py
+++ b/devscripts/bash-completion.py
@@ -6,9 +6,9 @@ from os.path import dirname as dirn
 import sys
 
 sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
-import youtube_dlc
+import yt_dlp
 
-BASH_COMPLETION_FILE = "youtube-dlc.bash-completion"
+BASH_COMPLETION_FILE = "yt-dlp.bash-completion"
 BASH_COMPLETION_TEMPLATE = "devscripts/bash-completion.in"
 
 
@@ -26,5 +26,5 @@ def build_completion(opt_parser):
         f.write(filled_template)
 
 
-parser = youtube_dlc.parseOpts()[0]
+parser = yt_dlp.parseOpts()[0]
 build_completion(parser)
diff --git a/devscripts/buildserver.py b/devscripts/buildserver.py
index 62dbd2cb1..9b5305a67 100644
--- a/devscripts/buildserver.py
+++ b/devscripts/buildserver.py
@@ -12,7 +12,7 @@ import traceback
 import os.path
 
 sys.path.insert(0, os.path.dirname(os.path.dirname((os.path.abspath(__file__)))))
-from youtube_dlc.compat import (
+from yt_dlp.compat import (
     compat_input,
     compat_http_server,
     compat_str,
@@ -325,7 +325,7 @@ class YoutubeDLBuilder(object):
     authorizedUsers = ['fraca7', 'phihag', 'rg3', 'FiloSottile', 'ytdl-org']
 
     def __init__(self, **kwargs):
-        if self.repoName != 'youtube-dlc':
+        if self.repoName != 'yt-dlp':
             raise BuildError('Invalid repository "%s"' % self.repoName)
         if self.user not in self.authorizedUsers:
             raise HTTPError('Unauthorized user "%s"' % self.user, 401)
diff --git a/devscripts/check-porn.py b/devscripts/check-porn.py
index 68a33d823..5e0072468 100644
--- a/devscripts/check-porn.py
+++ b/devscripts/check-porn.py
@@ -15,8 +15,8 @@ import sys
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import gettestcases
-from youtube_dlc.utils import compat_urllib_parse_urlparse
-from youtube_dlc.utils import compat_urllib_request
+from yt_dlp.utils import compat_urllib_parse_urlparse
+from yt_dlp.utils import compat_urllib_request
 
 if len(sys.argv) > 1:
     METHOD = 'LIST'
diff --git a/devscripts/create-github-release.py b/devscripts/create-github-release.py
index 3e11be6fa..e5740f40e 100644
--- a/devscripts/create-github-release.py
+++ b/devscripts/create-github-release.py
@@ -14,13 +14,13 @@ import sys
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dlc.compat import (
+from yt_dlp.compat import (
     compat_basestring,
     compat_getpass,
     compat_print,
     compat_urllib_request,
 )
-from youtube_dlc.utils import (
+from yt_dlp.utils import (
     make_HTTPS_handler,
     sanitized_Request,
 )
@@ -100,7 +100,7 @@ def main():
     releaser = GitHubReleaser()
 
     new_release = releaser.create_release(
-        version, name='youtube-dlc %s' % version, body=body)
+        version, name='yt-dlp %s' % version, body=body)
     release_id = new_release['id']
 
     for asset in os.listdir(build_path):
diff --git a/devscripts/fish-completion.in b/devscripts/fish-completion.in
index 4f08b6d4a..32938fbb4 100644
--- a/devscripts/fish-completion.in
+++ b/devscripts/fish-completion.in
@@ -2,4 +2,4 @@
 {{commands}}
 
 
-complete --command youtube-dlc --arguments ":ytfavorites :ytrecommended :ytsubscriptions :ytwatchlater :ythistory"
+complete --command yt-dlp --arguments ":ytfavorites :ytrecommended :ytsubscriptions :ytwatchlater :ythistory"
diff --git a/devscripts/fish-completion.py b/devscripts/fish-completion.py
index be65f4340..1c91f722b 100755
--- a/devscripts/fish-completion.py
+++ b/devscripts/fish-completion.py
@@ -7,10 +7,10 @@ from os.path import dirname as dirn
 import sys
 
 sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
-import youtube_dlc
-from youtube_dlc.utils import shell_quote
+import yt_dlp
+from yt_dlp.utils import shell_quote
 
-FISH_COMPLETION_FILE = 'youtube-dlc.fish'
+FISH_COMPLETION_FILE = 'yt-dlp.fish'
 FISH_COMPLETION_TEMPLATE = 'devscripts/fish-completion.in'
 
 EXTRA_ARGS = {
@@ -31,7 +31,7 @@ def build_completion(opt_parser):
     for group in opt_parser.option_groups:
         for option in group.option_list:
             long_option = option.get_opt_string().strip('-')
-            complete_cmd = ['complete', '--command', 'youtube-dlc', '--long-option', long_option]
+            complete_cmd = ['complete', '--command', 'yt-dlp', '--long-option', long_option]
             if option._short_opts:
                 complete_cmd += ['--short-option', option._short_opts[0].strip('-')]
             if option.help != optparse.SUPPRESS_HELP:
@@ -46,5 +46,5 @@ def build_completion(opt_parser):
         f.write(filled_template)
 
 
-parser = youtube_dlc.parseOpts()[0]
+parser = yt_dlp.parseOpts()[0]
 build_completion(parser)
diff --git a/devscripts/generate_aes_testdata.py b/devscripts/generate_aes_testdata.py
index c89bb547e..f9bb2ad3b 100644
--- a/devscripts/generate_aes_testdata.py
+++ b/devscripts/generate_aes_testdata.py
@@ -7,8 +7,8 @@ import os
 import sys
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dlc.utils import intlist_to_bytes
-from youtube_dlc.aes import aes_encrypt, key_expansion
+from yt_dlp.utils import intlist_to_bytes
+from yt_dlp.aes import aes_encrypt, key_expansion
 
 secret_msg = b'Secret message goes here'
 
diff --git a/devscripts/gh-pages/add-version.py b/devscripts/gh-pages/add-version.py
index 04588a5ee..9ea01374d 100755
--- a/devscripts/gh-pages/add-version.py
+++ b/devscripts/gh-pages/add-version.py
@@ -22,9 +22,9 @@ if 'signature' in versions_info:
 new_version = {}
 
 filenames = {
-    'bin': 'youtube-dlc',
-    'exe': 'youtube-dlc.exe',
-    'tar': 'youtube-dlc-%s.tar.gz' % version}
+    'bin': 'yt-dlp',
+    'exe': 'yt-dlp.exe',
+    'tar': 'yt-dlp-%s.tar.gz' % version}
 build_dir = os.path.join('..', '..', 'build', version)
 for key, filename in filenames.items():
     url = 'https://yt-dl.org/downloads/%s/%s' % (version, filename)
diff --git a/devscripts/gh-pages/update-feed.py b/devscripts/gh-pages/update-feed.py
index b07f1e830..c9f2fdb07 100755
--- a/devscripts/gh-pages/update-feed.py
+++ b/devscripts/gh-pages/update-feed.py
@@ -11,24 +11,24 @@ atom_template = textwrap.dedent("""\
     <?xml version="1.0" encoding="utf-8"?>
     <feed xmlns="http://www.w3.org/2005/Atom">
         <link rel="self" href="http://ytdl-org.github.io/youtube-dl/update/releases.atom" />
-        <title>youtube-dlc releases</title>
-        <id>https://yt-dl.org/feed/youtube-dlc-updates-feed</id>
+        <title>yt-dlp releases</title>
+        <id>https://yt-dl.org/feed/yt-dlp-updates-feed</id>
         <updated>@TIMESTAMP@</updated>
         @ENTRIES@
     </feed>""")
 
 entry_template = textwrap.dedent("""
     <entry>
-        <id>https://yt-dl.org/feed/youtube-dlc-updates-feed/youtube-dlc-@VERSION@</id>
+        <id>https://yt-dl.org/feed/yt-dlp-updates-feed/yt-dlp-@VERSION@</id>
         <title>New version @VERSION@</title>
-        <link href="http://ytdl-org.github.io/youtube-dlc" />
+        <link href="http://ytdl-org.github.io/yt-dlp" />
         <content type="xhtml">
             <div xmlns="http://www.w3.org/1999/xhtml">
                 Downloads available at <a href="https://yt-dl.org/downloads/@VERSION@/">https://yt-dl.org/downloads/@VERSION@/</a>
             </div>
         </content>
         <author>
-            <name>The youtube-dlc maintainers</name>
+            <name>The yt-dlp maintainers</name>
         </author>
         <updated>@TIMESTAMP@</updated>
     </entry>
diff --git a/devscripts/gh-pages/update-sites.py b/devscripts/gh-pages/update-sites.py
index 38acb5d9a..b53685fcc 100755
--- a/devscripts/gh-pages/update-sites.py
+++ b/devscripts/gh-pages/update-sites.py
@@ -5,10 +5,10 @@ import sys
 import os
 import textwrap
 
-# We must be able to import youtube_dlc
+# We must be able to import yt_dlp
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 
-import youtube_dlc
+import yt_dlp
 
 
 def main():
@@ -16,7 +16,7 @@ def main():
         template = tmplf.read()
 
     ie_htmls = []
-    for ie in youtube_dlc.list_extractors(age_limit=None):
+    for ie in yt_dlp.list_extractors(age_limit=None):
         ie_html = '<b>{}</b>'.format(ie.IE_NAME)
         ie_desc = getattr(ie, 'IE_DESC', None)
         if ie_desc is False:
diff --git a/devscripts/make_contributing.py b/devscripts/make_contributing.py
index 80426fb0a..b0cacbc4b 100755
--- a/devscripts/make_contributing.py
+++ b/devscripts/make_contributing.py
@@ -21,7 +21,7 @@ def main():
     bug_text = re.search( """
 # r'(?s)#\s*BUGS\s*[^\n]*\s*(.*?)#\s*COPYRIGHT', readme).group(1)
 # dev_text = re.search(
-# r'(?s)(#\s*DEVELOPER INSTRUCTIONS.*?)#\s*EMBEDDING youtube-dlc',
+# r'(?s)(#\s*DEVELOPER INSTRUCTIONS.*?)#\s*EMBEDDING yt-dlp',
 """         readme).group(1)
 
     out = bug_text + dev_text
diff --git a/devscripts/make_issue_template.py b/devscripts/make_issue_template.py
index 37cb0d4ee..13f337c82 100644
--- a/devscripts/make_issue_template.py
+++ b/devscripts/make_issue_template.py
@@ -16,9 +16,9 @@ def main():
     with io.open(infile, encoding='utf-8') as inf:
         issue_template_tmpl = inf.read()
 
-    # Get the version from youtube_dlc/version.py without importing the package
-    exec(compile(open('youtube_dlc/version.py').read(),
-                 'youtube_dlc/version.py', 'exec'))
+    # Get the version from yt_dlp/version.py without importing the package
+    exec(compile(open('yt_dlp/version.py').read(),
+                 'yt_dlp/version.py', 'exec'))
 
     out = issue_template_tmpl % {'version': locals()['__version__']}
 
diff --git a/devscripts/make_lazy_extractors.py b/devscripts/make_lazy_extractors.py
index c27ef9781..0ddaa3f83 100644
--- a/devscripts/make_lazy_extractors.py
+++ b/devscripts/make_lazy_extractors.py
@@ -14,8 +14,8 @@ lazy_extractors_filename = sys.argv[1]
 if os.path.exists(lazy_extractors_filename):
     os.remove(lazy_extractors_filename)
 
-from youtube_dlc.extractor import _ALL_CLASSES
-from youtube_dlc.extractor.common import InfoExtractor, SearchInfoExtractor
+from yt_dlp.extractor import _ALL_CLASSES
+from yt_dlp.extractor.common import InfoExtractor, SearchInfoExtractor
 
 with open('devscripts/lazy_load_template.py', 'rt') as f:
     module_template = f.read()
diff --git a/devscripts/make_supportedsites.py b/devscripts/make_supportedsites.py
index 0ae6f8aa3..12655bf89 100644
--- a/devscripts/make_supportedsites.py
+++ b/devscripts/make_supportedsites.py
@@ -7,10 +7,10 @@ import os
 import sys
 
 
-# Import youtube_dlc
+# Import yt_dlp
 ROOT_DIR = os.path.join(os.path.dirname(__file__), '..')
 sys.path.insert(0, ROOT_DIR)
-import youtube_dlc
+import yt_dlp
 
 
 def main():
@@ -33,7 +33,7 @@ def main():
                 ie_md += ' (Currently broken)'
             yield ie_md
 
-    ies = sorted(youtube_dlc.gen_extractors(), key=lambda i: i.IE_NAME.lower())
+    ies = sorted(yt_dlp.gen_extractors(), key=lambda i: i.IE_NAME.lower())
     out = '# Supported sites\n' + ''.join(
         ' - ' + md + '\n'
         for md in gen_ies_md(ies))
diff --git a/devscripts/prepare_manpage.py b/devscripts/prepare_manpage.py
index 843ade482..4578a33ce 100644
--- a/devscripts/prepare_manpage.py
+++ b/devscripts/prepare_manpage.py
@@ -8,7 +8,7 @@ import re
 ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 README_FILE = os.path.join(ROOT_DIR, 'README.md')
 
-PREFIX = r'''%youtube-dlc(1)
+PREFIX = r'''%yt-dlp(1)
 
 # NAME
 
@@ -16,7 +16,7 @@ youtube\-dl \- download videos from youtube.com or other video platforms
 
 # SYNOPSIS
 
-**youtube-dlc** \[OPTIONS\] URL [URL...]
+**yt-dlp** \[OPTIONS\] URL [URL...]
 
 '''
 
@@ -33,7 +33,7 @@ def main():
         readme = f.read()
 
     readme = re.sub(r'(?s)^.*?(?=# DESCRIPTION)', '', readme)
-    readme = re.sub(r'\s+youtube-dlc \[OPTIONS\] URL \[URL\.\.\.\]', '', readme)
+    readme = re.sub(r'\s+yt-dlp \[OPTIONS\] URL \[URL\.\.\.\]', '', readme)
     readme = PREFIX + readme
 
     readme = filter_options(readme)
diff --git a/devscripts/release.sh b/devscripts/release.sh
index 2da2ac471..86294d56b 100755
--- a/devscripts/release.sh
+++ b/devscripts/release.sh
@@ -54,8 +54,8 @@ fi
 
 if [ ! -z "`git tag | grep "$version"`" ]; then echo 'ERROR: version already present'; exit 1; fi
 if [ ! -z "`git status --porcelain | grep -v CHANGELOG`" ]; then echo 'ERROR: the working directory is not clean; commit or stash changes'; exit 1; fi
-useless_files=$(find youtube_dlc -type f -not -name '*.py')
-if [ ! -z "$useless_files" ]; then echo "ERROR: Non-.py files in youtube_dlc: $useless_files"; exit 1; fi
+useless_files=$(find yt_dlp -type f -not -name '*.py')
+if [ ! -z "$useless_files" ]; then echo "ERROR: Non-.py files in yt_dlp: $useless_files"; exit 1; fi
 if [ ! -f "updates_key.pem" ]; then echo 'ERROR: updates_key.pem missing'; exit 1; fi
 if ! type pandoc >/dev/null 2>/dev/null; then echo 'ERROR: pandoc is missing'; exit 1; fi
 if ! python3 -c 'import rsa' 2>/dev/null; then echo 'ERROR: python3-rsa is missing'; exit 1; fi
@@ -69,18 +69,18 @@ make clean
 if $skip_tests ; then
     echo 'SKIPPING TESTS'
 else
-    nosetests --verbose --with-coverage --cover-package=youtube_dlc --cover-html test --stop || exit 1
+    nosetests --verbose --with-coverage --cover-package=yt_dlp --cover-html test --stop || exit 1
 fi
 
 /bin/echo -e "\n### Changing version in version.py..."
-sed -i "s/__version__ = '.*'/__version__ = '$version'/" youtube_dlc/version.py
+sed -i "s/__version__ = '.*'/__version__ = '$version'/" yt_dlp/version.py
 
 /bin/echo -e "\n### Changing version in ChangeLog..."
 sed -i "s/<unreleased>/$version/" ChangeLog
 
-/bin/echo -e "\n### Committing documentation, templates and youtube_dlc/version.py..."
+/bin/echo -e "\n### Committing documentation, templates and yt_dlp/version.py..."
 make README.md CONTRIBUTING.md issuetemplates supportedsites
-git add README.md CONTRIBUTING.md .github/ISSUE_TEMPLATE/1_broken_site.md .github/ISSUE_TEMPLATE/2_site_support_request.md .github/ISSUE_TEMPLATE/3_site_feature_request.md .github/ISSUE_TEMPLATE/4_bug_report.md .github/ISSUE_TEMPLATE/5_feature_request.md .github/ISSUE_TEMPLATE/6_question.md docs/supportedsites.md youtube_dlc/version.py ChangeLog
+git add README.md CONTRIBUTING.md .github/ISSUE_TEMPLATE/1_broken_site.md .github/ISSUE_TEMPLATE/2_site_support_request.md .github/ISSUE_TEMPLATE/3_site_feature_request.md .github/ISSUE_TEMPLATE/4_bug_report.md .github/ISSUE_TEMPLATE/5_feature_request.md .github/ISSUE_TEMPLATE/6_question.md docs/supportedsites.md yt_dlp/version.py ChangeLog
 git commit $gpg_sign_commits -m "release $version"
 
 /bin/echo -e "\n### Now tagging, signing and pushing..."
@@ -95,13 +95,13 @@ git push origin "$version"
 
 /bin/echo -e "\n### OK, now it is time to build the binaries..."
 REV=$(git rev-parse HEAD)
-make youtube-dlc youtube-dlc.tar.gz
+make yt-dlp yt-dlp.tar.gz
 read -p "VM running? (y/n) " -n 1
-wget "http://$buildserver/build/ytdl-org/youtube-dl/youtube-dlc.exe?rev=$REV" -O youtube-dlc.exe
+wget "http://$buildserver/build/ytdl-org/youtube-dl/yt-dlp.exe?rev=$REV" -O yt-dlp.exe
 mkdir -p "build/$version"
-mv youtube-dlc youtube-dlc.exe "build/$version"
-mv youtube-dlc.tar.gz "build/$version/youtube-dlc-$version.tar.gz"
-RELEASE_FILES="youtube-dlc youtube-dlc.exe youtube-dlc-$version.tar.gz"
+mv yt-dlp yt-dlp.exe "build/$version"
+mv yt-dlp.tar.gz "build/$version/yt-dlp-$version.tar.gz"
+RELEASE_FILES="yt-dlp yt-dlp.exe yt-dlp-$version.tar.gz"
 (cd build/$version/ && md5sum $RELEASE_FILES > MD5SUMS)
 (cd build/$version/ && sha1sum $RELEASE_FILES > SHA1SUMS)
 (cd build/$version/ && sha256sum $RELEASE_FILES > SHA2-256SUMS)
diff --git a/devscripts/show-downloads-statistics.py b/devscripts/show-downloads-statistics.py
index b8c4269c4..e76f1e4c8 100644
--- a/devscripts/show-downloads-statistics.py
+++ b/devscripts/show-downloads-statistics.py
@@ -11,11 +11,11 @@ import sys
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dlc.compat import (
+from yt_dlp.compat import (
     compat_print,
     compat_urllib_request,
 )
-from youtube_dlc.utils import format_bytes
+from yt_dlp.utils import format_bytes
 
 
 def format_size(bytes):
@@ -38,9 +38,9 @@ for page in itertools.count(1):
             asset_name = asset['name']
             total_bytes += asset['download_count'] * asset['size']
             if all(not re.match(p, asset_name) for p in (
-                    r'^youtube-dlc$',
-                    r'^youtube-dlc-\d{4}\.\d{2}\.\d{2}(?:\.\d+)?\.tar\.gz$',
-                    r'^youtube-dlc\.exe$')):
+                    r'^yt-dlp$',
+                    r'^yt-dlp-\d{4}\.\d{2}\.\d{2}(?:\.\d+)?\.tar\.gz$',
+                    r'^yt-dlp\.exe$')):
                 continue
             compat_print(
                 ' %s size: %s downloads: %d'
diff --git a/devscripts/update-version.py b/devscripts/update-version.py
index 54d2158a6..c6e7b5309 100644
--- a/devscripts/update-version.py
+++ b/devscripts/update-version.py
@@ -5,7 +5,7 @@ from datetime import datetime
 # response = urllib.request.urlopen('https://blackjack4494.github.io/youtube-dlc/update/LATEST_VERSION')
 # old_version = response.read().decode('utf-8')
 
-exec(compile(open('youtube_dlc/version.py').read(), 'youtube_dlc/version.py', 'exec'))
+exec(compile(open('yt_dlp/version.py').read(), 'yt_dlp/version.py', 'exec'))
 old_version = locals()['__version__']
 
 old_version_list = old_version.split(".", 4)
@@ -19,13 +19,13 @@ rev = str(int(old_rev or 0) + 1) if old_ver == ver else ''
 VERSION = '.'.join((ver, rev)) if rev else ver
 # VERSION_LIST = [(int(v) for v in ver.split(".") + [rev or 0])]
 
-print('::set-output name=ytdlc_version::' + VERSION)
+print('::set-output name=ytdlp_version::' + VERSION)
 
-file_version_py = open('youtube_dlc/version.py', 'rt')
+file_version_py = open('yt_dlp/version.py', 'rt')
 data = file_version_py.read()
 data = data.replace(old_version, VERSION)
 file_version_py.close()
 
-file_version_py = open('youtube_dlc/version.py', 'wt')
+file_version_py = open('yt_dlp/version.py', 'wt')
 file_version_py.write(data)
 file_version_py.close()
diff --git a/devscripts/zsh-completion.in b/devscripts/zsh-completion.in
index 2317f41df..9117d339e 100644
--- a/devscripts/zsh-completion.in
+++ b/devscripts/zsh-completion.in
@@ -1,6 +1,6 @@
-#compdef youtube-dlc
+#compdef yt-dlp
 
-__youtube_dlc() {
+__yt_dlp() {
     local curcontext="$curcontext" fileopts diropts cur prev
     typeset -A opt_args
     fileopts="{{fileopts}}"
@@ -27,4 +27,4 @@ __youtube_dlc() {
     esac
 }
 
-__youtube_dlc
\ No newline at end of file
+__yt_dlp
\ No newline at end of file
diff --git a/devscripts/zsh-completion.py b/devscripts/zsh-completion.py
index 8b957144f..92eac5873 100755
--- a/devscripts/zsh-completion.py
+++ b/devscripts/zsh-completion.py
@@ -6,9 +6,9 @@ from os.path import dirname as dirn
 import sys
 
 sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
-import youtube_dlc
+import yt_dlp
 
-ZSH_COMPLETION_FILE = "youtube-dlc.zsh"
+ZSH_COMPLETION_FILE = "yt-dlp.zsh"
 ZSH_COMPLETION_TEMPLATE = "devscripts/zsh-completion.in"
 
 
@@ -45,5 +45,5 @@ def build_completion(opt_parser):
         f.write(template)
 
 
-parser = youtube_dlc.parseOpts()[0]
+parser = yt_dlp.parseOpts()[0]
 build_completion(parser)
diff --git a/docs/Makefile b/docs/Makefile
index a7159ff45..1a8e3cb1c 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -85,17 +85,17 @@ qthelp:
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
 	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/youtube-dlc.qhcp"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/yt-dlp.qhcp"
 	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/youtube-dlc.qhc"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/yt-dlp.qhc"
 
 devhelp:
 	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
 	@echo
 	@echo "Build finished."
 	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/youtube-dlc"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/youtube-dlc"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/yt-dlp"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/yt-dlp"
 	@echo "# devhelp"
 
 epub:
diff --git a/docs/conf.py b/docs/conf.py
index 3ce98be4d..58c0359e7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,16 +1,6 @@
 # coding: utf-8
 #
-# youtube-dlc documentation build configuration file, created by
-# sphinx-quickstart on Fri Mar 14 21:05:43 2014.
-#
-# This file is execfile()d with the current directory set to its
-# containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
+# yt-dlp documentation build configuration file
 
 import sys
 import os
@@ -47,7 +37,7 @@ copyright = u'UNLICENSE'
 # built documents.
 #
 # The short X.Y version.
-from youtube_dlc.version import __version__
+from yt_dlp.version import __version__
 version = __version__
 # The full version, including alpha/beta/rc tags.
 release = version
diff --git a/docs/index.rst b/docs/index.rst
new file mode 100644
index 000000000..9be67038a
--- /dev/null
+++ b/docs/index.rst
@@ -0,0 +1,23 @@
+Welcome to yt-dlp's documentation!
+======================================
+
+*yt-dlp* is a command-line program to download videos from YouTube.com and more sites.
+It can also be used in Python code.
+
+Developer guide
+---------------
+
+This section contains information for using *yt-dlp* from Python programs.
+
+.. toctree::
+    :maxdepth: 2
+
+    module_guide
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
diff --git a/docs/module_guide.rst b/docs/module_guide.rst
index 6413659cf..d6a96a9cf 100644
--- a/docs/module_guide.rst
+++ b/docs/module_guide.rst
@@ -1,11 +1,11 @@
-Using the ``youtube_dlc`` module
+Using the ``yt_dlp`` module
 ===============================
 
-When using the ``youtube_dlc`` module, you start by creating an instance of :class:`YoutubeDL` and adding all the available extractors:
+When using the ``yt_dlp`` module, you start by creating an instance of :class:`YoutubeDL` and adding all the available extractors:
 
 .. code-block:: python
 
-    >>> from youtube_dlc import YoutubeDL
+    >>> from yt_dlp import YoutubeDL
     >>> ydl = YoutubeDL()
     >>> ydl.add_default_info_extractors()
 
@@ -22,7 +22,7 @@ You use the :meth:`YoutubeDL.extract_info` method for getting the video informat
     [youtube] BaW_jenozKc: Downloading video info webpage
     [youtube] BaW_jenozKc: Extracting video information
     >>> info['title']
-    'youtube-dlc test video "\'/\\ä↭𝕐'
+    'youtube-dl test video "\'/\\ä↭𝕐'
     >>> info['height'], info['width']
     (720, 1280)
 
@@ -64,4 +64,3 @@ You can access the videos in the playlist with the ``entries`` field:
     Video #7: Coding a better government
     Video #8: The era of open innovation
     Video #9: The currency of the new economy is trust
-
diff --git a/pyinst.py b/pyinst.py
index e7b6dba25..005a5d9e2 100644
--- a/pyinst.py
+++ b/pyinst.py
@@ -23,7 +23,7 @@ FILE_DESCRIPTION = 'Media Downloader%s' % (' (32 Bit)' if _x86 else '')
 # print('Changing working directory to %s' % root_dir)
 # os.chdir(root_dir)
 
-exec(compile(open('youtube_dlc/version.py').read(), 'youtube_dlc/version.py', 'exec'))
+exec(compile(open('yt_dlp/version.py').read(), 'yt_dlp/version.py', 'exec'))
 VERSION = locals()['__version__']
 
 VERSION_LIST = VERSION.split('.')
@@ -47,17 +47,17 @@ VERSION_FILE = VSVersionInfo(
         StringFileInfo([
             StringTable(
                 '040904B0', [
-                    StringStruct('Comments', 'Youtube-dlc%s Command Line Interface.' % _x86),
-                    StringStruct('CompanyName', 'https://github.com/pukkandan/yt-dlp'),
+                    StringStruct('Comments', 'yt-dlp%s Command Line Interface.' % _x86),
+                    StringStruct('CompanyName', 'https://github.com/yt-dlp'),
                     StringStruct('FileDescription', FILE_DESCRIPTION),
                     StringStruct('FileVersion', VERSION),
-                    StringStruct('InternalName', 'youtube-dlc%s' % _x86),
+                    StringStruct('InternalName', 'yt-dlp%s' % _x86),
                     StringStruct(
                         'LegalCopyright',
-                        'pukkandan@gmail.com | UNLICENSE',
+                        'pukkandan.ytdlp@gmail.com | UNLICENSE',
                     ),
-                    StringStruct('OriginalFilename', 'youtube-dlc%s.exe' % _x86),
-                    StringStruct('ProductName', 'Youtube-dlc%s' % _x86),
+                    StringStruct('OriginalFilename', 'yt-dlp%s.exe' % _x86),
+                    StringStruct('ProductName', 'yt-dlp%s' % _x86),
                     StringStruct('ProductVersion', '%s%s' % (VERSION, _x86)),
                 ])]),
         VarFileInfo([VarStruct('Translation', [0, 1200])])
@@ -65,7 +65,7 @@ VERSION_FILE = VSVersionInfo(
 )
 
 PyInstaller.__main__.run([
-    '--name=youtube-dlc%s' % _x86,
+    '--name=yt-dlp%s' % _x86,
     '--onefile',
     '--icon=devscripts/cloud.ico',
     '--exclude-module=youtube_dl',
@@ -74,6 +74,6 @@ PyInstaller.__main__.run([
     '--hidden-import=mutagen',
     '--hidden-import=Crypto',
     '--upx-exclude=vcruntime140.dll',
-    'youtube_dlc/__main__.py',
+    'yt_dlp/__main__.py',
 ])
-SetVersion('dist/youtube-dlc%s.exe' % _x86, VERSION_FILE)
+SetVersion('dist/yt-dlp%s.exe' % _x86, VERSION_FILE)
diff --git a/setup.cfg b/setup.cfg
index e1f03714e..59372d93a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,5 +2,5 @@
 universal = True
 
 [flake8]
-exclude = youtube_dlc/extractor/__init__.py,devscripts/buildserver.py,devscripts/lazy_load_template.py,devscripts/make_issue_template.py,setup.py,build,.git,venv,devscripts/create-github-release.py,devscripts/release.sh,devscripts/show-downloads-statistics.py
+exclude = yt_dlp/extractor/__init__.py,devscripts/buildserver.py,devscripts/lazy_load_template.py,devscripts/make_issue_template.py,setup.py,build,.git,venv,devscripts/create-github-release.py,devscripts/release.sh,devscripts/show-downloads-statistics.py
 ignore = E402,E501,E731,E741,W503
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 09e2c84c9..c49b8edaf 100644
--- a/setup.py
+++ b/setup.py
@@ -8,15 +8,15 @@ import sys
 from distutils.spawn import spawn
 
 
-# Get the version from youtube_dlc/version.py without importing the package
-exec(compile(open('youtube_dlc/version.py').read(),
-             'youtube_dlc/version.py', 'exec'))
+# Get the version from yt_dlp/version.py without importing the package
+exec(compile(open('yt_dlp/version.py').read(),
+             'yt_dlp/version.py', 'exec'))
 
 
 DESCRIPTION = 'Command-line program to download videos from YouTube.com and many other other video platforms.'
 
 LONG_DESCRIPTION = '\n\n'.join((
-    'Official repository: <https://github.com/pukkandan/yt-dlp>',
+    'Official repository: <https://github.com/yt-dlp/yt-dlp>',
     '**PS**: Many links in this document will not work since this is a copy of the README.md from Github',
     open("README.md", "r", encoding="utf-8").read()))
 
@@ -27,10 +27,10 @@ if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
     print("inv")
 else:
     files_spec = [
-        ('etc/bash_completion.d', ['youtube-dlc.bash-completion']),
-        ('etc/fish/completions', ['youtube-dlc.fish']),
-        ('share/doc/youtube_dlc', ['README.txt']),
-        ('share/man/man1', ['youtube-dlc.1'])
+        ('etc/bash_completion.d', ['yt-dlp.bash-completion']),
+        ('etc/fish/completions', ['yt-dlp.fish']),
+        ('share/doc/yt_dlp', ['README.txt']),
+        ('share/man/man1', ['yt-dlp.1'])
     ]
     root = os.path.dirname(os.path.abspath(__file__))
     data_files = []
@@ -46,7 +46,7 @@ else:
     params = {
         'data_files': data_files,
     }
-    params['entry_points'] = {'console_scripts': ['youtube-dlc = youtube_dlc:main']}
+    params['entry_points'] = {'console_scripts': ['yt-dlp = yt_dlp:main']}
 
 
 class build_lazy_extractors(Command):
@@ -61,7 +61,7 @@ class build_lazy_extractors(Command):
 
     def run(self):
         spawn(
-            [sys.executable, 'devscripts/make_lazy_extractors.py', 'youtube_dlc/extractor/lazy_extractors.py'],
+            [sys.executable, 'devscripts/make_lazy_extractors.py', 'yt_dlp/extractor/lazy_extractors.py'],
             dry_run=self.dry_run,
         )
 
@@ -72,17 +72,17 @@ setup(
     name="yt-dlp",
     version=__version__,
     maintainer="pukkandan",
-    maintainer_email="pukkandan@gmail.com",
+    maintainer_email="pukkandan.ytdlp@gmail.com",
     description=DESCRIPTION,
     long_description=LONG_DESCRIPTION,
     long_description_content_type="text/markdown",
-    url="https://github.com/pukkandan/yt-dlp",
+    url="https://github.com/yt-dlp/yt-dlp",
     packages=packages,
     install_requires=REQUIREMENTS,
     project_urls={
-        'Documentation': 'https://github.com/pukkandan/yt-dlp#yt-dlp',
-        'Source': 'https://github.com/pukkandan/yt-dlp',
-        'Tracker': 'https://github.com/pukkandan/yt-dlp/issues',
+        'Documentation': 'https://github.com/yt-dlp/yt-dlp#yt-dlp',
+        'Source': 'https://github.com/yt-dlp/yt-dlp',
+        'Tracker': 'https://github.com/yt-dlp/yt-dlp/issues',
         #'Funding': 'https://donate.pypi.org',
     },
     classifiers=[
diff --git a/test/helper.py b/test/helper.py
index f45818b0f..963c40508 100644
--- a/test/helper.py
+++ b/test/helper.py
@@ -10,13 +10,13 @@ import types
 import ssl
 import sys
 
-import youtube_dlc.extractor
-from youtube_dlc import YoutubeDL
-from youtube_dlc.compat import (
+import yt_dlp.extractor
+from yt_dlp import YoutubeDL
+from yt_dlp.compat import (
     compat_os_name,
     compat_str,
 )
-from youtube_dlc.utils import (
+from yt_dlp.utils import (
     preferredencoding,
     write_string,
 )
@@ -90,7 +90,7 @@ class FakeYDL(YoutubeDL):
 
 
 def gettestcases(include_onlymatching=False):
-    for ie in youtube_dlc.extractor.gen_extractors():
+    for ie in yt_dlp.extractor.gen_extractors():
         for tc in ie.get_testcases(include_onlymatching):
             yield tc
 
diff --git a/test/test_InfoExtractor.py b/test/test_InfoExtractor.py
index d742284bc..a08616694 100644
--- a/test/test_InfoExtractor.py
+++ b/test/test_InfoExtractor.py
@@ -10,10 +10,10 @@ import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import FakeYDL, expect_dict, expect_value, http_server_port
-from youtube_dlc.compat import compat_etree_fromstring, compat_http_server
-from youtube_dlc.extractor.common import InfoExtractor
-from youtube_dlc.extractor import YoutubeIE, get_info_extractor
-from youtube_dlc.utils import encode_data_uri, strip_jsonp, ExtractorError, RegexNotFoundError
+from yt_dlp.compat import compat_etree_fromstring, compat_http_server
+from yt_dlp.extractor.common import InfoExtractor
+from yt_dlp.extractor import YoutubeIE, get_info_extractor
+from yt_dlp.utils import encode_data_uri, strip_jsonp, ExtractorError, RegexNotFoundError
 import threading
 
 
diff --git a/test/test_YoutubeDL.py b/test/test_YoutubeDL.py
index 43a5dcd74..6ae36638b 100644
--- a/test/test_YoutubeDL.py
+++ b/test/test_YoutubeDL.py
@@ -12,12 +12,12 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 import copy
 
 from test.helper import FakeYDL, assertRegexpMatches
-from youtube_dlc import YoutubeDL
-from youtube_dlc.compat import compat_str, compat_urllib_error
-from youtube_dlc.extractor import YoutubeIE
-from youtube_dlc.extractor.common import InfoExtractor
-from youtube_dlc.postprocessor.common import PostProcessor
-from youtube_dlc.utils import ExtractorError, match_filter_func
+from yt_dlp import YoutubeDL
+from yt_dlp.compat import compat_str, compat_urllib_error
+from yt_dlp.extractor import YoutubeIE
+from yt_dlp.extractor.common import InfoExtractor
+from yt_dlp.postprocessor.common import PostProcessor
+from yt_dlp.utils import ExtractorError, match_filter_func
 
 TEST_URL = 'http://localhost/sample.mp4'
 
diff --git a/test/test_YoutubeDLCookieJar.py b/test/test_YoutubeDLCookieJar.py
index 615d8a9d8..0fadf812b 100644
--- a/test/test_YoutubeDLCookieJar.py
+++ b/test/test_YoutubeDLCookieJar.py
@@ -10,7 +10,7 @@ import tempfile
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dlc.utils import YoutubeDLCookieJar
+from yt_dlp.utils import YoutubeDLCookieJar
 
 
 class TestYoutubeDLCookieJar(unittest.TestCase):
diff --git a/test/test_aes.py b/test/test_aes.py
index ef1e1b189..efbdd2e1a 100644
--- a/test/test_aes.py
+++ b/test/test_aes.py
@@ -8,8 +8,8 @@ import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dlc.aes import aes_decrypt, aes_encrypt, aes_cbc_decrypt, aes_cbc_encrypt, aes_decrypt_text
-from youtube_dlc.utils import bytes_to_intlist, intlist_to_bytes
+from yt_dlp.aes import aes_decrypt, aes_encrypt, aes_cbc_decrypt, aes_cbc_encrypt, aes_decrypt_text
+from yt_dlp.utils import bytes_to_intlist, intlist_to_bytes
 import base64
 
 # the encrypted data can be generate with 'devscripts/generate_aes_testdata.py'
diff --git a/test/test_age_restriction.py b/test/test_age_restriction.py
index b73bdd767..2eccd4718 100644
--- a/test/test_age_restriction.py
+++ b/test/test_age_restriction.py
@@ -10,7 +10,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from test.helper import try_rm
 
 
-from youtube_dlc import YoutubeDL
+from yt_dlp import YoutubeDL
 
 
 def _download_restricted(url, filename, age):
diff --git a/test/test_all_urls.py b/test/test_all_urls.py
index c16b427a3..e6cb33cd2 100644
--- a/test/test_all_urls.py
+++ b/test/test_all_urls.py
@@ -12,7 +12,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import gettestcases
 
-from youtube_dlc.extractor import (
+from yt_dlp.extractor import (
     FacebookIE,
     gen_extractors,
     YoutubeIE,
diff --git a/test/test_cache.py b/test/test_cache.py
index 1167519d1..d6de22194 100644
--- a/test/test_cache.py
+++ b/test/test_cache.py
@@ -13,7 +13,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
 from test.helper import FakeYDL
-from youtube_dlc.cache import Cache
+from yt_dlp.cache import Cache
 
 
 def _is_empty(d):
diff --git a/test/test_compat.py b/test/test_compat.py
index 20a7099d6..d903a5bfe 100644
--- a/test/test_compat.py
+++ b/test/test_compat.py
@@ -10,7 +10,7 @@ import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
-from youtube_dlc.compat import (
+from yt_dlp.compat import (
     compat_getenv,
     compat_setenv,
     compat_etree_Element,
@@ -30,11 +30,11 @@ from youtube_dlc.compat import (
 class TestCompat(unittest.TestCase):
     def test_compat_getenv(self):
         test_str = 'тест'
-        compat_setenv('youtube_dlc_COMPAT_GETENV', test_str)
-        self.assertEqual(compat_getenv('youtube_dlc_COMPAT_GETENV'), test_str)
+        compat_setenv('yt_dlp_COMPAT_GETENV', test_str)
+        self.assertEqual(compat_getenv('yt_dlp_COMPAT_GETENV'), test_str)
 
     def test_compat_setenv(self):
-        test_var = 'youtube_dlc_COMPAT_SETENV'
+        test_var = 'yt_dlp_COMPAT_SETENV'
         test_str = 'тест'
         compat_setenv(test_var, test_str)
         compat_getenv(test_var)
@@ -48,11 +48,11 @@ class TestCompat(unittest.TestCase):
         compat_setenv('HOME', old_home or '')
 
     def test_all_present(self):
-        import youtube_dlc.compat
-        all_names = youtube_dlc.compat.__all__
+        import yt_dlp.compat
+        all_names = yt_dlp.compat.__all__
         present_names = set(filter(
             lambda c: '_' in c and not c.startswith('_'),
-            dir(youtube_dlc.compat))) - set(['unicode_literals'])
+            dir(yt_dlp.compat))) - set(['unicode_literals'])
         self.assertEqual(all_names, sorted(present_names))
 
     def test_compat_urllib_parse_quote(self):
diff --git a/test/test_download.py b/test/test_download.py
index bcd3b4041..5559b4d6f 100644
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -24,24 +24,24 @@ import io
 import json
 import socket
 
-import youtube_dlc.YoutubeDL
-from youtube_dlc.compat import (
+import yt_dlp.YoutubeDL
+from yt_dlp.compat import (
     compat_http_client,
     compat_urllib_error,
     compat_HTTPError,
 )
-from youtube_dlc.utils import (
+from yt_dlp.utils import (
     DownloadError,
     ExtractorError,
     format_bytes,
     UnavailableVideoError,
 )
-from youtube_dlc.extractor import get_info_extractor
+from yt_dlp.extractor import get_info_extractor
 
 RETRIES = 3
 
 
-class YoutubeDL(youtube_dlc.YoutubeDL):
+class YoutubeDL(yt_dlp.YoutubeDL):
     def __init__(self, *args, **kwargs):
         self.to_stderr = self.to_screen
         self.processed_info_dicts = []
@@ -92,7 +92,7 @@ class TestDownload(unittest.TestCase):
 def generator(test_case, tname):
 
     def test_template(self):
-        ie = youtube_dlc.extractor.get_info_extractor(test_case['name'])()
+        ie = yt_dlp.extractor.get_info_extractor(test_case['name'])()
         other_ies = [get_info_extractor(ie_key)() for ie_key in test_case.get('add_ie', [])]
         is_playlist = any(k.startswith('playlist') for k in test_case)
         test_cases = test_case.get(
diff --git a/test/test_downloader_http.py b/test/test_downloader_http.py
index c8e28bd3a..2ef96b922 100644
--- a/test/test_downloader_http.py
+++ b/test/test_downloader_http.py
@@ -10,10 +10,10 @@ import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import http_server_port, try_rm
-from youtube_dlc import YoutubeDL
-from youtube_dlc.compat import compat_http_server
-from youtube_dlc.downloader.http import HttpFD
-from youtube_dlc.utils import encodeFilename
+from yt_dlp import YoutubeDL
+from yt_dlp.compat import compat_http_server
+from yt_dlp.downloader.http import HttpFD
+from yt_dlp.utils import encodeFilename
 import threading
 
 TEST_DIR = os.path.dirname(os.path.abspath(__file__))
diff --git a/test/test_execution.py b/test/test_execution.py
index b18e63d73..2aea4df1b 100644
--- a/test/test_execution.py
+++ b/test/test_execution.py
@@ -10,7 +10,7 @@ import os
 import subprocess
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dlc.utils import encodeArgument
+from yt_dlp.utils import encodeArgument
 
 rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
@@ -23,18 +23,18 @@ except AttributeError:
 
 class TestExecution(unittest.TestCase):
     def test_import(self):
-        subprocess.check_call([sys.executable, '-c', 'import youtube_dlc'], cwd=rootDir)
+        subprocess.check_call([sys.executable, '-c', 'import yt_dlp'], cwd=rootDir)
 
     def test_module_exec(self):
         if sys.version_info >= (2, 7):  # Python 2.6 doesn't support package execution
-            subprocess.check_call([sys.executable, '-m', 'youtube_dlc', '--version'], cwd=rootDir, stdout=_DEV_NULL)
+            subprocess.check_call([sys.executable, '-m', 'yt_dlp', '--version'], cwd=rootDir, stdout=_DEV_NULL)
 
     def test_main_exec(self):
-        subprocess.check_call([sys.executable, 'youtube_dlc/__main__.py', '--version'], cwd=rootDir, stdout=_DEV_NULL)
+        subprocess.check_call([sys.executable, 'yt_dlp/__main__.py', '--version'], cwd=rootDir, stdout=_DEV_NULL)
 
     def test_cmdline_umlauts(self):
         p = subprocess.Popen(
-            [sys.executable, 'youtube_dlc/__main__.py', encodeArgument('ä'), '--version'],
+            [sys.executable, 'yt_dlp/__main__.py', encodeArgument('ä'), '--version'],
             cwd=rootDir, stdout=_DEV_NULL, stderr=subprocess.PIPE)
         _, stderr = p.communicate()
         self.assertFalse(stderr)
diff --git a/test/test_http.py b/test/test_http.py
index 55c3c6183..c9e7ee225 100644
--- a/test/test_http.py
+++ b/test/test_http.py
@@ -9,8 +9,8 @@ import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import http_server_port
-from youtube_dlc import YoutubeDL
-from youtube_dlc.compat import compat_http_server, compat_urllib_request
+from yt_dlp import YoutubeDL
+from yt_dlp.compat import compat_http_server, compat_urllib_request
 import ssl
 import threading
 
diff --git a/test/test_iqiyi_sdk_interpreter.py b/test/test_iqiyi_sdk_interpreter.py
index 303609baa..b39bf4270 100644
--- a/test/test_iqiyi_sdk_interpreter.py
+++ b/test/test_iqiyi_sdk_interpreter.py
@@ -9,7 +9,7 @@ import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import FakeYDL
-from youtube_dlc.extractor import IqiyiIE
+from yt_dlp.extractor import IqiyiIE
 
 
 class IqiyiIEWithCredentials(IqiyiIE):
diff --git a/test/test_jsinterp.py b/test/test_jsinterp.py
index 97fc8d5aa..def823884 100644
--- a/test/test_jsinterp.py
+++ b/test/test_jsinterp.py
@@ -8,7 +8,7 @@ import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dlc.jsinterp import JSInterpreter
+from yt_dlp.jsinterp import JSInterpreter
 
 
 class TestJSInterpreter(unittest.TestCase):
diff --git a/test/test_netrc.py b/test/test_netrc.py
index 566ba37a6..36b943591 100644
--- a/test/test_netrc.py
+++ b/test/test_netrc.py
@@ -7,7 +7,7 @@ import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
-from youtube_dlc.extractor import (
+from yt_dlp.extractor import (
     gen_extractors,
 )
 
diff --git a/test/test_options.py b/test/test_options.py
index dce253373..42d9183a9 100644
--- a/test/test_options.py
+++ b/test/test_options.py
@@ -8,7 +8,7 @@ import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dlc.options import _hide_login_info
+from yt_dlp.options import _hide_login_info
 
 
 class TestOptions(unittest.TestCase):
diff --git a/test/test_overwrites.py b/test/test_overwrites.py
index d5c866c83..41b4e6dea 100644
--- a/test/test_overwrites.py
+++ b/test/test_overwrites.py
@@ -23,7 +23,7 @@ class TestOverwrites(unittest.TestCase):
     def test_default_overwrites(self):
         outp = subprocess.Popen(
             [
-                sys.executable, 'youtube_dlc/__main__.py',
+                sys.executable, 'yt_dlp/__main__.py',
                 '-o', 'test.webm',
                 'https://www.youtube.com/watch?v=jNQXAC9IVRw'
             ], cwd=root_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -35,7 +35,7 @@ class TestOverwrites(unittest.TestCase):
     def test_yes_overwrites(self):
         outp = subprocess.Popen(
             [
-                sys.executable, 'youtube_dlc/__main__.py', '--yes-overwrites',
+                sys.executable, 'yt_dlp/__main__.py', '--yes-overwrites',
                 '-o', 'test.webm',
                 'https://www.youtube.com/watch?v=jNQXAC9IVRw'
             ], cwd=root_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
diff --git a/test/test_post_hooks.py b/test/test_post_hooks.py
index 63500924e..51031871c 100644
--- a/test/test_post_hooks.py
+++ b/test/test_post_hooks.py
@@ -8,11 +8,11 @@ import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import get_params, try_rm
-import youtube_dlc.YoutubeDL
-from youtube_dlc.utils import DownloadError
+import yt_dlp.YoutubeDL
+from yt_dlp.utils import DownloadError
 
 
-class YoutubeDL(youtube_dlc.YoutubeDL):
+class YoutubeDL(yt_dlp.YoutubeDL):
     def __init__(self, *args, **kwargs):
         super(YoutubeDL, self).__init__(*args, **kwargs)
         self.to_stderr = self.to_screen
diff --git a/test/test_postprocessors.py b/test/test_postprocessors.py
index fabe7e6fb..2e9a1bf94 100644
--- a/test/test_postprocessors.py
+++ b/test/test_postprocessors.py
@@ -8,7 +8,7 @@ import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dlc.postprocessor import MetadataFromFieldPP, MetadataFromTitlePP
+from yt_dlp.postprocessor import MetadataFromFieldPP, MetadataFromTitlePP
 
 
 class TestMetadataFromField(unittest.TestCase):
diff --git a/test/test_socks.py b/test/test_socks.py
index be52e2343..8b4286982 100644
--- a/test/test_socks.py
+++ b/test/test_socks.py
@@ -15,7 +15,7 @@ from test.helper import (
     FakeYDL,
     get_params,
 )
-from youtube_dlc.compat import (
+from yt_dlp.compat import (
     compat_str,
     compat_urllib_request,
 )
diff --git a/test/test_subtitles.py b/test/test_subtitles.py
index 0014d57b6..61547cdb1 100644
--- a/test/test_subtitles.py
+++ b/test/test_subtitles.py
@@ -10,7 +10,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from test.helper import FakeYDL, md5
 
 
-from youtube_dlc.extractor import (
+from yt_dlp.extractor import (
     YoutubeIE,
     DailymotionIE,
     TEDIE,
diff --git a/test/test_swfinterp.py b/test/test_swfinterp.py
index 1a8b353e8..29a390e42 100644
--- a/test/test_swfinterp.py
+++ b/test/test_swfinterp.py
@@ -14,7 +14,7 @@ import json
 import re
 import subprocess
 
-from youtube_dlc.swfinterp import SWFInterpreter
+from yt_dlp.swfinterp import SWFInterpreter
 
 
 TEST_DIR = os.path.join(
diff --git a/test/test_update.py.disabled b/test/test_update.py.disabled
index 1b144c43c..617aee2f8 100644
--- a/test/test_update.py.disabled
+++ b/test/test_update.py.disabled
@@ -10,7 +10,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
 import json
-from youtube_dlc.update import rsa_verify
+from yt_dlp.update import rsa_verify
 
 
 class TestUpdate(unittest.TestCase):
diff --git a/test/test_utils.py b/test/test_utils.py
index a0f78ebe1..795d2b46a 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -15,7 +15,7 @@ import io
 import json
 import xml.etree.ElementTree
 
-from youtube_dlc.utils import (
+from yt_dlp.utils import (
     age_restricted,
     args_to_str,
     encode_base_n,
@@ -107,7 +107,7 @@ from youtube_dlc.utils import (
     parse_codecs,
     iri_to_uri,
 )
-from youtube_dlc.compat import (
+from yt_dlp.compat import (
     compat_chr,
     compat_etree_fromstring,
     compat_getenv,
@@ -242,12 +242,12 @@ class TestUtil(unittest.TestCase):
         def env(var):
             return '%{0}%'.format(var) if sys.platform == 'win32' else '${0}'.format(var)
 
-        compat_setenv('youtube_dlc_EXPATH_PATH', 'expanded')
-        self.assertEqual(expand_path(env('youtube_dlc_EXPATH_PATH')), 'expanded')
+        compat_setenv('yt_dlp_EXPATH_PATH', 'expanded')
+        self.assertEqual(expand_path(env('yt_dlp_EXPATH_PATH')), 'expanded')
         self.assertEqual(expand_path(env('HOME')), compat_getenv('HOME'))
         self.assertEqual(expand_path('~'), compat_getenv('HOME'))
         self.assertEqual(
-            expand_path('~/%s' % env('youtube_dlc_EXPATH_PATH')),
+            expand_path('~/%s' % env('yt_dlp_EXPATH_PATH')),
             '%s/expanded' % compat_getenv('HOME'))
 
     def test_prepend_extension(self):
@@ -1425,8 +1425,8 @@ Line 1
         self.assertEqual(caesar('ebg', 'acegik', -2), 'abc')
 
     def test_rot47(self):
-        self.assertEqual(rot47('youtube-dlc'), r'J@FEF36\5=4')
-        self.assertEqual(rot47('YOUTUBE-DLC'), r'*~&%&qt\s{r')
+        self.assertEqual(rot47('yt-dlp'), r'JE\5=A')
+        self.assertEqual(rot47('YT-DLP'), r'*%\s{!')
 
     def test_urshift(self):
         self.assertEqual(urshift(3, 1), 1)
diff --git a/test/test_verbose_output.py b/test/test_verbose_output.py
index 462f25e03..9b1ccde88 100644
--- a/test/test_verbose_output.py
+++ b/test/test_verbose_output.py
@@ -17,7 +17,7 @@ class TestVerboseOutput(unittest.TestCase):
     def test_private_info_arg(self):
         outp = subprocess.Popen(
             [
-                sys.executable, 'youtube_dlc/__main__.py', '-v',
+                sys.executable, 'yt_dlp/__main__.py', '-v',
                 '--username', 'johnsmith@gmail.com',
                 '--password', 'secret',
             ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -30,7 +30,7 @@ class TestVerboseOutput(unittest.TestCase):
     def test_private_info_shortarg(self):
         outp = subprocess.Popen(
             [
-                sys.executable, 'youtube_dlc/__main__.py', '-v',
+                sys.executable, 'yt_dlp/__main__.py', '-v',
                 '-u', 'johnsmith@gmail.com',
                 '-p', 'secret',
             ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -43,7 +43,7 @@ class TestVerboseOutput(unittest.TestCase):
     def test_private_info_eq(self):
         outp = subprocess.Popen(
             [
-                sys.executable, 'youtube_dlc/__main__.py', '-v',
+                sys.executable, 'yt_dlp/__main__.py', '-v',
                 '--username=johnsmith@gmail.com',
                 '--password=secret',
             ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -56,7 +56,7 @@ class TestVerboseOutput(unittest.TestCase):
     def test_private_info_shortarg_eq(self):
         outp = subprocess.Popen(
             [
-                sys.executable, 'youtube_dlc/__main__.py', '-v',
+                sys.executable, 'yt_dlp/__main__.py', '-v',
                 '-u=johnsmith@gmail.com',
                 '-p=secret',
             ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
diff --git a/test/test_write_annotations.py b/test/test_write_annotations.py
index d98c96c15..3a0122374 100644
--- a/test/test_write_annotations.py
+++ b/test/test_write_annotations.py
@@ -15,11 +15,11 @@ import io
 
 import xml.etree.ElementTree
 
-import youtube_dlc.YoutubeDL
-import youtube_dlc.extractor
+import yt_dlp.YoutubeDL
+import yt_dlp.extractor
 
 
-class YoutubeDL(youtube_dlc.YoutubeDL):
+class YoutubeDL(yt_dlp.YoutubeDL):
     def __init__(self, *args, **kwargs):
         super(YoutubeDL, self).__init__(*args, **kwargs)
         self.to_stderr = self.to_screen
@@ -45,7 +45,7 @@ class TestAnnotations(unittest.TestCase):
 
     def test_info_json(self):
         expected = list(EXPECTED_ANNOTATIONS)  # Two annotations could have the same text.
-        ie = youtube_dlc.extractor.YoutubeIE()
+        ie = yt_dlp.extractor.YoutubeIE()
         ydl = YoutubeDL(params)
         ydl.add_info_extractor(ie)
         ydl.download([TEST_ID])
diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py
index d9b8fa550..b38a47fc5 100644
--- a/test/test_youtube_lists.py
+++ b/test/test_youtube_lists.py
@@ -10,7 +10,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from test.helper import FakeYDL
 
 
-from youtube_dlc.extractor import (
+from yt_dlp.extractor import (
     YoutubePlaylistIE,
     YoutubeTabIE,
     YoutubeIE,
diff --git a/test/test_youtube_signature.py b/test/test_youtube_signature.py
index 268518591..80cb4b93a 100644
--- a/test/test_youtube_signature.py
+++ b/test/test_youtube_signature.py
@@ -13,8 +13,8 @@ import re
 import string
 
 from test.helper import FakeYDL
-from youtube_dlc.extractor import YoutubeIE
-from youtube_dlc.compat import compat_str, compat_urlretrieve
+from yt_dlp.extractor import YoutubeIE
+from yt_dlp.compat import compat_str, compat_urlretrieve
 
 _TESTS = [
     (
diff --git a/tox.ini b/tox.ini
index 842091d65..4e7143fc6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,5 +10,5 @@ defaultargs = test --exclude test_download.py --exclude test_age_restriction.py
     --exclude test_subtitles.py --exclude test_write_annotations.py
     --exclude test_youtube_lists.py --exclude test_iqiyi_sdk_interpreter.py
     --exclude test_socks.py
-commands = nosetests --verbose {posargs:{[testenv]defaultargs}}  # --with-coverage --cover-package=youtube_dlc --cover-html
+commands = nosetests --verbose {posargs:{[testenv]defaultargs}}  # --with-coverage --cover-package=yt_dlp --cover-html
                                                # test.test_download:TestDownload.test_NowVideo
diff --git a/youtube-dlc.cmd b/youtube-dlc.cmd
deleted file mode 100644
index 4bda71f17..000000000
--- a/youtube-dlc.cmd
+++ /dev/null
@@ -1 +0,0 @@
-@py "%~dp0youtube_dlc\__main__.py" %*
\ No newline at end of file
diff --git a/youtube-dlc.sh b/youtube-dlc.sh
deleted file mode 100644
index 4b86f3b1d..000000000
--- a/youtube-dlc.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-python3 -m youtube_dlc "$@"
\ No newline at end of file
diff --git a/yt-dlp.cmd b/yt-dlp.cmd
new file mode 100644
index 000000000..2b651a41e
--- /dev/null
+++ b/yt-dlp.cmd
@@ -0,0 +1 @@
+@py "%~dp0yt_dlp\__main__.py" %*
\ No newline at end of file
diff --git a/yt-dlp.sh b/yt-dlp.sh
new file mode 100644
index 000000000..97b86e0f0
--- /dev/null
+++ b/yt-dlp.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+python3 "$(dirname $(realpath $0))/yt_dlp/__main__.py" "$@"
diff --git a/yt-dlp.sublime-project b/yt-dlp.sublime-project
deleted file mode 100644
index 0ffdc674b..000000000
--- a/yt-dlp.sublime-project
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"folders":
-	[
-		{
-			"path": "./youtube_dlc",
-			"folder_exclude_patterns": ["__pycache__"],
-		},
-		{
-			"path": "./youtube_dl",
-			"folder_exclude_patterns": ["__pycache__"],
-		},
-		{
-			"path": ".",
-			"name": "root-folder",
-			"folder_exclude_patterns": ["youtube_dl", "youtube_dlc", ".git", "build", "dist", "zip"],
-		},
-	]
-}
diff --git a/youtube_dlc/YoutubeDL.py b/yt_dlp/YoutubeDL.py
index 8ff6a64f0..a54755e15 100644
--- a/youtube_dlc/YoutubeDL.py
+++ b/yt_dlp/YoutubeDL.py
@@ -199,7 +199,7 @@ class YoutubeDL(object):
     trim_file_name:    Limit length of filename (extension excluded)
     windowsfilenames:  Force the filenames to be windows compatible
     ignoreerrors:      Do not stop on download errors
-                       (Default True when running youtube-dlc,
+                       (Default True when running yt-dlp,
                        but False when directly accessing YoutubeDL class)
     force_generic_extractor: Force downloader to use the generic extractor
     overwrites:        Overwrite all video and metadata files if True,
@@ -279,7 +279,7 @@ class YoutubeDL(object):
                        playlist items.
     postprocessors:    A list of dictionaries, each with an entry
                        * key:  The name of the postprocessor. See
-                               youtube_dlc/postprocessor/__init__.py for a list.
+                               yt_dlp/postprocessor/__init__.py for a list.
                        * _after_move: Optional. If True, run this post_processor
                                after 'MoveFilesAfterDownload'
                        as well as any further keyword arguments for the
@@ -323,7 +323,7 @@ class YoutubeDL(object):
                                            about it, warn otherwise (default)
     source_address:    Client-side IP address to bind to.
     call_home:         Boolean, true iff we are allowed to contact the
-                       youtube-dlc servers for debugging.
+                       yt-dlp servers for debugging. (BROKEN)
     sleep_interval:    Number of seconds to sleep before each download when
                        used alone or a lower bound of a range for randomized
                        sleep before each download (minimum possible number
@@ -360,7 +360,7 @@ class YoutubeDL(object):
                        use downloader suggested by extractor if None.
 
     The following parameters are not used by YoutubeDL itself, they are used by
-    the downloader (see youtube_dlc/downloader/common.py):
+    the downloader (see yt_dlp/downloader/common.py):
     nopart, updatetime, buffersize, ratelimit, min_filesize, max_filesize, test,
     noresizebuffer, retries, continuedl, noprogress, consoletitle,
     xattr_set_filesize, external_downloader_args, hls_use_mpegts,
@@ -549,7 +549,7 @@ class YoutubeDL(object):
             if re.match(r'^-[0-9A-Za-z_-]{10}$', a)]
         if idxs:
             correct_argv = (
-                ['youtube-dlc']
+                ['yt-dlp']
                 + [a for i, a in enumerate(argv) if i not in idxs]
                 + ['--'] + [argv[i] for i in idxs]
             )
@@ -2893,7 +2893,7 @@ class YoutubeDL(object):
         file_handler = compat_urllib_request.FileHandler()
 
         def file_open(*args, **kwargs):
-            raise compat_urllib_error.URLError('file:// scheme is explicitly disabled in youtube-dlc for security reasons')
+            raise compat_urllib_error.URLError('file:// scheme is explicitly disabled in yt-dlp for security reasons')
         file_handler.file_open = file_open
 
         opener = compat_urllib_request.build_opener(
diff --git a/youtube_dlc/__init__.py b/yt_dlp/__init__.py
index 60400632d..91539daaf 100644
--- a/youtube_dlc/__init__.py
+++ b/yt_dlp/__init__.py
@@ -57,7 +57,7 @@ def _real_main(argv=None):
 
     workaround_optparse_bug9161()
 
-    setproctitle('youtube-dlc')
+    setproctitle('yt-dlp')
 
     parser, opts, args = parseOpts(argv)
 
@@ -573,7 +573,7 @@ def _real_main(argv=None):
             ydl.warn_if_short_id(sys.argv[1:] if argv is None else argv)
             parser.error(
                 'You must provide at least one URL.\n'
-                'Type youtube-dlc --help to see a list of all options.')
+                'Type yt-dlp --help to see a list of all options.')
 
         try:
             if opts.load_info_filename is not None:
diff --git a/youtube_dlc/__main__.py b/yt_dlp/__main__.py
index 0e7601686..f7329d67e 100644
--- a/youtube_dlc/__main__.py
+++ b/yt_dlp/__main__.py
@@ -2,8 +2,8 @@
 from __future__ import unicode_literals
 
 # Execute with
-# $ python youtube_dlc/__main__.py (2.6+)
-# $ python -m youtube_dlc          (2.7+)
+# $ python yt_dlp/__main__.py (2.6+)
+# $ python -m yt_dlp          (2.7+)
 
 import sys
 
@@ -13,7 +13,7 @@ if __package__ is None and not hasattr(sys, 'frozen'):
     path = os.path.realpath(os.path.abspath(__file__))
     sys.path.insert(0, os.path.dirname(os.path.dirname(path)))
 
-import youtube_dlc
+import yt_dlp
 
 if __name__ == '__main__':
-    youtube_dlc.main()
+    yt_dlp.main()
diff --git a/youtube_dlc/aes.py b/yt_dlp/aes.py
index 461bb6d41..461bb6d41 100644
--- a/youtube_dlc/aes.py
+++ b/yt_dlp/aes.py
diff --git a/youtube_dlc/cache.py b/yt_dlp/cache.py
index ada6aa1f2..dde9cca64 100644
--- a/youtube_dlc/cache.py
+++ b/yt_dlp/cache.py
@@ -23,7 +23,7 @@ class Cache(object):
         res = self._ydl.params.get('cachedir')
         if res is None:
             cache_root = compat_getenv('XDG_CACHE_HOME', '~/.cache')
-            res = os.path.join(cache_root, 'youtube-dlc')
+            res = os.path.join(cache_root, 'yt-dlp')
         return expand_path(res)
 
     def _get_cache_fn(self, section, key, dtype):
diff --git a/youtube_dlc/compat.py b/yt_dlp/compat.py
index 4a75a336c..9659d480e 100644
--- a/youtube_dlc/compat.py
+++ b/yt_dlp/compat.py
@@ -2993,7 +2993,7 @@ else:
 
 if platform.python_implementation() == 'PyPy' and sys.pypy_version_info < (5, 4, 0):
     # PyPy2 prior to version 5.4.0 expects byte strings as Windows function
-    # names, see the original PyPy issue [1] and the youtube-dlc one [2].
+    # names, see the original PyPy issue [1] and the yt-dlp one [2].
     # 1. https://bitbucket.org/pypy/pypy/issues/2360/windows-ctypescdll-typeerror-function-name
     # 2. https://github.com/ytdl-org/youtube-dl/pull/4392
     def compat_ctypes_WINFUNCTYPE(*args, **kwargs):
diff --git a/youtube_dlc/downloader/__init__.py b/yt_dlp/downloader/__init__.py
index a15e3fd45..a15e3fd45 100644
--- a/youtube_dlc/downloader/__init__.py
+++ b/yt_dlp/downloader/__init__.py
diff --git a/youtube_dlc/downloader/common.py b/yt_dlp/downloader/common.py
index f7e7955aa..7f7296915 100644
--- a/youtube_dlc/downloader/common.py
+++ b/yt_dlp/downloader/common.py
@@ -243,7 +243,7 @@ class FileDownloader(object):
             else:
                 clear_line = ('\r\x1b[K' if sys.stderr.isatty() else '\r')
             self.to_screen(clear_line + fullmsg, skip_eol=not is_last_line)
-        self.to_console_title('youtube-dlc ' + msg)
+        self.to_console_title('yt-dlp ' + msg)
 
     def report_progress(self, s):
         if s['status'] == 'finished':
diff --git a/youtube_dlc/downloader/dash.py b/yt_dlp/downloader/dash.py
index d758282c1..d758282c1 100644
--- a/youtube_dlc/downloader/dash.py
+++ b/yt_dlp/downloader/dash.py
diff --git a/youtube_dlc/downloader/external.py b/yt_dlp/downloader/external.py
index 4bef3bf52..4bef3bf52 100644
--- a/youtube_dlc/downloader/external.py
+++ b/yt_dlp/downloader/external.py
diff --git a/youtube_dlc/downloader/f4m.py b/yt_dlp/downloader/f4m.py
index 3eb406152..3eb406152 100644
--- a/youtube_dlc/downloader/f4m.py
+++ b/yt_dlp/downloader/f4m.py
diff --git a/youtube_dlc/downloader/fragment.py b/yt_dlp/downloader/fragment.py
index 5bc7f50f6..44beed066 100644
--- a/youtube_dlc/downloader/fragment.py
+++ b/yt_dlp/downloader/fragment.py
@@ -32,9 +32,9 @@ class FragmentFD(FileDownloader):
     keep_fragments:     Keep downloaded fragments on disk after downloading is
                         finished
 
-    For each incomplete fragment download youtube-dlc keeps on disk a special
+    For each incomplete fragment download yt-dlp keeps on disk a special
     bookkeeping file with download state and metadata (in future such files will
-    be used for any incomplete download handled by youtube-dlc). This file is
+    be used for any incomplete download handled by yt-dlp). This file is
     used to properly handle resuming, check download file consistency and detect
     potential errors. The file has a .ytdl extension and represents a standard
     JSON file of the following format:
diff --git a/youtube_dlc/downloader/hls.py b/yt_dlp/downloader/hls.py
index 6f30842a7..6f30842a7 100644
--- a/youtube_dlc/downloader/hls.py
+++ b/yt_dlp/downloader/hls.py
diff --git a/youtube_dlc/downloader/http.py b/yt_dlp/downloader/http.py
index bf77f4427..bf77f4427 100644
--- a/youtube_dlc/downloader/http.py
+++ b/yt_dlp/downloader/http.py
diff --git a/youtube_dlc/downloader/ism.py b/yt_dlp/downloader/ism.py
index 1ca666b4a..1ca666b4a 100644
--- a/youtube_dlc/downloader/ism.py
+++ b/yt_dlp/downloader/ism.py
diff --git a/youtube_dlc/downloader/niconico.py b/yt_dlp/downloader/niconico.py
index 38476783f..38476783f 100644
--- a/youtube_dlc/downloader/niconico.py
+++ b/yt_dlp/downloader/niconico.py
diff --git a/youtube_dlc/downloader/rtmp.py b/yt_dlp/downloader/rtmp.py
index 8a25dbc8d..8a25dbc8d 100644
--- a/youtube_dlc/downloader/rtmp.py
+++ b/yt_dlp/downloader/rtmp.py
diff --git a/youtube_dlc/downloader/rtsp.py b/yt_dlp/downloader/rtsp.py
index 939358b2a..939358b2a 100644
--- a/youtube_dlc/downloader/rtsp.py
+++ b/yt_dlp/downloader/rtsp.py
diff --git a/youtube_dlc/downloader/youtube_live_chat.py b/yt_dlp/downloader/youtube_live_chat.py
index 8e173d8b5..8e173d8b5 100644
--- a/youtube_dlc/downloader/youtube_live_chat.py
+++ b/yt_dlp/downloader/youtube_live_chat.py
diff --git a/youtube_dlc/extractor/__init__.py b/yt_dlp/extractor/__init__.py
index 38f6df181..38f6df181 100644
--- a/youtube_dlc/extractor/__init__.py
+++ b/yt_dlp/extractor/__init__.py
diff --git a/youtube_dlc/extractor/abc.py b/yt_dlp/extractor/abc.py
index 3e202168e..3e202168e 100644
--- a/youtube_dlc/extractor/abc.py
+++ b/yt_dlp/extractor/abc.py
diff --git a/youtube_dlc/extractor/abcnews.py b/yt_dlp/extractor/abcnews.py
index 908c83377..908c83377 100644
--- a/youtube_dlc/extractor/abcnews.py
+++ b/yt_dlp/extractor/abcnews.py
diff --git a/youtube_dlc/extractor/abcotvs.py b/yt_dlp/extractor/abcotvs.py
index 0bc69a64f..0bc69a64f 100644
--- a/youtube_dlc/extractor/abcotvs.py
+++ b/yt_dlp/extractor/abcotvs.py
diff --git a/youtube_dlc/extractor/academicearth.py b/yt_dlp/extractor/academicearth.py
index 34095501c..34095501c 100644
--- a/youtube_dlc/extractor/academicearth.py
+++ b/yt_dlp/extractor/academicearth.py
diff --git a/youtube_dlc/extractor/acast.py b/yt_dlp/extractor/acast.py
index b9355a2c8..b9355a2c8 100644
--- a/youtube_dlc/extractor/acast.py
+++ b/yt_dlp/extractor/acast.py
diff --git a/youtube_dlc/extractor/adn.py b/yt_dlp/extractor/adn.py
index a55ebbcbd..a55ebbcbd 100644
--- a/youtube_dlc/extractor/adn.py
+++ b/yt_dlp/extractor/adn.py
diff --git a/youtube_dlc/extractor/adobeconnect.py b/yt_dlp/extractor/adobeconnect.py
index 728549eb9..728549eb9 100644
--- a/youtube_dlc/extractor/adobeconnect.py
+++ b/yt_dlp/extractor/adobeconnect.py
diff --git a/youtube_dlc/extractor/adobepass.py b/yt_dlp/extractor/adobepass.py
index 79a532858..79a532858 100644
--- a/youtube_dlc/extractor/adobepass.py
+++ b/yt_dlp/extractor/adobepass.py
diff --git a/youtube_dlc/extractor/adobetv.py b/yt_dlp/extractor/adobetv.py
index bccdf9ca4..bccdf9ca4 100644
--- a/youtube_dlc/extractor/adobetv.py
+++ b/yt_dlp/extractor/adobetv.py
diff --git a/youtube_dlc/extractor/adultswim.py b/yt_dlp/extractor/adultswim.py
index 8d1d9ac7d..8d1d9ac7d 100644
--- a/youtube_dlc/extractor/adultswim.py
+++ b/yt_dlp/extractor/adultswim.py
diff --git a/youtube_dlc/extractor/aenetworks.py b/yt_dlp/extractor/aenetworks.py
index e55c03fd7..e55c03fd7 100644
--- a/youtube_dlc/extractor/aenetworks.py
+++ b/yt_dlp/extractor/aenetworks.py
diff --git a/youtube_dlc/extractor/afreecatv.py b/yt_dlp/extractor/afreecatv.py
index b56abb1e6..b56abb1e6 100644
--- a/youtube_dlc/extractor/afreecatv.py
+++ b/yt_dlp/extractor/afreecatv.py
diff --git a/youtube_dlc/extractor/airmozilla.py b/yt_dlp/extractor/airmozilla.py
index 9e38136b4..9e38136b4 100644
--- a/youtube_dlc/extractor/airmozilla.py
+++ b/yt_dlp/extractor/airmozilla.py
diff --git a/youtube_dlc/extractor/aliexpress.py b/yt_dlp/extractor/aliexpress.py
index 6f241e683..6f241e683 100644
--- a/youtube_dlc/extractor/aliexpress.py
+++ b/yt_dlp/extractor/aliexpress.py
diff --git a/youtube_dlc/extractor/aljazeera.py b/yt_dlp/extractor/aljazeera.py
index c4f915a3c..c4f915a3c 100644
--- a/youtube_dlc/extractor/aljazeera.py
+++ b/yt_dlp/extractor/aljazeera.py
diff --git a/youtube_dlc/extractor/allocine.py b/yt_dlp/extractor/allocine.py
index cd533acfc..cd533acfc 100644
--- a/youtube_dlc/extractor/allocine.py
+++ b/yt_dlp/extractor/allocine.py
diff --git a/youtube_dlc/extractor/alphaporno.py b/yt_dlp/extractor/alphaporno.py
index 3a6d99f6b..3a6d99f6b 100644
--- a/youtube_dlc/extractor/alphaporno.py
+++ b/yt_dlp/extractor/alphaporno.py
diff --git a/youtube_dlc/extractor/alura.py b/yt_dlp/extractor/alura.py
index 2681bfc18..2681bfc18 100644
--- a/youtube_dlc/extractor/alura.py
+++ b/yt_dlp/extractor/alura.py
diff --git a/youtube_dlc/extractor/amara.py b/yt_dlp/extractor/amara.py
index 61d469574..61d469574 100644
--- a/youtube_dlc/extractor/amara.py
+++ b/yt_dlp/extractor/amara.py
diff --git a/youtube_dlc/extractor/amcnetworks.py b/yt_dlp/extractor/amcnetworks.py
index b8027bbca..b8027bbca 100644
--- a/youtube_dlc/extractor/amcnetworks.py
+++ b/yt_dlp/extractor/amcnetworks.py
diff --git a/youtube_dlc/extractor/americastestkitchen.py b/yt_dlp/extractor/americastestkitchen.py
index be960c0f9..be960c0f9 100644
--- a/youtube_dlc/extractor/americastestkitchen.py
+++ b/yt_dlp/extractor/americastestkitchen.py
diff --git a/youtube_dlc/extractor/amp.py b/yt_dlp/extractor/amp.py
index 24c684cad..24c684cad 100644
--- a/youtube_dlc/extractor/amp.py
+++ b/yt_dlp/extractor/amp.py
diff --git a/youtube_dlc/extractor/animelab.py b/yt_dlp/extractor/animelab.py
index 4fb7ee424..4fb7ee424 100644
--- a/youtube_dlc/extractor/animelab.py
+++ b/yt_dlp/extractor/animelab.py
diff --git a/youtube_dlc/extractor/animeondemand.py b/yt_dlp/extractor/animeondemand.py
index 54e097d2f..54e097d2f 100644
--- a/youtube_dlc/extractor/animeondemand.py
+++ b/yt_dlp/extractor/animeondemand.py
diff --git a/youtube_dlc/extractor/anvato.py b/yt_dlp/extractor/anvato.py
index ab69b69bd..7386ae2e6 100644
--- a/youtube_dlc/extractor/anvato.py
+++ b/yt_dlp/extractor/anvato.py
@@ -23,7 +23,7 @@ from ..utils import (
 
 # This import causes a ModuleNotFoundError on some systems for unknown reason.
 # See issues:
-# https://github.com/pukkandan/yt-dlp/issues/35
+# https://github.com/yt-dlp/yt-dlp/issues/35
 # https://github.com/ytdl-org/youtube-dl/issues/27449
 # https://github.com/animelover1984/youtube-dl/issues/17
 try:
diff --git a/youtube_dlc/extractor/anvato_token_generator/__init__.py b/yt_dlp/extractor/anvato_token_generator/__init__.py
index 6e223db9f..6e223db9f 100644
--- a/youtube_dlc/extractor/anvato_token_generator/__init__.py
+++ b/yt_dlp/extractor/anvato_token_generator/__init__.py
diff --git a/youtube_dlc/extractor/anvato_token_generator/common.py b/yt_dlp/extractor/anvato_token_generator/common.py
index b959a903b..b959a903b 100644
--- a/youtube_dlc/extractor/anvato_token_generator/common.py
+++ b/yt_dlp/extractor/anvato_token_generator/common.py
diff --git a/youtube_dlc/extractor/anvato_token_generator/nfl.py b/yt_dlp/extractor/anvato_token_generator/nfl.py
index 97a2b245f..97a2b245f 100644
--- a/youtube_dlc/extractor/anvato_token_generator/nfl.py
+++ b/yt_dlp/extractor/anvato_token_generator/nfl.py
diff --git a/youtube_dlc/extractor/aol.py b/yt_dlp/extractor/aol.py
index 133b5e254..133b5e254 100644
--- a/youtube_dlc/extractor/aol.py
+++ b/yt_dlp/extractor/aol.py
diff --git a/youtube_dlc/extractor/apa.py b/yt_dlp/extractor/apa.py
index 98ccdaa4a..98ccdaa4a 100644
--- a/youtube_dlc/extractor/apa.py
+++ b/yt_dlp/extractor/apa.py
diff --git a/youtube_dlc/extractor/aparat.py b/yt_dlp/extractor/aparat.py
index da06a3cac..da06a3cac 100644
--- a/youtube_dlc/extractor/aparat.py
+++ b/yt_dlp/extractor/aparat.py
diff --git a/youtube_dlc/extractor/appleconnect.py b/yt_dlp/extractor/appleconnect.py
index a84b8b1eb..a84b8b1eb 100644
--- a/youtube_dlc/extractor/appleconnect.py
+++ b/yt_dlp/extractor/appleconnect.py
diff --git a/youtube_dlc/extractor/applepodcasts.py b/yt_dlp/extractor/applepodcasts.py
index 95758fece..95758fece 100644
--- a/youtube_dlc/extractor/applepodcasts.py
+++ b/yt_dlp/extractor/applepodcasts.py
diff --git a/youtube_dlc/extractor/appletrailers.py b/yt_dlp/extractor/appletrailers.py
index b5ed2b88b..d3d77a1d0 100644
--- a/youtube_dlc/extractor/appletrailers.py
+++ b/yt_dlp/extractor/appletrailers.py
@@ -199,7 +199,7 @@ class AppleTrailersIE(InfoExtractor):
                 'upload_date': upload_date,
                 'uploader_id': uploader_id,
                 'http_headers': {
-                    'User-Agent': 'QuickTime compatible (youtube-dlc)',
+                    'User-Agent': 'QuickTime compatible (yt-dlp)',
                 },
             })
 
diff --git a/youtube_dlc/extractor/archiveorg.py b/yt_dlp/extractor/archiveorg.py
index 66eb20531..66eb20531 100644
--- a/youtube_dlc/extractor/archiveorg.py
+++ b/yt_dlp/extractor/archiveorg.py
diff --git a/youtube_dlc/extractor/arcpublishing.py b/yt_dlp/extractor/arcpublishing.py
index fd2c795ae..fd2c795ae 100644
--- a/youtube_dlc/extractor/arcpublishing.py
+++ b/yt_dlp/extractor/arcpublishing.py
diff --git a/youtube_dlc/extractor/ard.py b/yt_dlp/extractor/ard.py
index 12a7cfb54..12a7cfb54 100644
--- a/youtube_dlc/extractor/ard.py
+++ b/yt_dlp/extractor/ard.py
diff --git a/youtube_dlc/extractor/arkena.py b/yt_dlp/extractor/arkena.py
index fd46b1c77..fd46b1c77 100644
--- a/youtube_dlc/extractor/arkena.py
+++ b/yt_dlp/extractor/arkena.py
diff --git a/youtube_dlc/extractor/arte.py b/yt_dlp/extractor/arte.py
index 5b38b20dd..5b38b20dd 100644
--- a/youtube_dlc/extractor/arte.py
+++ b/yt_dlp/extractor/arte.py
diff --git a/youtube_dlc/extractor/asiancrush.py b/yt_dlp/extractor/asiancrush.py
index 66ce7c686..66ce7c686 100644
--- a/youtube_dlc/extractor/asiancrush.py
+++ b/yt_dlp/extractor/asiancrush.py
diff --git a/youtube_dlc/extractor/atresplayer.py b/yt_dlp/extractor/atresplayer.py
index c2cec9845..c2cec9845 100644
--- a/youtube_dlc/extractor/atresplayer.py
+++ b/yt_dlp/extractor/atresplayer.py
diff --git a/youtube_dlc/extractor/atttechchannel.py b/yt_dlp/extractor/atttechchannel.py
index 8f93fb353..8f93fb353 100644
--- a/youtube_dlc/extractor/atttechchannel.py
+++ b/yt_dlp/extractor/atttechchannel.py
diff --git a/youtube_dlc/extractor/atvat.py b/yt_dlp/extractor/atvat.py
index 95e572d70..95e572d70 100644
--- a/youtube_dlc/extractor/atvat.py
+++ b/yt_dlp/extractor/atvat.py
diff --git a/youtube_dlc/extractor/audimedia.py b/yt_dlp/extractor/audimedia.py
index 6bd48ef15..6bd48ef15 100644
--- a/youtube_dlc/extractor/audimedia.py
+++ b/yt_dlp/extractor/audimedia.py
diff --git a/youtube_dlc/extractor/audioboom.py b/yt_dlp/extractor/audioboom.py
index c51837b40..c51837b40 100644
--- a/youtube_dlc/extractor/audioboom.py
+++ b/yt_dlp/extractor/audioboom.py
diff --git a/youtube_dlc/extractor/audiomack.py b/yt_dlp/extractor/audiomack.py
index cc7771354..cc7771354 100644
--- a/youtube_dlc/extractor/audiomack.py
+++ b/yt_dlp/extractor/audiomack.py
diff --git a/youtube_dlc/extractor/audius.py b/yt_dlp/extractor/audius.py
index 2cbc97fcd..2cbc97fcd 100644
--- a/youtube_dlc/extractor/audius.py
+++ b/yt_dlp/extractor/audius.py
diff --git a/youtube_dlc/extractor/awaan.py b/yt_dlp/extractor/awaan.py
index 3a7700cd4..3a7700cd4 100644
--- a/youtube_dlc/extractor/awaan.py
+++ b/yt_dlp/extractor/awaan.py
diff --git a/youtube_dlc/extractor/aws.py b/yt_dlp/extractor/aws.py
index dccfeaf73..dccfeaf73 100644
--- a/youtube_dlc/extractor/aws.py
+++ b/yt_dlp/extractor/aws.py
diff --git a/youtube_dlc/extractor/azmedien.py b/yt_dlp/extractor/azmedien.py
index 930266990..930266990 100644
--- a/youtube_dlc/extractor/azmedien.py
+++ b/yt_dlp/extractor/azmedien.py
diff --git a/youtube_dlc/extractor/baidu.py b/yt_dlp/extractor/baidu.py
index 234a661d3..234a661d3 100644
--- a/youtube_dlc/extractor/baidu.py
+++ b/yt_dlp/extractor/baidu.py
diff --git a/youtube_dlc/extractor/bandcamp.py b/yt_dlp/extractor/bandcamp.py
index 69e673a26..69e673a26 100644
--- a/youtube_dlc/extractor/bandcamp.py
+++ b/yt_dlp/extractor/bandcamp.py
diff --git a/youtube_dlc/extractor/bbc.py b/yt_dlp/extractor/bbc.py
index b4daee54e..b4daee54e 100644
--- a/youtube_dlc/extractor/bbc.py
+++ b/yt_dlp/extractor/bbc.py
diff --git a/youtube_dlc/extractor/beatport.py b/yt_dlp/extractor/beatport.py
index ae9c1a739..ae9c1a739 100644
--- a/youtube_dlc/extractor/beatport.py
+++ b/yt_dlp/extractor/beatport.py
diff --git a/youtube_dlc/extractor/beeg.py b/yt_dlp/extractor/beeg.py
index 5788d13ba..5788d13ba 100644
--- a/youtube_dlc/extractor/beeg.py
+++ b/yt_dlp/extractor/beeg.py
diff --git a/youtube_dlc/extractor/behindkink.py b/yt_dlp/extractor/behindkink.py
index 9bca853b3..9bca853b3 100644
--- a/youtube_dlc/extractor/behindkink.py
+++ b/yt_dlp/extractor/behindkink.py
diff --git a/youtube_dlc/extractor/bellmedia.py b/yt_dlp/extractor/bellmedia.py
index 9f9de96c6..9f9de96c6 100644
--- a/youtube_dlc/extractor/bellmedia.py
+++ b/yt_dlp/extractor/bellmedia.py
diff --git a/youtube_dlc/extractor/bet.py b/yt_dlp/extractor/bet.py
index 2c7144235..2c7144235 100644
--- a/youtube_dlc/extractor/bet.py
+++ b/yt_dlp/extractor/bet.py
diff --git a/youtube_dlc/extractor/bfi.py b/yt_dlp/extractor/bfi.py
index 60c8944b5..60c8944b5 100644
--- a/youtube_dlc/extractor/bfi.py
+++ b/yt_dlp/extractor/bfi.py
diff --git a/youtube_dlc/extractor/bfmtv.py b/yt_dlp/extractor/bfmtv.py
index 501f69d80..501f69d80 100644
--- a/youtube_dlc/extractor/bfmtv.py
+++ b/yt_dlp/extractor/bfmtv.py
diff --git a/youtube_dlc/extractor/bibeltv.py b/yt_dlp/extractor/bibeltv.py
index 56c2bfee8..56c2bfee8 100644
--- a/youtube_dlc/extractor/bibeltv.py
+++ b/yt_dlp/extractor/bibeltv.py
diff --git a/youtube_dlc/extractor/bigflix.py b/yt_dlp/extractor/bigflix.py
index 28e3e59f6..28e3e59f6 100644
--- a/youtube_dlc/extractor/bigflix.py
+++ b/yt_dlp/extractor/bigflix.py
diff --git a/youtube_dlc/extractor/bild.py b/yt_dlp/extractor/bild.py
index b8dfbd42b..b8dfbd42b 100644
--- a/youtube_dlc/extractor/bild.py
+++ b/yt_dlp/extractor/bild.py
diff --git a/youtube_dlc/extractor/bilibili.py b/yt_dlp/extractor/bilibili.py
index b04077750..be117a2bb 100644
--- a/youtube_dlc/extractor/bilibili.py
+++ b/yt_dlp/extractor/bilibili.py
@@ -153,7 +153,7 @@ class BiliBiliIE(InfoExtractor):
                 webpage, 'player parameters'))['cid'][0]
         else:
             if 'no_bangumi_tip' not in smuggled_data:
-                self.to_screen('Downloading episode %s. To download all videos in anime %s, re-run youtube-dlc with %s' % (
+                self.to_screen('Downloading episode %s. To download all videos in anime %s, re-run yt-dlp with %s' % (
                     video_id, anime_id, compat_urlparse.urljoin(url, '//bangumi.bilibili.com/anime/%s' % anime_id)))
             headers = {
                 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
diff --git a/youtube_dlc/extractor/biobiochiletv.py b/yt_dlp/extractor/biobiochiletv.py
index dc86c57c5..dc86c57c5 100644
--- a/youtube_dlc/extractor/biobiochiletv.py
+++ b/yt_dlp/extractor/biobiochiletv.py
diff --git a/youtube_dlc/extractor/biqle.py b/yt_dlp/extractor/biqle.py
index 17ebbb257..17ebbb257 100644
--- a/youtube_dlc/extractor/biqle.py
+++ b/yt_dlp/extractor/biqle.py
diff --git a/youtube_dlc/extractor/bitchute.py b/yt_dlp/extractor/bitchute.py
index 94219a138..94219a138 100644
--- a/youtube_dlc/extractor/bitchute.py
+++ b/yt_dlp/extractor/bitchute.py
diff --git a/youtube_dlc/extractor/bitwave.py b/yt_dlp/extractor/bitwave.py
index eb16c469d..eb16c469d 100644
--- a/youtube_dlc/extractor/bitwave.py
+++ b/yt_dlp/extractor/bitwave.py
diff --git a/youtube_dlc/extractor/bleacherreport.py b/yt_dlp/extractor/bleacherreport.py
index d1bf8e829..d1bf8e829 100644
--- a/youtube_dlc/extractor/bleacherreport.py
+++ b/yt_dlp/extractor/bleacherreport.py
diff --git a/youtube_dlc/extractor/blinkx.py b/yt_dlp/extractor/blinkx.py
index db5e12b21..db5e12b21 100644
--- a/youtube_dlc/extractor/blinkx.py
+++ b/yt_dlp/extractor/blinkx.py
diff --git a/youtube_dlc/extractor/bloomberg.py b/yt_dlp/extractor/bloomberg.py
index 2fbfad1ba..2fbfad1ba 100644
--- a/youtube_dlc/extractor/bloomberg.py
+++ b/yt_dlp/extractor/bloomberg.py
diff --git a/youtube_dlc/extractor/bokecc.py b/yt_dlp/extractor/bokecc.py
index 14840bd28..14840bd28 100644
--- a/youtube_dlc/extractor/bokecc.py
+++ b/yt_dlp/extractor/bokecc.py
diff --git a/youtube_dlc/extractor/bongacams.py b/yt_dlp/extractor/bongacams.py
index 180542fbc..180542fbc 100644
--- a/youtube_dlc/extractor/bongacams.py
+++ b/yt_dlp/extractor/bongacams.py
diff --git a/youtube_dlc/extractor/bostonglobe.py b/yt_dlp/extractor/bostonglobe.py
index 57882fbee..57882fbee 100644
--- a/youtube_dlc/extractor/bostonglobe.py
+++ b/yt_dlp/extractor/bostonglobe.py
diff --git a/youtube_dlc/extractor/box.py b/yt_dlp/extractor/box.py
index aae82d1af..aae82d1af 100644
--- a/youtube_dlc/extractor/box.py
+++ b/yt_dlp/extractor/box.py
diff --git a/youtube_dlc/extractor/bpb.py b/yt_dlp/extractor/bpb.py
index 8f6ef3cf0..8f6ef3cf0 100644
--- a/youtube_dlc/extractor/bpb.py
+++ b/yt_dlp/extractor/bpb.py
diff --git a/youtube_dlc/extractor/br.py b/yt_dlp/extractor/br.py
index 9bde7f2d8..9bde7f2d8 100644
--- a/youtube_dlc/extractor/br.py
+++ b/yt_dlp/extractor/br.py
diff --git a/youtube_dlc/extractor/bravotv.py b/yt_dlp/extractor/bravotv.py
index bae2aedce..bae2aedce 100644
--- a/youtube_dlc/extractor/bravotv.py
+++ b/yt_dlp/extractor/bravotv.py
diff --git a/youtube_dlc/extractor/breakcom.py b/yt_dlp/extractor/breakcom.py
index 68c7cf2bb..68c7cf2bb 100644
--- a/youtube_dlc/extractor/breakcom.py
+++ b/yt_dlp/extractor/breakcom.py
diff --git a/youtube_dlc/extractor/brightcove.py b/yt_dlp/extractor/brightcove.py
index 8b29ca993..8b29ca993 100644
--- a/youtube_dlc/extractor/brightcove.py
+++ b/yt_dlp/extractor/brightcove.py
diff --git a/youtube_dlc/extractor/businessinsider.py b/yt_dlp/extractor/businessinsider.py
index 73a57b1e4..73a57b1e4 100644
--- a/youtube_dlc/extractor/businessinsider.py
+++ b/yt_dlp/extractor/businessinsider.py
diff --git a/youtube_dlc/extractor/buzzfeed.py b/yt_dlp/extractor/buzzfeed.py
index ec411091e..ec411091e 100644
--- a/youtube_dlc/extractor/buzzfeed.py
+++ b/yt_dlp/extractor/buzzfeed.py
diff --git a/youtube_dlc/extractor/byutv.py b/yt_dlp/extractor/byutv.py
index 0b11bf11f..0b11bf11f 100644
--- a/youtube_dlc/extractor/byutv.py
+++ b/yt_dlp/extractor/byutv.py
diff --git a/youtube_dlc/extractor/c56.py b/yt_dlp/extractor/c56.py
index cac8fdcba..cac8fdcba 100644
--- a/youtube_dlc/extractor/c56.py
+++ b/yt_dlp/extractor/c56.py
diff --git a/youtube_dlc/extractor/camdemy.py b/yt_dlp/extractor/camdemy.py
index 8f0c6c545..8f0c6c545 100644
--- a/youtube_dlc/extractor/camdemy.py
+++ b/yt_dlp/extractor/camdemy.py
diff --git a/youtube_dlc/extractor/cammodels.py b/yt_dlp/extractor/cammodels.py
index eb2a8b4c6..eb2a8b4c6 100644
--- a/youtube_dlc/extractor/cammodels.py
+++ b/yt_dlp/extractor/cammodels.py
diff --git a/youtube_dlc/extractor/camtube.py b/yt_dlp/extractor/camtube.py
index b3be3bdcf..b3be3bdcf 100644
--- a/youtube_dlc/extractor/camtube.py
+++ b/yt_dlp/extractor/camtube.py
diff --git a/youtube_dlc/extractor/camwithher.py b/yt_dlp/extractor/camwithher.py
index bbc5205fd..bbc5205fd 100644
--- a/youtube_dlc/extractor/camwithher.py
+++ b/yt_dlp/extractor/camwithher.py
diff --git a/youtube_dlc/extractor/canalc2.py b/yt_dlp/extractor/canalc2.py
index 407cc8084..407cc8084 100644
--- a/youtube_dlc/extractor/canalc2.py
+++ b/yt_dlp/extractor/canalc2.py
diff --git a/youtube_dlc/extractor/canalplus.py b/yt_dlp/extractor/canalplus.py
index 1132ce4a7..1132ce4a7 100644
--- a/youtube_dlc/extractor/canalplus.py
+++ b/yt_dlp/extractor/canalplus.py
diff --git a/youtube_dlc/extractor/canvas.py b/yt_dlp/extractor/canvas.py
index eefbab241..eefbab241 100644
--- a/youtube_dlc/extractor/canvas.py
+++ b/yt_dlp/extractor/canvas.py
diff --git a/youtube_dlc/extractor/carambatv.py b/yt_dlp/extractor/carambatv.py
index b57b86af7..b57b86af7 100644
--- a/youtube_dlc/extractor/carambatv.py
+++ b/yt_dlp/extractor/carambatv.py
diff --git a/youtube_dlc/extractor/cartoonnetwork.py b/yt_dlp/extractor/cartoonnetwork.py
index 48b33617f..48b33617f 100644
--- a/youtube_dlc/extractor/cartoonnetwork.py
+++ b/yt_dlp/extractor/cartoonnetwork.py
diff --git a/youtube_dlc/extractor/cbc.py b/yt_dlp/extractor/cbc.py
index fd5ec6033..fd5ec6033 100644
--- a/youtube_dlc/extractor/cbc.py
+++ b/yt_dlp/extractor/cbc.py
diff --git a/youtube_dlc/extractor/cbs.py b/yt_dlp/extractor/cbs.py
index d00053685..d00053685 100644
--- a/youtube_dlc/extractor/cbs.py
+++ b/yt_dlp/extractor/cbs.py
diff --git a/youtube_dlc/extractor/cbsinteractive.py b/yt_dlp/extractor/cbsinteractive.py
index 6596e98a6..6596e98a6 100644
--- a/youtube_dlc/extractor/cbsinteractive.py
+++ b/yt_dlp/extractor/cbsinteractive.py
diff --git a/youtube_dlc/extractor/cbslocal.py b/yt_dlp/extractor/cbslocal.py
index 3b7e1a8b9..3b7e1a8b9 100644
--- a/youtube_dlc/extractor/cbslocal.py
+++ b/yt_dlp/extractor/cbslocal.py
diff --git a/youtube_dlc/extractor/cbsnews.py b/yt_dlp/extractor/cbsnews.py
index 345debcf0..345debcf0 100644
--- a/youtube_dlc/extractor/cbsnews.py
+++ b/yt_dlp/extractor/cbsnews.py
diff --git a/youtube_dlc/extractor/cbssports.py b/yt_dlp/extractor/cbssports.py
index 83b764762..83b764762 100644
--- a/youtube_dlc/extractor/cbssports.py
+++ b/yt_dlp/extractor/cbssports.py
diff --git a/youtube_dlc/extractor/ccc.py b/yt_dlp/extractor/ccc.py
index 36e6dff72..36e6dff72 100644
--- a/youtube_dlc/extractor/ccc.py
+++ b/yt_dlp/extractor/ccc.py
diff --git a/youtube_dlc/extractor/ccma.py b/yt_dlp/extractor/ccma.py
index e6ae49352..e6ae49352 100644
--- a/youtube_dlc/extractor/ccma.py
+++ b/yt_dlp/extractor/ccma.py
diff --git a/youtube_dlc/extractor/cctv.py b/yt_dlp/extractor/cctv.py
index 9b8612138..9b8612138 100644
--- a/youtube_dlc/extractor/cctv.py
+++ b/yt_dlp/extractor/cctv.py
diff --git a/youtube_dlc/extractor/cda.py b/yt_dlp/extractor/cda.py
index 1b4362144..1b4362144 100644
--- a/youtube_dlc/extractor/cda.py
+++ b/yt_dlp/extractor/cda.py
diff --git a/youtube_dlc/extractor/ceskatelevize.py b/yt_dlp/extractor/ceskatelevize.py
index 6bfb760fa..6bfb760fa 100644
--- a/youtube_dlc/extractor/ceskatelevize.py
+++ b/yt_dlp/extractor/ceskatelevize.py
diff --git a/youtube_dlc/extractor/channel9.py b/yt_dlp/extractor/channel9.py
index 09cacf6d3..09cacf6d3 100644
--- a/youtube_dlc/extractor/channel9.py
+++ b/yt_dlp/extractor/channel9.py
diff --git a/youtube_dlc/extractor/charlierose.py b/yt_dlp/extractor/charlierose.py
index 42c9af263..42c9af263 100644
--- a/youtube_dlc/extractor/charlierose.py
+++ b/yt_dlp/extractor/charlierose.py
diff --git a/youtube_dlc/extractor/chaturbate.py b/yt_dlp/extractor/chaturbate.py
index a459dcb8d..a459dcb8d 100644
--- a/youtube_dlc/extractor/chaturbate.py
+++ b/yt_dlp/extractor/chaturbate.py
diff --git a/youtube_dlc/extractor/chilloutzone.py b/yt_dlp/extractor/chilloutzone.py
index 5aac21299..5aac21299 100644
--- a/youtube_dlc/extractor/chilloutzone.py
+++ b/yt_dlp/extractor/chilloutzone.py
diff --git a/youtube_dlc/extractor/chirbit.py b/yt_dlp/extractor/chirbit.py
index 8d75cdf19..8d75cdf19 100644
--- a/youtube_dlc/extractor/chirbit.py
+++ b/yt_dlp/extractor/chirbit.py
diff --git a/youtube_dlc/extractor/cinchcast.py b/yt_dlp/extractor/cinchcast.py
index b861d54b0..b861d54b0 100644
--- a/youtube_dlc/extractor/cinchcast.py
+++ b/yt_dlp/extractor/cinchcast.py
diff --git a/youtube_dlc/extractor/cinemax.py b/yt_dlp/extractor/cinemax.py
index 7f89d33de..7f89d33de 100644
--- a/youtube_dlc/extractor/cinemax.py
+++ b/yt_dlp/extractor/cinemax.py
diff --git a/youtube_dlc/extractor/ciscolive.py b/yt_dlp/extractor/ciscolive.py
index da404e4dc..da404e4dc 100644
--- a/youtube_dlc/extractor/ciscolive.py
+++ b/yt_dlp/extractor/ciscolive.py
diff --git a/youtube_dlc/extractor/cjsw.py b/yt_dlp/extractor/cjsw.py
index 505bdbe16..505bdbe16 100644
--- a/youtube_dlc/extractor/cjsw.py
+++ b/yt_dlp/extractor/cjsw.py
diff --git a/youtube_dlc/extractor/cliphunter.py b/yt_dlp/extractor/cliphunter.py
index f2ca7a337..f2ca7a337 100644
--- a/youtube_dlc/extractor/cliphunter.py
+++ b/yt_dlp/extractor/cliphunter.py
diff --git a/youtube_dlc/extractor/clippit.py b/yt_dlp/extractor/clippit.py
index a1a7a774c..a1a7a774c 100644
--- a/youtube_dlc/extractor/clippit.py
+++ b/yt_dlp/extractor/clippit.py
diff --git a/youtube_dlc/extractor/cliprs.py b/yt_dlp/extractor/cliprs.py
index d55b26d59..d55b26d59 100644
--- a/youtube_dlc/extractor/cliprs.py
+++ b/yt_dlp/extractor/cliprs.py
diff --git a/youtube_dlc/extractor/clipsyndicate.py b/yt_dlp/extractor/clipsyndicate.py
index 6cdb42f5a..6cdb42f5a 100644
--- a/youtube_dlc/extractor/clipsyndicate.py
+++ b/yt_dlp/extractor/clipsyndicate.py
diff --git a/youtube_dlc/extractor/closertotruth.py b/yt_dlp/extractor/closertotruth.py
index 26243d52d..26243d52d 100644
--- a/youtube_dlc/extractor/closertotruth.py
+++ b/yt_dlp/extractor/closertotruth.py
diff --git a/youtube_dlc/extractor/cloudflarestream.py b/yt_dlp/extractor/cloudflarestream.py
index 2fdcfbb3a..2fdcfbb3a 100644
--- a/youtube_dlc/extractor/cloudflarestream.py
+++ b/yt_dlp/extractor/cloudflarestream.py
diff --git a/youtube_dlc/extractor/cloudy.py b/yt_dlp/extractor/cloudy.py
index 85ca20ecc..85ca20ecc 100644
--- a/youtube_dlc/extractor/cloudy.py
+++ b/yt_dlp/extractor/cloudy.py
diff --git a/youtube_dlc/extractor/clubic.py b/yt_dlp/extractor/clubic.py
index 98f9cb596..98f9cb596 100644
--- a/youtube_dlc/extractor/clubic.py
+++ b/yt_dlp/extractor/clubic.py
diff --git a/youtube_dlc/extractor/clyp.py b/yt_dlp/extractor/clyp.py
index 06d04de13..06d04de13 100644
--- a/youtube_dlc/extractor/clyp.py
+++ b/yt_dlp/extractor/clyp.py
diff --git a/youtube_dlc/extractor/cmt.py b/yt_dlp/extractor/cmt.py
index a4ddb9160..a4ddb9160 100644
--- a/youtube_dlc/extractor/cmt.py
+++ b/yt_dlp/extractor/cmt.py
diff --git a/youtube_dlc/extractor/cnbc.py b/yt_dlp/extractor/cnbc.py
index 7b9f4536a..7b9f4536a 100644
--- a/youtube_dlc/extractor/cnbc.py
+++ b/yt_dlp/extractor/cnbc.py
diff --git a/youtube_dlc/extractor/cnn.py b/yt_dlp/extractor/cnn.py
index 2d950fa05..2d950fa05 100644
--- a/youtube_dlc/extractor/cnn.py
+++ b/yt_dlp/extractor/cnn.py
diff --git a/youtube_dlc/extractor/comedycentral.py b/yt_dlp/extractor/comedycentral.py
index 1bfa912be..1bfa912be 100644
--- a/youtube_dlc/extractor/comedycentral.py
+++ b/yt_dlp/extractor/comedycentral.py
diff --git a/youtube_dlc/extractor/common.py b/yt_dlp/extractor/common.py
index edfa99975..b03582f54 100644
--- a/youtube_dlc/extractor/common.py
+++ b/yt_dlp/extractor/common.py
@@ -272,7 +272,7 @@ class InfoExtractor(object):
                                      Set to "root" to indicate that this is a
                                      comment to the original video.
     age_limit:      Age restriction for the video, as an integer (years)
-    webpage_url:    The URL to the video webpage, if given to youtube-dlc it
+    webpage_url:    The URL to the video webpage, if given to yt-dlp it
                     should allow to get the same result again. (It will be set
                     by YoutubeDL if it's missing)
     categories:     A list of categories that the video falls in, for example
@@ -1723,7 +1723,7 @@ class InfoExtractor(object):
         if not isinstance(manifest, compat_etree_Element) and not fatal:
             return []
 
-        # currently youtube-dlc cannot decode the playerVerificationChallenge as Akamai uses Adobe Alchemy
+        # currently yt-dlp cannot decode the playerVerificationChallenge as Akamai uses Adobe Alchemy
         akamai_pv = manifest.find('{http://ns.adobe.com/f4m/1.0}pv-2.0')
         if akamai_pv is not None and ';' in akamai_pv.text:
             playerVerificationChallenge = akamai_pv.text.split(';')[0]
diff --git a/youtube_dlc/extractor/commonmistakes.py b/yt_dlp/extractor/commonmistakes.py
index 933b89eb3..593ff1835 100644
--- a/youtube_dlc/extractor/commonmistakes.py
+++ b/yt_dlp/extractor/commonmistakes.py
@@ -22,12 +22,12 @@ class CommonMistakesIE(InfoExtractor):
 
     def _real_extract(self, url):
         msg = (
-            'You\'ve asked youtube-dlc to download the URL "%s". '
+            'You\'ve asked yt-dlp to download the URL "%s". '
             'That doesn\'t make any sense. '
             'Simply remove the parameter in your command or configuration.'
         ) % url
         if not self._downloader.params.get('verbose'):
-            msg += ' Add -v to the command line to see what arguments and configuration youtube-dlc got.'
+            msg += ' Add -v to the command line to see what arguments and configuration yt-dlp got.'
         raise ExtractorError(msg, expected=True)
 
 
diff --git a/youtube_dlc/extractor/commonprotocols.py b/yt_dlp/extractor/commonprotocols.py
index d98331a4e..d98331a4e 100644
--- a/youtube_dlc/extractor/commonprotocols.py
+++ b/yt_dlp/extractor/commonprotocols.py
diff --git a/youtube_dlc/extractor/condenast.py b/yt_dlp/extractor/condenast.py
index d5e77af32..d5e77af32 100644
--- a/youtube_dlc/extractor/condenast.py
+++ b/yt_dlp/extractor/condenast.py
diff --git a/youtube_dlc/extractor/contv.py b/yt_dlp/extractor/contv.py
index 84b462d40..84b462d40 100644
--- a/youtube_dlc/extractor/contv.py
+++ b/yt_dlp/extractor/contv.py
diff --git a/youtube_dlc/extractor/corus.py b/yt_dlp/extractor/corus.py
index e11aadf14..e11aadf14 100644
--- a/youtube_dlc/extractor/corus.py
+++ b/yt_dlp/extractor/corus.py
diff --git a/youtube_dlc/extractor/coub.py b/yt_dlp/extractor/coub.py
index eba6b73ba..eba6b73ba 100644
--- a/youtube_dlc/extractor/coub.py
+++ b/yt_dlp/extractor/coub.py
diff --git a/youtube_dlc/extractor/cracked.py b/yt_dlp/extractor/cracked.py
index f77a68ece..f77a68ece 100644
--- a/youtube_dlc/extractor/cracked.py
+++ b/yt_dlp/extractor/cracked.py
diff --git a/youtube_dlc/extractor/crackle.py b/yt_dlp/extractor/crackle.py
index 231d52218..231d52218 100644
--- a/youtube_dlc/extractor/crackle.py
+++ b/yt_dlp/extractor/crackle.py
diff --git a/youtube_dlc/extractor/crooksandliars.py b/yt_dlp/extractor/crooksandliars.py
index 7fb782db7..7fb782db7 100644
--- a/youtube_dlc/extractor/crooksandliars.py
+++ b/yt_dlp/extractor/crooksandliars.py
diff --git a/youtube_dlc/extractor/crunchyroll.py b/yt_dlp/extractor/crunchyroll.py
index d670c12c1..d670c12c1 100644
--- a/youtube_dlc/extractor/crunchyroll.py
+++ b/yt_dlp/extractor/crunchyroll.py
diff --git a/youtube_dlc/extractor/cspan.py b/yt_dlp/extractor/cspan.py
index 2e01aff48..2e01aff48 100644
--- a/youtube_dlc/extractor/cspan.py
+++ b/yt_dlp/extractor/cspan.py
diff --git a/youtube_dlc/extractor/ctsnews.py b/yt_dlp/extractor/ctsnews.py
index 679f1d92e..679f1d92e 100644
--- a/youtube_dlc/extractor/ctsnews.py
+++ b/yt_dlp/extractor/ctsnews.py
diff --git a/youtube_dlc/extractor/ctv.py b/yt_dlp/extractor/ctv.py
index 756bcc2be..756bcc2be 100644
--- a/youtube_dlc/extractor/ctv.py
+++ b/yt_dlp/extractor/ctv.py
diff --git a/youtube_dlc/extractor/ctvnews.py b/yt_dlp/extractor/ctvnews.py
index 03f8cefb7..03f8cefb7 100644
--- a/youtube_dlc/extractor/ctvnews.py
+++ b/yt_dlp/extractor/ctvnews.py
diff --git a/youtube_dlc/extractor/cultureunplugged.py b/yt_dlp/extractor/cultureunplugged.py
index bcdf27323..bcdf27323 100644
--- a/youtube_dlc/extractor/cultureunplugged.py
+++ b/yt_dlp/extractor/cultureunplugged.py
diff --git a/youtube_dlc/extractor/curiositystream.py b/yt_dlp/extractor/curiositystream.py
index e4a7fca6c..e4a7fca6c 100644
--- a/youtube_dlc/extractor/curiositystream.py
+++ b/yt_dlp/extractor/curiositystream.py
diff --git a/youtube_dlc/extractor/cwtv.py b/yt_dlp/extractor/cwtv.py
index 73382431b..73382431b 100644
--- a/youtube_dlc/extractor/cwtv.py
+++ b/yt_dlp/extractor/cwtv.py
diff --git a/youtube_dlc/extractor/dailymail.py b/yt_dlp/extractor/dailymail.py
index 67b88fd56..67b88fd56 100644
--- a/youtube_dlc/extractor/dailymail.py
+++ b/yt_dlp/extractor/dailymail.py
diff --git a/youtube_dlc/extractor/dailymotion.py b/yt_dlp/extractor/dailymotion.py
index b8529050c..b8529050c 100644
--- a/youtube_dlc/extractor/dailymotion.py
+++ b/yt_dlp/extractor/dailymotion.py
diff --git a/youtube_dlc/extractor/daum.py b/yt_dlp/extractor/daum.py
index 137095577..137095577 100644
--- a/youtube_dlc/extractor/daum.py
+++ b/yt_dlp/extractor/daum.py
diff --git a/youtube_dlc/extractor/dbtv.py b/yt_dlp/extractor/dbtv.py
index aaedf2e3d..aaedf2e3d 100644
--- a/youtube_dlc/extractor/dbtv.py
+++ b/yt_dlp/extractor/dbtv.py
diff --git a/youtube_dlc/extractor/dctp.py b/yt_dlp/extractor/dctp.py
index e700f8d86..e700f8d86 100644
--- a/youtube_dlc/extractor/dctp.py
+++ b/yt_dlp/extractor/dctp.py
diff --git a/youtube_dlc/extractor/deezer.py b/yt_dlp/extractor/deezer.py
index 3031671c1..3031671c1 100644
--- a/youtube_dlc/extractor/deezer.py
+++ b/yt_dlp/extractor/deezer.py
diff --git a/youtube_dlc/extractor/defense.py b/yt_dlp/extractor/defense.py
index 9fe144e14..9fe144e14 100644
--- a/youtube_dlc/extractor/defense.py
+++ b/yt_dlp/extractor/defense.py
diff --git a/youtube_dlc/extractor/democracynow.py b/yt_dlp/extractor/democracynow.py
index 5c9c0ecdc..5c9c0ecdc 100644
--- a/youtube_dlc/extractor/democracynow.py
+++ b/yt_dlp/extractor/democracynow.py
diff --git a/youtube_dlc/extractor/dfb.py b/yt_dlp/extractor/dfb.py
index a4d0448c2..a4d0448c2 100644
--- a/youtube_dlc/extractor/dfb.py
+++ b/yt_dlp/extractor/dfb.py
diff --git a/youtube_dlc/extractor/dhm.py b/yt_dlp/extractor/dhm.py
index aee72a6ed..aee72a6ed 100644
--- a/youtube_dlc/extractor/dhm.py
+++ b/yt_dlp/extractor/dhm.py
diff --git a/youtube_dlc/extractor/digg.py b/yt_dlp/extractor/digg.py
index 913c1750f..913c1750f 100644
--- a/youtube_dlc/extractor/digg.py
+++ b/yt_dlp/extractor/digg.py
diff --git a/youtube_dlc/extractor/digiteka.py b/yt_dlp/extractor/digiteka.py
index 3dfde0d8c..3dfde0d8c 100644
--- a/youtube_dlc/extractor/digiteka.py
+++ b/yt_dlp/extractor/digiteka.py
diff --git a/youtube_dlc/extractor/discovery.py b/yt_dlp/extractor/discovery.py
index e0139cc86..e0139cc86 100644
--- a/youtube_dlc/extractor/discovery.py
+++ b/yt_dlp/extractor/discovery.py
diff --git a/youtube_dlc/extractor/discoverygo.py b/yt_dlp/extractor/discoverygo.py
index 9e7b14a7d..9e7b14a7d 100644
--- a/youtube_dlc/extractor/discoverygo.py
+++ b/yt_dlp/extractor/discoverygo.py
diff --git a/youtube_dlc/extractor/discoverynetworks.py b/yt_dlp/extractor/discoverynetworks.py
index c512b95d0..c512b95d0 100644
--- a/youtube_dlc/extractor/discoverynetworks.py
+++ b/yt_dlp/extractor/discoverynetworks.py
diff --git a/youtube_dlc/extractor/discoveryvr.py b/yt_dlp/extractor/discoveryvr.py
index cb63c2649..cb63c2649 100644
--- a/youtube_dlc/extractor/discoveryvr.py
+++ b/yt_dlp/extractor/discoveryvr.py
diff --git a/youtube_dlc/extractor/disney.py b/yt_dlp/extractor/disney.py
index 0eee82fd6..0eee82fd6 100644
--- a/youtube_dlc/extractor/disney.py
+++ b/yt_dlp/extractor/disney.py
diff --git a/youtube_dlc/extractor/dispeak.py b/yt_dlp/extractor/dispeak.py
index b1c02ca2b..b1c02ca2b 100644
--- a/youtube_dlc/extractor/dispeak.py
+++ b/yt_dlp/extractor/dispeak.py
diff --git a/youtube_dlc/extractor/dlive.py b/yt_dlp/extractor/dlive.py
index d95c67a5b..d95c67a5b 100644
--- a/youtube_dlc/extractor/dlive.py
+++ b/yt_dlp/extractor/dlive.py
diff --git a/youtube_dlc/extractor/doodstream.py b/yt_dlp/extractor/doodstream.py
index 2c9ea6898..2c9ea6898 100644
--- a/youtube_dlc/extractor/doodstream.py
+++ b/yt_dlp/extractor/doodstream.py
diff --git a/youtube_dlc/extractor/dotsub.py b/yt_dlp/extractor/dotsub.py
index 148605c0b..148605c0b 100644
--- a/youtube_dlc/extractor/dotsub.py
+++ b/yt_dlp/extractor/dotsub.py
diff --git a/youtube_dlc/extractor/douyutv.py b/yt_dlp/extractor/douyutv.py
index 9757f4422..9757f4422 100644
--- a/youtube_dlc/extractor/douyutv.py
+++ b/yt_dlp/extractor/douyutv.py
diff --git a/youtube_dlc/extractor/dplay.py b/yt_dlp/extractor/dplay.py
index 0f0632f26..0f0632f26 100644
--- a/youtube_dlc/extractor/dplay.py
+++ b/yt_dlp/extractor/dplay.py
diff --git a/youtube_dlc/extractor/drbonanza.py b/yt_dlp/extractor/drbonanza.py
index 164e97c36..164e97c36 100644
--- a/youtube_dlc/extractor/drbonanza.py
+++ b/yt_dlp/extractor/drbonanza.py
diff --git a/youtube_dlc/extractor/dreisat.py b/yt_dlp/extractor/dreisat.py
index 848d387d1..848d387d1 100644
--- a/youtube_dlc/extractor/dreisat.py
+++ b/yt_dlp/extractor/dreisat.py
diff --git a/youtube_dlc/extractor/dropbox.py b/yt_dlp/extractor/dropbox.py
index 9dc6614c5..14b6c00b0 100644
--- a/youtube_dlc/extractor/dropbox.py
+++ b/yt_dlp/extractor/dropbox.py
@@ -13,11 +13,11 @@ class DropboxIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?dropbox[.]com/sh?/(?P<id>[a-zA-Z0-9]{15})/.*'
     _TESTS = [
         {
-            'url': 'https://www.dropbox.com/s/nelirfsxnmcfbfh/youtube-dlc%20test%20video%20%27%C3%A4%22BaW_jenozKc.mp4?dl=0',
+            'url': 'https://www.dropbox.com/s/nelirfsxnmcfbfh/youtube-dl%20test%20video%20%27%C3%A4%22BaW_jenozKc.mp4?dl=0',
             'info_dict': {
                 'id': 'nelirfsxnmcfbfh',
                 'ext': 'mp4',
-                'title': 'youtube-dlc test video \'ä"BaW_jenozKc'
+                'title': 'youtube-dl test video \'ä"BaW_jenozKc'
             }
         }, {
             'url': 'https://www.dropbox.com/sh/662glsejgzoj9sr/AAByil3FGH9KFNZ13e08eSa1a/Pregame%20Ceremony%20Program%20PA%2020140518.m4v',
diff --git a/youtube_dlc/extractor/drtuber.py b/yt_dlp/extractor/drtuber.py
index 2baea585b..2baea585b 100644
--- a/youtube_dlc/extractor/drtuber.py
+++ b/yt_dlp/extractor/drtuber.py
diff --git a/youtube_dlc/extractor/drtv.py b/yt_dlp/extractor/drtv.py
index 7bb15f8d4..7bb15f8d4 100644
--- a/youtube_dlc/extractor/drtv.py
+++ b/yt_dlp/extractor/drtv.py
diff --git a/youtube_dlc/extractor/dtube.py b/yt_dlp/extractor/dtube.py
index 114d2dbe3..114d2dbe3 100644
--- a/youtube_dlc/extractor/dtube.py
+++ b/yt_dlp/extractor/dtube.py
diff --git a/youtube_dlc/extractor/duboku.py b/yt_dlp/extractor/duboku.py
index fdc695bf4..fdc695bf4 100644
--- a/youtube_dlc/extractor/duboku.py
+++ b/yt_dlp/extractor/duboku.py
diff --git a/youtube_dlc/extractor/dumpert.py b/yt_dlp/extractor/dumpert.py
index d9d9afdec..d9d9afdec 100644
--- a/youtube_dlc/extractor/dumpert.py
+++ b/yt_dlp/extractor/dumpert.py
diff --git a/youtube_dlc/extractor/dvtv.py b/yt_dlp/extractor/dvtv.py
index de7f6d670..de7f6d670 100644
--- a/youtube_dlc/extractor/dvtv.py
+++ b/yt_dlp/extractor/dvtv.py
diff --git a/youtube_dlc/extractor/dw.py b/yt_dlp/extractor/dw.py
index d740652f1..d740652f1 100644
--- a/youtube_dlc/extractor/dw.py
+++ b/yt_dlp/extractor/dw.py
diff --git a/youtube_dlc/extractor/eagleplatform.py b/yt_dlp/extractor/eagleplatform.py
index 36fef07b7..36fef07b7 100644
--- a/youtube_dlc/extractor/eagleplatform.py
+++ b/yt_dlp/extractor/eagleplatform.py
diff --git a/youtube_dlc/extractor/ebaumsworld.py b/yt_dlp/extractor/ebaumsworld.py
index c97682cd3..c97682cd3 100644
--- a/youtube_dlc/extractor/ebaumsworld.py
+++ b/yt_dlp/extractor/ebaumsworld.py
diff --git a/youtube_dlc/extractor/echomsk.py b/yt_dlp/extractor/echomsk.py
index 6b7cc652f..6b7cc652f 100644
--- a/youtube_dlc/extractor/echomsk.py
+++ b/yt_dlp/extractor/echomsk.py
diff --git a/youtube_dlc/extractor/egghead.py b/yt_dlp/extractor/egghead.py
index aff9b88c0..aff9b88c0 100644
--- a/youtube_dlc/extractor/egghead.py
+++ b/yt_dlp/extractor/egghead.py
diff --git a/youtube_dlc/extractor/ehow.py b/yt_dlp/extractor/ehow.py
index b1cd4f5d4..b1cd4f5d4 100644
--- a/youtube_dlc/extractor/ehow.py
+++ b/yt_dlp/extractor/ehow.py
diff --git a/youtube_dlc/extractor/eighttracks.py b/yt_dlp/extractor/eighttracks.py
index 5ededd31d..9a44f89f3 100644
--- a/youtube_dlc/extractor/eighttracks.py
+++ b/yt_dlp/extractor/eighttracks.py
@@ -18,12 +18,12 @@ class EightTracksIE(InfoExtractor):
     _VALID_URL = r'https?://8tracks\.com/(?P<user>[^/]+)/(?P<id>[^/#]+)(?:#.*)?$'
     _TEST = {
         'name': 'EightTracks',
-        'url': 'http://8tracks.com/ytdl/youtube-dlc-test-tracks-a',
+        'url': 'http://8tracks.com/ytdl/youtube-dl-test-tracks-a',
         'info_dict': {
             'id': '1336550',
-            'display_id': 'youtube-dlc-test-tracks-a',
+            'display_id': 'youtube-dl-test-tracks-a',
             'description': "test chars:  \"'/\\ä↭",
-            'title': "youtube-dlc test tracks \"'/\\ä↭<>",
+            'title': "youtube-dl test tracks \"'/\\ä↭<>",
         },
         'playlist': [
             {
@@ -31,7 +31,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885610',
                     'ext': 'm4a',
-                    'title': "youtue-dl project<>\"' - youtube-dlc test track 1 \"'/\\\u00e4\u21ad",
+                    'title': "youtue-dl project<>\"' - youtube-dl test track 1 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             },
@@ -40,7 +40,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885608',
                     'ext': 'm4a',
-                    'title': "youtube-dlc project - youtube-dlc test track 2 \"'/\\\u00e4\u21ad",
+                    'title': "youtube-dl project - youtube-dl test track 2 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             },
@@ -49,7 +49,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885679',
                     'ext': 'm4a',
-                    'title': "youtube-dlc project as well - youtube-dlc test track 3 \"'/\\\u00e4\u21ad",
+                    'title': "youtube-dl project as well - youtube-dl test track 3 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             },
@@ -58,7 +58,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885680',
                     'ext': 'm4a',
-                    'title': "youtube-dlc project as well - youtube-dlc test track 4 \"'/\\\u00e4\u21ad",
+                    'title': "youtube-dl project as well - youtube-dl test track 4 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             },
@@ -67,7 +67,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885682',
                     'ext': 'm4a',
-                    'title': "PH - youtube-dlc test track 5 \"'/\\\u00e4\u21ad",
+                    'title': "PH - youtube-dl test track 5 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             },
@@ -76,7 +76,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885683',
                     'ext': 'm4a',
-                    'title': "PH - youtube-dlc test track 6 \"'/\\\u00e4\u21ad",
+                    'title': "PH - youtube-dl test track 6 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             },
@@ -85,7 +85,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885684',
                     'ext': 'm4a',
-                    'title': "phihag - youtube-dlc test track 7 \"'/\\\u00e4\u21ad",
+                    'title': "phihag - youtube-dl test track 7 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             },
@@ -94,7 +94,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885685',
                     'ext': 'm4a',
-                    'title': "phihag - youtube-dlc test track 8 \"'/\\\u00e4\u21ad",
+                    'title': "phihag - youtube-dl test track 8 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             }
diff --git a/youtube_dlc/extractor/einthusan.py b/yt_dlp/extractor/einthusan.py
index 4e0f8bc81..4e0f8bc81 100644
--- a/youtube_dlc/extractor/einthusan.py
+++ b/yt_dlp/extractor/einthusan.py
diff --git a/youtube_dlc/extractor/eitb.py b/yt_dlp/extractor/eitb.py
index ee5ead18b..ee5ead18b 100644
--- a/youtube_dlc/extractor/eitb.py
+++ b/yt_dlp/extractor/eitb.py
diff --git a/youtube_dlc/extractor/ellentube.py b/yt_dlp/extractor/ellentube.py
index 544473274..544473274 100644
--- a/youtube_dlc/extractor/ellentube.py
+++ b/yt_dlp/extractor/ellentube.py
diff --git a/youtube_dlc/extractor/elonet.py b/yt_dlp/extractor/elonet.py
index c64ab5de3..c64ab5de3 100644
--- a/youtube_dlc/extractor/elonet.py
+++ b/yt_dlp/extractor/elonet.py
diff --git a/youtube_dlc/extractor/elpais.py b/yt_dlp/extractor/elpais.py
index b89f6db62..b89f6db62 100644
--- a/youtube_dlc/extractor/elpais.py
+++ b/yt_dlp/extractor/elpais.py
diff --git a/youtube_dlc/extractor/embedly.py b/yt_dlp/extractor/embedly.py
index a5820b21e..a5820b21e 100644
--- a/youtube_dlc/extractor/embedly.py
+++ b/yt_dlp/extractor/embedly.py
diff --git a/youtube_dlc/extractor/engadget.py b/yt_dlp/extractor/engadget.py
index 65635c18b..65635c18b 100644
--- a/youtube_dlc/extractor/engadget.py
+++ b/yt_dlp/extractor/engadget.py
diff --git a/youtube_dlc/extractor/eporner.py b/yt_dlp/extractor/eporner.py
index bfecd3a41..bfecd3a41 100644
--- a/youtube_dlc/extractor/eporner.py
+++ b/yt_dlp/extractor/eporner.py
diff --git a/youtube_dlc/extractor/eroprofile.py b/yt_dlp/extractor/eroprofile.py
index c08643a17..c08643a17 100644
--- a/youtube_dlc/extractor/eroprofile.py
+++ b/yt_dlp/extractor/eroprofile.py
diff --git a/youtube_dlc/extractor/escapist.py b/yt_dlp/extractor/escapist.py
index 4cd815ebc..4cd815ebc 100644
--- a/youtube_dlc/extractor/escapist.py
+++ b/yt_dlp/extractor/escapist.py
diff --git a/youtube_dlc/extractor/espn.py b/yt_dlp/extractor/espn.py
index d4a66c29f..d4a66c29f 100644
--- a/youtube_dlc/extractor/espn.py
+++ b/yt_dlp/extractor/espn.py
diff --git a/youtube_dlc/extractor/esri.py b/yt_dlp/extractor/esri.py
index e9dcaeb1d..e9dcaeb1d 100644
--- a/youtube_dlc/extractor/esri.py
+++ b/yt_dlp/extractor/esri.py
diff --git a/youtube_dlc/extractor/europa.py b/yt_dlp/extractor/europa.py
index 2c1c747a1..2c1c747a1 100644
--- a/youtube_dlc/extractor/europa.py
+++ b/yt_dlp/extractor/europa.py
diff --git a/youtube_dlc/extractor/everyonesmixtape.py b/yt_dlp/extractor/everyonesmixtape.py
index 84a9b750e..84a9b750e 100644
--- a/youtube_dlc/extractor/everyonesmixtape.py
+++ b/yt_dlp/extractor/everyonesmixtape.py
diff --git a/youtube_dlc/extractor/expotv.py b/yt_dlp/extractor/expotv.py
index 95a897782..95a897782 100644
--- a/youtube_dlc/extractor/expotv.py
+++ b/yt_dlp/extractor/expotv.py
diff --git a/youtube_dlc/extractor/expressen.py b/yt_dlp/extractor/expressen.py
index dc8b855d2..dc8b855d2 100644
--- a/youtube_dlc/extractor/expressen.py
+++ b/yt_dlp/extractor/expressen.py
diff --git a/youtube_dlc/extractor/extractors.py b/yt_dlp/extractor/extractors.py
index 16837b766..16837b766 100644
--- a/youtube_dlc/extractor/extractors.py
+++ b/yt_dlp/extractor/extractors.py
diff --git a/youtube_dlc/extractor/extremetube.py b/yt_dlp/extractor/extremetube.py
index acd4090fa..acd4090fa 100644
--- a/youtube_dlc/extractor/extremetube.py
+++ b/yt_dlp/extractor/extremetube.py
diff --git a/youtube_dlc/extractor/eyedotv.py b/yt_dlp/extractor/eyedotv.py
index f62ddebae..f62ddebae 100644
--- a/youtube_dlc/extractor/eyedotv.py
+++ b/yt_dlp/extractor/eyedotv.py
diff --git a/youtube_dlc/extractor/facebook.py b/yt_dlp/extractor/facebook.py
index 7906e813c..7906e813c 100644
--- a/youtube_dlc/extractor/facebook.py
+++ b/yt_dlp/extractor/facebook.py
diff --git a/youtube_dlc/extractor/faz.py b/yt_dlp/extractor/faz.py
index 312ee2aee..312ee2aee 100644
--- a/youtube_dlc/extractor/faz.py
+++ b/yt_dlp/extractor/faz.py
diff --git a/youtube_dlc/extractor/fc2.py b/yt_dlp/extractor/fc2.py
index 435561147..435561147 100644
--- a/youtube_dlc/extractor/fc2.py
+++ b/yt_dlp/extractor/fc2.py
diff --git a/youtube_dlc/extractor/fczenit.py b/yt_dlp/extractor/fczenit.py
index 8db7c5963..8db7c5963 100644
--- a/youtube_dlc/extractor/fczenit.py
+++ b/yt_dlp/extractor/fczenit.py
diff --git a/youtube_dlc/extractor/filmon.py b/yt_dlp/extractor/filmon.py
index f775fe0ba..f775fe0ba 100644
--- a/youtube_dlc/extractor/filmon.py
+++ b/yt_dlp/extractor/filmon.py
diff --git a/youtube_dlc/extractor/filmweb.py b/yt_dlp/extractor/filmweb.py
index 56000bc5b..56000bc5b 100644
--- a/youtube_dlc/extractor/filmweb.py
+++ b/yt_dlp/extractor/filmweb.py
diff --git a/youtube_dlc/extractor/firsttv.py b/yt_dlp/extractor/firsttv.py
index ccad173b7..ccad173b7 100644
--- a/youtube_dlc/extractor/firsttv.py
+++ b/yt_dlp/extractor/firsttv.py
diff --git a/youtube_dlc/extractor/fivemin.py b/yt_dlp/extractor/fivemin.py
index f3f876ecd..f3f876ecd 100644
--- a/youtube_dlc/extractor/fivemin.py
+++ b/yt_dlp/extractor/fivemin.py
diff --git a/youtube_dlc/extractor/fivetv.py b/yt_dlp/extractor/fivetv.py
index c4c0f1b3d..c4c0f1b3d 100644
--- a/youtube_dlc/extractor/fivetv.py
+++ b/yt_dlp/extractor/fivetv.py
diff --git a/youtube_dlc/extractor/flickr.py b/yt_dlp/extractor/flickr.py
index 6c82fae3c..6c82fae3c 100644
--- a/youtube_dlc/extractor/flickr.py
+++ b/yt_dlp/extractor/flickr.py
diff --git a/youtube_dlc/extractor/folketinget.py b/yt_dlp/extractor/folketinget.py
index b3df93f28..b3df93f28 100644
--- a/youtube_dlc/extractor/folketinget.py
+++ b/yt_dlp/extractor/folketinget.py
diff --git a/youtube_dlc/extractor/footyroom.py b/yt_dlp/extractor/footyroom.py
index 118325b6d..118325b6d 100644
--- a/youtube_dlc/extractor/footyroom.py
+++ b/yt_dlp/extractor/footyroom.py
diff --git a/youtube_dlc/extractor/formula1.py b/yt_dlp/extractor/formula1.py
index fecfc28ae..fecfc28ae 100644
--- a/youtube_dlc/extractor/formula1.py
+++ b/yt_dlp/extractor/formula1.py
diff --git a/youtube_dlc/extractor/fourtube.py b/yt_dlp/extractor/fourtube.py
index be4e81342..be4e81342 100644
--- a/youtube_dlc/extractor/fourtube.py
+++ b/yt_dlp/extractor/fourtube.py
diff --git a/youtube_dlc/extractor/fox.py b/yt_dlp/extractor/fox.py
index 04f4bdba6..04f4bdba6 100644
--- a/youtube_dlc/extractor/fox.py
+++ b/yt_dlp/extractor/fox.py
diff --git a/youtube_dlc/extractor/fox9.py b/yt_dlp/extractor/fox9.py
index 91f8f7b8a..91f8f7b8a 100644
--- a/youtube_dlc/extractor/fox9.py
+++ b/yt_dlp/extractor/fox9.py
diff --git a/youtube_dlc/extractor/foxgay.py b/yt_dlp/extractor/foxgay.py
index 512a10645..512a10645 100644
--- a/youtube_dlc/extractor/foxgay.py
+++ b/yt_dlp/extractor/foxgay.py
diff --git a/youtube_dlc/extractor/foxnews.py b/yt_dlp/extractor/foxnews.py
index 63613cb85..63613cb85 100644
--- a/youtube_dlc/extractor/foxnews.py
+++ b/yt_dlp/extractor/foxnews.py
diff --git a/youtube_dlc/extractor/foxsports.py b/yt_dlp/extractor/foxsports.py
index 2b2cb6c6f..2b2cb6c6f 100644
--- a/youtube_dlc/extractor/foxsports.py
+++ b/yt_dlp/extractor/foxsports.py
diff --git a/youtube_dlc/extractor/franceculture.py b/yt_dlp/extractor/franceculture.py
index 14f4cb489..14f4cb489 100644
--- a/youtube_dlc/extractor/franceculture.py
+++ b/yt_dlp/extractor/franceculture.py
diff --git a/youtube_dlc/extractor/franceinter.py b/yt_dlp/extractor/franceinter.py
index ae822a50e..ae822a50e 100644
--- a/youtube_dlc/extractor/franceinter.py
+++ b/yt_dlp/extractor/franceinter.py
diff --git a/youtube_dlc/extractor/francetv.py b/yt_dlp/extractor/francetv.py
index ab0df1bed..ab0df1bed 100644
--- a/youtube_dlc/extractor/francetv.py
+++ b/yt_dlp/extractor/francetv.py
diff --git a/youtube_dlc/extractor/freesound.py b/yt_dlp/extractor/freesound.py
index 138b6bc58..138b6bc58 100644
--- a/youtube_dlc/extractor/freesound.py
+++ b/yt_dlp/extractor/freesound.py
diff --git a/youtube_dlc/extractor/freespeech.py b/yt_dlp/extractor/freespeech.py
index ea9c3e317..ea9c3e317 100644
--- a/youtube_dlc/extractor/freespeech.py
+++ b/yt_dlp/extractor/freespeech.py
diff --git a/youtube_dlc/extractor/freshlive.py b/yt_dlp/extractor/freshlive.py
index 72a845945..72a845945 100644
--- a/youtube_dlc/extractor/freshlive.py
+++ b/yt_dlp/extractor/freshlive.py
diff --git a/youtube_dlc/extractor/frontendmasters.py b/yt_dlp/extractor/frontendmasters.py
index f1db33fb1..f1db33fb1 100644
--- a/youtube_dlc/extractor/frontendmasters.py
+++ b/yt_dlp/extractor/frontendmasters.py
diff --git a/youtube_dlc/extractor/fujitv.py b/yt_dlp/extractor/fujitv.py
index 39685e075..39685e075 100644
--- a/youtube_dlc/extractor/fujitv.py
+++ b/yt_dlp/extractor/fujitv.py
diff --git a/youtube_dlc/extractor/funimation.py b/yt_dlp/extractor/funimation.py
index 8bbedca26..8bbedca26 100644
--- a/youtube_dlc/extractor/funimation.py
+++ b/yt_dlp/extractor/funimation.py
diff --git a/youtube_dlc/extractor/funk.py b/yt_dlp/extractor/funk.py
index 81d1949fd..81d1949fd 100644
--- a/youtube_dlc/extractor/funk.py
+++ b/yt_dlp/extractor/funk.py
diff --git a/youtube_dlc/extractor/fusion.py b/yt_dlp/extractor/fusion.py
index a3f44b812..a3f44b812 100644
--- a/youtube_dlc/extractor/fusion.py
+++ b/yt_dlp/extractor/fusion.py
diff --git a/youtube_dlc/extractor/fxnetworks.py b/yt_dlp/extractor/fxnetworks.py
index 00e67426b..00e67426b 100644
--- a/youtube_dlc/extractor/fxnetworks.py
+++ b/yt_dlp/extractor/fxnetworks.py
diff --git a/youtube_dlc/extractor/gaia.py b/yt_dlp/extractor/gaia.py
index e9527758f..e9527758f 100644
--- a/youtube_dlc/extractor/gaia.py
+++ b/yt_dlp/extractor/gaia.py
diff --git a/youtube_dlc/extractor/gameinformer.py b/yt_dlp/extractor/gameinformer.py
index f1b96c172..f1b96c172 100644
--- a/youtube_dlc/extractor/gameinformer.py
+++ b/yt_dlp/extractor/gameinformer.py
diff --git a/youtube_dlc/extractor/gamespot.py b/yt_dlp/extractor/gamespot.py
index 7a1beae3c..7a1beae3c 100644
--- a/youtube_dlc/extractor/gamespot.py
+++ b/yt_dlp/extractor/gamespot.py
diff --git a/youtube_dlc/extractor/gamestar.py b/yt_dlp/extractor/gamestar.py
index f00dab2f3..f00dab2f3 100644
--- a/youtube_dlc/extractor/gamestar.py
+++ b/yt_dlp/extractor/gamestar.py
diff --git a/youtube_dlc/extractor/gaskrank.py b/yt_dlp/extractor/gaskrank.py
index 1726a6704..1726a6704 100644
--- a/youtube_dlc/extractor/gaskrank.py
+++ b/yt_dlp/extractor/gaskrank.py
diff --git a/youtube_dlc/extractor/gazeta.py b/yt_dlp/extractor/gazeta.py
index 57c67a451..57c67a451 100644
--- a/youtube_dlc/extractor/gazeta.py
+++ b/yt_dlp/extractor/gazeta.py
diff --git a/youtube_dlc/extractor/gdcvault.py b/yt_dlp/extractor/gdcvault.py
index a248a170d..a248a170d 100644
--- a/youtube_dlc/extractor/gdcvault.py
+++ b/yt_dlp/extractor/gdcvault.py
diff --git a/youtube_dlc/extractor/gedi.py b/yt_dlp/extractor/gedi.py
index 9d9d4acc2..9d9d4acc2 100644
--- a/youtube_dlc/extractor/gedi.py
+++ b/yt_dlp/extractor/gedi.py
diff --git a/youtube_dlc/extractor/generic.py b/yt_dlp/extractor/generic.py
index 8cde11d2b..7ecc5b3bd 100644
--- a/youtube_dlc/extractor/generic.py
+++ b/yt_dlp/extractor/generic.py
@@ -1997,7 +1997,7 @@ class GenericIE(InfoExtractor):
         },
         {
             # vshare embed
-            'url': 'https://youtube-dlc-demo.neocities.org/vshare.html',
+            'url': 'https://youtube-dl-demo.neocities.org/vshare.html',
             'md5': '17b39f55b5497ae8b59f5fbce8e35886',
             'info_dict': {
                 'id': '0f64ce6',
@@ -2372,7 +2372,7 @@ class GenericIE(InfoExtractor):
                     if default_search == 'auto_warning':
                         if re.match(r'^(?:url|URL)$', url):
                             raise ExtractorError(
-                                'Invalid URL:  %r . Call youtube-dlc like this:  youtube-dlc -v "https://www.youtube.com/watch?v=BaW_jenozKc"  ' % url,
+                                'Invalid URL:  %r . Call yt-dlp like this:  yt-dlp -v "https://www.youtube.com/watch?v=BaW_jenozKc"  ' % url,
                                 expected=True)
                         else:
                             self._downloader.report_warning(
@@ -2382,7 +2382,7 @@ class GenericIE(InfoExtractor):
             if default_search in ('error', 'fixup_error'):
                 raise ExtractorError(
                     '%r is not a valid URL. '
-                    'Set --default-search "ytsearch" (or run  youtube-dlc "ytsearch:%s" ) to search YouTube'
+                    'Set --default-search "ytsearch" (or run  yt-dlp "ytsearch:%s" ) to search YouTube'
                     % (url, url), expected=True)
             else:
                 if ':' not in default_search:
@@ -2458,7 +2458,7 @@ class GenericIE(InfoExtractor):
             request = sanitized_Request(url)
             # Some webservers may serve compressed content of rather big size (e.g. gzipped flac)
             # making it impossible to download only chunk of the file (yet we need only 512kB to
-            # test whether it's HTML or not). According to youtube-dlc default Accept-Encoding
+            # test whether it's HTML or not). According to yt-dlp default Accept-Encoding
             # that will always result in downloading the whole file that is not desirable.
             # Therefore for extraction pass we have to override Accept-Encoding to any in order
             # to accept raw bytes and being able to download only a chunk.
@@ -3521,7 +3521,7 @@ class GenericIE(InfoExtractor):
 
         if not found:
             # twitter:player is a https URL to iframe player that may or may not
-            # be supported by youtube-dlc thus this is checked the very last (see
+            # be supported by yt-dlp thus this is checked the very last (see
             # https://dev.twitter.com/cards/types/player#On_twitter.com_via_desktop_browser)
             embed_url = self._html_search_meta('twitter:player', webpage, default=None)
             if embed_url and embed_url != url:
diff --git a/youtube_dlc/extractor/gfycat.py b/yt_dlp/extractor/gfycat.py
index 18a30fe67..18a30fe67 100644
--- a/youtube_dlc/extractor/gfycat.py
+++ b/yt_dlp/extractor/gfycat.py
diff --git a/youtube_dlc/extractor/giantbomb.py b/yt_dlp/extractor/giantbomb.py
index c6477958d..c6477958d 100644
--- a/youtube_dlc/extractor/giantbomb.py
+++ b/yt_dlp/extractor/giantbomb.py
diff --git a/youtube_dlc/extractor/giga.py b/yt_dlp/extractor/giga.py
index 5a9992a27..5a9992a27 100644
--- a/youtube_dlc/extractor/giga.py
+++ b/yt_dlp/extractor/giga.py
diff --git a/youtube_dlc/extractor/gigya.py b/yt_dlp/extractor/gigya.py
index 412178492..412178492 100644
--- a/youtube_dlc/extractor/gigya.py
+++ b/yt_dlp/extractor/gigya.py
diff --git a/youtube_dlc/extractor/glide.py b/yt_dlp/extractor/glide.py
index d94dfbf09..d94dfbf09 100644
--- a/youtube_dlc/extractor/glide.py
+++ b/yt_dlp/extractor/glide.py
diff --git a/youtube_dlc/extractor/globo.py b/yt_dlp/extractor/globo.py
index 3dbe759be..3dbe759be 100644
--- a/youtube_dlc/extractor/globo.py
+++ b/yt_dlp/extractor/globo.py
diff --git a/youtube_dlc/extractor/go.py b/yt_dlp/extractor/go.py
index dda08ae3e..dda08ae3e 100644
--- a/youtube_dlc/extractor/go.py
+++ b/yt_dlp/extractor/go.py
diff --git a/youtube_dlc/extractor/godtube.py b/yt_dlp/extractor/godtube.py
index 92efd16b3..92efd16b3 100644
--- a/youtube_dlc/extractor/godtube.py
+++ b/yt_dlp/extractor/godtube.py
diff --git a/youtube_dlc/extractor/golem.py b/yt_dlp/extractor/golem.py
index 47a068e74..47a068e74 100644
--- a/youtube_dlc/extractor/golem.py
+++ b/yt_dlp/extractor/golem.py
diff --git a/youtube_dlc/extractor/googledrive.py b/yt_dlp/extractor/googledrive.py
index 4eefcb70c..4eefcb70c 100644
--- a/youtube_dlc/extractor/googledrive.py
+++ b/yt_dlp/extractor/googledrive.py
diff --git a/youtube_dlc/extractor/googlepodcasts.py b/yt_dlp/extractor/googlepodcasts.py
index 31ad79907..31ad79907 100644
--- a/youtube_dlc/extractor/googlepodcasts.py
+++ b/yt_dlp/extractor/googlepodcasts.py
diff --git a/youtube_dlc/extractor/googlesearch.py b/yt_dlp/extractor/googlesearch.py
index 5279fa807..5279fa807 100644
--- a/youtube_dlc/extractor/googlesearch.py
+++ b/yt_dlp/extractor/googlesearch.py
diff --git a/youtube_dlc/extractor/goshgay.py b/yt_dlp/extractor/goshgay.py
index 377981d3e..377981d3e 100644
--- a/youtube_dlc/extractor/goshgay.py
+++ b/yt_dlp/extractor/goshgay.py
diff --git a/youtube_dlc/extractor/gputechconf.py b/yt_dlp/extractor/gputechconf.py
index 73dc62c49..73dc62c49 100644
--- a/youtube_dlc/extractor/gputechconf.py
+++ b/yt_dlp/extractor/gputechconf.py
diff --git a/youtube_dlc/extractor/groupon.py b/yt_dlp/extractor/groupon.py
index a6da90931..a6da90931 100644
--- a/youtube_dlc/extractor/groupon.py
+++ b/yt_dlp/extractor/groupon.py
diff --git a/youtube_dlc/extractor/hbo.py b/yt_dlp/extractor/hbo.py
index 68df748f5..68df748f5 100644
--- a/youtube_dlc/extractor/hbo.py
+++ b/yt_dlp/extractor/hbo.py
diff --git a/youtube_dlc/extractor/hearthisat.py b/yt_dlp/extractor/hearthisat.py
index aeb216c71..aeb216c71 100644
--- a/youtube_dlc/extractor/hearthisat.py
+++ b/yt_dlp/extractor/hearthisat.py
diff --git a/youtube_dlc/extractor/heise.py b/yt_dlp/extractor/heise.py
index cbe564a3c..cbe564a3c 100644
--- a/youtube_dlc/extractor/heise.py
+++ b/yt_dlp/extractor/heise.py
diff --git a/youtube_dlc/extractor/hellporno.py b/yt_dlp/extractor/hellporno.py
index fae425103..fae425103 100644
--- a/youtube_dlc/extractor/hellporno.py
+++ b/yt_dlp/extractor/hellporno.py
diff --git a/youtube_dlc/extractor/helsinki.py b/yt_dlp/extractor/helsinki.py
index 575fb332a..575fb332a 100644
--- a/youtube_dlc/extractor/helsinki.py
+++ b/yt_dlp/extractor/helsinki.py
diff --git a/youtube_dlc/extractor/hentaistigma.py b/yt_dlp/extractor/hentaistigma.py
index 86a93de4d..86a93de4d 100644
--- a/youtube_dlc/extractor/hentaistigma.py
+++ b/yt_dlp/extractor/hentaistigma.py
diff --git a/youtube_dlc/extractor/hgtv.py b/yt_dlp/extractor/hgtv.py
index a4f332565..a4f332565 100644
--- a/youtube_dlc/extractor/hgtv.py
+++ b/yt_dlp/extractor/hgtv.py
diff --git a/youtube_dlc/extractor/hidive.py b/yt_dlp/extractor/hidive.py
index f26f80265..f26f80265 100644
--- a/youtube_dlc/extractor/hidive.py
+++ b/yt_dlp/extractor/hidive.py
diff --git a/youtube_dlc/extractor/historicfilms.py b/yt_dlp/extractor/historicfilms.py
index 56343e98f..56343e98f 100644
--- a/youtube_dlc/extractor/historicfilms.py
+++ b/yt_dlp/extractor/historicfilms.py
diff --git a/youtube_dlc/extractor/hitbox.py b/yt_dlp/extractor/hitbox.py
index 3e5ff2685..3e5ff2685 100644
--- a/youtube_dlc/extractor/hitbox.py
+++ b/yt_dlp/extractor/hitbox.py
diff --git a/youtube_dlc/extractor/hitrecord.py b/yt_dlp/extractor/hitrecord.py
index fd5dc2935..fd5dc2935 100644
--- a/youtube_dlc/extractor/hitrecord.py
+++ b/yt_dlp/extractor/hitrecord.py
diff --git a/youtube_dlc/extractor/hketv.py b/yt_dlp/extractor/hketv.py
index 1f3502b90..1f3502b90 100644
--- a/youtube_dlc/extractor/hketv.py
+++ b/yt_dlp/extractor/hketv.py
diff --git a/youtube_dlc/extractor/hornbunny.py b/yt_dlp/extractor/hornbunny.py
index c458a959d..c458a959d 100644
--- a/youtube_dlc/extractor/hornbunny.py
+++ b/yt_dlp/extractor/hornbunny.py
diff --git a/youtube_dlc/extractor/hotnewhiphop.py b/yt_dlp/extractor/hotnewhiphop.py
index 4703e1894..4703e1894 100644
--- a/youtube_dlc/extractor/hotnewhiphop.py
+++ b/yt_dlp/extractor/hotnewhiphop.py
diff --git a/youtube_dlc/extractor/hotstar.py b/yt_dlp/extractor/hotstar.py
index e2e923539..e2e923539 100644
--- a/youtube_dlc/extractor/hotstar.py
+++ b/yt_dlp/extractor/hotstar.py
diff --git a/youtube_dlc/extractor/howcast.py b/yt_dlp/extractor/howcast.py
index 7e36b85ad..7e36b85ad 100644
--- a/youtube_dlc/extractor/howcast.py
+++ b/yt_dlp/extractor/howcast.py
diff --git a/youtube_dlc/extractor/howstuffworks.py b/yt_dlp/extractor/howstuffworks.py
index cf90ab3c9..cf90ab3c9 100644
--- a/youtube_dlc/extractor/howstuffworks.py
+++ b/yt_dlp/extractor/howstuffworks.py
diff --git a/youtube_dlc/extractor/hrfensehen.py b/yt_dlp/extractor/hrfensehen.py
index 805345e69..a04a5b0ff 100644
--- a/youtube_dlc/extractor/hrfensehen.py
+++ b/yt_dlp/extractor/hrfensehen.py
@@ -4,7 +4,7 @@ from __future__ import unicode_literals
 import json
 import re
 
-from youtube_dlc.utils import int_or_none, unified_timestamp, unescapeHTML
+from yt_dlp.utils import int_or_none, unified_timestamp, unescapeHTML
 from .common import InfoExtractor
 
 
diff --git a/youtube_dlc/extractor/hrti.py b/yt_dlp/extractor/hrti.py
index 23f7b1fc9..23f7b1fc9 100644
--- a/youtube_dlc/extractor/hrti.py
+++ b/yt_dlp/extractor/hrti.py
diff --git a/youtube_dlc/extractor/huajiao.py b/yt_dlp/extractor/huajiao.py
index 4ca275dda..4ca275dda 100644
--- a/youtube_dlc/extractor/huajiao.py
+++ b/yt_dlp/extractor/huajiao.py
diff --git a/youtube_dlc/extractor/huffpost.py b/yt_dlp/extractor/huffpost.py
index 97e36f056..97e36f056 100644
--- a/youtube_dlc/extractor/huffpost.py
+++ b/yt_dlp/extractor/huffpost.py
diff --git a/youtube_dlc/extractor/hungama.py b/yt_dlp/extractor/hungama.py
index 3fdaac5b6..3fdaac5b6 100644
--- a/youtube_dlc/extractor/hungama.py
+++ b/yt_dlp/extractor/hungama.py
diff --git a/youtube_dlc/extractor/hypem.py b/yt_dlp/extractor/hypem.py
index 9ca28d632..9ca28d632 100644
--- a/youtube_dlc/extractor/hypem.py
+++ b/yt_dlp/extractor/hypem.py
diff --git a/youtube_dlc/extractor/ign.py b/yt_dlp/extractor/ign.py
index c826eb3ba..c826eb3ba 100644
--- a/youtube_dlc/extractor/ign.py
+++ b/yt_dlp/extractor/ign.py
diff --git a/youtube_dlc/extractor/iheart.py b/yt_dlp/extractor/iheart.py
index b54c05eeb..b54c05eeb 100644
--- a/youtube_dlc/extractor/iheart.py
+++ b/yt_dlp/extractor/iheart.py
diff --git a/youtube_dlc/extractor/imdb.py b/yt_dlp/extractor/imdb.py
index a31301985..a31301985 100644
--- a/youtube_dlc/extractor/imdb.py
+++ b/yt_dlp/extractor/imdb.py
diff --git a/youtube_dlc/extractor/imggaming.py b/yt_dlp/extractor/imggaming.py
index e11f92053..e11f92053 100644
--- a/youtube_dlc/extractor/imggaming.py
+++ b/yt_dlp/extractor/imggaming.py
diff --git a/youtube_dlc/extractor/imgur.py b/yt_dlp/extractor/imgur.py
index 20fe6667b..dfa473752 100644
--- a/youtube_dlc/extractor/imgur.py
+++ b/yt_dlp/extractor/imgur.py
@@ -60,7 +60,7 @@ class ImgurIE(InfoExtractor):
                 'width': width,
                 'height': height,
                 'http_headers': {
-                    'User-Agent': 'youtube-dlc (like wget)',
+                    'User-Agent': 'yt-dlp (like wget)',
                 },
             })
 
@@ -82,7 +82,7 @@ class ImgurIE(InfoExtractor):
                 'url': self._proto_relative_url(gifd['gifUrl']),
                 'filesize': gifd.get('size'),
                 'http_headers': {
-                    'User-Agent': 'youtube-dlc (like wget)',
+                    'User-Agent': 'yt-dlp (like wget)',
                 },
             })
 
diff --git a/youtube_dlc/extractor/ina.py b/yt_dlp/extractor/ina.py
index b3b2683cb..b3b2683cb 100644
--- a/youtube_dlc/extractor/ina.py
+++ b/yt_dlp/extractor/ina.py
diff --git a/youtube_dlc/extractor/inc.py b/yt_dlp/extractor/inc.py
index d5b258a0f..d5b258a0f 100644
--- a/youtube_dlc/extractor/inc.py
+++ b/yt_dlp/extractor/inc.py
diff --git a/youtube_dlc/extractor/indavideo.py b/yt_dlp/extractor/indavideo.py
index 4c16243ec..4c16243ec 100644
--- a/youtube_dlc/extractor/indavideo.py
+++ b/yt_dlp/extractor/indavideo.py
diff --git a/youtube_dlc/extractor/infoq.py b/yt_dlp/extractor/infoq.py
index 0a70a1fb4..0a70a1fb4 100644
--- a/youtube_dlc/extractor/infoq.py
+++ b/yt_dlp/extractor/infoq.py
diff --git a/youtube_dlc/extractor/instagram.py b/yt_dlp/extractor/instagram.py
index 1eeddc3b6..1eeddc3b6 100644
--- a/youtube_dlc/extractor/instagram.py
+++ b/yt_dlp/extractor/instagram.py
diff --git a/youtube_dlc/extractor/internazionale.py b/yt_dlp/extractor/internazionale.py
index 676e8e269..676e8e269 100644
--- a/youtube_dlc/extractor/internazionale.py
+++ b/yt_dlp/extractor/internazionale.py
diff --git a/youtube_dlc/extractor/internetvideoarchive.py b/yt_dlp/extractor/internetvideoarchive.py
index 59b0a90c3..59b0a90c3 100644
--- a/youtube_dlc/extractor/internetvideoarchive.py
+++ b/yt_dlp/extractor/internetvideoarchive.py
diff --git a/youtube_dlc/extractor/iprima.py b/yt_dlp/extractor/iprima.py
index 648ae6741..648ae6741 100644
--- a/youtube_dlc/extractor/iprima.py
+++ b/yt_dlp/extractor/iprima.py
diff --git a/youtube_dlc/extractor/iqiyi.py b/yt_dlp/extractor/iqiyi.py
index 0d7cc65d7..0d7cc65d7 100644
--- a/youtube_dlc/extractor/iqiyi.py
+++ b/yt_dlp/extractor/iqiyi.py
diff --git a/youtube_dlc/extractor/ir90tv.py b/yt_dlp/extractor/ir90tv.py
index d5a3f6fa5..d5a3f6fa5 100644
--- a/youtube_dlc/extractor/ir90tv.py
+++ b/yt_dlp/extractor/ir90tv.py
diff --git a/youtube_dlc/extractor/itv.py b/yt_dlp/extractor/itv.py
index 4122ac880..4122ac880 100644
--- a/youtube_dlc/extractor/itv.py
+++ b/yt_dlp/extractor/itv.py
diff --git a/youtube_dlc/extractor/ivi.py b/yt_dlp/extractor/ivi.py
index 580cf41cd..69711f877 100644
--- a/youtube_dlc/extractor/ivi.py
+++ b/yt_dlp/extractor/ivi.py
@@ -142,7 +142,7 @@ class IviIE(InfoExtractor):
                     continue
                 elif bundled:
                     raise ExtractorError(
-                        'This feature does not work from bundled exe. Run youtube-dlc from sources.',
+                        'This feature does not work from bundled exe. Run yt-dlp from sources.',
                         expected=True)
                 elif not pycryptodomex_found:
                     raise ExtractorError(
diff --git a/youtube_dlc/extractor/ivideon.py b/yt_dlp/extractor/ivideon.py
index 3ca824f79..3ca824f79 100644
--- a/youtube_dlc/extractor/ivideon.py
+++ b/yt_dlp/extractor/ivideon.py
diff --git a/youtube_dlc/extractor/iwara.py b/yt_dlp/extractor/iwara.py
index 907d5fc8b..907d5fc8b 100644
--- a/youtube_dlc/extractor/iwara.py
+++ b/yt_dlp/extractor/iwara.py
diff --git a/youtube_dlc/extractor/izlesene.py b/yt_dlp/extractor/izlesene.py
index f8fca6c8f..f8fca6c8f 100644
--- a/youtube_dlc/extractor/izlesene.py
+++ b/yt_dlp/extractor/izlesene.py
diff --git a/youtube_dlc/extractor/jamendo.py b/yt_dlp/extractor/jamendo.py
index 490efa8fb..490efa8fb 100644
--- a/youtube_dlc/extractor/jamendo.py
+++ b/yt_dlp/extractor/jamendo.py
diff --git a/youtube_dlc/extractor/jeuxvideo.py b/yt_dlp/extractor/jeuxvideo.py
index e9f4ed738..e9f4ed738 100644
--- a/youtube_dlc/extractor/jeuxvideo.py
+++ b/yt_dlp/extractor/jeuxvideo.py
diff --git a/youtube_dlc/extractor/joj.py b/yt_dlp/extractor/joj.py
index 637618183..637618183 100644
--- a/youtube_dlc/extractor/joj.py
+++ b/yt_dlp/extractor/joj.py
diff --git a/youtube_dlc/extractor/jove.py b/yt_dlp/extractor/jove.py
index 27e0e37f6..27e0e37f6 100644
--- a/youtube_dlc/extractor/jove.py
+++ b/yt_dlp/extractor/jove.py
diff --git a/youtube_dlc/extractor/jwplatform.py b/yt_dlp/extractor/jwplatform.py
index 5aa508bf9..5aa508bf9 100644
--- a/youtube_dlc/extractor/jwplatform.py
+++ b/yt_dlp/extractor/jwplatform.py
diff --git a/youtube_dlc/extractor/kakao.py b/yt_dlp/extractor/kakao.py
index fefd8a215..fefd8a215 100644
--- a/youtube_dlc/extractor/kakao.py
+++ b/yt_dlp/extractor/kakao.py
diff --git a/youtube_dlc/extractor/kaltura.py b/yt_dlp/extractor/kaltura.py
index c8097249e..c8097249e 100644
--- a/youtube_dlc/extractor/kaltura.py
+++ b/yt_dlp/extractor/kaltura.py
diff --git a/youtube_dlc/extractor/kanalplay.py b/yt_dlp/extractor/kanalplay.py
index 6c3498c67..6c3498c67 100644
--- a/youtube_dlc/extractor/kanalplay.py
+++ b/yt_dlp/extractor/kanalplay.py
diff --git a/youtube_dlc/extractor/kankan.py b/yt_dlp/extractor/kankan.py
index a677ff447..a677ff447 100644
--- a/youtube_dlc/extractor/kankan.py
+++ b/yt_dlp/extractor/kankan.py
diff --git a/youtube_dlc/extractor/karaoketv.py b/yt_dlp/extractor/karaoketv.py
index bfccf89b0..bfccf89b0 100644
--- a/youtube_dlc/extractor/karaoketv.py
+++ b/yt_dlp/extractor/karaoketv.py
diff --git a/youtube_dlc/extractor/karrierevideos.py b/yt_dlp/extractor/karrierevideos.py
index 7b291e0a0..7b291e0a0 100644
--- a/youtube_dlc/extractor/karrierevideos.py
+++ b/yt_dlp/extractor/karrierevideos.py
diff --git a/youtube_dlc/extractor/keezmovies.py b/yt_dlp/extractor/keezmovies.py
index c3eb74c17..c3eb74c17 100644
--- a/youtube_dlc/extractor/keezmovies.py
+++ b/yt_dlp/extractor/keezmovies.py
diff --git a/youtube_dlc/extractor/ketnet.py b/yt_dlp/extractor/ketnet.py
index e0599d02f..e0599d02f 100644
--- a/youtube_dlc/extractor/ketnet.py
+++ b/yt_dlp/extractor/ketnet.py
diff --git a/youtube_dlc/extractor/khanacademy.py b/yt_dlp/extractor/khanacademy.py
index 87e520378..87e520378 100644
--- a/youtube_dlc/extractor/khanacademy.py
+++ b/yt_dlp/extractor/khanacademy.py
diff --git a/youtube_dlc/extractor/kickstarter.py b/yt_dlp/extractor/kickstarter.py
index d4da8f484..d4da8f484 100644
--- a/youtube_dlc/extractor/kickstarter.py
+++ b/yt_dlp/extractor/kickstarter.py
diff --git a/youtube_dlc/extractor/kinja.py b/yt_dlp/extractor/kinja.py
index 79e3026d2..79e3026d2 100644
--- a/youtube_dlc/extractor/kinja.py
+++ b/yt_dlp/extractor/kinja.py
diff --git a/youtube_dlc/extractor/kinopoisk.py b/yt_dlp/extractor/kinopoisk.py
index 9e8d01f53..9e8d01f53 100644
--- a/youtube_dlc/extractor/kinopoisk.py
+++ b/yt_dlp/extractor/kinopoisk.py
diff --git a/youtube_dlc/extractor/konserthusetplay.py b/yt_dlp/extractor/konserthusetplay.py
index dd42bb2f2..dd42bb2f2 100644
--- a/youtube_dlc/extractor/konserthusetplay.py
+++ b/yt_dlp/extractor/konserthusetplay.py
diff --git a/youtube_dlc/extractor/krasview.py b/yt_dlp/extractor/krasview.py
index d27d052ff..d27d052ff 100644
--- a/youtube_dlc/extractor/krasview.py
+++ b/yt_dlp/extractor/krasview.py
diff --git a/youtube_dlc/extractor/ku6.py b/yt_dlp/extractor/ku6.py
index a574408e5..a574408e5 100644
--- a/youtube_dlc/extractor/ku6.py
+++ b/yt_dlp/extractor/ku6.py
diff --git a/youtube_dlc/extractor/kusi.py b/yt_dlp/extractor/kusi.py
index 9833d35eb..9833d35eb 100644
--- a/youtube_dlc/extractor/kusi.py
+++ b/yt_dlp/extractor/kusi.py
diff --git a/youtube_dlc/extractor/kuwo.py b/yt_dlp/extractor/kuwo.py
index 460a4252f..460a4252f 100644
--- a/youtube_dlc/extractor/kuwo.py
+++ b/yt_dlp/extractor/kuwo.py
diff --git a/youtube_dlc/extractor/la7.py b/yt_dlp/extractor/la7.py
index 74b006fb5..74b006fb5 100644
--- a/youtube_dlc/extractor/la7.py
+++ b/yt_dlp/extractor/la7.py
diff --git a/youtube_dlc/extractor/laola1tv.py b/yt_dlp/extractor/laola1tv.py
index fa217365a..fa217365a 100644
--- a/youtube_dlc/extractor/laola1tv.py
+++ b/yt_dlp/extractor/laola1tv.py
diff --git a/youtube_dlc/extractor/lbry.py b/yt_dlp/extractor/lbry.py
index 413215a99..413215a99 100644
--- a/youtube_dlc/extractor/lbry.py
+++ b/yt_dlp/extractor/lbry.py
diff --git a/youtube_dlc/extractor/lci.py b/yt_dlp/extractor/lci.py
index 920872f5c..920872f5c 100644
--- a/youtube_dlc/extractor/lci.py
+++ b/yt_dlp/extractor/lci.py
diff --git a/youtube_dlc/extractor/lcp.py b/yt_dlp/extractor/lcp.py
index ade27a99e..ade27a99e 100644
--- a/youtube_dlc/extractor/lcp.py
+++ b/yt_dlp/extractor/lcp.py
diff --git a/youtube_dlc/extractor/lecture2go.py b/yt_dlp/extractor/lecture2go.py
index 81b5d41be..81b5d41be 100644
--- a/youtube_dlc/extractor/lecture2go.py
+++ b/yt_dlp/extractor/lecture2go.py
diff --git a/youtube_dlc/extractor/lecturio.py b/yt_dlp/extractor/lecturio.py
index 1b2dcef46..1b2dcef46 100644
--- a/youtube_dlc/extractor/lecturio.py
+++ b/yt_dlp/extractor/lecturio.py
diff --git a/youtube_dlc/extractor/leeco.py b/yt_dlp/extractor/leeco.py
index d5e11423c..d5e11423c 100644
--- a/youtube_dlc/extractor/leeco.py
+++ b/yt_dlp/extractor/leeco.py
diff --git a/youtube_dlc/extractor/lego.py b/yt_dlp/extractor/lego.py
index 1e3c19dfd..1e3c19dfd 100644
--- a/youtube_dlc/extractor/lego.py
+++ b/yt_dlp/extractor/lego.py
diff --git a/youtube_dlc/extractor/lemonde.py b/yt_dlp/extractor/lemonde.py
index 3306892e8..3306892e8 100644
--- a/youtube_dlc/extractor/lemonde.py
+++ b/yt_dlp/extractor/lemonde.py
diff --git a/youtube_dlc/extractor/lenta.py b/yt_dlp/extractor/lenta.py
index 2ebd4e577..2ebd4e577 100644
--- a/youtube_dlc/extractor/lenta.py
+++ b/yt_dlp/extractor/lenta.py
diff --git a/youtube_dlc/extractor/libraryofcongress.py b/yt_dlp/extractor/libraryofcongress.py
index 03f205144..03f205144 100644
--- a/youtube_dlc/extractor/libraryofcongress.py
+++ b/yt_dlp/extractor/libraryofcongress.py
diff --git a/youtube_dlc/extractor/libsyn.py b/yt_dlp/extractor/libsyn.py
index 2cf444258..2cf444258 100644
--- a/youtube_dlc/extractor/libsyn.py
+++ b/yt_dlp/extractor/libsyn.py
diff --git a/youtube_dlc/extractor/lifenews.py b/yt_dlp/extractor/lifenews.py
index 49a0a5989..49a0a5989 100644
--- a/youtube_dlc/extractor/lifenews.py
+++ b/yt_dlp/extractor/lifenews.py
diff --git a/youtube_dlc/extractor/limelight.py b/yt_dlp/extractor/limelight.py
index c0c35511f..c0c35511f 100644
--- a/youtube_dlc/extractor/limelight.py
+++ b/yt_dlp/extractor/limelight.py
diff --git a/youtube_dlc/extractor/line.py b/yt_dlp/extractor/line.py
index 7f5fa446e..7f5fa446e 100644
--- a/youtube_dlc/extractor/line.py
+++ b/yt_dlp/extractor/line.py
diff --git a/youtube_dlc/extractor/linkedin.py b/yt_dlp/extractor/linkedin.py
index e1dca4899..e1dca4899 100644
--- a/youtube_dlc/extractor/linkedin.py
+++ b/yt_dlp/extractor/linkedin.py
diff --git a/youtube_dlc/extractor/linuxacademy.py b/yt_dlp/extractor/linuxacademy.py
index 7ec4a6557..7ec4a6557 100644
--- a/youtube_dlc/extractor/linuxacademy.py
+++ b/yt_dlp/extractor/linuxacademy.py
diff --git a/youtube_dlc/extractor/litv.py b/yt_dlp/extractor/litv.py
index 337b1b15c..337b1b15c 100644
--- a/youtube_dlc/extractor/litv.py
+++ b/yt_dlp/extractor/litv.py
diff --git a/youtube_dlc/extractor/livejournal.py b/yt_dlp/extractor/livejournal.py
index 3a9f4553f..3a9f4553f 100644
--- a/youtube_dlc/extractor/livejournal.py
+++ b/yt_dlp/extractor/livejournal.py
diff --git a/youtube_dlc/extractor/liveleak.py b/yt_dlp/extractor/liveleak.py
index 114556ef0..114556ef0 100644
--- a/youtube_dlc/extractor/liveleak.py
+++ b/yt_dlp/extractor/liveleak.py
diff --git a/youtube_dlc/extractor/livestream.py b/yt_dlp/extractor/livestream.py
index 036b39023..036b39023 100644
--- a/youtube_dlc/extractor/livestream.py
+++ b/yt_dlp/extractor/livestream.py
diff --git a/youtube_dlc/extractor/lnkgo.py b/yt_dlp/extractor/lnkgo.py
index 3e71852aa..3e71852aa 100644
--- a/youtube_dlc/extractor/lnkgo.py
+++ b/yt_dlp/extractor/lnkgo.py
diff --git a/youtube_dlc/extractor/localnews8.py b/yt_dlp/extractor/localnews8.py
index aad396135..aad396135 100644
--- a/youtube_dlc/extractor/localnews8.py
+++ b/yt_dlp/extractor/localnews8.py
diff --git a/youtube_dlc/extractor/lovehomeporn.py b/yt_dlp/extractor/lovehomeporn.py
index 8f65a3c03..8f65a3c03 100644
--- a/youtube_dlc/extractor/lovehomeporn.py
+++ b/yt_dlp/extractor/lovehomeporn.py
diff --git a/youtube_dlc/extractor/lrt.py b/yt_dlp/extractor/lrt.py
index 89d549858..89d549858 100644
--- a/youtube_dlc/extractor/lrt.py
+++ b/yt_dlp/extractor/lrt.py
diff --git a/youtube_dlc/extractor/lynda.py b/yt_dlp/extractor/lynda.py
index b3d8653d0..b3d8653d0 100644
--- a/youtube_dlc/extractor/lynda.py
+++ b/yt_dlp/extractor/lynda.py
diff --git a/youtube_dlc/extractor/m6.py b/yt_dlp/extractor/m6.py
index 9806875e8..9806875e8 100644
--- a/youtube_dlc/extractor/m6.py
+++ b/yt_dlp/extractor/m6.py
diff --git a/youtube_dlc/extractor/magentamusik360.py b/yt_dlp/extractor/magentamusik360.py
index 5c274902f..5c274902f 100644
--- a/youtube_dlc/extractor/magentamusik360.py
+++ b/yt_dlp/extractor/magentamusik360.py
diff --git a/youtube_dlc/extractor/mailru.py b/yt_dlp/extractor/mailru.py
index 5bfe40649..5bfe40649 100644
--- a/youtube_dlc/extractor/mailru.py
+++ b/yt_dlp/extractor/mailru.py
diff --git a/youtube_dlc/extractor/malltv.py b/yt_dlp/extractor/malltv.py
index fadfd9338..fadfd9338 100644
--- a/youtube_dlc/extractor/malltv.py
+++ b/yt_dlp/extractor/malltv.py
diff --git a/youtube_dlc/extractor/mangomolo.py b/yt_dlp/extractor/mangomolo.py
index acee370e9..acee370e9 100644
--- a/youtube_dlc/extractor/mangomolo.py
+++ b/yt_dlp/extractor/mangomolo.py
diff --git a/youtube_dlc/extractor/manyvids.py b/yt_dlp/extractor/manyvids.py
index e8d7163e4..e8d7163e4 100644
--- a/youtube_dlc/extractor/manyvids.py
+++ b/yt_dlp/extractor/manyvids.py
diff --git a/youtube_dlc/extractor/markiza.py b/yt_dlp/extractor/markiza.py
index def960a0c..def960a0c 100644
--- a/youtube_dlc/extractor/markiza.py
+++ b/yt_dlp/extractor/markiza.py
diff --git a/youtube_dlc/extractor/massengeschmacktv.py b/yt_dlp/extractor/massengeschmacktv.py
index b381d31b4..b381d31b4 100644
--- a/youtube_dlc/extractor/massengeschmacktv.py
+++ b/yt_dlp/extractor/massengeschmacktv.py
diff --git a/youtube_dlc/extractor/matchtv.py b/yt_dlp/extractor/matchtv.py
index bc9933a81..bc9933a81 100644
--- a/youtube_dlc/extractor/matchtv.py
+++ b/yt_dlp/extractor/matchtv.py
diff --git a/youtube_dlc/extractor/mdr.py b/yt_dlp/extractor/mdr.py
index 0bdd62693..0bdd62693 100644
--- a/youtube_dlc/extractor/mdr.py
+++ b/yt_dlp/extractor/mdr.py
diff --git a/youtube_dlc/extractor/medaltv.py b/yt_dlp/extractor/medaltv.py
index 1603b55f6..1603b55f6 100644
--- a/youtube_dlc/extractor/medaltv.py
+++ b/yt_dlp/extractor/medaltv.py
diff --git a/youtube_dlc/extractor/medialaan.py b/yt_dlp/extractor/medialaan.py
index 788acf7fb..788acf7fb 100644
--- a/youtube_dlc/extractor/medialaan.py
+++ b/yt_dlp/extractor/medialaan.py
diff --git a/youtube_dlc/extractor/mediaset.py b/yt_dlp/extractor/mediaset.py
index 2c16fc9e2..2c16fc9e2 100644
--- a/youtube_dlc/extractor/mediaset.py
+++ b/yt_dlp/extractor/mediaset.py
diff --git a/youtube_dlc/extractor/mediasite.py b/yt_dlp/extractor/mediasite.py
index c18b16eb3..c18b16eb3 100644
--- a/youtube_dlc/extractor/mediasite.py
+++ b/yt_dlp/extractor/mediasite.py
diff --git a/youtube_dlc/extractor/medici.py b/yt_dlp/extractor/medici.py
index cd910238e..cd910238e 100644
--- a/youtube_dlc/extractor/medici.py
+++ b/yt_dlp/extractor/medici.py
diff --git a/youtube_dlc/extractor/megaphone.py b/yt_dlp/extractor/megaphone.py
index 5bafa6cf4..5bafa6cf4 100644
--- a/youtube_dlc/extractor/megaphone.py
+++ b/yt_dlp/extractor/megaphone.py
diff --git a/youtube_dlc/extractor/meipai.py b/yt_dlp/extractor/meipai.py
index 2445b8b39..2445b8b39 100644
--- a/youtube_dlc/extractor/meipai.py
+++ b/yt_dlp/extractor/meipai.py
diff --git a/youtube_dlc/extractor/melonvod.py b/yt_dlp/extractor/melonvod.py
index bd8cf13ab..bd8cf13ab 100644
--- a/youtube_dlc/extractor/melonvod.py
+++ b/yt_dlp/extractor/melonvod.py
diff --git a/youtube_dlc/extractor/meta.py b/yt_dlp/extractor/meta.py
index cdb46e163..cdb46e163 100644
--- a/youtube_dlc/extractor/meta.py
+++ b/yt_dlp/extractor/meta.py
diff --git a/youtube_dlc/extractor/metacafe.py b/yt_dlp/extractor/metacafe.py
index 9e92416d1..9e92416d1 100644
--- a/youtube_dlc/extractor/metacafe.py
+++ b/yt_dlp/extractor/metacafe.py
diff --git a/youtube_dlc/extractor/metacritic.py b/yt_dlp/extractor/metacritic.py
index 7d468d78b..7d468d78b 100644
--- a/youtube_dlc/extractor/metacritic.py
+++ b/yt_dlp/extractor/metacritic.py
diff --git a/youtube_dlc/extractor/mgoon.py b/yt_dlp/extractor/mgoon.py
index 7bb473900..7bb473900 100644
--- a/youtube_dlc/extractor/mgoon.py
+++ b/yt_dlp/extractor/mgoon.py
diff --git a/youtube_dlc/extractor/mgtv.py b/yt_dlp/extractor/mgtv.py
index cab3aa045..cab3aa045 100644
--- a/youtube_dlc/extractor/mgtv.py
+++ b/yt_dlp/extractor/mgtv.py
diff --git a/youtube_dlc/extractor/miaopai.py b/yt_dlp/extractor/miaopai.py
index f9e35ac7f..f9e35ac7f 100644
--- a/youtube_dlc/extractor/miaopai.py
+++ b/yt_dlp/extractor/miaopai.py
diff --git a/youtube_dlc/extractor/microsoftvirtualacademy.py b/yt_dlp/extractor/microsoftvirtualacademy.py
index 8e0aee0e6..8e0aee0e6 100644
--- a/youtube_dlc/extractor/microsoftvirtualacademy.py
+++ b/yt_dlp/extractor/microsoftvirtualacademy.py
diff --git a/youtube_dlc/extractor/mildom.py b/yt_dlp/extractor/mildom.py
index 2e750d6d1..2e750d6d1 100644
--- a/youtube_dlc/extractor/mildom.py
+++ b/yt_dlp/extractor/mildom.py
diff --git a/youtube_dlc/extractor/minds.py b/yt_dlp/extractor/minds.py
index 8e9f0f825..8e9f0f825 100644
--- a/youtube_dlc/extractor/minds.py
+++ b/yt_dlp/extractor/minds.py
diff --git a/youtube_dlc/extractor/ministrygrid.py b/yt_dlp/extractor/ministrygrid.py
index 8ad9239c5..8ad9239c5 100644
--- a/youtube_dlc/extractor/ministrygrid.py
+++ b/yt_dlp/extractor/ministrygrid.py
diff --git a/youtube_dlc/extractor/minoto.py b/yt_dlp/extractor/minoto.py
index 636731195..636731195 100644
--- a/youtube_dlc/extractor/minoto.py
+++ b/yt_dlp/extractor/minoto.py
diff --git a/youtube_dlc/extractor/miomio.py b/yt_dlp/extractor/miomio.py
index 40f72d66f..40f72d66f 100644
--- a/youtube_dlc/extractor/miomio.py
+++ b/yt_dlp/extractor/miomio.py
diff --git a/youtube_dlc/extractor/mit.py b/yt_dlp/extractor/mit.py
index e1506a745..e1506a745 100644
--- a/youtube_dlc/extractor/mit.py
+++ b/yt_dlp/extractor/mit.py
diff --git a/youtube_dlc/extractor/mitele.py b/yt_dlp/extractor/mitele.py
index b5937233b..b5937233b 100644
--- a/youtube_dlc/extractor/mitele.py
+++ b/yt_dlp/extractor/mitele.py
diff --git a/youtube_dlc/extractor/mixcloud.py b/yt_dlp/extractor/mixcloud.py
index 69319857d..69319857d 100644
--- a/youtube_dlc/extractor/mixcloud.py
+++ b/yt_dlp/extractor/mixcloud.py
diff --git a/youtube_dlc/extractor/mlb.py b/yt_dlp/extractor/mlb.py
index b907f6b49..b907f6b49 100644
--- a/youtube_dlc/extractor/mlb.py
+++ b/yt_dlp/extractor/mlb.py
diff --git a/youtube_dlc/extractor/mnet.py b/yt_dlp/extractor/mnet.py
index 0e26ca1b3..0e26ca1b3 100644
--- a/youtube_dlc/extractor/mnet.py
+++ b/yt_dlp/extractor/mnet.py
diff --git a/youtube_dlc/extractor/moevideo.py b/yt_dlp/extractor/moevideo.py
index eb9b4ce7c..eb9b4ce7c 100644
--- a/youtube_dlc/extractor/moevideo.py
+++ b/yt_dlp/extractor/moevideo.py
diff --git a/youtube_dlc/extractor/mofosex.py b/yt_dlp/extractor/mofosex.py
index 5234cac02..5234cac02 100644
--- a/youtube_dlc/extractor/mofosex.py
+++ b/yt_dlp/extractor/mofosex.py
diff --git a/youtube_dlc/extractor/mojvideo.py b/yt_dlp/extractor/mojvideo.py
index 165e658c9..165e658c9 100644
--- a/youtube_dlc/extractor/mojvideo.py
+++ b/yt_dlp/extractor/mojvideo.py
diff --git a/youtube_dlc/extractor/morningstar.py b/yt_dlp/extractor/morningstar.py
index 0093bcd6c..0093bcd6c 100644
--- a/youtube_dlc/extractor/morningstar.py
+++ b/yt_dlp/extractor/morningstar.py
diff --git a/youtube_dlc/extractor/motherless.py b/yt_dlp/extractor/motherless.py
index ef1e081f2..ef1e081f2 100644
--- a/youtube_dlc/extractor/motherless.py
+++ b/yt_dlp/extractor/motherless.py
diff --git a/youtube_dlc/extractor/motorsport.py b/yt_dlp/extractor/motorsport.py
index c9d1ab64d..c9d1ab64d 100644
--- a/youtube_dlc/extractor/motorsport.py
+++ b/yt_dlp/extractor/motorsport.py
diff --git a/youtube_dlc/extractor/movieclips.py b/yt_dlp/extractor/movieclips.py
index 5453da1ac..5453da1ac 100644
--- a/youtube_dlc/extractor/movieclips.py
+++ b/yt_dlp/extractor/movieclips.py
diff --git a/youtube_dlc/extractor/moviezine.py b/yt_dlp/extractor/moviezine.py
index 85cc6e22f..85cc6e22f 100644
--- a/youtube_dlc/extractor/moviezine.py
+++ b/yt_dlp/extractor/moviezine.py
diff --git a/youtube_dlc/extractor/movingimage.py b/yt_dlp/extractor/movingimage.py
index 4f62d628a..4f62d628a 100644
--- a/youtube_dlc/extractor/movingimage.py
+++ b/yt_dlp/extractor/movingimage.py
diff --git a/youtube_dlc/extractor/msn.py b/yt_dlp/extractor/msn.py
index 9ce90a928..9ce90a928 100644
--- a/youtube_dlc/extractor/msn.py
+++ b/yt_dlp/extractor/msn.py
diff --git a/youtube_dlc/extractor/mtv.py b/yt_dlp/extractor/mtv.py
index 68e81ad47..68e81ad47 100644
--- a/youtube_dlc/extractor/mtv.py
+++ b/yt_dlp/extractor/mtv.py
diff --git a/youtube_dlc/extractor/muenchentv.py b/yt_dlp/extractor/muenchentv.py
index d256236d1..d256236d1 100644
--- a/youtube_dlc/extractor/muenchentv.py
+++ b/yt_dlp/extractor/muenchentv.py
diff --git a/youtube_dlc/extractor/mwave.py b/yt_dlp/extractor/mwave.py
index a67276596..a67276596 100644
--- a/youtube_dlc/extractor/mwave.py
+++ b/yt_dlp/extractor/mwave.py
diff --git a/youtube_dlc/extractor/mychannels.py b/yt_dlp/extractor/mychannels.py
index b1ffe7848..b1ffe7848 100644
--- a/youtube_dlc/extractor/mychannels.py
+++ b/yt_dlp/extractor/mychannels.py
diff --git a/youtube_dlc/extractor/myspace.py b/yt_dlp/extractor/myspace.py
index c3bf69091..c3bf69091 100644
--- a/youtube_dlc/extractor/myspace.py
+++ b/yt_dlp/extractor/myspace.py
diff --git a/youtube_dlc/extractor/myspass.py b/yt_dlp/extractor/myspass.py
index db7ebc94c..db7ebc94c 100644
--- a/youtube_dlc/extractor/myspass.py
+++ b/yt_dlp/extractor/myspass.py
diff --git a/youtube_dlc/extractor/myvi.py b/yt_dlp/extractor/myvi.py
index 75d286365..75d286365 100644
--- a/youtube_dlc/extractor/myvi.py
+++ b/yt_dlp/extractor/myvi.py
diff --git a/youtube_dlc/extractor/myvideoge.py b/yt_dlp/extractor/myvideoge.py
index 0a1d7d0cb..0a1d7d0cb 100644
--- a/youtube_dlc/extractor/myvideoge.py
+++ b/yt_dlp/extractor/myvideoge.py
diff --git a/youtube_dlc/extractor/myvidster.py b/yt_dlp/extractor/myvidster.py
index 2117d302d..2117d302d 100644
--- a/youtube_dlc/extractor/myvidster.py
+++ b/yt_dlp/extractor/myvidster.py
diff --git a/youtube_dlc/extractor/nationalgeographic.py b/yt_dlp/extractor/nationalgeographic.py
index ee12e2b47..ee12e2b47 100644
--- a/youtube_dlc/extractor/nationalgeographic.py
+++ b/yt_dlp/extractor/nationalgeographic.py
diff --git a/youtube_dlc/extractor/naver.py b/yt_dlp/extractor/naver.py
index acf53c1ff..acf53c1ff 100644
--- a/youtube_dlc/extractor/naver.py
+++ b/yt_dlp/extractor/naver.py
diff --git a/youtube_dlc/extractor/nba.py b/yt_dlp/extractor/nba.py
index a1dc1dde7..a1dc1dde7 100644
--- a/youtube_dlc/extractor/nba.py
+++ b/yt_dlp/extractor/nba.py
diff --git a/youtube_dlc/extractor/nbc.py b/yt_dlp/extractor/nbc.py
index 0d77648c2..0d77648c2 100644
--- a/youtube_dlc/extractor/nbc.py
+++ b/yt_dlp/extractor/nbc.py
diff --git a/youtube_dlc/extractor/ndr.py b/yt_dlp/extractor/ndr.py
index 81abb3120..81abb3120 100644
--- a/youtube_dlc/extractor/ndr.py
+++ b/yt_dlp/extractor/ndr.py
diff --git a/youtube_dlc/extractor/ndtv.py b/yt_dlp/extractor/ndtv.py
index bc3eb9160..bc3eb9160 100644
--- a/youtube_dlc/extractor/ndtv.py
+++ b/yt_dlp/extractor/ndtv.py
diff --git a/youtube_dlc/extractor/nerdcubed.py b/yt_dlp/extractor/nerdcubed.py
index 9feccc672..9feccc672 100644
--- a/youtube_dlc/extractor/nerdcubed.py
+++ b/yt_dlp/extractor/nerdcubed.py
diff --git a/youtube_dlc/extractor/neteasemusic.py b/yt_dlp/extractor/neteasemusic.py
index 978a05841..978a05841 100644
--- a/youtube_dlc/extractor/neteasemusic.py
+++ b/yt_dlp/extractor/neteasemusic.py
diff --git a/youtube_dlc/extractor/netzkino.py b/yt_dlp/extractor/netzkino.py
index 3d1a06d0b..3d1a06d0b 100644
--- a/youtube_dlc/extractor/netzkino.py
+++ b/yt_dlp/extractor/netzkino.py
diff --git a/youtube_dlc/extractor/newgrounds.py b/yt_dlp/extractor/newgrounds.py
index b9f01235f..b9f01235f 100644
--- a/youtube_dlc/extractor/newgrounds.py
+++ b/yt_dlp/extractor/newgrounds.py
diff --git a/youtube_dlc/extractor/newstube.py b/yt_dlp/extractor/newstube.py
index dab4aec44..dab4aec44 100644
--- a/youtube_dlc/extractor/newstube.py
+++ b/yt_dlp/extractor/newstube.py
diff --git a/youtube_dlc/extractor/nextmedia.py b/yt_dlp/extractor/nextmedia.py
index 7bd1290bf..7bd1290bf 100644
--- a/youtube_dlc/extractor/nextmedia.py
+++ b/yt_dlp/extractor/nextmedia.py
diff --git a/youtube_dlc/extractor/nexx.py b/yt_dlp/extractor/nexx.py
index 586c1b7eb..586c1b7eb 100644
--- a/youtube_dlc/extractor/nexx.py
+++ b/yt_dlp/extractor/nexx.py
diff --git a/youtube_dlc/extractor/nfl.py b/yt_dlp/extractor/nfl.py
index 871923e4c..871923e4c 100644
--- a/youtube_dlc/extractor/nfl.py
+++ b/yt_dlp/extractor/nfl.py
diff --git a/youtube_dlc/extractor/nhk.py b/yt_dlp/extractor/nhk.py
index 8a9331a79..8a9331a79 100644
--- a/youtube_dlc/extractor/nhk.py
+++ b/yt_dlp/extractor/nhk.py
diff --git a/youtube_dlc/extractor/nhl.py b/yt_dlp/extractor/nhl.py
index eddfe1f37..eddfe1f37 100644
--- a/youtube_dlc/extractor/nhl.py
+++ b/yt_dlp/extractor/nhl.py
diff --git a/youtube_dlc/extractor/nick.py b/yt_dlp/extractor/nick.py
index 7e981b8c1..7e981b8c1 100644
--- a/youtube_dlc/extractor/nick.py
+++ b/yt_dlp/extractor/nick.py
diff --git a/youtube_dlc/extractor/niconico.py b/yt_dlp/extractor/niconico.py
index 38370b346..38370b346 100644
--- a/youtube_dlc/extractor/niconico.py
+++ b/yt_dlp/extractor/niconico.py
diff --git a/youtube_dlc/extractor/ninecninemedia.py b/yt_dlp/extractor/ninecninemedia.py
index f98e8396b..f98e8396b 100644
--- a/youtube_dlc/extractor/ninecninemedia.py
+++ b/yt_dlp/extractor/ninecninemedia.py
diff --git a/youtube_dlc/extractor/ninegag.py b/yt_dlp/extractor/ninegag.py
index 14390823b..14390823b 100644
--- a/youtube_dlc/extractor/ninegag.py
+++ b/yt_dlp/extractor/ninegag.py
diff --git a/youtube_dlc/extractor/ninenow.py b/yt_dlp/extractor/ninenow.py
index fc3a398ad..fc3a398ad 100644
--- a/youtube_dlc/extractor/ninenow.py
+++ b/yt_dlp/extractor/ninenow.py
diff --git a/youtube_dlc/extractor/nintendo.py b/yt_dlp/extractor/nintendo.py
index ff8f70ba6..ff8f70ba6 100644
--- a/youtube_dlc/extractor/nintendo.py
+++ b/yt_dlp/extractor/nintendo.py
diff --git a/youtube_dlc/extractor/nitter.py b/yt_dlp/extractor/nitter.py
index 3191543ed..3191543ed 100644
--- a/youtube_dlc/extractor/nitter.py
+++ b/yt_dlp/extractor/nitter.py
diff --git a/youtube_dlc/extractor/njpwworld.py b/yt_dlp/extractor/njpwworld.py
index 3639d142f..3639d142f 100644
--- a/youtube_dlc/extractor/njpwworld.py
+++ b/yt_dlp/extractor/njpwworld.py
diff --git a/youtube_dlc/extractor/nobelprize.py b/yt_dlp/extractor/nobelprize.py
index 4dfdb09d6..4dfdb09d6 100644
--- a/youtube_dlc/extractor/nobelprize.py
+++ b/yt_dlp/extractor/nobelprize.py
diff --git a/youtube_dlc/extractor/noco.py b/yt_dlp/extractor/noco.py
index aec8433de..aec8433de 100644
--- a/youtube_dlc/extractor/noco.py
+++ b/yt_dlp/extractor/noco.py
diff --git a/youtube_dlc/extractor/nonktube.py b/yt_dlp/extractor/nonktube.py
index ca1424e06..ca1424e06 100644
--- a/youtube_dlc/extractor/nonktube.py
+++ b/yt_dlp/extractor/nonktube.py
diff --git a/youtube_dlc/extractor/noovo.py b/yt_dlp/extractor/noovo.py
index b40770d07..b40770d07 100644
--- a/youtube_dlc/extractor/noovo.py
+++ b/yt_dlp/extractor/noovo.py
diff --git a/youtube_dlc/extractor/normalboots.py b/yt_dlp/extractor/normalboots.py
index 61fe571df..61fe571df 100644
--- a/youtube_dlc/extractor/normalboots.py
+++ b/yt_dlp/extractor/normalboots.py
diff --git a/youtube_dlc/extractor/nosvideo.py b/yt_dlp/extractor/nosvideo.py
index 53c500c35..53c500c35 100644
--- a/youtube_dlc/extractor/nosvideo.py
+++ b/yt_dlp/extractor/nosvideo.py
diff --git a/youtube_dlc/extractor/nova.py b/yt_dlp/extractor/nova.py
index 47b9748f0..47b9748f0 100644
--- a/youtube_dlc/extractor/nova.py
+++ b/yt_dlp/extractor/nova.py
diff --git a/youtube_dlc/extractor/nowness.py b/yt_dlp/extractor/nowness.py
index c136bc8c0..b2c715f41 100644
--- a/youtube_dlc/extractor/nowness.py
+++ b/yt_dlp/extractor/nowness.py
@@ -37,7 +37,7 @@ class NownessBaseIE(InfoExtractor):
                     elif source == 'youtube':
                         return self.url_result(video_id, 'Youtube')
                     elif source == 'cinematique':
-                        # youtube-dlc currently doesn't support cinematique
+                        # yt-dlp currently doesn't support cinematique
                         # return self.url_result('http://cinematique.com/embed/%s' % video_id, 'Cinematique')
                         pass
 
diff --git a/youtube_dlc/extractor/noz.py b/yt_dlp/extractor/noz.py
index ccafd7723..ccafd7723 100644
--- a/youtube_dlc/extractor/noz.py
+++ b/yt_dlp/extractor/noz.py
diff --git a/youtube_dlc/extractor/npo.py b/yt_dlp/extractor/npo.py
index ca6dbfc81..ca6dbfc81 100644
--- a/youtube_dlc/extractor/npo.py
+++ b/yt_dlp/extractor/npo.py
diff --git a/youtube_dlc/extractor/npr.py b/yt_dlp/extractor/npr.py
index 9d1122f0c..9d1122f0c 100644
--- a/youtube_dlc/extractor/npr.py
+++ b/yt_dlp/extractor/npr.py
diff --git a/youtube_dlc/extractor/nrk.py b/yt_dlp/extractor/nrk.py
index 40dee2162..40dee2162 100644
--- a/youtube_dlc/extractor/nrk.py
+++ b/yt_dlp/extractor/nrk.py
diff --git a/youtube_dlc/extractor/nrl.py b/yt_dlp/extractor/nrl.py
index 22a2df8d3..22a2df8d3 100644
--- a/youtube_dlc/extractor/nrl.py
+++ b/yt_dlp/extractor/nrl.py
diff --git a/youtube_dlc/extractor/ntvcojp.py b/yt_dlp/extractor/ntvcojp.py
index 0c8221b22..0c8221b22 100644
--- a/youtube_dlc/extractor/ntvcojp.py
+++ b/yt_dlp/extractor/ntvcojp.py
diff --git a/youtube_dlc/extractor/ntvde.py b/yt_dlp/extractor/ntvde.py
index 035582ee8..035582ee8 100644
--- a/youtube_dlc/extractor/ntvde.py
+++ b/yt_dlp/extractor/ntvde.py
diff --git a/youtube_dlc/extractor/ntvru.py b/yt_dlp/extractor/ntvru.py
index c47d1dfa4..c47d1dfa4 100644
--- a/youtube_dlc/extractor/ntvru.py
+++ b/yt_dlp/extractor/ntvru.py
diff --git a/youtube_dlc/extractor/nuevo.py b/yt_dlp/extractor/nuevo.py
index be1e09d37..be1e09d37 100644
--- a/youtube_dlc/extractor/nuevo.py
+++ b/yt_dlp/extractor/nuevo.py
diff --git a/youtube_dlc/extractor/nuvid.py b/yt_dlp/extractor/nuvid.py
index ab6bfcd7f..ab6bfcd7f 100644
--- a/youtube_dlc/extractor/nuvid.py
+++ b/yt_dlp/extractor/nuvid.py
diff --git a/youtube_dlc/extractor/nytimes.py b/yt_dlp/extractor/nytimes.py
index 1f03a9462..1f03a9462 100644
--- a/youtube_dlc/extractor/nytimes.py
+++ b/yt_dlp/extractor/nytimes.py
diff --git a/youtube_dlc/extractor/nzz.py b/yt_dlp/extractor/nzz.py
index 61ee77adb..61ee77adb 100644
--- a/youtube_dlc/extractor/nzz.py
+++ b/yt_dlp/extractor/nzz.py
diff --git a/youtube_dlc/extractor/odatv.py b/yt_dlp/extractor/odatv.py
index 314527f98..314527f98 100644
--- a/youtube_dlc/extractor/odatv.py
+++ b/yt_dlp/extractor/odatv.py
diff --git a/youtube_dlc/extractor/odnoklassniki.py b/yt_dlp/extractor/odnoklassniki.py
index 7ed9fac55..7ed9fac55 100644
--- a/youtube_dlc/extractor/odnoklassniki.py
+++ b/yt_dlp/extractor/odnoklassniki.py
diff --git a/youtube_dlc/extractor/oktoberfesttv.py b/yt_dlp/extractor/oktoberfesttv.py
index a914068f9..a914068f9 100644
--- a/youtube_dlc/extractor/oktoberfesttv.py
+++ b/yt_dlp/extractor/oktoberfesttv.py
diff --git a/youtube_dlc/extractor/once.py b/yt_dlp/extractor/once.py
index 3e44b7829..3e44b7829 100644
--- a/youtube_dlc/extractor/once.py
+++ b/yt_dlp/extractor/once.py
diff --git a/youtube_dlc/extractor/ondemandkorea.py b/yt_dlp/extractor/ondemandkorea.py
index cc3c587bc..cc3c587bc 100644
--- a/youtube_dlc/extractor/ondemandkorea.py
+++ b/yt_dlp/extractor/ondemandkorea.py
diff --git a/youtube_dlc/extractor/onet.py b/yt_dlp/extractor/onet.py
index e55b2ac89..e55b2ac89 100644
--- a/youtube_dlc/extractor/onet.py
+++ b/yt_dlp/extractor/onet.py
diff --git a/youtube_dlc/extractor/onionstudios.py b/yt_dlp/extractor/onionstudios.py
index cf5c39e66..cf5c39e66 100644
--- a/youtube_dlc/extractor/onionstudios.py
+++ b/yt_dlp/extractor/onionstudios.py
diff --git a/youtube_dlc/extractor/ooyala.py b/yt_dlp/extractor/ooyala.py
index eb957b8fe..eb957b8fe 100644
--- a/youtube_dlc/extractor/ooyala.py
+++ b/yt_dlp/extractor/ooyala.py
diff --git a/youtube_dlc/extractor/openload.py b/yt_dlp/extractor/openload.py
index dfdd0e526..dfdd0e526 100644
--- a/youtube_dlc/extractor/openload.py
+++ b/yt_dlp/extractor/openload.py
diff --git a/youtube_dlc/extractor/ora.py b/yt_dlp/extractor/ora.py
index 422d0b330..422d0b330 100644
--- a/youtube_dlc/extractor/ora.py
+++ b/yt_dlp/extractor/ora.py
diff --git a/youtube_dlc/extractor/orf.py b/yt_dlp/extractor/orf.py
index 700ce448c..700ce448c 100644
--- a/youtube_dlc/extractor/orf.py
+++ b/yt_dlp/extractor/orf.py
diff --git a/youtube_dlc/extractor/outsidetv.py b/yt_dlp/extractor/outsidetv.py
index c5333b08c..c5333b08c 100644
--- a/youtube_dlc/extractor/outsidetv.py
+++ b/yt_dlp/extractor/outsidetv.py
diff --git a/youtube_dlc/extractor/packtpub.py b/yt_dlp/extractor/packtpub.py
index 11ad3b3b8..11ad3b3b8 100644
--- a/youtube_dlc/extractor/packtpub.py
+++ b/yt_dlp/extractor/packtpub.py
diff --git a/youtube_dlc/extractor/pandoratv.py b/yt_dlp/extractor/pandoratv.py
index 538738c09..538738c09 100644
--- a/youtube_dlc/extractor/pandoratv.py
+++ b/yt_dlp/extractor/pandoratv.py
diff --git a/youtube_dlc/extractor/parliamentliveuk.py b/yt_dlp/extractor/parliamentliveuk.py
index bdd5ff565..bdd5ff565 100644
--- a/youtube_dlc/extractor/parliamentliveuk.py
+++ b/yt_dlp/extractor/parliamentliveuk.py
diff --git a/youtube_dlc/extractor/patreon.py b/yt_dlp/extractor/patreon.py
index 761a4b1de..761a4b1de 100644
--- a/youtube_dlc/extractor/patreon.py
+++ b/yt_dlp/extractor/patreon.py
diff --git a/youtube_dlc/extractor/pbs.py b/yt_dlp/extractor/pbs.py
index d4baa16ee..d4baa16ee 100644
--- a/youtube_dlc/extractor/pbs.py
+++ b/yt_dlp/extractor/pbs.py
diff --git a/youtube_dlc/extractor/pearvideo.py b/yt_dlp/extractor/pearvideo.py
index 1d777221c..1d777221c 100644
--- a/youtube_dlc/extractor/pearvideo.py
+++ b/yt_dlp/extractor/pearvideo.py
diff --git a/youtube_dlc/extractor/peertube.py b/yt_dlp/extractor/peertube.py
index c2ca71c71..c2ca71c71 100644
--- a/youtube_dlc/extractor/peertube.py
+++ b/yt_dlp/extractor/peertube.py
diff --git a/youtube_dlc/extractor/people.py b/yt_dlp/extractor/people.py
index 6ca95715e..6ca95715e 100644
--- a/youtube_dlc/extractor/people.py
+++ b/yt_dlp/extractor/people.py
diff --git a/youtube_dlc/extractor/performgroup.py b/yt_dlp/extractor/performgroup.py
index 26942bfb3..26942bfb3 100644
--- a/youtube_dlc/extractor/performgroup.py
+++ b/yt_dlp/extractor/performgroup.py
diff --git a/youtube_dlc/extractor/periscope.py b/yt_dlp/extractor/periscope.py
index b15906390..b15906390 100644
--- a/youtube_dlc/extractor/periscope.py
+++ b/yt_dlp/extractor/periscope.py
diff --git a/youtube_dlc/extractor/philharmoniedeparis.py b/yt_dlp/extractor/philharmoniedeparis.py
index 03da64b11..03da64b11 100644
--- a/youtube_dlc/extractor/philharmoniedeparis.py
+++ b/yt_dlp/extractor/philharmoniedeparis.py
diff --git a/youtube_dlc/extractor/phoenix.py b/yt_dlp/extractor/phoenix.py
index 8d52ad3b4..8d52ad3b4 100644
--- a/youtube_dlc/extractor/phoenix.py
+++ b/yt_dlp/extractor/phoenix.py
diff --git a/youtube_dlc/extractor/photobucket.py b/yt_dlp/extractor/photobucket.py
index 6c8bbe1d9..6c8bbe1d9 100644
--- a/youtube_dlc/extractor/photobucket.py
+++ b/yt_dlp/extractor/photobucket.py
diff --git a/youtube_dlc/extractor/picarto.py b/yt_dlp/extractor/picarto.py
index 1abda865d..1abda865d 100644
--- a/youtube_dlc/extractor/picarto.py
+++ b/yt_dlp/extractor/picarto.py
diff --git a/youtube_dlc/extractor/piksel.py b/yt_dlp/extractor/piksel.py
index ecf56ff8f..ecf56ff8f 100644
--- a/youtube_dlc/extractor/piksel.py
+++ b/yt_dlp/extractor/piksel.py
diff --git a/youtube_dlc/extractor/pinkbike.py b/yt_dlp/extractor/pinkbike.py
index 9f3501f77..9f3501f77 100644
--- a/youtube_dlc/extractor/pinkbike.py
+++ b/yt_dlp/extractor/pinkbike.py
diff --git a/youtube_dlc/extractor/pinterest.py b/yt_dlp/extractor/pinterest.py
index 15c11a755..15c11a755 100644
--- a/youtube_dlc/extractor/pinterest.py
+++ b/yt_dlp/extractor/pinterest.py
diff --git a/youtube_dlc/extractor/pladform.py b/yt_dlp/extractor/pladform.py
index e86c65396..e86c65396 100644
--- a/youtube_dlc/extractor/pladform.py
+++ b/yt_dlp/extractor/pladform.py
diff --git a/youtube_dlc/extractor/platzi.py b/yt_dlp/extractor/platzi.py
index 23c8256b5..23c8256b5 100644
--- a/youtube_dlc/extractor/platzi.py
+++ b/yt_dlp/extractor/platzi.py
diff --git a/youtube_dlc/extractor/playfm.py b/yt_dlp/extractor/playfm.py
index e766ccca3..e766ccca3 100644
--- a/youtube_dlc/extractor/playfm.py
+++ b/yt_dlp/extractor/playfm.py
diff --git a/youtube_dlc/extractor/playplustv.py b/yt_dlp/extractor/playplustv.py
index 1e30ab23a..1e30ab23a 100644
--- a/youtube_dlc/extractor/playplustv.py
+++ b/yt_dlp/extractor/playplustv.py
diff --git a/youtube_dlc/extractor/plays.py b/yt_dlp/extractor/plays.py
index ddfc6f148..ddfc6f148 100644
--- a/youtube_dlc/extractor/plays.py
+++ b/yt_dlp/extractor/plays.py
diff --git a/youtube_dlc/extractor/playtvak.py b/yt_dlp/extractor/playtvak.py
index 84e92dda4..84e92dda4 100644
--- a/youtube_dlc/extractor/playtvak.py
+++ b/yt_dlp/extractor/playtvak.py
diff --git a/youtube_dlc/extractor/playvid.py b/yt_dlp/extractor/playvid.py
index 4aef186ea..4aef186ea 100644
--- a/youtube_dlc/extractor/playvid.py
+++ b/yt_dlp/extractor/playvid.py
diff --git a/youtube_dlc/extractor/playwire.py b/yt_dlp/extractor/playwire.py
index 4d96a10a7..4d96a10a7 100644
--- a/youtube_dlc/extractor/playwire.py
+++ b/yt_dlp/extractor/playwire.py
diff --git a/youtube_dlc/extractor/pluralsight.py b/yt_dlp/extractor/pluralsight.py
index abd08bc28..abd08bc28 100644
--- a/youtube_dlc/extractor/pluralsight.py
+++ b/yt_dlp/extractor/pluralsight.py
diff --git a/youtube_dlc/extractor/podomatic.py b/yt_dlp/extractor/podomatic.py
index e782e3f1f..e782e3f1f 100644
--- a/youtube_dlc/extractor/podomatic.py
+++ b/yt_dlp/extractor/podomatic.py
diff --git a/youtube_dlc/extractor/pokemon.py b/yt_dlp/extractor/pokemon.py
index ec8148407..ec8148407 100644
--- a/youtube_dlc/extractor/pokemon.py
+++ b/yt_dlp/extractor/pokemon.py
diff --git a/youtube_dlc/extractor/polskieradio.py b/yt_dlp/extractor/polskieradio.py
index 978d6f813..978d6f813 100644
--- a/youtube_dlc/extractor/polskieradio.py
+++ b/yt_dlp/extractor/polskieradio.py
diff --git a/youtube_dlc/extractor/popcorntimes.py b/yt_dlp/extractor/popcorntimes.py
index 7bf7f9858..7bf7f9858 100644
--- a/youtube_dlc/extractor/popcorntimes.py
+++ b/yt_dlp/extractor/popcorntimes.py
diff --git a/youtube_dlc/extractor/popcorntv.py b/yt_dlp/extractor/popcorntv.py
index 9f834fb6c..9f834fb6c 100644
--- a/youtube_dlc/extractor/popcorntv.py
+++ b/yt_dlp/extractor/popcorntv.py
diff --git a/youtube_dlc/extractor/porn91.py b/yt_dlp/extractor/porn91.py
index 20eac647a..20eac647a 100644
--- a/youtube_dlc/extractor/porn91.py
+++ b/yt_dlp/extractor/porn91.py
diff --git a/youtube_dlc/extractor/porncom.py b/yt_dlp/extractor/porncom.py
index 5726cab3a..5726cab3a 100644
--- a/youtube_dlc/extractor/porncom.py
+++ b/yt_dlp/extractor/porncom.py
diff --git a/youtube_dlc/extractor/pornhd.py b/yt_dlp/extractor/pornhd.py
index c6052ac9f..c6052ac9f 100644
--- a/youtube_dlc/extractor/pornhd.py
+++ b/yt_dlp/extractor/pornhd.py
diff --git a/youtube_dlc/extractor/pornhub.py b/yt_dlp/extractor/pornhub.py
index b7631e4e1..b7631e4e1 100644
--- a/youtube_dlc/extractor/pornhub.py
+++ b/yt_dlp/extractor/pornhub.py
diff --git a/youtube_dlc/extractor/pornotube.py b/yt_dlp/extractor/pornotube.py
index 1b5b9a320..1b5b9a320 100644
--- a/youtube_dlc/extractor/pornotube.py
+++ b/yt_dlp/extractor/pornotube.py
diff --git a/youtube_dlc/extractor/pornovoisines.py b/yt_dlp/extractor/pornovoisines.py
index b6b71069d..b6b71069d 100644
--- a/youtube_dlc/extractor/pornovoisines.py
+++ b/yt_dlp/extractor/pornovoisines.py
diff --git a/youtube_dlc/extractor/pornoxo.py b/yt_dlp/extractor/pornoxo.py
index 2831368b6..2831368b6 100644
--- a/youtube_dlc/extractor/pornoxo.py
+++ b/yt_dlp/extractor/pornoxo.py
diff --git a/youtube_dlc/extractor/presstv.py b/yt_dlp/extractor/presstv.py
index b5c279203..b5c279203 100644
--- a/youtube_dlc/extractor/presstv.py
+++ b/yt_dlp/extractor/presstv.py
diff --git a/youtube_dlc/extractor/prosiebensat1.py b/yt_dlp/extractor/prosiebensat1.py
index 307ab81e9..307ab81e9 100644
--- a/youtube_dlc/extractor/prosiebensat1.py
+++ b/yt_dlp/extractor/prosiebensat1.py
diff --git a/youtube_dlc/extractor/puhutv.py b/yt_dlp/extractor/puhutv.py
index ca71665e0..ca71665e0 100644
--- a/youtube_dlc/extractor/puhutv.py
+++ b/yt_dlp/extractor/puhutv.py
diff --git a/youtube_dlc/extractor/puls4.py b/yt_dlp/extractor/puls4.py
index 80091b85f..80091b85f 100644
--- a/youtube_dlc/extractor/puls4.py
+++ b/yt_dlp/extractor/puls4.py
diff --git a/youtube_dlc/extractor/pyvideo.py b/yt_dlp/extractor/pyvideo.py
index b8ac93a62..b8ac93a62 100644
--- a/youtube_dlc/extractor/pyvideo.py
+++ b/yt_dlp/extractor/pyvideo.py
diff --git a/youtube_dlc/extractor/qqmusic.py b/yt_dlp/extractor/qqmusic.py
index 0106d166f..0106d166f 100644
--- a/youtube_dlc/extractor/qqmusic.py
+++ b/yt_dlp/extractor/qqmusic.py
diff --git a/youtube_dlc/extractor/r7.py b/yt_dlp/extractor/r7.py
index e2202d603..e2202d603 100644
--- a/youtube_dlc/extractor/r7.py
+++ b/yt_dlp/extractor/r7.py
diff --git a/youtube_dlc/extractor/radiobremen.py b/yt_dlp/extractor/radiobremen.py
index 2c35f9845..2c35f9845 100644
--- a/youtube_dlc/extractor/radiobremen.py
+++ b/yt_dlp/extractor/radiobremen.py
diff --git a/youtube_dlc/extractor/radiocanada.py b/yt_dlp/extractor/radiocanada.py
index a28b1a24c..a28b1a24c 100644
--- a/youtube_dlc/extractor/radiocanada.py
+++ b/yt_dlp/extractor/radiocanada.py
diff --git a/youtube_dlc/extractor/radiode.py b/yt_dlp/extractor/radiode.py
index 2c06c8b1e..2c06c8b1e 100644
--- a/youtube_dlc/extractor/radiode.py
+++ b/yt_dlp/extractor/radiode.py
diff --git a/youtube_dlc/extractor/radiofrance.py b/yt_dlp/extractor/radiofrance.py
index 2b5fea945..2b5fea945 100644
--- a/youtube_dlc/extractor/radiofrance.py
+++ b/yt_dlp/extractor/radiofrance.py
diff --git a/youtube_dlc/extractor/radiojavan.py b/yt_dlp/extractor/radiojavan.py
index 3f74f0c01..3f74f0c01 100644
--- a/youtube_dlc/extractor/radiojavan.py
+++ b/yt_dlp/extractor/radiojavan.py
diff --git a/youtube_dlc/extractor/rai.py b/yt_dlp/extractor/rai.py
index c78580d95..c78580d95 100644
--- a/youtube_dlc/extractor/rai.py
+++ b/yt_dlp/extractor/rai.py
diff --git a/youtube_dlc/extractor/raywenderlich.py b/yt_dlp/extractor/raywenderlich.py
index 5411ece21..5411ece21 100644
--- a/youtube_dlc/extractor/raywenderlich.py
+++ b/yt_dlp/extractor/raywenderlich.py
diff --git a/youtube_dlc/extractor/rbmaradio.py b/yt_dlp/extractor/rbmaradio.py
index ae7413fb5..ae7413fb5 100644
--- a/youtube_dlc/extractor/rbmaradio.py
+++ b/yt_dlp/extractor/rbmaradio.py
diff --git a/youtube_dlc/extractor/rcs.py b/yt_dlp/extractor/rcs.py
index 830182c6d..830182c6d 100644
--- a/youtube_dlc/extractor/rcs.py
+++ b/yt_dlp/extractor/rcs.py
diff --git a/youtube_dlc/extractor/rds.py b/yt_dlp/extractor/rds.py
index 8c016a77d..8c016a77d 100644
--- a/youtube_dlc/extractor/rds.py
+++ b/yt_dlp/extractor/rds.py
diff --git a/youtube_dlc/extractor/redbulltv.py b/yt_dlp/extractor/redbulltv.py
index 3aae79f5d..3aae79f5d 100644
--- a/youtube_dlc/extractor/redbulltv.py
+++ b/yt_dlp/extractor/redbulltv.py
diff --git a/youtube_dlc/extractor/reddit.py b/yt_dlp/extractor/reddit.py
index 222fa0172..222fa0172 100644
--- a/youtube_dlc/extractor/reddit.py
+++ b/yt_dlp/extractor/reddit.py
diff --git a/youtube_dlc/extractor/redtube.py b/yt_dlp/extractor/redtube.py
index a1ca791ca..a1ca791ca 100644
--- a/youtube_dlc/extractor/redtube.py
+++ b/yt_dlp/extractor/redtube.py
diff --git a/youtube_dlc/extractor/regiotv.py b/yt_dlp/extractor/regiotv.py
index e250a52f0..e250a52f0 100644
--- a/youtube_dlc/extractor/regiotv.py
+++ b/yt_dlp/extractor/regiotv.py
diff --git a/youtube_dlc/extractor/rentv.py b/yt_dlp/extractor/rentv.py
index 7c8909d95..7c8909d95 100644
--- a/youtube_dlc/extractor/rentv.py
+++ b/yt_dlp/extractor/rentv.py
diff --git a/youtube_dlc/extractor/restudy.py b/yt_dlp/extractor/restudy.py
index d47fb45ca..d47fb45ca 100644
--- a/youtube_dlc/extractor/restudy.py
+++ b/yt_dlp/extractor/restudy.py
diff --git a/youtube_dlc/extractor/reuters.py b/yt_dlp/extractor/reuters.py
index 9dc482d21..9dc482d21 100644
--- a/youtube_dlc/extractor/reuters.py
+++ b/yt_dlp/extractor/reuters.py
diff --git a/youtube_dlc/extractor/reverbnation.py b/yt_dlp/extractor/reverbnation.py
index 4cb99c244..4cb99c244 100644
--- a/youtube_dlc/extractor/reverbnation.py
+++ b/yt_dlp/extractor/reverbnation.py
diff --git a/youtube_dlc/extractor/rice.py b/yt_dlp/extractor/rice.py
index f855719ac..f855719ac 100644
--- a/youtube_dlc/extractor/rice.py
+++ b/yt_dlp/extractor/rice.py
diff --git a/youtube_dlc/extractor/rmcdecouverte.py b/yt_dlp/extractor/rmcdecouverte.py
index c3623edcc..c3623edcc 100644
--- a/youtube_dlc/extractor/rmcdecouverte.py
+++ b/yt_dlp/extractor/rmcdecouverte.py
diff --git a/youtube_dlc/extractor/ro220.py b/yt_dlp/extractor/ro220.py
index 69934ef2b..69934ef2b 100644
--- a/youtube_dlc/extractor/ro220.py
+++ b/yt_dlp/extractor/ro220.py
diff --git a/youtube_dlc/extractor/rockstargames.py b/yt_dlp/extractor/rockstargames.py
index cd6904bc9..cd6904bc9 100644
--- a/youtube_dlc/extractor/rockstargames.py
+++ b/yt_dlp/extractor/rockstargames.py
diff --git a/youtube_dlc/extractor/roosterteeth.py b/yt_dlp/extractor/roosterteeth.py
index 0724cef26..0724cef26 100644
--- a/youtube_dlc/extractor/roosterteeth.py
+++ b/yt_dlp/extractor/roosterteeth.py
diff --git a/youtube_dlc/extractor/rottentomatoes.py b/yt_dlp/extractor/rottentomatoes.py
index 14c8e8236..14c8e8236 100644
--- a/youtube_dlc/extractor/rottentomatoes.py
+++ b/yt_dlp/extractor/rottentomatoes.py
diff --git a/youtube_dlc/extractor/roxwel.py b/yt_dlp/extractor/roxwel.py
index 65284643b..65284643b 100644
--- a/youtube_dlc/extractor/roxwel.py
+++ b/yt_dlp/extractor/roxwel.py
diff --git a/youtube_dlc/extractor/rozhlas.py b/yt_dlp/extractor/rozhlas.py
index fccf69401..fccf69401 100644
--- a/youtube_dlc/extractor/rozhlas.py
+++ b/yt_dlp/extractor/rozhlas.py
diff --git a/youtube_dlc/extractor/rtbf.py b/yt_dlp/extractor/rtbf.py
index 2bb0acd5a..2bb0acd5a 100644
--- a/youtube_dlc/extractor/rtbf.py
+++ b/yt_dlp/extractor/rtbf.py
diff --git a/youtube_dlc/extractor/rte.py b/yt_dlp/extractor/rte.py
index 1fbc72915..1fbc72915 100644
--- a/youtube_dlc/extractor/rte.py
+++ b/yt_dlp/extractor/rte.py
diff --git a/youtube_dlc/extractor/rtl2.py b/yt_dlp/extractor/rtl2.py
index d7baa3aa5..d7baa3aa5 100644
--- a/youtube_dlc/extractor/rtl2.py
+++ b/yt_dlp/extractor/rtl2.py
diff --git a/youtube_dlc/extractor/rtlnl.py b/yt_dlp/extractor/rtlnl.py
index 9eaa06f25..9eaa06f25 100644
--- a/youtube_dlc/extractor/rtlnl.py
+++ b/yt_dlp/extractor/rtlnl.py
diff --git a/youtube_dlc/extractor/rtp.py b/yt_dlp/extractor/rtp.py
index f78e90e97..f78e90e97 100644
--- a/youtube_dlc/extractor/rtp.py
+++ b/yt_dlp/extractor/rtp.py
diff --git a/youtube_dlc/extractor/rts.py b/yt_dlp/extractor/rts.py
index 48f17b828..48f17b828 100644
--- a/youtube_dlc/extractor/rts.py
+++ b/yt_dlp/extractor/rts.py
diff --git a/youtube_dlc/extractor/rtve.py b/yt_dlp/extractor/rtve.py
index ce9db0629..ce9db0629 100644
--- a/youtube_dlc/extractor/rtve.py
+++ b/yt_dlp/extractor/rtve.py
diff --git a/youtube_dlc/extractor/rtvnh.py b/yt_dlp/extractor/rtvnh.py
index 6a00f7007..6a00f7007 100644
--- a/youtube_dlc/extractor/rtvnh.py
+++ b/yt_dlp/extractor/rtvnh.py
diff --git a/youtube_dlc/extractor/rtvs.py b/yt_dlp/extractor/rtvs.py
index 6573b260d..6573b260d 100644
--- a/youtube_dlc/extractor/rtvs.py
+++ b/yt_dlp/extractor/rtvs.py
diff --git a/youtube_dlc/extractor/ruhd.py b/yt_dlp/extractor/ruhd.py
index 3c8053a26..3c8053a26 100644
--- a/youtube_dlc/extractor/ruhd.py
+++ b/yt_dlp/extractor/ruhd.py
diff --git a/youtube_dlc/extractor/rumble.py b/yt_dlp/extractor/rumble.py
index b526de76b..b526de76b 100644
--- a/youtube_dlc/extractor/rumble.py
+++ b/yt_dlp/extractor/rumble.py
diff --git a/youtube_dlc/extractor/rutube.py b/yt_dlp/extractor/rutube.py
index 8f54d5675..8f54d5675 100644
--- a/youtube_dlc/extractor/rutube.py
+++ b/yt_dlp/extractor/rutube.py
diff --git a/youtube_dlc/extractor/rutv.py b/yt_dlp/extractor/rutv.py
index e66036c79..e66036c79 100644
--- a/youtube_dlc/extractor/rutv.py
+++ b/yt_dlp/extractor/rutv.py
diff --git a/youtube_dlc/extractor/ruutu.py b/yt_dlp/extractor/ruutu.py
index f9f30e3dd..f9f30e3dd 100644
--- a/youtube_dlc/extractor/ruutu.py
+++ b/yt_dlp/extractor/ruutu.py
diff --git a/youtube_dlc/extractor/ruv.py b/yt_dlp/extractor/ruv.py
index 8f3cc4095..8f3cc4095 100644
--- a/youtube_dlc/extractor/ruv.py
+++ b/yt_dlp/extractor/ruv.py
diff --git a/youtube_dlc/extractor/safari.py b/yt_dlp/extractor/safari.py
index 2cc665122..2cc665122 100644
--- a/youtube_dlc/extractor/safari.py
+++ b/yt_dlp/extractor/safari.py
diff --git a/youtube_dlc/extractor/sapo.py b/yt_dlp/extractor/sapo.py
index 49a9b313a..49a9b313a 100644
--- a/youtube_dlc/extractor/sapo.py
+++ b/yt_dlp/extractor/sapo.py
diff --git a/youtube_dlc/extractor/savefrom.py b/yt_dlp/extractor/savefrom.py
index 21e44b69a..21e44b69a 100644
--- a/youtube_dlc/extractor/savefrom.py
+++ b/yt_dlp/extractor/savefrom.py
diff --git a/youtube_dlc/extractor/sbs.py b/yt_dlp/extractor/sbs.py
index f722528cd..f722528cd 100644
--- a/youtube_dlc/extractor/sbs.py
+++ b/yt_dlp/extractor/sbs.py
diff --git a/youtube_dlc/extractor/screencast.py b/yt_dlp/extractor/screencast.py
index 69a0d01f3..69a0d01f3 100644
--- a/youtube_dlc/extractor/screencast.py
+++ b/yt_dlp/extractor/screencast.py
diff --git a/youtube_dlc/extractor/screencastomatic.py b/yt_dlp/extractor/screencastomatic.py
index b5e76c9af..b5e76c9af 100644
--- a/youtube_dlc/extractor/screencastomatic.py
+++ b/yt_dlp/extractor/screencastomatic.py
diff --git a/youtube_dlc/extractor/scrippsnetworks.py b/yt_dlp/extractor/scrippsnetworks.py
index b40b4c4af..b40b4c4af 100644
--- a/youtube_dlc/extractor/scrippsnetworks.py
+++ b/yt_dlp/extractor/scrippsnetworks.py
diff --git a/youtube_dlc/extractor/scte.py b/yt_dlp/extractor/scte.py
index ca1de63b6..ca1de63b6 100644
--- a/youtube_dlc/extractor/scte.py
+++ b/yt_dlp/extractor/scte.py
diff --git a/youtube_dlc/extractor/seeker.py b/yt_dlp/extractor/seeker.py
index 7872dc80d..7872dc80d 100644
--- a/youtube_dlc/extractor/seeker.py
+++ b/yt_dlp/extractor/seeker.py
diff --git a/youtube_dlc/extractor/senateisvp.py b/yt_dlp/extractor/senateisvp.py
index db5ef8b57..db5ef8b57 100644
--- a/youtube_dlc/extractor/senateisvp.py
+++ b/yt_dlp/extractor/senateisvp.py
diff --git a/youtube_dlc/extractor/sendtonews.py b/yt_dlp/extractor/sendtonews.py
index bc38a0f1e..bc38a0f1e 100644
--- a/youtube_dlc/extractor/sendtonews.py
+++ b/yt_dlp/extractor/sendtonews.py
diff --git a/youtube_dlc/extractor/servus.py b/yt_dlp/extractor/servus.py
index 1610ddc2c..1610ddc2c 100644
--- a/youtube_dlc/extractor/servus.py
+++ b/yt_dlp/extractor/servus.py
diff --git a/youtube_dlc/extractor/sevenplus.py b/yt_dlp/extractor/sevenplus.py
index 240afc18f..240afc18f 100644
--- a/youtube_dlc/extractor/sevenplus.py
+++ b/yt_dlp/extractor/sevenplus.py
diff --git a/youtube_dlc/extractor/sexu.py b/yt_dlp/extractor/sexu.py
index 3df51520b..3df51520b 100644
--- a/youtube_dlc/extractor/sexu.py
+++ b/yt_dlp/extractor/sexu.py
diff --git a/youtube_dlc/extractor/seznamzpravy.py b/yt_dlp/extractor/seznamzpravy.py
index 7a1c7e38b..7a1c7e38b 100644
--- a/youtube_dlc/extractor/seznamzpravy.py
+++ b/yt_dlp/extractor/seznamzpravy.py
diff --git a/youtube_dlc/extractor/shahid.py b/yt_dlp/extractor/shahid.py
index c1d6aba2c..c1d6aba2c 100644
--- a/youtube_dlc/extractor/shahid.py
+++ b/yt_dlp/extractor/shahid.py
diff --git a/youtube_dlc/extractor/shared.py b/yt_dlp/extractor/shared.py
index 02295d1a4..02295d1a4 100644
--- a/youtube_dlc/extractor/shared.py
+++ b/yt_dlp/extractor/shared.py
diff --git a/youtube_dlc/extractor/showroomlive.py b/yt_dlp/extractor/showroomlive.py
index efd9d561f..efd9d561f 100644
--- a/youtube_dlc/extractor/showroomlive.py
+++ b/yt_dlp/extractor/showroomlive.py
diff --git a/youtube_dlc/extractor/simplecast.py b/yt_dlp/extractor/simplecast.py
index 2d0b3c06d..2d0b3c06d 100644
--- a/youtube_dlc/extractor/simplecast.py
+++ b/yt_dlp/extractor/simplecast.py
diff --git a/youtube_dlc/extractor/sina.py b/yt_dlp/extractor/sina.py
index 60f2dd053..60f2dd053 100644
--- a/youtube_dlc/extractor/sina.py
+++ b/yt_dlp/extractor/sina.py
diff --git a/youtube_dlc/extractor/sixplay.py b/yt_dlp/extractor/sixplay.py
index 7ec66ecf3..7ec66ecf3 100644
--- a/youtube_dlc/extractor/sixplay.py
+++ b/yt_dlp/extractor/sixplay.py
diff --git a/youtube_dlc/extractor/sky.py b/yt_dlp/extractor/sky.py
index ff2c977a0..ff2c977a0 100644
--- a/youtube_dlc/extractor/sky.py
+++ b/yt_dlp/extractor/sky.py
diff --git a/youtube_dlc/extractor/skyit.py b/yt_dlp/extractor/skyit.py
index 14a4d8d4c..14a4d8d4c 100644
--- a/youtube_dlc/extractor/skyit.py
+++ b/yt_dlp/extractor/skyit.py
diff --git a/youtube_dlc/extractor/skylinewebcams.py b/yt_dlp/extractor/skylinewebcams.py
index b7f8ac736..b7f8ac736 100644
--- a/youtube_dlc/extractor/skylinewebcams.py
+++ b/yt_dlp/extractor/skylinewebcams.py
diff --git a/youtube_dlc/extractor/skynewsarabia.py b/yt_dlp/extractor/skynewsarabia.py
index fffc9aa22..fffc9aa22 100644
--- a/youtube_dlc/extractor/skynewsarabia.py
+++ b/yt_dlp/extractor/skynewsarabia.py
diff --git a/youtube_dlc/extractor/slideshare.py b/yt_dlp/extractor/slideshare.py
index e89ebebe7..e89ebebe7 100644
--- a/youtube_dlc/extractor/slideshare.py
+++ b/yt_dlp/extractor/slideshare.py
diff --git a/youtube_dlc/extractor/slideslive.py b/yt_dlp/extractor/slideslive.py
index 9409a0100..9409a0100 100644
--- a/youtube_dlc/extractor/slideslive.py
+++ b/yt_dlp/extractor/slideslive.py
diff --git a/youtube_dlc/extractor/slutload.py b/yt_dlp/extractor/slutload.py
index 661f9e59d..661f9e59d 100644
--- a/youtube_dlc/extractor/slutload.py
+++ b/yt_dlp/extractor/slutload.py
diff --git a/youtube_dlc/extractor/snotr.py b/yt_dlp/extractor/snotr.py
index f77354748..f77354748 100644
--- a/youtube_dlc/extractor/snotr.py
+++ b/yt_dlp/extractor/snotr.py
diff --git a/youtube_dlc/extractor/sohu.py b/yt_dlp/extractor/sohu.py
index 76b3cc6b6..a62ed84f1 100644
--- a/youtube_dlc/extractor/sohu.py
+++ b/yt_dlp/extractor/sohu.py
@@ -77,7 +77,7 @@ class SohuIE(InfoExtractor):
         'info_dict': {
             'id': '78932792',
             'ext': 'mp4',
-            'title': 'youtube-dlc testing video',
+            'title': 'youtube-dl testing video',
         },
         'params': {
             'skip_download': True
diff --git a/youtube_dlc/extractor/sonyliv.py b/yt_dlp/extractor/sonyliv.py
index f0c17b256..f0c17b256 100644
--- a/youtube_dlc/extractor/sonyliv.py
+++ b/yt_dlp/extractor/sonyliv.py
diff --git a/youtube_dlc/extractor/soundcloud.py b/yt_dlp/extractor/soundcloud.py
index 72562379b..d72a02dca 100644
--- a/youtube_dlc/extractor/soundcloud.py
+++ b/yt_dlp/extractor/soundcloud.py
@@ -122,7 +122,7 @@ class SoundcloudIE(InfoExtractor):
         },
         # private link
         {
-            'url': 'https://soundcloud.com/jaimemf/youtube-dlc-test-video-a-y-baw/s-8Pjrp',
+            'url': 'https://soundcloud.com/jaimemf/youtube-dl-test-video-a-y-baw/s-8Pjrp',
             'md5': 'aa0dd32bfea9b0c5ef4f02aacd080604',
             'info_dict': {
                 'id': '123998367',
diff --git a/youtube_dlc/extractor/soundgasm.py b/yt_dlp/extractor/soundgasm.py
index 3d78a9d76..3d78a9d76 100644
--- a/youtube_dlc/extractor/soundgasm.py
+++ b/yt_dlp/extractor/soundgasm.py
diff --git a/youtube_dlc/extractor/southpark.py b/yt_dlp/extractor/southpark.py
index 95e6d2890..95e6d2890 100644
--- a/youtube_dlc/extractor/southpark.py
+++ b/yt_dlp/extractor/southpark.py
diff --git a/youtube_dlc/extractor/spankbang.py b/yt_dlp/extractor/spankbang.py
index f14bd6d71..f14bd6d71 100644
--- a/youtube_dlc/extractor/spankbang.py
+++ b/yt_dlp/extractor/spankbang.py
diff --git a/youtube_dlc/extractor/spankwire.py b/yt_dlp/extractor/spankwire.py
index e97c1d23e..e97c1d23e 100644
--- a/youtube_dlc/extractor/spankwire.py
+++ b/yt_dlp/extractor/spankwire.py
diff --git a/youtube_dlc/extractor/spiegel.py b/yt_dlp/extractor/spiegel.py
index 2da32b9b2..2da32b9b2 100644
--- a/youtube_dlc/extractor/spiegel.py
+++ b/yt_dlp/extractor/spiegel.py
diff --git a/youtube_dlc/extractor/spiegeltv.py b/yt_dlp/extractor/spiegeltv.py
index 6ccf4c342..6ccf4c342 100644
--- a/youtube_dlc/extractor/spiegeltv.py
+++ b/yt_dlp/extractor/spiegeltv.py
diff --git a/youtube_dlc/extractor/spike.py b/yt_dlp/extractor/spike.py
index 5805f3d44..5805f3d44 100644
--- a/youtube_dlc/extractor/spike.py
+++ b/yt_dlp/extractor/spike.py
diff --git a/youtube_dlc/extractor/sport5.py b/yt_dlp/extractor/sport5.py
index a417b5a4e..a417b5a4e 100644
--- a/youtube_dlc/extractor/sport5.py
+++ b/yt_dlp/extractor/sport5.py
diff --git a/youtube_dlc/extractor/sportbox.py b/yt_dlp/extractor/sportbox.py
index b9017fd2a..b9017fd2a 100644
--- a/youtube_dlc/extractor/sportbox.py
+++ b/yt_dlp/extractor/sportbox.py
diff --git a/youtube_dlc/extractor/sportdeutschland.py b/yt_dlp/extractor/sportdeutschland.py
index 378fc7568..378fc7568 100644
--- a/youtube_dlc/extractor/sportdeutschland.py
+++ b/yt_dlp/extractor/sportdeutschland.py
diff --git a/youtube_dlc/extractor/spotify.py b/yt_dlp/extractor/spotify.py
index 826f98cff..826f98cff 100644
--- a/youtube_dlc/extractor/spotify.py
+++ b/yt_dlp/extractor/spotify.py
diff --git a/youtube_dlc/extractor/spreaker.py b/yt_dlp/extractor/spreaker.py
index 6c7e40ae4..6c7e40ae4 100644
--- a/youtube_dlc/extractor/spreaker.py
+++ b/yt_dlp/extractor/spreaker.py
diff --git a/youtube_dlc/extractor/springboardplatform.py b/yt_dlp/extractor/springboardplatform.py
index 07d99b579..07d99b579 100644
--- a/youtube_dlc/extractor/springboardplatform.py
+++ b/yt_dlp/extractor/springboardplatform.py
diff --git a/youtube_dlc/extractor/sprout.py b/yt_dlp/extractor/sprout.py
index e243732f2..e243732f2 100644
--- a/youtube_dlc/extractor/sprout.py
+++ b/yt_dlp/extractor/sprout.py
diff --git a/youtube_dlc/extractor/srgssr.py b/yt_dlp/extractor/srgssr.py
index 0f4c8189c..0f4c8189c 100644
--- a/youtube_dlc/extractor/srgssr.py
+++ b/yt_dlp/extractor/srgssr.py
diff --git a/youtube_dlc/extractor/srmediathek.py b/yt_dlp/extractor/srmediathek.py
index 359dadaa3..359dadaa3 100644
--- a/youtube_dlc/extractor/srmediathek.py
+++ b/yt_dlp/extractor/srmediathek.py
diff --git a/youtube_dlc/extractor/stanfordoc.py b/yt_dlp/extractor/stanfordoc.py
index ae3dd1380..ae3dd1380 100644
--- a/youtube_dlc/extractor/stanfordoc.py
+++ b/yt_dlp/extractor/stanfordoc.py
diff --git a/youtube_dlc/extractor/steam.py b/yt_dlp/extractor/steam.py
index a6a191ceb..a6a191ceb 100644
--- a/youtube_dlc/extractor/steam.py
+++ b/yt_dlp/extractor/steam.py
diff --git a/youtube_dlc/extractor/stitcher.py b/yt_dlp/extractor/stitcher.py
index b8b5711b1..b8b5711b1 100644
--- a/youtube_dlc/extractor/stitcher.py
+++ b/yt_dlp/extractor/stitcher.py
diff --git a/youtube_dlc/extractor/storyfire.py b/yt_dlp/extractor/storyfire.py
index 9c698626f..9c698626f 100644
--- a/youtube_dlc/extractor/storyfire.py
+++ b/yt_dlp/extractor/storyfire.py
diff --git a/youtube_dlc/extractor/streamable.py b/yt_dlp/extractor/streamable.py
index 34725274e..34725274e 100644
--- a/youtube_dlc/extractor/streamable.py
+++ b/yt_dlp/extractor/streamable.py
diff --git a/youtube_dlc/extractor/streamcloud.py b/yt_dlp/extractor/streamcloud.py
index 32eb2b92d..b97bb4374 100644
--- a/youtube_dlc/extractor/streamcloud.py
+++ b/yt_dlp/extractor/streamcloud.py
@@ -15,12 +15,12 @@ class StreamcloudIE(InfoExtractor):
     _VALID_URL = r'https?://streamcloud\.eu/(?P<id>[a-zA-Z0-9_-]+)(?:/(?P<fname>[^#?]*)\.html)?'
 
     _TESTS = [{
-        'url': 'http://streamcloud.eu/skp9j99s4bpz/youtube-dlc_test_video_____________-BaW_jenozKc.mp4.html',
+        'url': 'http://streamcloud.eu/skp9j99s4bpz/youtube-dl_test_video_____________-BaW_jenozKc.mp4.html',
         'md5': '6bea4c7fa5daaacc2a946b7146286686',
         'info_dict': {
             'id': 'skp9j99s4bpz',
             'ext': 'mp4',
-            'title': 'youtube-dlc test video  \'/\\ ä ↭',
+            'title': 'youtube-dl test video  \'/\\ ä ↭',
         },
         'skip': 'Only available from the EU'
     }, {
diff --git a/youtube_dlc/extractor/streamcz.py b/yt_dlp/extractor/streamcz.py
index 58e0b4c80..58e0b4c80 100644
--- a/youtube_dlc/extractor/streamcz.py
+++ b/yt_dlp/extractor/streamcz.py
diff --git a/youtube_dlc/extractor/streetvoice.py b/yt_dlp/extractor/streetvoice.py
index f21681ae7..f21681ae7 100644
--- a/youtube_dlc/extractor/streetvoice.py
+++ b/yt_dlp/extractor/streetvoice.py
diff --git a/youtube_dlc/extractor/stretchinternet.py b/yt_dlp/extractor/stretchinternet.py
index 4dbead2ba..4dbead2ba 100644
--- a/youtube_dlc/extractor/stretchinternet.py
+++ b/yt_dlp/extractor/stretchinternet.py
diff --git a/youtube_dlc/extractor/stv.py b/yt_dlp/extractor/stv.py
index 539220a94..539220a94 100644
--- a/youtube_dlc/extractor/stv.py
+++ b/yt_dlp/extractor/stv.py
diff --git a/youtube_dlc/extractor/sunporno.py b/yt_dlp/extractor/sunporno.py
index 68051169b..68051169b 100644
--- a/youtube_dlc/extractor/sunporno.py
+++ b/yt_dlp/extractor/sunporno.py
diff --git a/youtube_dlc/extractor/sverigesradio.py b/yt_dlp/extractor/sverigesradio.py
index aa0691f0d..aa0691f0d 100644
--- a/youtube_dlc/extractor/sverigesradio.py
+++ b/yt_dlp/extractor/sverigesradio.py
diff --git a/youtube_dlc/extractor/svt.py b/yt_dlp/extractor/svt.py
index 4acc29fce..4acc29fce 100644
--- a/youtube_dlc/extractor/svt.py
+++ b/yt_dlp/extractor/svt.py
diff --git a/youtube_dlc/extractor/swrmediathek.py b/yt_dlp/extractor/swrmediathek.py
index 0f615979e..0f615979e 100644
--- a/youtube_dlc/extractor/swrmediathek.py
+++ b/yt_dlp/extractor/swrmediathek.py
diff --git a/youtube_dlc/extractor/syfy.py b/yt_dlp/extractor/syfy.py
index def7e5a2c..def7e5a2c 100644
--- a/youtube_dlc/extractor/syfy.py
+++ b/yt_dlp/extractor/syfy.py
diff --git a/youtube_dlc/extractor/sztvhu.py b/yt_dlp/extractor/sztvhu.py
index cfad33146..cfad33146 100644
--- a/youtube_dlc/extractor/sztvhu.py
+++ b/yt_dlp/extractor/sztvhu.py
diff --git a/youtube_dlc/extractor/tagesschau.py b/yt_dlp/extractor/tagesschau.py
index 8ceab7e35..8ceab7e35 100644
--- a/youtube_dlc/extractor/tagesschau.py
+++ b/yt_dlp/extractor/tagesschau.py
diff --git a/youtube_dlc/extractor/tass.py b/yt_dlp/extractor/tass.py
index 6d336da78..6d336da78 100644
--- a/youtube_dlc/extractor/tass.py
+++ b/yt_dlp/extractor/tass.py
diff --git a/youtube_dlc/extractor/tastytrade.py b/yt_dlp/extractor/tastytrade.py
index 7fe96bd5f..7fe96bd5f 100644
--- a/youtube_dlc/extractor/tastytrade.py
+++ b/yt_dlp/extractor/tastytrade.py
diff --git a/youtube_dlc/extractor/tbs.py b/yt_dlp/extractor/tbs.py
index e8a7c65e0..e8a7c65e0 100644
--- a/youtube_dlc/extractor/tbs.py
+++ b/yt_dlp/extractor/tbs.py
diff --git a/youtube_dlc/extractor/tdslifeway.py b/yt_dlp/extractor/tdslifeway.py
index 101c6ee31..101c6ee31 100644
--- a/youtube_dlc/extractor/tdslifeway.py
+++ b/yt_dlp/extractor/tdslifeway.py
diff --git a/youtube_dlc/extractor/teachable.py b/yt_dlp/extractor/teachable.py
index 2394f86d4..2394f86d4 100644
--- a/youtube_dlc/extractor/teachable.py
+++ b/yt_dlp/extractor/teachable.py
diff --git a/youtube_dlc/extractor/teachertube.py b/yt_dlp/extractor/teachertube.py
index 1272078c5..1272078c5 100644
--- a/youtube_dlc/extractor/teachertube.py
+++ b/yt_dlp/extractor/teachertube.py
diff --git a/youtube_dlc/extractor/teachingchannel.py b/yt_dlp/extractor/teachingchannel.py
index 624cdb3ad..624cdb3ad 100644
--- a/youtube_dlc/extractor/teachingchannel.py
+++ b/yt_dlp/extractor/teachingchannel.py
diff --git a/youtube_dlc/extractor/teamcoco.py b/yt_dlp/extractor/teamcoco.py
index 5793b711f..5793b711f 100644
--- a/youtube_dlc/extractor/teamcoco.py
+++ b/yt_dlp/extractor/teamcoco.py
diff --git a/youtube_dlc/extractor/teamtreehouse.py b/yt_dlp/extractor/teamtreehouse.py
index d347e97ef..d347e97ef 100644
--- a/youtube_dlc/extractor/teamtreehouse.py
+++ b/yt_dlp/extractor/teamtreehouse.py
diff --git a/youtube_dlc/extractor/techtalks.py b/yt_dlp/extractor/techtalks.py
index a5b62c717..a5b62c717 100644
--- a/youtube_dlc/extractor/techtalks.py
+++ b/yt_dlp/extractor/techtalks.py
diff --git a/youtube_dlc/extractor/ted.py b/yt_dlp/extractor/ted.py
index 63e2455b2..63e2455b2 100644
--- a/youtube_dlc/extractor/ted.py
+++ b/yt_dlp/extractor/ted.py
diff --git a/youtube_dlc/extractor/tele13.py b/yt_dlp/extractor/tele13.py
index f8a27550e..f8a27550e 100644
--- a/youtube_dlc/extractor/tele13.py
+++ b/yt_dlp/extractor/tele13.py
diff --git a/youtube_dlc/extractor/tele5.py b/yt_dlp/extractor/tele5.py
index 3e1a7a9e6..3e1a7a9e6 100644
--- a/youtube_dlc/extractor/tele5.py
+++ b/yt_dlp/extractor/tele5.py
diff --git a/youtube_dlc/extractor/telebruxelles.py b/yt_dlp/extractor/telebruxelles.py
index a0353fe3a..a0353fe3a 100644
--- a/youtube_dlc/extractor/telebruxelles.py
+++ b/yt_dlp/extractor/telebruxelles.py
diff --git a/youtube_dlc/extractor/telecinco.py b/yt_dlp/extractor/telecinco.py
index eecd6a5c9..eecd6a5c9 100644
--- a/youtube_dlc/extractor/telecinco.py
+++ b/yt_dlp/extractor/telecinco.py
diff --git a/youtube_dlc/extractor/telegraaf.py b/yt_dlp/extractor/telegraaf.py
index 2dc020537..2dc020537 100644
--- a/youtube_dlc/extractor/telegraaf.py
+++ b/yt_dlp/extractor/telegraaf.py
diff --git a/youtube_dlc/extractor/telemb.py b/yt_dlp/extractor/telemb.py
index 44d5d220b..44d5d220b 100644
--- a/youtube_dlc/extractor/telemb.py
+++ b/yt_dlp/extractor/telemb.py
diff --git a/youtube_dlc/extractor/telequebec.py b/yt_dlp/extractor/telequebec.py
index 800d87b70..800d87b70 100644
--- a/youtube_dlc/extractor/telequebec.py
+++ b/yt_dlp/extractor/telequebec.py
diff --git a/youtube_dlc/extractor/teletask.py b/yt_dlp/extractor/teletask.py
index b9e2ef8ca..b9e2ef8ca 100644
--- a/youtube_dlc/extractor/teletask.py
+++ b/yt_dlp/extractor/teletask.py
diff --git a/youtube_dlc/extractor/telewebion.py b/yt_dlp/extractor/telewebion.py
index 1207b1a1b..1207b1a1b 100644
--- a/youtube_dlc/extractor/telewebion.py
+++ b/yt_dlp/extractor/telewebion.py
diff --git a/youtube_dlc/extractor/tennistv.py b/yt_dlp/extractor/tennistv.py
index 5e3eb8938..5e3eb8938 100644
--- a/youtube_dlc/extractor/tennistv.py
+++ b/yt_dlp/extractor/tennistv.py
diff --git a/youtube_dlc/extractor/tenplay.py b/yt_dlp/extractor/tenplay.py
index cd30d57f4..cd30d57f4 100644
--- a/youtube_dlc/extractor/tenplay.py
+++ b/yt_dlp/extractor/tenplay.py
diff --git a/youtube_dlc/extractor/testurl.py b/yt_dlp/extractor/testurl.py
index 84a14a0bd..84a14a0bd 100644
--- a/youtube_dlc/extractor/testurl.py
+++ b/yt_dlp/extractor/testurl.py
diff --git a/youtube_dlc/extractor/tf1.py b/yt_dlp/extractor/tf1.py
index 55e2a0721..55e2a0721 100644
--- a/youtube_dlc/extractor/tf1.py
+++ b/yt_dlp/extractor/tf1.py
diff --git a/youtube_dlc/extractor/tfo.py b/yt_dlp/extractor/tfo.py
index 0631cb7ab..0631cb7ab 100644
--- a/youtube_dlc/extractor/tfo.py
+++ b/yt_dlp/extractor/tfo.py
diff --git a/youtube_dlc/extractor/theintercept.py b/yt_dlp/extractor/theintercept.py
index f23b58713..f23b58713 100644
--- a/youtube_dlc/extractor/theintercept.py
+++ b/yt_dlp/extractor/theintercept.py
diff --git a/youtube_dlc/extractor/theplatform.py b/yt_dlp/extractor/theplatform.py
index adfe11e31..adfe11e31 100644
--- a/youtube_dlc/extractor/theplatform.py
+++ b/yt_dlp/extractor/theplatform.py
diff --git a/youtube_dlc/extractor/thescene.py b/yt_dlp/extractor/thescene.py
index cd642355c..cd642355c 100644
--- a/youtube_dlc/extractor/thescene.py
+++ b/yt_dlp/extractor/thescene.py
diff --git a/youtube_dlc/extractor/thestar.py b/yt_dlp/extractor/thestar.py
index c3f118894..c3f118894 100644
--- a/youtube_dlc/extractor/thestar.py
+++ b/yt_dlp/extractor/thestar.py
diff --git a/youtube_dlc/extractor/thesun.py b/yt_dlp/extractor/thesun.py
index 15d4a6932..15d4a6932 100644
--- a/youtube_dlc/extractor/thesun.py
+++ b/yt_dlp/extractor/thesun.py
diff --git a/youtube_dlc/extractor/theweatherchannel.py b/yt_dlp/extractor/theweatherchannel.py
index b2a8c3797..b2a8c3797 100644
--- a/youtube_dlc/extractor/theweatherchannel.py
+++ b/yt_dlp/extractor/theweatherchannel.py
diff --git a/youtube_dlc/extractor/thisamericanlife.py b/yt_dlp/extractor/thisamericanlife.py
index 91e45f2c3..91e45f2c3 100644
--- a/youtube_dlc/extractor/thisamericanlife.py
+++ b/yt_dlp/extractor/thisamericanlife.py
diff --git a/youtube_dlc/extractor/thisav.py b/yt_dlp/extractor/thisav.py
index dc3dd03c8..dc3dd03c8 100644
--- a/youtube_dlc/extractor/thisav.py
+++ b/yt_dlp/extractor/thisav.py
diff --git a/youtube_dlc/extractor/thisoldhouse.py b/yt_dlp/extractor/thisoldhouse.py
index a3d9b4017..a3d9b4017 100644
--- a/youtube_dlc/extractor/thisoldhouse.py
+++ b/yt_dlp/extractor/thisoldhouse.py
diff --git a/youtube_dlc/extractor/thisvid.py b/yt_dlp/extractor/thisvid.py
index f507e1b06..f507e1b06 100644
--- a/youtube_dlc/extractor/thisvid.py
+++ b/yt_dlp/extractor/thisvid.py
diff --git a/youtube_dlc/extractor/threeqsdn.py b/yt_dlp/extractor/threeqsdn.py
index 5eaa991eb..5eaa991eb 100644
--- a/youtube_dlc/extractor/threeqsdn.py
+++ b/yt_dlp/extractor/threeqsdn.py
diff --git a/youtube_dlc/extractor/tiktok.py b/yt_dlp/extractor/tiktok.py
index b205887a2..b205887a2 100644
--- a/youtube_dlc/extractor/tiktok.py
+++ b/yt_dlp/extractor/tiktok.py
diff --git a/youtube_dlc/extractor/tinypic.py b/yt_dlp/extractor/tinypic.py
index bc2def508..bc2def508 100644
--- a/youtube_dlc/extractor/tinypic.py
+++ b/yt_dlp/extractor/tinypic.py
diff --git a/youtube_dlc/extractor/tmz.py b/yt_dlp/extractor/tmz.py
index aee2273b8..aee2273b8 100644
--- a/youtube_dlc/extractor/tmz.py
+++ b/yt_dlp/extractor/tmz.py
diff --git a/youtube_dlc/extractor/tnaflix.py b/yt_dlp/extractor/tnaflix.py
index b3573c6e0..b3573c6e0 100644
--- a/youtube_dlc/extractor/tnaflix.py
+++ b/yt_dlp/extractor/tnaflix.py
diff --git a/youtube_dlc/extractor/toggle.py b/yt_dlp/extractor/toggle.py
index 1e2a2d819..1e2a2d819 100644
--- a/youtube_dlc/extractor/toggle.py
+++ b/yt_dlp/extractor/toggle.py
diff --git a/youtube_dlc/extractor/tonline.py b/yt_dlp/extractor/tonline.py
index cc11eae2a..cc11eae2a 100644
--- a/youtube_dlc/extractor/tonline.py
+++ b/yt_dlp/extractor/tonline.py
diff --git a/youtube_dlc/extractor/toongoggles.py b/yt_dlp/extractor/toongoggles.py
index b5ba1c01d..b5ba1c01d 100644
--- a/youtube_dlc/extractor/toongoggles.py
+++ b/yt_dlp/extractor/toongoggles.py
diff --git a/youtube_dlc/extractor/toutv.py b/yt_dlp/extractor/toutv.py
index aba87051a..aba87051a 100644
--- a/youtube_dlc/extractor/toutv.py
+++ b/yt_dlp/extractor/toutv.py
diff --git a/youtube_dlc/extractor/toypics.py b/yt_dlp/extractor/toypics.py
index f705a06c9..f705a06c9 100644
--- a/youtube_dlc/extractor/toypics.py
+++ b/yt_dlp/extractor/toypics.py
diff --git a/youtube_dlc/extractor/traileraddict.py b/yt_dlp/extractor/traileraddict.py
index 747370d12..747370d12 100644
--- a/youtube_dlc/extractor/traileraddict.py
+++ b/yt_dlp/extractor/traileraddict.py
diff --git a/youtube_dlc/extractor/trilulilu.py b/yt_dlp/extractor/trilulilu.py
index a800449e9..a800449e9 100644
--- a/youtube_dlc/extractor/trilulilu.py
+++ b/yt_dlp/extractor/trilulilu.py
diff --git a/youtube_dlc/extractor/trovo.py b/yt_dlp/extractor/trovo.py
index 43745213d..43745213d 100644
--- a/youtube_dlc/extractor/trovo.py
+++ b/yt_dlp/extractor/trovo.py
diff --git a/youtube_dlc/extractor/trovolive.py b/yt_dlp/extractor/trovolive.py
index 174edfc51..174edfc51 100644
--- a/youtube_dlc/extractor/trovolive.py
+++ b/yt_dlp/extractor/trovolive.py
diff --git a/youtube_dlc/extractor/trunews.py b/yt_dlp/extractor/trunews.py
index cca5b5ceb..cca5b5ceb 100644
--- a/youtube_dlc/extractor/trunews.py
+++ b/yt_dlp/extractor/trunews.py
diff --git a/youtube_dlc/extractor/trutv.py b/yt_dlp/extractor/trutv.py
index ce892c8c5..ce892c8c5 100644
--- a/youtube_dlc/extractor/trutv.py
+++ b/yt_dlp/extractor/trutv.py
diff --git a/youtube_dlc/extractor/tube8.py b/yt_dlp/extractor/tube8.py
index db93b0182..db93b0182 100644
--- a/youtube_dlc/extractor/tube8.py
+++ b/yt_dlp/extractor/tube8.py
diff --git a/youtube_dlc/extractor/tubitv.py b/yt_dlp/extractor/tubitv.py
index ebfb05c63..ebfb05c63 100644
--- a/youtube_dlc/extractor/tubitv.py
+++ b/yt_dlp/extractor/tubitv.py
diff --git a/youtube_dlc/extractor/tudou.py b/yt_dlp/extractor/tudou.py
index 7421378a8..7421378a8 100644
--- a/youtube_dlc/extractor/tudou.py
+++ b/yt_dlp/extractor/tudou.py
diff --git a/youtube_dlc/extractor/tumblr.py b/yt_dlp/extractor/tumblr.py
index ae584ad69..ae584ad69 100644
--- a/youtube_dlc/extractor/tumblr.py
+++ b/yt_dlp/extractor/tumblr.py
diff --git a/youtube_dlc/extractor/tunein.py b/yt_dlp/extractor/tunein.py
index c7a5f5a63..c7a5f5a63 100644
--- a/youtube_dlc/extractor/tunein.py
+++ b/yt_dlp/extractor/tunein.py
diff --git a/youtube_dlc/extractor/tunepk.py b/yt_dlp/extractor/tunepk.py
index 9d42651ce..9d42651ce 100644
--- a/youtube_dlc/extractor/tunepk.py
+++ b/yt_dlp/extractor/tunepk.py
diff --git a/youtube_dlc/extractor/turbo.py b/yt_dlp/extractor/turbo.py
index be3eaa5c2..be3eaa5c2 100644
--- a/youtube_dlc/extractor/turbo.py
+++ b/yt_dlp/extractor/turbo.py
diff --git a/youtube_dlc/extractor/turner.py b/yt_dlp/extractor/turner.py
index 81229a54b..81229a54b 100644
--- a/youtube_dlc/extractor/turner.py
+++ b/yt_dlp/extractor/turner.py
diff --git a/youtube_dlc/extractor/tv2.py b/yt_dlp/extractor/tv2.py
index 334b7d540..334b7d540 100644
--- a/youtube_dlc/extractor/tv2.py
+++ b/yt_dlp/extractor/tv2.py
diff --git a/youtube_dlc/extractor/tv2dk.py b/yt_dlp/extractor/tv2dk.py
index 8bda9348d..8bda9348d 100644
--- a/youtube_dlc/extractor/tv2dk.py
+++ b/yt_dlp/extractor/tv2dk.py
diff --git a/youtube_dlc/extractor/tv2hu.py b/yt_dlp/extractor/tv2hu.py
index 86017b757..86017b757 100644
--- a/youtube_dlc/extractor/tv2hu.py
+++ b/yt_dlp/extractor/tv2hu.py
diff --git a/youtube_dlc/extractor/tv4.py b/yt_dlp/extractor/tv4.py
index b73bab9a8..b73bab9a8 100644
--- a/youtube_dlc/extractor/tv4.py
+++ b/yt_dlp/extractor/tv4.py
diff --git a/youtube_dlc/extractor/tv5mondeplus.py b/yt_dlp/extractor/tv5mondeplus.py
index b7fe082b9..b7fe082b9 100644
--- a/youtube_dlc/extractor/tv5mondeplus.py
+++ b/yt_dlp/extractor/tv5mondeplus.py
diff --git a/youtube_dlc/extractor/tv5unis.py b/yt_dlp/extractor/tv5unis.py
index eabdc2271..eabdc2271 100644
--- a/youtube_dlc/extractor/tv5unis.py
+++ b/yt_dlp/extractor/tv5unis.py
diff --git a/youtube_dlc/extractor/tva.py b/yt_dlp/extractor/tva.py
index 52a4ddf32..52a4ddf32 100644
--- a/youtube_dlc/extractor/tva.py
+++ b/yt_dlp/extractor/tva.py
diff --git a/youtube_dlc/extractor/tvanouvelles.py b/yt_dlp/extractor/tvanouvelles.py
index 1086176a2..1086176a2 100644
--- a/youtube_dlc/extractor/tvanouvelles.py
+++ b/yt_dlp/extractor/tvanouvelles.py
diff --git a/youtube_dlc/extractor/tvc.py b/yt_dlp/extractor/tvc.py
index 008f64cc2..008f64cc2 100644
--- a/youtube_dlc/extractor/tvc.py
+++ b/yt_dlp/extractor/tvc.py
diff --git a/youtube_dlc/extractor/tver.py b/yt_dlp/extractor/tver.py
index 931d4d650..931d4d650 100644
--- a/youtube_dlc/extractor/tver.py
+++ b/yt_dlp/extractor/tver.py
diff --git a/youtube_dlc/extractor/tvigle.py b/yt_dlp/extractor/tvigle.py
index 180259aba..180259aba 100644
--- a/youtube_dlc/extractor/tvigle.py
+++ b/yt_dlp/extractor/tvigle.py
diff --git a/youtube_dlc/extractor/tvland.py b/yt_dlp/extractor/tvland.py
index 225b6b078..225b6b078 100644
--- a/youtube_dlc/extractor/tvland.py
+++ b/yt_dlp/extractor/tvland.py
diff --git a/youtube_dlc/extractor/tvn24.py b/yt_dlp/extractor/tvn24.py
index de0fb5063..de0fb5063 100644
--- a/youtube_dlc/extractor/tvn24.py
+++ b/yt_dlp/extractor/tvn24.py
diff --git a/youtube_dlc/extractor/tvnet.py b/yt_dlp/extractor/tvnet.py
index 4222ff9ee..4222ff9ee 100644
--- a/youtube_dlc/extractor/tvnet.py
+++ b/yt_dlp/extractor/tvnet.py
diff --git a/youtube_dlc/extractor/tvnoe.py b/yt_dlp/extractor/tvnoe.py
index 26a5aeae4..26a5aeae4 100644
--- a/youtube_dlc/extractor/tvnoe.py
+++ b/yt_dlp/extractor/tvnoe.py
diff --git a/youtube_dlc/extractor/tvnow.py b/yt_dlp/extractor/tvnow.py
index 9b90a2b26..9b90a2b26 100644
--- a/youtube_dlc/extractor/tvnow.py
+++ b/yt_dlp/extractor/tvnow.py
diff --git a/youtube_dlc/extractor/tvp.py b/yt_dlp/extractor/tvp.py
index accff75b5..accff75b5 100644
--- a/youtube_dlc/extractor/tvp.py
+++ b/yt_dlp/extractor/tvp.py
diff --git a/youtube_dlc/extractor/tvplay.py b/yt_dlp/extractor/tvplay.py
index 0d858c025..0d858c025 100644
--- a/youtube_dlc/extractor/tvplay.py
+++ b/yt_dlp/extractor/tvplay.py
diff --git a/youtube_dlc/extractor/tvplayer.py b/yt_dlp/extractor/tvplayer.py
index 8f8686a65..8f8686a65 100644
--- a/youtube_dlc/extractor/tvplayer.py
+++ b/yt_dlp/extractor/tvplayer.py
diff --git a/youtube_dlc/extractor/tweakers.py b/yt_dlp/extractor/tweakers.py
index 2b10d9bca..2b10d9bca 100644
--- a/youtube_dlc/extractor/tweakers.py
+++ b/yt_dlp/extractor/tweakers.py
diff --git a/youtube_dlc/extractor/twentyfourvideo.py b/yt_dlp/extractor/twentyfourvideo.py
index 74d14049b..74d14049b 100644
--- a/youtube_dlc/extractor/twentyfourvideo.py
+++ b/yt_dlp/extractor/twentyfourvideo.py
diff --git a/youtube_dlc/extractor/twentymin.py b/yt_dlp/extractor/twentymin.py
index a42977f39..a42977f39 100644
--- a/youtube_dlc/extractor/twentymin.py
+++ b/yt_dlp/extractor/twentymin.py
diff --git a/youtube_dlc/extractor/twentythreevideo.py b/yt_dlp/extractor/twentythreevideo.py
index dc5609192..dc5609192 100644
--- a/youtube_dlc/extractor/twentythreevideo.py
+++ b/yt_dlp/extractor/twentythreevideo.py
diff --git a/youtube_dlc/extractor/twitcasting.py b/yt_dlp/extractor/twitcasting.py
index 6596eef9f..6596eef9f 100644
--- a/youtube_dlc/extractor/twitcasting.py
+++ b/yt_dlp/extractor/twitcasting.py
diff --git a/youtube_dlc/extractor/twitch.py b/yt_dlp/extractor/twitch.py
index fc8cb7321..fc8cb7321 100644
--- a/youtube_dlc/extractor/twitch.py
+++ b/yt_dlp/extractor/twitch.py
diff --git a/youtube_dlc/extractor/twitter.py b/yt_dlp/extractor/twitter.py
index 8a2a77b71..8a2a77b71 100644
--- a/youtube_dlc/extractor/twitter.py
+++ b/yt_dlp/extractor/twitter.py
diff --git a/youtube_dlc/extractor/udemy.py b/yt_dlp/extractor/udemy.py
index 5b81aa365..25b28e98e 100644
--- a/youtube_dlc/extractor/udemy.py
+++ b/yt_dlp/extractor/udemy.py
@@ -143,7 +143,7 @@ class UdemyIE(InfoExtractor):
             raise ExtractorError(
                 'Udemy asks you to solve a CAPTCHA. Login with browser, '
                 'solve CAPTCHA, then export cookies and pass cookie file to '
-                'youtube-dlc with --cookies.', expected=True)
+                'yt-dlp with --cookies.', expected=True)
         return ret
 
     def _download_json(self, url_or_request, *args, **kwargs):
diff --git a/youtube_dlc/extractor/udn.py b/yt_dlp/extractor/udn.py
index 2c8e5c7b4..2c8e5c7b4 100644
--- a/youtube_dlc/extractor/udn.py
+++ b/yt_dlp/extractor/udn.py
diff --git a/youtube_dlc/extractor/ufctv.py b/yt_dlp/extractor/ufctv.py
index 3d74ba071..3d74ba071 100644
--- a/youtube_dlc/extractor/ufctv.py
+++ b/yt_dlp/extractor/ufctv.py
diff --git a/youtube_dlc/extractor/uktvplay.py b/yt_dlp/extractor/uktvplay.py
index f28fd514d..f28fd514d 100644
--- a/youtube_dlc/extractor/uktvplay.py
+++ b/yt_dlp/extractor/uktvplay.py
diff --git a/youtube_dlc/extractor/umg.py b/yt_dlp/extractor/umg.py
index 8c84f2009..8c84f2009 100644
--- a/youtube_dlc/extractor/umg.py
+++ b/yt_dlp/extractor/umg.py
diff --git a/youtube_dlc/extractor/unistra.py b/yt_dlp/extractor/unistra.py
index a724cdbef..a724cdbef 100644
--- a/youtube_dlc/extractor/unistra.py
+++ b/yt_dlp/extractor/unistra.py
diff --git a/youtube_dlc/extractor/unity.py b/yt_dlp/extractor/unity.py
index 73daacf29..73daacf29 100644
--- a/youtube_dlc/extractor/unity.py
+++ b/yt_dlp/extractor/unity.py
diff --git a/youtube_dlc/extractor/uol.py b/yt_dlp/extractor/uol.py
index 4a2a97fa4..4a2a97fa4 100644
--- a/youtube_dlc/extractor/uol.py
+++ b/yt_dlp/extractor/uol.py
diff --git a/youtube_dlc/extractor/uplynk.py b/yt_dlp/extractor/uplynk.py
index f06bf5b12..f06bf5b12 100644
--- a/youtube_dlc/extractor/uplynk.py
+++ b/yt_dlp/extractor/uplynk.py
diff --git a/youtube_dlc/extractor/urort.py b/yt_dlp/extractor/urort.py
index 020425fc7..020425fc7 100644
--- a/youtube_dlc/extractor/urort.py
+++ b/yt_dlp/extractor/urort.py
diff --git a/youtube_dlc/extractor/urplay.py b/yt_dlp/extractor/urplay.py
index e901be7d7..e901be7d7 100644
--- a/youtube_dlc/extractor/urplay.py
+++ b/yt_dlp/extractor/urplay.py
diff --git a/youtube_dlc/extractor/usanetwork.py b/yt_dlp/extractor/usanetwork.py
index d953e460b..d953e460b 100644
--- a/youtube_dlc/extractor/usanetwork.py
+++ b/yt_dlp/extractor/usanetwork.py
diff --git a/youtube_dlc/extractor/usatoday.py b/yt_dlp/extractor/usatoday.py
index b2103448d..b2103448d 100644
--- a/youtube_dlc/extractor/usatoday.py
+++ b/yt_dlp/extractor/usatoday.py
diff --git a/youtube_dlc/extractor/ustream.py b/yt_dlp/extractor/ustream.py
index 9e860aeb7..9e860aeb7 100644
--- a/youtube_dlc/extractor/ustream.py
+++ b/yt_dlp/extractor/ustream.py
diff --git a/youtube_dlc/extractor/ustudio.py b/yt_dlp/extractor/ustudio.py
index 56509beed..56509beed 100644
--- a/youtube_dlc/extractor/ustudio.py
+++ b/yt_dlp/extractor/ustudio.py
diff --git a/youtube_dlc/extractor/varzesh3.py b/yt_dlp/extractor/varzesh3.py
index f474ed73f..f474ed73f 100644
--- a/youtube_dlc/extractor/varzesh3.py
+++ b/yt_dlp/extractor/varzesh3.py
diff --git a/youtube_dlc/extractor/vbox7.py b/yt_dlp/extractor/vbox7.py
index 8152acefd..8152acefd 100644
--- a/youtube_dlc/extractor/vbox7.py
+++ b/yt_dlp/extractor/vbox7.py
diff --git a/youtube_dlc/extractor/veehd.py b/yt_dlp/extractor/veehd.py
index a6dc3c8d8..a6dc3c8d8 100644
--- a/youtube_dlc/extractor/veehd.py
+++ b/yt_dlp/extractor/veehd.py
diff --git a/youtube_dlc/extractor/veoh.py b/yt_dlp/extractor/veoh.py
index 1c44c145c..1c44c145c 100644
--- a/youtube_dlc/extractor/veoh.py
+++ b/yt_dlp/extractor/veoh.py
diff --git a/youtube_dlc/extractor/vesti.py b/yt_dlp/extractor/vesti.py
index 5ab716880..5ab716880 100644
--- a/youtube_dlc/extractor/vesti.py
+++ b/yt_dlp/extractor/vesti.py
diff --git a/youtube_dlc/extractor/vevo.py b/yt_dlp/extractor/vevo.py
index 1aec828be..1aec828be 100644
--- a/youtube_dlc/extractor/vevo.py
+++ b/yt_dlp/extractor/vevo.py
diff --git a/youtube_dlc/extractor/vgtv.py b/yt_dlp/extractor/vgtv.py
index fe7a26b62..fe7a26b62 100644
--- a/youtube_dlc/extractor/vgtv.py
+++ b/yt_dlp/extractor/vgtv.py
diff --git a/youtube_dlc/extractor/vh1.py b/yt_dlp/extractor/vh1.py
index ea576dc6b..ea576dc6b 100644
--- a/youtube_dlc/extractor/vh1.py
+++ b/yt_dlp/extractor/vh1.py
diff --git a/youtube_dlc/extractor/vice.py b/yt_dlp/extractor/vice.py
index e37499512..e37499512 100644
--- a/youtube_dlc/extractor/vice.py
+++ b/yt_dlp/extractor/vice.py
diff --git a/youtube_dlc/extractor/vidbit.py b/yt_dlp/extractor/vidbit.py
index 91f45b7cc..91f45b7cc 100644
--- a/youtube_dlc/extractor/vidbit.py
+++ b/yt_dlp/extractor/vidbit.py
diff --git a/youtube_dlc/extractor/viddler.py b/yt_dlp/extractor/viddler.py
index 642358433..642358433 100644
--- a/youtube_dlc/extractor/viddler.py
+++ b/yt_dlp/extractor/viddler.py
diff --git a/youtube_dlc/extractor/videa.py b/yt_dlp/extractor/videa.py
index ab2c15cde..ab2c15cde 100644
--- a/youtube_dlc/extractor/videa.py
+++ b/yt_dlp/extractor/videa.py
diff --git a/youtube_dlc/extractor/videodetective.py b/yt_dlp/extractor/videodetective.py
index fe70db713..fe70db713 100644
--- a/youtube_dlc/extractor/videodetective.py
+++ b/yt_dlp/extractor/videodetective.py
diff --git a/youtube_dlc/extractor/videofyme.py b/yt_dlp/extractor/videofyme.py
index cd3f50a63..cd3f50a63 100644
--- a/youtube_dlc/extractor/videofyme.py
+++ b/yt_dlp/extractor/videofyme.py
diff --git a/youtube_dlc/extractor/videomore.py b/yt_dlp/extractor/videomore.py
index e0c10aa5b..e0c10aa5b 100644
--- a/youtube_dlc/extractor/videomore.py
+++ b/yt_dlp/extractor/videomore.py
diff --git a/youtube_dlc/extractor/videopress.py b/yt_dlp/extractor/videopress.py
index 6376ff096..6376ff096 100644
--- a/youtube_dlc/extractor/videopress.py
+++ b/yt_dlp/extractor/videopress.py
diff --git a/youtube_dlc/extractor/vidio.py b/yt_dlp/extractor/vidio.py
index b1243e847..b1243e847 100644
--- a/youtube_dlc/extractor/vidio.py
+++ b/yt_dlp/extractor/vidio.py
diff --git a/youtube_dlc/extractor/vidlii.py b/yt_dlp/extractor/vidlii.py
index f4774256b..f4774256b 100644
--- a/youtube_dlc/extractor/vidlii.py
+++ b/yt_dlp/extractor/vidlii.py
diff --git a/youtube_dlc/extractor/vidme.py b/yt_dlp/extractor/vidme.py
index a02f91731..a02f91731 100644
--- a/youtube_dlc/extractor/vidme.py
+++ b/yt_dlp/extractor/vidme.py
diff --git a/youtube_dlc/extractor/vidzi.py b/yt_dlp/extractor/vidzi.py
index 4e79a0b84..42ea4952c 100644
--- a/youtube_dlc/extractor/vidzi.py
+++ b/yt_dlp/extractor/vidzi.py
@@ -20,7 +20,7 @@ class VidziIE(InfoExtractor):
         'info_dict': {
             'id': 'cghql9yq6emu',
             'ext': 'mp4',
-            'title': 'youtube-dlc test video  1\\\\2\'3/4<5\\\\6ä7↭',
+            'title': 'youtube-dl test video  1\\\\2\'3/4<5\\\\6ä7↭',
         },
         'params': {
             # m3u8 download
diff --git a/youtube_dlc/extractor/vier.py b/yt_dlp/extractor/vier.py
index dbd5ba9ba..dbd5ba9ba 100644
--- a/youtube_dlc/extractor/vier.py
+++ b/yt_dlp/extractor/vier.py
diff --git a/youtube_dlc/extractor/viewlift.py b/yt_dlp/extractor/viewlift.py
index 55c2b95c2..55c2b95c2 100644
--- a/youtube_dlc/extractor/viewlift.py
+++ b/yt_dlp/extractor/viewlift.py
diff --git a/youtube_dlc/extractor/viidea.py b/yt_dlp/extractor/viidea.py
index a0abbae60..a0abbae60 100644
--- a/youtube_dlc/extractor/viidea.py
+++ b/yt_dlp/extractor/viidea.py
diff --git a/youtube_dlc/extractor/viki.py b/yt_dlp/extractor/viki.py
index d9731095c..d9731095c 100644
--- a/youtube_dlc/extractor/viki.py
+++ b/yt_dlp/extractor/viki.py
diff --git a/youtube_dlc/extractor/vimeo.py b/yt_dlp/extractor/vimeo.py
index ecfb5f0c5..d64b6c300 100644
--- a/youtube_dlc/extractor/vimeo.py
+++ b/yt_dlp/extractor/vimeo.py
@@ -602,7 +602,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
                 if b'Because of its privacy settings, this video cannot be played here' in errmsg:
                     raise ExtractorError(
                         'Cannot download embed-only video without embedding '
-                        'URL. Please call youtube-dlc with the URL of the page '
+                        'URL. Please call yt-dlp with the URL of the page '
                         'that embeds this video.',
                         expected=True)
             raise
diff --git a/youtube_dlc/extractor/vimple.py b/yt_dlp/extractor/vimple.py
index c74b43766..c74b43766 100644
--- a/youtube_dlc/extractor/vimple.py
+++ b/yt_dlp/extractor/vimple.py
diff --git a/youtube_dlc/extractor/vine.py b/yt_dlp/extractor/vine.py
index 80b896b56..80b896b56 100644
--- a/youtube_dlc/extractor/vine.py
+++ b/yt_dlp/extractor/vine.py
diff --git a/youtube_dlc/extractor/viqeo.py b/yt_dlp/extractor/viqeo.py
index be7dfa814..be7dfa814 100644
--- a/youtube_dlc/extractor/viqeo.py
+++ b/yt_dlp/extractor/viqeo.py
diff --git a/youtube_dlc/extractor/viu.py b/yt_dlp/extractor/viu.py
index 3bd37525b..3bd37525b 100644
--- a/youtube_dlc/extractor/viu.py
+++ b/yt_dlp/extractor/viu.py
diff --git a/youtube_dlc/extractor/vk.py b/yt_dlp/extractor/vk.py
index 00ec006c4..00ec006c4 100644
--- a/youtube_dlc/extractor/vk.py
+++ b/yt_dlp/extractor/vk.py
diff --git a/youtube_dlc/extractor/vlive.py b/yt_dlp/extractor/vlive.py
index 533bfd5da..533bfd5da 100644
--- a/youtube_dlc/extractor/vlive.py
+++ b/yt_dlp/extractor/vlive.py
diff --git a/youtube_dlc/extractor/vodlocker.py b/yt_dlp/extractor/vodlocker.py
index 02c9617d2..02c9617d2 100644
--- a/youtube_dlc/extractor/vodlocker.py
+++ b/yt_dlp/extractor/vodlocker.py
diff --git a/youtube_dlc/extractor/vodpl.py b/yt_dlp/extractor/vodpl.py
index 9e919708e..9e919708e 100644
--- a/youtube_dlc/extractor/vodpl.py
+++ b/yt_dlp/extractor/vodpl.py
diff --git a/youtube_dlc/extractor/vodplatform.py b/yt_dlp/extractor/vodplatform.py
index 74d2257e7..74d2257e7 100644
--- a/youtube_dlc/extractor/vodplatform.py
+++ b/yt_dlp/extractor/vodplatform.py
diff --git a/youtube_dlc/extractor/voicerepublic.py b/yt_dlp/extractor/voicerepublic.py
index a52e40afa..a52e40afa 100644
--- a/youtube_dlc/extractor/voicerepublic.py
+++ b/yt_dlp/extractor/voicerepublic.py
diff --git a/youtube_dlc/extractor/voot.py b/yt_dlp/extractor/voot.py
index 751b21ee5..751b21ee5 100644
--- a/youtube_dlc/extractor/voot.py
+++ b/yt_dlp/extractor/voot.py
diff --git a/youtube_dlc/extractor/voxmedia.py b/yt_dlp/extractor/voxmedia.py
index b318e15d4..b318e15d4 100644
--- a/youtube_dlc/extractor/voxmedia.py
+++ b/yt_dlp/extractor/voxmedia.py
diff --git a/youtube_dlc/extractor/vrak.py b/yt_dlp/extractor/vrak.py
index daa247cce..daa247cce 100644
--- a/youtube_dlc/extractor/vrak.py
+++ b/yt_dlp/extractor/vrak.py
diff --git a/youtube_dlc/extractor/vrt.py b/yt_dlp/extractor/vrt.py
index 2b65d2e5f..2b65d2e5f 100644
--- a/youtube_dlc/extractor/vrt.py
+++ b/yt_dlp/extractor/vrt.py
diff --git a/youtube_dlc/extractor/vrv.py b/yt_dlp/extractor/vrv.py
index 6e51469b0..6e51469b0 100644
--- a/youtube_dlc/extractor/vrv.py
+++ b/yt_dlp/extractor/vrv.py
diff --git a/youtube_dlc/extractor/vshare.py b/yt_dlp/extractor/vshare.py
index c631ac1fa..c631ac1fa 100644
--- a/youtube_dlc/extractor/vshare.py
+++ b/yt_dlp/extractor/vshare.py
diff --git a/youtube_dlc/extractor/vtm.py b/yt_dlp/extractor/vtm.py
index 093f1aa69..093f1aa69 100644
--- a/youtube_dlc/extractor/vtm.py
+++ b/yt_dlp/extractor/vtm.py
diff --git a/youtube_dlc/extractor/vube.py b/yt_dlp/extractor/vube.py
index 8ce3a6b81..8ce3a6b81 100644
--- a/youtube_dlc/extractor/vube.py
+++ b/yt_dlp/extractor/vube.py
diff --git a/youtube_dlc/extractor/vuclip.py b/yt_dlp/extractor/vuclip.py
index 55e087bdb..55e087bdb 100644
--- a/youtube_dlc/extractor/vuclip.py
+++ b/yt_dlp/extractor/vuclip.py
diff --git a/youtube_dlc/extractor/vvvvid.py b/yt_dlp/extractor/vvvvid.py
index 778ce8b76..778ce8b76 100644
--- a/youtube_dlc/extractor/vvvvid.py
+++ b/yt_dlp/extractor/vvvvid.py
diff --git a/youtube_dlc/extractor/vyborymos.py b/yt_dlp/extractor/vyborymos.py
index 9e703c4b6..9e703c4b6 100644
--- a/youtube_dlc/extractor/vyborymos.py
+++ b/yt_dlp/extractor/vyborymos.py
diff --git a/youtube_dlc/extractor/vzaar.py b/yt_dlp/extractor/vzaar.py
index 54f88bba8..54f88bba8 100644
--- a/youtube_dlc/extractor/vzaar.py
+++ b/yt_dlp/extractor/vzaar.py
diff --git a/youtube_dlc/extractor/wakanim.py b/yt_dlp/extractor/wakanim.py
index 507a28feb..507a28feb 100644
--- a/youtube_dlc/extractor/wakanim.py
+++ b/yt_dlp/extractor/wakanim.py
diff --git a/youtube_dlc/extractor/walla.py b/yt_dlp/extractor/walla.py
index cbb548672..cbb548672 100644
--- a/youtube_dlc/extractor/walla.py
+++ b/yt_dlp/extractor/walla.py
diff --git a/youtube_dlc/extractor/washingtonpost.py b/yt_dlp/extractor/washingtonpost.py
index 8afb1af83..8afb1af83 100644
--- a/youtube_dlc/extractor/washingtonpost.py
+++ b/yt_dlp/extractor/washingtonpost.py
diff --git a/youtube_dlc/extractor/wat.py b/yt_dlp/extractor/wat.py
index f6940b371..f6940b371 100644
--- a/youtube_dlc/extractor/wat.py
+++ b/yt_dlp/extractor/wat.py
diff --git a/youtube_dlc/extractor/watchbox.py b/yt_dlp/extractor/watchbox.py
index 5a4e46e73..5a4e46e73 100644
--- a/youtube_dlc/extractor/watchbox.py
+++ b/yt_dlp/extractor/watchbox.py
diff --git a/youtube_dlc/extractor/watchindianporn.py b/yt_dlp/extractor/watchindianporn.py
index fadc539ee..fadc539ee 100644
--- a/youtube_dlc/extractor/watchindianporn.py
+++ b/yt_dlp/extractor/watchindianporn.py
diff --git a/youtube_dlc/extractor/wdr.py b/yt_dlp/extractor/wdr.py
index 9658ecea7..9658ecea7 100644
--- a/youtube_dlc/extractor/wdr.py
+++ b/yt_dlp/extractor/wdr.py
diff --git a/youtube_dlc/extractor/webcaster.py b/yt_dlp/extractor/webcaster.py
index e4b65f54f..e4b65f54f 100644
--- a/youtube_dlc/extractor/webcaster.py
+++ b/yt_dlp/extractor/webcaster.py
diff --git a/youtube_dlc/extractor/webofstories.py b/yt_dlp/extractor/webofstories.py
index f2b8d19b4..f2b8d19b4 100644
--- a/youtube_dlc/extractor/webofstories.py
+++ b/yt_dlp/extractor/webofstories.py
diff --git a/youtube_dlc/extractor/weibo.py b/yt_dlp/extractor/weibo.py
index 621df5b54..621df5b54 100644
--- a/youtube_dlc/extractor/weibo.py
+++ b/yt_dlp/extractor/weibo.py
diff --git a/youtube_dlc/extractor/weiqitv.py b/yt_dlp/extractor/weiqitv.py
index 7e0befd39..7e0befd39 100644
--- a/youtube_dlc/extractor/weiqitv.py
+++ b/yt_dlp/extractor/weiqitv.py
diff --git a/youtube_dlc/extractor/wistia.py b/yt_dlp/extractor/wistia.py
index a170966c3..a170966c3 100644
--- a/youtube_dlc/extractor/wistia.py
+++ b/yt_dlp/extractor/wistia.py
diff --git a/youtube_dlc/extractor/worldstarhiphop.py b/yt_dlp/extractor/worldstarhiphop.py
index 82587b4ce..82587b4ce 100644
--- a/youtube_dlc/extractor/worldstarhiphop.py
+++ b/yt_dlp/extractor/worldstarhiphop.py
diff --git a/youtube_dlc/extractor/wsj.py b/yt_dlp/extractor/wsj.py
index 67236f377..67236f377 100644
--- a/youtube_dlc/extractor/wsj.py
+++ b/yt_dlp/extractor/wsj.py
diff --git a/youtube_dlc/extractor/wwe.py b/yt_dlp/extractor/wwe.py
index bebc77bb5..bebc77bb5 100644
--- a/youtube_dlc/extractor/wwe.py
+++ b/yt_dlp/extractor/wwe.py
diff --git a/youtube_dlc/extractor/xbef.py b/yt_dlp/extractor/xbef.py
index 4c41e98b2..4c41e98b2 100644
--- a/youtube_dlc/extractor/xbef.py
+++ b/yt_dlp/extractor/xbef.py
diff --git a/youtube_dlc/extractor/xboxclips.py b/yt_dlp/extractor/xboxclips.py
index 25f487e1e..25f487e1e 100644
--- a/youtube_dlc/extractor/xboxclips.py
+++ b/yt_dlp/extractor/xboxclips.py
diff --git a/youtube_dlc/extractor/xfileshare.py b/yt_dlp/extractor/xfileshare.py
index cbd5d1cbb..cbd5d1cbb 100644
--- a/youtube_dlc/extractor/xfileshare.py
+++ b/yt_dlp/extractor/xfileshare.py
diff --git a/youtube_dlc/extractor/xhamster.py b/yt_dlp/extractor/xhamster.py
index 1c9398986..1c9398986 100644
--- a/youtube_dlc/extractor/xhamster.py
+++ b/yt_dlp/extractor/xhamster.py
diff --git a/youtube_dlc/extractor/xiami.py b/yt_dlp/extractor/xiami.py
index 769aab331..769aab331 100644
--- a/youtube_dlc/extractor/xiami.py
+++ b/yt_dlp/extractor/xiami.py
diff --git a/youtube_dlc/extractor/ximalaya.py b/yt_dlp/extractor/ximalaya.py
index a912e54b8..a912e54b8 100644
--- a/youtube_dlc/extractor/ximalaya.py
+++ b/yt_dlp/extractor/ximalaya.py
diff --git a/youtube_dlc/extractor/xminus.py b/yt_dlp/extractor/xminus.py
index 36e5ead1e..36e5ead1e 100644
--- a/youtube_dlc/extractor/xminus.py
+++ b/yt_dlp/extractor/xminus.py
diff --git a/youtube_dlc/extractor/xnxx.py b/yt_dlp/extractor/xnxx.py
index dd4fb54d4..dd4fb54d4 100644
--- a/youtube_dlc/extractor/xnxx.py
+++ b/yt_dlp/extractor/xnxx.py
diff --git a/youtube_dlc/extractor/xstream.py b/yt_dlp/extractor/xstream.py
index cd9c465e4..cd9c465e4 100644
--- a/youtube_dlc/extractor/xstream.py
+++ b/yt_dlp/extractor/xstream.py
diff --git a/youtube_dlc/extractor/xtube.py b/yt_dlp/extractor/xtube.py
index 98d2adb99..98d2adb99 100644
--- a/youtube_dlc/extractor/xtube.py
+++ b/yt_dlp/extractor/xtube.py
diff --git a/youtube_dlc/extractor/xuite.py b/yt_dlp/extractor/xuite.py
index 0276c0dbb..0276c0dbb 100644
--- a/youtube_dlc/extractor/xuite.py
+++ b/yt_dlp/extractor/xuite.py
diff --git a/youtube_dlc/extractor/xvideos.py b/yt_dlp/extractor/xvideos.py
index 8fc64914c..8fc64914c 100644
--- a/youtube_dlc/extractor/xvideos.py
+++ b/yt_dlp/extractor/xvideos.py
diff --git a/youtube_dlc/extractor/xxxymovies.py b/yt_dlp/extractor/xxxymovies.py
index e34ebe3a6..e34ebe3a6 100644
--- a/youtube_dlc/extractor/xxxymovies.py
+++ b/yt_dlp/extractor/xxxymovies.py
diff --git a/youtube_dlc/extractor/yahoo.py b/yt_dlp/extractor/yahoo.py
index a17b10d6e..a17b10d6e 100644
--- a/youtube_dlc/extractor/yahoo.py
+++ b/yt_dlp/extractor/yahoo.py
diff --git a/youtube_dlc/extractor/yandexdisk.py b/yt_dlp/extractor/yandexdisk.py
index 6fcd8ee7e..6fcd8ee7e 100644
--- a/youtube_dlc/extractor/yandexdisk.py
+++ b/yt_dlp/extractor/yandexdisk.py
diff --git a/youtube_dlc/extractor/yandexmusic.py b/yt_dlp/extractor/yandexmusic.py
index 4bcbaa4db..c30c438f8 100644
--- a/youtube_dlc/extractor/yandexmusic.py
+++ b/yt_dlp/extractor/yandexmusic.py
@@ -30,12 +30,12 @@ class YandexMusicBaseIE(InfoExtractor):
     @staticmethod
     def _raise_captcha():
         raise ExtractorError(
-            'YandexMusic has considered youtube-dlc requests automated and '
+            'YandexMusic has considered yt-dlp requests automated and '
             'asks you to solve a CAPTCHA. You can either wait for some '
             'time until unblocked and optionally use --sleep-interval '
             'in future or alternatively you can go to https://music.yandex.ru/ '
             'solve CAPTCHA, then export cookies and pass cookie file to '
-            'youtube-dlc with --cookies',
+            'yt-dlp with --cookies',
             expected=True)
 
     def _download_webpage_handle(self, *args, **kwargs):
diff --git a/youtube_dlc/extractor/yandexvideo.py b/yt_dlp/extractor/yandexvideo.py
index 6a166ec9b..6a166ec9b 100644
--- a/youtube_dlc/extractor/yandexvideo.py
+++ b/yt_dlp/extractor/yandexvideo.py
diff --git a/youtube_dlc/extractor/yapfiles.py b/yt_dlp/extractor/yapfiles.py
index cfb368de9..cfb368de9 100644
--- a/youtube_dlc/extractor/yapfiles.py
+++ b/yt_dlp/extractor/yapfiles.py
diff --git a/youtube_dlc/extractor/yesjapan.py b/yt_dlp/extractor/yesjapan.py
index 681338c96..681338c96 100644
--- a/youtube_dlc/extractor/yesjapan.py
+++ b/yt_dlp/extractor/yesjapan.py
diff --git a/youtube_dlc/extractor/yinyuetai.py b/yt_dlp/extractor/yinyuetai.py
index 1fd8d35c6..1fd8d35c6 100644
--- a/youtube_dlc/extractor/yinyuetai.py
+++ b/yt_dlp/extractor/yinyuetai.py
diff --git a/youtube_dlc/extractor/ynet.py b/yt_dlp/extractor/ynet.py
index c4ae4d88e..c4ae4d88e 100644
--- a/youtube_dlc/extractor/ynet.py
+++ b/yt_dlp/extractor/ynet.py
diff --git a/youtube_dlc/extractor/youjizz.py b/yt_dlp/extractor/youjizz.py
index 88aabd272..88aabd272 100644
--- a/youtube_dlc/extractor/youjizz.py
+++ b/yt_dlp/extractor/youjizz.py
diff --git a/youtube_dlc/extractor/youku.py b/yt_dlp/extractor/youku.py
index 61d1ab209..61d1ab209 100644
--- a/youtube_dlc/extractor/youku.py
+++ b/yt_dlp/extractor/youku.py
diff --git a/youtube_dlc/extractor/younow.py b/yt_dlp/extractor/younow.py
index 04dbc87fc..04dbc87fc 100644
--- a/youtube_dlc/extractor/younow.py
+++ b/yt_dlp/extractor/younow.py
diff --git a/youtube_dlc/extractor/youporn.py b/yt_dlp/extractor/youporn.py
index 534270bac..534270bac 100644
--- a/youtube_dlc/extractor/youporn.py
+++ b/yt_dlp/extractor/youporn.py
diff --git a/youtube_dlc/extractor/yourporn.py b/yt_dlp/extractor/yourporn.py
index 98347491e..98347491e 100644
--- a/youtube_dlc/extractor/yourporn.py
+++ b/yt_dlp/extractor/yourporn.py
diff --git a/youtube_dlc/extractor/yourupload.py b/yt_dlp/extractor/yourupload.py
index 9fa772838..9fa772838 100644
--- a/youtube_dlc/extractor/yourupload.py
+++ b/yt_dlp/extractor/yourupload.py
diff --git a/youtube_dlc/extractor/youtube.py b/yt_dlp/extractor/youtube.py
index 2f02f3afc..2f02f3afc 100644
--- a/youtube_dlc/extractor/youtube.py
+++ b/yt_dlp/extractor/youtube.py
diff --git a/youtube_dlc/extractor/zapiks.py b/yt_dlp/extractor/zapiks.py
index f6496f516..f6496f516 100644
--- a/youtube_dlc/extractor/zapiks.py
+++ b/yt_dlp/extractor/zapiks.py
diff --git a/youtube_dlc/extractor/zaq1.py b/yt_dlp/extractor/zaq1.py
index 889aff5d8..889aff5d8 100644
--- a/youtube_dlc/extractor/zaq1.py
+++ b/yt_dlp/extractor/zaq1.py
diff --git a/youtube_dlc/extractor/zattoo.py b/yt_dlp/extractor/zattoo.py
index 32dcc03b1..32dcc03b1 100644
--- a/youtube_dlc/extractor/zattoo.py
+++ b/yt_dlp/extractor/zattoo.py
diff --git a/youtube_dlc/extractor/zdf.py b/yt_dlp/extractor/zdf.py
index d9b393e6e..d9b393e6e 100644
--- a/youtube_dlc/extractor/zdf.py
+++ b/yt_dlp/extractor/zdf.py
diff --git a/youtube_dlc/extractor/zee5.py b/yt_dlp/extractor/zee5.py
index 73a50876b..73a50876b 100644
--- a/youtube_dlc/extractor/zee5.py
+++ b/yt_dlp/extractor/zee5.py
diff --git a/youtube_dlc/extractor/zhihu.py b/yt_dlp/extractor/zhihu.py
index d1ed55be3..d1ed55be3 100644
--- a/youtube_dlc/extractor/zhihu.py
+++ b/yt_dlp/extractor/zhihu.py
diff --git a/youtube_dlc/extractor/zingmp3.py b/yt_dlp/extractor/zingmp3.py
index adfdcaabf..adfdcaabf 100644
--- a/youtube_dlc/extractor/zingmp3.py
+++ b/yt_dlp/extractor/zingmp3.py
diff --git a/youtube_dlc/extractor/zoom.py b/yt_dlp/extractor/zoom.py
index 038a90297..038a90297 100644
--- a/youtube_dlc/extractor/zoom.py
+++ b/yt_dlp/extractor/zoom.py
diff --git a/youtube_dlc/extractor/zype.py b/yt_dlp/extractor/zype.py
index f20f953cb..f20f953cb 100644
--- a/youtube_dlc/extractor/zype.py
+++ b/yt_dlp/extractor/zype.py
diff --git a/youtube_dlc/jsinterp.py b/yt_dlp/jsinterp.py
index 7bda59610..7bda59610 100644
--- a/youtube_dlc/jsinterp.py
+++ b/yt_dlp/jsinterp.py
diff --git a/youtube_dlc/options.py b/yt_dlp/options.py
index 26df62ca5..00bc02c2d 100644
--- a/youtube_dlc/options.py
+++ b/yt_dlp/options.py
@@ -408,7 +408,7 @@ def parseOpts(overrideArguments=None):
     authentication.add_option(
         '-p', '--password',
         dest='password', metavar='PASSWORD',
-        help='Account password. If this option is left out, youtube-dlc will ask interactively')
+        help='Account password. If this option is left out, yt-dlp will ask interactively')
     authentication.add_option(
         '-2', '--twofactor',
         dest='twofactor', metavar='TWOFACTOR',
@@ -434,7 +434,7 @@ def parseOpts(overrideArguments=None):
     adobe_pass.add_option(
         '--ap-password',
         dest='ap_password', metavar='PASSWORD',
-        help='Multiple-system operator account password. If this option is left out, youtube-dlc will ask interactively')
+        help='Multiple-system operator account password. If this option is left out, yt-dlp will ask interactively')
     adobe_pass.add_option(
         '--ap-list-mso',
         action='store_true', dest='ap_list_mso', default=False,
@@ -812,12 +812,12 @@ def parseOpts(overrideArguments=None):
     verbosity.add_option(
         '-C', '--call-home',
         dest='call_home', action='store_true', default=False,
-        # help='[Broken] Contact the youtube-dlc server for debugging')
+        # help='[Broken] Contact the yt-dlp server for debugging')
         help=optparse.SUPPRESS_HELP)
     verbosity.add_option(
         '--no-call-home',
         dest='call_home', action='store_false',
-        # help='Do not contact the youtube-dlc server for debugging (default)')
+        # help='Do not contact the yt-dlp server for debugging (default)')
         help=optparse.SUPPRESS_HELP)
 
     filesystem = optparse.OptionGroup(parser, 'Filesystem Options')
@@ -1167,7 +1167,7 @@ def parseOpts(overrideArguments=None):
         help='Convert the subtitles to other format (currently supported: srt|ass|vtt|lrc)')
 
     sponskrub = optparse.OptionGroup(parser, 'SponSkrub (SponsorBlock) Options', description=(
-        'SponSkrub (https://github.com/pukkandan/SponSkrub) is a utility to mark/remove sponsor segments '
+        'SponSkrub (https://github.com/yt-dlp/SponSkrub) is a utility to mark/remove sponsor segments '
         'from downloaded YouTube videos using SponsorBlock API (https://sponsor.ajay.app)'))
     sponskrub.add_option(
         '--sponskrub',
@@ -1276,7 +1276,7 @@ def parseOpts(overrideArguments=None):
             if '--config-location' in configs['command-line']:
                 location = compat_expanduser(opts.config_location)
                 if os.path.isdir(location):
-                    location = os.path.join(location, 'youtube-dlc.conf')
+                    location = os.path.join(location, 'yt-dlp.conf')
                 if not os.path.exists(location):
                     parser.error('config-location %s does not exist.' % location)
                 configs['custom'] = _readOptions(location, default=None)
@@ -1290,7 +1290,10 @@ def parseOpts(overrideArguments=None):
                 return
 
             def read_options(path, user=False):
-                for package in ('yt-dlp', 'youtube-dlc'):
+                # Multiple package names can be given here
+                # Eg: ('yt-dlp', 'youtube-dlc', 'youtube-dl') will look for
+                # the configuration file of any of these three packages
+                for package in ('yt-dlp',):
                     if user:
                         config, current_path = _readUserConf(package, default=None)
                     else:
diff --git a/youtube_dlc/postprocessor/__init__.py b/yt_dlp/postprocessor/__init__.py
index c5aa925c6..c5aa925c6 100644
--- a/youtube_dlc/postprocessor/__init__.py
+++ b/yt_dlp/postprocessor/__init__.py
diff --git a/youtube_dlc/postprocessor/common.py b/yt_dlp/postprocessor/common.py
index f8f4e7693..f8f4e7693 100644
--- a/youtube_dlc/postprocessor/common.py
+++ b/yt_dlp/postprocessor/common.py
diff --git a/youtube_dlc/postprocessor/embedthumbnail.py b/yt_dlp/postprocessor/embedthumbnail.py
index 926673363..926673363 100644
--- a/youtube_dlc/postprocessor/embedthumbnail.py
+++ b/yt_dlp/postprocessor/embedthumbnail.py
diff --git a/youtube_dlc/postprocessor/execafterdownload.py b/yt_dlp/postprocessor/execafterdownload.py
index 24dc64ef0..24dc64ef0 100644
--- a/youtube_dlc/postprocessor/execafterdownload.py
+++ b/yt_dlp/postprocessor/execafterdownload.py
diff --git a/youtube_dlc/postprocessor/ffmpeg.py b/yt_dlp/postprocessor/ffmpeg.py
index b0615ddb2..944a4bc17 100644
--- a/youtube_dlc/postprocessor/ffmpeg.py
+++ b/yt_dlp/postprocessor/ffmpeg.py
@@ -251,7 +251,7 @@ class FFmpegPostProcessor(PostProcessor):
                 + [encodeFilename(self._ffmpeg_filename_argument(file), True)])
 
         for i, path in enumerate(input_paths):
-            cmd += make_args(path, post=['-i'], exe='%s_i%d' % (self.basename, i+1), use_default_arg=False)
+            cmd += make_args(path, post=['-i'], exe='%s_i%d' % (self.basename, i + 1), use_default_arg=False)
         cmd += make_args(out_path, pre=opts, exe=self.basename)
 
         self.write_debug('ffmpeg command line: %s' % shell_quote(cmd))
@@ -633,7 +633,7 @@ class FFmpegMergerPP(FFmpegPostProcessor):
         if is_outdated_version(
                 self._versions[self.basename], required_version):
             warning = ('Your copy of %s is outdated and unable to properly mux separate video and audio files, '
-                       'youtube-dlc will download single file media. '
+                       'yt-dlp will download single file media. '
                        'Update %s to version %s or newer to fix this.') % (
                            self.basename, self.basename, required_version)
             self.report_warning(warning)
diff --git a/youtube_dlc/postprocessor/metadatafromfield.py b/yt_dlp/postprocessor/metadatafromfield.py
index 716911b21..716911b21 100644
--- a/youtube_dlc/postprocessor/metadatafromfield.py
+++ b/yt_dlp/postprocessor/metadatafromfield.py
diff --git a/youtube_dlc/postprocessor/movefilesafterdownload.py b/yt_dlp/postprocessor/movefilesafterdownload.py
index fa61317ed..fa61317ed 100644
--- a/youtube_dlc/postprocessor/movefilesafterdownload.py
+++ b/yt_dlp/postprocessor/movefilesafterdownload.py
diff --git a/youtube_dlc/postprocessor/sponskrub.py b/yt_dlp/postprocessor/sponskrub.py
index 2f30acc8e..2f30acc8e 100644
--- a/youtube_dlc/postprocessor/sponskrub.py
+++ b/yt_dlp/postprocessor/sponskrub.py
diff --git a/youtube_dlc/postprocessor/xattrpp.py b/yt_dlp/postprocessor/xattrpp.py
index 3d31f0ce5..3d31f0ce5 100644
--- a/youtube_dlc/postprocessor/xattrpp.py
+++ b/yt_dlp/postprocessor/xattrpp.py
diff --git a/youtube_dlc/socks.py b/yt_dlp/socks.py
index 5d4adbe72..5d4adbe72 100644
--- a/youtube_dlc/socks.py
+++ b/yt_dlp/socks.py
diff --git a/youtube_dlc/swfinterp.py b/yt_dlp/swfinterp.py
index 0c7158575..0c7158575 100644
--- a/youtube_dlc/swfinterp.py
+++ b/yt_dlp/swfinterp.py
diff --git a/youtube_dlc/update.py b/yt_dlp/update.py
index 402fefb67..81c9013a1 100644
--- a/youtube_dlc/update.py
+++ b/yt_dlp/update.py
@@ -38,7 +38,7 @@ def update_self(to_screen, verbose, opener):
     Returns whether the program should terminate
     """
 
-    JSON_URL = 'https://api.github.com/repos/pukkandan/yt-dlp/releases/latest'
+    JSON_URL = 'https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest'
 
     def calc_sha256sum(path):
         h = hashlib.sha256()
@@ -63,7 +63,7 @@ def update_self(to_screen, verbose, opener):
         if verbose:
             to_screen(encode_compat_str(traceback.format_exc()))
         to_screen('ERROR: can\'t obtain versions info. Please try again later.')
-        to_screen('Visit https://github.com/pukkandan/yt-dlp/releases/latest')
+        to_screen('Visit https://github.com/yt-dlp/yt-dlp/releases/latest')
         return
 
     def version_tuple(version_str):
@@ -87,8 +87,8 @@ def update_self(to_screen, verbose, opener):
     def get_bin_info(bin_or_exe, version):
         label = version_labels['%s_%s' % (bin_or_exe, version)]
         return next(
-            (i for i in version_info['assets']
-                if i['name'] in ('yt-dlp%s' % label, 'youtube-dlc%s' % label)), {})
+            (i for i in version_info['assets'] if i['name'] == 'yt-dlp%s' % label),
+            {})
 
     def get_sha256sum(bin_or_exe, version):
         label = version_labels['%s_%s' % (bin_or_exe, version)]
@@ -100,8 +100,8 @@ def update_self(to_screen, verbose, opener):
         hash_data = opener.open(urlh).read().decode('utf-8')
         hashes = list(map(lambda x: x.split(':'), hash_data.splitlines()))
         return next(
-            (i[1] for i in hashes
-                if i[0] in ('yt-dlp%s' % label, 'youtube-dlc%s' % label)), None)
+            (i[1] for i in hashes if i[0] == 'yt-dlp%s' % label),
+            None)
 
     # sys.executable is set to the full pathname of the exe-file for py2exe
     # though symlinks are not followed so that we need to do this manually
@@ -125,7 +125,7 @@ def update_self(to_screen, verbose, opener):
             url = get_bin_info('exe', arch).get('browser_download_url')
             if not url:
                 to_screen('ERROR: unable to fetch updates')
-                to_screen('Visit https://github.com/pukkandan/yt-dlp/releases/latest')
+                to_screen('Visit https://github.com/yt-dlp/yt-dlp/releases/latest')
                 return
             urlh = opener.open(url)
             newcontent = urlh.read()
@@ -134,7 +134,7 @@ def update_self(to_screen, verbose, opener):
             if verbose:
                 to_screen(encode_compat_str(traceback.format_exc()))
             to_screen('ERROR: unable to download latest version')
-            to_screen('Visit https://github.com/pukkandan/yt-dlp/releases/latest')
+            to_screen('Visit https://github.com/yt-dlp/yt-dlp/releases/latest')
             return
 
         try:
@@ -151,7 +151,7 @@ def update_self(to_screen, verbose, opener):
             to_screen('WARNING: no hash information found for the release')
         elif calc_sha256sum(exe + '.new') != expected_sum:
             to_screen('ERROR: unable to verify the new executable')
-            to_screen('Visit https://github.com/pukkandan/yt-dlp/releases/latest')
+            to_screen('Visit https://github.com/yt-dlp/yt-dlp/releases/latest')
             try:
                 os.remove(exe + '.new')
             except OSError:
@@ -186,7 +186,7 @@ def update_self(to_screen, verbose, opener):
             url = get_bin_info('zip', py_ver).get('browser_download_url')
             if not url:
                 to_screen('ERROR: unable to fetch updates')
-                to_screen('Visit https://github.com/pukkandan/yt-dlp/releases/latest')
+                to_screen('Visit https://github.com/yt-dlp/yt-dlp/releases/latest')
                 return
             urlh = opener.open(url)
             newcontent = urlh.read()
@@ -195,7 +195,7 @@ def update_self(to_screen, verbose, opener):
             if verbose:
                 to_screen(encode_compat_str(traceback.format_exc()))
             to_screen('ERROR: unable to download latest version')
-            to_screen('Visit https://github.com/pukkandan/yt-dlp/releases/latest')
+            to_screen('Visit https://github.com/yt-dlp/yt-dlp/releases/latest')
             return
 
         try:
@@ -210,7 +210,7 @@ def update_self(to_screen, verbose, opener):
         expected_sum = get_sha256sum('zip', py_ver)
         if expected_sum and calc_sha256sum(filename + '.new') != expected_sum:
             to_screen('ERROR: unable to verify the new zip')
-            to_screen('Visit https://github.com/pukkandan/yt-dlp/releases/latest')
+            to_screen('Visit https://github.com/yt-dlp/yt-dlp/releases/latest')
             try:
                 os.remove(filename + '.new')
             except OSError:
@@ -223,7 +223,7 @@ def update_self(to_screen, verbose, opener):
             to_screen('ERROR: unable to overwrite current version')
             return
 
-    to_screen('Updated yt-dlp. Restart youtube-dlc to use the new version.')
+    to_screen('Updated yt-dlp. Restart yt-dlp to use the new version.')
 
 
 '''  # UNUSED
diff --git a/youtube_dlc/utils.py b/yt_dlp/utils.py
index b33a40fa6..0dbb85467 100644
--- a/youtube_dlc/utils.py
+++ b/yt_dlp/utils.py
@@ -2341,12 +2341,12 @@ def make_HTTPS_handler(params, **kwargs):
 
 def bug_reports_message():
     if ytdl_is_updateable():
-        update_cmd = 'type  youtube-dlc -U  to update'
+        update_cmd = 'type  yt-dlp -U  to update'
     else:
-        update_cmd = 'see  https://github.com/pukkandan/yt-dlp  on how to update'
-    msg = '; please report this issue on https://github.com/pukkandan/yt-dlp .'
+        update_cmd = 'see  https://github.com/yt-dlp/yt-dlp  on how to update'
+    msg = '; please report this issue on https://github.com/yt-dlp/yt-dlp .'
     msg += ' Make sure you are using the latest version; %s.' % update_cmd
-    msg += ' Be sure to call youtube-dlc with the --verbose flag and include its complete output.'
+    msg += ' Be sure to call yt-dlp with the --verbose flag and include its complete output.'
     return msg
 
 
@@ -2360,7 +2360,7 @@ class ExtractorError(YoutubeDLError):
 
     def __init__(self, msg, tb=None, expected=False, cause=None, video_id=None):
         """ tb, if given, is the original traceback (so that it can be printed out).
-        If expected is set, this is a normal error message and most likely not a bug in youtube-dlc.
+        If expected is set, this is a normal error message and most likely not a bug in yt-dlp.
         """
 
         if sys.exc_info()[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError):
@@ -2782,7 +2782,7 @@ class YoutubeDLCookieJar(compat_cookiejar.MozillaCookieJar):
     _HTTPONLY_PREFIX = '#HttpOnly_'
     _ENTRY_LEN = 7
     _HEADER = '''# Netscape HTTP Cookie File
-# This file is generated by youtube-dlc.  Do not edit.
+# This file is generated by yt-dlp.  Do not edit.
 
 '''
     _CookieFileEntry = collections.namedtuple(
@@ -3787,7 +3787,7 @@ def get_exe_version(exe, args=['--version'],
     or False if the executable is not present """
     try:
         # STDIN should be redirected too. On UNIX-like systems, ffmpeg triggers
-        # SIGTTOU if youtube-dlc is run in the background.
+        # SIGTTOU if yt-dlp is run in the background.
         # See https://github.com/ytdl-org/youtube-dl/issues/955#issuecomment-209789656
         out, _ = process_communicate_or_kill(subprocess.Popen(
             [encodeArgument(exe)] + args,
@@ -4218,7 +4218,7 @@ def is_outdated_version(version, limit, assume_new=True):
 
 
 def ytdl_is_updateable():
-    """ Returns if youtube-dlc can be updated with -U """
+    """ Returns if yt-dlp can be updated with -U """
     return False
 
     from zipimport import zipimporter
@@ -4695,7 +4695,7 @@ def cli_valueless_option(params, command_option, param, expected_value=True):
 def cli_configuration_args(argdict, key, default=[], exe=None, use_default_arg=True):
     # use_default_arg can be True, False, or 'no_compat'
     if isinstance(argdict, (list, tuple)):  # for backward compatibility
-        if use_default_arg == True:
+        if use_default_arg is True:
             return argdict
         else:
             argdict = None
@@ -5468,7 +5468,7 @@ class PerRequestProxyHandler(compat_urllib_request.ProxyHandler):
             return None  # No Proxy
         if compat_urlparse.urlparse(proxy).scheme.lower() in ('socks', 'socks4', 'socks4a', 'socks5'):
             req.add_header('Ytdl-socks-proxy', proxy)
-            # youtube-dlc's http/https handlers do wrapping the socket with socks
+            # yt-dlp's http/https handlers do wrapping the socket with socks
             return None
         return compat_urllib_request.ProxyHandler.proxy_open(
             self, req, proxy, type)
@@ -5741,7 +5741,7 @@ def write_xattr(path, key, value):
                 # TODO: fallback to CLI tools
                 raise XAttrUnavailableError(
                     'python-pyxattr is detected but is too old. '
-                    'youtube-dlc requires %s or above while your version is %s. '
+                    'yt-dlp requires %s or above while your version is %s. '
                     'Falling back to other xattr implementations' % (
                         pyxattr_required_version, xattr.__version__))
 
diff --git a/youtube_dlc/version.py b/yt_dlp/version.py
index 0813757ee..0813757ee 100644
--- a/youtube_dlc/version.py
+++ b/yt_dlp/version.py
diff --git a/ytdlp_plugins/extractor/sample.py b/ytdlp_plugins/extractor/sample.py
index 321f3fed1..5d8df1df5 100644
--- a/ytdlp_plugins/extractor/sample.py
+++ b/ytdlp_plugins/extractor/sample.py
@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
 # Don't use relative imports
-from youtube_dlc.extractor.common import InfoExtractor
+from yt_dlp.extractor.common import InfoExtractor
 
 
 # See https://github.com/ytdl-org/youtube-dl#adding-support-for-a-new-site