diff --git a/letsencrypt-apache/LICENSE.txt b/certbot-apache/LICENSE.txt
similarity index 100%
rename from letsencrypt-apache/LICENSE.txt
rename to certbot-apache/LICENSE.txt
diff --git a/certbot-apache/MANIFEST.in b/certbot-apache/MANIFEST.in
new file mode 100644
index 000000000..3e594a953
--- /dev/null
+++ b/certbot-apache/MANIFEST.in
@@ -0,0 +1,7 @@
+include LICENSE.txt
+include README.rst
+recursive-include docs *
+recursive-include certbot_apache/tests/testdata *
+include certbot_apache/centos-options-ssl-apache.conf
+include certbot_apache/options-ssl-apache.conf
+recursive-include certbot_apache/augeas_lens *.aug
diff --git a/letsencrypt-apache/README.rst b/certbot-apache/README.rst
similarity index 100%
rename from letsencrypt-apache/README.rst
rename to certbot-apache/README.rst
diff --git a/letsencrypt-apache/letsencrypt_apache/__init__.py b/certbot-apache/certbot_apache/__init__.py
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/__init__.py
rename to certbot-apache/certbot_apache/__init__.py
diff --git a/letsencrypt-apache/letsencrypt_apache/augeas_configurator.py b/certbot-apache/certbot_apache/augeas_configurator.py
similarity index 96%
rename from letsencrypt-apache/letsencrypt_apache/augeas_configurator.py
rename to certbot-apache/certbot_apache/augeas_configurator.py
index 9b51c32a9..12753541c 100644
--- a/letsencrypt-apache/letsencrypt_apache/augeas_configurator.py
+++ b/certbot-apache/certbot_apache/augeas_configurator.py
@@ -3,11 +3,11 @@ import logging
 
 import augeas
 
-from letsencrypt import errors
-from letsencrypt import reverter
-from letsencrypt.plugins import common
+from certbot import errors
+from certbot import reverter
+from certbot.plugins import common
 
-from letsencrypt_apache import constants
+from certbot_apache import constants
 
 logger = logging.getLogger(__name__)
 
@@ -16,14 +16,14 @@ class AugeasConfigurator(common.Plugin):
     """Base Augeas Configurator class.
 
     :ivar config: Configuration.
-    :type config: :class:`~letsencrypt.interfaces.IConfig`
+    :type config: :class:`~certbot.interfaces.IConfig`
 
     :ivar aug: Augeas object
     :type aug: :class:`augeas.Augeas`
 
     :ivar str save_notes: Human-readable configuration change notes
     :ivar reverter: saves and reverts checkpoints
-    :type reverter: :class:`letsencrypt.reverter.Reverter`
+    :type reverter: :class:`certbot.reverter.Reverter`
 
     """
     def __init__(self, *args, **kwargs):
diff --git a/letsencrypt-apache/letsencrypt_apache/augeas_lens/README b/certbot-apache/certbot_apache/augeas_lens/README
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/augeas_lens/README
rename to certbot-apache/certbot_apache/augeas_lens/README
diff --git a/letsencrypt-apache/letsencrypt_apache/augeas_lens/httpd.aug b/certbot-apache/certbot_apache/augeas_lens/httpd.aug
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/augeas_lens/httpd.aug
rename to certbot-apache/certbot_apache/augeas_lens/httpd.aug
diff --git a/letsencrypt-apache/letsencrypt_apache/centos-options-ssl-apache.conf b/certbot-apache/certbot_apache/centos-options-ssl-apache.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/centos-options-ssl-apache.conf
rename to certbot-apache/certbot_apache/centos-options-ssl-apache.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/configurator.py b/certbot-apache/certbot_apache/configurator.py
similarity index 95%
rename from letsencrypt-apache/letsencrypt_apache/configurator.py
rename to certbot-apache/certbot_apache/configurator.py
index b2c843251..5681373b6 100644
--- a/letsencrypt-apache/letsencrypt_apache/configurator.py
+++ b/certbot-apache/certbot_apache/configurator.py
@@ -13,18 +13,18 @@ import zope.interface
 
 from acme import challenges
 
-from letsencrypt import errors
-from letsencrypt import interfaces
-from letsencrypt import le_util
+from certbot import errors
+from certbot import interfaces
+from certbot import le_util
 
-from letsencrypt.plugins import common
+from certbot.plugins import common
 
-from letsencrypt_apache import augeas_configurator
-from letsencrypt_apache import constants
-from letsencrypt_apache import display_ops
-from letsencrypt_apache import tls_sni_01
-from letsencrypt_apache import obj
-from letsencrypt_apache import parser
+from certbot_apache import augeas_configurator
+from certbot_apache import constants
+from certbot_apache import display_ops
+from certbot_apache import tls_sni_01
+from certbot_apache import obj
+from certbot_apache import parser
 
 from collections import defaultdict
 
@@ -70,14 +70,14 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
     14.04 Apache 2.4 and it works for Ubuntu 12.04 Apache 2.2
 
     :ivar config: Configuration.
-    :type config: :class:`~letsencrypt.interfaces.IConfig`
+    :type config: :class:`~certbot.interfaces.IConfig`
 
     :ivar parser: Handles low level parsing
-    :type parser: :class:`~letsencrypt_apache.parser`
+    :type parser: :class:`~certbot_apache.parser`
 
     :ivar tup version: version of Apache
     :ivar list vhosts: All vhosts found in the configuration
-        (:class:`list` of :class:`~letsencrypt_apache.obj.VirtualHost`)
+        (:class:`list` of :class:`~certbot_apache.obj.VirtualHost`)
 
     :ivar dict assoc: Mapping between domains and vhosts
 
@@ -205,7 +205,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         installed, the VirtualHost is enabled if it isn't already.
 
         .. todo:: Might be nice to remove chain directive if none exists
-                  This shouldn't happen within letsencrypt though
+                  This shouldn't happen within certbot though
 
         :raises errors.PluginError: When unable to deploy certificate due to
             a lack of directives
@@ -290,7 +290,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         :param bool temp: whether the vhost is only used temporarily
 
         :returns: ssl vhost associated with name
-        :rtype: :class:`~letsencrypt_apache.obj.VirtualHost`
+        :rtype: :class:`~certbot_apache.obj.VirtualHost`
 
         :raises .errors.PluginError: If no vhost is available or chosen
 
@@ -472,7 +472,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         """Helper function for get_virtual_hosts().
 
         :param host: In progress vhost whose names will be added
-        :type host: :class:`~letsencrypt_apache.obj.VirtualHost`
+        :type host: :class:`~certbot_apache.obj.VirtualHost`
 
         """
         # Take the final ServerName as each overrides the previous
@@ -498,7 +498,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         :param str path: Augeas path to virtual host
 
         :returns: newly created vhost
-        :rtype: :class:`~letsencrypt_apache.obj.VirtualHost`
+        :rtype: :class:`~certbot_apache.obj.VirtualHost`
 
         """
         addrs = set()
@@ -534,7 +534,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
     def get_virtual_hosts(self):
         """Returns list of virtual hosts found in the Apache configuration.
 
-        :returns: List of :class:`~letsencrypt_apache.obj.VirtualHost`
+        :returns: List of :class:`~certbot_apache.obj.VirtualHost`
             objects found in configuration
         :rtype: list
 
@@ -572,7 +572,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         now NameVirtualHosts. If version is earlier than 2.4, check if addr
         has a NameVirtualHost directive in the Apache config
 
-        :param letsencrypt_apache.obj.Addr target_addr: vhost address
+        :param certbot_apache.obj.Addr target_addr: vhost address
 
         :returns: Success
         :rtype: bool
@@ -590,7 +590,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         """Adds NameVirtualHost directive for given address.
 
         :param addr: Address that will be added as NameVirtualHost directive
-        :type addr: :class:`~letsencrypt_apache.obj.Addr`
+        :type addr: :class:`~certbot_apache.obj.Addr`
 
         """
         loc = parser.get_aug_path(self.parser.loc["name"])
@@ -679,7 +679,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         """Checks to see if the server is ready for SNI challenges.
 
         :param addrs: Addresses to check SNI compatibility
-        :type addrs: :class:`~letsencrypt_apache.obj.Addr`
+        :type addrs: :class:`~certbot_apache.obj.Addr`
 
         """
         # Version 2.4 and later are automatically SNI ready.
@@ -697,15 +697,15 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
 
         Duplicates vhost and adds default ssl options
         New vhost will reside as (nonssl_vhost.path) +
-        ``letsencrypt_apache.constants.os_constant("le_vhost_ext")``
+        ``certbot_apache.constants.os_constant("le_vhost_ext")``
 
         .. note:: This function saves the configuration
 
         :param nonssl_vhost: Valid VH that doesn't have SSLEngine on
-        :type nonssl_vhost: :class:`~letsencrypt_apache.obj.VirtualHost`
+        :type nonssl_vhost: :class:`~certbot_apache.obj.VirtualHost`
 
         :returns: SSL vhost
-        :rtype: :class:`~letsencrypt_apache.obj.VirtualHost`
+        :rtype: :class:`~certbot_apache.obj.VirtualHost`
 
         :raises .errors.PluginError: If more than one virtual host is in
             the file or if plugin is unable to write/read vhost files.
@@ -911,7 +911,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         https://httpd.apache.org/docs/2.2/mod/core.html#namevirtualhost
 
         :param vhost: New virtual host that was recently created.
-        :type vhost: :class:`~letsencrypt_apache.obj.VirtualHost`
+        :type vhost: :class:`~certbot_apache.obj.VirtualHost`
 
         """
         need_to_save = False
@@ -951,9 +951,9 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
 
         :param str domain: domain to enhance
         :param str enhancement: enhancement type defined in
-            :const:`~letsencrypt.constants.ENHANCEMENTS`
+            :const:`~certbot.constants.ENHANCEMENTS`
         :param options: options for the enhancement
-            See :const:`~letsencrypt.constants.ENHANCEMENTS`
+            See :const:`~certbot.constants.ENHANCEMENTS`
             documentation for appropriate parameter.
 
         :raises .errors.PluginError: If Enhancement is not supported, or if
@@ -981,14 +981,14 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         .. note:: This function saves the configuration
 
         :param ssl_vhost: Destination of traffic, an ssl enabled vhost
-        :type ssl_vhost: :class:`~letsencrypt_apache.obj.VirtualHost`
+        :type ssl_vhost: :class:`~certbot_apache.obj.VirtualHost`
 
         :param header_substring: string that uniquely identifies a header.
                 e.g: Strict-Transport-Security, Upgrade-Insecure-Requests.
         :type str
 
         :returns: Success, general_vhost (HTTP vhost)
-        :rtype: (bool, :class:`~letsencrypt_apache.obj.VirtualHost`)
+        :rtype: (bool, :class:`~certbot_apache.obj.VirtualHost`)
 
         :raises .errors.PluginError: If no viable HTTP host can be created or
             set with header header_substring.
@@ -1016,7 +1016,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         contains the string header_substring.
 
         :param ssl_vhost: vhost to check
-        :type vhost: :class:`~letsencrypt_apache.obj.VirtualHost`
+        :type vhost: :class:`~certbot_apache.obj.VirtualHost`
 
         :param header_substring: string that uniquely identifies a header.
                 e.g: Strict-Transport-Security, Upgrade-Insecure-Requests.
@@ -1053,13 +1053,13 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         .. note:: This function saves the configuration
 
         :param ssl_vhost: Destination of traffic, an ssl enabled vhost
-        :type ssl_vhost: :class:`~letsencrypt_apache.obj.VirtualHost`
+        :type ssl_vhost: :class:`~certbot_apache.obj.VirtualHost`
 
         :param unused_options: Not currently used
         :type unused_options: Not Available
 
         :returns: Success, general_vhost (HTTP vhost)
-        :rtype: (bool, :class:`~letsencrypt_apache.obj.VirtualHost`)
+        :rtype: (bool, :class:`~certbot_apache.obj.VirtualHost`)
 
         :raises .errors.PluginError: If no viable HTTP host can be created or
             used for the redirect.
@@ -1084,10 +1084,10 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
             self._create_redirect_vhost(ssl_vhost)
         else:
             # Check if LetsEncrypt redirection already exists
-            self._verify_no_letsencrypt_redirect(general_vh)
+            self._verify_no_certbot_redirect(general_vh)
 
             # Note: if code flow gets here it means we didn't find the exact
-            # letsencrypt RewriteRule config for redirection. Finding
+            # certbot RewriteRule config for redirection. Finding
             # another RewriteRule is likely to be fine in most or all cases,
             # but redirect loops are possible in very obscure cases; see #1620
             # for reasoning.
@@ -1121,17 +1121,17 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
             logger.info("Redirecting vhost in %s to ssl vhost in %s",
                         general_vh.filep, ssl_vhost.filep)
 
-    def _verify_no_letsencrypt_redirect(self, vhost):
-        """Checks to see if a redirect was already installed by letsencrypt.
+    def _verify_no_certbot_redirect(self, vhost):
+        """Checks to see if a redirect was already installed by certbot.
 
         Checks to see if virtualhost already contains a rewrite rule that is
         identical to Letsencrypt's redirection rewrite rule.
 
         :param vhost: vhost to check
-        :type vhost: :class:`~letsencrypt_apache.obj.VirtualHost`
+        :type vhost: :class:`~certbot_apache.obj.VirtualHost`
 
         :raises errors.PluginEnhancementAlreadyPresent: When the exact
-                letsencrypt redirection WriteRule exists in virtual host.
+                certbot redirection WriteRule exists in virtual host.
         """
         rewrite_path = self.parser.find_dir(
             "RewriteRule", None, start=vhost.path)
