diff --git a/zuul/lib/connections.py b/zuul/lib/connections.py
index cb26ba5..92ddb0f 100644
--- a/zuul/lib/connections.py
+++ b/zuul/lib/connections.py
@@ -56,11 +56,11 @@
     if 'gerrit' in config.sections():
         connections['gerrit'] = \
             zuul.connection.gerrit.GerritConnection(
-                '_legacy_gerrit', dict(config.items('gerrit')))
+                'gerrit', dict(config.items('gerrit')))
 
     if 'smtp' in config.sections():
         connections['smtp'] = \
             zuul.connection.smtp.SMTPConnection(
-                '_legacy_smtp', dict(config.items('smtp')))
+                'smtp', dict(config.items('smtp')))
 
     return connections