diff --git a/certbot-apache/README.rst b/certbot-apache/README.rst
index 3505fd594..96a6ff8ae 100644
--- a/certbot-apache/README.rst
+++ b/certbot-apache/README.rst
@@ -1 +1 @@
-Apache plugin for Let's Encrypt client
+Apache plugin for Certbot
diff --git a/certbot-apache/certbot_apache/__init__.py b/certbot-apache/certbot_apache/__init__.py
index c0d1e0d52..9c195ccc7 100644
--- a/certbot-apache/certbot_apache/__init__.py
+++ b/certbot-apache/certbot_apache/__init__.py
@@ -1 +1 @@
-"""Let's Encrypt Apache plugin."""
+"""Certbot Apache plugin."""
diff --git a/certbot-apache/certbot_apache/augeas_lens/README b/certbot-apache/certbot_apache/augeas_lens/README
index f801efd43..bf9161f93 100644
--- a/certbot-apache/certbot_apache/augeas_lens/README
+++ b/certbot-apache/certbot_apache/augeas_lens/README
@@ -1,2 +1,2 @@
-Let's Encrypt includes the very latest Augeas lenses in order to ship bug fixes 
+Certbot includes the very latest Augeas lenses in order to ship bug fixes 
 to Apache configuration handling bugs as quickly as possible
diff --git a/certbot-apache/certbot_apache/configurator.py b/certbot-apache/certbot_apache/configurator.py
index 5681373b6..0873edd24 100644
--- a/certbot-apache/certbot_apache/configurator.py
+++ b/certbot-apache/certbot_apache/configurator.py
@@ -1154,7 +1154,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
             for matches in rewrite_args_dict.values():
                 if [self.aug.get(x) for x in matches] in redirect_args:
                     raise errors.PluginEnhancementAlreadyPresent(
-                        "Let's Encrypt has already enabled redirection")
+                        "Certbot has already enabled redirection")
 
     def _is_rewrite_exists(self, vhost):
         """Checks if there exists a RewriteRule directive in vhost
@@ -1635,7 +1635,7 @@ def get_file_path(vhost_path):
 
 def install_ssl_options_conf(options_ssl):
     """
-    Copy Let's Encrypt's SSL options file into the system's config dir if
+    Copy Certbot's SSL options file into the system's config dir if
     required.
     """
     # XXX if we ever try to enforce a local privilege boundary (eg, running
diff --git a/certbot-apache/certbot_apache/tests/__init__.py b/certbot-apache/certbot_apache/tests/__init__.py
index 2c0849a3d..7e7d39fa4 100644
--- a/certbot-apache/certbot_apache/tests/__init__.py
+++ b/certbot-apache/certbot_apache/tests/__init__.py
@@ -1 +1 @@
-"""Let's Encrypt Apache Tests"""
+"""Certbot Apache Tests"""
diff --git a/certbot-apache/certbot_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
index 8da335d35..d81fe132d 100644
--- a/certbot-apache/certbot_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
@@ -1,5 +1,5 @@
 <VirtualHost *:80>
-        # How well does Let's Encrypt work without a ServerName/Alias?
+        # How well does Certbot work without a ServerName/Alias?
 	ServerAdmin webmaster@localhost
 	DocumentRoot /var/www/html
 
diff --git a/certbot-apache/setup.py b/certbot-apache/setup.py
index 28ad4cbda..89373800c 100644
--- a/certbot-apache/setup.py
+++ b/certbot-apache/setup.py
@@ -31,9 +31,9 @@ docs_extras = [
 setup(
     name='certbot-apache',
     version=version,
-    description="Apache plugin for Let's Encrypt client",
+    description="Apache plugin for Certbot",
     url='https://github.com/letsencrypt/letsencrypt',
-    author="Let's Encrypt Project",
+    author="Electronic Frontier Foundation",
     author_email='client-dev@letsencrypt.org',
     license='Apache License 2.0',
     classifiers=[