@@ -1160,7 +1160,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         """Checks if there exists a RewriteRule directive in vhost
 
         :param vhost: vhost to check
-        :type vhost: :class:`~letsencrypt_apache.obj.VirtualHost`
+        :type vhost: :class:`~certbot_apache.obj.VirtualHost`
 
         :returns: True if a RewriteRule directive exists.
         :rtype: bool
@@ -1174,7 +1174,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         """Checks if a RewriteEngine directive is on
 
         :param vhost: vhost to check
-        :type vhost: :class:`~letsencrypt_apache.obj.VirtualHost`
+        :type vhost: :class:`~certbot_apache.obj.VirtualHost`
 
         """
         rewrite_engine_path = self.parser.find_dir("RewriteEngine", "on",
@@ -1187,10 +1187,10 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         """Creates an http_vhost specifically to redirect for the ssl_vhost.
 
         :param ssl_vhost: ssl vhost
-        :type ssl_vhost: :class:`~letsencrypt_apache.obj.VirtualHost`
+        :type ssl_vhost: :class:`~certbot_apache.obj.VirtualHost`
 
         :returns: tuple of the form
-            (`success`, :class:`~letsencrypt_apache.obj.VirtualHost`)
+            (`success`, :class:`~certbot_apache.obj.VirtualHost`)
         :rtype: tuple
 
         """
@@ -1369,7 +1369,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         .. todo:: Make sure link is not broken...
 
         :param vhost: vhost to enable
-        :type vhost: :class:`~letsencrypt_apache.obj.VirtualHost`
+        :type vhost: :class:`~certbot_apache.obj.VirtualHost`
 
         :raises .errors.NotSupportedError: If filesystem layout is not
             supported.
@@ -1452,7 +1452,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         if not le_util.exe_exists(self.conf("dismod")):
             raise errors.MisconfigurationError(
                 "Unable to find a2dismod, please make sure a2enmod and "
-                "a2dismod are configured correctly for letsencrypt.")
+                "a2dismod are configured correctly for certbot.")
 
         self.reverter.register_undo_command(
             temp, [self.conf("dismod"), mod_name])
@@ -1639,7 +1639,7 @@ def install_ssl_options_conf(options_ssl):
     required.
     """
     # XXX if we ever try to enforce a local privilege boundary (eg, running
-    # letsencrypt for unprivileged users via setuid), this function will need
+    # certbot for unprivileged users via setuid), this function will need
     # to be modified.
 
     # XXX if the user is in security-autoupdate mode, we should be willing to
diff --git a/letsencrypt-apache/letsencrypt_apache/constants.py b/certbot-apache/certbot_apache/constants.py
similarity index 92%
rename from letsencrypt-apache/letsencrypt_apache/constants.py
rename to certbot-apache/certbot_apache/constants.py
index 8b502b4d8..f3226572c 100644
--- a/letsencrypt-apache/letsencrypt_apache/constants.py
+++ b/certbot-apache/certbot_apache/constants.py
@@ -1,6 +1,6 @@
 """Apache plugin constants."""
 import pkg_resources
-from letsencrypt import le_util
+from certbot import le_util
 
 
 CLI_DEFAULTS_DEBIAN = dict(
@@ -18,7 +18,7 @@ CLI_DEFAULTS_DEBIAN = dict(
     handle_sites=True,
     challenge_location="/etc/apache2",
     MOD_SSL_CONF_SRC=pkg_resources.resource_filename(
-        "letsencrypt_apache", "options-ssl-apache.conf")
+        "certbot_apache", "options-ssl-apache.conf")
 )
 CLI_DEFAULTS_CENTOS = dict(
     server_root="/etc/httpd",
@@ -35,7 +35,7 @@ CLI_DEFAULTS_CENTOS = dict(
     handle_sites=False,
     challenge_location="/etc/httpd/conf.d",
     MOD_SSL_CONF_SRC=pkg_resources.resource_filename(
-        "letsencrypt_apache", "centos-options-ssl-apache.conf")
+        "certbot_apache", "centos-options-ssl-apache.conf")
 )
 CLI_DEFAULTS_GENTOO = dict(
     server_root="/etc/apache2",
@@ -52,7 +52,7 @@ CLI_DEFAULTS_GENTOO = dict(
     handle_sites=False,
     challenge_location="/etc/apache2/vhosts.d",
     MOD_SSL_CONF_SRC=pkg_resources.resource_filename(
-        "letsencrypt_apache", "options-ssl-apache.conf")
+        "certbot_apache", "options-ssl-apache.conf")
 )
 CLI_DEFAULTS_DARWIN = dict(
     server_root="/etc/apache2",
@@ -69,7 +69,7 @@ CLI_DEFAULTS_DARWIN = dict(
     handle_sites=False,
     challenge_location="/etc/apache2/other",
     MOD_SSL_CONF_SRC=pkg_resources.resource_filename(
-        "letsencrypt_apache", "options-ssl-apache.conf")
+        "certbot_apache", "options-ssl-apache.conf")
 )
 CLI_DEFAULTS = {
     "debian": CLI_DEFAULTS_DEBIAN,
@@ -87,7 +87,7 @@ MOD_SSL_CONF_DEST = "options-ssl-apache.conf"
 """Name of the mod_ssl config file as saved in `IConfig.config_dir`."""
 
 AUGEAS_LENS_DIR = pkg_resources.resource_filename(
-    "letsencrypt_apache", "augeas_lens")
+    "certbot_apache", "augeas_lens")
 """Path to the Augeas lens directory"""
 
 REWRITE_HTTPS_ARGS = [
diff --git a/letsencrypt-apache/letsencrypt_apache/display_ops.py b/certbot-apache/certbot_apache/display_ops.py
similarity index 94%
rename from letsencrypt-apache/letsencrypt_apache/display_ops.py
rename to certbot-apache/certbot_apache/display_ops.py
index 4c01579cc..c9359e7d3 100644
--- a/letsencrypt-apache/letsencrypt_apache/display_ops.py
+++ b/certbot-apache/certbot_apache/display_ops.py
@@ -4,10 +4,10 @@ import os
 
 import zope.component
 
-from letsencrypt import errors
-from letsencrypt import interfaces
+from certbot import errors
+from certbot import interfaces
 
-import letsencrypt.display.util as display_util
+import certbot.display.util as display_util
 
 
 logger = logging.getLogger(__name__)
@@ -50,7 +50,7 @@ def _vhost_menu(domain, vhosts):
 
     if free_chars < 2:
         logger.debug("Display size is too small for "
-                     "letsencrypt_apache.display_ops._vhost_menu()")
+                     "certbot_apache.display_ops._vhost_menu()")
         # This runs the edge off the screen, but it doesn't cause an "error"
         filename_size = 1
         disp_name_size = 1
diff --git a/letsencrypt-apache/letsencrypt_apache/obj.py b/certbot-apache/certbot_apache/obj.py
similarity index 99%
rename from letsencrypt-apache/letsencrypt_apache/obj.py
rename to certbot-apache/certbot_apache/obj.py
index c05ee4bcc..b88b22428 100644
--- a/letsencrypt-apache/letsencrypt_apache/obj.py
+++ b/certbot-apache/certbot_apache/obj.py
@@ -1,7 +1,7 @@
 """Module contains classes used by the Apache Configurator."""
 import re
 
-from letsencrypt.plugins import common
+from certbot.plugins import common
 
 
 class Addr(common.Addr):
diff --git a/letsencrypt-apache/letsencrypt_apache/options-ssl-apache.conf b/certbot-apache/certbot_apache/options-ssl-apache.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/options-ssl-apache.conf
rename to certbot-apache/certbot_apache/options-ssl-apache.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/parser.py b/certbot-apache/certbot_apache/parser.py
similarity index 99%
rename from letsencrypt-apache/letsencrypt_apache/parser.py
rename to certbot-apache/certbot_apache/parser.py
index f49ac0acc..321546eb3 100644
--- a/letsencrypt-apache/letsencrypt_apache/parser.py
+++ b/certbot-apache/certbot_apache/parser.py
@@ -6,9 +6,9 @@ import os
 import re
 import subprocess
 
-from letsencrypt import errors
+from certbot import errors
 
-from letsencrypt_apache import constants
+from certbot_apache import constants
 
 logger = logging.getLogger(__name__)
 
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/__init__.py b/certbot-apache/certbot_apache/tests/__init__.py
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/__init__.py
rename to certbot-apache/certbot_apache/tests/__init__.py
diff --git a/certbot-apache/certbot_apache/tests/apache-conf-files/NEEDED.txt b/certbot-apache/certbot_apache/tests/apache-conf-files/NEEDED.txt
new file mode 100644
index 000000000..c3606fefe
--- /dev/null
+++ b/certbot-apache/certbot_apache/tests/apache-conf-files/NEEDED.txt
@@ -0,0 +1,6 @@
+Issues for which some kind of test case should be constructable, but we do not
+currently have one:
+
+https://github.com/certbot/certbot/issues/1213
+https://github.com/certbot/certbot/issues/1602
+
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/apache-conf-test b/certbot-apache/certbot_apache/tests/apache-conf-files/apache-conf-test
similarity index 92%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/apache-conf-test
rename to certbot-apache/certbot_apache/tests/apache-conf-files/apache-conf-test
index 5725508e9..b2a453fb9 100755
--- a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/apache-conf-test
+++ b/certbot-apache/certbot_apache/tests/apache-conf-files/apache-conf-test
@@ -59,7 +59,7 @@ trap CleanupExit INT
 for f in *.conf ; do 
     echo -n  testing "$f"...
     Setup
