861 files changed, 452 insertions, 452 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 4e43e99f3..d2cce9a1c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,8 +2,8 @@ include README.md
 include LICENSE
 include AUTHORS
 include ChangeLog
-include youtube-dl.bash-completion
-include youtube-dl.fish
-include youtube-dl.1
+include youtube-dlc.bash-completion
+include youtube-dlc.fish
+include youtube-dlc.1
 recursive-include docs Makefile conf.py *.rst
 recursive-include test *
diff --git a/Makefile b/Makefile
index 3e17365b8..9588657c1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-all: youtube-dl README.md CONTRIBUTING.md README.txt youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish supportedsites
+all: youtube-dlc README.md CONTRIBUTING.md README.txt youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish supportedsites
 
 clean:
-	rm -rf youtube-dl.1.temp.md youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dl.tar.gz youtube-dl.zsh youtube-dl.fish youtube_dl/extractor/lazy_extractors.py *.dump *.part* *.ytdl *.info.json *.mp4 *.m4a *.flv *.mp3 *.avi *.mkv *.webm *.3gp *.wav *.ape *.swf *.jpg *.png CONTRIBUTING.md.tmp youtube-dl youtube-dl.exe
+	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 CONTRIBUTING.md.tmp youtube-dlc youtube-dlc.exe
 	find . -name "*.pyc" -delete
 	find . -name "*.class" -delete
 
@@ -17,23 +17,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-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
+install: youtube-dlc youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish
 	install -d $(DESTDIR)$(BINDIR)
-	install -m 755 youtube-dl $(DESTDIR)$(BINDIR)
+	install -m 755 youtube-dlc $(DESTDIR)$(BINDIR)
 	install -d $(DESTDIR)$(MANDIR)/man1
-	install -m 644 youtube-dl.1 $(DESTDIR)$(MANDIR)/man1
+	install -m 644 youtube-dlc.1 $(DESTDIR)$(MANDIR)/man1
 	install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
-	install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl
+	install -m 644 youtube-dlc.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dlc
 	install -d $(DESTDIR)$(SHAREDIR)/zsh/site-functions
-	install -m 644 youtube-dl.zsh $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_youtube-dl
+	install -m 644 youtube-dlc.zsh $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_youtube-dlc
 	install -d $(DESTDIR)$(SYSCONFDIR)/fish/completions
-	install -m 644 youtube-dl.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/youtube-dl.fish
+	install -m 644 youtube-dlc.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/youtube-dlc.fish
 
 codetest:
 	flake8 .
 
 test:
-	#nosetests --with-coverage --cover-package=youtube_dl --cover-html --verbose --processes 4 test
+	#nosetests --with-coverage --cover-package=youtube_dlc --cover-html --verbose --processes 4 test
 	nosetests --verbose test
 	$(MAKE) codetest
 
@@ -51,34 +51,34 @@ offlinetest: codetest
 		--exclude test_youtube_lists.py \
 		--exclude test_youtube_signature.py
 
-tar: youtube-dl.tar.gz
+tar: youtube-dlc.tar.gz
 
 .PHONY: all clean install test tar bash-completion pypi-files zsh-completion fish-completion ot offlinetest codetest supportedsites
 
-pypi-files: youtube-dl.bash-completion README.txt youtube-dl.1 youtube-dl.fish
+pypi-files: youtube-dlc.bash-completion README.txt youtube-dlc.1 youtube-dlc.fish
 
-youtube-dl: youtube_dl/*.py youtube_dl/*/*.py
+youtube-dlc: youtube_dlc/*.py youtube_dlc/*/*.py
 	mkdir -p zip
-	for d in youtube_dl youtube_dl/downloader youtube_dl/extractor youtube_dl/postprocessor ; do \
+	for d in youtube_dlc youtube_dlc/downloader youtube_dlc/extractor youtube_dlc/postprocessor ; do \
 	  mkdir -p zip/$$d ;\
 	  cp -pPR $$d/*.py zip/$$d/ ;\
 	done
-	touch -t 200001010101 zip/youtube_dl/*.py zip/youtube_dl/*/*.py
-	mv zip/youtube_dl/__main__.py zip/
-	cd zip ; zip -q ../youtube-dl youtube_dl/*.py youtube_dl/*/*.py __main__.py
+	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
 	rm -rf zip
-	echo '#!$(PYTHON)' > youtube-dl
-	cat youtube-dl.zip >> youtube-dl
-	rm youtube-dl.zip
-	chmod a+x youtube-dl
+	echo '#!$(PYTHON)' > youtube-dlc
+	cat youtube-dlc.zip >> youtube-dlc
+	rm youtube-dlc.zip
+	chmod a+x youtube-dlc
 
-README.md: youtube_dl/*.py youtube_dl/*/*.py
-	COLUMNS=80 $(PYTHON) youtube_dl/__main__.py --help | $(PYTHON) devscripts/make_readme.py
+README.md: youtube_dlc/*.py youtube_dlc/*/*.py
+	COLUMNS=80 $(PYTHON) youtube_dlc/__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_dl/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 youtube_dlc/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
@@ -91,34 +91,34 @@ supportedsites:
 README.txt: README.md
 	pandoc -f $(MARKDOWN) -t plain README.md -o README.txt
 
-youtube-dl.1: README.md
-	$(PYTHON) devscripts/prepare_manpage.py youtube-dl.1.temp.md
-	pandoc -s -f $(MARKDOWN) -t man youtube-dl.1.temp.md -o youtube-dl.1
-	rm -f youtube-dl.1.temp.md
+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
 
-youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in
+youtube-dlc.bash-completion: youtube_dlc/*.py youtube_dlc/*/*.py devscripts/bash-completion.in
 	$(PYTHON) devscripts/bash-completion.py
 
-bash-completion: youtube-dl.bash-completion
+bash-completion: youtube-dlc.bash-completion
 
-youtube-dl.zsh: youtube_dl/*.py youtube_dl/*/*.py devscripts/zsh-completion.in
+youtube-dlc.zsh: youtube_dlc/*.py youtube_dlc/*/*.py devscripts/zsh-completion.in
 	$(PYTHON) devscripts/zsh-completion.py
 
-zsh-completion: youtube-dl.zsh
+zsh-completion: youtube-dlc.zsh
 
-youtube-dl.fish: youtube_dl/*.py youtube_dl/*/*.py devscripts/fish-completion.in
+youtube-dlc.fish: youtube_dlc/*.py youtube_dlc/*/*.py devscripts/fish-completion.in
 	$(PYTHON) devscripts/fish-completion.py
 
-fish-completion: youtube-dl.fish
+fish-completion: youtube-dlc.fish
 
-lazy-extractors: youtube_dl/extractor/lazy_extractors.py
+lazy-extractors: youtube_dlc/extractor/lazy_extractors.py
 
-_EXTRACTOR_FILES = $(shell find youtube_dl/extractor -iname '*.py' -and -not -iname 'lazy_extractors.py')
-youtube_dl/extractor/lazy_extractors.py: devscripts/make_lazy_extractors.py devscripts/lazy_load_template.py $(_EXTRACTOR_FILES)
+_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)
 	$(PYTHON) devscripts/make_lazy_extractors.py $@
 
-youtube-dl.tar.gz: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish ChangeLog AUTHORS
-	@tar -czf youtube-dl.tar.gz --transform "s|^|youtube-dl/|" --owner 0 --group 0 \
+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 \
 		--exclude '*.DS_Store' \
 		--exclude '*.kate-swp' \
 		--exclude '*.pyc' \
@@ -128,8 +128,8 @@ youtube-dl.tar.gz: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-
 		--exclude '.git' \
 		--exclude 'docs/_build' \
 		-- \
-		bin devscripts test youtube_dl docs \
+		bin devscripts test youtube_dlc docs \
 		ChangeLog AUTHORS LICENSE README.md README.txt \
-		Makefile MANIFEST.in youtube-dl.1 youtube-dl.bash-completion \
-		youtube-dl.zsh youtube-dl.fish setup.py setup.cfg \
-		youtube-dl
+		Makefile MANIFEST.in youtube-dlc.1 youtube-dlc.bash-completion \
+		youtube-dlc.zsh youtube-dlc.fish setup.py setup.cfg \
+		youtube-dlc
diff --git a/README.md b/README.md
index 9854aab92..5e4cd3a44 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ Using curl:
 To build the Windows executable yourself
 
     python -m pip install --upgrade pyinstaller
-    pyinstaller.exe youtube_dl\__main__.py --onefile --name youtube-dlc
+    pyinstaller.exe youtube_dlc\__main__.py --onefile --name youtube-dlc
     
 Or simply execute the `make_win.bat` if pyinstaller is installed.
 There will be a `youtube-dlc.exe` in `/dist`  
@@ -71,18 +71,18 @@ Then simply type this
                                      extractor
     --default-search PREFIX          Use this prefix for unqualified URLs. For
                                      example "gvsearch2:" downloads two videos
-                                     from google videos for youtube-dl "large
+                                     from google videos for youtube-dlc "large
                                      apple". Use the value "auto" to let
