diff --git a/acme/setup.py b/acme/setup.py
index 72c751dca..cbd3bfb87 100644
--- a/acme/setup.py
+++ b/acme/setup.py
@@ -53,7 +53,7 @@ setup(
     version=version,
     description='ACME protocol implementation in Python',
     url='https://github.com/letsencrypt/letsencrypt',
-    author="Electronic Frontier Foundation",
+    author="Certbot Project",
     author_email='client-dev@letsencrypt.org',
     license='Apache License 2.0',
     classifiers=[
diff --git a/certbot-apache/setup.py b/certbot-apache/setup.py
index 89373800c..7358c7041 100644
--- a/certbot-apache/setup.py
+++ b/certbot-apache/setup.py
@@ -33,7 +33,7 @@ setup(
     version=version,
     description="Apache plugin for Certbot",
     url='https://github.com/letsencrypt/letsencrypt',
-    author="Electronic Frontier Foundation",
+    author="Certbot Project",
     author_email='client-dev@letsencrypt.org',
     license='Apache License 2.0',
     classifiers=[
diff --git a/certbot-compatibility-test/setup.py b/certbot-compatibility-test/setup.py
index 51704fda5..c62a10f89 100644
--- a/certbot-compatibility-test/setup.py
+++ b/certbot-compatibility-test/setup.py
@@ -35,7 +35,7 @@ setup(
     version=version,
     description="Compatibility tests for Certbot",
     url='https://github.com/letsencrypt/letsencrypt',
-    author="Electronic Frontier Foundation",
+    author="Certbot Project",
     author_email='client-dev@letsencrypt.org',
     license='Apache License 2.0',
     classifiers=[
diff --git a/certbot-nginx/setup.py b/certbot-nginx/setup.py
index 7c07ff4a0..0e5c27a0a 100644
--- a/certbot-nginx/setup.py
+++ b/certbot-nginx/setup.py
@@ -33,7 +33,7 @@ setup(
     version=version,
     description="Nginx plugin for Certbot",
     url='https://github.com/letsencrypt/letsencrypt',
-    author="Electronic Frontier Foundation",
+    author="Certbot Project",
     author_email='client-dev@letsencrypt.org',
     license='Apache License 2.0',
     classifiers=[
diff --git a/letshelp-certbot/setup.py b/letshelp-certbot/setup.py
index e625b288c..8359d2766 100644
--- a/letshelp-certbot/setup.py
+++ b/letshelp-certbot/setup.py
@@ -24,7 +24,7 @@ setup(
     version=version,
     description="Let's help Certbot client",
     url='https://github.com/letsencrypt/letsencrypt',
-    author="Electronic Frontier Foundation",
+    author="Certbot Project",
     author_email='client-dev@letsencrypt.org',
     license='Apache License 2.0',
     classifiers=[
diff --git a/setup.py b/setup.py
index a21c43946..67cefdc48 100644
--- a/setup.py
+++ b/setup.py
@@ -90,7 +90,7 @@ setup(
     description="ACME client",
     long_description=readme,  # later: + '\n\n' + changes
     url='https://github.com/letsencrypt/letsencrypt',
-    author="Electronic Frontier Foundation",
+    author="Certbot Project",
     author_email='client-dev@letsencrypt.org',
     license='Apache License 2.0',
     classifiers=[