-    RESULT=`echo c | sudo env "PATH=$PATH" letsencrypt -vvvv --debug --staging --apache --register-unsafely-without-email --agree-tos certonly -t 2>&1`
+    RESULT=`echo c | sudo env "PATH=$PATH" certbot -vvvv --debug --staging --apache --register-unsafely-without-email --agree-tos certonly -t 2>&1`
     if echo $RESULT | grep -Eq \("Which names would you like"\|"mod_macro is not yet"\) ; then
         echo passed
     else
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/missing-double-quote-1724.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/failing/missing-double-quote-1724.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/missing-double-quote-1724.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/failing/missing-double-quote-1724.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/multivhost-1093.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/failing/multivhost-1093.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/multivhost-1093.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/failing/multivhost-1093.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/multivhost-1093b.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/failing/multivhost-1093b.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/multivhost-1093b.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/failing/multivhost-1093b.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/1626-1531.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/1626-1531.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/1626-1531.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/1626-1531.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/README.modules b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/README.modules
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/README.modules
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/README.modules
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/anarcat-1531.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/anarcat-1531.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/anarcat-1531.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/anarcat-1531.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/drupal-htaccess-1531.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/drupal-htaccess-1531.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/drupal-htaccess-1531.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/drupal-htaccess-1531.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/example-1755.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/example-1755.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/example-1755.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/example-1755.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/example-ssl.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/example-ssl.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/example-ssl.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/example-ssl.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/example.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/example.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/example.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/example.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/finalize-1243.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/finalize-1243.conf
similarity index 97%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/finalize-1243.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/finalize-1243.conf
index 0918e5669..0b34ee5f0 100644
--- a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/finalize-1243.conf
+++ b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/finalize-1243.conf
@@ -41,7 +41,7 @@ Listen 443
 SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
 SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
 SSLCertificateChainFile /etc/ssl/certs/ssl-cert-snakeoil.pem
-Include /etc/letsencrypt/options-ssl-apache.conf
+Include /etc/certbot/options-ssl-apache.conf
 
 </VirtualHost>
 
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/graphite-quote-1934.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/graphite-quote-1934.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/graphite-quote-1934.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/graphite-quote-1934.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/ipv6-1143.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/ipv6-1143.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143b.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/ipv6-1143b.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143b.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/ipv6-1143b.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143c.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/ipv6-1143c.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143c.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/ipv6-1143c.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143d.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/ipv6-1143d.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143d.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/ipv6-1143d.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/missing-quote-1724.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/missing-quote-1724.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/missing-quote-1724.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/missing-quote-1724.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/modmacro-1385.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/modmacro-1385.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/modmacro-1385.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/modmacro-1385.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/owncloud-1264.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/owncloud-1264.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/owncloud-1264.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/owncloud-1264.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/rewrite-quote-1960.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/rewrite-quote-1960.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/rewrite-quote-1960.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/rewrite-quote-1960.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/roundcube-1222.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/roundcube-1222.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/roundcube-1222.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/roundcube-1222.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/section-continuations-2525.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/section-continuations-2525.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/section-continuations-2525.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/section-continuations-2525.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/semacode-1598.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/semacode-1598.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/semacode-1598.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/semacode-1598.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf
rename to certbot-apache/certbot_apache/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/augeas_configurator_test.py b/certbot-apache/certbot_apache/tests/augeas_configurator_test.py
similarity index 96%
rename from letsencrypt-apache/letsencrypt_apache/tests/augeas_configurator_test.py
rename to certbot-apache/certbot_apache/tests/augeas_configurator_test.py
index bf95f72ce..c55f27ff0 100644
--- a/letsencrypt-apache/letsencrypt_apache/tests/augeas_configurator_test.py
+++ b/certbot-apache/certbot_apache/tests/augeas_configurator_test.py
@@ -1,13 +1,13 @@
-"""Test for letsencrypt_apache.augeas_configurator."""
+"""Test for certbot_apache.augeas_configurator."""
 import os
 import shutil
 import unittest
 
 import mock
 
-from letsencrypt import errors
+from certbot import errors
 
-from letsencrypt_apache.tests import util
+from certbot_apache.tests import util
 
 
 class AugeasConfiguratorTest(util.ApacheTest):
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/complex_parsing_test.py b/certbot-apache/certbot_apache/tests/complex_parsing_test.py
similarity index 96%
rename from letsencrypt-apache/letsencrypt_apache/tests/complex_parsing_test.py
rename to certbot-apache/certbot_apache/tests/complex_parsing_test.py
index 1fc5281c1..079d7e95f 100644
--- a/letsencrypt-apache/letsencrypt_apache/tests/complex_parsing_test.py
+++ b/certbot-apache/certbot_apache/tests/complex_parsing_test.py
@@ -1,11 +1,11 @@
-"""Tests for letsencrypt_apache.parser."""
+"""Tests for certbot_apache.parser."""
 import os
 import shutil
 import unittest
 
-from letsencrypt import errors
+from certbot import errors
 
-from letsencrypt_apache.tests import util
+from certbot_apache.tests import util
 
 
 class ComplexParserTest(util.ParserTest):
@@ -88,7 +88,7 @@ class ComplexParserTest(util.ParserTest):
 
     def verify_fnmatch(self, arg, hit=True):
         """Test if Include was correctly parsed."""
-        from letsencrypt_apache import parser
+        from certbot_apache import parser
         self.parser.add_dir(parser.get_aug_path(self.parser.loc["default"]),
                             "Include", [arg])
         if hit:
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/configurator_test.py b/certbot-apache/certbot_apache/tests/configurator_test.py
similarity index 90%
rename from letsencrypt-apache/letsencrypt_apache/tests/configurator_test.py
rename to certbot-apache/certbot_apache/tests/configurator_test.py
index 927d918ae..f2f78c8f9 100644
--- a/letsencrypt-apache/letsencrypt_apache/tests/configurator_test.py
+++ b/certbot-apache/certbot_apache/tests/configurator_test.py
@@ -1,5 +1,5 @@
 # pylint: disable=too-many-public-methods
-"""Test for letsencrypt_apache.configurator."""
+"""Test for certbot_apache.configurator."""
 import os
 import shutil
 import socket
@@ -9,15 +9,15 @@ import mock
 
 from acme import challenges
 
-from letsencrypt import achallenges
-from letsencrypt import errors
+from certbot import achallenges
+from certbot import errors
 
-from letsencrypt.tests import acme_util
+from certbot.tests import acme_util
 
-from letsencrypt_apache import configurator
-from letsencrypt_apache import obj
+from certbot_apache import configurator
+from certbot_apache import obj
 
-from letsencrypt_apache.tests import util
+from certbot_apache.tests import util
 
 
 class MultipleVhostsTest(util.ApacheTest):
@@ -38,7 +38,7 @@ class MultipleVhostsTest(util.ApacheTest):
 
         def mocked_deploy_cert(*args, **kwargs):
             """a helper to mock a deployed cert"""
-            with mock.patch("letsencrypt_apache.configurator.ApacheConfigurator.enable_mod"):
+            with mock.patch("certbot_apache.configurator.ApacheConfigurator.enable_mod"):
                 config.real_deploy_cert(*args, **kwargs)
         self.config.deploy_cert = mocked_deploy_cert
         return self.config
@@ -48,14 +48,14 @@ class MultipleVhostsTest(util.ApacheTest):
         shutil.rmtree(self.config_dir)
         shutil.rmtree(self.work_dir)
 
-    @mock.patch("letsencrypt_apache.configurator.le_util.exe_exists")
+    @mock.patch("certbot_apache.configurator.le_util.exe_exists")
     def test_prepare_no_install(self, mock_exe_exists):
         mock_exe_exists.return_value = False
         self.assertRaises(
             errors.NoInstallationError, self.config.prepare)
 
-    @mock.patch("letsencrypt_apache.parser.ApacheParser")
-    @mock.patch("letsencrypt_apache.configurator.le_util.exe_exists")
+    @mock.patch("certbot_apache.parser.ApacheParser")
+    @mock.patch("certbot_apache.configurator.le_util.exe_exists")
     def test_prepare_version(self, mock_exe_exists, _):
         mock_exe_exists.return_value = True
         self.config.version = None
@@ -65,8 +65,8 @@ class MultipleVhostsTest(util.ApacheTest):
         self.assertRaises(
             errors.NotSupportedError, self.config.prepare)
 
-    @mock.patch("letsencrypt_apache.parser.ApacheParser")
-    @mock.patch("letsencrypt_apache.configurator.le_util.exe_exists")
+    @mock.patch("certbot_apache.parser.ApacheParser")
+    @mock.patch("certbot_apache.configurator.le_util.exe_exists")
     def test_prepare_old_aug(self, mock_exe_exists, _):
         mock_exe_exists.return_value = True
         self.config.config_test = mock.Mock()
@@ -76,7 +76,7 @@ class MultipleVhostsTest(util.ApacheTest):
             errors.NotSupportedError, self.config.prepare)
 
     def test_add_parser_arguments(self):  # pylint: disable=no-self-use
-        from letsencrypt_apache.configurator import ApacheConfigurator
+        from certbot_apache.configurator import ApacheConfigurator
         # Weak test..
         ApacheConfigurator.add_parser_arguments(mock.MagicMock())
 
@@ -85,10 +85,10 @@ class MultipleVhostsTest(util.ApacheTest):
         mock_getutility.notification = mock.MagicMock(return_value=True)
         names = self.config.get_all_names()
         self.assertEqual(names, set(
-            ["letsencrypt.demo", "encryption-example.demo", "ip-172-30-0-17", "*.blue.purple.com"]))
+            ["certbot.demo", "encryption-example.demo", "ip-172-30-0-17", "*.blue.purple.com"]))
 
     @mock.patch("zope.component.getUtility")
-    @mock.patch("letsencrypt_apache.configurator.socket.gethostbyaddr")
+    @mock.patch("certbot_apache.configurator.socket.gethostbyaddr")
     def test_get_all_names_addrs(self, mock_gethost, mock_getutility):
         mock_gethost.side_effect = [("google.com", "", ""), socket.error]
         notification = mock.Mock()
@@ -106,7 +106,7 @@ class MultipleVhostsTest(util.ApacheTest):
         self.assertEqual(len(names), 6)
         self.assertTrue("zombo.com" in names)
         self.assertTrue("google.com" in names)
-        self.assertTrue("letsencrypt.demo" in names)
+        self.assertTrue("certbot.demo" in names)
 
     def test_add_servernames_alias(self):
         self.config.parser.add_dir(
@@ -139,25 +139,25 @@ class MultipleVhostsTest(util.ApacheTest):
 
         # Handle case of non-debian layout get_virtual_hosts
         with mock.patch(
-                "letsencrypt_apache.configurator.ApacheConfigurator.conf"
+                "certbot_apache.configurator.ApacheConfigurator.conf"
         ) as mock_conf:
             mock_conf.return_value = False
             vhs = self.config.get_virtual_hosts()
             self.assertEqual(len(vhs), 7)
 
-    @mock.patch("letsencrypt_apache.display_ops.select_vhost")
+    @mock.patch("certbot_apache.display_ops.select_vhost")
     def test_choose_vhost_none_avail(self, mock_select):
         mock_select.return_value = None
         self.assertRaises(
             errors.PluginError, self.config.choose_vhost, "none.com")
 
-    @mock.patch("letsencrypt_apache.display_ops.select_vhost")
+    @mock.patch("certbot_apache.display_ops.select_vhost")
     def test_choose_vhost_select_vhost_ssl(self, mock_select):
         mock_select.return_value = self.vh_truth[1]
         self.assertEqual(
             self.vh_truth[1], self.config.choose_vhost("none.com"))
 
-    @mock.patch("letsencrypt_apache.display_ops.select_vhost")
+    @mock.patch("certbot_apache.display_ops.select_vhost")
     def test_choose_vhost_select_vhost_non_ssl(self, mock_select):
         mock_select.return_value = self.vh_truth[0]
         chosen_vhost = self.config.choose_vhost("none.com")
@@ -169,13 +169,13 @@ class MultipleVhostsTest(util.ApacheTest):
         self.assertFalse(self.vh_truth[0].ssl)
         self.assertTrue(chosen_vhost.ssl)
 
-    @mock.patch("letsencrypt_apache.display_ops.select_vhost")
+    @mock.patch("certbot_apache.display_ops.select_vhost")
     def test_choose_vhost_select_vhost_with_temp(self, mock_select):
         mock_select.return_value = self.vh_truth[0]
         chosen_vhost = self.config.choose_vhost("none.com", temp=True)
         self.assertEqual(self.vh_truth[0], chosen_vhost)
 
-    @mock.patch("letsencrypt_apache.display_ops.select_vhost")
+    @mock.patch("certbot_apache.display_ops.select_vhost")
     def test_choose_vhost_select_vhost_conflicting_non_ssl(self, mock_select):
         mock_select.return_value = self.vh_truth[3]
         conflicting_vhost = obj.VirtualHost(
@@ -203,7 +203,7 @@ class MultipleVhostsTest(util.ApacheTest):
     def test_find_best_vhost(self):
         # pylint: disable=protected-access
         self.assertEqual(
-            self.vh_truth[3], self.config._find_best_vhost("letsencrypt.demo"))
+            self.vh_truth[3], self.config._find_best_vhost("certbot.demo"))
         self.assertEqual(
             self.vh_truth[0],
             self.config._find_best_vhost("encryption-example.demo"))
@@ -224,7 +224,7 @@ class MultipleVhostsTest(util.ApacheTest):
         # Assume only the two default vhosts.
         self.config.vhosts = [
             vh for vh in self.config.vhosts
-            if vh.name not in ["letsencrypt.demo", "encryption-example.demo"]
+            if vh.name not in ["certbot.demo", "encryption-example.demo"]
             and "*.blue.purple.com" not in vh.aliases
         ]
 
@@ -254,9 +254,9 @@ class MultipleVhostsTest(util.ApacheTest):
                               self.config.is_site_enabled,
                               "irrelevant")
 