-                                     youtube-dl guess ("auto_warning" to emit a
+                                     youtube-dlc guess ("auto_warning" to emit a
                                      warning when guessing). "error" just throws
                                      an error. The default value "fixup_error"
                                      repairs broken URLs, but emits an error if
                                      this is not possible instead of searching.
     --ignore-config                  Do not read configuration files. When given
                                      in the global configuration file
-                                     /etc/youtube-dl.conf: Do not read the user
+                                     /etc/youtube-dlc.conf: Do not read the user
                                      configuration in ~/.config/youtube-
-                                     dl/config (%APPDATA%/youtube-dl/config.txt
+                                     dl/config (%APPDATA%/youtube-dlc/config.txt
                                      on Windows)
     --config-location PATH           Location of the configuration file; either
                                      the path to the config or its containing
@@ -240,7 +240,7 @@ Then simply type this
                                      filenames
     -w, --no-overwrites              Do not overwrite files
     -c, --continue                   Force resume of partially downloaded files.
-                                     By default, youtube-dl will resume
+                                     By default, youtube-dlc will resume
                                      downloads if possible.
     --no-continue                    Do not resume partially downloaded files
                                      (restart from beginning)
@@ -258,11 +258,11 @@ Then simply type this
                                      option)
     --cookies FILE                   File to read cookies from and dump cookie
                                      jar in
-    --cache-dir DIR                  Location in the filesystem where youtube-dl
+    --cache-dir DIR                  Location in the filesystem where youtube-dlc
                                      can store some downloaded information
                                      permanently. By default
-                                     $XDG_CACHE_HOME/youtube-dl or
-                                     ~/.cache/youtube-dl . At the moment, only
+                                     $XDG_CACHE_HOME/youtube-dlc or
+                                     ~/.cache/youtube-dlc . At the moment, only
                                      YouTube player files (for videos with
                                      obfuscated signatures) are cached, but that
                                      may change.
@@ -308,8 +308,8 @@ Then simply type this
                                      files in the current directory to debug
                                      problems
     --print-traffic                  Display sent and read HTTP traffic
-    -C, --call-home                  Contact the youtube-dl server for debugging
-    --no-call-home                   Do NOT contact the youtube-dl server for
+    -C, --call-home                  Contact the youtube-dlc server for debugging
+    --no-call-home                   Do NOT contact the youtube-dlc server for
                                      debugging
 
 ## Workarounds:
@@ -370,7 +370,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-dl will ask interactively.
+                                     out, youtube-dlc will ask interactively.
     -2, --twofactor TWOFACTOR        Two-factor authentication code
     -n, --netrc                      Use .netrc authentication data
     --video-password PASSWORD        Video password (vimeo, smotri, youku)
@@ -381,7 +381,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-dl will
+                                     If this option is left out, youtube-dlc will
                                      ask interactively.
     --ap-list-mso                    List all supported multiple-system
                                      operators
@@ -444,6 +444,6 @@ Then simply type this
 
 # COPYRIGHT
 
-youtube-dl is released into the public domain by the copyright holders.
+youtube-dlc is released into the public domain by the copyright holders.
 
 This README file was originally written by [Daniel Bolton](https://github.com/dbbolton) and is likewise released into the public domain.
diff --git a/devscripts/bash-completion.in b/devscripts/bash-completion.in
index 28bd23727..1bf41f2cc 100644
--- a/devscripts/bash-completion.in
+++ b/devscripts/bash-completion.in
@@ -1,4 +1,4 @@
-__youtube_dl()
+__youtube_dlc()
 {
     local cur prev opts fileopts diropts keywords
     COMPREPLY=()
@@ -26,4 +26,4 @@ __youtube_dl()
     fi
 }
 
-complete -F __youtube_dl youtube-dl
+complete -F __youtube_dlc youtube-dlc
diff --git a/devscripts/bash-completion.py b/devscripts/bash-completion.py
index 3d1391334..d68c9b1cc 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_dl
+import youtube_dlc
 
-BASH_COMPLETION_FILE = "youtube-dl.bash-completion"
+BASH_COMPLETION_FILE = "youtube-dlc.bash-completion"
 BASH_COMPLETION_TEMPLATE = "devscripts/bash-completion.in"
 
 
@@ -26,5 +26,5 @@ def build_completion(opt_parser):
         f.write(filled_template)
 
 
-parser = youtube_dl.parseOpts()[0]
+parser = youtube_dlc.parseOpts()[0]
 build_completion(parser)
diff --git a/devscripts/buildserver.py b/devscripts/buildserver.py
index 4a4295ba9..62dbd2cb1 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_dl.compat import (
+from youtube_dlc.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-dl':
+        if self.repoName != 'youtube-dlc':
             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 740f04de0..68a33d823 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_dl.utils import compat_urllib_parse_urlparse
-from youtube_dl.utils import compat_urllib_request
+from youtube_dlc.utils import compat_urllib_parse_urlparse
+from youtube_dlc.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 2ddfa1096..4714d81a6 100644
--- a/devscripts/create-github-release.py
+++ b/devscripts/create-github-release.py
@@ -12,13 +12,13 @@ import sys
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dl.compat import (
+from youtube_dlc.compat import (
     compat_basestring,
     compat_getpass,
     compat_print,
     compat_urllib_request,
 )
-from youtube_dl.utils import (
+from youtube_dlc.utils import (
     make_HTTPS_handler,
     sanitized_Request,
 )
@@ -98,7 +98,7 @@ def main():
     releaser = GitHubReleaser()
 
     new_release = releaser.create_release(
-        version, name='youtube-dl %s' % version, body=body)
+        version, name='youtube-dlc %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 eb79765da..4f08b6d4a 100644
--- a/devscripts/fish-completion.in
+++ b/devscripts/fish-completion.in
@@ -2,4 +2,4 @@
 {{commands}}
 
 
-complete --command youtube-dl --arguments ":ytfavorites :ytrecommended :ytsubscriptions :ytwatchlater :ythistory"
+complete --command youtube-dlc --arguments ":ytfavorites :ytrecommended :ytsubscriptions :ytwatchlater :ythistory"
diff --git a/devscripts/fish-completion.py b/devscripts/fish-completion.py
index 51d19dd33..a27ef44f8 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_dl
-from youtube_dl.utils import shell_quote
+import youtube_dlc
+from youtube_dlc.utils import shell_quote
 
-FISH_COMPLETION_FILE = 'youtube-dl.fish'
+FISH_COMPLETION_FILE = 'youtube-dlc.fish'
 FISH_COMPLETION_TEMPLATE = 'devscripts/fish-completion.in'
 
 EXTRA_ARGS = {
@@ -30,7 +30,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-dl', '--long-option', long_option]
+            complete_cmd = ['complete', '--command', 'youtube-dlc', '--long-option', long_option]
             if option._short_opts:
                 complete_cmd += ['--short-option', option._short_opts[0].strip('-')]
             if option.help != optparse.SUPPRESS_HELP:
@@ -45,5 +45,5 @@ def build_completion(opt_parser):
         f.write(filled_template)
 
 
-parser = youtube_dl.parseOpts()[0]
+parser = youtube_dlc.parseOpts()[0]
 build_completion(parser)
diff --git a/devscripts/generate_aes_testdata.py b/devscripts/generate_aes_testdata.py
index e3df42cc2..c89bb547e 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_dl.utils import intlist_to_bytes
-from youtube_dl.aes import aes_encrypt, key_expansion
+from youtube_dlc.utils import intlist_to_bytes
+from youtube_dlc.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 867ea0048..04588a5ee 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-dl',
-    'exe': 'youtube-dl.exe',
-    'tar': 'youtube-dl-%s.tar.gz' % version}
+    'bin': 'youtube-dlc',
+    'exe': 'youtube-dlc.exe',
+    'tar': 'youtube-dlc-%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 506a62377..b07f1e830 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-dl releases</title>
-        <id>https://yt-dl.org/feed/youtube-dl-updates-feed</id>
+        <title>youtube-dlc releases</title>
+        <id>https://yt-dl.org/feed/youtube-dlc-updates-feed</id>
         <updated>@TIMESTAMP@</updated>
         @ENTRIES@
     </feed>""")
 
 entry_template = textwrap.dedent("""
     <entry>
-        <id>https://yt-dl.org/feed/youtube-dl-updates-feed/youtube-dl-@VERSION@</id>
+        <id>https://yt-dl.org/feed/youtube-dlc-updates-feed/youtube-dlc-@VERSION@</id>
         <title>New version @VERSION@</title>
-        <link href="http://ytdl-org.github.io/youtube-dl" />
+        <link href="http://ytdl-org.github.io/youtube-dlc" />
         <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-dl maintainers</name>
+            <name>The youtube-dlc maintainers</name>
         </author>
         <updated>@TIMESTAMP@</updated>
     </entry>
diff --git a/devscripts/gh-pages/update-sites.py b/devscripts/gh-pages/update-sites.py
index 531c93c70..38acb5d9a 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_dl
+# We must be able to import youtube_dlc
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 
-import youtube_dl
+import youtube_dlc
 
 
 def main():
@@ -16,7 +16,7 @@ def main():
         template = tmplf.read()
 
     ie_htmls = []
-    for ie in youtube_dl.list_extractors(age_limit=None):
+    for ie in youtube_dlc.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 226d1a5d6..f18de0560 100755
--- a/devscripts/make_contributing.py
+++ b/devscripts/make_contributing.py
@@ -20,7 +20,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-DL',
+        r'(?s)(#\s*DEVELOPER INSTRUCTIONS.*?)#\s*EMBEDDING youtube-dlc',
         readme).group(1)
 
     out = bug_text + dev_text
diff --git a/devscripts/make_issue_template.py b/devscripts/make_issue_template.py
index b7ad23d83..37cb0d4ee 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_dl/version.py without importing the package
-    exec(compile(open('youtube_dl/version.py').read(),
-                 'youtube_dl/version.py', 'exec'))
+    # 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'))
 
     out = issue_template_tmpl % {'version': locals()['__version__']}
 
diff --git a/devscripts/make_lazy_extractors.py b/devscripts/make_lazy_extractors.py
index 0a1762dbc..e6de72b33 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_dl.extractor import _ALL_CLASSES
-from youtube_dl.extractor.common import InfoExtractor, SearchInfoExtractor
+from youtube_dlc.extractor import _ALL_CLASSES
+from youtube_dlc.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 764795bc5..0ae6f8aa3 100644
--- a/devscripts/make_supportedsites.py
+++ b/devscripts/make_supportedsites.py
@@ -7,10 +7,10 @@ import os
 import sys
 
 
-# Import youtube_dl
+# Import youtube_dlc
 ROOT_DIR = os.path.join(os.path.dirname(__file__), '..')
 sys.path.insert(0, ROOT_DIR)
-import youtube_dl
+import youtube_dlc
 
 
 def main():
@@ -33,7 +33,7 @@ def main():
                 ie_md += ' (Currently broken)'
             yield ie_md
 
-    ies = sorted(youtube_dl.gen_extractors(), key=lambda i: i.IE_NAME.lower())
+    ies = sorted(youtube_dlc.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 76bf873e1..843ade482 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-DL(1)
+PREFIX = r'''%youtube-dlc(1)
 
 # NAME
 
@@ -16,7 +16,7 @@ youtube\-dl \- download videos from youtube.com or other video platforms
 
 # SYNOPSIS
 
-**youtube-dl** \[OPTIONS\] URL [URL...]
+**youtube-dlc** \[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-dl \[OPTIONS\] URL \[URL\.\.\.\]', '', readme)
+    readme = re.sub(r'\s+youtube-dlc \[OPTIONS\] URL \[URL\.\.\.\]', '', readme)
     readme = PREFIX + readme
 
     readme = filter_options(readme)
diff --git a/devscripts/release.sh b/devscripts/release.sh
index f2411c927..04cb7fec1 100755
--- a/devscripts/release.sh
+++ b/devscripts/release.sh
@@ -53,8 +53,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_dl -type f -not -name '*.py')
-if [ ! -z "$useless_files" ]; then echo "ERROR: Non-.py files in youtube_dl: $useless_files"; 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
 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
@@ -68,18 +68,18 @@ make clean
 if $skip_tests ; then
     echo 'SKIPPING TESTS'
 else
-    nosetests --verbose --with-coverage --cover-package=youtube_dl --cover-html test --stop || exit 1
+    nosetests --verbose --with-coverage --cover-package=youtube_dlc --cover-html test --stop || exit 1
 fi
 
 /bin/echo -e "\n### Changing version in version.py..."
-sed -i "s/__version__ = '.*'/__version__ = '$version'/" youtube_dl/version.py
+sed -i "s/__version__ = '.*'/__version__ = '$version'/" youtube_dlc/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_dl/version.py..."
+/bin/echo -e "\n### Committing documentation, templates and youtube_dlc/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_dl/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 youtube_dlc/version.py ChangeLog
 git commit $gpg_sign_commits -m "release $version"
 
 /bin/echo -e "\n### Now tagging, signing and pushing..."
@@ -94,13 +94,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-dl youtube-dl.tar.gz
+make youtube-dlc youtube-dlc.tar.gz
 read -p "VM running? (y/n) " -n 1
-wget "http://$buildserver/build/ytdl-org/youtube-dl/youtube-dl.exe?rev=$REV" -O youtube-dl.exe
+wget "http://$buildserver/build/ytdl-org/youtube-dl/youtube-dlc.exe?rev=$REV" -O youtube-dlc.exe
 mkdir -p "build/$version"
-mv youtube-dl youtube-dl.exe "build/$version"
-mv youtube-dl.tar.gz "build/$version/youtube-dl-$version.tar.gz"
-RELEASE_FILES="youtube-dl youtube-dl.exe youtube-dl-$version.tar.gz"
+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"
 (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 6c8d1cc2d..ef90a56ab 100644
--- a/devscripts/show-downloads-statistics.py
+++ b/devscripts/show-downloads-statistics.py
@@ -9,11 +9,11 @@ import sys
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dl.compat import (
+from youtube_dlc.compat import (
     compat_print,
     compat_urllib_request,
 )
-from youtube_dl.utils import format_bytes
+from youtube_dlc.utils import format_bytes
 
 
 def format_size(bytes):
@@ -36,9 +36,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-dl$',
-                    r'^youtube-dl-\d{4}\.\d{2}\.\d{2}(?:\.\d+)?\.tar\.gz$',
-                    r'^youtube-dl\.exe$')):
+                    r'^youtube-dlc$',
+                    r'^youtube-dlc-\d{4}\.\d{2}\.\d{2}(?:\.\d+)?\.tar\.gz$',
+                    r'^youtube-dlc\.exe$')):
                 continue
             compat_print(
                 ' %s size: %s downloads: %d'
diff --git a/devscripts/zsh-completion.in b/devscripts/zsh-completion.in
index b394a1ae7..bb021862f 100644
--- a/devscripts/zsh-completion.in
+++ b/devscripts/zsh-completion.in
@@ -1,6 +1,6 @@
-#compdef youtube-dl
+#compdef youtube-dlc
 
-__youtube_dl() {
+__youtube_dlc() {
     local curcontext="$curcontext" fileopts diropts cur prev
     typeset -A opt_args
     fileopts="{{fileopts}}"
@@ -25,4 +25,4 @@ __youtube_dl() {
     esac
 }
 
-__youtube_dl
\ No newline at end of file
+__youtube_dlc
\ No newline at end of file
diff --git a/devscripts/zsh-completion.py b/devscripts/zsh-completion.py
index 60aaf76cc..8b957144f 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_dl
+import youtube_dlc
 
-ZSH_COMPLETION_FILE = "youtube-dl.zsh"
+ZSH_COMPLETION_FILE = "youtube-dlc.zsh"
 ZSH_COMPLETION_TEMPLATE = "devscripts/zsh-completion.in"
 
 
@@ -45,5 +45,5 @@ def build_completion(opt_parser):
         f.write(template)
 
 
-parser = youtube_dl.parseOpts()[0]
+parser = youtube_dlc.parseOpts()[0]
 build_completion(parser)
diff --git a/docs/Makefile b/docs/Makefile
index 712218045..a7159ff45 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-dl.qhcp"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/youtube-dlc.qhcp"
 	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/youtube-dl.qhc"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/youtube-dlc.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-dl"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/youtube-dl"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/youtube-dlc"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/youtube-dlc"
 	@echo "# devhelp"
 
 epub:
diff --git a/docs/conf.py b/docs/conf.py
index 0aaf1b8fc..fa616ebbb 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 #
-# youtube-dl documentation build configuration file, created by
+# 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
@@ -14,7 +14,7 @@
 
 import sys
 import os
-# Allows to import youtube_dl
+# Allows to import youtube_dlc
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 # -- General configuration ------------------------------------------------
@@ -36,7 +36,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'youtube-dl'
+project = u'youtube-dlc'
 copyright = u'2014, Ricardo Garcia Gonzalez'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -44,7 +44,7 @@ copyright = u'2014, Ricardo Garcia Gonzalez'
 # built documents.
 #
 # The short X.Y version.
-from youtube_dl.version import __version__
+from youtube_dlc.version import __version__
 version = __version__
 # The full version, including alpha/beta/rc tags.
 release = version
@@ -68,4 +68,4 @@ html_theme = 'default'
 html_static_path = ['_static']
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'youtube-dldoc'
+htmlhelp_basename = 'youtube-dlcdoc'
diff --git a/docs/index.rst b/docs/index.rst
index b746ff95b..afa26fef1 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,13 +1,13 @@
-Welcome to youtube-dl's documentation!
+Welcome to youtube-dlc's documentation!
 ======================================
 
-*youtube-dl* is a command-line program to download videos from YouTube.com and more sites.
+*youtube-dlc* 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 *youtube-dl* from Python programs.
+This section contains information for using *youtube-dlc* from Python programs.
 
 .. toctree::
     :maxdepth: 2
diff --git a/docs/module_guide.rst b/docs/module_guide.rst
index 03d72882e..6413659cf 100644
--- a/docs/module_guide.rst
+++ b/docs/module_guide.rst
@@ -1,11 +1,11 @@
-Using the ``youtube_dl`` module
+Using the ``youtube_dlc`` module
 ===============================
 
-When using the ``youtube_dl`` module, you start by creating an instance of :class:`YoutubeDL` and adding all the available extractors:
+When using the ``youtube_dlc`` module, you start by creating an instance of :class:`YoutubeDL` and adding all the available extractors:
 
 .. code-block:: python
 
-    >>> from youtube_dl import YoutubeDL
+    >>> from youtube_dlc 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-dl test video "\'/\\ä↭𝕐'
+    'youtube-dlc test video "\'/\\ä↭𝕐'
     >>> info['height'], info['width']
     (720, 1280)
 
diff --git a/make_win.bat b/make_win.bat
index a1f692e17..c5caac08f 100644
--- a/make_win.bat
+++ b/make_win.bat
@@ -1 +1 @@
-pyinstaller.exe youtube_dl\__main__.py --onefile --name youtube-dlc
\ No newline at end of file
+pyinstaller.exe youtube_dlc\__main__.py --onefile --name youtube-dlc
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index da78a9c47..f658aaa0a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,5 +2,5 @@
 universal = True
 
 [flake8]
-exclude = youtube_dl/extractor/__init__.py,devscripts/buildserver.py,devscripts/lazy_load_template.py,devscripts/make_issue_template.py,setup.py,build,.git,venv
+exclude = youtube_dlc/extractor/__init__.py,devscripts/buildserver.py,devscripts/lazy_load_template.py,devscripts/make_issue_template.py,setup.py,build,.git,venv
 ignore = E402,E501,E731,E741,W503
diff --git a/setup.py b/setup.py
index 23553b88a..083f9b0f8 100644
--- a/setup.py
+++ b/setup.py
@@ -7,9 +7,9 @@ import warnings
 import sys
 from distutils.spawn import spawn
 
-# Get the version from youtube_dl/version.py without importing the package
-exec(compile(open('youtube_dl/version.py').read(),
-             'youtube_dl/version.py', 'exec'))
+# 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'))
 
 DESCRIPTION = 'Media downloader supporting various sites such as youtube'
 LONG_DESCRIPTION = 'Command-line program to download videos from YouTube.com and other video sites. Based on a more active community fork.'
@@ -18,10 +18,10 @@ if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
     print("inv")
 else:
     files_spec = [
-        ('etc/bash_completion.d', ['youtube-dl.bash-completion']),
-        ('etc/fish/completions', ['youtube-dl.fish']),
-        ('share/doc/youtube_dl', ['README.txt']),
-        ('share/man/man1', ['youtube-dl.1'])
+        ('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'])
     ]
     root = os.path.dirname(os.path.abspath(__file__))
     data_files = []
@@ -38,7 +38,7 @@ else:
         'data_files': data_files,
     }
     #if setuptools_available:
-    params['entry_points'] = {'console_scripts': ['youtube-dlc = youtube_dl:main']}
+    params['entry_points'] = {'console_scripts': ['youtube-dlc = youtube_dlc:main']}
     #else:
     #    params['scripts'] = ['bin/youtube-dlc']
 
@@ -54,7 +54,7 @@ class build_lazy_extractors(Command):
 
     def run(self):
         spawn(
-            [sys.executable, 'devscripts/make_lazy_extractors.py', 'youtube_dl/extractor/lazy_extractors.py'],
+            [sys.executable, 'devscripts/make_lazy_extractors.py', 'youtube_dlc/extractor/lazy_extractors.py'],
             dry_run=self.dry_run,
         )
 
@@ -69,9 +69,9 @@ setup(
     url="https://github.com/blackjack4494/youtube-dlc",
     # packages=setuptools.find_packages(),
 	packages=[
-        'youtube_dl',
-        'youtube_dl.extractor', 'youtube_dl.downloader',
-        'youtube_dl.postprocessor'],
+        'youtube_dlc',
+        'youtube_dlc.extractor', 'youtube_dlc.downloader',
+        'youtube_dlc.postprocessor'],
     classifiers=[
 	    "Topic :: Multimedia :: Video",
         "Development Status :: 5 - Production/Stable",
diff --git a/test/helper.py b/test/helper.py
index e62aab11e..f45818b0f 100644
--- a/test/helper.py
+++ b/test/helper.py
@@ -10,13 +10,13 @@ import types
 import ssl
 import sys
 
-import youtube_dl.extractor
-from youtube_dl import YoutubeDL
-from youtube_dl.compat import (
+import youtube_dlc.extractor
+from youtube_dlc import YoutubeDL
+from youtube_dlc.compat import (
     compat_os_name,
     compat_str,
 )
-from youtube_dl.utils import (
+from youtube_dlc.utils import (
     preferredencoding,
     write_string,
 )
@@ -90,7 +90,7 @@ class FakeYDL(YoutubeDL):
 
 
 def gettestcases(include_onlymatching=False):
-    for ie in youtube_dl.extractor.gen_extractors():
+    for ie in youtube_dlc.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 71f6608fe..bdd01e41a 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_dl.compat import compat_etree_fromstring, compat_http_server
-from youtube_dl.extractor.common import InfoExtractor
-from youtube_dl.extractor import YoutubeIE, get_info_extractor
-from youtube_dl.utils import encode_data_uri, strip_jsonp, ExtractorError, RegexNotFoundError
+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
 import threading
 
 
diff --git a/test/test_YoutubeDL.py b/test/test_YoutubeDL.py
index 1e204e551..6d02c2a54 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_dl import YoutubeDL
-from youtube_dl.compat import compat_str, compat_urllib_error
-from youtube_dl.extractor import YoutubeIE
-from youtube_dl.extractor.common import InfoExtractor
-from youtube_dl.postprocessor.common import PostProcessor
-from youtube_dl.utils import ExtractorError, match_filter_func
+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
 
 TEST_URL = 'http://localhost/sample.mp4'
 
diff --git a/test/test_YoutubeDLCookieJar.py b/test/test_YoutubeDLCookieJar.py
index 05f48bd74..615d8a9d8 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_dl.utils import YoutubeDLCookieJar
+from youtube_dlc.utils import YoutubeDLCookieJar
 
 
 class TestYoutubeDLCookieJar(unittest.TestCase):
diff --git a/test/test_aes.py b/test/test_aes.py
index cc89fb6ab..ef1e1b189 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_dl.aes import aes_decrypt, aes_encrypt, aes_cbc_decrypt, aes_cbc_encrypt, aes_decrypt_text
-from youtube_dl.utils import bytes_to_intlist, intlist_to_bytes
+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
 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 6f5513faa..b73bdd767 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_dl import YoutubeDL
+from youtube_dlc import YoutubeDL
 
 
 def _download_restricted(url, filename, age):
diff --git a/test/test_all_urls.py b/test/test_all_urls.py
index 81056a999..7b6664cac 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_dl.extractor import (
+from youtube_dlc.extractor import (
     FacebookIE,
     gen_extractors,
     YoutubeIE,
@@ -70,7 +70,7 @@ class TestAllURLsMatching(unittest.TestCase):
 
     def test_youtube_search_matching(self):
         self.assertMatch('http://www.youtube.com/results?search_query=making+mustard', ['youtube:search_url'])
-        self.assertMatch('https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video', ['youtube:search_url'])
+        self.assertMatch('https://www.youtube.com/results?baz=bar&search_query=youtube-dlc+test+video&filters=video&lclk=video', ['youtube:search_url'])
 
     def test_youtube_extract(self):
         assertExtractId = lambda url, id: self.assertEqual(YoutubeIE.extract_id(url), id)
diff --git a/test/test_cache.py b/test/test_cache.py
index a16160142..1167519d1 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_dl.cache import Cache
+from youtube_dlc.cache import Cache
 
 
 def _is_empty(d):
diff --git a/test/test_compat.py b/test/test_compat.py
index 86ff389fd..8c49a001e 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_dl.compat import (
+from youtube_dlc.compat import (
     compat_getenv,
     compat_setenv,
     compat_etree_Element,
@@ -28,11 +28,11 @@ from youtube_dl.compat import (
 class TestCompat(unittest.TestCase):
     def test_compat_getenv(self):
         test_str = 'тест'
-        compat_setenv('YOUTUBE_DL_COMPAT_GETENV', test_str)
-        self.assertEqual(compat_getenv('YOUTUBE_DL_COMPAT_GETENV'), test_str)
+        compat_setenv('youtube_dlc_COMPAT_GETENV', test_str)
+        self.assertEqual(compat_getenv('youtube_dlc_COMPAT_GETENV'), test_str)
 
     def test_compat_setenv(self):
-        test_var = 'YOUTUBE_DL_COMPAT_SETENV'
+        test_var = 'youtube_dlc_COMPAT_SETENV'
         test_str = 'тест'
         compat_setenv(test_var, test_str)
         compat_getenv(test_var)
@@ -46,11 +46,11 @@ class TestCompat(unittest.TestCase):
         compat_setenv('HOME', old_home or '')
 
     def test_all_present(self):
-        import youtube_dl.compat
-        all_names = youtube_dl.compat.__all__
+        import youtube_dlc.compat
+        all_names = youtube_dlc.compat.__all__
         present_names = set(filter(
             lambda c: '_' in c and not c.startswith('_'),
-            dir(youtube_dl.compat))) - set(['unicode_literals'])
+            dir(youtube_dlc.compat))) - set(['unicode_literals'])
         self.assertEqual(all_names, sorted(present_names))
 
     def test_compat_urllib_parse_unquote(self):
diff --git a/test/test_download.py b/test/test_download.py
index ebe820dfc..bcd3b4041 100644
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -24,24 +24,24 @@ import io
 import json
 import socket
 
-import youtube_dl.YoutubeDL
-from youtube_dl.compat import (
+import youtube_dlc.YoutubeDL
+from youtube_dlc.compat import (
     compat_http_client,
     compat_urllib_error,
     compat_HTTPError,
 )
-from youtube_dl.utils import (
+from youtube_dlc.utils import (
     DownloadError,
     ExtractorError,
     format_bytes,
     UnavailableVideoError,
 )
-from youtube_dl.extractor import get_info_extractor
+from youtube_dlc.extractor import get_info_extractor
 
 RETRIES = 3
 
 
-class YoutubeDL(youtube_dl.YoutubeDL):
+class YoutubeDL(youtube_dlc.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_dl.extractor.get_info_extractor(test_case['name'])()
+        ie = youtube_dlc.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 750472281..c8e28bd3a 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_dl import YoutubeDL
-from youtube_dl.compat import compat_http_server
-from youtube_dl.downloader.http import HttpFD
-from youtube_dl.utils import encodeFilename
+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
 import threading
 
 TEST_DIR = os.path.dirname(os.path.abspath(__file__))
diff --git a/test/test_execution.py b/test/test_execution.py
index 11661bb68..b18e63d73 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_dl.utils import encodeArgument
+from youtube_dlc.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_dl'], cwd=rootDir)
+        subprocess.check_call([sys.executable, '-c', 'import youtube_dlc'], 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_dl', '--version'], cwd=rootDir, stdout=_DEV_NULL)
+            subprocess.check_call([sys.executable, '-m', 'youtube_dlc', '--version'], cwd=rootDir, stdout=_DEV_NULL)
 
     def test_main_exec(self):
-        subprocess.check_call([sys.executable, 'youtube_dl/__main__.py', '--version'], cwd=rootDir, stdout=_DEV_NULL)
+        subprocess.check_call([sys.executable, 'youtube_dlc/__main__.py', '--version'], cwd=rootDir, stdout=_DEV_NULL)
 
     def test_cmdline_umlauts(self):
         p = subprocess.Popen(
-            [sys.executable, 'youtube_dl/__main__.py', encodeArgument('ä'), '--version'],
+            [sys.executable, 'youtube_dlc/__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 3ee0a5dda..55c3c6183 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_dl import YoutubeDL
-from youtube_dl.compat import compat_http_server, compat_urllib_request
+from youtube_dlc import YoutubeDL
+from youtube_dlc.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 789059dbe..303609baa 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_dl.extractor import IqiyiIE
+from youtube_dlc.extractor import IqiyiIE
 
 
 class IqiyiIEWithCredentials(IqiyiIE):
diff --git a/test/test_jsinterp.py b/test/test_jsinterp.py
index c24b8ca74..97fc8d5aa 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_dl.jsinterp import JSInterpreter
+from youtube_dlc.jsinterp import JSInterpreter
 
 
 class TestJSInterpreter(unittest.TestCase):
diff --git a/test/test_netrc.py b/test/test_netrc.py
index 7cf3a6a2e..566ba37a6 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_dl.extractor import (
+from youtube_dlc.extractor import (
     gen_extractors,
 )
 
diff --git a/test/test_options.py b/test/test_options.py
index 3a25a6ba3..dce253373 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_dl.options import _hide_login_info
+from youtube_dlc.options import _hide_login_info
 
 
 class TestOptions(unittest.TestCase):
diff --git a/test/test_postprocessors.py b/test/test_postprocessors.py
index 4209d1d9a..6f538a3da 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_dl.postprocessor import MetadataFromTitlePP
+from youtube_dlc.postprocessor import MetadataFromTitlePP
 
 
 class TestMetadataFromTitle(unittest.TestCase):
diff --git a/test/test_socks.py b/test/test_socks.py
index 1e68eb0da..be52e2343 100644
--- a/test/test_socks.py
+++ b/test/test_socks.py
@@ -15,7 +15,7 @@ from test.helper import (
     FakeYDL,
     get_params,
 )
-from youtube_dl.compat import (
+from youtube_dlc.compat import (
     compat_str,
     compat_urllib_request,
 )
diff --git a/test/test_subtitles.py b/test/test_subtitles.py
index 17aaaf20d..3ca03fb6f 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_dl.extractor import (
+from youtube_dlc.extractor import (
     YoutubeIE,
     DailymotionIE,
     TEDIE,
diff --git a/test/test_swfinterp.py b/test/test_swfinterp.py
index 9f18055e6..1a8b353e8 100644
--- a/test/test_swfinterp.py
+++ b/test/test_swfinterp.py
@@ -14,7 +14,7 @@ import json
 import re
 import subprocess
 
-from youtube_dl.swfinterp import SWFInterpreter
+from youtube_dlc.swfinterp import SWFInterpreter
 
 
 TEST_DIR = os.path.join(
diff --git a/test/test_update.py b/test/test_update.py
index d9c71511d..1b144c43c 100644
--- a/test/test_update.py
+++ b/test/test_update.py
@@ -10,7 +10,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
 import json
-from youtube_dl.update import rsa_verify
+from youtube_dlc.update import rsa_verify
 
 
 class TestUpdate(unittest.TestCase):
diff --git a/test/test_utils.py b/test/test_utils.py
index 0896f4150..663a34e07 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_dl.utils import (
+from youtube_dlc.utils import (
     age_restricted,
     args_to_str,
     encode_base_n,
@@ -105,7 +105,7 @@ from youtube_dl.utils import (
     cli_bool_option,
     parse_codecs,
 )
-from youtube_dl.compat import (
+from youtube_dlc.compat import (
     compat_chr,
     compat_etree_fromstring,
     compat_getenv,
@@ -240,12 +240,12 @@ class TestUtil(unittest.TestCase):
         def env(var):
             return '%{0}%'.format(var) if sys.platform == 'win32' else '${0}'.format(var)
 
-        compat_setenv('YOUTUBE_DL_EXPATH_PATH', 'expanded')
-        self.assertEqual(expand_path(env('YOUTUBE_DL_EXPATH_PATH')), 'expanded')
+        compat_setenv('youtube_dlc_EXPATH_PATH', 'expanded')
+        self.assertEqual(expand_path(env('youtube_dlc_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_DL_EXPATH_PATH')),
+            expand_path('~/%s' % env('youtube_dlc_EXPATH_PATH')),
             '%s/expanded' % compat_getenv('HOME'))
 
     def test_prepend_extension(self):
@@ -1388,8 +1388,8 @@ Line 1
         self.assertEqual(caesar('ebg', 'acegik', -2), 'abc')
 
     def test_rot47(self):
-        self.assertEqual(rot47('youtube-dl'), r'J@FEF36\5=')
-        self.assertEqual(rot47('YOUTUBE-DL'), r'*~&%&qt\s{')
+        self.assertEqual(rot47('youtube-dlc'), r'J@FEF36\5=')
+        self.assertEqual(rot47('youtube-dlc'), r'*~&%&qt\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 c1465fe8c..462f25e03 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_dl/__main__.py', '-v',
+                sys.executable, 'youtube_dlc/__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_dl/__main__.py', '-v',
+                sys.executable, 'youtube_dlc/__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_dl/__main__.py', '-v',
+                sys.executable, 'youtube_dlc/__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_dl/__main__.py', '-v',
+                sys.executable, 'youtube_dlc/__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 41abdfe3b..d98c96c15 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_dl.YoutubeDL
-import youtube_dl.extractor
+import youtube_dlc.YoutubeDL
+import youtube_dlc.extractor
 
 
-class YoutubeDL(youtube_dl.YoutubeDL):
+class YoutubeDL(youtube_dlc.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_dl.extractor.YoutubeIE()
+        ie = youtube_dlc.extractor.YoutubeIE()
         ydl = YoutubeDL(params)
         ydl.add_info_extractor(ie)
         ydl.download([TEST_ID])
diff --git a/test/test_youtube_chapters.py b/test/test_youtube_chapters.py
index e69c57377..4529d2e84 100644
--- a/test/test_youtube_chapters.py
+++ b/test/test_youtube_chapters.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 expect_value
-from youtube_dl.extractor import YoutubeIE
+from youtube_dlc.extractor import YoutubeIE
 
 
 class TestYoutubeChapters(unittest.TestCase):
diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py
index c4f0abbea..a693963ef 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_dl.extractor import (
+from youtube_dlc.extractor import (
     YoutubePlaylistIE,
     YoutubeIE,
 )
diff --git a/test/test_youtube_signature.py b/test/test_youtube_signature.py
index 69df30eda..a54b36198 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_dl.extractor import YoutubeIE
-from youtube_dl.compat import compat_str, compat_urlretrieve
+from youtube_dlc.extractor import YoutubeIE
+from youtube_dlc.compat import compat_str, compat_urlretrieve
 
 _TESTS = [
     (
diff --git a/tox.ini b/tox.ini
index 9c4e4a3d1..842091d65 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_dl --cover-html
+commands = nosetests --verbose {posargs:{[testenv]defaultargs}}  # --with-coverage --cover-package=youtube_dlc --cover-html
                                                # test.test_download:TestDownload.test_NowVideo
diff --git a/youtube-dl.plugin.zsh b/youtube-dl.plugin.zsh
index 17ab1341a..27537ee11 100644
--- a/youtube-dl.plugin.zsh
+++ b/youtube-dl.plugin.zsh
@@ -1,4 +1,4 @@
-# This allows the youtube-dl command to be installed in ZSH using antigen.
+# This allows the youtube-dlc command to be installed in ZSH using antigen.
 # Antigen is a bundle manager. It allows you to enhance the functionality of
 # your zsh session by installing bundles and themes easily.
 
@@ -6,11 +6,11 @@
 # http://antigen.sharats.me/
 # https://github.com/zsh-users/antigen
 
-# Install youtube-dl:
+# Install youtube-dlc:
 # antigen bundle ytdl-org/youtube-dl
 # Bundles installed by antigen are available for use immediately.
 
-# Update youtube-dl (and all other antigen bundles):
+# Update youtube-dlc (and all other antigen bundles):
 # antigen update
 
 # The antigen command will download the git repository to a folder and then
@@ -18,7 +18,7 @@
 # code is documented here:
 # https://github.com/zsh-users/antigen#notes-on-writing-plugins
 
-# This specific script just aliases youtube-dl to the python script that this
+# This specific script just aliases youtube-dlc to the python script that this
 # library provides. This requires updating the PYTHONPATH to ensure that the
 # full set of code can be located.
-alias youtube-dl="PYTHONPATH=$(dirname $0) $(dirname $0)/bin/youtube-dl"
+alias youtube-dlc="PYTHONPATH=$(dirname $0) $(dirname $0)/bin/youtube-dlc"
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dlc/YoutubeDL.py
index 0dc869d56..f79d31deb 100755..100644
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dlc/YoutubeDL.py
@@ -228,7 +228,7 @@ class YoutubeDL(object):
                        playlist items.
     postprocessors:    A list of dictionaries, each with an entry
                        * key:  The name of the postprocessor. See
-                               youtube_dl/postprocessor/__init__.py for a list.
+                               youtube_dlc/postprocessor/__init__.py for a list.
                        as well as any further keyword arguments for the
                        postprocessor.
     progress_hooks:    A list of functions that get called on download
@@ -264,7 +264,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-dl servers for debugging.
+                       youtube-dlc servers for debugging.
     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
@@ -301,7 +301,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_dl/downloader/common.py):
+    the downloader (see youtube_dlc/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,
@@ -441,7 +441,7 @@ class YoutubeDL(object):
             if re.match(r'^-[0-9A-Za-z_-]{10}$', a)]
         if idxs:
             correct_argv = (
-                ['youtube-dl']
+                ['youtube-dlc']
                 + [a for i, a in enumerate(argv) if i not in idxs]
                 + ['--'] + [argv[i] for i in idxs]
             )
@@ -2254,7 +2254,7 @@ class YoutubeDL(object):
                 self.get_encoding()))
         write_string(encoding_str, encoding=None)
 
-        self._write_string('[debug] youtube-dl version ' + __version__ + '\n')
+        self._write_string('[debug] youtube-dlc version ' + __version__ + '\n')
         if _LAZY_LOADER:
             self._write_string('[debug] Lazy loading extractors enabled' + '\n')
         try:
@@ -2352,7 +2352,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-dl for security reasons')
+            raise compat_urllib_error.URLError('file:// scheme is explicitly disabled in youtube-dlc for security reasons')
         file_handler.file_open = file_open
 
         opener = compat_urllib_request.build_opener(
diff --git a/youtube_dl/__init__.py b/youtube_dlc/__init__.py
index 9a659fc65..a663417da 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dlc/__init__.py
@@ -53,7 +53,7 @@ def _real_main(argv=None):
 
     workaround_optparse_bug9161()
 
-    setproctitle('youtube-dl')
+    setproctitle('youtube-dlc')
 
     parser, opts, args = parseOpts(argv)
 
@@ -455,7 +455,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-dl --help to see a list of all options.')
+                'Type youtube-dlc --help to see a list of all options.')
 
         try:
             if opts.load_info_filename is not None:
diff --git a/youtube_dl/__main__.py b/youtube_dlc/__main__.py
index 138f5fbec..0e7601686 100755..100644
--- a/youtube_dl/__main__.py
+++ b/youtube_dlc/__main__.py
@@ -2,8 +2,8 @@
 from __future__ import unicode_literals
 
 # Execute with
-# $ python youtube_dl/__main__.py (2.6+)
-# $ python -m youtube_dl          (2.7+)
+# $ python youtube_dlc/__main__.py (2.6+)
+# $ python -m youtube_dlc          (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_dl
+import youtube_dlc
 
 if __name__ == '__main__':
-    youtube_dl.main()
+    youtube_dlc.main()
diff --git a/youtube_dl/aes.py b/youtube_dlc/aes.py
index 461bb6d41..461bb6d41 100644
--- a/youtube_dl/aes.py
+++ b/youtube_dlc/aes.py
diff --git a/youtube_dl/cache.py b/youtube_dlc/cache.py
index 7bdade1bd..ada6aa1f2 100644
--- a/youtube_dl/cache.py
+++ b/youtube_dlc/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-dl')
+            res = os.path.join(cache_root, 'youtube-dlc')
         return expand_path(res)
 
     def _get_cache_fn(self, section, key, dtype):
diff --git a/youtube_dl/compat.py b/youtube_dlc/compat.py
index 0ee9bc760..1cf7efed6 100644
--- a/youtube_dl/compat.py
+++ b/youtube_dlc/compat.py
@@ -2973,7 +2973,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-dl one [2].
+    # names, see the original PyPy issue [1] and the youtube-dlc 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_dl/downloader/__init__.py b/youtube_dlc/downloader/__init__.py
index 4ae81f516..4ae81f516 100644
--- a/youtube_dl/downloader/__init__.py
+++ b/youtube_dlc/downloader/__init__.py
diff --git a/youtube_dl/downloader/common.py b/youtube_dlc/downloader/common.py
index 1cdba89cd..31c286458 100644
--- a/youtube_dl/downloader/common.py
+++ b/youtube_dlc/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-dl ' + msg)
+        self.to_console_title('youtube-dlc ' + msg)
 
     def report_progress(self, s):
         if s['status'] == 'finished':
diff --git a/youtube_dl/downloader/dash.py b/youtube_dlc/downloader/dash.py
index c6d674bc6..c6d674bc6 100644
--- a/youtube_dl/downloader/dash.py
+++ b/youtube_dlc/downloader/dash.py
diff --git a/youtube_dl/downloader/external.py b/youtube_dlc/downloader/external.py
index c31f8910a..c31f8910a 100644
--- a/youtube_dl/downloader/external.py
+++ b/youtube_dlc/downloader/external.py
diff --git a/youtube_dl/downloader/f4m.py b/youtube_dlc/downloader/f4m.py
index 8dd3c2eeb..8dd3c2eeb 100644
--- a/youtube_dl/downloader/f4m.py
+++ b/youtube_dlc/downloader/f4m.py
diff --git a/youtube_dl/downloader/fragment.py b/youtube_dlc/downloader/fragment.py
index 02f35459e..9339b3a62 100644
--- a/youtube_dl/downloader/fragment.py
+++ b/youtube_dlc/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-dl keeps on disk a special
+    For each incomplete fragment download youtube-dlc 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-dl). This file is
+    be used for any incomplete download handled by youtube-dlc). 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_dl/downloader/hls.py b/youtube_dlc/downloader/hls.py
index 84bc34928..84bc34928 100644
--- a/youtube_dl/downloader/hls.py
+++ b/youtube_dlc/downloader/hls.py
diff --git a/youtube_dl/downloader/http.py b/youtube_dlc/downloader/http.py
index 5046878df..5046878df 100644
--- a/youtube_dl/downloader/http.py
+++ b/youtube_dlc/downloader/http.py
diff --git a/youtube_dl/downloader/ism.py b/youtube_dlc/downloader/ism.py
index 1ca666b4a..1ca666b4a 100644
--- a/youtube_dl/downloader/ism.py
+++ b/youtube_dlc/downloader/ism.py
diff --git a/youtube_dl/downloader/rtmp.py b/youtube_dlc/downloader/rtmp.py
index fbb7f51b0..fbb7f51b0 100644
--- a/youtube_dl/downloader/rtmp.py
+++ b/youtube_dlc/downloader/rtmp.py
diff --git a/youtube_dl/downloader/rtsp.py b/youtube_dlc/downloader/rtsp.py
index 939358b2a..939358b2a 100644
--- a/youtube_dl/downloader/rtsp.py
+++ b/youtube_dlc/downloader/rtsp.py
diff --git a/youtube_dl/downloader/youtube_live_chat.py b/youtube_dlc/downloader/youtube_live_chat.py
index 4932dd9c5..4932dd9c5 100644
--- a/youtube_dl/downloader/youtube_live_chat.py
+++ b/youtube_dlc/downloader/youtube_live_chat.py
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dlc/extractor/__init__.py
index 18d8dbcd6..18d8dbcd6 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dlc/extractor/__init__.py
diff --git a/youtube_dl/extractor/abc.py b/youtube_dlc/extractor/abc.py
index 6637f4f35..6637f4f35 100644
--- a/youtube_dl/extractor/abc.py
+++ b/youtube_dlc/extractor/abc.py
diff --git a/youtube_dl/extractor/abcnews.py b/youtube_dlc/extractor/abcnews.py
index 8b407bf9c..8b407bf9c 100644
--- a/youtube_dl/extractor/abcnews.py
+++ b/youtube_dlc/extractor/abcnews.py
diff --git a/youtube_dl/extractor/abcotvs.py b/youtube_dlc/extractor/abcotvs.py
index 0bc69a64f..0bc69a64f 100644
--- a/youtube_dl/extractor/abcotvs.py
+++ b/youtube_dlc/extractor/abcotvs.py
diff --git a/youtube_dl/extractor/academicearth.py b/youtube_dlc/extractor/academicearth.py
index 34095501c..34095501c 100644
--- a/youtube_dl/extractor/academicearth.py
+++ b/youtube_dlc/extractor/academicearth.py
diff --git a/youtube_dl/extractor/acast.py b/youtube_dlc/extractor/acast.py
index b17c792d2..b17c792d2 100644
--- a/youtube_dl/extractor/acast.py
+++ b/youtube_dlc/extractor/acast.py
diff --git a/youtube_dl/extractor/adn.py b/youtube_dlc/extractor/adn.py
index c95ad2173..c95ad2173 100644
--- a/youtube_dl/extractor/adn.py
+++ b/youtube_dlc/extractor/adn.py
diff --git a/youtube_dl/extractor/adobeconnect.py b/youtube_dlc/extractor/adobeconnect.py
index 728549eb9..728549eb9 100644
--- a/youtube_dl/extractor/adobeconnect.py
+++ b/youtube_dlc/extractor/adobeconnect.py
diff --git a/youtube_dl/extractor/adobepass.py b/youtube_dlc/extractor/adobepass.py
index 38dca1b0a..38dca1b0a 100644
--- a/youtube_dl/extractor/adobepass.py
+++ b/youtube_dlc/extractor/adobepass.py
diff --git a/youtube_dl/extractor/adobetv.py b/youtube_dlc/extractor/adobetv.py
index 80060f037..80060f037 100644
--- a/youtube_dl/extractor/adobetv.py
+++ b/youtube_dlc/extractor/adobetv.py
diff --git a/youtube_dl/extractor/adultswim.py b/youtube_dlc/extractor/adultswim.py
index 8d1d9ac7d..8d1d9ac7d 100644
--- a/youtube_dl/extractor/adultswim.py
+++ b/youtube_dlc/extractor/adultswim.py
diff --git a/youtube_dl/extractor/aenetworks.py b/youtube_dlc/extractor/aenetworks.py
index 611b948f5..611b948f5 100644
--- a/youtube_dl/extractor/aenetworks.py
+++ b/youtube_dlc/extractor/aenetworks.py
diff --git a/youtube_dl/extractor/afreecatv.py b/youtube_dlc/extractor/afreecatv.py
index 6275e5209..6275e5209 100644
--- a/youtube_dl/extractor/afreecatv.py
+++ b/youtube_dlc/extractor/afreecatv.py
diff --git a/youtube_dl/extractor/airmozilla.py b/youtube_dlc/extractor/airmozilla.py
index 9e38136b4..9e38136b4 100644
--- a/youtube_dl/extractor/airmozilla.py
+++ b/youtube_dlc/extractor/airmozilla.py
diff --git a/youtube_dl/extractor/aliexpress.py b/youtube_dlc/extractor/aliexpress.py
index 6f241e683..6f241e683 100644
--- a/youtube_dl/extractor/aliexpress.py
+++ b/youtube_dlc/extractor/aliexpress.py
diff --git a/youtube_dl/extractor/aljazeera.py b/youtube_dlc/extractor/aljazeera.py
index c68be3134..c68be3134 100644
--- a/youtube_dl/extractor/aljazeera.py
+++ b/youtube_dlc/extractor/aljazeera.py
diff --git a/youtube_dl/extractor/allocine.py b/youtube_dlc/extractor/allocine.py
index cd533acfc..cd533acfc 100644
--- a/youtube_dl/extractor/allocine.py
+++ b/youtube_dlc/extractor/allocine.py
diff --git a/youtube_dl/extractor/alphaporno.py b/youtube_dlc/extractor/alphaporno.py
index 3a6d99f6b..3a6d99f6b 100644
--- a/youtube_dl/extractor/alphaporno.py
+++ b/youtube_dlc/extractor/alphaporno.py
diff --git a/youtube_dl/extractor/amcnetworks.py b/youtube_dlc/extractor/amcnetworks.py
index 6fb3d6c53..6fb3d6c53 100644
--- a/youtube_dl/extractor/amcnetworks.py
+++ b/youtube_dlc/extractor/amcnetworks.py
diff --git a/youtube_dl/extractor/americastestkitchen.py b/youtube_dlc/extractor/americastestkitchen.py
index 9c9d77ae1..9c9d77ae1 100644
--- a/youtube_dl/extractor/americastestkitchen.py
+++ b/youtube_dlc/extractor/americastestkitchen.py
diff --git a/youtube_dl/extractor/amp.py b/youtube_dlc/extractor/amp.py
index 7ff098cfa..7ff098cfa 100644
--- a/youtube_dl/extractor/amp.py
+++ b/youtube_dlc/extractor/amp.py
diff --git a/youtube_dl/extractor/animeondemand.py b/youtube_dlc/extractor/animeondemand.py
index 00ce684d1..00ce684d1 100644
--- a/youtube_dl/extractor/animeondemand.py
+++ b/youtube_dlc/extractor/animeondemand.py
diff --git a/youtube_dl/extractor/anvato.py b/youtube_dlc/extractor/anvato.py
index 84e841035..84e841035 100644
--- a/youtube_dl/extractor/anvato.py
+++ b/youtube_dlc/extractor/anvato.py
diff --git a/youtube_dl/extractor/aol.py b/youtube_dlc/extractor/aol.py
index e87994a6a..e87994a6a 100644
--- a/youtube_dl/extractor/aol.py
+++ b/youtube_dlc/extractor/aol.py
diff --git a/youtube_dl/extractor/apa.py b/youtube_dlc/extractor/apa.py
index 98ccdaa4a..98ccdaa4a 100644
--- a/youtube_dl/extractor/apa.py
+++ b/youtube_dlc/extractor/apa.py
diff --git a/youtube_dl/extractor/aparat.py b/youtube_dlc/extractor/aparat.py
index 883dcee7a..883dcee7a 100644
--- a/youtube_dl/extractor/aparat.py
+++ b/youtube_dlc/extractor/aparat.py
diff --git a/youtube_dl/extractor/appleconnect.py b/youtube_dlc/extractor/appleconnect.py
index a84b8b1eb..a84b8b1eb 100644
--- a/youtube_dl/extractor/appleconnect.py
+++ b/youtube_dlc/extractor/appleconnect.py
diff --git a/youtube_dl/extractor/appletrailers.py b/youtube_dlc/extractor/appletrailers.py
index a9ef733e0..b5ed2b88b 100644
--- a/youtube_dl/extractor/appletrailers.py
+++ b/youtube_dlc/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-dl)',
+                    'User-Agent': 'QuickTime compatible (youtube-dlc)',
                 },
             })
 
diff --git a/youtube_dl/extractor/archiveorg.py b/youtube_dlc/extractor/archiveorg.py
index c79c58e82..c79c58e82 100644
--- a/youtube_dl/extractor/archiveorg.py
+++ b/youtube_dlc/extractor/archiveorg.py
diff --git a/youtube_dl/extractor/ard.py b/youtube_dlc/extractor/ard.py
index 5b7b2dd6d..5b7b2dd6d 100644
--- a/youtube_dl/extractor/ard.py
+++ b/youtube_dlc/extractor/ard.py
diff --git a/youtube_dl/extractor/arkena.py b/youtube_dlc/extractor/arkena.py
index 854f58767..854f58767 100644
--- a/youtube_dl/extractor/arkena.py
+++ b/youtube_dlc/extractor/arkena.py
diff --git a/youtube_dl/extractor/arte.py b/youtube_dlc/extractor/arte.py
index 2bd3bfe8a..2bd3bfe8a 100644
--- a/youtube_dl/extractor/arte.py
+++ b/youtube_dlc/extractor/arte.py
diff --git a/youtube_dl/extractor/asiancrush.py b/youtube_dlc/extractor/asiancrush.py
index 0348e680c..0348e680c 100644
--- a/youtube_dl/extractor/asiancrush.py
+++ b/youtube_dlc/extractor/asiancrush.py
diff --git a/youtube_dl/extractor/atresplayer.py b/youtube_dlc/extractor/atresplayer.py
index c2cec9845..c2cec9845 100644
--- a/youtube_dl/extractor/atresplayer.py
+++ b/youtube_dlc/extractor/atresplayer.py
diff --git a/youtube_dl/extractor/atttechchannel.py b/youtube_dlc/extractor/atttechchannel.py
index 8f93fb353..8f93fb353 100644
--- a/youtube_dl/extractor/atttechchannel.py
+++ b/youtube_dlc/extractor/atttechchannel.py
diff --git a/youtube_dl/extractor/atvat.py b/youtube_dlc/extractor/atvat.py
index 95e572d70..95e572d70 100644
--- a/youtube_dl/extractor/atvat.py
+++ b/youtube_dlc/extractor/atvat.py
diff --git a/youtube_dl/extractor/audimedia.py b/youtube_dlc/extractor/audimedia.py
index 6bd48ef15..6bd48ef15 100644
--- a/youtube_dl/extractor/audimedia.py
+++ b/youtube_dlc/extractor/audimedia.py
diff --git a/youtube_dl/extractor/audioboom.py b/youtube_dlc/extractor/audioboom.py
index c51837b40..c51837b40 100644
--- a/youtube_dl/extractor/audioboom.py
+++ b/youtube_dlc/extractor/audioboom.py
diff --git a/youtube_dl/extractor/audiomack.py b/youtube_dlc/extractor/audiomack.py
index cc7771354..cc7771354 100644
--- a/youtube_dl/extractor/audiomack.py
+++ b/youtube_dlc/extractor/audiomack.py
diff --git a/youtube_dl/extractor/awaan.py b/youtube_dlc/extractor/awaan.py
index a2603bbff..a2603bbff 100644
--- a/youtube_dl/extractor/awaan.py
+++ b/youtube_dlc/extractor/awaan.py
diff --git a/youtube_dl/extractor/aws.py b/youtube_dlc/extractor/aws.py
index dccfeaf73..dccfeaf73 100644
--- a/youtube_dl/extractor/aws.py
+++ b/youtube_dlc/extractor/aws.py
diff --git a/youtube_dl/extractor/azmedien.py b/youtube_dlc/extractor/azmedien.py
index b1e20def5..b1e20def5 100644
--- a/youtube_dl/extractor/azmedien.py
+++ b/youtube_dlc/extractor/azmedien.py
diff --git a/youtube_dl/extractor/baidu.py b/youtube_dlc/extractor/baidu.py
index 234a661d3..234a661d3 100644
--- a/youtube_dl/extractor/baidu.py
+++ b/youtube_dlc/extractor/baidu.py
diff --git a/youtube_dl/extractor/bandcamp.py b/youtube_dlc/extractor/bandcamp.py
index f14b407dc..b8a57e6a5 100644
--- a/youtube_dl/extractor/bandcamp.py
+++ b/youtube_dlc/extractor/bandcamp.py
@@ -28,12 +28,12 @@ from ..utils import (
 class BandcampIE(InfoExtractor):
     _VALID_URL = r'https?://[^/]+\.bandcamp\.com/track/(?P<title>[^/?#&]+)'
     _TESTS = [{
-        'url': 'http://youtube-dl.bandcamp.com/track/youtube-dl-test-song',
+        'url': 'http://youtube-dlc.bandcamp.com/track/youtube-dlc-test-song',
         'md5': 'c557841d5e50261777a6585648adf439',
         'info_dict': {
             'id': '1812978515',
             'ext': 'mp3',
-            'title': "youtube-dl  \"'/\\\u00e4\u21ad - youtube-dl test song \"'/\\\u00e4\u21ad",
+            'title': "youtube-dlc  \"'/\\\u00e4\u21ad - youtube-dlc test song \"'/\\\u00e4\u21ad",
             'duration': 9.8485,
         },
         '_skip': 'There is a limit of 200 free downloads / month for the test song'
diff --git a/youtube_dl/extractor/bbc.py b/youtube_dlc/extractor/bbc.py
index 002c39c39..002c39c39 100644
--- a/youtube_dl/extractor/bbc.py
+++ b/youtube_dlc/extractor/bbc.py
diff --git a/youtube_dl/extractor/beampro.py b/youtube_dlc/extractor/beampro.py
index 86abdae00..86abdae00 100644
--- a/youtube_dl/extractor/beampro.py
+++ b/youtube_dlc/extractor/beampro.py
diff --git a/youtube_dl/extractor/beatport.py b/youtube_dlc/extractor/beatport.py
index e60709417..e60709417 100644
--- a/youtube_dl/extractor/beatport.py
+++ b/youtube_dlc/extractor/beatport.py
diff --git a/youtube_dl/extractor/beeg.py b/youtube_dlc/extractor/beeg.py
index 5788d13ba..5788d13ba 100644
--- a/youtube_dl/extractor/beeg.py
+++ b/youtube_dlc/extractor/beeg.py
diff --git a/youtube_dl/extractor/behindkink.py b/youtube_dlc/extractor/behindkink.py
index 9bca853b3..9bca853b3 100644
--- a/youtube_dl/extractor/behindkink.py
+++ b/youtube_dlc/extractor/behindkink.py
diff --git a/youtube_dl/extractor/bellmedia.py b/youtube_dlc/extractor/bellmedia.py
index 9f9de96c6..9f9de96c6 100644
--- a/youtube_dl/extractor/bellmedia.py
+++ b/youtube_dlc/extractor/bellmedia.py
diff --git a/youtube_dl/extractor/bet.py b/youtube_dlc/extractor/bet.py
index d7ceaa85e..d7ceaa85e 100644
--- a/youtube_dl/extractor/bet.py
+++ b/youtube_dlc/extractor/bet.py
diff --git a/youtube_dl/extractor/bfi.py b/youtube_dlc/extractor/bfi.py
index 60c8944b5..60c8944b5 100644
--- a/youtube_dl/extractor/bfi.py
+++ b/youtube_dlc/extractor/bfi.py
diff --git a/youtube_dl/extractor/bigflix.py b/youtube_dlc/extractor/bigflix.py
index 28e3e59f6..28e3e59f6 100644
--- a/youtube_dl/extractor/bigflix.py
+++ b/youtube_dlc/extractor/bigflix.py
diff --git a/youtube_dl/extractor/bild.py b/youtube_dlc/extractor/bild.py
index b8dfbd42b..b8dfbd42b 100644
--- a/youtube_dl/extractor/bild.py
+++ b/youtube_dlc/extractor/bild.py
diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dlc/extractor/bilibili.py
index 4dc597e16..d39ee8ffe 100644
--- a/youtube_dl/extractor/bilibili.py
+++ b/youtube_dlc/extractor/bilibili.py
@@ -139,7 +139,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-dl with %s' % (
+                self.to_screen('Downloading episode %s. To download all videos in anime %s, re-run youtube-dlc 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_dl/extractor/biobiochiletv.py b/youtube_dlc/extractor/biobiochiletv.py
index dc86c57c5..dc86c57c5 100644
--- a/youtube_dl/extractor/biobiochiletv.py
+++ b/youtube_dlc/extractor/biobiochiletv.py
diff --git a/youtube_dl/extractor/biqle.py b/youtube_dlc/extractor/biqle.py
index 17ebbb257..17ebbb257 100644
--- a/youtube_dl/extractor/biqle.py
+++ b/youtube_dlc/extractor/biqle.py
diff --git a/youtube_dl/extractor/bitchute.py b/youtube_dlc/extractor/bitchute.py
index 0c773e66e..0c773e66e 100644
--- a/youtube_dl/extractor/bitchute.py
+++ b/youtube_dlc/extractor/bitchute.py
diff --git a/youtube_dl/extractor/bleacherreport.py b/youtube_dlc/extractor/bleacherreport.py
index dc60224d0..dc60224d0 100644
--- a/youtube_dl/extractor/bleacherreport.py
+++ b/youtube_dlc/extractor/bleacherreport.py
diff --git a/youtube_dl/extractor/blinkx.py b/youtube_dlc/extractor/blinkx.py
index db5e12b21..db5e12b21 100644
--- a/youtube_dl/extractor/blinkx.py
+++ b/youtube_dlc/extractor/blinkx.py
diff --git a/youtube_dl/extractor/bloomberg.py b/youtube_dlc/extractor/bloomberg.py
index 2fbfad1ba..2fbfad1ba 100644
--- a/youtube_dl/extractor/bloomberg.py
+++ b/youtube_dlc/extractor/bloomberg.py
diff --git a/youtube_dl/extractor/bokecc.py b/youtube_dlc/extractor/bokecc.py
index 6017e8344..6017e8344 100644
--- a/youtube_dl/extractor/bokecc.py
+++ b/youtube_dlc/extractor/bokecc.py
diff --git a/youtube_dl/extractor/bostonglobe.py b/youtube_dlc/extractor/bostonglobe.py
index 57882fbee..57882fbee 100644
--- a/youtube_dl/extractor/bostonglobe.py
+++ b/youtube_dlc/extractor/bostonglobe.py
diff --git a/youtube_dl/extractor/bpb.py b/youtube_dlc/extractor/bpb.py
index 07833532e..07833532e 100644
--- a/youtube_dl/extractor/bpb.py
+++ b/youtube_dlc/extractor/bpb.py
diff --git a/youtube_dl/extractor/br.py b/youtube_dlc/extractor/br.py
index 9bde7f2d8..9bde7f2d8 100644
--- a/youtube_dl/extractor/br.py
+++ b/youtube_dlc/extractor/br.py
diff --git a/youtube_dl/extractor/bravotv.py b/youtube_dlc/extractor/bravotv.py
index b9715df00..b9715df00 100644
--- a/youtube_dl/extractor/bravotv.py
+++ b/youtube_dlc/extractor/bravotv.py
diff --git a/youtube_dl/extractor/breakcom.py b/youtube_dlc/extractor/breakcom.py
index 68c7cf2bb..68c7cf2bb 100644
--- a/youtube_dl/extractor/breakcom.py
+++ b/youtube_dlc/extractor/breakcom.py
diff --git a/youtube_dl/extractor/brightcove.py b/youtube_dlc/extractor/brightcove.py
index 2aa9f4782..2aa9f4782 100644
--- a/youtube_dl/extractor/brightcove.py
+++ b/youtube_dlc/extractor/brightcove.py
diff --git a/youtube_dl/extractor/businessinsider.py b/youtube_dlc/extractor/businessinsider.py
index 73a57b1e4..73a57b1e4 100644
--- a/youtube_dl/extractor/businessinsider.py
+++ b/youtube_dlc/extractor/businessinsider.py
diff --git a/youtube_dl/extractor/buzzfeed.py b/youtube_dlc/extractor/buzzfeed.py
index ec411091e..ec411091e 100644
--- a/youtube_dl/extractor/buzzfeed.py
+++ b/youtube_dlc/extractor/buzzfeed.py
diff --git a/youtube_dl/extractor/byutv.py b/youtube_dlc/extractor/byutv.py
index 0b11bf11f..0b11bf11f 100644
--- a/youtube_dl/extractor/byutv.py
+++ b/youtube_dlc/extractor/byutv.py
diff --git a/youtube_dl/extractor/c56.py b/youtube_dlc/extractor/c56.py
index cac8fdcba..cac8fdcba 100644
--- a/youtube_dl/extractor/c56.py
+++ b/youtube_dlc/extractor/c56.py
diff --git a/youtube_dl/extractor/camdemy.py b/youtube_dlc/extractor/camdemy.py
index 8f0c6c545..8f0c6c545 100644
--- a/youtube_dl/extractor/camdemy.py
+++ b/youtube_dlc/extractor/camdemy.py
diff --git a/youtube_dl/extractor/cammodels.py b/youtube_dlc/extractor/cammodels.py
index 1eb81b75e..1eb81b75e 100644
--- a/youtube_dl/extractor/cammodels.py
+++ b/youtube_dlc/extractor/cammodels.py
diff --git a/youtube_dl/extractor/camtube.py b/youtube_dlc/extractor/camtube.py
index b3be3bdcf..b3be3bdcf 100644
--- a/youtube_dl/extractor/camtube.py
+++ b/youtube_dlc/extractor/camtube.py
diff --git a/youtube_dl/extractor/camwithher.py b/youtube_dlc/extractor/camwithher.py
index bbc5205fd..bbc5205fd 100644
--- a/youtube_dl/extractor/camwithher.py
+++ b/youtube_dlc/extractor/camwithher.py
diff --git a/youtube_dl/extractor/canalc2.py b/youtube_dlc/extractor/canalc2.py
index 407cc8084..407cc8084 100644
--- a/youtube_dl/extractor/canalc2.py
+++ b/youtube_dlc/extractor/canalc2.py
diff --git a/youtube_dl/extractor/canalplus.py b/youtube_dlc/extractor/canalplus.py
index 51c11cb7e..51c11cb7e 100644
--- a/youtube_dl/extractor/canalplus.py
+++ b/youtube_dlc/extractor/canalplus.py
diff --git a/youtube_dl/extractor/canvas.py b/youtube_dlc/extractor/canvas.py
index 8667a0d04..8667a0d04 100644
--- a/youtube_dl/extractor/canvas.py
+++ b/youtube_dlc/extractor/canvas.py
diff --git a/youtube_dl/extractor/carambatv.py b/youtube_dlc/extractor/carambatv.py
index b57b86af7..b57b86af7 100644
--- a/youtube_dl/extractor/carambatv.py
+++ b/youtube_dlc/extractor/carambatv.py
diff --git a/youtube_dl/extractor/cartoonnetwork.py b/youtube_dlc/extractor/cartoonnetwork.py
index 48b33617f..48b33617f 100644
--- a/youtube_dl/extractor/cartoonnetwork.py
+++ b/youtube_dlc/extractor/cartoonnetwork.py
diff --git a/youtube_dl/extractor/cbc.py b/youtube_dlc/extractor/cbc.py
index fd5ec6033..fd5ec6033 100644
--- a/youtube_dl/extractor/cbc.py
+++ b/youtube_dlc/extractor/cbc.py
diff --git a/youtube_dl/extractor/cbs.py b/youtube_dlc/extractor/cbs.py
index 4a19a73d2..4a19a73d2 100644
--- a/youtube_dl/extractor/cbs.py
+++ b/youtube_dlc/extractor/cbs.py
diff --git a/youtube_dl/extractor/cbsinteractive.py b/youtube_dlc/extractor/cbsinteractive.py
index 6596e98a6..6596e98a6 100644
--- a/youtube_dl/extractor/cbsinteractive.py
+++ b/youtube_dlc/extractor/cbsinteractive.py
diff --git a/youtube_dl/extractor/cbslocal.py b/youtube_dlc/extractor/cbslocal.py
index 90852a9ef..90852a9ef 100644
--- a/youtube_dl/extractor/cbslocal.py
+++ b/youtube_dlc/extractor/cbslocal.py
diff --git a/youtube_dl/extractor/cbsnews.py b/youtube_dlc/extractor/cbsnews.py
index 345debcf0..345debcf0 100644
--- a/youtube_dl/extractor/cbsnews.py
+++ b/youtube_dlc/extractor/cbsnews.py
diff --git a/youtube_dl/extractor/cbssports.py b/youtube_dlc/extractor/cbssports.py
index 83b764762..83b764762 100644
--- a/youtube_dl/extractor/cbssports.py
+++ b/youtube_dlc/extractor/cbssports.py
diff --git a/youtube_dl/extractor/ccc.py b/youtube_dlc/extractor/ccc.py
index 36e6dff72..36e6dff72 100644
--- a/youtube_dl/extractor/ccc.py
+++ b/youtube_dlc/extractor/ccc.py
diff --git a/youtube_dl/extractor/ccma.py b/youtube_dlc/extractor/ccma.py
index 544647f92..544647f92 100644
--- a/youtube_dl/extractor/ccma.py
+++ b/youtube_dlc/extractor/ccma.py
diff --git a/youtube_dl/extractor/cctv.py b/youtube_dlc/extractor/cctv.py
index c76f361c6..c76f361c6 100644
--- a/youtube_dl/extractor/cctv.py
+++ b/youtube_dlc/extractor/cctv.py
diff --git a/youtube_dl/extractor/cda.py b/youtube_dlc/extractor/cda.py
index 0c3af23d5..0c3af23d5 100644
--- a/youtube_dl/extractor/cda.py
+++ b/youtube_dlc/extractor/cda.py
diff --git a/youtube_dl/extractor/ceskatelevize.py b/youtube_dlc/extractor/ceskatelevize.py
index 7cb4efb74..7cb4efb74 100644
--- a/youtube_dl/extractor/ceskatelevize.py
+++ b/youtube_dlc/extractor/ceskatelevize.py
diff --git a/youtube_dl/extractor/channel9.py b/youtube_dlc/extractor/channel9.py
index 09cacf6d3..09cacf6d3 100644
--- a/youtube_dl/extractor/channel9.py
+++ b/youtube_dlc/extractor/channel9.py
diff --git a/youtube_dl/extractor/charlierose.py b/youtube_dlc/extractor/charlierose.py
index 42c9af263..42c9af263 100644
--- a/youtube_dl/extractor/charlierose.py
+++ b/youtube_dlc/extractor/charlierose.py
diff --git a/youtube_dl/extractor/chaturbate.py b/youtube_dlc/extractor/chaturbate.py
index a459dcb8d..a459dcb8d 100644
--- a/youtube_dl/extractor/chaturbate.py
+++ b/youtube_dlc/extractor/chaturbate.py
diff --git a/youtube_dl/extractor/chilloutzone.py b/youtube_dlc/extractor/chilloutzone.py
index 5aac21299..5aac21299 100644
--- a/youtube_dl/extractor/chilloutzone.py
+++ b/youtube_dlc/extractor/chilloutzone.py
diff --git a/youtube_dl/extractor/chirbit.py b/youtube_dlc/extractor/chirbit.py
index 8d75cdf19..8d75cdf19 100644
--- a/youtube_dl/extractor/chirbit.py
+++ b/youtube_dlc/extractor/chirbit.py
diff --git a/youtube_dl/extractor/cinchcast.py b/youtube_dlc/extractor/cinchcast.py
index b861d54b0..b861d54b0 100644
--- a/youtube_dl/extractor/cinchcast.py
+++ b/youtube_dlc/extractor/cinchcast.py
diff --git a/youtube_dl/extractor/cinemax.py b/youtube_dlc/extractor/cinemax.py
index 7f89d33de..7f89d33de 100644
--- a/youtube_dl/extractor/cinemax.py
+++ b/youtube_dlc/extractor/cinemax.py
diff --git a/youtube_dl/extractor/ciscolive.py b/youtube_dlc/extractor/ciscolive.py
index da404e4dc..da404e4dc 100644
--- a/youtube_dl/extractor/ciscolive.py
+++ b/youtube_dlc/extractor/ciscolive.py
diff --git a/youtube_dl/extractor/cjsw.py b/youtube_dlc/extractor/cjsw.py
index 505bdbe16..505bdbe16 100644
--- a/youtube_dl/extractor/cjsw.py
+++ b/youtube_dlc/extractor/cjsw.py
diff --git a/youtube_dl/extractor/cliphunter.py b/youtube_dlc/extractor/cliphunter.py
index f2ca7a337..f2ca7a337 100644
--- a/youtube_dl/extractor/cliphunter.py
+++ b/youtube_dlc/extractor/cliphunter.py
diff --git a/youtube_dl/extractor/clippit.py b/youtube_dlc/extractor/clippit.py
index a1a7a774c..a1a7a774c 100644
--- a/youtube_dl/extractor/clippit.py
+++ b/youtube_dlc/extractor/clippit.py
diff --git a/youtube_dl/extractor/cliprs.py b/youtube_dlc/extractor/cliprs.py
index d55b26d59..d55b26d59 100644
--- a/youtube_dl/extractor/cliprs.py
+++ b/youtube_dlc/extractor/cliprs.py
diff --git a/youtube_dl/extractor/clipsyndicate.py b/youtube_dlc/extractor/clipsyndicate.py
index 6cdb42f5a..6cdb42f5a 100644
--- a/youtube_dl/extractor/clipsyndicate.py
+++ b/youtube_dlc/extractor/clipsyndicate.py
diff --git a/youtube_dl/extractor/closertotruth.py b/youtube_dlc/extractor/closertotruth.py
index 26243d52d..26243d52d 100644
--- a/youtube_dl/extractor/closertotruth.py
+++ b/youtube_dlc/extractor/closertotruth.py
diff --git a/youtube_dl/extractor/cloudflarestream.py b/youtube_dlc/extractor/cloudflarestream.py
index 2fdcfbb3a..2fdcfbb3a 100644
--- a/youtube_dl/extractor/cloudflarestream.py
+++ b/youtube_dlc/extractor/cloudflarestream.py
diff --git a/youtube_dl/extractor/cloudy.py b/youtube_dlc/extractor/cloudy.py
index 85ca20ecc..85ca20ecc 100644
--- a/youtube_dl/extractor/cloudy.py
+++ b/youtube_dlc/extractor/cloudy.py
diff --git a/youtube_dl/extractor/clubic.py b/youtube_dlc/extractor/clubic.py
index 98f9cb596..98f9cb596 100644
--- a/youtube_dl/extractor/clubic.py
+++ b/youtube_dlc/extractor/clubic.py
diff --git a/youtube_dl/extractor/clyp.py b/youtube_dlc/extractor/clyp.py
index 06d04de13..06d04de13 100644
--- a/youtube_dl/extractor/clyp.py
+++ b/youtube_dlc/extractor/clyp.py
diff --git a/youtube_dl/extractor/cmt.py b/youtube_dlc/extractor/cmt.py
index e701fbeab..e701fbeab 100644
--- a/youtube_dl/extractor/cmt.py
+++ b/youtube_dlc/extractor/cmt.py
diff --git a/youtube_dl/extractor/cnbc.py b/youtube_dlc/extractor/cnbc.py
index 6889b0f40..6889b0f40 100644
--- a/youtube_dl/extractor/cnbc.py
+++ b/youtube_dlc/extractor/cnbc.py
diff --git a/youtube_dl/extractor/cnn.py b/youtube_dlc/extractor/cnn.py
index 774b71055..774b71055 100644
--- a/youtube_dl/extractor/cnn.py
+++ b/youtube_dlc/extractor/cnn.py
diff --git a/youtube_dl/extractor/comedycentral.py b/youtube_dlc/extractor/comedycentral.py
index d08b909a6..d08b909a6 100644
--- a/youtube_dl/extractor/comedycentral.py
+++ b/youtube_dlc/extractor/comedycentral.py
diff --git a/youtube_dl/extractor/common.py b/youtube_dlc/extractor/common.py
index a61753b17..c1ea5d846 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dlc/extractor/common.py
@@ -269,7 +269,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-dl it
+    webpage_url:    The URL to the video webpage, if given to youtube-dlc 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
@@ -1500,7 +1500,7 @@ class InfoExtractor(object):
         if not isinstance(manifest, compat_etree_Element) and not fatal:
             return []
 
-        # currently youtube-dl cannot decode the playerVerificationChallenge as Akamai uses Adobe Alchemy
+        # currently youtube-dlc 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_dl/extractor/commonmistakes.py b/youtube_dlc/extractor/commonmistakes.py
index 7e12499b1..933b89eb3 100644
--- a/youtube_dl/extractor/commonmistakes.py
+++ b/youtube_dlc/extractor/commonmistakes.py
@@ -22,12 +22,12 @@ class CommonMistakesIE(InfoExtractor):
 
     def _real_extract(self, url):
         msg = (
-            'You\'ve asked youtube-dl to download the URL "%s". '
+            'You\'ve asked youtube-dlc 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-dl got.'
+            msg += ' Add -v to the command line to see what arguments and configuration youtube-dlc got.'
         raise ExtractorError(msg, expected=True)
 
 
diff --git a/youtube_dl/extractor/commonprotocols.py b/youtube_dlc/extractor/commonprotocols.py
index d98331a4e..d98331a4e 100644
--- a/youtube_dl/extractor/commonprotocols.py
+++ b/youtube_dlc/extractor/commonprotocols.py
diff --git a/youtube_dl/extractor/condenast.py b/youtube_dlc/extractor/condenast.py
index ed278fefc..ed278fefc 100644
--- a/youtube_dl/extractor/condenast.py
+++ b/youtube_dlc/extractor/condenast.py
diff --git a/youtube_dl/extractor/contv.py b/youtube_dlc/extractor/contv.py
index 84b462d40..84b462d40 100644
--- a/youtube_dl/extractor/contv.py
+++ b/youtube_dlc/extractor/contv.py
diff --git a/youtube_dl/extractor/corus.py b/youtube_dlc/extractor/corus.py
index e11aadf14..e11aadf14 100644
--- a/youtube_dl/extractor/corus.py
+++ b/youtube_dlc/extractor/corus.py
diff --git a/youtube_dl/extractor/coub.py b/youtube_dlc/extractor/coub.py
index 6ea03e65c..6ea03e65c 100644
--- a/youtube_dl/extractor/coub.py
+++ b/youtube_dlc/extractor/coub.py
diff --git a/youtube_dl/extractor/cracked.py b/youtube_dlc/extractor/cracked.py
index f77a68ece..f77a68ece 100644
--- a/youtube_dl/extractor/cracked.py
+++ b/youtube_dlc/extractor/cracked.py
diff --git a/youtube_dl/extractor/crackle.py b/youtube_dlc/extractor/crackle.py
index 49bf3a4f9..49bf3a4f9 100644
--- a/youtube_dl/extractor/crackle.py
+++ b/youtube_dlc/extractor/crackle.py
diff --git a/youtube_dl/extractor/crooksandliars.py b/youtube_dlc/extractor/crooksandliars.py
index 7fb782db7..7fb782db7 100644
--- a/youtube_dl/extractor/crooksandliars.py
+++ b/youtube_dlc/extractor/crooksandliars.py
diff --git a/youtube_dl/extractor/crunchyroll.py b/youtube_dlc/extractor/crunchyroll.py
index bc2d1fa8b..bc2d1fa8b 100644
--- a/youtube_dl/extractor/crunchyroll.py
+++ b/youtube_dlc/extractor/crunchyroll.py
diff --git a/youtube_dl/extractor/cspan.py b/youtube_dlc/extractor/cspan.py
index 67d6df4b0..67d6df4b0 100644
--- a/youtube_dl/extractor/cspan.py
+++ b/youtube_dlc/extractor/cspan.py
diff --git a/youtube_dl/extractor/ctsnews.py b/youtube_dlc/extractor/ctsnews.py
index 679f1d92e..679f1d92e 100644
--- a/youtube_dl/extractor/ctsnews.py
+++ b/youtube_dlc/extractor/ctsnews.py
diff --git a/youtube_dl/extractor/ctvnews.py b/youtube_dlc/extractor/ctvnews.py
index 03f8cefb7..03f8cefb7 100644
--- a/youtube_dl/extractor/ctvnews.py
+++ b/youtube_dlc/extractor/ctvnews.py
diff --git a/youtube_dl/extractor/cultureunplugged.py b/youtube_dlc/extractor/cultureunplugged.py
index bcdf27323..bcdf27323 100644
--- a/youtube_dl/extractor/cultureunplugged.py
+++ b/youtube_dlc/extractor/cultureunplugged.py
diff --git a/youtube_dl/extractor/curiositystream.py b/youtube_dlc/extractor/curiositystream.py
index e4a7fca6c..e4a7fca6c 100644
--- a/youtube_dl/extractor/curiositystream.py
+++ b/youtube_dlc/extractor/curiositystream.py
diff --git a/youtube_dl/extractor/cwtv.py b/youtube_dlc/extractor/cwtv.py
index 73382431b..73382431b 100644
--- a/youtube_dl/extractor/cwtv.py
+++ b/youtube_dlc/extractor/cwtv.py
diff --git a/youtube_dl/extractor/dailymail.py b/youtube_dlc/extractor/dailymail.py
index 67b88fd56..67b88fd56 100644
--- a/youtube_dl/extractor/dailymail.py
+++ b/youtube_dlc/extractor/dailymail.py
diff --git a/youtube_dl/extractor/dailymotion.py b/youtube_dlc/extractor/dailymotion.py
index b8529050c..b8529050c 100644
--- a/youtube_dl/extractor/dailymotion.py
+++ b/youtube_dlc/extractor/dailymotion.py
diff --git a/youtube_dl/extractor/daum.py b/youtube_dlc/extractor/daum.py
index 137095577..137095577 100644
--- a/youtube_dl/extractor/daum.py
+++ b/youtube_dlc/extractor/daum.py
diff --git a/youtube_dl/extractor/dbtv.py b/youtube_dlc/extractor/dbtv.py
index aaedf2e3d..aaedf2e3d 100644
--- a/youtube_dl/extractor/dbtv.py
+++ b/youtube_dlc/extractor/dbtv.py
diff --git a/youtube_dl/extractor/dctp.py b/youtube_dlc/extractor/dctp.py
index e700f8d86..e700f8d86 100644
--- a/youtube_dl/extractor/dctp.py
+++ b/youtube_dlc/extractor/dctp.py
diff --git a/youtube_dl/extractor/deezer.py b/youtube_dlc/extractor/deezer.py
index a38b2683d..a38b2683d 100644
--- a/youtube_dl/extractor/deezer.py
+++ b/youtube_dlc/extractor/deezer.py
diff --git a/youtube_dl/extractor/defense.py b/youtube_dlc/extractor/defense.py
index 9fe144e14..9fe144e14 100644
--- a/youtube_dl/extractor/defense.py
+++ b/youtube_dlc/extractor/defense.py
diff --git a/youtube_dl/extractor/democracynow.py b/youtube_dlc/extractor/democracynow.py
index 5c9c0ecdc..5c9c0ecdc 100644
--- a/youtube_dl/extractor/democracynow.py
+++ b/youtube_dlc/extractor/democracynow.py
diff --git a/youtube_dl/extractor/dfb.py b/youtube_dlc/extractor/dfb.py
index a4d0448c2..a4d0448c2 100644
--- a/youtube_dl/extractor/dfb.py
+++ b/youtube_dlc/extractor/dfb.py
diff --git a/youtube_dl/extractor/dhm.py b/youtube_dlc/extractor/dhm.py
index aee72a6ed..aee72a6ed 100644
--- a/youtube_dl/extractor/dhm.py
+++ b/youtube_dlc/extractor/dhm.py
diff --git a/youtube_dl/extractor/digg.py b/youtube_dlc/extractor/digg.py
index 913c1750f..913c1750f 100644
--- a/youtube_dl/extractor/digg.py
+++ b/youtube_dlc/extractor/digg.py
diff --git a/youtube_dl/extractor/digiteka.py b/youtube_dlc/extractor/digiteka.py
index 3dfde0d8c..3dfde0d8c 100644
--- a/youtube_dl/extractor/digiteka.py
+++ b/youtube_dlc/extractor/digiteka.py
diff --git a/youtube_dl/extractor/discovery.py b/youtube_dlc/extractor/discovery.py
index e0139cc86..e0139cc86 100644
--- a/youtube_dl/extractor/discovery.py
+++ b/youtube_dlc/extractor/discovery.py
diff --git a/youtube_dl/extractor/discoverygo.py b/youtube_dlc/extractor/discoverygo.py
index 9e7b14a7d..9e7b14a7d 100644
--- a/youtube_dl/extractor/discoverygo.py
+++ b/youtube_dlc/extractor/discoverygo.py
diff --git a/youtube_dl/extractor/discoverynetworks.py b/youtube_dlc/extractor/discoverynetworks.py
index 607a54948..607a54948 100644
--- a/youtube_dl/extractor/discoverynetworks.py
+++ b/youtube_dlc/extractor/discoverynetworks.py
diff --git a/youtube_dl/extractor/discoveryvr.py b/youtube_dlc/extractor/discoveryvr.py
index cb63c2649..cb63c2649 100644
--- a/youtube_dl/extractor/discoveryvr.py
+++ b/youtube_dlc/extractor/discoveryvr.py
diff --git a/youtube_dl/extractor/disney.py b/youtube_dlc/extractor/disney.py
index 0eee82fd6..0eee82fd6 100644
--- a/youtube_dl/extractor/disney.py
+++ b/youtube_dlc/extractor/disney.py
diff --git a/youtube_dl/extractor/dispeak.py b/youtube_dlc/extractor/dispeak.py
index c345e0274..c345e0274 100644
--- a/youtube_dl/extractor/dispeak.py
+++ b/youtube_dlc/extractor/dispeak.py
diff --git a/youtube_dl/extractor/dlive.py b/youtube_dlc/extractor/dlive.py
index d95c67a5b..d95c67a5b 100644
--- a/youtube_dl/extractor/dlive.py
+++ b/youtube_dlc/extractor/dlive.py
diff --git a/youtube_dl/extractor/doodstream.py b/youtube_dlc/extractor/doodstream.py
index 2c9ea6898..2c9ea6898 100644
--- a/youtube_dl/extractor/doodstream.py
+++ b/youtube_dlc/extractor/doodstream.py
diff --git a/youtube_dl/extractor/dotsub.py b/youtube_dlc/extractor/dotsub.py
index 148605c0b..148605c0b 100644
--- a/youtube_dl/extractor/dotsub.py
+++ b/youtube_dlc/extractor/dotsub.py
diff --git a/youtube_dl/extractor/douyutv.py b/youtube_dlc/extractor/douyutv.py
index 9757f4422..9757f4422 100644
--- a/youtube_dl/extractor/douyutv.py
+++ b/youtube_dlc/extractor/douyutv.py
diff --git a/youtube_dl/extractor/dplay.py b/youtube_dlc/extractor/dplay.py
index a7b9db568..a7b9db568 100644
--- a/youtube_dl/extractor/dplay.py
+++ b/youtube_dlc/extractor/dplay.py
diff --git a/youtube_dl/extractor/drbonanza.py b/youtube_dlc/extractor/drbonanza.py
index 164e97c36..164e97c36 100644
--- a/youtube_dl/extractor/drbonanza.py
+++ b/youtube_dlc/extractor/drbonanza.py
diff --git a/youtube_dl/extractor/dreisat.py b/youtube_dlc/extractor/dreisat.py
index 848d387d1..848d387d1 100644
--- a/youtube_dl/extractor/dreisat.py
+++ b/youtube_dlc/extractor/dreisat.py
diff --git a/youtube_dl/extractor/dropbox.py b/youtube_dlc/extractor/dropbox.py
index 14b6c00b0..9dc6614c5 100644
--- a/youtube_dl/extractor/dropbox.py
+++ b/youtube_dlc/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-dl%20test%20video%20%27%C3%A4%22BaW_jenozKc.mp4?dl=0',
+            'url': 'https://www.dropbox.com/s/nelirfsxnmcfbfh/youtube-dlc%20test%20video%20%27%C3%A4%22BaW_jenozKc.mp4?dl=0',
             'info_dict': {
                 'id': 'nelirfsxnmcfbfh',
                 'ext': 'mp4',
-                'title': 'youtube-dl test video \'ä"BaW_jenozKc'
+                'title': 'youtube-dlc test video \'ä"BaW_jenozKc'
             }
         }, {
             'url': 'https://www.dropbox.com/sh/662glsejgzoj9sr/AAByil3FGH9KFNZ13e08eSa1a/Pregame%20Ceremony%20Program%20PA%2020140518.m4v',
diff --git a/youtube_dl/extractor/drtuber.py b/youtube_dlc/extractor/drtuber.py
index 2baea585b..2baea585b 100644
--- a/youtube_dl/extractor/drtuber.py
+++ b/youtube_dlc/extractor/drtuber.py
diff --git a/youtube_dl/extractor/drtv.py b/youtube_dlc/extractor/drtv.py
index 390e79f8c..390e79f8c 100644
--- a/youtube_dl/extractor/drtv.py
+++ b/youtube_dlc/extractor/drtv.py
diff --git a/youtube_dl/extractor/dtube.py b/youtube_dlc/extractor/dtube.py
index 114d2dbe3..114d2dbe3 100644
--- a/youtube_dl/extractor/dtube.py
+++ b/youtube_dlc/extractor/dtube.py
diff --git a/youtube_dl/extractor/dumpert.py b/youtube_dlc/extractor/dumpert.py
index d9d9afdec..d9d9afdec 100644
--- a/youtube_dl/extractor/dumpert.py
+++ b/youtube_dlc/extractor/dumpert.py
diff --git a/youtube_dl/extractor/dvtv.py b/youtube_dlc/extractor/dvtv.py
index de7f6d670..de7f6d670 100644
--- a/youtube_dl/extractor/dvtv.py
+++ b/youtube_dlc/extractor/dvtv.py
diff --git a/youtube_dl/extractor/dw.py b/youtube_dlc/extractor/dw.py
index d740652f1..d740652f1 100644
--- a/youtube_dl/extractor/dw.py
+++ b/youtube_dlc/extractor/dw.py
diff --git a/youtube_dl/extractor/eagleplatform.py b/youtube_dlc/extractor/eagleplatform.py
index 36fef07b7..36fef07b7 100644
--- a/youtube_dl/extractor/eagleplatform.py
+++ b/youtube_dlc/extractor/eagleplatform.py
diff --git a/youtube_dl/extractor/ebaumsworld.py b/youtube_dlc/extractor/ebaumsworld.py
index c97682cd3..c97682cd3 100644
--- a/youtube_dl/extractor/ebaumsworld.py
+++ b/youtube_dlc/extractor/ebaumsworld.py
diff --git a/youtube_dl/extractor/echomsk.py b/youtube_dlc/extractor/echomsk.py
index 6b7cc652f..6b7cc652f 100644
--- a/youtube_dl/extractor/echomsk.py
+++ b/youtube_dlc/extractor/echomsk.py
diff --git a/youtube_dl/extractor/egghead.py b/youtube_dlc/extractor/egghead.py
index df11dc206..df11dc206 100644
--- a/youtube_dl/extractor/egghead.py
+++ b/youtube_dlc/extractor/egghead.py
diff --git a/youtube_dl/extractor/ehow.py b/youtube_dlc/extractor/ehow.py
index b1cd4f5d4..b1cd4f5d4 100644
--- a/youtube_dl/extractor/ehow.py
+++ b/youtube_dlc/extractor/ehow.py
diff --git a/youtube_dl/extractor/eighttracks.py b/youtube_dlc/extractor/eighttracks.py
index 9a44f89f3..5ededd31d 100644
--- a/youtube_dl/extractor/eighttracks.py
+++ b/youtube_dlc/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-dl-test-tracks-a',
+        'url': 'http://8tracks.com/ytdl/youtube-dlc-test-tracks-a',
         'info_dict': {
             'id': '1336550',
-            'display_id': 'youtube-dl-test-tracks-a',
+            'display_id': 'youtube-dlc-test-tracks-a',
             'description': "test chars:  \"'/\\ä↭",
-            'title': "youtube-dl test tracks \"'/\\ä↭<>",
+            'title': "youtube-dlc test tracks \"'/\\ä↭<>",
         },
         'playlist': [
             {
@@ -31,7 +31,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885610',
                     'ext': 'm4a',
-                    'title': "youtue-dl project<>\"' - youtube-dl test track 1 \"'/\\\u00e4\u21ad",
+                    'title': "youtue-dl project<>\"' - youtube-dlc test track 1 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             },
@@ -40,7 +40,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885608',
                     'ext': 'm4a',
-                    'title': "youtube-dl project - youtube-dl test track 2 \"'/\\\u00e4\u21ad",
+                    'title': "youtube-dlc project - youtube-dlc test track 2 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             },
@@ -49,7 +49,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885679',
                     'ext': 'm4a',
-                    'title': "youtube-dl project as well - youtube-dl test track 3 \"'/\\\u00e4\u21ad",
+                    'title': "youtube-dlc project as well - youtube-dlc test track 3 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             },
@@ -58,7 +58,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885680',
                     'ext': 'm4a',
-                    'title': "youtube-dl project as well - youtube-dl test track 4 \"'/\\\u00e4\u21ad",
+                    'title': "youtube-dlc project as well - youtube-dlc test track 4 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             },
@@ -67,7 +67,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885682',
                     'ext': 'm4a',
-                    'title': "PH - youtube-dl test track 5 \"'/\\\u00e4\u21ad",
+                    'title': "PH - youtube-dlc test track 5 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             },
@@ -76,7 +76,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885683',
                     'ext': 'm4a',
-                    'title': "PH - youtube-dl test track 6 \"'/\\\u00e4\u21ad",
+                    'title': "PH - youtube-dlc test track 6 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             },
@@ -85,7 +85,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885684',
                     'ext': 'm4a',
-                    'title': "phihag - youtube-dl test track 7 \"'/\\\u00e4\u21ad",
+                    'title': "phihag - youtube-dlc test track 7 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             },
@@ -94,7 +94,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885685',
                     'ext': 'm4a',
-                    'title': "phihag - youtube-dl test track 8 \"'/\\\u00e4\u21ad",
+                    'title': "phihag - youtube-dlc test track 8 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             }
diff --git a/youtube_dl/extractor/einthusan.py b/youtube_dlc/extractor/einthusan.py
index 4e0f8bc81..4e0f8bc81 100644
--- a/youtube_dl/extractor/einthusan.py
+++ b/youtube_dlc/extractor/einthusan.py
diff --git a/youtube_dl/extractor/eitb.py b/youtube_dlc/extractor/eitb.py
index ee5ead18b..ee5ead18b 100644
--- a/youtube_dl/extractor/eitb.py
+++ b/youtube_dlc/extractor/eitb.py
diff --git a/youtube_dl/extractor/ellentube.py b/youtube_dlc/extractor/ellentube.py
index 544473274..544473274 100644
--- a/youtube_dl/extractor/ellentube.py
+++ b/youtube_dlc/extractor/ellentube.py
diff --git a/youtube_dl/extractor/elpais.py b/youtube_dlc/extractor/elpais.py
index b89f6db62..b89f6db62 100644
--- a/youtube_dl/extractor/elpais.py
+++ b/youtube_dlc/extractor/elpais.py
diff --git a/youtube_dl/extractor/embedly.py b/youtube_dlc/extractor/embedly.py
index a5820b21e..a5820b21e 100644
--- a/youtube_dl/extractor/embedly.py
+++ b/youtube_dlc/extractor/embedly.py
diff --git a/youtube_dl/extractor/engadget.py b/youtube_dlc/extractor/engadget.py
index 65635c18b..65635c18b 100644
--- a/youtube_dl/extractor/engadget.py
+++ b/youtube_dlc/extractor/engadget.py
diff --git a/youtube_dl/extractor/eporner.py b/youtube_dlc/extractor/eporner.py
index fe42821c7..fe42821c7 100644
--- a/youtube_dl/extractor/eporner.py
+++ b/youtube_dlc/extractor/eporner.py
diff --git a/youtube_dl/extractor/eroprofile.py b/youtube_dlc/extractor/eroprofile.py
index c08643a17..c08643a17 100644
--- a/youtube_dl/extractor/eroprofile.py
+++ b/youtube_dlc/extractor/eroprofile.py
diff --git a/youtube_dl/extractor/escapist.py b/youtube_dlc/extractor/escapist.py
index 4cd815ebc..4cd815ebc 100644
--- a/youtube_dl/extractor/escapist.py
+++ b/youtube_dlc/extractor/escapist.py
diff --git a/youtube_dl/extractor/espn.py b/youtube_dlc/extractor/espn.py
index 6cf05e6da..6cf05e6da 100644
--- a/youtube_dl/extractor/espn.py
+++ b/youtube_dlc/extractor/espn.py
diff --git a/youtube_dl/extractor/esri.py b/youtube_dlc/extractor/esri.py
index e9dcaeb1d..e9dcaeb1d 100644
--- a/youtube_dl/extractor/esri.py
+++ b/youtube_dlc/extractor/esri.py
diff --git a/youtube_dl/extractor/europa.py b/youtube_dlc/extractor/europa.py
index 1efc0b2ec..1efc0b2ec 100644
--- a/youtube_dl/extractor/europa.py
+++ b/youtube_dlc/extractor/europa.py
diff --git a/youtube_dl/extractor/everyonesmixtape.py b/youtube_dlc/extractor/everyonesmixtape.py
index 84a9b750e..84a9b750e 100644
--- a/youtube_dl/extractor/everyonesmixtape.py
+++ b/youtube_dlc/extractor/everyonesmixtape.py
diff --git a/youtube_dl/extractor/expotv.py b/youtube_dlc/extractor/expotv.py
index 95a897782..95a897782 100644
--- a/youtube_dl/extractor/expotv.py
+++ b/youtube_dlc/extractor/expotv.py
diff --git a/youtube_dl/extractor/expressen.py b/youtube_dlc/extractor/expressen.py
index f79365038..f79365038 100644
--- a/youtube_dl/extractor/expressen.py
+++ b/youtube_dlc/extractor/expressen.py
diff --git a/youtube_dl/extractor/extractors.py b/youtube_dlc/extractor/extractors.py
index e213b1bea..e213b1bea 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dlc/extractor/extractors.py
diff --git a/youtube_dl/extractor/extremetube.py b/youtube_dlc/extractor/extremetube.py
index acd4090fa..acd4090fa 100644
--- a/youtube_dl/extractor/extremetube.py
+++ b/youtube_dlc/extractor/extremetube.py
diff --git a/youtube_dl/extractor/eyedotv.py b/youtube_dlc/extractor/eyedotv.py
index f62ddebae..f62ddebae 100644
--- a/youtube_dl/extractor/eyedotv.py
+++ b/youtube_dlc/extractor/eyedotv.py
diff --git a/youtube_dl/extractor/facebook.py b/youtube_dlc/extractor/facebook.py
index 610d66745..610d66745 100644
--- a/youtube_dl/extractor/facebook.py
+++ b/youtube_dlc/extractor/facebook.py
diff --git a/youtube_dl/extractor/faz.py b/youtube_dlc/extractor/faz.py
index 312ee2aee..312ee2aee 100644
--- a/youtube_dl/extractor/faz.py
+++ b/youtube_dlc/extractor/faz.py
diff --git a/youtube_dl/extractor/fc2.py b/youtube_dlc/extractor/fc2.py
index 435561147..435561147 100644
--- a/youtube_dl/extractor/fc2.py
+++ b/youtube_dlc/extractor/fc2.py
diff --git a/youtube_dl/extractor/fczenit.py b/youtube_dlc/extractor/fczenit.py
index 8db7c5963..8db7c5963 100644
--- a/youtube_dl/extractor/fczenit.py
+++ b/youtube_dlc/extractor/fczenit.py
diff --git a/youtube_dl/extractor/filmon.py b/youtube_dlc/extractor/filmon.py
index f775fe0ba..f775fe0ba 100644
--- a/youtube_dl/extractor/filmon.py
+++ b/youtube_dlc/extractor/filmon.py
diff --git a/youtube_dl/extractor/filmweb.py b/youtube_dlc/extractor/filmweb.py
index 56000bc5b..56000bc5b 100644
--- a/youtube_dl/extractor/filmweb.py
+++ b/youtube_dlc/extractor/filmweb.py
diff --git a/youtube_dl/extractor/firsttv.py b/youtube_dlc/extractor/firsttv.py
index 28617d83c..28617d83c 100644
--- a/youtube_dl/extractor/firsttv.py
+++ b/youtube_dlc/extractor/firsttv.py
diff --git a/youtube_dl/extractor/fivemin.py b/youtube_dlc/extractor/fivemin.py
index f3f876ecd..f3f876ecd 100644
--- a/youtube_dl/extractor/fivemin.py
+++ b/youtube_dlc/extractor/fivemin.py
diff --git a/youtube_dl/extractor/fivetv.py b/youtube_dlc/extractor/fivetv.py
index c4c0f1b3d..c4c0f1b3d 100644
--- a/youtube_dl/extractor/fivetv.py
+++ b/youtube_dlc/extractor/fivetv.py
diff --git a/youtube_dl/extractor/flickr.py b/youtube_dlc/extractor/flickr.py
index 9f166efd4..9f166efd4 100644
--- a/youtube_dl/extractor/flickr.py
+++ b/youtube_dlc/extractor/flickr.py
diff --git a/youtube_dl/extractor/folketinget.py b/youtube_dlc/extractor/folketinget.py
index b3df93f28..b3df93f28 100644
--- a/youtube_dl/extractor/folketinget.py
+++ b/youtube_dlc/extractor/folketinget.py
diff --git a/youtube_dl/extractor/footyroom.py b/youtube_dlc/extractor/footyroom.py
index 118325b6d..118325b6d 100644
--- a/youtube_dl/extractor/footyroom.py
+++ b/youtube_dlc/extractor/footyroom.py
diff --git a/youtube_dl/extractor/formula1.py b/youtube_dlc/extractor/formula1.py
index fecfc28ae..fecfc28ae 100644
--- a/youtube_dl/extractor/formula1.py
+++ b/youtube_dlc/extractor/formula1.py
diff --git a/youtube_dl/extractor/fourtube.py b/youtube_dlc/extractor/fourtube.py
index be4e81342..be4e81342 100644
--- a/youtube_dl/extractor/fourtube.py
+++ b/youtube_dlc/extractor/fourtube.py
diff --git a/youtube_dl/extractor/fox.py b/youtube_dlc/extractor/fox.py
index 04f4bdba6..04f4bdba6 100644
--- a/youtube_dl/extractor/fox.py
+++ b/youtube_dlc/extractor/fox.py
diff --git a/youtube_dl/extractor/fox9.py b/youtube_dlc/extractor/fox9.py
index 91f8f7b8a..91f8f7b8a 100644
--- a/youtube_dl/extractor/fox9.py
+++ b/youtube_dlc/extractor/fox9.py
diff --git a/youtube_dl/extractor/foxgay.py b/youtube_dlc/extractor/foxgay.py
index 512a10645..512a10645 100644
--- a/youtube_dl/extractor/foxgay.py
+++ b/youtube_dlc/extractor/foxgay.py
diff --git a/youtube_dl/extractor/foxnews.py b/youtube_dlc/extractor/foxnews.py
index 63613cb85..63613cb85 100644
--- a/youtube_dl/extractor/foxnews.py
+++ b/youtube_dlc/extractor/foxnews.py
diff --git a/youtube_dl/extractor/foxsports.py b/youtube_dlc/extractor/foxsports.py
index 2b2cb6c6f..2b2cb6c6f 100644
--- a/youtube_dl/extractor/foxsports.py
+++ b/youtube_dlc/extractor/foxsports.py
diff --git a/youtube_dl/extractor/franceculture.py b/youtube_dlc/extractor/franceculture.py
index 306b45fc9..306b45fc9 100644
--- a/youtube_dl/extractor/franceculture.py
+++ b/youtube_dlc/extractor/franceculture.py
diff --git a/youtube_dl/extractor/franceinter.py b/youtube_dlc/extractor/franceinter.py
index 05806895c..05806895c 100644
--- a/youtube_dl/extractor/franceinter.py
+++ b/youtube_dlc/extractor/franceinter.py
diff --git a/youtube_dl/extractor/francetv.py b/youtube_dlc/extractor/francetv.py
index e340cddba..e340cddba 100644
--- a/youtube_dl/extractor/francetv.py
+++ b/youtube_dlc/extractor/francetv.py
diff --git a/youtube_dl/extractor/freesound.py b/youtube_dlc/extractor/freesound.py
index 138b6bc58..138b6bc58 100644
--- a/youtube_dl/extractor/freesound.py
+++ b/youtube_dlc/extractor/freesound.py
diff --git a/youtube_dl/extractor/freespeech.py b/youtube_dlc/extractor/freespeech.py
index ea9c3e317..ea9c3e317 100644
--- a/youtube_dl/extractor/freespeech.py
+++ b/youtube_dlc/extractor/freespeech.py
diff --git a/youtube_dl/extractor/freshlive.py b/youtube_dlc/extractor/freshlive.py
index 72a845945..72a845945 100644
--- a/youtube_dl/extractor/freshlive.py
+++ b/youtube_dlc/extractor/freshlive.py
diff --git a/youtube_dl/extractor/frontendmasters.py b/youtube_dlc/extractor/frontendmasters.py
index f1db33fb1..f1db33fb1 100644
--- a/youtube_dl/extractor/frontendmasters.py
+++ b/youtube_dlc/extractor/frontendmasters.py
diff --git a/youtube_dl/extractor/funimation.py b/youtube_dlc/extractor/funimation.py
index 8bbedca26..8bbedca26 100644
--- a/youtube_dl/extractor/funimation.py
+++ b/youtube_dlc/extractor/funimation.py
diff --git a/youtube_dl/extractor/funk.py b/youtube_dlc/extractor/funk.py
index 81d1949fd..81d1949fd 100644
--- a/youtube_dl/extractor/funk.py
+++ b/youtube_dlc/extractor/funk.py
diff --git a/youtube_dl/extractor/fusion.py b/youtube_dlc/extractor/fusion.py
index a3f44b812..a3f44b812 100644
--- a/youtube_dl/extractor/fusion.py
+++ b/youtube_dlc/extractor/fusion.py
diff --git a/youtube_dl/extractor/fxnetworks.py b/youtube_dlc/extractor/fxnetworks.py
index 00e67426b..00e67426b 100644
--- a/youtube_dl/extractor/fxnetworks.py
+++ b/youtube_dlc/extractor/fxnetworks.py
diff --git a/youtube_dl/extractor/gaia.py b/youtube_dlc/extractor/gaia.py
index e9527758f..e9527758f 100644
--- a/youtube_dl/extractor/gaia.py
+++ b/youtube_dlc/extractor/gaia.py
diff --git a/youtube_dl/extractor/gameinformer.py b/youtube_dlc/extractor/gameinformer.py
index f1b96c172..f1b96c172 100644
--- a/youtube_dl/extractor/gameinformer.py
+++ b/youtube_dlc/extractor/gameinformer.py
diff --git a/youtube_dl/extractor/gamespot.py b/youtube_dlc/extractor/gamespot.py
index 4236a5ed8..4236a5ed8 100644
--- a/youtube_dl/extractor/gamespot.py
+++ b/youtube_dlc/extractor/gamespot.py
diff --git a/youtube_dl/extractor/gamestar.py b/youtube_dlc/extractor/gamestar.py
index f00dab2f3..f00dab2f3 100644
--- a/youtube_dl/extractor/gamestar.py
+++ b/youtube_dlc/extractor/gamestar.py
diff --git a/youtube_dl/extractor/gaskrank.py b/youtube_dlc/extractor/gaskrank.py
index 1726a6704..1726a6704 100644
--- a/youtube_dl/extractor/gaskrank.py
+++ b/youtube_dlc/extractor/gaskrank.py
diff --git a/youtube_dl/extractor/gazeta.py b/youtube_dlc/extractor/gazeta.py
index 57c67a451..57c67a451 100644
--- a/youtube_dl/extractor/gazeta.py
+++ b/youtube_dlc/extractor/gazeta.py
diff --git a/youtube_dl/extractor/gdcvault.py b/youtube_dlc/extractor/gdcvault.py
index 2f555c1d4..2f555c1d4 100644
--- a/youtube_dl/extractor/gdcvault.py
+++ b/youtube_dlc/extractor/gdcvault.py
diff --git a/youtube_dl/extractor/generic.py b/youtube_dlc/extractor/generic.py
index 355067a50..aba06b328 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dlc/extractor/generic.py
@@ -1947,7 +1947,7 @@ class GenericIE(InfoExtractor):
         },
         {
             # vshare embed
-            'url': 'https://youtube-dl-demo.neocities.org/vshare.html',
+            'url': 'https://youtube-dlc-demo.neocities.org/vshare.html',
             'md5': '17b39f55b5497ae8b59f5fbce8e35886',
             'info_dict': {
                 'id': '0f64ce6',
@@ -2263,7 +2263,7 @@ class GenericIE(InfoExtractor):
                     if default_search == 'auto_warning':
                         if re.match(r'^(?:url|URL)$', url):
                             raise ExtractorError(
-                                'Invalid URL:  %r . Call youtube-dl like this:  youtube-dl -v "https://www.youtube.com/watch?v=BaW_jenozKc"  ' % url,
+                                'Invalid URL:  %r . Call youtube-dlc like this:  youtube-dlc -v "https://www.youtube.com/watch?v=BaW_jenozKc"  ' % url,
                                 expected=True)
                         else:
                             self._downloader.report_warning(
@@ -2273,7 +2273,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-dl "ytsearch:%s" ) to search YouTube'
+                    'Set --default-search "ytsearch" (or run  youtube-dlc "ytsearch:%s" ) to search YouTube'
                     % (url, url), expected=True)
             else:
                 if ':' not in default_search:
@@ -2349,7 +2349,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-dl default Accept-Encoding
+            # test whether it's HTML or not). According to youtube-dlc 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.
@@ -3372,7 +3372,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-dl thus this is checked the very last (see
+            # be supported by youtube-dlc 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_dl/extractor/gfycat.py b/youtube_dlc/extractor/gfycat.py
index 18a30fe67..18a30fe67 100644
--- a/youtube_dl/extractor/gfycat.py
+++ b/youtube_dlc/extractor/gfycat.py
diff --git a/youtube_dl/extractor/giantbomb.py b/youtube_dlc/extractor/giantbomb.py
index c6477958d..c6477958d 100644
--- a/youtube_dl/extractor/giantbomb.py
+++ b/youtube_dlc/extractor/giantbomb.py
diff --git a/youtube_dl/extractor/giga.py b/youtube_dlc/extractor/giga.py
index 5a9992a27..5a9992a27 100644
--- a/youtube_dl/extractor/giga.py
+++ b/youtube_dlc/extractor/giga.py
diff --git a/youtube_dl/extractor/gigya.py b/youtube_dlc/extractor/gigya.py
index 412178492..412178492 100644
--- a/youtube_dl/extractor/gigya.py
+++ b/youtube_dlc/extractor/gigya.py
diff --git a/youtube_dl/extractor/glide.py b/youtube_dlc/extractor/glide.py
index d94dfbf09..d94dfbf09 100644
--- a/youtube_dl/extractor/glide.py
+++ b/youtube_dlc/extractor/glide.py
diff --git a/youtube_dl/extractor/globo.py b/youtube_dlc/extractor/globo.py
index 60d842d3a..60d842d3a 100644
--- a/youtube_dl/extractor/globo.py
+++ b/youtube_dlc/extractor/globo.py
diff --git a/youtube_dl/extractor/go.py b/youtube_dlc/extractor/go.py
index 03cfba91f..03cfba91f 100644
--- a/youtube_dl/extractor/go.py
+++ b/youtube_dlc/extractor/go.py
diff --git a/youtube_dl/extractor/godtube.py b/youtube_dlc/extractor/godtube.py
index 92efd16b3..92efd16b3 100644
--- a/youtube_dl/extractor/godtube.py
+++ b/youtube_dlc/extractor/godtube.py
diff --git a/youtube_dl/extractor/golem.py b/youtube_dlc/extractor/golem.py
index 47a068e74..47a068e74 100644
--- a/youtube_dl/extractor/golem.py
+++ b/youtube_dlc/extractor/golem.py
diff --git a/youtube_dl/extractor/googledrive.py b/youtube_dlc/extractor/googledrive.py
index 589e4d5c3..589e4d5c3 100644
--- a/youtube_dl/extractor/googledrive.py
+++ b/youtube_dlc/extractor/googledrive.py
diff --git a/youtube_dl/extractor/googleplus.py b/youtube_dlc/extractor/googleplus.py
index 6b927bb44..6b927bb44 100644
--- a/youtube_dl/extractor/googleplus.py
+++ b/youtube_dlc/extractor/googleplus.py
diff --git a/youtube_dl/extractor/googlesearch.py b/youtube_dlc/extractor/googlesearch.py
index 5279fa807..5279fa807 100644
--- a/youtube_dl/extractor/googlesearch.py
+++ b/youtube_dlc/extractor/googlesearch.py
diff --git a/youtube_dl/extractor/goshgay.py b/youtube_dlc/extractor/goshgay.py
index 377981d3e..377981d3e 100644
--- a/youtube_dl/extractor/goshgay.py
+++ b/youtube_dlc/extractor/goshgay.py
diff --git a/youtube_dl/extractor/gputechconf.py b/youtube_dlc/extractor/gputechconf.py
index 73dc62c49..73dc62c49 100644
--- a/youtube_dl/extractor/gputechconf.py
+++ b/youtube_dlc/extractor/gputechconf.py
diff --git a/youtube_dl/extractor/groupon.py b/youtube_dlc/extractor/groupon.py
index a6da90931..a6da90931 100644
--- a/youtube_dl/extractor/groupon.py
+++ b/youtube_dlc/extractor/groupon.py
diff --git a/youtube_dl/extractor/hbo.py b/youtube_dlc/extractor/hbo.py
index 68df748f5..68df748f5 100644
--- a/youtube_dl/extractor/hbo.py
+++ b/youtube_dlc/extractor/hbo.py
diff --git a/youtube_dl/extractor/hearthisat.py b/youtube_dlc/extractor/hearthisat.py
index 18c252012..18c252012 100644
--- a/youtube_dl/extractor/hearthisat.py
+++ b/youtube_dlc/extractor/hearthisat.py
diff --git a/youtube_dl/extractor/heise.py b/youtube_dlc/extractor/heise.py
index cbe564a3c..cbe564a3c 100644
--- a/youtube_dl/extractor/heise.py
+++ b/youtube_dlc/extractor/heise.py
diff --git a/youtube_dl/extractor/hellporno.py b/youtube_dlc/extractor/hellporno.py
index fae425103..fae425103 100644
--- a/youtube_dl/extractor/hellporno.py
+++ b/youtube_dlc/extractor/hellporno.py
diff --git a/youtube_dl/extractor/helsinki.py b/youtube_dlc/extractor/helsinki.py
index 575fb332a..575fb332a 100644
--- a/youtube_dl/extractor/helsinki.py
+++ b/youtube_dlc/extractor/helsinki.py
diff --git a/youtube_dl/extractor/hentaistigma.py b/youtube_dlc/extractor/hentaistigma.py
index 86a93de4d..86a93de4d 100644
--- a/youtube_dl/extractor/hentaistigma.py
+++ b/youtube_dlc/extractor/hentaistigma.py
diff --git a/youtube_dl/extractor/hgtv.py b/youtube_dlc/extractor/hgtv.py
index a4f332565..a4f332565 100644
--- a/youtube_dl/extractor/hgtv.py
+++ b/youtube_dlc/extractor/hgtv.py
diff --git a/youtube_dl/extractor/hidive.py b/youtube_dlc/extractor/hidive.py
index f26f80265..f26f80265 100644
--- a/youtube_dl/extractor/hidive.py
+++ b/youtube_dlc/extractor/hidive.py
diff --git a/youtube_dl/extractor/historicfilms.py b/youtube_dlc/extractor/historicfilms.py
index 56343e98f..56343e98f 100644
--- a/youtube_dl/extractor/historicfilms.py
+++ b/youtube_dlc/extractor/historicfilms.py
diff --git a/youtube_dl/extractor/hitbox.py b/youtube_dlc/extractor/hitbox.py
index 3e5ff2685..3e5ff2685 100644
--- a/youtube_dl/extractor/hitbox.py
+++ b/youtube_dlc/extractor/hitbox.py
diff --git a/youtube_dl/extractor/hitrecord.py b/youtube_dlc/extractor/hitrecord.py
index fd5dc2935..fd5dc2935 100644
--- a/youtube_dl/extractor/hitrecord.py
+++ b/youtube_dlc/extractor/hitrecord.py
diff --git a/youtube_dl/extractor/hketv.py b/youtube_dlc/extractor/hketv.py
index 1f3502b90..1f3502b90 100644
--- a/youtube_dl/extractor/hketv.py
+++ b/youtube_dlc/extractor/hketv.py
diff --git a/youtube_dl/extractor/hornbunny.py b/youtube_dlc/extractor/hornbunny.py
index c458a959d..c458a959d 100644
--- a/youtube_dl/extractor/hornbunny.py
+++ b/youtube_dlc/extractor/hornbunny.py
diff --git a/youtube_dl/extractor/hotnewhiphop.py b/youtube_dlc/extractor/hotnewhiphop.py
index 4703e1894..4703e1894 100644
--- a/youtube_dl/extractor/hotnewhiphop.py
+++ b/youtube_dlc/extractor/hotnewhiphop.py
diff --git a/youtube_dl/extractor/hotstar.py b/youtube_dlc/extractor/hotstar.py
index f97eefa3d..f97eefa3d 100644
--- a/youtube_dl/extractor/hotstar.py
+++ b/youtube_dlc/extractor/hotstar.py
diff --git a/youtube_dl/extractor/howcast.py b/youtube_dlc/extractor/howcast.py
index 7e36b85ad..7e36b85ad 100644
--- a/youtube_dl/extractor/howcast.py
+++ b/youtube_dlc/extractor/howcast.py
diff --git a/youtube_dl/extractor/howstuffworks.py b/youtube_dlc/extractor/howstuffworks.py
index cf90ab3c9..cf90ab3c9 100644
--- a/youtube_dl/extractor/howstuffworks.py
+++ b/youtube_dlc/extractor/howstuffworks.py
diff --git a/youtube_dl/extractor/hrfensehen.py b/youtube_dlc/extractor/hrfensehen.py
index 2beadef2c..805345e69 100644
--- a/youtube_dl/extractor/hrfensehen.py
+++ b/youtube_dlc/extractor/hrfensehen.py
@@ -4,7 +4,7 @@ from __future__ import unicode_literals
 import json
 import re
 
-from youtube_dl.utils import int_or_none, unified_timestamp, unescapeHTML
+from youtube_dlc.utils import int_or_none, unified_timestamp, unescapeHTML
 from .common import InfoExtractor
 
 
diff --git a/youtube_dl/extractor/hrti.py b/youtube_dlc/extractor/hrti.py
index 23f7b1fc9..23f7b1fc9 100644
--- a/youtube_dl/extractor/hrti.py
+++ b/youtube_dlc/extractor/hrti.py
diff --git a/youtube_dl/extractor/huajiao.py b/youtube_dlc/extractor/huajiao.py
index 4ca275dda..4ca275dda 100644
--- a/youtube_dl/extractor/huajiao.py
+++ b/youtube_dlc/extractor/huajiao.py
diff --git a/youtube_dl/extractor/huffpost.py b/youtube_dlc/extractor/huffpost.py
index 97e36f056..97e36f056 100644
--- a/youtube_dl/extractor/huffpost.py
+++ b/youtube_dlc/extractor/huffpost.py
diff --git a/youtube_dl/extractor/hungama.py b/youtube_dlc/extractor/hungama.py
index 3fdaac5b6..3fdaac5b6 100644
--- a/youtube_dl/extractor/hungama.py
+++ b/youtube_dlc/extractor/hungama.py
diff --git a/youtube_dl/extractor/hypem.py b/youtube_dlc/extractor/hypem.py
index 9ca28d632..9ca28d632 100644
--- a/youtube_dl/extractor/hypem.py
+++ b/youtube_dlc/extractor/hypem.py
diff --git a/youtube_dl/extractor/ign.py b/youtube_dlc/extractor/ign.py
index a96ea8010..a96ea8010 100644
--- a/youtube_dl/extractor/ign.py
+++ b/youtube_dlc/extractor/ign.py
diff --git a/youtube_dl/extractor/imdb.py b/youtube_dlc/extractor/imdb.py
index a31301985..a31301985 100644
--- a/youtube_dl/extractor/imdb.py
+++ b/youtube_dlc/extractor/imdb.py
diff --git a/youtube_dl/extractor/imggaming.py b/youtube_dlc/extractor/imggaming.py
index e11f92053..e11f92053 100644
--- a/youtube_dl/extractor/imggaming.py
+++ b/youtube_dlc/extractor/imggaming.py
diff --git a/youtube_dl/extractor/imgur.py b/youtube_dlc/extractor/imgur.py
index a5ba03efa..4dc7b0b5c 100644
--- a/youtube_dl/extractor/imgur.py
+++ b/youtube_dlc/extractor/imgur.py
@@ -60,7 +60,7 @@ class ImgurIE(InfoExtractor):
                 'width': width,
                 'height': height,
                 'http_headers': {
-                    'User-Agent': 'youtube-dl (like wget)',
+                    'User-Agent': 'youtube-dlc (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-dl (like wget)',
+                    'User-Agent': 'youtube-dlc (like wget)',
                 },
             })
 
diff --git a/youtube_dl/extractor/ina.py b/youtube_dlc/extractor/ina.py
index 12695af27..12695af27 100644
--- a/youtube_dl/extractor/ina.py
+++ b/youtube_dlc/extractor/ina.py
diff --git a/youtube_dl/extractor/inc.py b/youtube_dlc/extractor/inc.py
index d5b258a0f..d5b258a0f 100644
--- a/youtube_dl/extractor/inc.py
+++ b/youtube_dlc/extractor/inc.py
diff --git a/youtube_dl/extractor/indavideo.py b/youtube_dlc/extractor/indavideo.py
index 4c16243ec..4c16243ec 100644
--- a/youtube_dl/extractor/indavideo.py
+++ b/youtube_dlc/extractor/indavideo.py
diff --git a/youtube_dl/extractor/infoq.py b/youtube_dlc/extractor/infoq.py
index 18249cf9b..18249cf9b 100644
--- a/youtube_dl/extractor/infoq.py
+++ b/youtube_dlc/extractor/infoq.py
diff --git a/youtube_dl/extractor/instagram.py b/youtube_dlc/extractor/instagram.py
index b061850a1..b061850a1 100644
--- a/youtube_dl/extractor/instagram.py
+++ b/youtube_dlc/extractor/instagram.py
diff --git a/youtube_dl/extractor/internazionale.py b/youtube_dlc/extractor/internazionale.py
index 676e8e269..676e8e269 100644
--- a/youtube_dl/extractor/internazionale.py
+++ b/youtube_dlc/extractor/internazionale.py
diff --git a/youtube_dl/extractor/internetvideoarchive.py b/youtube_dlc/extractor/internetvideoarchive.py
index 59b0a90c3..59b0a90c3 100644
--- a/youtube_dl/extractor/internetvideoarchive.py
+++ b/youtube_dlc/extractor/internetvideoarchive.py
diff --git a/youtube_dl/extractor/iprima.py b/youtube_dlc/extractor/iprima.py
index 53a550c11..53a550c11 100644
--- a/youtube_dl/extractor/iprima.py
+++ b/youtube_dlc/extractor/iprima.py
diff --git a/youtube_dl/extractor/iqiyi.py b/youtube_dlc/extractor/iqiyi.py
index cd11aa70f..cd11aa70f 100644
--- a/youtube_dl/extractor/iqiyi.py
+++ b/youtube_dlc/extractor/iqiyi.py
diff --git a/youtube_dl/extractor/ir90tv.py b/youtube_dlc/extractor/ir90tv.py
index d5a3f6fa5..d5a3f6fa5 100644
--- a/youtube_dl/extractor/ir90tv.py
+++ b/youtube_dlc/extractor/ir90tv.py
diff --git a/youtube_dl/extractor/itv.py b/youtube_dlc/extractor/itv.py
index ad2f4eca5..ad2f4eca5 100644
--- a/youtube_dl/extractor/itv.py
+++ b/youtube_dlc/extractor/itv.py
diff --git a/youtube_dl/extractor/ivi.py b/youtube_dlc/extractor/ivi.py
index b5a740a01..b9cb5a8e6 100644
--- a/youtube_dl/extractor/ivi.py
+++ b/youtube_dlc/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-dl from sources.',
+                        'This feature does not work from bundled exe. Run youtube-dlc from sources.',
                         expected=True)
                 elif not pycryptodomex_found:
                     raise ExtractorError(
diff --git a/youtube_dl/extractor/ivideon.py b/youtube_dlc/extractor/ivideon.py
index 3ca824f79..3ca824f79 100644
--- a/youtube_dl/extractor/ivideon.py
+++ b/youtube_dlc/extractor/ivideon.py
diff --git a/youtube_dl/extractor/iwara.py b/youtube_dlc/extractor/iwara.py
index 907d5fc8b..907d5fc8b 100644
--- a/youtube_dl/extractor/iwara.py
+++ b/youtube_dlc/extractor/iwara.py
diff --git a/youtube_dl/extractor/izlesene.py b/youtube_dlc/extractor/izlesene.py
index f8fca6c8f..f8fca6c8f 100644
--- a/youtube_dl/extractor/izlesene.py
+++ b/youtube_dlc/extractor/izlesene.py
diff --git a/youtube_dl/extractor/jamendo.py b/youtube_dlc/extractor/jamendo.py
index 490efa8fb..490efa8fb 100644
--- a/youtube_dl/extractor/jamendo.py
+++ b/youtube_dlc/extractor/jamendo.py
diff --git a/youtube_dl/extractor/jeuxvideo.py b/youtube_dlc/extractor/jeuxvideo.py
index e9f4ed738..e9f4ed738 100644
--- a/youtube_dl/extractor/jeuxvideo.py
+++ b/youtube_dlc/extractor/jeuxvideo.py
diff --git a/youtube_dl/extractor/joj.py b/youtube_dlc/extractor/joj.py
index 62b28e980..637618183 100644
--- a/youtube_dl/extractor/joj.py
+++ b/youtube_dlc/extractor/joj.py
@@ -1,108 +1,108 @@
-# coding: utf-8

-from __future__ import unicode_literals

-

-import re

-

-from .common import InfoExtractor

-from ..compat import compat_str

-from ..utils import (

-    int_or_none,

-    js_to_json,

-    try_get,

-)

-

-

-class JojIE(InfoExtractor):

-    _VALID_URL = r'''(?x)

-                    (?:

-                        joj:|

-                        https?://media\.joj\.sk/embed/

-                    )

-                    (?P<id>[^/?#^]+)

-                '''

-    _TESTS = [{

-        'url': 'https://media.joj.sk/embed/a388ec4c-6019-4a4a-9312-b1bee194e932',

-        'info_dict': {

-            'id': 'a388ec4c-6019-4a4a-9312-b1bee194e932',

-            'ext': 'mp4',

-            'title': 'NOVÉ BÝVANIE',

-            'thumbnail': r're:^https?://.*\.jpg$',

-            'duration': 3118,

-        }

-    }, {

-        'url': 'https://media.joj.sk/embed/9i1cxv',

-        'only_matching': True,

-    }, {

-        'url': 'joj:a388ec4c-6019-4a4a-9312-b1bee194e932',

-        'only_matching': True,

-    }, {

-        'url': 'joj:9i1cxv',

-        'only_matching': True,

-    }]

-

-    @staticmethod

-    def _extract_urls(webpage):

-        return [

-            mobj.group('url')

-            for mobj in re.finditer(

-                r'<iframe\b[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//media\.joj\.sk/embed/(?:(?!\1).)+)\1',

-                webpage)]

-

-    def _real_extract(self, url):

-        video_id = self._match_id(url)

-

-        webpage = self._download_webpage(

-            'https://media.joj.sk/embed/%s' % video_id, video_id)

-

-        title = self._search_regex(

-            (r'videoTitle\s*:\s*(["\'])(?P<title>(?:(?!\1).)+)\1',

-             r'<title>(?P<title>[^<]+)'), webpage, 'title',

-            default=None, group='title') or self._og_search_title(webpage)

-

-        bitrates = self._parse_json(

-            self._search_regex(

-                r'(?s)(?:src|bitrates)\s*=\s*({.+?});', webpage, 'bitrates',

-                default='{}'),

-            video_id, transform_source=js_to_json, fatal=False)

-

-        formats = []

-        for format_url in try_get(bitrates, lambda x: x['mp4'], list) or []:

-            if isinstance(format_url, compat_str):

-                height = self._search_regex(

-                    r'(\d+)[pP]\.', format_url, 'height', default=None)

-                formats.append({

-                    'url': format_url,

-                    'format_id': '%sp' % height if height else None,

-                    'height': int(height),

-                })

-        if not formats:

-            playlist = self._download_xml(

-                'https://media.joj.sk/services/Video.php?clip=%s' % video_id,

-                video_id)

-            for file_el in playlist.findall('./files/file'):

-                path = file_el.get('path')

-                if not path:

-                    continue

-                format_id = file_el.get('id') or file_el.get('label')

-                formats.append({

-                    'url': 'http://n16.joj.sk/storage/%s' % path.replace(

-                        'dat/', '', 1),

-                    'format_id': format_id,

-                    'height': int_or_none(self._search_regex(

-                        r'(\d+)[pP]', format_id or path, 'height',

-                        default=None)),

-                })

-        self._sort_formats(formats)

-

-        thumbnail = self._og_search_thumbnail(webpage)

-

-        duration = int_or_none(self._search_regex(

-            r'videoDuration\s*:\s*(\d+)', webpage, 'duration', fatal=False))

-

-        return {

-            'id': video_id,

-            'title': title,

-            'thumbnail': thumbnail,

-            'duration': duration,

-            'formats': formats,

-        }

+# coding: utf-8
+from __future__ import unicode_literals
+
+import re
+
+from .common import InfoExtractor
+from ..compat import compat_str
+from ..utils import (
+    int_or_none,
+    js_to_json,
+    try_get,
+)
+
+
+class JojIE(InfoExtractor):
+    _VALID_URL = r'''(?x)
+                    (?:
+                        joj:|
+                        https?://media\.joj\.sk/embed/
+                    )
+                    (?P<id>[^/?#^]+)
+                '''
+    _TESTS = [{
+        'url': 'https://media.joj.sk/embed/a388ec4c-6019-4a4a-9312-b1bee194e932',
+        'info_dict': {
+            'id': 'a388ec4c-6019-4a4a-9312-b1bee194e932',
+            'ext': 'mp4',
+            'title': 'NOVÉ BÝVANIE',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'duration': 3118,
+        }
+    }, {
+        'url': 'https://media.joj.sk/embed/9i1cxv',
+        'only_matching': True,
+    }, {
+        'url': 'joj:a388ec4c-6019-4a4a-9312-b1bee194e932',
+        'only_matching': True,
+    }, {
+        'url': 'joj:9i1cxv',
+        'only_matching': True,
+    }]
+
+    @staticmethod
+    def _extract_urls(webpage):
+        return [
+            mobj.group('url')
+            for mobj in re.finditer(
+                r'<iframe\b[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//media\.joj\.sk/embed/(?:(?!\1).)+)\1',
+                webpage)]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        webpage = self._download_webpage(
+            'https://media.joj.sk/embed/%s' % video_id, video_id)
+
+        title = self._search_regex(
+            (r'videoTitle\s*:\s*(["\'])(?P<title>(?:(?!\1).)+)\1',
+             r'<title>(?P<title>[^<]+)'), webpage, 'title',
+            default=None, group='title') or self._og_search_title(webpage)
+
+        bitrates = self._parse_json(
+            self._search_regex(
+                r'(?s)(?:src|bitrates)\s*=\s*({.+?});', webpage, 'bitrates',
+                default='{}'),
+            video_id, transform_source=js_to_json, fatal=False)
+
+        formats = []
+        for format_url in try_get(bitrates, lambda x: x['mp4'], list) or []:
+            if isinstance(format_url, compat_str):
+                height = self._search_regex(
+                    r'(\d+)[pP]\.', format_url, 'height', default=None)
+                formats.append({
+                    'url': format_url,
+                    'format_id': '%sp' % height if height else None,
+                    'height': int(height),
+                })
+        if not formats:
+            playlist = self._download_xml(
+                'https://media.joj.sk/services/Video.php?clip=%s' % video_id,
+                video_id)
+            for file_el in playlist.findall('./files/file'):
+                path = file_el.get('path')
+                if not path:
+                    continue
+                format_id = file_el.get('id') or file_el.get('label')
+                formats.append({
+                    'url': 'http://n16.joj.sk/storage/%s' % path.replace(
+                        'dat/', '', 1),
+                    'format_id': format_id,
+                    'height': int_or_none(self._search_regex(
+                        r'(\d+)[pP]', format_id or path, 'height',
+                        default=None)),
+                })
+        self._sort_formats(formats)
+
+        thumbnail = self._og_search_thumbnail(webpage)
+
+        duration = int_or_none(self._search_regex(
+            r'videoDuration\s*:\s*(\d+)', webpage, 'duration', fatal=False))
+
+        return {
+            'id': video_id,
+            'title': title,
+            'thumbnail': thumbnail,
+            'duration': duration,
+            'formats': formats,
+        }
diff --git a/youtube_dl/extractor/jove.py b/youtube_dlc/extractor/jove.py
index 27e0e37f6..27e0e37f6 100644
--- a/youtube_dl/extractor/jove.py
+++ b/youtube_dlc/extractor/jove.py
diff --git a/youtube_dl/extractor/jwplatform.py b/youtube_dlc/extractor/jwplatform.py
index c34b5f5e6..c34b5f5e6 100644
--- a/youtube_dl/extractor/jwplatform.py
+++ b/youtube_dlc/extractor/jwplatform.py
diff --git a/youtube_dl/extractor/kakao.py b/youtube_dlc/extractor/kakao.py
index 32935bb28..32935bb28 100644
--- a/youtube_dl/extractor/kakao.py
+++ b/youtube_dlc/extractor/kakao.py
diff --git a/youtube_dl/extractor/kaltura.py b/youtube_dlc/extractor/kaltura.py
index 49d13460d..49d13460d 100644
--- a/youtube_dl/extractor/kaltura.py
+++ b/youtube_dlc/extractor/kaltura.py
diff --git a/youtube_dl/extractor/kanalplay.py b/youtube_dlc/extractor/kanalplay.py
index 6c3498c67..6c3498c67 100644
--- a/youtube_dl/extractor/kanalplay.py
+++ b/youtube_dlc/extractor/kanalplay.py
diff --git a/youtube_dl/extractor/kankan.py b/youtube_dlc/extractor/kankan.py
index a677ff447..a677ff447 100644
--- a/youtube_dl/extractor/kankan.py
+++ b/youtube_dlc/extractor/kankan.py
diff --git a/youtube_dl/extractor/karaoketv.py b/youtube_dlc/extractor/karaoketv.py
index bfccf89b0..bfccf89b0 100644
--- a/youtube_dl/extractor/karaoketv.py
+++ b/youtube_dlc/extractor/karaoketv.py
diff --git a/youtube_dl/extractor/karrierevideos.py b/youtube_dlc/extractor/karrierevideos.py
index 7b291e0a0..7b291e0a0 100644
--- a/youtube_dl/extractor/karrierevideos.py
+++ b/youtube_dlc/extractor/karrierevideos.py
diff --git a/youtube_dl/extractor/keezmovies.py b/youtube_dlc/extractor/keezmovies.py
index c3eb74c17..c3eb74c17 100644
--- a/youtube_dl/extractor/keezmovies.py
+++ b/youtube_dlc/extractor/keezmovies.py
diff --git a/youtube_dl/extractor/ketnet.py b/youtube_dlc/extractor/ketnet.py
index 93a98e1e0..93a98e1e0 100644
--- a/youtube_dl/extractor/ketnet.py
+++ b/youtube_dlc/extractor/ketnet.py
diff --git a/youtube_dl/extractor/khanacademy.py b/youtube_dlc/extractor/khanacademy.py
index 61739efa7..61739efa7 100644
--- a/youtube_dl/extractor/khanacademy.py
+++ b/youtube_dlc/extractor/khanacademy.py
diff --git a/youtube_dl/extractor/kickstarter.py b/youtube_dlc/extractor/kickstarter.py
index d4da8f484..d4da8f484 100644
--- a/youtube_dl/extractor/kickstarter.py
+++ b/youtube_dlc/extractor/kickstarter.py
diff --git a/youtube_dl/extractor/kinja.py b/youtube_dlc/extractor/kinja.py
index 79e3026d2..79e3026d2 100644
--- a/youtube_dl/extractor/kinja.py
+++ b/youtube_dlc/extractor/kinja.py
diff --git a/youtube_dl/extractor/kinopoisk.py b/youtube_dlc/extractor/kinopoisk.py
index 9e8d01f53..9e8d01f53 100644
--- a/youtube_dl/extractor/kinopoisk.py
+++ b/youtube_dlc/extractor/kinopoisk.py
diff --git a/youtube_dl/extractor/konserthusetplay.py b/youtube_dlc/extractor/konserthusetplay.py
index dd42bb2f2..dd42bb2f2 100644
--- a/youtube_dl/extractor/konserthusetplay.py
+++ b/youtube_dlc/extractor/konserthusetplay.py
diff --git a/youtube_dl/extractor/krasview.py b/youtube_dlc/extractor/krasview.py
index d27d052ff..d27d052ff 100644
--- a/youtube_dl/extractor/krasview.py
+++ b/youtube_dlc/extractor/krasview.py
diff --git a/youtube_dl/extractor/ku6.py b/youtube_dlc/extractor/ku6.py
index a574408e5..a574408e5 100644
--- a/youtube_dl/extractor/ku6.py
+++ b/youtube_dlc/extractor/ku6.py
diff --git a/youtube_dl/extractor/kusi.py b/youtube_dlc/extractor/kusi.py
index 6a7e3baa7..6a7e3baa7 100644
--- a/youtube_dl/extractor/kusi.py
+++ b/youtube_dlc/extractor/kusi.py
diff --git a/youtube_dl/extractor/kuwo.py b/youtube_dlc/extractor/kuwo.py
index cc5b2a1c1..cc5b2a1c1 100644
--- a/youtube_dl/extractor/kuwo.py
+++ b/youtube_dlc/extractor/kuwo.py
diff --git a/youtube_dl/extractor/la7.py b/youtube_dlc/extractor/la7.py
index c3b4ffa7e..c3b4ffa7e 100644
--- a/youtube_dl/extractor/la7.py
+++ b/youtube_dlc/extractor/la7.py
diff --git a/youtube_dl/extractor/laola1tv.py b/youtube_dlc/extractor/laola1tv.py
index fa217365a..fa217365a 100644
--- a/youtube_dl/extractor/laola1tv.py
+++ b/youtube_dlc/extractor/laola1tv.py
diff --git a/youtube_dl/extractor/lci.py b/youtube_dlc/extractor/lci.py
index 920872f5c..920872f5c 100644
--- a/youtube_dl/extractor/lci.py
+++ b/youtube_dlc/extractor/lci.py
diff --git a/youtube_dl/extractor/lcp.py b/youtube_dlc/extractor/lcp.py
index ade27a99e..ade27a99e 100644
--- a/youtube_dl/extractor/lcp.py
+++ b/youtube_dlc/extractor/lcp.py
diff --git a/youtube_dl/extractor/lecture2go.py b/youtube_dlc/extractor/lecture2go.py
index 81b5d41be..81b5d41be 100644
--- a/youtube_dl/extractor/lecture2go.py
+++ b/youtube_dlc/extractor/lecture2go.py
diff --git a/youtube_dl/extractor/lecturio.py b/youtube_dlc/extractor/lecturio.py
index 1b2dcef46..1b2dcef46 100644
--- a/youtube_dl/extractor/lecturio.py
+++ b/youtube_dlc/extractor/lecturio.py
diff --git a/youtube_dl/extractor/leeco.py b/youtube_dlc/extractor/leeco.py
index 7dc0ad794..7dc0ad794 100644
--- a/youtube_dl/extractor/leeco.py
+++ b/youtube_dlc/extractor/leeco.py
diff --git a/youtube_dl/extractor/lego.py b/youtube_dlc/extractor/lego.py
index 1e3c19dfd..1e3c19dfd 100644
--- a/youtube_dl/extractor/lego.py
+++ b/youtube_dlc/extractor/lego.py
diff --git a/youtube_dl/extractor/lemonde.py b/youtube_dlc/extractor/lemonde.py
index 3306892e8..3306892e8 100644
--- a/youtube_dl/extractor/lemonde.py
+++ b/youtube_dlc/extractor/lemonde.py
diff --git a/youtube_dl/extractor/lenta.py b/youtube_dlc/extractor/lenta.py
index 2ebd4e577..2ebd4e577 100644
--- a/youtube_dl/extractor/lenta.py
+++ b/youtube_dlc/extractor/lenta.py
diff --git a/youtube_dl/extractor/libraryofcongress.py b/youtube_dlc/extractor/libraryofcongress.py
index 03f205144..03f205144 100644
--- a/youtube_dl/extractor/libraryofcongress.py
+++ b/youtube_dlc/extractor/libraryofcongress.py
diff --git a/youtube_dl/extractor/libsyn.py b/youtube_dlc/extractor/libsyn.py
index 2cf444258..2cf444258 100644
--- a/youtube_dl/extractor/libsyn.py
+++ b/youtube_dlc/extractor/libsyn.py
diff --git a/youtube_dl/extractor/lifenews.py b/youtube_dlc/extractor/lifenews.py
index 42e263bfa..42e263bfa 100644
--- a/youtube_dl/extractor/lifenews.py
+++ b/youtube_dlc/extractor/lifenews.py
diff --git a/youtube_dl/extractor/limelight.py b/youtube_dlc/extractor/limelight.py
index 39f74d282..39f74d282 100644
--- a/youtube_dl/extractor/limelight.py
+++ b/youtube_dlc/extractor/limelight.py
diff --git a/youtube_dl/extractor/line.py b/youtube_dlc/extractor/line.py
index 7f5fa446e..7f5fa446e 100644
--- a/youtube_dl/extractor/line.py
+++ b/youtube_dlc/extractor/line.py
diff --git a/youtube_dl/extractor/linkedin.py b/youtube_dlc/extractor/linkedin.py
index 26fc703d1..26fc703d1 100644
--- a/youtube_dl/extractor/linkedin.py
+++ b/youtube_dlc/extractor/linkedin.py
diff --git a/youtube_dl/extractor/linuxacademy.py b/youtube_dlc/extractor/linuxacademy.py
index 23ca965d9..23ca965d9 100644
--- a/youtube_dl/extractor/linuxacademy.py
+++ b/youtube_dlc/extractor/linuxacademy.py
diff --git a/youtube_dl/extractor/litv.py b/youtube_dlc/extractor/litv.py
index 337b1b15c..337b1b15c 100644
--- a/youtube_dl/extractor/litv.py
+++ b/youtube_dlc/extractor/litv.py
diff --git a/youtube_dl/extractor/livejournal.py b/youtube_dlc/extractor/livejournal.py
index 3a9f4553f..3a9f4553f 100644
--- a/youtube_dl/extractor/livejournal.py
+++ b/youtube_dlc/extractor/livejournal.py
diff --git a/youtube_dl/extractor/liveleak.py b/youtube_dlc/extractor/liveleak.py
index 4ac437c8b..4ac437c8b 100644
--- a/youtube_dl/extractor/liveleak.py
+++ b/youtube_dlc/extractor/liveleak.py
diff --git a/youtube_dl/extractor/livestream.py b/youtube_dlc/extractor/livestream.py
index e55b1a202..e55b1a202 100644
--- a/youtube_dl/extractor/livestream.py
+++ b/youtube_dlc/extractor/livestream.py
diff --git a/youtube_dl/extractor/lnkgo.py b/youtube_dlc/extractor/lnkgo.py
index 3e71852aa..3e71852aa 100644
--- a/youtube_dl/extractor/lnkgo.py
+++ b/youtube_dlc/extractor/lnkgo.py
diff --git a/youtube_dl/extractor/localnews8.py b/youtube_dlc/extractor/localnews8.py
index aad396135..aad396135 100644
--- a/youtube_dl/extractor/localnews8.py
+++ b/youtube_dlc/extractor/localnews8.py
diff --git a/youtube_dl/extractor/lovehomeporn.py b/youtube_dlc/extractor/lovehomeporn.py
index 8f65a3c03..8f65a3c03 100644
--- a/youtube_dl/extractor/lovehomeporn.py
+++ b/youtube_dlc/extractor/lovehomeporn.py
diff --git a/youtube_dl/extractor/lrt.py b/youtube_dlc/extractor/lrt.py
index f5c997ef4..f5c997ef4 100644
--- a/youtube_dl/extractor/lrt.py
+++ b/youtube_dlc/extractor/lrt.py
diff --git a/youtube_dl/extractor/lynda.py b/youtube_dlc/extractor/lynda.py
index b3d8653d0..b3d8653d0 100644
--- a/youtube_dl/extractor/lynda.py
+++ b/youtube_dlc/extractor/lynda.py
diff --git a/youtube_dl/extractor/m6.py b/youtube_dlc/extractor/m6.py
index 9806875e8..9806875e8 100644
--- a/youtube_dl/extractor/m6.py
+++ b/youtube_dlc/extractor/m6.py
diff --git a/youtube_dl/extractor/mailru.py b/youtube_dlc/extractor/mailru.py
index 65cc474db..65cc474db 100644
--- a/youtube_dl/extractor/mailru.py
+++ b/youtube_dlc/extractor/mailru.py
diff --git a/youtube_dl/extractor/malltv.py b/youtube_dlc/extractor/malltv.py
index 6f4fd927f..6f4fd927f 100644
--- a/youtube_dl/extractor/malltv.py
+++ b/youtube_dlc/extractor/malltv.py
diff --git a/youtube_dl/extractor/mangomolo.py b/youtube_dlc/extractor/mangomolo.py
index acee370e9..acee370e9 100644
--- a/youtube_dl/extractor/mangomolo.py
+++ b/youtube_dlc/extractor/mangomolo.py
diff --git a/youtube_dl/extractor/manyvids.py b/youtube_dlc/extractor/manyvids.py
index e8d7163e4..e8d7163e4 100644
--- a/youtube_dl/extractor/manyvids.py
+++ b/youtube_dlc/extractor/manyvids.py
diff --git a/youtube_dl/extractor/markiza.py b/youtube_dlc/extractor/markiza.py
index def960a0c..def960a0c 100644
--- a/youtube_dl/extractor/markiza.py
+++ b/youtube_dlc/extractor/markiza.py
diff --git a/youtube_dl/extractor/massengeschmacktv.py b/youtube_dlc/extractor/massengeschmacktv.py
index cfcc6b224..cfcc6b224 100644
--- a/youtube_dl/extractor/massengeschmacktv.py
+++ b/youtube_dlc/extractor/massengeschmacktv.py
diff --git a/youtube_dl/extractor/matchtv.py b/youtube_dlc/extractor/matchtv.py
index bc9933a81..bc9933a81 100644
--- a/youtube_dl/extractor/matchtv.py
+++ b/youtube_dlc/extractor/matchtv.py
diff --git a/youtube_dl/extractor/mdr.py b/youtube_dlc/extractor/mdr.py
index 322e5b45a..322e5b45a 100644
--- a/youtube_dl/extractor/mdr.py
+++ b/youtube_dlc/extractor/mdr.py
diff --git a/youtube_dl/extractor/medialaan.py b/youtube_dlc/extractor/medialaan.py
index 50d5db802..50d5db802 100644
--- a/youtube_dl/extractor/medialaan.py
+++ b/youtube_dlc/extractor/medialaan.py
diff --git a/youtube_dl/extractor/mediaset.py b/youtube_dlc/extractor/mediaset.py
index 933df1495..933df1495 100644
--- a/youtube_dl/extractor/mediaset.py
+++ b/youtube_dlc/extractor/mediaset.py
diff --git a/youtube_dl/extractor/mediasite.py b/youtube_dlc/extractor/mediasite.py
index d6eb15740..d6eb15740 100644
--- a/youtube_dl/extractor/mediasite.py
+++ b/youtube_dlc/extractor/mediasite.py
diff --git a/youtube_dl/extractor/medici.py b/youtube_dlc/extractor/medici.py
index cd910238e..cd910238e 100644
--- a/youtube_dl/extractor/medici.py
+++ b/youtube_dlc/extractor/medici.py
diff --git a/youtube_dl/extractor/megaphone.py b/youtube_dlc/extractor/megaphone.py
index 5bafa6cf4..5bafa6cf4 100644
--- a/youtube_dl/extractor/megaphone.py
+++ b/youtube_dlc/extractor/megaphone.py
diff --git a/youtube_dl/extractor/meipai.py b/youtube_dlc/extractor/meipai.py
index 2445b8b39..2445b8b39 100644
--- a/youtube_dl/extractor/meipai.py
+++ b/youtube_dlc/extractor/meipai.py
diff --git a/youtube_dl/extractor/melonvod.py b/youtube_dlc/extractor/melonvod.py
index bd8cf13ab..bd8cf13ab 100644
--- a/youtube_dl/extractor/melonvod.py
+++ b/youtube_dlc/extractor/melonvod.py
diff --git a/youtube_dl/extractor/meta.py b/youtube_dlc/extractor/meta.py
index cdb46e163..cdb46e163 100644
--- a/youtube_dl/extractor/meta.py
+++ b/youtube_dlc/extractor/meta.py
diff --git a/youtube_dl/extractor/metacafe.py b/youtube_dlc/extractor/metacafe.py
index 9e92416d1..9e92416d1 100644
--- a/youtube_dl/extractor/metacafe.py
+++ b/youtube_dlc/extractor/metacafe.py
diff --git a/youtube_dl/extractor/metacritic.py b/youtube_dlc/extractor/metacritic.py
index 7d468d78b..7d468d78b 100644
--- a/youtube_dl/extractor/metacritic.py
+++ b/youtube_dlc/extractor/metacritic.py
diff --git a/youtube_dl/extractor/mgoon.py b/youtube_dlc/extractor/mgoon.py
index 7bb473900..7bb473900 100644
--- a/youtube_dl/extractor/mgoon.py
+++ b/youtube_dlc/extractor/mgoon.py
diff --git a/youtube_dl/extractor/mgtv.py b/youtube_dlc/extractor/mgtv.py
index 71fc3ec56..71fc3ec56 100644
--- a/youtube_dl/extractor/mgtv.py
+++ b/youtube_dlc/extractor/mgtv.py
diff --git a/youtube_dl/extractor/miaopai.py b/youtube_dlc/extractor/miaopai.py
index f9e35ac7f..f9e35ac7f 100644
--- a/youtube_dl/extractor/miaopai.py
+++ b/youtube_dlc/extractor/miaopai.py
diff --git a/youtube_dl/extractor/microsoftvirtualacademy.py b/youtube_dlc/extractor/microsoftvirtualacademy.py
index 8e0aee0e6..8e0aee0e6 100644
--- a/youtube_dl/extractor/microsoftvirtualacademy.py
+++ b/youtube_dlc/extractor/microsoftvirtualacademy.py
diff --git a/youtube_dl/extractor/ministrygrid.py b/youtube_dlc/extractor/ministrygrid.py
index 8ad9239c5..8ad9239c5 100644
--- a/youtube_dl/extractor/ministrygrid.py
+++ b/youtube_dlc/extractor/ministrygrid.py
diff --git a/youtube_dl/extractor/minoto.py b/youtube_dlc/extractor/minoto.py
index 636731195..636731195 100644
--- a/youtube_dl/extractor/minoto.py
+++ b/youtube_dlc/extractor/minoto.py
diff --git a/youtube_dl/extractor/miomio.py b/youtube_dlc/extractor/miomio.py
index 40f72d66f..40f72d66f 100644
--- a/youtube_dl/extractor/miomio.py
+++ b/youtube_dlc/extractor/miomio.py
diff --git a/youtube_dl/extractor/mit.py b/youtube_dlc/extractor/mit.py
index e1506a745..e1506a745 100644
--- a/youtube_dl/extractor/mit.py
+++ b/youtube_dlc/extractor/mit.py
diff --git a/youtube_dl/extractor/mitele.py b/youtube_dlc/extractor/mitele.py
index ad9da9612..ad9da9612 100644
--- a/youtube_dl/extractor/mitele.py
+++ b/youtube_dlc/extractor/mitele.py
diff --git a/youtube_dl/extractor/mixcloud.py b/youtube_dlc/extractor/mixcloud.py
index 9759560f1..9759560f1 100644
--- a/youtube_dl/extractor/mixcloud.py
+++ b/youtube_dlc/extractor/mixcloud.py
diff --git a/youtube_dl/extractor/mlb.py b/youtube_dlc/extractor/mlb.py
index b907f6b49..b907f6b49 100644
--- a/youtube_dl/extractor/mlb.py
+++ b/youtube_dlc/extractor/mlb.py
diff --git a/youtube_dl/extractor/mnet.py b/youtube_dlc/extractor/mnet.py
index 0e26ca1b3..0e26ca1b3 100644
--- a/youtube_dl/extractor/mnet.py
+++ b/youtube_dlc/extractor/mnet.py
diff --git a/youtube_dl/extractor/moevideo.py b/youtube_dlc/extractor/moevideo.py
index eb9b4ce7c..eb9b4ce7c 100644
--- a/youtube_dl/extractor/moevideo.py
+++ b/youtube_dlc/extractor/moevideo.py
diff --git a/youtube_dl/extractor/mofosex.py b/youtube_dlc/extractor/mofosex.py
index 5234cac02..5234cac02 100644
--- a/youtube_dl/extractor/mofosex.py
+++ b/youtube_dlc/extractor/mofosex.py
diff --git a/youtube_dl/extractor/mojvideo.py b/youtube_dlc/extractor/mojvideo.py
index 165e658c9..165e658c9 100644
--- a/youtube_dl/extractor/mojvideo.py
+++ b/youtube_dlc/extractor/mojvideo.py
diff --git a/youtube_dl/extractor/morningstar.py b/youtube_dlc/extractor/morningstar.py
index 0093bcd6c..0093bcd6c 100644
--- a/youtube_dl/extractor/morningstar.py
+++ b/youtube_dlc/extractor/morningstar.py
diff --git a/youtube_dl/extractor/motherless.py b/youtube_dlc/extractor/motherless.py
index b1615b4d8..b1615b4d8 100644
--- a/youtube_dl/extractor/motherless.py
+++ b/youtube_dlc/extractor/motherless.py
diff --git a/youtube_dl/extractor/motorsport.py b/youtube_dlc/extractor/motorsport.py
index c9d1ab64d..c9d1ab64d 100644
--- a/youtube_dl/extractor/motorsport.py
+++ b/youtube_dlc/extractor/motorsport.py
diff --git a/youtube_dl/extractor/movieclips.py b/youtube_dlc/extractor/movieclips.py
index 5453da1ac..5453da1ac 100644
--- a/youtube_dl/extractor/movieclips.py
+++ b/youtube_dlc/extractor/movieclips.py
diff --git a/youtube_dl/extractor/moviezine.py b/youtube_dlc/extractor/moviezine.py
index 85cc6e22f..85cc6e22f 100644
--- a/youtube_dl/extractor/moviezine.py
+++ b/youtube_dlc/extractor/moviezine.py
diff --git a/youtube_dl/extractor/movingimage.py b/youtube_dlc/extractor/movingimage.py
index 4f62d628a..4f62d628a 100644
--- a/youtube_dl/extractor/movingimage.py
+++ b/youtube_dlc/extractor/movingimage.py
diff --git a/youtube_dl/extractor/msn.py b/youtube_dlc/extractor/msn.py
index e59b0b7b0..e59b0b7b0 100644
--- a/youtube_dl/extractor/msn.py
+++ b/youtube_dlc/extractor/msn.py
diff --git a/youtube_dl/extractor/mtv.py b/youtube_dlc/extractor/mtv.py
index fedd5f46b..fedd5f46b 100644
--- a/youtube_dl/extractor/mtv.py
+++ b/youtube_dlc/extractor/mtv.py
diff --git a/youtube_dl/extractor/muenchentv.py b/youtube_dlc/extractor/muenchentv.py
index 2cc2bf229..2cc2bf229 100644
--- a/youtube_dl/extractor/muenchentv.py
+++ b/youtube_dlc/extractor/muenchentv.py
diff --git a/youtube_dl/extractor/mwave.py b/youtube_dlc/extractor/mwave.py
index a67276596..a67276596 100644
--- a/youtube_dl/extractor/mwave.py
+++ b/youtube_dlc/extractor/mwave.py
diff --git a/youtube_dl/extractor/mychannels.py b/youtube_dlc/extractor/mychannels.py
index b1ffe7848..b1ffe7848 100644
--- a/youtube_dl/extractor/mychannels.py
+++ b/youtube_dlc/extractor/mychannels.py
diff --git a/youtube_dl/extractor/myspace.py b/youtube_dlc/extractor/myspace.py
index e164d5940..e164d5940 100644
--- a/youtube_dl/extractor/myspace.py
+++ b/youtube_dlc/extractor/myspace.py
diff --git a/youtube_dl/extractor/myspass.py b/youtube_dlc/extractor/myspass.py
index db7ebc94c..db7ebc94c 100644
--- a/youtube_dl/extractor/myspass.py
+++ b/youtube_dlc/extractor/myspass.py
diff --git a/youtube_dl/extractor/myvi.py b/youtube_dlc/extractor/myvi.py
index 75d286365..75d286365 100644
--- a/youtube_dl/extractor/myvi.py
+++ b/youtube_dlc/extractor/myvi.py
diff --git a/youtube_dl/extractor/myvidster.py b/youtube_dlc/extractor/myvidster.py
index 2117d302d..2117d302d 100644
--- a/youtube_dl/extractor/myvidster.py
+++ b/youtube_dlc/extractor/myvidster.py
diff --git a/youtube_dl/extractor/nationalgeographic.py b/youtube_dlc/extractor/nationalgeographic.py
index ee12e2b47..ee12e2b47 100644
--- a/youtube_dl/extractor/nationalgeographic.py
+++ b/youtube_dlc/extractor/nationalgeographic.py
diff --git a/youtube_dl/extractor/naver.py b/youtube_dlc/extractor/naver.py
index 61fc59126..61fc59126 100644
--- a/youtube_dl/extractor/naver.py
+++ b/youtube_dlc/extractor/naver.py
diff --git a/youtube_dl/extractor/nba.py b/youtube_dlc/extractor/nba.py
index be295a7a3..be295a7a3 100644
--- a/youtube_dl/extractor/nba.py
+++ b/youtube_dlc/extractor/nba.py
diff --git a/youtube_dl/extractor/nbc.py b/youtube_dlc/extractor/nbc.py
index 6f3cb3003..6f3cb3003 100644
--- a/youtube_dl/extractor/nbc.py
+++ b/youtube_dlc/extractor/nbc.py
diff --git a/youtube_dl/extractor/ndr.py b/youtube_dlc/extractor/ndr.py
index 2447c812e..2447c812e 100644
--- a/youtube_dl/extractor/ndr.py
+++ b/youtube_dlc/extractor/ndr.py
diff --git a/youtube_dl/extractor/ndtv.py b/youtube_dlc/extractor/ndtv.py
index bc3eb9160..bc3eb9160 100644
--- a/youtube_dl/extractor/ndtv.py
+++ b/youtube_dlc/extractor/ndtv.py
diff --git a/youtube_dl/extractor/nerdcubed.py b/youtube_dlc/extractor/nerdcubed.py
index 9feccc672..9feccc672 100644
--- a/youtube_dl/extractor/nerdcubed.py
+++ b/youtube_dlc/extractor/nerdcubed.py
diff --git a/youtube_dl/extractor/neteasemusic.py b/youtube_dlc/extractor/neteasemusic.py
index 978a05841..978a05841 100644
--- a/youtube_dl/extractor/neteasemusic.py
+++ b/youtube_dlc/extractor/neteasemusic.py
diff --git a/youtube_dl/extractor/netzkino.py b/youtube_dlc/extractor/netzkino.py
index aec3026b1..aec3026b1 100644
--- a/youtube_dl/extractor/netzkino.py
+++ b/youtube_dlc/extractor/netzkino.py
diff --git a/youtube_dl/extractor/newgrounds.py b/youtube_dlc/extractor/newgrounds.py
index 82e7cf522..82e7cf522 100644
--- a/youtube_dl/extractor/newgrounds.py
+++ b/youtube_dlc/extractor/newgrounds.py
diff --git a/youtube_dl/extractor/newstube.py b/youtube_dlc/extractor/newstube.py
index dab4aec44..dab4aec44 100644
--- a/youtube_dl/extractor/newstube.py
+++ b/youtube_dlc/extractor/newstube.py
diff --git a/youtube_dl/extractor/nextmedia.py b/youtube_dlc/extractor/nextmedia.py
index 7bd1290bf..7bd1290bf 100644
--- a/youtube_dl/extractor/nextmedia.py
+++ b/youtube_dlc/extractor/nextmedia.py
diff --git a/youtube_dl/extractor/nexx.py b/youtube_dlc/extractor/nexx.py
index 586c1b7eb..586c1b7eb 100644
--- a/youtube_dl/extractor/nexx.py
+++ b/youtube_dlc/extractor/nexx.py
diff --git a/youtube_dl/extractor/nfl.py b/youtube_dlc/extractor/nfl.py
index 460deb162..460deb162 100644
--- a/youtube_dl/extractor/nfl.py
+++ b/youtube_dlc/extractor/nfl.py
diff --git a/youtube_dl/extractor/nhk.py b/youtube_dlc/extractor/nhk.py
index de6a707c4..de6a707c4 100644
--- a/youtube_dl/extractor/nhk.py
+++ b/youtube_dlc/extractor/nhk.py
diff --git a/youtube_dl/extractor/nhl.py b/youtube_dlc/extractor/nhl.py
index eddfe1f37..eddfe1f37 100644
--- a/youtube_dl/extractor/nhl.py
+++ b/youtube_dlc/extractor/nhl.py
diff --git a/youtube_dl/extractor/nick.py b/youtube_dlc/extractor/nick.py
index 2e8b302ac..2e8b302ac 100644
--- a/youtube_dl/extractor/nick.py
+++ b/youtube_dlc/extractor/nick.py
diff --git a/youtube_dl/extractor/niconico.py b/youtube_dlc/extractor/niconico.py
index eb07ca776..eb07ca776 100644
--- a/youtube_dl/extractor/niconico.py
+++ b/youtube_dlc/extractor/niconico.py
diff --git a/youtube_dl/extractor/ninecninemedia.py b/youtube_dlc/extractor/ninecninemedia.py
index 65754c5e7..65754c5e7 100644
--- a/youtube_dl/extractor/ninecninemedia.py
+++ b/youtube_dlc/extractor/ninecninemedia.py
diff --git a/youtube_dl/extractor/ninegag.py b/youtube_dlc/extractor/ninegag.py
index dc6a27d36..dc6a27d36 100644
--- a/youtube_dl/extractor/ninegag.py
+++ b/youtube_dlc/extractor/ninegag.py
diff --git a/youtube_dl/extractor/ninenow.py b/youtube_dlc/extractor/ninenow.py
index 6157dc7c1..6157dc7c1 100644
--- a/youtube_dl/extractor/ninenow.py
+++ b/youtube_dlc/extractor/ninenow.py
diff --git a/youtube_dl/extractor/nintendo.py b/youtube_dlc/extractor/nintendo.py
index ff8f70ba6..ff8f70ba6 100644
--- a/youtube_dl/extractor/nintendo.py
+++ b/youtube_dlc/extractor/nintendo.py
diff --git a/youtube_dl/extractor/njpwworld.py b/youtube_dlc/extractor/njpwworld.py
index 025c5d249..025c5d249 100644
--- a/youtube_dl/extractor/njpwworld.py
+++ b/youtube_dlc/extractor/njpwworld.py
diff --git a/youtube_dl/extractor/nobelprize.py b/youtube_dlc/extractor/nobelprize.py
index 4dfdb09d6..4dfdb09d6 100644
--- a/youtube_dl/extractor/nobelprize.py
+++ b/youtube_dlc/extractor/nobelprize.py
diff --git a/youtube_dl/extractor/noco.py b/youtube_dlc/extractor/noco.py
index 30df905af..30df905af 100644
--- a/youtube_dl/extractor/noco.py
+++ b/youtube_dlc/extractor/noco.py
diff --git a/youtube_dl/extractor/nonktube.py b/youtube_dlc/extractor/nonktube.py
index ca1424e06..ca1424e06 100644
--- a/youtube_dl/extractor/nonktube.py
+++ b/youtube_dlc/extractor/nonktube.py
diff --git a/youtube_dl/extractor/noovo.py b/youtube_dlc/extractor/noovo.py
index b40770d07..b40770d07 100644
--- a/youtube_dl/extractor/noovo.py
+++ b/youtube_dlc/extractor/noovo.py
diff --git a/youtube_dl/extractor/normalboots.py b/youtube_dlc/extractor/normalboots.py
index 61fe571df..61fe571df 100644
--- a/youtube_dl/extractor/normalboots.py
+++ b/youtube_dlc/extractor/normalboots.py
diff --git a/youtube_dl/extractor/nosvideo.py b/youtube_dlc/extractor/nosvideo.py
index 53c500c35..53c500c35 100644
--- a/youtube_dl/extractor/nosvideo.py
+++ b/youtube_dlc/extractor/nosvideo.py
diff --git a/youtube_dl/extractor/nova.py b/youtube_dlc/extractor/nova.py
index 47b9748f0..47b9748f0 100644
--- a/youtube_dl/extractor/nova.py
+++ b/youtube_dlc/extractor/nova.py
diff --git a/youtube_dl/extractor/nowness.py b/youtube_dlc/extractor/nowness.py
index f26dafb8f..c136bc8c0 100644
--- a/youtube_dl/extractor/nowness.py
+++ b/youtube_dlc/extractor/nowness.py
@@ -37,7 +37,7 @@ class NownessBaseIE(InfoExtractor):
                     elif source == 'youtube':
                         return self.url_result(video_id, 'Youtube')
                     elif source == 'cinematique':
-                        # youtube-dl currently doesn't support cinematique
+                        # youtube-dlc currently doesn't support cinematique
                         # return self.url_result('http://cinematique.com/embed/%s' % video_id, 'Cinematique')
                         pass
 
diff --git a/youtube_dl/extractor/noz.py b/youtube_dlc/extractor/noz.py
index ccafd7723..ccafd7723 100644
--- a/youtube_dl/extractor/noz.py
+++ b/youtube_dlc/extractor/noz.py
diff --git a/youtube_dl/extractor/npo.py b/youtube_dlc/extractor/npo.py
index e525ad928..e525ad928 100644
--- a/youtube_dl/extractor/npo.py
+++ b/youtube_dlc/extractor/npo.py
diff --git a/youtube_dl/extractor/npr.py b/youtube_dlc/extractor/npr.py
index 53acc6e57..53acc6e57 100644
--- a/youtube_dl/extractor/npr.py
+++ b/youtube_dlc/extractor/npr.py
diff --git a/youtube_dl/extractor/nrk.py b/youtube_dlc/extractor/nrk.py
index 94115534b..94115534b 100644
--- a/youtube_dl/extractor/nrk.py
+++ b/youtube_dlc/extractor/nrk.py
diff --git a/youtube_dl/extractor/nrl.py b/youtube_dlc/extractor/nrl.py
index 22a2df8d3..22a2df8d3 100644
--- a/youtube_dl/extractor/nrl.py
+++ b/youtube_dlc/extractor/nrl.py
diff --git a/youtube_dl/extractor/ntvcojp.py b/youtube_dlc/extractor/ntvcojp.py
index 0c8221b22..0c8221b22 100644
--- a/youtube_dl/extractor/ntvcojp.py
+++ b/youtube_dlc/extractor/ntvcojp.py
diff --git a/youtube_dl/extractor/ntvde.py b/youtube_dlc/extractor/ntvde.py
index 101a5374c..101a5374c 100644
--- a/youtube_dl/extractor/ntvde.py
+++ b/youtube_dlc/extractor/ntvde.py
diff --git a/youtube_dl/extractor/ntvru.py b/youtube_dlc/extractor/ntvru.py
index c47d1dfa4..c47d1dfa4 100644
--- a/youtube_dl/extractor/ntvru.py
+++ b/youtube_dlc/extractor/ntvru.py
diff --git a/youtube_dl/extractor/nuevo.py b/youtube_dlc/extractor/nuevo.py
index be1e09d37..be1e09d37 100644
--- a/youtube_dl/extractor/nuevo.py
+++ b/youtube_dlc/extractor/nuevo.py
diff --git a/youtube_dl/extractor/nuvid.py b/youtube_dlc/extractor/nuvid.py
index ab6bfcd7f..ab6bfcd7f 100644
--- a/youtube_dl/extractor/nuvid.py
+++ b/youtube_dlc/extractor/nuvid.py
diff --git a/youtube_dl/extractor/nytimes.py b/youtube_dlc/extractor/nytimes.py
index fc78ca56c..fc78ca56c 100644
--- a/youtube_dl/extractor/nytimes.py
+++ b/youtube_dlc/extractor/nytimes.py
diff --git a/youtube_dl/extractor/nzz.py b/youtube_dlc/extractor/nzz.py
index 61ee77adb..61ee77adb 100644
--- a/youtube_dl/extractor/nzz.py
+++ b/youtube_dlc/extractor/nzz.py
diff --git a/youtube_dl/extractor/odatv.py b/youtube_dlc/extractor/odatv.py
index 314527f98..314527f98 100644
--- a/youtube_dl/extractor/odatv.py
+++ b/youtube_dlc/extractor/odatv.py
diff --git a/youtube_dl/extractor/odnoklassniki.py b/youtube_dlc/extractor/odnoklassniki.py
index 7ed9fac55..7ed9fac55 100644
--- a/youtube_dl/extractor/odnoklassniki.py
+++ b/youtube_dlc/extractor/odnoklassniki.py
diff --git a/youtube_dl/extractor/oktoberfesttv.py b/youtube_dlc/extractor/oktoberfesttv.py
index a914068f9..a914068f9 100644
--- a/youtube_dl/extractor/oktoberfesttv.py
+++ b/youtube_dlc/extractor/oktoberfesttv.py
diff --git a/youtube_dl/extractor/once.py b/youtube_dlc/extractor/once.py
index 3e44b7829..3e44b7829 100644
--- a/youtube_dl/extractor/once.py
+++ b/youtube_dlc/extractor/once.py
diff --git a/youtube_dl/extractor/ondemandkorea.py b/youtube_dlc/extractor/ondemandkorea.py
index df1ce3c1d..df1ce3c1d 100644
--- a/youtube_dl/extractor/ondemandkorea.py
+++ b/youtube_dlc/extractor/ondemandkorea.py
diff --git a/youtube_dl/extractor/onet.py b/youtube_dlc/extractor/onet.py
index e55b2ac89..e55b2ac89 100644
--- a/youtube_dl/extractor/onet.py
+++ b/youtube_dlc/extractor/onet.py
diff --git a/youtube_dl/extractor/onionstudios.py b/youtube_dlc/extractor/onionstudios.py
index cf5c39e66..cf5c39e66 100644
--- a/youtube_dl/extractor/onionstudios.py
+++ b/youtube_dlc/extractor/onionstudios.py
diff --git a/youtube_dl/extractor/ooyala.py b/youtube_dlc/extractor/ooyala.py
index eb957b8fe..eb957b8fe 100644
--- a/youtube_dl/extractor/ooyala.py
+++ b/youtube_dlc/extractor/ooyala.py
diff --git a/youtube_dl/extractor/openload.py b/youtube_dlc/extractor/openload.py
index 0c20d0177..0c20d0177 100644
--- a/youtube_dl/extractor/openload.py
+++ b/youtube_dlc/extractor/openload.py
diff --git a/youtube_dl/extractor/ora.py b/youtube_dlc/extractor/ora.py
index 1d42be39b..1d42be39b 100644
--- a/youtube_dl/extractor/ora.py
+++ b/youtube_dlc/extractor/ora.py
diff --git a/youtube_dl/extractor/orf.py b/youtube_dlc/extractor/orf.py
index 700ce448c..700ce448c 100644
--- a/youtube_dl/extractor/orf.py
+++ b/youtube_dlc/extractor/orf.py
diff --git a/youtube_dl/extractor/outsidetv.py b/youtube_dlc/extractor/outsidetv.py
index c5333b08c..c5333b08c 100644
--- a/youtube_dl/extractor/outsidetv.py
+++ b/youtube_dlc/extractor/outsidetv.py
diff --git a/youtube_dl/extractor/packtpub.py b/youtube_dlc/extractor/packtpub.py
index 11ad3b3b8..11ad3b3b8 100644
--- a/youtube_dl/extractor/packtpub.py
+++ b/youtube_dlc/extractor/packtpub.py
diff --git a/youtube_dl/extractor/pandoratv.py b/youtube_dlc/extractor/pandoratv.py
index 538738c09..538738c09 100644
--- a/youtube_dl/extractor/pandoratv.py
+++ b/youtube_dlc/extractor/pandoratv.py
diff --git a/youtube_dl/extractor/parliamentliveuk.py b/youtube_dlc/extractor/parliamentliveuk.py
index bdd5ff565..bdd5ff565 100644
--- a/youtube_dl/extractor/parliamentliveuk.py
+++ b/youtube_dlc/extractor/parliamentliveuk.py
diff --git a/youtube_dl/extractor/patreon.py b/youtube_dlc/extractor/patreon.py
index 761a4b1de..761a4b1de 100644
--- a/youtube_dl/extractor/patreon.py
+++ b/youtube_dlc/extractor/patreon.py
diff --git a/youtube_dl/extractor/pbs.py b/youtube_dlc/extractor/pbs.py
index 4dbe661be..4dbe661be 100644
--- a/youtube_dl/extractor/pbs.py
+++ b/youtube_dlc/extractor/pbs.py
diff --git a/youtube_dl/extractor/pearvideo.py b/youtube_dlc/extractor/pearvideo.py
index 1d777221c..1d777221c 100644
--- a/youtube_dl/extractor/pearvideo.py
+++ b/youtube_dlc/extractor/pearvideo.py
diff --git a/youtube_dl/extractor/peertube.py b/youtube_dlc/extractor/peertube.py
index 48fb95416..48fb95416 100644
--- a/youtube_dl/extractor/peertube.py
+++ b/youtube_dlc/extractor/peertube.py
diff --git a/youtube_dl/extractor/people.py b/youtube_dlc/extractor/people.py
index 6ca95715e..6ca95715e 100644
--- a/youtube_dl/extractor/people.py
+++ b/youtube_dlc/extractor/people.py
diff --git a/youtube_dl/extractor/performgroup.py b/youtube_dlc/extractor/performgroup.py
index 26942bfb3..26942bfb3 100644
--- a/youtube_dl/extractor/performgroup.py
+++ b/youtube_dlc/extractor/performgroup.py
diff --git a/youtube_dl/extractor/periscope.py b/youtube_dlc/extractor/periscope.py
index b15906390..b15906390 100644
--- a/youtube_dl/extractor/periscope.py
+++ b/youtube_dlc/extractor/periscope.py
diff --git a/youtube_dl/extractor/philharmoniedeparis.py b/youtube_dlc/extractor/philharmoniedeparis.py
index 03da64b11..03da64b11 100644
--- a/youtube_dl/extractor/philharmoniedeparis.py
+++ b/youtube_dlc/extractor/philharmoniedeparis.py
diff --git a/youtube_dl/extractor/phoenix.py b/youtube_dlc/extractor/phoenix.py
index e435c28e1..e435c28e1 100644
--- a/youtube_dl/extractor/phoenix.py
+++ b/youtube_dlc/extractor/phoenix.py
diff --git a/youtube_dl/extractor/photobucket.py b/youtube_dlc/extractor/photobucket.py
index 6c8bbe1d9..6c8bbe1d9 100644
--- a/youtube_dl/extractor/photobucket.py
+++ b/youtube_dlc/extractor/photobucket.py
diff --git a/youtube_dl/extractor/picarto.py b/youtube_dlc/extractor/picarto.py
index 8099ef1d6..8099ef1d6 100644
--- a/youtube_dl/extractor/picarto.py
+++ b/youtube_dlc/extractor/picarto.py
diff --git a/youtube_dl/extractor/piksel.py b/youtube_dlc/extractor/piksel.py
index 88b6859b0..88b6859b0 100644
--- a/youtube_dl/extractor/piksel.py
+++ b/youtube_dlc/extractor/piksel.py
diff --git a/youtube_dl/extractor/pinkbike.py b/youtube_dlc/extractor/pinkbike.py
index 9f3501f77..9f3501f77 100644
--- a/youtube_dl/extractor/pinkbike.py
+++ b/youtube_dlc/extractor/pinkbike.py
diff --git a/youtube_dl/extractor/pladform.py b/youtube_dlc/extractor/pladform.py
index e86c65396..e86c65396 100644
--- a/youtube_dl/extractor/pladform.py
+++ b/youtube_dlc/extractor/pladform.py
diff --git a/youtube_dl/extractor/platzi.py b/youtube_dlc/extractor/platzi.py
index 23c8256b5..23c8256b5 100644
--- a/youtube_dl/extractor/platzi.py
+++ b/youtube_dlc/extractor/platzi.py
diff --git a/youtube_dl/extractor/playfm.py b/youtube_dlc/extractor/playfm.py
index e766ccca3..e766ccca3 100644
--- a/youtube_dl/extractor/playfm.py
+++ b/youtube_dlc/extractor/playfm.py
diff --git a/youtube_dl/extractor/playplustv.py b/youtube_dlc/extractor/playplustv.py
index 1e30ab23a..1e30ab23a 100644
--- a/youtube_dl/extractor/playplustv.py
+++ b/youtube_dlc/extractor/playplustv.py
diff --git a/youtube_dl/extractor/plays.py b/youtube_dlc/extractor/plays.py
index ddfc6f148..ddfc6f148 100644
--- a/youtube_dl/extractor/plays.py
+++ b/youtube_dlc/extractor/plays.py
diff --git a/youtube_dl/extractor/playtvak.py b/youtube_dlc/extractor/playtvak.py
index 4c5f57919..4c5f57919 100644
--- a/youtube_dl/extractor/playtvak.py
+++ b/youtube_dlc/extractor/playtvak.py
diff --git a/youtube_dl/extractor/playvid.py b/youtube_dlc/extractor/playvid.py
index 4aef186ea..4aef186ea 100644
--- a/youtube_dl/extractor/playvid.py
+++ b/youtube_dlc/extractor/playvid.py
diff --git a/youtube_dl/extractor/playwire.py b/youtube_dlc/extractor/playwire.py
index 4d96a10a7..4d96a10a7 100644
--- a/youtube_dl/extractor/playwire.py
+++ b/youtube_dlc/extractor/playwire.py
diff --git a/youtube_dl/extractor/pluralsight.py b/youtube_dlc/extractor/pluralsight.py
index abd08bc28..abd08bc28 100644
--- a/youtube_dl/extractor/pluralsight.py
+++ b/youtube_dlc/extractor/pluralsight.py
diff --git a/youtube_dl/extractor/podomatic.py b/youtube_dlc/extractor/podomatic.py
index e782e3f1f..e782e3f1f 100644
--- a/youtube_dl/extractor/podomatic.py
+++ b/youtube_dlc/extractor/podomatic.py
diff --git a/youtube_dl/extractor/pokemon.py b/youtube_dlc/extractor/pokemon.py
index 80222d428..80222d428 100644
--- a/youtube_dl/extractor/pokemon.py
+++ b/youtube_dlc/extractor/pokemon.py
diff --git a/youtube_dl/extractor/polskieradio.py b/youtube_dlc/extractor/polskieradio.py
index 978d6f813..978d6f813 100644
--- a/youtube_dl/extractor/polskieradio.py
+++ b/youtube_dlc/extractor/polskieradio.py
diff --git a/youtube_dl/extractor/popcorntimes.py b/youtube_dlc/extractor/popcorntimes.py
index 7bf7f9858..7bf7f9858 100644
--- a/youtube_dl/extractor/popcorntimes.py
+++ b/youtube_dlc/extractor/popcorntimes.py
diff --git a/youtube_dl/extractor/popcorntv.py b/youtube_dlc/extractor/popcorntv.py
index 9f834fb6c..9f834fb6c 100644
--- a/youtube_dl/extractor/popcorntv.py
+++ b/youtube_dlc/extractor/popcorntv.py
diff --git a/youtube_dl/extractor/porn91.py b/youtube_dlc/extractor/porn91.py
index 20eac647a..20eac647a 100644
--- a/youtube_dl/extractor/porn91.py
+++ b/youtube_dlc/extractor/porn91.py
diff --git a/youtube_dl/extractor/porncom.py b/youtube_dlc/extractor/porncom.py
index 5726cab3a..5726cab3a 100644
--- a/youtube_dl/extractor/porncom.py
+++ b/youtube_dlc/extractor/porncom.py
diff --git a/youtube_dl/extractor/pornhd.py b/youtube_dlc/extractor/pornhd.py
index c6052ac9f..c6052ac9f 100644
--- a/youtube_dl/extractor/pornhd.py
+++ b/youtube_dlc/extractor/pornhd.py
diff --git a/youtube_dl/extractor/pornhub.py b/youtube_dlc/extractor/pornhub.py
index 3567a3283..3567a3283 100644
--- a/youtube_dl/extractor/pornhub.py
+++ b/youtube_dlc/extractor/pornhub.py
diff --git a/youtube_dl/extractor/pornotube.py b/youtube_dlc/extractor/pornotube.py
index 1b5b9a320..1b5b9a320 100644
--- a/youtube_dl/extractor/pornotube.py
+++ b/youtube_dlc/extractor/pornotube.py
diff --git a/youtube_dl/extractor/pornovoisines.py b/youtube_dlc/extractor/pornovoisines.py
index b6b71069d..b6b71069d 100644
--- a/youtube_dl/extractor/pornovoisines.py
+++ b/youtube_dlc/extractor/pornovoisines.py
diff --git a/youtube_dl/extractor/pornoxo.py b/youtube_dlc/extractor/pornoxo.py
index 2831368b6..2831368b6 100644
--- a/youtube_dl/extractor/pornoxo.py
+++ b/youtube_dlc/extractor/pornoxo.py
diff --git a/youtube_dl/extractor/presstv.py b/youtube_dlc/extractor/presstv.py
index b5c279203..b5c279203 100644
--- a/youtube_dl/extractor/presstv.py
+++ b/youtube_dlc/extractor/presstv.py
diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dlc/extractor/prosiebensat1.py
index e47088292..e47088292 100644
--- a/youtube_dl/extractor/prosiebensat1.py
+++ b/youtube_dlc/extractor/prosiebensat1.py
diff --git a/youtube_dl/extractor/puhutv.py b/youtube_dlc/extractor/puhutv.py
index ca71665e0..ca71665e0 100644
--- a/youtube_dl/extractor/puhutv.py
+++ b/youtube_dlc/extractor/puhutv.py
diff --git a/youtube_dl/extractor/puls4.py b/youtube_dlc/extractor/puls4.py
index 80091b85f..80091b85f 100644
--- a/youtube_dl/extractor/puls4.py
+++ b/youtube_dlc/extractor/puls4.py
diff --git a/youtube_dl/extractor/pyvideo.py b/youtube_dlc/extractor/pyvideo.py
index b8ac93a62..b8ac93a62 100644
--- a/youtube_dl/extractor/pyvideo.py
+++ b/youtube_dlc/extractor/pyvideo.py
diff --git a/youtube_dl/extractor/qqmusic.py b/youtube_dlc/extractor/qqmusic.py
index 084308aeb..084308aeb 100644
--- a/youtube_dl/extractor/qqmusic.py
+++ b/youtube_dlc/extractor/qqmusic.py
diff --git a/youtube_dl/extractor/r7.py b/youtube_dlc/extractor/r7.py
index e2202d603..e2202d603 100644
--- a/youtube_dl/extractor/r7.py
+++ b/youtube_dlc/extractor/r7.py
diff --git a/youtube_dl/extractor/radiobremen.py b/youtube_dlc/extractor/radiobremen.py
index 2c35f9845..2c35f9845 100644
--- a/youtube_dl/extractor/radiobremen.py
+++ b/youtube_dlc/extractor/radiobremen.py
diff --git a/youtube_dl/extractor/radiocanada.py b/youtube_dlc/extractor/radiocanada.py
index a28b1a24c..a28b1a24c 100644
--- a/youtube_dl/extractor/radiocanada.py
+++ b/youtube_dlc/extractor/radiocanada.py
diff --git a/youtube_dl/extractor/radiode.py b/youtube_dlc/extractor/radiode.py
index 2c06c8b1e..2c06c8b1e 100644
--- a/youtube_dl/extractor/radiode.py
+++ b/youtube_dlc/extractor/radiode.py
diff --git a/youtube_dl/extractor/radiofrance.py b/youtube_dlc/extractor/radiofrance.py
index a8afc0014..a8afc0014 100644
--- a/youtube_dl/extractor/radiofrance.py
+++ b/youtube_dlc/extractor/radiofrance.py
diff --git a/youtube_dl/extractor/radiojavan.py b/youtube_dlc/extractor/radiojavan.py
index 3f74f0c01..3f74f0c01 100644
--- a/youtube_dl/extractor/radiojavan.py
+++ b/youtube_dlc/extractor/radiojavan.py
diff --git a/youtube_dl/extractor/rai.py b/youtube_dlc/extractor/rai.py
index 207a6c247..207a6c247 100644
--- a/youtube_dl/extractor/rai.py
+++ b/youtube_dlc/extractor/rai.py
diff --git a/youtube_dl/extractor/raywenderlich.py b/youtube_dlc/extractor/raywenderlich.py
index 5411ece21..5411ece21 100644
--- a/youtube_dl/extractor/raywenderlich.py
+++ b/youtube_dlc/extractor/raywenderlich.py
diff --git a/youtube_dl/extractor/rbmaradio.py b/youtube_dlc/extractor/rbmaradio.py
index ae7413fb5..ae7413fb5 100644
--- a/youtube_dl/extractor/rbmaradio.py
+++ b/youtube_dlc/extractor/rbmaradio.py
diff --git a/youtube_dl/extractor/rds.py b/youtube_dlc/extractor/rds.py
index 8c016a77d..8c016a77d 100644
--- a/youtube_dl/extractor/rds.py
+++ b/youtube_dlc/extractor/rds.py
diff --git a/youtube_dl/extractor/redbulltv.py b/youtube_dlc/extractor/redbulltv.py
index dbe1aaded..dbe1aaded 100644
--- a/youtube_dl/extractor/redbulltv.py
+++ b/youtube_dlc/extractor/redbulltv.py
diff --git a/youtube_dl/extractor/reddit.py b/youtube_dlc/extractor/reddit.py
index 663f622b3..663f622b3 100644
--- a/youtube_dl/extractor/reddit.py
+++ b/youtube_dlc/extractor/reddit.py
diff --git a/youtube_dl/extractor/redtube.py b/youtube_dlc/extractor/redtube.py
index 2d2f6a98c..2d2f6a98c 100644
--- a/youtube_dl/extractor/redtube.py
+++ b/youtube_dlc/extractor/redtube.py
diff --git a/youtube_dl/extractor/regiotv.py b/youtube_dlc/extractor/regiotv.py
index e250a52f0..e250a52f0 100644
--- a/youtube_dl/extractor/regiotv.py
+++ b/youtube_dlc/extractor/regiotv.py
diff --git a/youtube_dl/extractor/rentv.py b/youtube_dlc/extractor/rentv.py
index 7c8909d95..7c8909d95 100644
--- a/youtube_dl/extractor/rentv.py
+++ b/youtube_dlc/extractor/rentv.py
diff --git a/youtube_dl/extractor/restudy.py b/youtube_dlc/extractor/restudy.py
index d47fb45ca..d47fb45ca 100644
--- a/youtube_dl/extractor/restudy.py
+++ b/youtube_dlc/extractor/restudy.py
diff --git a/youtube_dl/extractor/reuters.py b/youtube_dlc/extractor/reuters.py
index 9dc482d21..9dc482d21 100644
--- a/youtube_dl/extractor/reuters.py
+++ b/youtube_dlc/extractor/reuters.py
diff --git a/youtube_dl/extractor/reverbnation.py b/youtube_dlc/extractor/reverbnation.py
index 4cb99c244..4cb99c244 100644
--- a/youtube_dl/extractor/reverbnation.py
+++ b/youtube_dlc/extractor/reverbnation.py
diff --git a/youtube_dl/extractor/rice.py b/youtube_dlc/extractor/rice.py
index f855719ac..f855719ac 100644
--- a/youtube_dl/extractor/rice.py
+++ b/youtube_dlc/extractor/rice.py
diff --git a/youtube_dl/extractor/rmcdecouverte.py b/youtube_dlc/extractor/rmcdecouverte.py
index c3623edcc..c3623edcc 100644
--- a/youtube_dl/extractor/rmcdecouverte.py
+++ b/youtube_dlc/extractor/rmcdecouverte.py
diff --git a/youtube_dl/extractor/ro220.py b/youtube_dlc/extractor/ro220.py
index 69934ef2b..69934ef2b 100644
--- a/youtube_dl/extractor/ro220.py
+++ b/youtube_dlc/extractor/ro220.py
diff --git a/youtube_dl/extractor/rockstargames.py b/youtube_dlc/extractor/rockstargames.py
index cd6904bc9..cd6904bc9 100644
--- a/youtube_dl/extractor/rockstargames.py
+++ b/youtube_dlc/extractor/rockstargames.py
diff --git a/youtube_dl/extractor/roosterteeth.py b/youtube_dlc/extractor/roosterteeth.py
index 8883639b2..8883639b2 100644
--- a/youtube_dl/extractor/roosterteeth.py
+++ b/youtube_dlc/extractor/roosterteeth.py
diff --git a/youtube_dl/extractor/rottentomatoes.py b/youtube_dlc/extractor/rottentomatoes.py
index 14c8e8236..14c8e8236 100644
--- a/youtube_dl/extractor/rottentomatoes.py
+++ b/youtube_dlc/extractor/rottentomatoes.py
diff --git a/youtube_dl/extractor/roxwel.py b/youtube_dlc/extractor/roxwel.py
index 65284643b..65284643b 100644
--- a/youtube_dl/extractor/roxwel.py
+++ b/youtube_dlc/extractor/roxwel.py
diff --git a/youtube_dl/extractor/rozhlas.py b/youtube_dlc/extractor/rozhlas.py
index fccf69401..fccf69401 100644
--- a/youtube_dl/extractor/rozhlas.py
+++ b/youtube_dlc/extractor/rozhlas.py
diff --git a/youtube_dl/extractor/rtbf.py b/youtube_dlc/extractor/rtbf.py
index 3b0f3080b..3b0f3080b 100644
--- a/youtube_dl/extractor/rtbf.py
+++ b/youtube_dlc/extractor/rtbf.py
diff --git a/youtube_dl/extractor/rte.py b/youtube_dlc/extractor/rte.py
index 1fbc72915..1fbc72915 100644
--- a/youtube_dl/extractor/rte.py
+++ b/youtube_dlc/extractor/rte.py
diff --git a/youtube_dl/extractor/rtl2.py b/youtube_dlc/extractor/rtl2.py
index 70f000ca8..70f000ca8 100644
--- a/youtube_dl/extractor/rtl2.py
+++ b/youtube_dlc/extractor/rtl2.py
diff --git a/youtube_dl/extractor/rtlnl.py b/youtube_dlc/extractor/rtlnl.py
index fadca8c17..fadca8c17 100644
--- a/youtube_dl/extractor/rtlnl.py
+++ b/youtube_dlc/extractor/rtlnl.py
diff --git a/youtube_dl/extractor/rtp.py b/youtube_dlc/extractor/rtp.py
index 02986f442..02986f442 100644
--- a/youtube_dl/extractor/rtp.py
+++ b/youtube_dlc/extractor/rtp.py
diff --git a/youtube_dl/extractor/rts.py b/youtube_dlc/extractor/rts.py
index 48f17b828..48f17b828 100644
--- a/youtube_dl/extractor/rts.py
+++ b/youtube_dlc/extractor/rts.py
diff --git a/youtube_dl/extractor/rtve.py b/youtube_dlc/extractor/rtve.py
index ce9db0629..ce9db0629 100644
--- a/youtube_dl/extractor/rtve.py
+++ b/youtube_dlc/extractor/rtve.py
diff --git a/youtube_dl/extractor/rtvnh.py b/youtube_dlc/extractor/rtvnh.py
index 6a00f7007..6a00f7007 100644
--- a/youtube_dl/extractor/rtvnh.py
+++ b/youtube_dlc/extractor/rtvnh.py
diff --git a/youtube_dl/extractor/rtvs.py b/youtube_dlc/extractor/rtvs.py
index 6573b260d..6573b260d 100644
--- a/youtube_dl/extractor/rtvs.py
+++ b/youtube_dlc/extractor/rtvs.py
diff --git a/youtube_dl/extractor/ruhd.py b/youtube_dlc/extractor/ruhd.py
index 3c8053a26..3c8053a26 100644
--- a/youtube_dl/extractor/ruhd.py
+++ b/youtube_dlc/extractor/ruhd.py
diff --git a/youtube_dl/extractor/rutube.py b/youtube_dlc/extractor/rutube.py
index 8f54d5675..8f54d5675 100644
--- a/youtube_dl/extractor/rutube.py
+++ b/youtube_dlc/extractor/rutube.py
diff --git a/youtube_dl/extractor/rutv.py b/youtube_dlc/extractor/rutv.py
index d2713c19a..d2713c19a 100644
--- a/youtube_dl/extractor/rutv.py
+++ b/youtube_dlc/extractor/rutv.py
diff --git a/youtube_dl/extractor/ruutu.py b/youtube_dlc/extractor/ruutu.py
index f984040aa..f984040aa 100644
--- a/youtube_dl/extractor/ruutu.py
+++ b/youtube_dlc/extractor/ruutu.py
diff --git a/youtube_dl/extractor/ruv.py b/youtube_dlc/extractor/ruv.py
index 8f3cc4095..8f3cc4095 100644
--- a/youtube_dl/extractor/ruv.py
+++ b/youtube_dlc/extractor/ruv.py
diff --git a/youtube_dl/extractor/safari.py b/youtube_dlc/extractor/safari.py
index 2cc665122..2cc665122 100644
--- a/youtube_dl/extractor/safari.py
+++ b/youtube_dlc/extractor/safari.py
diff --git a/youtube_dl/extractor/sapo.py b/youtube_dlc/extractor/sapo.py
index 49a9b313a..49a9b313a 100644
--- a/youtube_dl/extractor/sapo.py
+++ b/youtube_dlc/extractor/sapo.py
diff --git a/youtube_dl/extractor/savefrom.py b/youtube_dlc/extractor/savefrom.py
index 21e44b69a..21e44b69a 100644
--- a/youtube_dl/extractor/savefrom.py
+++ b/youtube_dlc/extractor/savefrom.py
diff --git a/youtube_dl/extractor/sbs.py b/youtube_dlc/extractor/sbs.py
index 0e623ff7b..0e623ff7b 100644
--- a/youtube_dl/extractor/sbs.py
+++ b/youtube_dlc/extractor/sbs.py
diff --git a/youtube_dl/extractor/screencast.py b/youtube_dlc/extractor/screencast.py
index 69a0d01f3..69a0d01f3 100644
--- a/youtube_dl/extractor/screencast.py
+++ b/youtube_dlc/extractor/screencast.py
diff --git a/youtube_dl/extractor/screencastomatic.py b/youtube_dlc/extractor/screencastomatic.py
index b5e76c9af..b5e76c9af 100644
--- a/youtube_dl/extractor/screencastomatic.py
+++ b/youtube_dlc/extractor/screencastomatic.py
diff --git a/youtube_dl/extractor/scrippsnetworks.py b/youtube_dlc/extractor/scrippsnetworks.py
index b40b4c4af..b40b4c4af 100644
--- a/youtube_dl/extractor/scrippsnetworks.py
+++ b/youtube_dlc/extractor/scrippsnetworks.py
diff --git a/youtube_dl/extractor/scte.py b/youtube_dlc/extractor/scte.py
index ca1de63b6..ca1de63b6 100644
--- a/youtube_dl/extractor/scte.py
+++ b/youtube_dlc/extractor/scte.py
diff --git a/youtube_dl/extractor/seeker.py b/youtube_dlc/extractor/seeker.py
index 7872dc80d..7872dc80d 100644
--- a/youtube_dl/extractor/seeker.py
+++ b/youtube_dlc/extractor/seeker.py
diff --git a/youtube_dl/extractor/senateisvp.py b/youtube_dlc/extractor/senateisvp.py
index db5ef8b57..db5ef8b57 100644
--- a/youtube_dl/extractor/senateisvp.py
+++ b/youtube_dlc/extractor/senateisvp.py
diff --git a/youtube_dl/extractor/sendtonews.py b/youtube_dlc/extractor/sendtonews.py
index 9d9652949..9d9652949 100644
--- a/youtube_dl/extractor/sendtonews.py
+++ b/youtube_dlc/extractor/sendtonews.py
diff --git a/youtube_dl/extractor/servus.py b/youtube_dlc/extractor/servus.py
index 9401bf2cf..9401bf2cf 100644
--- a/youtube_dl/extractor/servus.py
+++ b/youtube_dlc/extractor/servus.py
diff --git a/youtube_dl/extractor/sevenplus.py b/youtube_dlc/extractor/sevenplus.py
index 84568ac69..84568ac69 100644
--- a/youtube_dl/extractor/sevenplus.py
+++ b/youtube_dlc/extractor/sevenplus.py
diff --git a/youtube_dl/extractor/sexu.py b/youtube_dlc/extractor/sexu.py
index 3df51520b..3df51520b 100644
--- a/youtube_dl/extractor/sexu.py
+++ b/youtube_dlc/extractor/sexu.py
diff --git a/youtube_dl/extractor/seznamzpravy.py b/youtube_dlc/extractor/seznamzpravy.py
index 7a1c7e38b..7a1c7e38b 100644
--- a/youtube_dl/extractor/seznamzpravy.py
+++ b/youtube_dlc/extractor/seznamzpravy.py
diff --git a/youtube_dl/extractor/shahid.py b/youtube_dlc/extractor/shahid.py
index 5c2a6206b..5c2a6206b 100644
--- a/youtube_dl/extractor/shahid.py
+++ b/youtube_dlc/extractor/shahid.py
diff --git a/youtube_dl/extractor/shared.py b/youtube_dlc/extractor/shared.py
index 02295d1a4..02295d1a4 100644
--- a/youtube_dl/extractor/shared.py
+++ b/youtube_dlc/extractor/shared.py
diff --git a/youtube_dl/extractor/showroomlive.py b/youtube_dlc/extractor/showroomlive.py
index efd9d561f..efd9d561f 100644
--- a/youtube_dl/extractor/showroomlive.py
+++ b/youtube_dlc/extractor/showroomlive.py
diff --git a/youtube_dl/extractor/sina.py b/youtube_dlc/extractor/sina.py
index 07b766b4a..07b766b4a 100644
--- a/youtube_dl/extractor/sina.py
+++ b/youtube_dlc/extractor/sina.py
diff --git a/youtube_dl/extractor/sixplay.py b/youtube_dlc/extractor/sixplay.py
index 7ec66ecf3..7ec66ecf3 100644
--- a/youtube_dl/extractor/sixplay.py
+++ b/youtube_dlc/extractor/sixplay.py
diff --git a/youtube_dl/extractor/sky.py b/youtube_dlc/extractor/sky.py
index ea30d6e62..ea30d6e62 100644
--- a/youtube_dl/extractor/sky.py
+++ b/youtube_dlc/extractor/sky.py
diff --git a/youtube_dl/extractor/skylinewebcams.py b/youtube_dlc/extractor/skylinewebcams.py
index b7f8ac736..b7f8ac736 100644
--- a/youtube_dl/extractor/skylinewebcams.py
+++ b/youtube_dlc/extractor/skylinewebcams.py
diff --git a/youtube_dl/extractor/skynewsarabia.py b/youtube_dlc/extractor/skynewsarabia.py
index fffc9aa22..fffc9aa22 100644
--- a/youtube_dl/extractor/skynewsarabia.py
+++ b/youtube_dlc/extractor/skynewsarabia.py
diff --git a/youtube_dl/extractor/slideshare.py b/youtube_dlc/extractor/slideshare.py
index e89ebebe7..e89ebebe7 100644
--- a/youtube_dl/extractor/slideshare.py
+++ b/youtube_dlc/extractor/slideshare.py
diff --git a/youtube_dl/extractor/slideslive.py b/youtube_dlc/extractor/slideslive.py
index d9ea76831..d9ea76831 100644
--- a/youtube_dl/extractor/slideslive.py
+++ b/youtube_dlc/extractor/slideslive.py
diff --git a/youtube_dl/extractor/slutload.py b/youtube_dlc/extractor/slutload.py
index 661f9e59d..661f9e59d 100644
--- a/youtube_dl/extractor/slutload.py
+++ b/youtube_dlc/extractor/slutload.py
diff --git a/youtube_dl/extractor/smotri.py b/youtube_dlc/extractor/smotri.py
index 45995f30f..45995f30f 100644
--- a/youtube_dl/extractor/smotri.py
+++ b/youtube_dlc/extractor/smotri.py
diff --git a/youtube_dl/extractor/snotr.py b/youtube_dlc/extractor/snotr.py
index f77354748..f77354748 100644
--- a/youtube_dl/extractor/snotr.py
+++ b/youtube_dlc/extractor/snotr.py
diff --git a/youtube_dl/extractor/sohu.py b/youtube_dlc/extractor/sohu.py
index a62ed84f1..76b3cc6b6 100644
--- a/youtube_dl/extractor/sohu.py
+++ b/youtube_dlc/extractor/sohu.py
@@ -77,7 +77,7 @@ class SohuIE(InfoExtractor):
         'info_dict': {
             'id': '78932792',
             'ext': 'mp4',
-            'title': 'youtube-dl testing video',
+            'title': 'youtube-dlc testing video',
         },
         'params': {
             'skip_download': True
diff --git a/youtube_dl/extractor/sonyliv.py b/youtube_dlc/extractor/sonyliv.py
index 58a8c0d4d..58a8c0d4d 100644
--- a/youtube_dl/extractor/sonyliv.py
+++ b/youtube_dlc/extractor/sonyliv.py
diff --git a/youtube_dl/extractor/soundcloud.py b/youtube_dlc/extractor/soundcloud.py
index ac09cb5e6..ae3573680 100644
--- a/youtube_dl/extractor/soundcloud.py
+++ b/youtube_dlc/extractor/soundcloud.py
@@ -122,7 +122,7 @@ class SoundcloudIE(InfoExtractor):
         },
         # private link
         {
-            'url': 'https://soundcloud.com/jaimemf/youtube-dl-test-video-a-y-baw/s-8Pjrp',
+            'url': 'https://soundcloud.com/jaimemf/youtube-dlc-test-video-a-y-baw/s-8Pjrp',
             'md5': 'aa0dd32bfea9b0c5ef4f02aacd080604',
             'info_dict': {
                 'id': '123998367',
diff --git a/youtube_dl/extractor/soundgasm.py b/youtube_dlc/extractor/soundgasm.py
index 3d78a9d76..3d78a9d76 100644
--- a/youtube_dl/extractor/soundgasm.py
+++ b/youtube_dlc/extractor/soundgasm.py
diff --git a/youtube_dl/extractor/southpark.py b/youtube_dlc/extractor/southpark.py
index da75a43a7..da75a43a7 100644
--- a/youtube_dl/extractor/southpark.py
+++ b/youtube_dlc/extractor/southpark.py
diff --git a/youtube_dl/extractor/spankbang.py b/youtube_dlc/extractor/spankbang.py
index 61ca902ce..61ca902ce 100644
--- a/youtube_dl/extractor/spankbang.py
+++ b/youtube_dlc/extractor/spankbang.py
diff --git a/youtube_dl/extractor/spankwire.py b/youtube_dlc/extractor/spankwire.py
index 35ab9ec37..35ab9ec37 100644
--- a/youtube_dl/extractor/spankwire.py
+++ b/youtube_dlc/extractor/spankwire.py
diff --git a/youtube_dl/extractor/spiegel.py b/youtube_dlc/extractor/spiegel.py
index 4df7f4ddc..4df7f4ddc 100644
--- a/youtube_dl/extractor/spiegel.py
+++ b/youtube_dlc/extractor/spiegel.py
diff --git a/youtube_dl/extractor/spiegeltv.py b/youtube_dlc/extractor/spiegeltv.py
index 6ccf4c342..6ccf4c342 100644
--- a/youtube_dl/extractor/spiegeltv.py
+++ b/youtube_dlc/extractor/spiegeltv.py
diff --git a/youtube_dl/extractor/spike.py b/youtube_dlc/extractor/spike.py
index aabff7a3c..aabff7a3c 100644
--- a/youtube_dl/extractor/spike.py
+++ b/youtube_dlc/extractor/spike.py
diff --git a/youtube_dl/extractor/sport5.py b/youtube_dlc/extractor/sport5.py
index a417b5a4e..a417b5a4e 100644
--- a/youtube_dl/extractor/sport5.py
+++ b/youtube_dlc/extractor/sport5.py
diff --git a/youtube_dl/extractor/sportbox.py b/youtube_dlc/extractor/sportbox.py
index b9017fd2a..b9017fd2a 100644
--- a/youtube_dl/extractor/sportbox.py
+++ b/youtube_dlc/extractor/sportbox.py
diff --git a/youtube_dl/extractor/sportdeutschland.py b/youtube_dlc/extractor/sportdeutschland.py
index 378fc7568..378fc7568 100644
--- a/youtube_dl/extractor/sportdeutschland.py
+++ b/youtube_dlc/extractor/sportdeutschland.py
diff --git a/youtube_dl/extractor/springboardplatform.py b/youtube_dlc/extractor/springboardplatform.py
index 07d99b579..07d99b579 100644
--- a/youtube_dl/extractor/springboardplatform.py
+++ b/youtube_dlc/extractor/springboardplatform.py
diff --git a/youtube_dl/extractor/sprout.py b/youtube_dlc/extractor/sprout.py
index 8467bf49d..8467bf49d 100644
--- a/youtube_dl/extractor/sprout.py
+++ b/youtube_dlc/extractor/sprout.py
diff --git a/youtube_dl/extractor/srgssr.py b/youtube_dlc/extractor/srgssr.py
index 170dce87f..170dce87f 100644
--- a/youtube_dl/extractor/srgssr.py
+++ b/youtube_dlc/extractor/srgssr.py
diff --git a/youtube_dl/extractor/srmediathek.py b/youtube_dlc/extractor/srmediathek.py
index 359dadaa3..359dadaa3 100644
--- a/youtube_dl/extractor/srmediathek.py
+++ b/youtube_dlc/extractor/srmediathek.py
diff --git a/youtube_dl/extractor/stanfordoc.py b/youtube_dlc/extractor/stanfordoc.py
index ae3dd1380..ae3dd1380 100644
--- a/youtube_dl/extractor/stanfordoc.py
+++ b/youtube_dlc/extractor/stanfordoc.py
diff --git a/youtube_dl/extractor/steam.py b/youtube_dlc/extractor/steam.py
index a6a191ceb..a6a191ceb 100644
--- a/youtube_dl/extractor/steam.py
+++ b/youtube_dlc/extractor/steam.py
diff --git a/youtube_dl/extractor/stitcher.py b/youtube_dlc/extractor/stitcher.py
index 97d1ff681..97d1ff681 100644
--- a/youtube_dl/extractor/stitcher.py
+++ b/youtube_dlc/extractor/stitcher.py
diff --git a/youtube_dl/extractor/storyfire.py b/youtube_dlc/extractor/storyfire.py
index 67457cc94..67457cc94 100644
--- a/youtube_dl/extractor/storyfire.py
+++ b/youtube_dlc/extractor/storyfire.py
diff --git a/youtube_dl/extractor/streamable.py b/youtube_dlc/extractor/streamable.py
index 34725274e..34725274e 100644
--- a/youtube_dl/extractor/streamable.py
+++ b/youtube_dlc/extractor/streamable.py
diff --git a/youtube_dl/extractor/streamcloud.py b/youtube_dlc/extractor/streamcloud.py
index b97bb4374..32eb2b92d 100644
--- a/youtube_dl/extractor/streamcloud.py
+++ b/youtube_dlc/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-dl_test_video_____________-BaW_jenozKc.mp4.html',
+        'url': 'http://streamcloud.eu/skp9j99s4bpz/youtube-dlc_test_video_____________-BaW_jenozKc.mp4.html',
         'md5': '6bea4c7fa5daaacc2a946b7146286686',
         'info_dict': {
             'id': 'skp9j99s4bpz',
             'ext': 'mp4',
-            'title': 'youtube-dl test video  \'/\\ ä ↭',
+            'title': 'youtube-dlc test video  \'/\\ ä ↭',
         },
         'skip': 'Only available from the EU'
     }, {
diff --git a/youtube_dl/extractor/streamcz.py b/youtube_dlc/extractor/streamcz.py
index 58e0b4c80..58e0b4c80 100644
--- a/youtube_dl/extractor/streamcz.py
+++ b/youtube_dlc/extractor/streamcz.py
diff --git a/youtube_dl/extractor/streetvoice.py b/youtube_dlc/extractor/streetvoice.py
index 91612c7f2..91612c7f2 100644
--- a/youtube_dl/extractor/streetvoice.py
+++ b/youtube_dlc/extractor/streetvoice.py
diff --git a/youtube_dl/extractor/stretchinternet.py b/youtube_dlc/extractor/stretchinternet.py
index 4dbead2ba..4dbead2ba 100644
--- a/youtube_dl/extractor/stretchinternet.py
+++ b/youtube_dlc/extractor/stretchinternet.py
diff --git a/youtube_dl/extractor/stv.py b/youtube_dlc/extractor/stv.py
index bae8b71f4..bae8b71f4 100644
--- a/youtube_dl/extractor/stv.py
+++ b/youtube_dlc/extractor/stv.py
diff --git a/youtube_dl/extractor/sunporno.py b/youtube_dlc/extractor/sunporno.py
index 68051169b..68051169b 100644
--- a/youtube_dl/extractor/sunporno.py
+++ b/youtube_dlc/extractor/sunporno.py
diff --git a/youtube_dl/extractor/sverigesradio.py b/youtube_dlc/extractor/sverigesradio.py
index aa0691f0d..aa0691f0d 100644
--- a/youtube_dl/extractor/sverigesradio.py
+++ b/youtube_dlc/extractor/sverigesradio.py
diff --git a/youtube_dl/extractor/svt.py b/youtube_dlc/extractor/svt.py
index e12389cad..e12389cad 100644
--- a/youtube_dl/extractor/svt.py
+++ b/youtube_dlc/extractor/svt.py
diff --git a/youtube_dl/extractor/swrmediathek.py b/youtube_dlc/extractor/swrmediathek.py
index 0f615979e..0f615979e 100644
--- a/youtube_dl/extractor/swrmediathek.py
+++ b/youtube_dlc/extractor/swrmediathek.py
diff --git a/youtube_dl/extractor/syfy.py b/youtube_dlc/extractor/syfy.py
index def7e5a2c..def7e5a2c 100644
--- a/youtube_dl/extractor/syfy.py
+++ b/youtube_dlc/extractor/syfy.py
diff --git a/youtube_dl/extractor/sztvhu.py b/youtube_dlc/extractor/sztvhu.py
index cfad33146..cfad33146 100644
--- a/youtube_dl/extractor/sztvhu.py
+++ b/youtube_dlc/extractor/sztvhu.py
diff --git a/youtube_dl/extractor/tagesschau.py b/youtube_dlc/extractor/tagesschau.py
index c351b7545..c351b7545 100644
--- a/youtube_dl/extractor/tagesschau.py
+++ b/youtube_dlc/extractor/tagesschau.py
diff --git a/youtube_dl/extractor/tass.py b/youtube_dlc/extractor/tass.py
index 6d336da78..6d336da78 100644
--- a/youtube_dl/extractor/tass.py
+++ b/youtube_dlc/extractor/tass.py
diff --git a/youtube_dl/extractor/tastytrade.py b/youtube_dlc/extractor/tastytrade.py
index 7fe96bd5f..7fe96bd5f 100644
--- a/youtube_dl/extractor/tastytrade.py
+++ b/youtube_dlc/extractor/tastytrade.py
diff --git a/youtube_dl/extractor/tbs.py b/youtube_dlc/extractor/tbs.py
index e8a7c65e0..e8a7c65e0 100644
--- a/youtube_dl/extractor/tbs.py
+++ b/youtube_dlc/extractor/tbs.py
diff --git a/youtube_dl/extractor/tdslifeway.py b/youtube_dlc/extractor/tdslifeway.py
index 101c6ee31..101c6ee31 100644
--- a/youtube_dl/extractor/tdslifeway.py
+++ b/youtube_dlc/extractor/tdslifeway.py
diff --git a/youtube_dl/extractor/teachable.py b/youtube_dlc/extractor/teachable.py
index a75369dbe..a75369dbe 100644
--- a/youtube_dl/extractor/teachable.py
+++ b/youtube_dlc/extractor/teachable.py
diff --git a/youtube_dl/extractor/teachertube.py b/youtube_dlc/extractor/teachertube.py
index 1272078c5..1272078c5 100644
--- a/youtube_dl/extractor/teachertube.py
+++ b/youtube_dlc/extractor/teachertube.py
diff --git a/youtube_dl/extractor/teachingchannel.py b/youtube_dlc/extractor/teachingchannel.py
index 624cdb3ad..624cdb3ad 100644
--- a/youtube_dl/extractor/teachingchannel.py
+++ b/youtube_dlc/extractor/teachingchannel.py
diff --git a/youtube_dl/extractor/teamcoco.py b/youtube_dlc/extractor/teamcoco.py
index 5793b711f..5793b711f 100644
--- a/youtube_dl/extractor/teamcoco.py
+++ b/youtube_dlc/extractor/teamcoco.py
diff --git a/youtube_dl/extractor/teamtreehouse.py b/youtube_dlc/extractor/teamtreehouse.py
index d347e97ef..d347e97ef 100644
--- a/youtube_dl/extractor/teamtreehouse.py
+++ b/youtube_dlc/extractor/teamtreehouse.py
diff --git a/youtube_dl/extractor/techtalks.py b/youtube_dlc/extractor/techtalks.py
index a5b62c717..a5b62c717 100644
--- a/youtube_dl/extractor/techtalks.py
+++ b/youtube_dlc/extractor/techtalks.py
diff --git a/youtube_dl/extractor/ted.py b/youtube_dlc/extractor/ted.py
index 63e2455b2..63e2455b2 100644
--- a/youtube_dl/extractor/ted.py
+++ b/youtube_dlc/extractor/ted.py
diff --git a/youtube_dl/extractor/tele13.py b/youtube_dlc/extractor/tele13.py
index a29a64b6d..a29a64b6d 100644
--- a/youtube_dl/extractor/tele13.py
+++ b/youtube_dlc/extractor/tele13.py
diff --git a/youtube_dl/extractor/tele5.py b/youtube_dlc/extractor/tele5.py
index 3e1a7a9e6..3e1a7a9e6 100644
--- a/youtube_dl/extractor/tele5.py
+++ b/youtube_dlc/extractor/tele5.py
diff --git a/youtube_dl/extractor/telebruxelles.py b/youtube_dlc/extractor/telebruxelles.py
index a0353fe3a..a0353fe3a 100644
--- a/youtube_dl/extractor/telebruxelles.py
+++ b/youtube_dlc/extractor/telebruxelles.py
diff --git a/youtube_dl/extractor/telecinco.py b/youtube_dlc/extractor/telecinco.py
index 9ba3da341..9ba3da341 100644
--- a/youtube_dl/extractor/telecinco.py
+++ b/youtube_dlc/extractor/telecinco.py
diff --git a/youtube_dl/extractor/telegraaf.py b/youtube_dlc/extractor/telegraaf.py
index 2dc020537..2dc020537 100644
--- a/youtube_dl/extractor/telegraaf.py
+++ b/youtube_dlc/extractor/telegraaf.py
diff --git a/youtube_dl/extractor/telemb.py b/youtube_dlc/extractor/telemb.py
index 9bcac4ec0..9bcac4ec0 100644
--- a/youtube_dl/extractor/telemb.py
+++ b/youtube_dlc/extractor/telemb.py
diff --git a/youtube_dl/extractor/telequebec.py b/youtube_dlc/extractor/telequebec.py
index c82c94b3a..c82c94b3a 100644
--- a/youtube_dl/extractor/telequebec.py
+++ b/youtube_dlc/extractor/telequebec.py
diff --git a/youtube_dl/extractor/teletask.py b/youtube_dlc/extractor/teletask.py
index b9e2ef8ca..b9e2ef8ca 100644
--- a/youtube_dl/extractor/teletask.py
+++ b/youtube_dlc/extractor/teletask.py
diff --git a/youtube_dl/extractor/telewebion.py b/youtube_dlc/extractor/telewebion.py
index 1207b1a1b..1207b1a1b 100644
--- a/youtube_dl/extractor/telewebion.py
+++ b/youtube_dlc/extractor/telewebion.py
diff --git a/youtube_dl/extractor/tennistv.py b/youtube_dlc/extractor/tennistv.py
index a586f30ad..a586f30ad 100644
--- a/youtube_dl/extractor/tennistv.py
+++ b/youtube_dlc/extractor/tennistv.py
diff --git a/youtube_dl/extractor/tenplay.py b/youtube_dlc/extractor/tenplay.py
index af325fea8..af325fea8 100644
--- a/youtube_dl/extractor/tenplay.py
+++ b/youtube_dlc/extractor/tenplay.py
diff --git a/youtube_dl/extractor/testurl.py b/youtube_dlc/extractor/testurl.py
index 84a14a0bd..84a14a0bd 100644
--- a/youtube_dl/extractor/testurl.py
+++ b/youtube_dlc/extractor/testurl.py
diff --git a/youtube_dl/extractor/tf1.py b/youtube_dlc/extractor/tf1.py
index 55e2a0721..55e2a0721 100644
--- a/youtube_dl/extractor/tf1.py
+++ b/youtube_dlc/extractor/tf1.py
diff --git a/youtube_dl/extractor/tfo.py b/youtube_dlc/extractor/tfo.py
index 0631cb7ab..0631cb7ab 100644
--- a/youtube_dl/extractor/tfo.py
+++ b/youtube_dlc/extractor/tfo.py
diff --git a/youtube_dl/extractor/theintercept.py b/youtube_dlc/extractor/theintercept.py
index f23b58713..f23b58713 100644
--- a/youtube_dl/extractor/theintercept.py
+++ b/youtube_dlc/extractor/theintercept.py
diff --git a/youtube_dl/extractor/theplatform.py b/youtube_dlc/extractor/theplatform.py
index 07055513a..07055513a 100644
--- a/youtube_dl/extractor/theplatform.py
+++ b/youtube_dlc/extractor/theplatform.py
diff --git a/youtube_dl/extractor/thescene.py b/youtube_dlc/extractor/thescene.py
index cd642355c..cd642355c 100644
--- a/youtube_dl/extractor/thescene.py
+++ b/youtube_dlc/extractor/thescene.py
diff --git a/youtube_dl/extractor/thestar.py b/youtube_dlc/extractor/thestar.py
index c3f118894..c3f118894 100644
--- a/youtube_dl/extractor/thestar.py
+++ b/youtube_dlc/extractor/thestar.py
diff --git a/youtube_dl/extractor/thesun.py b/youtube_dlc/extractor/thesun.py
index 15d4a6932..15d4a6932 100644
--- a/youtube_dl/extractor/thesun.py
+++ b/youtube_dlc/extractor/thesun.py
diff --git a/youtube_dl/extractor/theweatherchannel.py b/youtube_dlc/extractor/theweatherchannel.py
index c34a49d03..c34a49d03 100644
--- a/youtube_dl/extractor/theweatherchannel.py
+++ b/youtube_dlc/extractor/theweatherchannel.py
diff --git a/youtube_dl/extractor/thisamericanlife.py b/youtube_dlc/extractor/thisamericanlife.py
index 91e45f2c3..91e45f2c3 100644
--- a/youtube_dl/extractor/thisamericanlife.py
+++ b/youtube_dlc/extractor/thisamericanlife.py
diff --git a/youtube_dl/extractor/thisav.py b/youtube_dlc/extractor/thisav.py
index dc3dd03c8..dc3dd03c8 100644
--- a/youtube_dl/extractor/thisav.py
+++ b/youtube_dlc/extractor/thisav.py
diff --git a/youtube_dl/extractor/thisoldhouse.py b/youtube_dlc/extractor/thisoldhouse.py
index a3d9b4017..a3d9b4017 100644
--- a/youtube_dl/extractor/thisoldhouse.py
+++ b/youtube_dlc/extractor/thisoldhouse.py
diff --git a/youtube_dl/extractor/threeqsdn.py b/youtube_dlc/extractor/threeqsdn.py
index f26937da1..f26937da1 100644
--- a/youtube_dl/extractor/threeqsdn.py
+++ b/youtube_dlc/extractor/threeqsdn.py
diff --git a/youtube_dl/extractor/tiktok.py b/youtube_dlc/extractor/tiktok.py
index 66088b9ab..66088b9ab 100644
--- a/youtube_dl/extractor/tiktok.py
+++ b/youtube_dlc/extractor/tiktok.py
diff --git a/youtube_dl/extractor/tinypic.py b/youtube_dlc/extractor/tinypic.py
index bc2def508..bc2def508 100644
--- a/youtube_dl/extractor/tinypic.py
+++ b/youtube_dlc/extractor/tinypic.py
diff --git a/youtube_dl/extractor/tmz.py b/youtube_dlc/extractor/tmz.py
index 419f9d92e..419f9d92e 100644
--- a/youtube_dl/extractor/tmz.py
+++ b/youtube_dlc/extractor/tmz.py
diff --git a/youtube_dl/extractor/tnaflix.py b/youtube_dlc/extractor/tnaflix.py
index b3573c6e0..b3573c6e0 100644
--- a/youtube_dl/extractor/tnaflix.py
+++ b/youtube_dlc/extractor/tnaflix.py
diff --git a/youtube_dl/extractor/toggle.py b/youtube_dlc/extractor/toggle.py
index ca2e36efe..ca2e36efe 100644
--- a/youtube_dl/extractor/toggle.py
+++ b/youtube_dlc/extractor/toggle.py
diff --git a/youtube_dl/extractor/tonline.py b/youtube_dlc/extractor/tonline.py
index cc11eae2a..cc11eae2a 100644
--- a/youtube_dl/extractor/tonline.py
+++ b/youtube_dlc/extractor/tonline.py
diff --git a/youtube_dl/extractor/toongoggles.py b/youtube_dlc/extractor/toongoggles.py
index b5ba1c01d..b5ba1c01d 100644
--- a/youtube_dl/extractor/toongoggles.py
+++ b/youtube_dlc/extractor/toongoggles.py
diff --git a/youtube_dl/extractor/toutv.py b/youtube_dlc/extractor/toutv.py
index 44b022fca..44b022fca 100644
--- a/youtube_dl/extractor/toutv.py
+++ b/youtube_dlc/extractor/toutv.py
diff --git a/youtube_dl/extractor/toypics.py b/youtube_dlc/extractor/toypics.py
index f705a06c9..f705a06c9 100644
--- a/youtube_dl/extractor/toypics.py
+++ b/youtube_dlc/extractor/toypics.py
diff --git a/youtube_dl/extractor/traileraddict.py b/youtube_dlc/extractor/traileraddict.py
index 747370d12..747370d12 100644
--- a/youtube_dl/extractor/traileraddict.py
+++ b/youtube_dlc/extractor/traileraddict.py
diff --git a/youtube_dl/extractor/trilulilu.py b/youtube_dlc/extractor/trilulilu.py
index a800449e9..a800449e9 100644
--- a/youtube_dl/extractor/trilulilu.py
+++ b/youtube_dlc/extractor/trilulilu.py
diff --git a/youtube_dl/extractor/trunews.py b/youtube_dlc/extractor/trunews.py
index cca5b5ceb..cca5b5ceb 100644
--- a/youtube_dl/extractor/trunews.py
+++ b/youtube_dlc/extractor/trunews.py
diff --git a/youtube_dl/extractor/trutv.py b/youtube_dlc/extractor/trutv.py
index ce892c8c5..ce892c8c5 100644
--- a/youtube_dl/extractor/trutv.py
+++ b/youtube_dlc/extractor/trutv.py
diff --git a/youtube_dl/extractor/tube8.py b/youtube_dlc/extractor/tube8.py
index db93b0182..db93b0182 100644
--- a/youtube_dl/extractor/tube8.py
+++ b/youtube_dlc/extractor/tube8.py
diff --git a/youtube_dl/extractor/tubitv.py b/youtube_dlc/extractor/tubitv.py
index a51fa6515..a51fa6515 100644
--- a/youtube_dl/extractor/tubitv.py
+++ b/youtube_dlc/extractor/tubitv.py
diff --git a/youtube_dl/extractor/tudou.py b/youtube_dlc/extractor/tudou.py
index 7421378a8..7421378a8 100644
--- a/youtube_dl/extractor/tudou.py
+++ b/youtube_dlc/extractor/tudou.py
diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dlc/extractor/tumblr.py
index ae584ad69..ae584ad69 100644
--- a/youtube_dl/extractor/tumblr.py
+++ b/youtube_dlc/extractor/tumblr.py
diff --git a/youtube_dl/extractor/tunein.py b/youtube_dlc/extractor/tunein.py
index c7a5f5a63..c7a5f5a63 100644
--- a/youtube_dl/extractor/tunein.py
+++ b/youtube_dlc/extractor/tunein.py
diff --git a/youtube_dl/extractor/tunepk.py b/youtube_dlc/extractor/tunepk.py
index 9d42651ce..9d42651ce 100644
--- a/youtube_dl/extractor/tunepk.py
+++ b/youtube_dlc/extractor/tunepk.py
diff --git a/youtube_dl/extractor/turbo.py b/youtube_dlc/extractor/turbo.py
index be3eaa5c2..be3eaa5c2 100644
--- a/youtube_dl/extractor/turbo.py
+++ b/youtube_dlc/extractor/turbo.py
diff --git a/youtube_dl/extractor/turner.py b/youtube_dlc/extractor/turner.py
index 4a6cbfbb8..4a6cbfbb8 100644
--- a/youtube_dl/extractor/turner.py
+++ b/youtube_dlc/extractor/turner.py
diff --git a/youtube_dl/extractor/tv2.py b/youtube_dlc/extractor/tv2.py
index 4a19b9be6..4a19b9be6 100644
--- a/youtube_dl/extractor/tv2.py
+++ b/youtube_dlc/extractor/tv2.py
diff --git a/youtube_dl/extractor/tv2dk.py b/youtube_dlc/extractor/tv2dk.py
index 8bda9348d..8bda9348d 100644
--- a/youtube_dl/extractor/tv2dk.py
+++ b/youtube_dlc/extractor/tv2dk.py
diff --git a/youtube_dl/extractor/tv2hu.py b/youtube_dlc/extractor/tv2hu.py
index 86017b757..86017b757 100644
--- a/youtube_dl/extractor/tv2hu.py
+++ b/youtube_dlc/extractor/tv2hu.py
diff --git a/youtube_dl/extractor/tv4.py b/youtube_dlc/extractor/tv4.py
index c498b0191..c498b0191 100644
--- a/youtube_dl/extractor/tv4.py
+++ b/youtube_dlc/extractor/tv4.py
diff --git a/youtube_dl/extractor/tv5mondeplus.py b/youtube_dlc/extractor/tv5mondeplus.py
index b7fe082b9..b7fe082b9 100644
--- a/youtube_dl/extractor/tv5mondeplus.py
+++ b/youtube_dlc/extractor/tv5mondeplus.py
diff --git a/youtube_dl/extractor/tva.py b/youtube_dlc/extractor/tva.py
index 443f46e8a..443f46e8a 100644
--- a/youtube_dl/extractor/tva.py
+++ b/youtube_dlc/extractor/tva.py
diff --git a/youtube_dl/extractor/tvanouvelles.py b/youtube_dlc/extractor/tvanouvelles.py
index 1086176a2..1086176a2 100644
--- a/youtube_dl/extractor/tvanouvelles.py
+++ b/youtube_dlc/extractor/tvanouvelles.py
diff --git a/youtube_dl/extractor/tvc.py b/youtube_dlc/extractor/tvc.py
index 008f64cc2..008f64cc2 100644
--- a/youtube_dl/extractor/tvc.py
+++ b/youtube_dlc/extractor/tvc.py
diff --git a/youtube_dl/extractor/tvigle.py b/youtube_dlc/extractor/tvigle.py
index 180259aba..180259aba 100644
--- a/youtube_dl/extractor/tvigle.py
+++ b/youtube_dlc/extractor/tvigle.py
diff --git a/youtube_dl/extractor/tvland.py b/youtube_dlc/extractor/tvland.py
index 791144128..791144128 100644
--- a/youtube_dl/extractor/tvland.py
+++ b/youtube_dlc/extractor/tvland.py
diff --git a/youtube_dl/extractor/tvn24.py b/youtube_dlc/extractor/tvn24.py
index de0fb5063..de0fb5063 100644
--- a/youtube_dl/extractor/tvn24.py
+++ b/youtube_dlc/extractor/tvn24.py
diff --git a/youtube_dl/extractor/tvnet.py b/youtube_dlc/extractor/tvnet.py
index 4222ff9ee..4222ff9ee 100644
--- a/youtube_dl/extractor/tvnet.py
+++ b/youtube_dlc/extractor/tvnet.py
diff --git a/youtube_dl/extractor/tvnoe.py b/youtube_dlc/extractor/tvnoe.py
index 26a5aeae4..26a5aeae4 100644
--- a/youtube_dl/extractor/tvnoe.py
+++ b/youtube_dlc/extractor/tvnoe.py
diff --git a/youtube_dl/extractor/tvnow.py b/youtube_dlc/extractor/tvnow.py
index 9c8a8a0dc..9c8a8a0dc 100644
--- a/youtube_dl/extractor/tvnow.py
+++ b/youtube_dlc/extractor/tvnow.py
diff --git a/youtube_dl/extractor/tvp.py b/youtube_dlc/extractor/tvp.py
index accff75b5..accff75b5 100644
--- a/youtube_dl/extractor/tvp.py
+++ b/youtube_dlc/extractor/tvp.py
diff --git a/youtube_dl/extractor/tvplay.py b/youtube_dlc/extractor/tvplay.py
index 3c2450dd0..3c2450dd0 100644
--- a/youtube_dl/extractor/tvplay.py
+++ b/youtube_dlc/extractor/tvplay.py
diff --git a/youtube_dl/extractor/tvplayer.py b/youtube_dlc/extractor/tvplayer.py
index 8f8686a65..8f8686a65 100644
--- a/youtube_dl/extractor/tvplayer.py
+++ b/youtube_dlc/extractor/tvplayer.py
diff --git a/youtube_dl/extractor/tweakers.py b/youtube_dlc/extractor/tweakers.py
index 2b10d9bca..2b10d9bca 100644
--- a/youtube_dl/extractor/tweakers.py
+++ b/youtube_dlc/extractor/tweakers.py
diff --git a/youtube_dl/extractor/twentyfourvideo.py b/youtube_dlc/extractor/twentyfourvideo.py
index 74d14049b..74d14049b 100644
--- a/youtube_dl/extractor/twentyfourvideo.py
+++ b/youtube_dlc/extractor/twentyfourvideo.py
diff --git a/youtube_dl/extractor/twentymin.py b/youtube_dlc/extractor/twentymin.py
index a42977f39..a42977f39 100644
--- a/youtube_dl/extractor/twentymin.py
+++ b/youtube_dlc/extractor/twentymin.py
diff --git a/youtube_dl/extractor/twentythreevideo.py b/youtube_dlc/extractor/twentythreevideo.py
index aa0c6e90f..aa0c6e90f 100644
--- a/youtube_dl/extractor/twentythreevideo.py
+++ b/youtube_dlc/extractor/twentythreevideo.py
diff --git a/youtube_dl/extractor/twitcasting.py b/youtube_dlc/extractor/twitcasting.py
index 2dbe89f5b..2dbe89f5b 100644
--- a/youtube_dl/extractor/twitcasting.py
+++ b/youtube_dlc/extractor/twitcasting.py
diff --git a/youtube_dl/extractor/twitch.py b/youtube_dlc/extractor/twitch.py
index 3f0f7e277..3f0f7e277 100644
--- a/youtube_dl/extractor/twitch.py
+++ b/youtube_dlc/extractor/twitch.py
diff --git a/youtube_dl/extractor/twitter.py b/youtube_dlc/extractor/twitter.py
index 4284487db..4284487db 100644
--- a/youtube_dl/extractor/twitter.py
+++ b/youtube_dlc/extractor/twitter.py
diff --git a/youtube_dl/extractor/udemy.py b/youtube_dlc/extractor/udemy.py
index 2a4faecef..60e364d30 100644
--- a/youtube_dl/extractor/udemy.py
+++ b/youtube_dlc/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-dl with --cookies.', expected=True)
+                'youtube-dlc with --cookies.', expected=True)
         return ret
 
     def _download_json(self, url_or_request, *args, **kwargs):
diff --git a/youtube_dl/extractor/udn.py b/youtube_dlc/extractor/udn.py
index 2c8e5c7b4..2c8e5c7b4 100644
--- a/youtube_dl/extractor/udn.py
+++ b/youtube_dlc/extractor/udn.py
diff --git a/youtube_dl/extractor/ufctv.py b/youtube_dlc/extractor/ufctv.py
index 3d74ba071..3d74ba071 100644
--- a/youtube_dl/extractor/ufctv.py
+++ b/youtube_dlc/extractor/ufctv.py
diff --git a/youtube_dl/extractor/uktvplay.py b/youtube_dlc/extractor/uktvplay.py
index 2137502a1..2137502a1 100644
--- a/youtube_dl/extractor/uktvplay.py
+++ b/youtube_dlc/extractor/uktvplay.py
diff --git a/youtube_dl/extractor/umg.py b/youtube_dlc/extractor/umg.py
index d815cd9a6..d815cd9a6 100644
--- a/youtube_dl/extractor/umg.py
+++ b/youtube_dlc/extractor/umg.py
diff --git a/youtube_dl/extractor/unistra.py b/youtube_dlc/extractor/unistra.py
index a724cdbef..a724cdbef 100644
--- a/youtube_dl/extractor/unistra.py
+++ b/youtube_dlc/extractor/unistra.py
diff --git a/youtube_dl/extractor/unity.py b/youtube_dlc/extractor/unity.py
index 73daacf29..73daacf29 100644
--- a/youtube_dl/extractor/unity.py
+++ b/youtube_dlc/extractor/unity.py
diff --git a/youtube_dl/extractor/uol.py b/youtube_dlc/extractor/uol.py
index 628adf219..628adf219 100644
--- a/youtube_dl/extractor/uol.py
+++ b/youtube_dlc/extractor/uol.py
diff --git a/youtube_dl/extractor/uplynk.py b/youtube_dlc/extractor/uplynk.py
index f06bf5b12..f06bf5b12 100644
--- a/youtube_dl/extractor/uplynk.py
+++ b/youtube_dlc/extractor/uplynk.py
diff --git a/youtube_dl/extractor/urort.py b/youtube_dlc/extractor/urort.py
index 8f6edab4b..8f6edab4b 100644
--- a/youtube_dl/extractor/urort.py
+++ b/youtube_dlc/extractor/urort.py
diff --git a/youtube_dl/extractor/urplay.py b/youtube_dlc/extractor/urplay.py
index 6030b7cb5..6030b7cb5 100644
--- a/youtube_dl/extractor/urplay.py
+++ b/youtube_dlc/extractor/urplay.py
diff --git a/youtube_dl/extractor/usanetwork.py b/youtube_dlc/extractor/usanetwork.py
index 54c7495cc..54c7495cc 100644
--- a/youtube_dl/extractor/usanetwork.py
+++ b/youtube_dlc/extractor/usanetwork.py
diff --git a/youtube_dl/extractor/usatoday.py b/youtube_dlc/extractor/usatoday.py
index b2103448d..b2103448d 100644
--- a/youtube_dl/extractor/usatoday.py
+++ b/youtube_dlc/extractor/usatoday.py
diff --git a/youtube_dl/extractor/ustream.py b/youtube_dlc/extractor/ustream.py
index 582090d0d..582090d0d 100644
--- a/youtube_dl/extractor/ustream.py
+++ b/youtube_dlc/extractor/ustream.py
diff --git a/youtube_dl/extractor/ustudio.py b/youtube_dlc/extractor/ustudio.py
index 56509beed..56509beed 100644
--- a/youtube_dl/extractor/ustudio.py
+++ b/youtube_dlc/extractor/ustudio.py
diff --git a/youtube_dl/extractor/varzesh3.py b/youtube_dlc/extractor/varzesh3.py
index f474ed73f..f474ed73f 100644
--- a/youtube_dl/extractor/varzesh3.py
+++ b/youtube_dlc/extractor/varzesh3.py
diff --git a/youtube_dl/extractor/vbox7.py b/youtube_dlc/extractor/vbox7.py
index 8152acefd..8152acefd 100644
--- a/youtube_dl/extractor/vbox7.py
+++ b/youtube_dlc/extractor/vbox7.py
diff --git a/youtube_dl/extractor/veehd.py b/youtube_dlc/extractor/veehd.py
index a6dc3c8d8..a6dc3c8d8 100644
--- a/youtube_dl/extractor/veehd.py
+++ b/youtube_dlc/extractor/veehd.py
diff --git a/youtube_dl/extractor/veoh.py b/youtube_dlc/extractor/veoh.py
index 1c44c145c..1c44c145c 100644
--- a/youtube_dl/extractor/veoh.py
+++ b/youtube_dlc/extractor/veoh.py
diff --git a/youtube_dl/extractor/vesti.py b/youtube_dlc/extractor/vesti.py
index 5ab716880..5ab716880 100644
--- a/youtube_dl/extractor/vesti.py
+++ b/youtube_dlc/extractor/vesti.py
diff --git a/youtube_dl/extractor/vevo.py b/youtube_dlc/extractor/vevo.py
index 4ea9f1b4b..4ea9f1b4b 100644
--- a/youtube_dl/extractor/vevo.py
+++ b/youtube_dlc/extractor/vevo.py
diff --git a/youtube_dl/extractor/vgtv.py b/youtube_dlc/extractor/vgtv.py
index fe7a26b62..fe7a26b62 100644
--- a/youtube_dl/extractor/vgtv.py
+++ b/youtube_dlc/extractor/vgtv.py
diff --git a/youtube_dl/extractor/vh1.py b/youtube_dlc/extractor/vh1.py
index dff94a2b8..dff94a2b8 100644
--- a/youtube_dl/extractor/vh1.py
+++ b/youtube_dlc/extractor/vh1.py
diff --git a/youtube_dl/extractor/vice.py b/youtube_dlc/extractor/vice.py
index e37499512..e37499512 100644
--- a/youtube_dl/extractor/vice.py
+++ b/youtube_dlc/extractor/vice.py
diff --git a/youtube_dl/extractor/vidbit.py b/youtube_dlc/extractor/vidbit.py
index 91f45b7cc..91f45b7cc 100644
--- a/youtube_dl/extractor/vidbit.py
+++ b/youtube_dlc/extractor/vidbit.py
diff --git a/youtube_dl/extractor/viddler.py b/youtube_dlc/extractor/viddler.py
index 642358433..642358433 100644
--- a/youtube_dl/extractor/viddler.py
+++ b/youtube_dlc/extractor/viddler.py
diff --git a/youtube_dl/extractor/videa.py b/youtube_dlc/extractor/videa.py
index a03614cc1..a03614cc1 100644
--- a/youtube_dl/extractor/videa.py
+++ b/youtube_dlc/extractor/videa.py
diff --git a/youtube_dl/extractor/videodetective.py b/youtube_dlc/extractor/videodetective.py
index fe70db713..fe70db713 100644
--- a/youtube_dl/extractor/videodetective.py
+++ b/youtube_dlc/extractor/videodetective.py
diff --git a/youtube_dl/extractor/videofyme.py b/youtube_dlc/extractor/videofyme.py
index cd3f50a63..cd3f50a63 100644
--- a/youtube_dl/extractor/videofyme.py
+++ b/youtube_dlc/extractor/videofyme.py
diff --git a/youtube_dl/extractor/videomore.py b/youtube_dlc/extractor/videomore.py
index e3eda3327..e3eda3327 100644
--- a/youtube_dl/extractor/videomore.py
+++ b/youtube_dlc/extractor/videomore.py
diff --git a/youtube_dl/extractor/videopress.py b/youtube_dlc/extractor/videopress.py
index e5f964d39..e5f964d39 100644
--- a/youtube_dl/extractor/videopress.py
+++ b/youtube_dlc/extractor/videopress.py
diff --git a/youtube_dl/extractor/vidio.py b/youtube_dlc/extractor/vidio.py
index b48baf00b..b48baf00b 100644
--- a/youtube_dl/extractor/vidio.py
+++ b/youtube_dlc/extractor/vidio.py
diff --git a/youtube_dl/extractor/vidlii.py b/youtube_dlc/extractor/vidlii.py
index f4774256b..f4774256b 100644
--- a/youtube_dl/extractor/vidlii.py
+++ b/youtube_dlc/extractor/vidlii.py
diff --git a/youtube_dl/extractor/vidme.py b/youtube_dlc/extractor/vidme.py
index 174e69cd6..174e69cd6 100644
--- a/youtube_dl/extractor/vidme.py
+++ b/youtube_dlc/extractor/vidme.py
diff --git a/youtube_dl/extractor/vidzi.py b/youtube_dlc/extractor/vidzi.py
index 42ea4952c..4e79a0b84 100644
--- a/youtube_dl/extractor/vidzi.py
+++ b/youtube_dlc/extractor/vidzi.py
@@ -20,7 +20,7 @@ class VidziIE(InfoExtractor):
         'info_dict': {
             'id': 'cghql9yq6emu',
             'ext': 'mp4',
-            'title': 'youtube-dl test video  1\\\\2\'3/4<5\\\\6ä7↭',
+            'title': 'youtube-dlc test video  1\\\\2\'3/4<5\\\\6ä7↭',
         },
         'params': {
             # m3u8 download
diff --git a/youtube_dl/extractor/vier.py b/youtube_dlc/extractor/vier.py
index dbd5ba9ba..dbd5ba9ba 100644
--- a/youtube_dl/extractor/vier.py
+++ b/youtube_dlc/extractor/vier.py
diff --git a/youtube_dl/extractor/viewlift.py b/youtube_dlc/extractor/viewlift.py
index d6b92b1c8..d6b92b1c8 100644
--- a/youtube_dl/extractor/viewlift.py
+++ b/youtube_dlc/extractor/viewlift.py
diff --git a/youtube_dl/extractor/viidea.py b/youtube_dlc/extractor/viidea.py
index a0abbae60..a0abbae60 100644
--- a/youtube_dl/extractor/viidea.py
+++ b/youtube_dlc/extractor/viidea.py
diff --git a/youtube_dl/extractor/viki.py b/youtube_dlc/extractor/viki.py
index 9e4171237..9e4171237 100644
--- a/youtube_dl/extractor/viki.py
+++ b/youtube_dlc/extractor/viki.py
diff --git a/youtube_dl/extractor/vimeo.py b/youtube_dlc/extractor/vimeo.py
index 421795b94..bbd7d06db 100644
--- a/youtube_dl/extractor/vimeo.py
+++ b/youtube_dlc/extractor/vimeo.py
@@ -287,7 +287,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
             'info_dict': {
                 'id': '56015672',
                 'ext': 'mp4',
-                'title': "youtube-dl test video - \u2605 \" ' \u5e78 / \\ \u00e4 \u21ad \U0001d550",
+                'title': "youtube-dlc test video - \u2605 \" ' \u5e78 / \\ \u00e4 \u21ad \U0001d550",
                 'description': 'md5:2d3305bad981a06ff79f027f19865021',
                 'timestamp': 1355990239,
                 'upload_date': '20121220',
@@ -347,7 +347,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
             'info_dict': {
                 'id': '68375962',
                 'ext': 'mp4',
-                'title': 'youtube-dl password protected test video',
+                'title': 'youtube-dlc password protected test video',
                 'timestamp': 1371200155,
                 'upload_date': '20130614',
                 'uploader_url': r're:https?://(?:www\.)?vimeo\.com/user18948128',
@@ -358,7 +358,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
             },
             'params': {
                 'format': 'best[protocol=https]',
-                'videopassword': 'youtube-dl',
+                'videopassword': 'youtube-dlc',
             },
         },
         {
@@ -473,7 +473,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
             'info_dict': {
                 'id': '68375962',
                 'ext': 'mp4',
-                'title': 'youtube-dl password protected test video',
+                'title': 'youtube-dlc password protected test video',
                 'uploader_url': r're:https?://(?:www\.)?vimeo\.com/user18948128',
                 'uploader_id': 'user18948128',
                 'uploader': 'Jaime Marquínez Ferrándiz',
@@ -481,7 +481,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
             },
             'params': {
                 'format': 'best[protocol=https]',
-                'videopassword': 'youtube-dl',
+                'videopassword': 'youtube-dlc',
             },
         },
         {
@@ -600,7 +600,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-dl with the URL of the page '
+                        'URL. Please call youtube-dlc with the URL of the page '
                         'that embeds this video.',
                         expected=True)
             raise
@@ -917,7 +917,7 @@ class VimeoAlbumIE(VimeoBaseInfoExtractor):
         },
         'playlist_count': 1,
         'params': {
-            'videopassword': 'youtube-dl',
+            'videopassword': 'youtube-dlc',
         }
     }]
     _PAGE_SIZE = 100
diff --git a/youtube_dl/extractor/vimple.py b/youtube_dlc/extractor/vimple.py
index c74b43766..c74b43766 100644
--- a/youtube_dl/extractor/vimple.py
+++ b/youtube_dlc/extractor/vimple.py
diff --git a/youtube_dl/extractor/vine.py b/youtube_dlc/extractor/vine.py
index 80b896b56..80b896b56 100644
--- a/youtube_dl/extractor/vine.py
+++ b/youtube_dlc/extractor/vine.py
diff --git a/youtube_dl/extractor/viqeo.py b/youtube_dlc/extractor/viqeo.py
index be7dfa814..be7dfa814 100644
--- a/youtube_dl/extractor/viqeo.py
+++ b/youtube_dlc/extractor/viqeo.py
diff --git a/youtube_dl/extractor/viu.py b/youtube_dlc/extractor/viu.py
index 3bd37525b..3bd37525b 100644
--- a/youtube_dl/extractor/viu.py
+++ b/youtube_dlc/extractor/viu.py
diff --git a/youtube_dl/extractor/vk.py b/youtube_dlc/extractor/vk.py
index 00ec006c4..00ec006c4 100644
--- a/youtube_dl/extractor/vk.py
+++ b/youtube_dlc/extractor/vk.py
diff --git a/youtube_dl/extractor/vlive.py b/youtube_dlc/extractor/vlive.py
index f79531e6f..f79531e6f 100644
--- a/youtube_dl/extractor/vlive.py
+++ b/youtube_dlc/extractor/vlive.py
diff --git a/youtube_dl/extractor/vodlocker.py b/youtube_dlc/extractor/vodlocker.py
index 02c9617d2..02c9617d2 100644
--- a/youtube_dl/extractor/vodlocker.py
+++ b/youtube_dlc/extractor/vodlocker.py
diff --git a/youtube_dl/extractor/vodpl.py b/youtube_dlc/extractor/vodpl.py
index 9e919708e..9e919708e 100644
--- a/youtube_dl/extractor/vodpl.py
+++ b/youtube_dlc/extractor/vodpl.py
diff --git a/youtube_dl/extractor/vodplatform.py b/youtube_dlc/extractor/vodplatform.py
index 74d2257e7..74d2257e7 100644
--- a/youtube_dl/extractor/vodplatform.py
+++ b/youtube_dlc/extractor/vodplatform.py
diff --git a/youtube_dl/extractor/voicerepublic.py b/youtube_dlc/extractor/voicerepublic.py
index a52e40afa..a52e40afa 100644
--- a/youtube_dl/extractor/voicerepublic.py
+++ b/youtube_dlc/extractor/voicerepublic.py
diff --git a/youtube_dl/extractor/voot.py b/youtube_dlc/extractor/voot.py
index 751b21ee5..751b21ee5 100644
--- a/youtube_dl/extractor/voot.py
+++ b/youtube_dlc/extractor/voot.py
diff --git a/youtube_dl/extractor/voxmedia.py b/youtube_dlc/extractor/voxmedia.py
index b318e15d4..b318e15d4 100644
--- a/youtube_dl/extractor/voxmedia.py
+++ b/youtube_dlc/extractor/voxmedia.py
diff --git a/youtube_dl/extractor/vrak.py b/youtube_dlc/extractor/vrak.py
index daa247cce..daa247cce 100644
--- a/youtube_dl/extractor/vrak.py
+++ b/youtube_dlc/extractor/vrak.py
diff --git a/youtube_dl/extractor/vrt.py b/youtube_dlc/extractor/vrt.py
index 422025267..422025267 100644
--- a/youtube_dl/extractor/vrt.py
+++ b/youtube_dlc/extractor/vrt.py
diff --git a/youtube_dl/extractor/vrv.py b/youtube_dlc/extractor/vrv.py
index 6e51469b0..6e51469b0 100644
--- a/youtube_dl/extractor/vrv.py
+++ b/youtube_dlc/extractor/vrv.py
diff --git a/youtube_dl/extractor/vshare.py b/youtube_dlc/extractor/vshare.py
index c631ac1fa..c631ac1fa 100644
--- a/youtube_dl/extractor/vshare.py
+++ b/youtube_dlc/extractor/vshare.py
diff --git a/youtube_dl/extractor/vube.py b/youtube_dlc/extractor/vube.py
index 8ce3a6b81..8ce3a6b81 100644
--- a/youtube_dl/extractor/vube.py
+++ b/youtube_dlc/extractor/vube.py
diff --git a/youtube_dl/extractor/vuclip.py b/youtube_dlc/extractor/vuclip.py
index 55e087bdb..55e087bdb 100644
--- a/youtube_dl/extractor/vuclip.py
+++ b/youtube_dlc/extractor/vuclip.py
diff --git a/youtube_dl/extractor/vvvvid.py b/youtube_dlc/extractor/vvvvid.py
index 6906cd2ab..6906cd2ab 100644
--- a/youtube_dl/extractor/vvvvid.py
+++ b/youtube_dlc/extractor/vvvvid.py
diff --git a/youtube_dl/extractor/vyborymos.py b/youtube_dlc/extractor/vyborymos.py
index 9e703c4b6..9e703c4b6 100644
--- a/youtube_dl/extractor/vyborymos.py
+++ b/youtube_dlc/extractor/vyborymos.py
diff --git a/youtube_dl/extractor/vzaar.py b/youtube_dlc/extractor/vzaar.py
index b7d02fca3..b7d02fca3 100644
--- a/youtube_dl/extractor/vzaar.py
+++ b/youtube_dlc/extractor/vzaar.py
diff --git a/youtube_dl/extractor/wakanim.py b/youtube_dlc/extractor/wakanim.py
index f9a2395d9..f9a2395d9 100644
--- a/youtube_dl/extractor/wakanim.py
+++ b/youtube_dlc/extractor/wakanim.py
diff --git a/youtube_dl/extractor/walla.py b/youtube_dlc/extractor/walla.py
index cbb548672..cbb548672 100644
--- a/youtube_dl/extractor/walla.py
+++ b/youtube_dlc/extractor/walla.py
diff --git a/youtube_dl/extractor/washingtonpost.py b/youtube_dlc/extractor/washingtonpost.py
index 625d0a1cc..625d0a1cc 100644
--- a/youtube_dl/extractor/washingtonpost.py
+++ b/youtube_dlc/extractor/washingtonpost.py
diff --git a/youtube_dl/extractor/wat.py b/youtube_dlc/extractor/wat.py
index 8ef3e0906..8ef3e0906 100644
--- a/youtube_dl/extractor/wat.py
+++ b/youtube_dlc/extractor/wat.py
diff --git a/youtube_dl/extractor/watchbox.py b/youtube_dlc/extractor/watchbox.py
index 5a4e46e73..5a4e46e73 100644
--- a/youtube_dl/extractor/watchbox.py
+++ b/youtube_dlc/extractor/watchbox.py
diff --git a/youtube_dl/extractor/watchindianporn.py b/youtube_dlc/extractor/watchindianporn.py
index fadc539ee..fadc539ee 100644
--- a/youtube_dl/extractor/watchindianporn.py
+++ b/youtube_dlc/extractor/watchindianporn.py
diff --git a/youtube_dl/extractor/wdr.py b/youtube_dlc/extractor/wdr.py
index cf6f7c7ed..cf6f7c7ed 100644
--- a/youtube_dl/extractor/wdr.py
+++ b/youtube_dlc/extractor/wdr.py
diff --git a/youtube_dl/extractor/webcaster.py b/youtube_dlc/extractor/webcaster.py
index e4b65f54f..e4b65f54f 100644
--- a/youtube_dl/extractor/webcaster.py
+++ b/youtube_dlc/extractor/webcaster.py
diff --git a/youtube_dl/extractor/webofstories.py b/youtube_dlc/extractor/webofstories.py
index f2b8d19b4..f2b8d19b4 100644
--- a/youtube_dl/extractor/webofstories.py
+++ b/youtube_dlc/extractor/webofstories.py
diff --git a/youtube_dl/extractor/weibo.py b/youtube_dlc/extractor/weibo.py
index 621df5b54..621df5b54 100644
--- a/youtube_dl/extractor/weibo.py
+++ b/youtube_dlc/extractor/weibo.py
diff --git a/youtube_dl/extractor/weiqitv.py b/youtube_dlc/extractor/weiqitv.py
index 7e0befd39..7e0befd39 100644
--- a/youtube_dl/extractor/weiqitv.py
+++ b/youtube_dlc/extractor/weiqitv.py
diff --git a/youtube_dl/extractor/wistia.py b/youtube_dlc/extractor/wistia.py
index 77febd2eb..77febd2eb 100644
--- a/youtube_dl/extractor/wistia.py
+++ b/youtube_dlc/extractor/wistia.py
diff --git a/youtube_dl/extractor/worldstarhiphop.py b/youtube_dlc/extractor/worldstarhiphop.py
index 82587b4ce..82587b4ce 100644
--- a/youtube_dl/extractor/worldstarhiphop.py
+++ b/youtube_dlc/extractor/worldstarhiphop.py
diff --git a/youtube_dl/extractor/wsj.py b/youtube_dlc/extractor/wsj.py
index 67236f377..67236f377 100644
--- a/youtube_dl/extractor/wsj.py
+++ b/youtube_dlc/extractor/wsj.py
diff --git a/youtube_dl/extractor/wwe.py b/youtube_dlc/extractor/wwe.py
index bebc77bb5..bebc77bb5 100644
--- a/youtube_dl/extractor/wwe.py
+++ b/youtube_dlc/extractor/wwe.py
diff --git a/youtube_dl/extractor/xbef.py b/youtube_dlc/extractor/xbef.py
index 4c41e98b2..4c41e98b2 100644
--- a/youtube_dl/extractor/xbef.py
+++ b/youtube_dlc/extractor/xbef.py
diff --git a/youtube_dl/extractor/xboxclips.py b/youtube_dlc/extractor/xboxclips.py
index d9c277bc3..d9c277bc3 100644
--- a/youtube_dl/extractor/xboxclips.py
+++ b/youtube_dlc/extractor/xboxclips.py
diff --git a/youtube_dl/extractor/xfileshare.py b/youtube_dlc/extractor/xfileshare.py
index 48ef07ed1..48ef07ed1 100644
--- a/youtube_dl/extractor/xfileshare.py
+++ b/youtube_dlc/extractor/xfileshare.py
diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dlc/extractor/xhamster.py
index 902a3ed33..902a3ed33 100644
--- a/youtube_dl/extractor/xhamster.py
+++ b/youtube_dlc/extractor/xhamster.py
diff --git a/youtube_dl/extractor/xiami.py b/youtube_dlc/extractor/xiami.py
index 618da8382..618da8382 100644
--- a/youtube_dl/extractor/xiami.py
+++ b/youtube_dlc/extractor/xiami.py
diff --git a/youtube_dl/extractor/ximalaya.py b/youtube_dlc/extractor/ximalaya.py
index a912e54b8..a912e54b8 100644
--- a/youtube_dl/extractor/ximalaya.py
+++ b/youtube_dlc/extractor/ximalaya.py
diff --git a/youtube_dl/extractor/xminus.py b/youtube_dlc/extractor/xminus.py
index 36e5ead1e..36e5ead1e 100644
--- a/youtube_dl/extractor/xminus.py
+++ b/youtube_dlc/extractor/xminus.py
diff --git a/youtube_dl/extractor/xnxx.py b/youtube_dlc/extractor/xnxx.py
index ac1ccc404..ac1ccc404 100644
--- a/youtube_dl/extractor/xnxx.py
+++ b/youtube_dlc/extractor/xnxx.py
diff --git a/youtube_dl/extractor/xstream.py b/youtube_dlc/extractor/xstream.py
index 76c91bd92..76c91bd92 100644
--- a/youtube_dl/extractor/xstream.py
+++ b/youtube_dlc/extractor/xstream.py
diff --git a/youtube_dl/extractor/xtube.py b/youtube_dlc/extractor/xtube.py
index 01b253dcb..01b253dcb 100644
--- a/youtube_dl/extractor/xtube.py
+++ b/youtube_dlc/extractor/xtube.py
diff --git a/youtube_dl/extractor/xuite.py b/youtube_dlc/extractor/xuite.py
index 0276c0dbb..0276c0dbb 100644
--- a/youtube_dl/extractor/xuite.py
+++ b/youtube_dlc/extractor/xuite.py
diff --git a/youtube_dl/extractor/xvideos.py b/youtube_dlc/extractor/xvideos.py
index 8fc64914c..8fc64914c 100644
--- a/youtube_dl/extractor/xvideos.py
+++ b/youtube_dlc/extractor/xvideos.py
diff --git a/youtube_dl/extractor/xxxymovies.py b/youtube_dlc/extractor/xxxymovies.py
index e34ebe3a6..e34ebe3a6 100644
--- a/youtube_dl/extractor/xxxymovies.py
+++ b/youtube_dlc/extractor/xxxymovies.py
diff --git a/youtube_dl/extractor/yahoo.py b/youtube_dlc/extractor/yahoo.py
index e4615376c..e4615376c 100644
--- a/youtube_dl/extractor/yahoo.py
+++ b/youtube_dlc/extractor/yahoo.py
diff --git a/youtube_dl/extractor/yandexdisk.py b/youtube_dlc/extractor/yandexdisk.py
index e8f6ae10f..e8f6ae10f 100644
--- a/youtube_dl/extractor/yandexdisk.py
+++ b/youtube_dlc/extractor/yandexdisk.py
diff --git a/youtube_dl/extractor/yandexmusic.py b/youtube_dlc/extractor/yandexmusic.py
index 08d35e04c..4358bc836 100644
--- a/youtube_dl/extractor/yandexmusic.py
+++ b/youtube_dlc/extractor/yandexmusic.py
@@ -27,12 +27,12 @@ class YandexMusicBaseIE(InfoExtractor):
     @staticmethod
     def _raise_captcha():
         raise ExtractorError(
-            'YandexMusic has considered youtube-dl requests automated and '
+            'YandexMusic has considered youtube-dlc 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-dl with --cookies',
+            'youtube-dlc with --cookies',
             expected=True)
 
     def _download_webpage_handle(self, *args, **kwargs):
diff --git a/youtube_dl/extractor/yandexvideo.py b/youtube_dlc/extractor/yandexvideo.py
index 46529be05..46529be05 100644
--- a/youtube_dl/extractor/yandexvideo.py
+++ b/youtube_dlc/extractor/yandexvideo.py
diff --git a/youtube_dl/extractor/yapfiles.py b/youtube_dlc/extractor/yapfiles.py
index cfb368de9..cfb368de9 100644
--- a/youtube_dl/extractor/yapfiles.py
+++ b/youtube_dlc/extractor/yapfiles.py
diff --git a/youtube_dl/extractor/yesjapan.py b/youtube_dlc/extractor/yesjapan.py
index 681338c96..681338c96 100644
--- a/youtube_dl/extractor/yesjapan.py
+++ b/youtube_dlc/extractor/yesjapan.py
diff --git a/youtube_dl/extractor/yinyuetai.py b/youtube_dlc/extractor/yinyuetai.py
index 1fd8d35c6..1fd8d35c6 100644
--- a/youtube_dl/extractor/yinyuetai.py
+++ b/youtube_dlc/extractor/yinyuetai.py
diff --git a/youtube_dl/extractor/ynet.py b/youtube_dlc/extractor/ynet.py
index c4ae4d88e..c4ae4d88e 100644
--- a/youtube_dl/extractor/ynet.py
+++ b/youtube_dlc/extractor/ynet.py
diff --git a/youtube_dl/extractor/youjizz.py b/youtube_dlc/extractor/youjizz.py
index 88aabd272..88aabd272 100644
--- a/youtube_dl/extractor/youjizz.py
+++ b/youtube_dlc/extractor/youjizz.py
diff --git a/youtube_dl/extractor/youku.py b/youtube_dlc/extractor/youku.py
index 61d1ab209..61d1ab209 100644
--- a/youtube_dl/extractor/youku.py
+++ b/youtube_dlc/extractor/youku.py
diff --git a/youtube_dl/extractor/younow.py b/youtube_dlc/extractor/younow.py
index 04dbc87fc..04dbc87fc 100644
--- a/youtube_dl/extractor/younow.py
+++ b/youtube_dlc/extractor/younow.py
diff --git a/youtube_dl/extractor/youporn.py b/youtube_dlc/extractor/youporn.py
index e7fca22de..e7fca22de 100644
--- a/youtube_dl/extractor/youporn.py
+++ b/youtube_dlc/extractor/youporn.py
diff --git a/youtube_dl/extractor/yourporn.py b/youtube_dlc/extractor/yourporn.py
index 98347491e..98347491e 100644
--- a/youtube_dl/extractor/yourporn.py
+++ b/youtube_dlc/extractor/yourporn.py
diff --git a/youtube_dl/extractor/yourupload.py b/youtube_dlc/extractor/yourupload.py
index 9fa772838..9fa772838 100644
--- a/youtube_dl/extractor/yourupload.py
+++ b/youtube_dlc/extractor/yourupload.py
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dlc/extractor/youtube.py
index 70a5bd3b0..395cbf6a2 100644
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dlc/extractor/youtube.py
@@ -560,16 +560,16 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
             'info_dict': {
                 'id': 'BaW_jenozKc',
                 'ext': 'mp4',
-                'title': 'youtube-dl test video "\'/\\ä↭𝕐',
+                'title': 'youtube-dlc test video "\'/\\ä↭𝕐',
                 'uploader': 'Philipp Hagemeister',
                 'uploader_id': 'phihag',
                 'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/phihag',
                 'channel_id': 'UCLqxVugv74EIW3VWh2NOa3Q',
                 'channel_url': r're:https?://(?:www\.)?youtube\.com/channel/UCLqxVugv74EIW3VWh2NOa3Q',
                 'upload_date': '20121002',
-                'description': 'test chars:  "\'/\\ä↭𝕐\ntest URL: https://github.com/rg3/youtube-dl/issues/1892\n\nThis is a test video for youtube-dl.\n\nFor more information, contact phihag@phihag.de .',
+                'description': 'test chars:  "\'/\\ä↭𝕐\ntest URL: https://github.com/rg3/youtube-dl/issues/1892\n\nThis is a test video for youtube-dlc.\n\nFor more information, contact phihag@phihag.de .',
                 'categories': ['Science & Technology'],
-                'tags': ['youtube-dl'],
+                'tags': ['youtube-dlc'],
                 'duration': 10,
                 'view_count': int,
                 'like_count': int,
@@ -641,14 +641,14 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
             'info_dict': {
                 'id': 'BaW_jenozKc',
                 'ext': 'mp4',
-                'title': 'youtube-dl test video "\'/\\ä↭𝕐',
+                'title': 'youtube-dlc test video "\'/\\ä↭𝕐',
                 'uploader': 'Philipp Hagemeister',
                 'uploader_id': 'phihag',
                 'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/phihag',
                 'upload_date': '20121002',
-                'description': 'test chars:  "\'/\\ä↭𝕐\ntest URL: https://github.com/rg3/youtube-dl/issues/1892\n\nThis is a test video for youtube-dl.\n\nFor more information, contact phihag@phihag.de .',
+                'description': 'test chars:  "\'/\\ä↭𝕐\ntest URL: https://github.com/rg3/youtube-dl/issues/1892\n\nThis is a test video for youtube-dlc.\n\nFor more information, contact phihag@phihag.de .',
                 'categories': ['Science & Technology'],
-                'tags': ['youtube-dl'],
+                'tags': ['youtube-dlc'],
                 'duration': 10,
                 'view_count': int,
                 'like_count': int,
@@ -2600,7 +2600,7 @@ class YoutubePlaylistIE(YoutubePlaylistBaseInfoExtractor):
             'uploader_id': 'UCmlqkdCBesrv2Lak1mF_MxA',
             'uploader': 'Sergey M.',
             'id': 'PL4lCao7KL_QFVb7Iudeipvc2BCavECqzc',
-            'title': 'youtube-dl public playlist',
+            'title': 'youtube-dlc public playlist',
         },
         'playlist_count': 1,
     }, {
@@ -2609,7 +2609,7 @@ class YoutubePlaylistIE(YoutubePlaylistBaseInfoExtractor):
             'uploader_id': 'UCmlqkdCBesrv2Lak1mF_MxA',
             'uploader': 'Sergey M.',
             'id': 'PL4lCao7KL_QFodcLWhDpGCYnngnHtQ-Xf',
-            'title': 'youtube-dl empty playlist',
+            'title': 'youtube-dlc empty playlist',
         },
         'playlist_count': 0,
     }, {
@@ -3235,10 +3235,10 @@ class YoutubeSearchURLIE(YoutubeSearchBaseInfoExtractor):
     IE_NAME = 'youtube:search_url'
     _VALID_URL = r'https?://(?:www\.)?youtube\.com/results\?(.*?&)?(?:search_query|q)=(?P<query>[^&]+)(?:[&]|$)'
     _TESTS = [{
-        'url': 'https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video',
+        'url': 'https://www.youtube.com/results?baz=bar&search_query=youtube-dlc+test+video&filters=video&lclk=video',
         'playlist_mincount': 5,
         'info_dict': {
-            'title': 'youtube-dl test video',
+            'title': 'youtube-dlc test video',
         }
     }, {
         'url': 'https://www.youtube.com/results?q=test&sp=EgQIBBgB',
@@ -3422,9 +3422,9 @@ class YoutubeTruncatedURLIE(InfoExtractor):
         raise ExtractorError(
             'Did you forget to quote the URL? Remember that & is a meta '
             'character in most shells, so you want to put the URL in quotes, '
-            'like  youtube-dl '
+            'like  youtube-dlc '
             '"https://www.youtube.com/watch?feature=foo&v=BaW_jenozKc" '
-            ' or simply  youtube-dl BaW_jenozKc  .',
+            ' or simply  youtube-dlc BaW_jenozKc  .',
             expected=True)
 
 
diff --git a/youtube_dl/extractor/zapiks.py b/youtube_dlc/extractor/zapiks.py
index f6496f516..f6496f516 100644
--- a/youtube_dl/extractor/zapiks.py
+++ b/youtube_dlc/extractor/zapiks.py
diff --git a/youtube_dl/extractor/zaq1.py b/youtube_dlc/extractor/zaq1.py
index 889aff5d8..889aff5d8 100644
--- a/youtube_dl/extractor/zaq1.py
+++ b/youtube_dlc/extractor/zaq1.py
diff --git a/youtube_dl/extractor/zattoo.py b/youtube_dlc/extractor/zattoo.py
index 6bac3026e..6bac3026e 100644
--- a/youtube_dl/extractor/zattoo.py
+++ b/youtube_dlc/extractor/zattoo.py
diff --git a/youtube_dl/extractor/zdf.py b/youtube_dlc/extractor/zdf.py
index 656864b2e..656864b2e 100644
--- a/youtube_dl/extractor/zdf.py
+++ b/youtube_dlc/extractor/zdf.py
diff --git a/youtube_dl/extractor/zingmp3.py b/youtube_dlc/extractor/zingmp3.py
index adfdcaabf..adfdcaabf 100644
--- a/youtube_dl/extractor/zingmp3.py
+++ b/youtube_dlc/extractor/zingmp3.py
diff --git a/youtube_dl/extractor/zype.py b/youtube_dlc/extractor/zype.py
index 2e2e97a0c..2e2e97a0c 100644
--- a/youtube_dl/extractor/zype.py
+++ b/youtube_dlc/extractor/zype.py
diff --git a/youtube_dl/jsinterp.py b/youtube_dlc/jsinterp.py
index 7bda59610..7bda59610 100644
--- a/youtube_dl/jsinterp.py
+++ b/youtube_dlc/jsinterp.py
diff --git a/youtube_dl/options.py b/youtube_dlc/options.py
index 6d5ac62b3..2cc5eee74 100644
--- a/youtube_dl/options.py
+++ b/youtube_dlc/options.py
@@ -57,33 +57,33 @@ def parseOpts(overrideArguments=None):
     def _readUserConf():
         xdg_config_home = compat_getenv('XDG_CONFIG_HOME')
         if xdg_config_home:
-            userConfFile = os.path.join(xdg_config_home, 'youtube-dl', 'config')
+            userConfFile = os.path.join(xdg_config_home, 'youtube-dlc', 'config')
             if not os.path.isfile(userConfFile):
-                userConfFile = os.path.join(xdg_config_home, 'youtube-dl.conf')
+                userConfFile = os.path.join(xdg_config_home, 'youtube-dlc.conf')
         else:
-            userConfFile = os.path.join(compat_expanduser('~'), '.config', 'youtube-dl', 'config')
+            userConfFile = os.path.join(compat_expanduser('~'), '.config', 'youtube-dlc', 'config')
             if not os.path.isfile(userConfFile):
-                userConfFile = os.path.join(compat_expanduser('~'), '.config', 'youtube-dl.conf')
+                userConfFile = os.path.join(compat_expanduser('~'), '.config', 'youtube-dlc.conf')
         userConf = _readOptions(userConfFile, None)
 
         if userConf is None:
             appdata_dir = compat_getenv('appdata')
             if appdata_dir:
                 userConf = _readOptions(
-                    os.path.join(appdata_dir, 'youtube-dl', 'config'),
+                    os.path.join(appdata_dir, 'youtube-dlc', 'config'),
                     default=None)
                 if userConf is None:
                     userConf = _readOptions(
-                        os.path.join(appdata_dir, 'youtube-dl', 'config.txt'),
+                        os.path.join(appdata_dir, 'youtube-dlc', 'config.txt'),
                         default=None)
 
         if userConf is None:
             userConf = _readOptions(
-                os.path.join(compat_expanduser('~'), 'youtube-dl.conf'),
+                os.path.join(compat_expanduser('~'), 'youtube-dlc.conf'),
                 default=None)
         if userConf is None:
             userConf = _readOptions(
-                os.path.join(compat_expanduser('~'), 'youtube-dl.conf.txt'),
+                os.path.join(compat_expanduser('~'), 'youtube-dlc.conf.txt'),
                 default=None)
 
         if userConf is None:
@@ -168,14 +168,14 @@ def parseOpts(overrideArguments=None):
     general.add_option(
         '--default-search',
         dest='default_search', metavar='PREFIX',
-        help='Use this prefix for unqualified URLs. For example "gvsearch2:" downloads two videos from google videos for youtube-dl "large apple". Use the value "auto" to let youtube-dl guess ("auto_warning" to emit a warning when guessing). "error" just throws an error. The default value "fixup_error" repairs broken URLs, but emits an error if this is not possible instead of searching.')
+        help='Use this prefix for unqualified URLs. For example "gvsearch2:" downloads two videos from google videos for youtube-dlc "large apple". Use the value "auto" to let youtube-dlc guess ("auto_warning" to emit a warning when guessing). "error" just throws an error. The default value "fixup_error" repairs broken URLs, but emits an error if this is not possible instead of searching.')
     general.add_option(
         '--ignore-config',
         action='store_true',
         help='Do not read configuration files. '
-        'When given in the global configuration file /etc/youtube-dl.conf: '
-        'Do not read the user configuration in ~/.config/youtube-dl/config '
-        '(%APPDATA%/youtube-dl/config.txt on Windows)')
+        'When given in the global configuration file /etc/youtube-dlc.conf: '
+        'Do not read the user configuration in ~/.config/youtube-dlc/config '
+        '(%APPDATA%/youtube-dlc/config.txt on Windows)')
     general.add_option(
         '--config-location',
         dest='config_location', metavar='PATH',
@@ -357,7 +357,7 @@ def parseOpts(overrideArguments=None):
     authentication.add_option(
         '-p', '--password',
         dest='password', metavar='PASSWORD',
-        help='Account password. If this option is left out, youtube-dl will ask interactively.')
+        help='Account password. If this option is left out, youtube-dlc will ask interactively.')
     authentication.add_option(
         '-2', '--twofactor',
         dest='twofactor', metavar='TWOFACTOR',
@@ -383,7 +383,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-dl will ask interactively.')
+        help='Multiple-system operator account password. If this option is left out, youtube-dlc will ask interactively.')
     adobe_pass.add_option(
         '--ap-list-mso',
         action='store_true', dest='ap_list_mso', default=False,
@@ -670,11 +670,11 @@ def parseOpts(overrideArguments=None):
     verbosity.add_option(
         '-C', '--call-home',
         dest='call_home', action='store_true', default=False,
-        help='Contact the youtube-dl server for debugging')
+        help='Contact the youtube-dlc server for debugging')
     verbosity.add_option(
         '--no-call-home',
         dest='call_home', action='store_false', default=False,
-        help='Do NOT contact the youtube-dl server for debugging')
+        help='Do NOT contact the youtube-dlc server for debugging')
 
     filesystem = optparse.OptionGroup(parser, 'Filesystem Options')
     filesystem.add_option(
@@ -720,7 +720,7 @@ def parseOpts(overrideArguments=None):
     filesystem.add_option(
         '-c', '--continue',
         action='store_true', dest='continue_dl', default=True,
-        help='Force resume of partially downloaded files. By default, youtube-dl will resume downloads if possible.')
+        help='Force resume of partially downloaded files. By default, youtube-dlc will resume downloads if possible.')
     filesystem.add_option(
         '--no-continue',
         action='store_false', dest='continue_dl',
@@ -755,7 +755,7 @@ def parseOpts(overrideArguments=None):
         help='File to read cookies from and dump cookie jar in')
     filesystem.add_option(
         '--cache-dir', dest='cachedir', default=None, metavar='DIR',
-        help='Location in the filesystem where youtube-dl can store some downloaded information permanently. By default $XDG_CACHE_HOME/youtube-dl or ~/.cache/youtube-dl . At the moment, only YouTube player files (for videos with obfuscated signatures) are cached, but that may change.')
+        help='Location in the filesystem where youtube-dlc can store some downloaded information permanently. By default $XDG_CACHE_HOME/youtube-dlc or ~/.cache/youtube-dlc . At the moment, only YouTube player files (for videos with obfuscated signatures) are cached, but that may change.')
     filesystem.add_option(
         '--no-cache-dir', action='store_const', const=False, dest='cachedir',
         help='Disable filesystem caching')
@@ -892,14 +892,14 @@ def parseOpts(overrideArguments=None):
         if '--config-location' in command_line_conf:
             location = compat_expanduser(opts.config_location)
             if os.path.isdir(location):
-                location = os.path.join(location, 'youtube-dl.conf')
+                location = os.path.join(location, 'youtube-dlc.conf')
             if not os.path.exists(location):
                 parser.error('config-location %s does not exist.' % location)
             custom_conf = _readOptions(location)
         elif '--ignore-config' in command_line_conf:
             pass
         else:
-            system_conf = _readOptions('/etc/youtube-dl.conf')
+            system_conf = _readOptions('/etc/youtube-dlc.conf')
             if '--ignore-config' not in system_conf:
                 user_conf = _readUserConf()
 
diff --git a/youtube_dl/postprocessor/__init__.py b/youtube_dlc/postprocessor/__init__.py
index 3ea518399..3ea518399 100644
--- a/youtube_dl/postprocessor/__init__.py
+++ b/youtube_dlc/postprocessor/__init__.py
diff --git a/youtube_dl/postprocessor/common.py b/youtube_dlc/postprocessor/common.py
index 599dd1df2..599dd1df2 100644
--- a/youtube_dl/postprocessor/common.py
+++ b/youtube_dlc/postprocessor/common.py
diff --git a/youtube_dl/postprocessor/embedthumbnail.py b/youtube_dlc/postprocessor/embedthumbnail.py
index e2002ab0b..e2002ab0b 100644
--- a/youtube_dl/postprocessor/embedthumbnail.py
+++ b/youtube_dlc/postprocessor/embedthumbnail.py
diff --git a/youtube_dl/postprocessor/execafterdownload.py b/youtube_dlc/postprocessor/execafterdownload.py
index 64dabe790..64dabe790 100644
--- a/youtube_dl/postprocessor/execafterdownload.py
+++ b/youtube_dlc/postprocessor/execafterdownload.py
diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dlc/postprocessor/ffmpeg.py
index 5f7298345..dbc736c50 100644
--- a/youtube_dl/postprocessor/ffmpeg.py
+++ b/youtube_dlc/postprocessor/ffmpeg.py
@@ -533,7 +533,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-dl will download single file media. '
+                       'youtube-dlc will download single file media. '
                        'Update %s to version %s or newer to fix this.') % (
                            self.basename, self.basename, required_version)
             if self._downloader:
diff --git a/youtube_dl/postprocessor/metadatafromtitle.py b/youtube_dlc/postprocessor/metadatafromtitle.py
index f5c14d974..f5c14d974 100644
--- a/youtube_dl/postprocessor/metadatafromtitle.py
+++ b/youtube_dlc/postprocessor/metadatafromtitle.py
diff --git a/youtube_dl/postprocessor/xattrpp.py b/youtube_dlc/postprocessor/xattrpp.py
index 814dabecf..814dabecf 100644
--- a/youtube_dl/postprocessor/xattrpp.py
+++ b/youtube_dlc/postprocessor/xattrpp.py
diff --git a/youtube_dl/socks.py b/youtube_dlc/socks.py
index 5d4adbe72..5d4adbe72 100644
--- a/youtube_dl/socks.py
+++ b/youtube_dlc/socks.py
diff --git a/youtube_dl/swfinterp.py b/youtube_dlc/swfinterp.py
index 0c7158575..0c7158575 100644
--- a/youtube_dl/swfinterp.py
+++ b/youtube_dlc/swfinterp.py
diff --git a/youtube_dl/update.py b/youtube_dlc/update.py
index 84c964617..d95a07c0c 100644
--- a/youtube_dl/update.py
+++ b/youtube_dlc/update.py
@@ -38,7 +38,7 @@ def update_self(to_screen, verbose, opener):
     UPDATES_RSA_KEY = (0x9d60ee4d8f805312fdb15a62f87b95bd66177b91df176765d13514a0f1754bcd2057295c5b6f1d35daa6742c3ffc9a82d3e118861c207995a8031e151d863c9927e304576bc80692bc8e094896fcf11b66f3e29e04e3a71e9a11558558acea1840aec37fc396fb6b65dc81a1c4144e03bd1c011de62e3f1357b327d08426fe93, 65537)
 
     if not isinstance(globals().get('__loader__'), zipimporter) and not hasattr(sys, 'frozen'):
-        to_screen('It looks like you installed youtube-dl with a package manager, pip, setup.py or a tarball. Please use that to update.')
+        to_screen('It looks like you installed youtube-dlc with a package manager, pip, setup.py or a tarball. Please use that to update.')
         return
 
     # Check if there is a new version
@@ -50,7 +50,7 @@ def update_self(to_screen, verbose, opener):
         to_screen('ERROR: can\'t find the current version. Please try again later.')
         return
     if newversion == __version__:
-        to_screen('youtube-dl is up-to-date (' + __version__ + ')')
+        to_screen('youtube-dlc is up-to-date (' + __version__ + ')')
         return
 
     # Download and check versions info
@@ -76,7 +76,7 @@ def update_self(to_screen, verbose, opener):
     def version_tuple(version_str):
         return tuple(map(int, version_str.split('.')))
     if version_tuple(__version__) >= version_tuple(version_id):
-        to_screen('youtube-dl is up to date (%s)' % __version__)
+        to_screen('youtube-dlc is up to date (%s)' % __version__)
         return
 
     to_screen('Updating to version ' + version_id + ' ...')
@@ -126,14 +126,14 @@ def update_self(to_screen, verbose, opener):
             return
 
         try:
-            bat = os.path.join(directory, 'youtube-dl-updater.bat')
+            bat = os.path.join(directory, 'youtube-dlc-updater.bat')
             with io.open(bat, 'w') as batfile:
                 batfile.write('''
 @echo off
 echo Waiting for file handle to be closed ...
 ping 127.0.0.1 -n 5 -w 1000 > NUL
 move /Y "%s.new" "%s" > NUL
-echo Updated youtube-dl to version %s.
+echo Updated youtube-dlc to version %s.
 start /b "" cmd /c del "%%~f0"&exit /b"
                 \n''' % (exe, exe, version_id))
 
@@ -171,7 +171,7 @@ start /b "" cmd /c del "%%~f0"&exit /b"
             to_screen('ERROR: unable to overwrite current version')
             return
 
-    to_screen('Updated youtube-dl. Restart youtube-dl to use the new version.')
+    to_screen('Updated youtube-dlc. Restart youtube-dlc to use the new version.')
 
 
 def get_notes(versions, fromVersion):
diff --git a/youtube_dl/utils.py b/youtube_dlc/utils.py
index c73f5e0ca..7dafacac2 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dlc/utils.py
@@ -2317,12 +2317,12 @@ def make_HTTPS_handler(params, **kwargs):
 
 def bug_reports_message():
     if ytdl_is_updateable():
-        update_cmd = 'type  youtube-dl -U  to update'
+        update_cmd = 'type  youtube-dlc -U  to update'
     else:
         update_cmd = 'see  https://yt-dl.org/update  on how to update'
     msg = '; please report this issue on https://yt-dl.org/bug .'
     msg += ' Make sure you are using the latest version; %s.' % update_cmd
-    msg += ' Be sure to call youtube-dl with the --verbose flag and include its complete output.'
+    msg += ' Be sure to call youtube-dlc with the --verbose flag and include its complete output.'
     return msg
 
 
@@ -2336,7 +2336,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-dl.
+        If expected is set, this is a normal error message and most likely not a bug in youtube-dlc.
         """
 
         if sys.exc_info()[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError):
@@ -2745,7 +2745,7 @@ class YoutubeDLCookieJar(compat_cookiejar.MozillaCookieJar):
     _HTTPONLY_PREFIX = '#HttpOnly_'
     _ENTRY_LEN = 7
     _HEADER = '''# Netscape HTTP Cookie File
-# This file is generated by youtube-dl.  Do not edit.
+# This file is generated by youtube-dlc.  Do not edit.
 
 '''
     _CookieFileEntry = collections.namedtuple(
@@ -3732,7 +3732,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-dl is run in the background.
+        # SIGTTOU if youtube-dlc is run in the background.
         # See https://github.com/ytdl-org/youtube-dl/issues/955#issuecomment-209789656
         out, _ = subprocess.Popen(
             [encodeArgument(exe)] + args,
@@ -4144,7 +4144,7 @@ def is_outdated_version(version, limit, assume_new=True):
 
 
 def ytdl_is_updateable():
-    """ Returns if youtube-dl can be updated with -U """
+    """ Returns if youtube-dlc can be updated with -U """
     from zipimport import zipimporter
 
     return isinstance(globals().get('__loader__'), zipimporter) or hasattr(sys, 'frozen')
@@ -5353,7 +5353,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-dl's http/https handlers do wrapping the socket with socks
+            # youtube-dlc's http/https handlers do wrapping the socket with socks
             return None
         return compat_urllib_request.ProxyHandler.proxy_open(
             self, req, proxy, type)
@@ -5626,7 +5626,7 @@ def write_xattr(path, key, value):
                 # TODO: fallback to CLI tools
                 raise XAttrUnavailableError(
                     'python-pyxattr is detected but is too old. '
-                    'youtube-dl requires %s or above while your version is %s. '
+                    'youtube-dlc requires %s or above while your version is %s. '
                     'Falling back to other xattr implementations' % (
                         pyxattr_required_version, xattr.__version__))
 
diff --git a/youtube_dl/version.py b/youtube_dlc/version.py
index aea708f45..aea708f45 100644
--- a/youtube_dl/version.py
+++ b/youtube_dlc/version.py