-    @mock.patch("letsencrypt.le_util.run_script")
-    @mock.patch("letsencrypt.le_util.exe_exists")
-    @mock.patch("letsencrypt_apache.parser.subprocess.Popen")
+    @mock.patch("certbot.le_util.run_script")
+    @mock.patch("certbot.le_util.exe_exists")
+    @mock.patch("certbot_apache.parser.subprocess.Popen")
     def test_enable_mod(self, mock_popen, mock_exe_exists, mock_run_script):
         mock_popen().communicate.return_value = ("Define: DUMP_RUN_CFG", "")
         mock_popen().returncode = 0
@@ -273,7 +273,7 @@ class MultipleVhostsTest(util.ApacheTest):
         self.assertRaises(
             errors.NotSupportedError, self.config.enable_mod, "ssl")
 
-    @mock.patch("letsencrypt.le_util.exe_exists")
+    @mock.patch("certbot.le_util.exe_exists")
     def test_enable_mod_no_disable(self, mock_exe_exists):
         mock_exe_exists.return_value = False
         self.assertRaises(
@@ -636,8 +636,8 @@ class MultipleVhostsTest(util.ApacheTest):
         self.config._add_name_vhost_if_necessary(self.vh_truth[0])
         self.assertEqual(self.config.save.call_count, 2)
 
-    @mock.patch("letsencrypt_apache.configurator.tls_sni_01.ApacheTlsSni01.perform")
-    @mock.patch("letsencrypt_apache.configurator.ApacheConfigurator.restart")
+    @mock.patch("certbot_apache.configurator.tls_sni_01.ApacheTlsSni01.perform")
+    @mock.patch("certbot_apache.configurator.ApacheConfigurator.restart")
     def test_perform(self, mock_restart, mock_perform):
         # Only tests functionality specific to configurator.perform
         # Note: As more challenges are offered this will have to be expanded
@@ -656,7 +656,7 @@ class MultipleVhostsTest(util.ApacheTest):
 
         self.assertEqual(mock_restart.call_count, 1)
 
-    @mock.patch("letsencrypt_apache.configurator.ApacheConfigurator.restart")
+    @mock.patch("certbot_apache.configurator.ApacheConfigurator.restart")
     def test_cleanup(self, mock_restart):
         _, achall1, achall2 = self.get_achalls()
 
@@ -669,7 +669,7 @@ class MultipleVhostsTest(util.ApacheTest):
         self.config.cleanup([achall2])
         self.assertTrue(mock_restart.called)
 
-    @mock.patch("letsencrypt_apache.configurator.ApacheConfigurator.restart")
+    @mock.patch("certbot_apache.configurator.ApacheConfigurator.restart")
     def test_cleanup_no_errors(self, mock_restart):
         _, achall1, achall2 = self.get_achalls()
 
@@ -681,7 +681,7 @@ class MultipleVhostsTest(util.ApacheTest):
         self.config.cleanup([achall1, achall2])
         self.assertTrue(mock_restart.called)
 
-    @mock.patch("letsencrypt.le_util.run_script")
+    @mock.patch("certbot.le_util.run_script")
     def test_get_version(self, mock_script):
         mock_script.return_value = (
             "Server Version: Apache/2.4.2 (Debian)", "")
@@ -703,21 +703,21 @@ class MultipleVhostsTest(util.ApacheTest):
         mock_script.side_effect = errors.SubprocessError("Can't find program")
         self.assertRaises(errors.PluginError, self.config.get_version)
 
-    @mock.patch("letsencrypt_apache.configurator.le_util.run_script")
+    @mock.patch("certbot_apache.configurator.le_util.run_script")
     def test_restart(self, _):
         self.config.restart()
 
-    @mock.patch("letsencrypt_apache.configurator.le_util.run_script")
+    @mock.patch("certbot_apache.configurator.le_util.run_script")
     def test_restart_bad_process(self, mock_run_script):
         mock_run_script.side_effect = [None, errors.SubprocessError]
 
         self.assertRaises(errors.MisconfigurationError, self.config.restart)
 
-    @mock.patch("letsencrypt.le_util.run_script")
+    @mock.patch("certbot.le_util.run_script")
     def test_config_test(self, _):
         self.config.config_test()
 
-    @mock.patch("letsencrypt.le_util.run_script")
+    @mock.patch("certbot.le_util.run_script")
     def test_config_test_bad_process(self, mock_run_script):
         mock_run_script.side_effect = errors.SubprocessError
 
@@ -747,7 +747,7 @@ class MultipleVhostsTest(util.ApacheTest):
         self.assertTrue(isinstance(self.config.get_chall_pref(""), list))
 
     def test_install_ssl_options_conf(self):
-        from letsencrypt_apache.configurator import install_ssl_options_conf
+        from certbot_apache.configurator import install_ssl_options_conf
         path = os.path.join(self.work_dir, "test_it")
         install_ssl_options_conf(path)
         self.assertTrue(os.path.isfile(path))
@@ -756,7 +756,7 @@ class MultipleVhostsTest(util.ApacheTest):
     def test_supported_enhancements(self):
         self.assertTrue(isinstance(self.config.supported_enhancements(), list))
 
-    @mock.patch("letsencrypt.le_util.exe_exists")
+    @mock.patch("certbot.le_util.exe_exists")
     def test_enhance_unknown_vhost(self, mock_exe):
         self.config.parser.modules.add("rewrite_module")
         mock_exe.return_value = True
@@ -772,23 +772,23 @@ class MultipleVhostsTest(util.ApacheTest):
     def test_enhance_unknown_enhancement(self):
         self.assertRaises(
             errors.PluginError,
-            self.config.enhance, "letsencrypt.demo", "unknown_enhancement")
+            self.config.enhance, "certbot.demo", "unknown_enhancement")
 
-    @mock.patch("letsencrypt.le_util.run_script")
-    @mock.patch("letsencrypt.le_util.exe_exists")
+    @mock.patch("certbot.le_util.run_script")
+    @mock.patch("certbot.le_util.exe_exists")
     def test_http_header_hsts(self, mock_exe, _):
         self.config.parser.update_runtime_variables = mock.Mock()
         self.config.parser.modules.add("mod_ssl.c")
         mock_exe.return_value = True
 
-        # This will create an ssl vhost for letsencrypt.demo
-        self.config.enhance("letsencrypt.demo", "ensure-http-header",
+        # This will create an ssl vhost for certbot.demo
+        self.config.enhance("certbot.demo", "ensure-http-header",
                             "Strict-Transport-Security")
 
         self.assertTrue("headers_module" in self.config.parser.modules)
 
-        # Get the ssl vhost for letsencrypt.demo
-        ssl_vhost = self.config.assoc["letsencrypt.demo"]
+        # Get the ssl vhost for certbot.demo
+        ssl_vhost = self.config.assoc["certbot.demo"]
 
         # These are not immediately available in find_dir even with save() and
         # load(). They must be found in sites-available
@@ -803,7 +803,7 @@ class MultipleVhostsTest(util.ApacheTest):
         # skip the enable mod
         self.config.parser.modules.add("headers_module")
 
-        # This will create an ssl vhost for letsencrypt.demo
+        # This will create an ssl vhost for certbot.demo
         self.config.enhance("encryption-example.demo", "ensure-http-header",
                             "Strict-Transport-Security")
 
@@ -812,21 +812,21 @@ class MultipleVhostsTest(util.ApacheTest):
             self.config.enhance, "encryption-example.demo",
             "ensure-http-header", "Strict-Transport-Security")
 
-    @mock.patch("letsencrypt.le_util.run_script")
-    @mock.patch("letsencrypt.le_util.exe_exists")
+    @mock.patch("certbot.le_util.run_script")
+    @mock.patch("certbot.le_util.exe_exists")
     def test_http_header_uir(self, mock_exe, _):
         self.config.parser.update_runtime_variables = mock.Mock()
         self.config.parser.modules.add("mod_ssl.c")
         mock_exe.return_value = True
 
-        # This will create an ssl vhost for letsencrypt.demo
-        self.config.enhance("letsencrypt.demo", "ensure-http-header",
+        # This will create an ssl vhost for certbot.demo
+        self.config.enhance("certbot.demo", "ensure-http-header",
                             "Upgrade-Insecure-Requests")
 
         self.assertTrue("headers_module" in self.config.parser.modules)
 
-        # Get the ssl vhost for letsencrypt.demo
-        ssl_vhost = self.config.assoc["letsencrypt.demo"]
+        # Get the ssl vhost for certbot.demo
+        ssl_vhost = self.config.assoc["certbot.demo"]
 
         # These are not immediately available in find_dir even with save() and
         # load(). They must be found in sites-available
@@ -841,7 +841,7 @@ class MultipleVhostsTest(util.ApacheTest):
         # skip the enable mod
         self.config.parser.modules.add("headers_module")
 
-        # This will create an ssl vhost for letsencrypt.demo
+        # This will create an ssl vhost for certbot.demo
         self.config.enhance("encryption-example.demo", "ensure-http-header",
                             "Upgrade-Insecure-Requests")
 
@@ -850,15 +850,15 @@ class MultipleVhostsTest(util.ApacheTest):
             self.config.enhance, "encryption-example.demo",
             "ensure-http-header", "Upgrade-Insecure-Requests")
 
-    @mock.patch("letsencrypt.le_util.run_script")
-    @mock.patch("letsencrypt.le_util.exe_exists")
+    @mock.patch("certbot.le_util.run_script")
+    @mock.patch("certbot.le_util.exe_exists")
     def test_redirect_well_formed_http(self, mock_exe, _):
         self.config.parser.update_runtime_variables = mock.Mock()
         mock_exe.return_value = True
         self.config.get_version = mock.Mock(return_value=(2, 2))
 
-        # This will create an ssl vhost for letsencrypt.demo
-        self.config.enhance("letsencrypt.demo", "redirect")
+        # This will create an ssl vhost for certbot.demo
+        self.config.enhance("certbot.demo", "redirect")
 
         # These are not immediately available in find_dir even with save() and
         # load(). They must be found in sites-available
@@ -894,8 +894,8 @@ class MultipleVhostsTest(util.ApacheTest):
         # pylint: disable=protected-access
         self.assertTrue(self.config._is_rewrite_engine_on(self.vh_truth[3]))
 
-    @mock.patch("letsencrypt.le_util.run_script")
-    @mock.patch("letsencrypt.le_util.exe_exists")
+    @mock.patch("certbot.le_util.run_script")
+    @mock.patch("certbot.le_util.exe_exists")
     def test_redirect_with_existing_rewrite(self, mock_exe, _):
         self.config.parser.update_runtime_variables = mock.Mock()
         mock_exe.return_value = True
@@ -907,8 +907,8 @@ class MultipleVhostsTest(util.ApacheTest):
                                                    "UnknownTarget"])
         self.config.save()
 
-        # This will create an ssl vhost for letsencrypt.demo
-        self.config.enhance("letsencrypt.demo", "redirect")
+        # This will create an ssl vhost for certbot.demo
+        self.config.enhance("certbot.demo", "redirect")
 
         # These are not immediately available in find_dir even with save() and
         # load(). They must be found in sites-available
@@ -981,7 +981,7 @@ class MultipleVhostsTest(util.ApacheTest):
         normal_target = "RewriteRule ^/(.*) http://www.a.com:1234/$1 [L,R]"
         self.assertFalse(self.config._sift_line(normal_target))
 
-    @mock.patch("letsencrypt_apache.configurator.zope.component.getUtility")
+    @mock.patch("certbot_apache.configurator.zope.component.getUtility")
     def test_make_vhost_ssl_with_existing_rewrite_rule(self, mock_get_utility):
         self.config.parser.modules.add("rewrite_module")
 
@@ -1024,7 +1024,7 @@ class MultipleVhostsTest(util.ApacheTest):
                 challenges.TLSSNI01(
                     token="uqnaPzxtrndteOqtrXb0Asl5gOJfWAnnx6QJyvcmlDU"),
                 "pending"),
-            domain="letsencrypt.demo", account_key=account_key)
+            domain="certbot.demo", account_key=account_key)
 
         return account_key, achall1, achall2
 
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/constants_test.py b/certbot-apache/certbot_apache/tests/constants_test.py
similarity index 75%
rename from letsencrypt-apache/letsencrypt_apache/tests/constants_test.py
rename to certbot-apache/certbot_apache/tests/constants_test.py
index 289b61bb1..d970c96be 100644
--- a/letsencrypt-apache/letsencrypt_apache/tests/constants_test.py
+++ b/certbot-apache/certbot_apache/tests/constants_test.py
@@ -1,26 +1,26 @@
-"""Test for letsencrypt_apache.configurator."""
+"""Test for certbot_apache.configurator."""
 
 import mock
 import unittest
 
-from letsencrypt_apache import constants
+from certbot_apache import constants
 
 
 class ConstantsTest(unittest.TestCase):
 
-    @mock.patch("letsencrypt.le_util.get_os_info")
+    @mock.patch("certbot.le_util.get_os_info")
     def test_get_debian_value(self, os_info):
         os_info.return_value = ('Debian', '', '')
         self.assertEqual(constants.os_constant("vhost_root"),
                          "/etc/apache2/sites-available")
 
-    @mock.patch("letsencrypt.le_util.get_os_info")
+    @mock.patch("certbot.le_util.get_os_info")
     def test_get_centos_value(self, os_info):
         os_info.return_value = ('CentOS Linux', '', '')
         self.assertEqual(constants.os_constant("vhost_root"),
                          "/etc/httpd/conf.d")
 
-    @mock.patch("letsencrypt.le_util.get_os_info")
+    @mock.patch("certbot.le_util.get_os_info")
     def test_get_default_value(self, os_info):
         os_info.return_value = ('Nonexistent Linux', '', '')
         self.assertEqual(constants.os_constant("vhost_root"),
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/display_ops_test.py b/certbot-apache/certbot_apache/tests/display_ops_test.py
similarity index 71%
rename from letsencrypt-apache/letsencrypt_apache/tests/display_ops_test.py
rename to certbot-apache/certbot_apache/tests/display_ops_test.py
index 124ba2f17..fd1e52fde 100644
--- a/letsencrypt-apache/letsencrypt_apache/tests/display_ops_test.py
+++ b/certbot-apache/certbot_apache/tests/display_ops_test.py
@@ -1,20 +1,20 @@
-"""Test letsencrypt_apache.display_ops."""
+"""Test certbot_apache.display_ops."""
 import sys
 import unittest
 
 import mock
 import zope.component
 
-from letsencrypt.display import util as display_util
-from letsencrypt import errors
+from certbot.display import util as display_util
+from certbot import errors
 
-from letsencrypt_apache import obj
+from certbot_apache import obj
 
-from letsencrypt_apache.tests import util
+from certbot_apache.tests import util
 
 
 class SelectVhostTest(unittest.TestCase):
-    """Tests for letsencrypt_apache.display_ops.select_vhost."""
+    """Tests for certbot_apache.display_ops.select_vhost."""
 
     def setUp(self):
         zope.component.provideUtility(display_util.FileDisplay(sys.stdout))
@@ -24,15 +24,15 @@ class SelectVhostTest(unittest.TestCase):
 
     @classmethod
     def _call(cls, vhosts):
-        from letsencrypt_apache.display_ops import select_vhost
+        from certbot_apache.display_ops import select_vhost
         return select_vhost("example.com", vhosts)
 
-    @mock.patch("letsencrypt_apache.display_ops.zope.component.getUtility")
+    @mock.patch("certbot_apache.display_ops.zope.component.getUtility")
     def test_successful_choice(self, mock_util):
         mock_util().menu.return_value = (display_util.OK, 3)
         self.assertEqual(self.vhosts[3], self._call(self.vhosts))
 
-    @mock.patch("letsencrypt_apache.display_ops.zope.component.getUtility")
+    @mock.patch("certbot_apache.display_ops.zope.component.getUtility")
     def test_noninteractive(self, mock_util):
         mock_util().menu.side_effect = errors.MissingCommandlineFlag("no vhost default")
         try:
@@ -40,7 +40,7 @@ class SelectVhostTest(unittest.TestCase):
         except errors.MissingCommandlineFlag as e:
             self.assertTrue("VirtualHost directives" in e.message)
 
-    @mock.patch("letsencrypt_apache.display_ops.zope.component.getUtility")
+    @mock.patch("certbot_apache.display_ops.zope.component.getUtility")
     def test_more_info_cancel(self, mock_util):
         mock_util().menu.side_effect = [
             (display_util.HELP, 1),
@@ -54,9 +54,9 @@ class SelectVhostTest(unittest.TestCase):
     def test_no_vhosts(self):
         self.assertEqual(self._call([]), None)
 
-    @mock.patch("letsencrypt_apache.display_ops.display_util")
-    @mock.patch("letsencrypt_apache.display_ops.zope.component.getUtility")
-    @mock.patch("letsencrypt_apache.display_ops.logger")
+    @mock.patch("certbot_apache.display_ops.display_util")
+    @mock.patch("certbot_apache.display_ops.zope.component.getUtility")
+    @mock.patch("certbot_apache.display_ops.logger")
     def test_small_display(self, mock_logger, mock_util, mock_display_util):
         mock_display_util.WIDTH = 20
         mock_util().menu.return_value = (display_util.OK, 0)
@@ -64,7 +64,7 @@ class SelectVhostTest(unittest.TestCase):
 
         self.assertEqual(mock_logger.debug.call_count, 1)
 
-    @mock.patch("letsencrypt_apache.display_ops.zope.component.getUtility")
+    @mock.patch("certbot_apache.display_ops.zope.component.getUtility")
     def test_multiple_names(self, mock_util):
         mock_util().menu.return_value = (display_util.OK, 5)
 
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/obj_test.py b/certbot-apache/certbot_apache/tests/obj_test.py
similarity index 92%
rename from letsencrypt-apache/letsencrypt_apache/tests/obj_test.py
rename to certbot-apache/certbot_apache/tests/obj_test.py
index a469702f1..4c3d331be 100644
--- a/letsencrypt-apache/letsencrypt_apache/tests/obj_test.py
+++ b/certbot-apache/certbot_apache/tests/obj_test.py
@@ -1,4 +1,4 @@
-"""Tests for letsencrypt_apache.obj."""
+"""Tests for certbot_apache.obj."""
 import unittest
 
 
@@ -6,8 +6,8 @@ class VirtualHostTest(unittest.TestCase):
     """Test the VirtualHost class."""
 
     def setUp(self):
-        from letsencrypt_apache.obj import Addr
-        from letsencrypt_apache.obj import VirtualHost
+        from certbot_apache.obj import Addr
+        from certbot_apache.obj import VirtualHost
 
         self.addr1 = Addr.fromstring("127.0.0.1")
         self.addr2 = Addr.fromstring("127.0.0.1:443")
@@ -33,8 +33,8 @@ class VirtualHostTest(unittest.TestCase):
         self.assertFalse(self.vhost1 != self.vhost1b)
 
     def test_conflicts(self):
-        from letsencrypt_apache.obj import Addr
-        from letsencrypt_apache.obj import VirtualHost
+        from certbot_apache.obj import Addr
+        from certbot_apache.obj import VirtualHost
 
         complex_vh = VirtualHost(
             "fp", "vhp",
@@ -51,7 +51,7 @@ class VirtualHostTest(unittest.TestCase):
                                                 self.addr_default]))
 
     def test_same_server(self):
-        from letsencrypt_apache.obj import VirtualHost
+        from certbot_apache.obj import VirtualHost
         no_name1 = VirtualHost(
             "fp", "vhp", set([self.addr1]), False, False, None)
         no_name2 = VirtualHost(
@@ -74,7 +74,7 @@ class VirtualHostTest(unittest.TestCase):
 class AddrTest(unittest.TestCase):
     """Test obj.Addr."""
     def setUp(self):
-        from letsencrypt_apache.obj import Addr
+        from certbot_apache.obj import Addr
         self.addr = Addr.fromstring("*:443")
 
         self.addr1 = Addr.fromstring("127.0.0.1")
@@ -89,7 +89,7 @@ class AddrTest(unittest.TestCase):
         self.assertTrue(self.addr2.is_wildcard())
 
     def test_get_sni_addr(self):
-        from letsencrypt_apache.obj import Addr
+        from certbot_apache.obj import Addr
         self.assertEqual(
             self.addr.get_sni_addr("443"), Addr.fromstring("*:443"))
         self.assertEqual(
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/parser_test.py b/certbot-apache/certbot_apache/tests/parser_test.py
similarity index 83%
rename from letsencrypt-apache/letsencrypt_apache/tests/parser_test.py
rename to certbot-apache/certbot_apache/tests/parser_test.py
index f4d4660c9..759ae1265 100644
--- a/letsencrypt-apache/letsencrypt_apache/tests/parser_test.py
+++ b/certbot-apache/certbot_apache/tests/parser_test.py
@@ -1,4 +1,4 @@
-"""Tests for letsencrypt_apache.parser."""
+"""Tests for certbot_apache.parser."""
 import os
 import shutil
 import unittest
@@ -6,9 +6,9 @@ import unittest
 import augeas
 import mock
 
-from letsencrypt import errors
+from certbot import errors
 
-from letsencrypt_apache.tests import util
+from certbot_apache.tests import util
 
 
 class BasicParserTest(util.ParserTest):
@@ -31,12 +31,12 @@ class BasicParserTest(util.ParserTest):
     def test_parse_file(self):
         """Test parse_file.
 
-        letsencrypt.conf is chosen as the test file as it will not be
+        certbot.conf is chosen as the test file as it will not be
         included during the normal course of execution.
 
         """
         file_path = os.path.join(
-            self.config_path, "not-parsed-by-default", "letsencrypt.conf")
+            self.config_path, "not-parsed-by-default", "certbot.conf")
 
         self.parser._parse_file(file_path)  # pylint: disable=protected-access
 
@@ -72,7 +72,7 @@ class BasicParserTest(util.ParserTest):
         Path must be valid before attempting to add to augeas
 
         """
-        from letsencrypt_apache.parser import get_aug_path
+        from certbot_apache.parser import get_aug_path
         # This makes sure that find_dir will work
         self.parser.modules.add("mod_ssl.c")
 
@@ -86,7 +86,7 @@ class BasicParserTest(util.ParserTest):
         self.assertTrue("IfModule" in matches[0])
 
     def test_add_dir_to_ifmodssl_multiple(self):
-        from letsencrypt_apache.parser import get_aug_path
+        from certbot_apache.parser import get_aug_path
         # This makes sure that find_dir will work
         self.parser.modules.add("mod_ssl.c")
 
@@ -100,11 +100,11 @@ class BasicParserTest(util.ParserTest):
         self.assertTrue("IfModule" in matches[0])
 
     def test_get_aug_path(self):
-        from letsencrypt_apache.parser import get_aug_path
+        from certbot_apache.parser import get_aug_path
         self.assertEqual("/files/etc/apache", get_aug_path("/etc/apache"))
 
     def test_set_locations(self):
-        with mock.patch("letsencrypt_apache.parser.os.path") as mock_path:
+        with mock.patch("certbot_apache.parser.os.path") as mock_path:
 
             mock_path.isfile.side_effect = [False, False]
 
@@ -114,7 +114,7 @@ class BasicParserTest(util.ParserTest):
             self.assertEqual(results["default"], results["listen"])
             self.assertEqual(results["default"], results["name"])
 
-    @mock.patch("letsencrypt_apache.parser.ApacheParser._get_runtime_cfg")
+    @mock.patch("certbot_apache.parser.ApacheParser._get_runtime_cfg")
     def test_update_runtime_variables(self, mock_cfg):
         mock_cfg.return_value = (
             'ServerRoot: "/etc/apache2"\n'
@@ -139,7 +139,7 @@ class BasicParserTest(util.ParserTest):
         self.parser.update_runtime_variables()
         self.assertEqual(self.parser.variables, expected_vars)
 
-    @mock.patch("letsencrypt_apache.parser.ApacheParser._get_runtime_cfg")
+    @mock.patch("certbot_apache.parser.ApacheParser._get_runtime_cfg")
     def test_update_runtime_vars_bad_output(self, mock_cfg):
         mock_cfg.return_value = "Define: TLS=443=24"
         self.parser.update_runtime_variables()
@@ -148,8 +148,8 @@ class BasicParserTest(util.ParserTest):
         self.assertRaises(
             errors.PluginError, self.parser.update_runtime_variables)
 
-    @mock.patch("letsencrypt_apache.constants.os_constant")
-    @mock.patch("letsencrypt_apache.parser.subprocess.Popen")
+    @mock.patch("certbot_apache.constants.os_constant")
+    @mock.patch("certbot_apache.parser.subprocess.Popen")
     def test_update_runtime_vars_bad_ctl(self, mock_popen, mock_const):
         mock_popen.side_effect = OSError
         mock_const.return_value = "nonexistent"
@@ -157,7 +157,7 @@ class BasicParserTest(util.ParserTest):
             errors.MisconfigurationError,
             self.parser.update_runtime_variables)
 
-    @mock.patch("letsencrypt_apache.parser.subprocess.Popen")
+    @mock.patch("certbot_apache.parser.subprocess.Popen")
     def test_update_runtime_vars_bad_exit(self, mock_popen):
         mock_popen().communicate.return_value = ("", "")
         mock_popen.returncode = -1
@@ -177,9 +177,9 @@ class ParserInitTest(util.ApacheTest):
         shutil.rmtree(self.config_dir)
         shutil.rmtree(self.work_dir)
 
-    @mock.patch("letsencrypt_apache.parser.ApacheParser._get_runtime_cfg")
+    @mock.patch("certbot_apache.parser.ApacheParser._get_runtime_cfg")
     def test_unparsable(self, mock_cfg):
-        from letsencrypt_apache.parser import ApacheParser
+        from certbot_apache.parser import ApacheParser
         mock_cfg.return_value = ('Define: TEST')
         self.assertRaises(
             errors.PluginError,
@@ -187,9 +187,9 @@ class ParserInitTest(util.ApacheTest):
             "/dummy/vhostpath", version=(2, 2, 22))
 
     def test_root_normalized(self):
-        from letsencrypt_apache.parser import ApacheParser
+        from certbot_apache.parser import ApacheParser
 
-        with mock.patch("letsencrypt_apache.parser.ApacheParser."
+        with mock.patch("certbot_apache.parser.ApacheParser."
                         "update_runtime_variables"):
             path = os.path.join(
                 self.temp_dir,
@@ -201,8 +201,8 @@ class ParserInitTest(util.ApacheTest):
         self.assertEqual(parser.root, self.config_path)
 
     def test_root_absolute(self):
-        from letsencrypt_apache.parser import ApacheParser
-        with mock.patch("letsencrypt_apache.parser.ApacheParser."
+        from certbot_apache.parser import ApacheParser
+        with mock.patch("certbot_apache.parser.ApacheParser."
                         "update_runtime_variables"):
             parser = ApacheParser(
                 self.aug, os.path.relpath(self.config_path),
@@ -211,8 +211,8 @@ class ParserInitTest(util.ApacheTest):
         self.assertEqual(parser.root, self.config_path)
 
     def test_root_no_trailing_slash(self):
-        from letsencrypt_apache.parser import ApacheParser
-        with mock.patch("letsencrypt_apache.parser.ApacheParser."
+        from certbot_apache.parser import ApacheParser
+        with mock.patch("certbot_apache.parser.ApacheParser."
                         "update_runtime_variables"):
             parser = ApacheParser(
                 self.aug, self.config_path + os.path.sep,
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/complex_parsing/apache2.conf b/certbot-apache/certbot_apache/tests/testdata/complex_parsing/apache2.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/complex_parsing/apache2.conf
rename to certbot-apache/certbot_apache/tests/testdata/complex_parsing/apache2.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/complex_parsing/conf-enabled/dummy.conf b/certbot-apache/certbot_apache/tests/testdata/complex_parsing/conf-enabled/dummy.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/complex_parsing/conf-enabled/dummy.conf
rename to certbot-apache/certbot_apache/tests/testdata/complex_parsing/conf-enabled/dummy.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/complex_parsing/test_fnmatch.conf b/certbot-apache/certbot_apache/tests/testdata/complex_parsing/test_fnmatch.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/complex_parsing/test_fnmatch.conf
rename to certbot-apache/certbot_apache/tests/testdata/complex_parsing/test_fnmatch.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/complex_parsing/test_variables.conf b/certbot-apache/certbot_apache/tests/testdata/complex_parsing/test_variables.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/complex_parsing/test_variables.conf
rename to certbot-apache/certbot_apache/tests/testdata/complex_parsing/test_variables.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/envvars b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/envvars
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/envvars
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/envvars
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf
similarity index 88%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf
index 2fbfc02a8..e659d4b07 100644
--- a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf
+++ b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf
@@ -16,8 +16,8 @@
 		#   /usr/share/doc/apache2/README.Debian.gz for more info.
 		#   If both key and certificate are stored in the same file, only the
 		#   SSLCertificateFile directive is needed.
-		SSLCertificateFile	/etc/apache2/certs/letsencrypt-cert_5.pem
-		SSLCertificateKeyFile /etc/apache2/ssl/key-letsencrypt_15.pem
+		SSLCertificateFile	/etc/apache2/certs/certbot-cert_5.pem
+		SSLCertificateKeyFile /etc/apache2/ssl/key-certbot_15.pem
 
 		<FilesMatch "\.(cgi|shtml|phtml|php)$">
 				SSLOptions +StdEnvVars
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/sites b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/sites
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/sites
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/sites
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/apache2.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/apache2.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/apache2.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/apache2.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/bad_conf_file.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/bad_conf_file.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/bad_conf_file.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/bad_conf_file.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/other-vhosts-access-log.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/other-vhosts-access-log.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/other-vhosts-access-log.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/other-vhosts-access-log.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/security.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/security.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/security.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/security.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/serve-cgi-bin.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/serve-cgi-bin.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/serve-cgi-bin.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/serve-cgi-bin.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/security.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/security.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/security.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/security.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/serve-cgi-bin.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/serve-cgi-bin.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/serve-cgi-bin.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/serve-cgi-bin.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/envvars b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/envvars
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/envvars
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/envvars
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/authz_svn.load b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/authz_svn.load
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/authz_svn.load
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/authz_svn.load
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav.load b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav.load
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav.load
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav.load
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.load b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.load
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.load
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.load
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/rewrite.load b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/rewrite.load
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/rewrite.load
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/rewrite.load
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.load b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.load
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.load
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.load
diff --git a/letsencrypt-apache/docs/_static/.gitignore b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/.gitignore
similarity index 100%
rename from letsencrypt-apache/docs/_static/.gitignore
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/.gitignore
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/authz_svn.load b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/authz_svn.load
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/authz_svn.load
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/authz_svn.load
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav.load b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav.load
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav.load
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav.load
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.load b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.load
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.load
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.load
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/ports.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/ports.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/ports.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/ports.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/000-default.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/000-default.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/000-default.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/000-default.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/letsencrypt.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/certbot.conf
similarity index 91%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/letsencrypt.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/certbot.conf
index e38fc9f9b..b3147a523 100644
--- a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/letsencrypt.conf
+++ b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/certbot.conf
@@ -1,8 +1,8 @@
 <VirtualHost *:80>
-ServerName letsencrypt.demo
+ServerName certbot.demo
 ServerAdmin webmaster@localhost
 
-DocumentRoot /var/www-letsencrypt-reworld/static/
+DocumentRoot /var/www-certbot-reworld/static/
 <Directory />
 Options FollowSymLinks
 AllowOverride None
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl-port-only.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl-port-only.conf
similarity index 88%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl-port-only.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl-port-only.conf
index 5a50c536e..849b42e9f 100644
--- a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl-port-only.conf
+++ b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl-port-only.conf
@@ -12,8 +12,8 @@
 		#   /usr/share/doc/apache2/README.Debian.gz for more info.
 		#   If both key and certificate are stored in the same file, only the
 		#   SSLCertificateFile directive is needed.
-		SSLCertificateFile	/etc/apache2/certs/letsencrypt-cert_5.pem
-		SSLCertificateKeyFile /etc/apache2/ssl/key-letsencrypt_15.pem
+		SSLCertificateFile	/etc/apache2/certs/certbot-cert_5.pem
+		SSLCertificateKeyFile /etc/apache2/ssl/key-certbot_15.pem
 
 
 		#SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl.conf
similarity index 89%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl.conf
index f1061c928..a3025ae8a 100644
--- a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl.conf
+++ b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl.conf
@@ -16,8 +16,8 @@
 		#   /usr/share/doc/apache2/README.Debian.gz for more info.
 		#   If both key and certificate are stored in the same file, only the
 		#   SSLCertificateFile directive is needed.
-		SSLCertificateFile	/etc/apache2/certs/letsencrypt-cert_5.pem
-		SSLCertificateKeyFile /etc/apache2/ssl/key-letsencrypt_15.pem
+		SSLCertificateFile	/etc/apache2/certs/certbot-cert_5.pem
+		SSLCertificateKeyFile /etc/apache2/ssl/key-certbot_15.pem
 
 
 		#SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/encryption-example.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/encryption-example.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/encryption-example.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/encryption-example.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/mod_macro-example.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/mod_macro-example.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/mod_macro-example.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/mod_macro-example.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/wildcard.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/wildcard.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/wildcard.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/wildcard.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/000-default.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/000-default.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/000-default.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/000-default.conf
diff --git a/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/certbot.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/certbot.conf
new file mode 120000
index 000000000..4d08c763f
--- /dev/null
+++ b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/certbot.conf
@@ -0,0 +1 @@
+../sites-available/certbot.conf
\ No newline at end of file
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/encryption-example.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/encryption-example.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/encryption-example.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/encryption-example.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/mod_macro-example.conf b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/mod_macro-example.conf
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/mod_macro-example.conf
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/mod_macro-example.conf
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/sites b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/sites
similarity index 56%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/sites
rename to certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/sites
index 3e73390fd..06bf6a2ae 100644
--- a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/sites
+++ b/certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/sites
@@ -1,2 +1,2 @@
-sites-available/letsencrypt.conf, letsencrypt.demo
+sites-available/certbot.conf, certbot.demo
 sites-available/encryption-example.conf, encryption-example.demo
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/tls_sni_01_test.py b/certbot-apache/certbot_apache/tests/tls_sni_01_test.py
similarity index 91%
rename from letsencrypt-apache/letsencrypt_apache/tests/tls_sni_01_test.py
rename to certbot-apache/certbot_apache/tests/tls_sni_01_test.py
index 9681bf9fc..17ef92004 100644
--- a/letsencrypt-apache/letsencrypt_apache/tests/tls_sni_01_test.py
+++ b/certbot-apache/certbot_apache/tests/tls_sni_01_test.py
@@ -1,13 +1,13 @@
-"""Test for letsencrypt_apache.tls_sni_01."""
+"""Test for certbot_apache.tls_sni_01."""
 import unittest
 import shutil
 
 import mock
 
-from letsencrypt.plugins import common_test
+from certbot.plugins import common_test
 
-from letsencrypt_apache import obj
-from letsencrypt_apache.tests import util
+from certbot_apache import obj
+from certbot_apache.tests import util
 
 from six.moves import xrange  # pylint: disable=redefined-builtin, import-error
 
@@ -25,7 +25,7 @@ class TlsSniPerformTest(util.ApacheTest):
             self.config_path, self.vhost_path, self.config_dir, self.work_dir)
         config.config.tls_sni_01_port = 443
 
-        from letsencrypt_apache import tls_sni_01
+        from certbot_apache import tls_sni_01
         self.sni = tls_sni_01.ApacheTlsSni01(config)
 
     def tearDown(self):
@@ -37,8 +37,8 @@ class TlsSniPerformTest(util.ApacheTest):
         resp = self.sni.perform()
         self.assertEqual(len(resp), 0)
 
-    @mock.patch("letsencrypt.le_util.exe_exists")
-    @mock.patch("letsencrypt.le_util.run_script")
+    @mock.patch("certbot.le_util.exe_exists")
+    @mock.patch("certbot.le_util.run_script")
     def test_perform1(self, _, mock_exists):
         mock_register = mock.Mock()
         self.sni.configurator.reverter.register_undo_command = mock_register
@@ -80,7 +80,7 @@ class TlsSniPerformTest(util.ApacheTest):
         # pylint: disable=protected-access
         self.sni._setup_challenge_cert = mock_setup_cert
 
-        with mock.patch("letsencrypt_apache.configurator.ApacheConfigurator.enable_mod"):
+        with mock.patch("certbot_apache.configurator.ApacheConfigurator.enable_mod"):
             sni_responses = self.sni.perform()
 
         self.assertEqual(mock_setup_cert.call_count, 2)
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/util.py b/certbot-apache/certbot_apache/tests/util.py
similarity index 87%
rename from letsencrypt-apache/letsencrypt_apache/tests/util.py
rename to certbot-apache/certbot_apache/tests/util.py
index 2fbfd70c6..9fb5dcdfa 100644
--- a/letsencrypt-apache/letsencrypt_apache/tests/util.py
+++ b/certbot-apache/certbot_apache/tests/util.py
@@ -1,4 +1,4 @@
-"""Common utilities for letsencrypt_apache."""
+"""Common utilities for certbot_apache."""
 import os
 import sys
 import unittest
@@ -9,15 +9,15 @@ import zope.component
 
 from acme import jose
 
-from letsencrypt.display import util as display_util
+from certbot.display import util as display_util
 
-from letsencrypt.plugins import common
+from certbot.plugins import common
 
-from letsencrypt.tests import test_util
+from certbot.tests import test_util
 
-from letsencrypt_apache import configurator
-from letsencrypt_apache import constants
-from letsencrypt_apache import obj
+from certbot_apache import configurator
+from certbot_apache import constants
+from certbot_apache import obj
 
 
 class ApacheTest(unittest.TestCase):  # pylint: disable=too-few-public-methods
@@ -30,7 +30,7 @@ class ApacheTest(unittest.TestCase):  # pylint: disable=too-few-public-methods
 
         self.temp_dir, self.config_dir, self.work_dir = common.dir_setup(
             test_dir=test_dir,
-            pkg="letsencrypt_apache.tests")
+            pkg="certbot_apache.tests")
 
         self.ssl_options = common.setup_ssl_options(
             self.config_dir, constants.os_constant("MOD_SSL_CONF_SRC"),
@@ -66,10 +66,10 @@ class ParserTest(ApacheTest):  # pytlint: disable=too-few-public-methods
 
         zope.component.provideUtility(display_util.FileDisplay(sys.stdout))
 
-        from letsencrypt_apache.parser import ApacheParser
+        from certbot_apache.parser import ApacheParser
         self.aug = augeas.Augeas(
             flags=augeas.Augeas.NONE | augeas.Augeas.NO_MODL_AUTOLOAD)
-        with mock.patch("letsencrypt_apache.parser.ApacheParser."
+        with mock.patch("certbot_apache.parser.ApacheParser."
                         "update_runtime_variables"):
             self.parser = ApacheParser(
                 self.aug, self.config_path, self.vhost_path)
@@ -95,11 +95,11 @@ def get_apache_configurator(
         in_progress_dir=os.path.join(backups, "IN_PROGRESS"),
         work_dir=work_dir)
 
-    with mock.patch("letsencrypt_apache.configurator.le_util.run_script"):
-        with mock.patch("letsencrypt_apache.configurator.le_util."
+    with mock.patch("certbot_apache.configurator.le_util.run_script"):
+        with mock.patch("certbot_apache.configurator.le_util."
                         "exe_exists") as mock_exe_exists:
             mock_exe_exists.return_value = True
-            with mock.patch("letsencrypt_apache.parser.ApacheParser."
+            with mock.patch("certbot_apache.parser.ApacheParser."
                             "update_runtime_variables"):
                 config = configurator.ApacheConfigurator(
                     config=mock_le_config,
@@ -137,10 +137,10 @@ def get_vh_truth(temp_dir, config_name):
                      obj.Addr.fromstring("[::]:80")]),
                 False, True, "ip-172-30-0-17"),
             obj.VirtualHost(
-                os.path.join(prefix, "letsencrypt.conf"),
-                os.path.join(aug_pre, "letsencrypt.conf/VirtualHost"),
+                os.path.join(prefix, "certbot.conf"),
+                os.path.join(aug_pre, "certbot.conf/VirtualHost"),
                 set([obj.Addr.fromstring("*:80")]), False, True,
-                "letsencrypt.demo"),
+                "certbot.demo"),
             obj.VirtualHost(
                 os.path.join(prefix, "mod_macro-example.conf"),
                 os.path.join(aug_pre,
diff --git a/letsencrypt-apache/letsencrypt_apache/tls_sni_01.py b/certbot-apache/certbot_apache/tls_sni_01.py
similarity index 98%
rename from letsencrypt-apache/letsencrypt_apache/tls_sni_01.py
rename to certbot-apache/certbot_apache/tls_sni_01.py
index 9316427e5..1236c2eb9 100644
--- a/letsencrypt-apache/letsencrypt_apache/tls_sni_01.py
+++ b/certbot-apache/certbot_apache/tls_sni_01.py
@@ -3,10 +3,10 @@
 import os
 import logging
 
-from letsencrypt.plugins import common
+from certbot.plugins import common
 
-from letsencrypt_apache import obj
-from letsencrypt_apache import parser
+from certbot_apache import obj
+from certbot_apache import parser
 
 logger = logging.getLogger(__name__)
 
diff --git a/letsencrypt-apache/docs/.gitignore b/certbot-apache/docs/.gitignore
similarity index 100%
rename from letsencrypt-apache/docs/.gitignore
rename to certbot-apache/docs/.gitignore
diff --git a/letsencrypt-apache/docs/Makefile b/certbot-apache/docs/Makefile
similarity index 96%
rename from letsencrypt-apache/docs/Makefile
rename to certbot-apache/docs/Makefile
index 9bf5154fe..0e611ecec 100644
--- a/letsencrypt-apache/docs/Makefile
+++ b/certbot-apache/docs/Makefile
@@ -87,9 +87,9 @@ qthelp:
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
 	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/letsencrypt-apache.qhcp"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/certbot-apache.qhcp"
 	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/letsencrypt-apache.qhc"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/certbot-apache.qhc"
 
 applehelp:
 	$(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
@@ -104,8 +104,8 @@ devhelp:
 	@echo
 	@echo "Build finished."
 	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/letsencrypt-apache"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/letsencrypt-apache"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/certbot-apache"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/certbot-apache"
 	@echo "# devhelp"
 
 epub:
diff --git a/letsencrypt-apache/docs/_templates/.gitignore b/certbot-apache/docs/_static/.gitignore
similarity index 100%
rename from letsencrypt-apache/docs/_templates/.gitignore
rename to certbot-apache/docs/_static/.gitignore
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/.gitignore b/certbot-apache/docs/_templates/.gitignore
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/.gitignore
rename to certbot-apache/docs/_templates/.gitignore
diff --git a/letsencrypt-apache/docs/api.rst b/certbot-apache/docs/api.rst
similarity index 100%
rename from letsencrypt-apache/docs/api.rst
rename to certbot-apache/docs/api.rst
diff --git a/certbot-apache/docs/api/augeas_configurator.rst b/certbot-apache/docs/api/augeas_configurator.rst
new file mode 100644
index 000000000..b47ffbc6b
--- /dev/null
+++ b/certbot-apache/docs/api/augeas_configurator.rst
@@ -0,0 +1,5 @@
+:mod:`certbot_apache.augeas_configurator`
+---------------------------------------------
+
+.. automodule:: certbot_apache.augeas_configurator
+   :members:
diff --git a/certbot-apache/docs/api/configurator.rst b/certbot-apache/docs/api/configurator.rst
new file mode 100644
index 000000000..8ec266d1a
--- /dev/null
+++ b/certbot-apache/docs/api/configurator.rst
@@ -0,0 +1,5 @@
+:mod:`certbot_apache.configurator`
+--------------------------------------
+
+.. automodule:: certbot_apache.configurator
+   :members:
diff --git a/certbot-apache/docs/api/display_ops.rst b/certbot-apache/docs/api/display_ops.rst
new file mode 100644
index 000000000..26d3ed3dc
--- /dev/null
+++ b/certbot-apache/docs/api/display_ops.rst
@@ -0,0 +1,5 @@
+:mod:`certbot_apache.display_ops`
+-------------------------------------
+
+.. automodule:: certbot_apache.display_ops
+   :members:
diff --git a/certbot-apache/docs/api/obj.rst b/certbot-apache/docs/api/obj.rst
new file mode 100644
index 000000000..82e58df3f
--- /dev/null
+++ b/certbot-apache/docs/api/obj.rst
@@ -0,0 +1,5 @@
+:mod:`certbot_apache.obj`
+-----------------------------
+
+.. automodule:: certbot_apache.obj
+   :members:
diff --git a/certbot-apache/docs/api/parser.rst b/certbot-apache/docs/api/parser.rst
new file mode 100644
index 000000000..3427735be
--- /dev/null
+++ b/certbot-apache/docs/api/parser.rst
@@ -0,0 +1,5 @@
+:mod:`certbot_apache.parser`
+--------------------------------
+
+.. automodule:: certbot_apache.parser
+   :members:
diff --git a/certbot-apache/docs/api/tls_sni_01.rst b/certbot-apache/docs/api/tls_sni_01.rst
new file mode 100644
index 000000000..3ecd0a365
--- /dev/null
+++ b/certbot-apache/docs/api/tls_sni_01.rst
@@ -0,0 +1,5 @@
+:mod:`certbot_apache.tls_sni_01`
+------------------------------------
+
+.. automodule:: certbot_apache.tls_sni_01
+   :members:
diff --git a/letsencrypt-apache/docs/conf.py b/certbot-apache/docs/conf.py
similarity index 94%
rename from letsencrypt-apache/docs/conf.py
rename to certbot-apache/docs/conf.py
index aa58038cd..b7faa7b26 100644
--- a/letsencrypt-apache/docs/conf.py
+++ b/certbot-apache/docs/conf.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# letsencrypt-apache documentation build configuration file, created by
+# certbot-apache documentation build configuration file, created by
 # sphinx-quickstart on Sun Oct 18 13:39:26 2015.
 #
 # This file is execfile()d with the current directory set to its
@@ -65,7 +65,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'letsencrypt-apache'
+project = u'certbot-apache'
 copyright = u'2014-2015, Let\'s Encrypt Project'
 author = u'Let\'s Encrypt Project'
 
@@ -227,7 +227,7 @@ html_static_path = ['_static']
 #html_search_scorer = 'scorer.js'
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'letsencrypt-apachedoc'
+htmlhelp_basename = 'certbot-apachedoc'
 
 # -- Options for LaTeX output ---------------------------------------------
 
@@ -249,7 +249,7 @@ latex_elements = {
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'letsencrypt-apache.tex', u'letsencrypt-apache Documentation',
+    (master_doc, 'certbot-apache.tex', u'certbot-apache Documentation',
      u'Let\'s Encrypt Project', 'manual'),
 ]
 
@@ -279,7 +279,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'letsencrypt-apache', u'letsencrypt-apache Documentation',
+    (master_doc, 'certbot-apache', u'certbot-apache Documentation',
      [author], 1)
 ]
 
@@ -293,8 +293,8 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'letsencrypt-apache', u'letsencrypt-apache Documentation',
-     author, 'letsencrypt-apache', 'One line description of project.',
+    (master_doc, 'certbot-apache', u'certbot-apache Documentation',
+     author, 'certbot-apache', 'One line description of project.',
      'Miscellaneous'),
 ]
 
@@ -314,5 +314,5 @@ texinfo_documents = [
 intersphinx_mapping = {
     'python': ('https://docs.python.org/', None),
     'acme': ('https://acme-python.readthedocs.org/en/latest/', None),
-    'letsencrypt': ('https://letsencrypt.readthedocs.org/en/latest/', None),
+    'certbot': ('https://letsencrypt.readthedocs.org/en/latest/', None),
 }
diff --git a/letsencrypt-apache/docs/index.rst b/certbot-apache/docs/index.rst
similarity index 74%
rename from letsencrypt-apache/docs/index.rst
rename to certbot-apache/docs/index.rst
index f968ccbef..bfe4d245c 100644
--- a/letsencrypt-apache/docs/index.rst
+++ b/certbot-apache/docs/index.rst
@@ -1,9 +1,9 @@
-.. letsencrypt-apache documentation master file, created by
+.. certbot-apache documentation master file, created by
    sphinx-quickstart on Sun Oct 18 13:39:26 2015.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Welcome to letsencrypt-apache's documentation!
+Welcome to certbot-apache's documentation!
 ==============================================
 
 Contents:
@@ -18,7 +18,7 @@ Contents:
    api
 
 
-.. automodule:: letsencrypt_apache
+.. automodule:: certbot_apache
    :members:
 
 
diff --git a/letsencrypt-apache/docs/make.bat b/certbot-apache/docs/make.bat
similarity index 97%
rename from letsencrypt-apache/docs/make.bat
rename to certbot-apache/docs/make.bat
index 62a54fd2c..3a7818940 100644
--- a/letsencrypt-apache/docs/make.bat
+++ b/certbot-apache/docs/make.bat
@@ -127,9 +127,9 @@ if "%1" == "qthelp" (
 	echo.
 	echo.Build finished; now you can run "qcollectiongenerator" with the ^
 .qhcp project file in %BUILDDIR%/qthelp, like this:
-	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\letsencrypt-apache.qhcp
+	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\certbot-apache.qhcp
 	echo.To view the help file:
-	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\letsencrypt-apache.ghc
+	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\certbot-apache.ghc
 	goto end
 )
 
diff --git a/letsencrypt-apache/readthedocs.org.requirements.txt b/certbot-apache/readthedocs.org.requirements.txt
similarity index 94%
rename from letsencrypt-apache/readthedocs.org.requirements.txt
rename to certbot-apache/readthedocs.org.requirements.txt
index 7855b5ce2..fe30ab1dc 100644
--- a/letsencrypt-apache/readthedocs.org.requirements.txt
+++ b/certbot-apache/readthedocs.org.requirements.txt
@@ -9,4 +9,4 @@
 
 -e acme
 -e .
--e letsencrypt-apache[docs]
+-e certbot-apache[docs]
diff --git a/letsencrypt-apache/setup.py b/certbot-apache/setup.py
similarity index 89%
rename from letsencrypt-apache/setup.py
rename to certbot-apache/setup.py
index c2ec7dabd..28ad4cbda 100644
--- a/letsencrypt-apache/setup.py
+++ b/certbot-apache/setup.py
@@ -9,7 +9,7 @@ version = '0.6.0.dev0'
 # Please update tox.ini when modifying dependency version requirements
 install_requires = [
     'acme=={0}'.format(version),
-    'letsencrypt=={0}'.format(version),
+    'certbot=={0}'.format(version),
     'python-augeas',
     # For pkg_resources. >=1.0 so pip resolves it to a version cryptography
     # will tolerate; see #2599:
@@ -29,7 +29,7 @@ docs_extras = [
 ]
 
 setup(
-    name='letsencrypt-apache',
+    name='certbot-apache',
     version=version,
     description="Apache plugin for Let's Encrypt client",
     url='https://github.com/letsencrypt/letsencrypt',
@@ -61,9 +61,9 @@ setup(
         'docs': docs_extras,
     },
     entry_points={
-        'letsencrypt.plugins': [
-            'apache = letsencrypt_apache.configurator:ApacheConfigurator',
+        'certbot.plugins': [
+            'apache = certbot_apache.configurator:ApacheConfigurator',
         ],
     },
-    test_suite='letsencrypt_apache',
+    test_suite='certbot_apache',
 )
diff --git a/letsencrypt-apache/MANIFEST.in b/letsencrypt-apache/MANIFEST.in
deleted file mode 100644
index bdb67199f..000000000
--- a/letsencrypt-apache/MANIFEST.in
+++ /dev/null
@@ -1,7 +0,0 @@
-include LICENSE.txt
-include README.rst
-recursive-include docs *
-recursive-include letsencrypt_apache/tests/testdata *
-include letsencrypt_apache/centos-options-ssl-apache.conf
-include letsencrypt_apache/options-ssl-apache.conf
-recursive-include letsencrypt_apache/augeas_lens *.aug
diff --git a/letsencrypt-apache/docs/api/augeas_configurator.rst b/letsencrypt-apache/docs/api/augeas_configurator.rst
deleted file mode 100644
index 3b1821e3d..000000000
--- a/letsencrypt-apache/docs/api/augeas_configurator.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-:mod:`letsencrypt_apache.augeas_configurator`
----------------------------------------------
-
-.. automodule:: letsencrypt_apache.augeas_configurator
-   :members:
diff --git a/letsencrypt-apache/docs/api/configurator.rst b/letsencrypt-apache/docs/api/configurator.rst
deleted file mode 100644
index 2ed613286..000000000
--- a/letsencrypt-apache/docs/api/configurator.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-:mod:`letsencrypt_apache.configurator`
---------------------------------------
-
-.. automodule:: letsencrypt_apache.configurator
-   :members:
diff --git a/letsencrypt-apache/docs/api/display_ops.rst b/letsencrypt-apache/docs/api/display_ops.rst
deleted file mode 100644
index 59ff9d15e..000000000
--- a/letsencrypt-apache/docs/api/display_ops.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-:mod:`letsencrypt_apache.display_ops`
--------------------------------------
-
-.. automodule:: letsencrypt_apache.display_ops
-   :members:
diff --git a/letsencrypt-apache/docs/api/obj.rst b/letsencrypt-apache/docs/api/obj.rst
deleted file mode 100644
index 969293ca1..000000000
--- a/letsencrypt-apache/docs/api/obj.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-:mod:`letsencrypt_apache.obj`
------------------------------
-
-.. automodule:: letsencrypt_apache.obj
-   :members:
diff --git a/letsencrypt-apache/docs/api/parser.rst b/letsencrypt-apache/docs/api/parser.rst
deleted file mode 100644
index 0c998e06c..000000000
--- a/letsencrypt-apache/docs/api/parser.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-:mod:`letsencrypt_apache.parser`
---------------------------------
-
-.. automodule:: letsencrypt_apache.parser
-   :members:
diff --git a/letsencrypt-apache/docs/api/tls_sni_01.rst b/letsencrypt-apache/docs/api/tls_sni_01.rst
deleted file mode 100644
index 2c11a3394..000000000
--- a/letsencrypt-apache/docs/api/tls_sni_01.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-:mod:`letsencrypt_apache.tls_sni_01`
-------------------------------------
-
-.. automodule:: letsencrypt_apache.tls_sni_01
-   :members:
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/NEEDED.txt b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/NEEDED.txt
deleted file mode 100644
index b51956b0c..000000000
--- a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/NEEDED.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Issues for which some kind of test case should be constructable, but we do not
-currently have one:
-
-https://github.com/letsencrypt/letsencrypt/issues/1213
-https://github.com/letsencrypt/letsencrypt/issues/1602
-
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/letsencrypt.conf b/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/letsencrypt.conf
deleted file mode 120000
index f31102913..000000000
--- a/letsencrypt-apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/letsencrypt.conf
+++ /dev/null
@@ -1 +0,0 @@
-../sites-available/letsencrypt.conf
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 8f16b71d1..5d1bc5801 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,8 +17,8 @@ commands =
     nosetests -v acme
     pip install -e .[dev]
     nosetests -v certbot
-    pip install -e letsencrypt-apache
-    nosetests -v letsencrypt_apache
+    pip install -e certbot-apache
+    nosetests -v certbot_apache
     pip install -e letsencrypt-nginx
     nosetests -v letsencrypt_nginx
     pip install -e letshelp-letsencrypt
@@ -54,7 +54,7 @@ commands =
 [testenv:cover]
 basepython = python2.7
 commands =
-    pip install -e acme[dev] -e .[dev] -e letsencrypt-apache -e letsencrypt-nginx -e letshelp-letsencrypt
+    pip install -e acme[dev] -e .[dev] -e certbot-apache -e letsencrypt-nginx -e letshelp-letsencrypt
     ./tox.cover.sh
 
 [testenv:lint]
@@ -64,11 +64,11 @@ basepython = python2.7
 # duplicate code checking; if one of the commands fails, others will
 # continue, but tox return code will reflect previous error
 commands =
-    pip install -e acme[dev] -e .[dev] -e letsencrypt-apache -e letsencrypt-nginx -e letsencrypt-compatibility-test -e letshelp-letsencrypt
+    pip install -e acme[dev] -e .[dev] -e certbot-apache -e letsencrypt-nginx -e letsencrypt-compatibility-test -e letshelp-letsencrypt
     ./pep8.travis.sh
     pylint --rcfile=.pylintrc certbot
     pylint --rcfile=acme/.pylintrc acme/acme
-    pylint --rcfile=.pylintrc letsencrypt-apache/letsencrypt_apache
+    pylint --rcfile=.pylintrc certbot-apache/certbot_apache
     pylint --rcfile=.pylintrc letsencrypt-nginx/letsencrypt_nginx
     pylint --rcfile=.pylintrc letsencrypt-compatibility-test/letsencrypt_compatibility_test
     pylint --rcfile=.pylintrc letshelp-letsencrypt/letshelp_letsencrypt
@@ -76,8 +76,8 @@ commands =
 [testenv:apacheconftest]
 #basepython = python2.7
 commands =
-    pip install -e acme -e .[dev] -e letsencrypt-apache -e letsencrypt-nginx -e letsencrypt-compatibility-test -e letshelp-letsencrypt
-    {toxinidir}/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/apache-conf-test --debian-modules
+    pip install -e acme -e .[dev] -e certbot-apache -e letsencrypt-nginx -e letsencrypt-compatibility-test -e letshelp-letsencrypt
+    {toxinidir}/certbot-apache/certbot_apache/tests/apache-conf-files/apache-conf-test --debian-modules
 
 
 [testenv:le_auto]