diff --git a/letsencrypt-apache/letsencrypt_apache/dvsni.py b/letsencrypt-apache/letsencrypt_apache/dvsni.py
index ed88bf8a7..02ae34150 100644
--- a/letsencrypt-apache/letsencrypt_apache/dvsni.py
+++ b/letsencrypt-apache/letsencrypt_apache/dvsni.py
@@ -62,7 +62,7 @@ class ApacheDvsni(common.Dvsni):
 
         # Prepare the server for HTTPS
         self.configurator.prepare_server_https(
-            str(self.configurator.config.dvsni_port), True)
+            str(self.configurator.config.tls_sni_01_port), True)
 
         responses = []
 
@@ -114,14 +114,15 @@ class ApacheDvsni(common.Dvsni):
 
         # TODO: Checkout _default_ rules.
         dvsni_addrs = set()
-        default_addr = obj.Addr(("*", str(self.configurator.config.dvsni_port)))
+        default_addr = obj.Addr(("*", str(
+            self.configurator.config.tls_sni_01_port)))
 
         for addr in vhost.addrs:
             if "_default_" == addr.get_addr():
                 dvsni_addrs.add(default_addr)
             else:
                 dvsni_addrs.add(
-                    addr.get_sni_addr(self.configurator.config.dvsni_port))
+                    addr.get_sni_addr(self.configurator.config.tls_sni_01_port))
 
         return dvsni_addrs
 
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/dvsni_test.py b/letsencrypt-apache/letsencrypt_apache/tests/dvsni_test.py
index c362d4115..6cb93e0ca 100644
--- a/letsencrypt-apache/letsencrypt_apache/tests/dvsni_test.py
+++ b/letsencrypt-apache/letsencrypt_apache/tests/dvsni_test.py
@@ -21,7 +21,7 @@ class DvsniPerformTest(util.ApacheTest):
 
         config = util.get_apache_configurator(
             self.config_path, self.config_dir, self.work_dir)
-        config.config.dvsni_port = 443
+        config.config.tls_sni_01_port = 443
 
         from letsencrypt_apache import dvsni
         self.sni = dvsni.ApacheDvsni(config)
diff --git a/letsencrypt-nginx/letsencrypt_nginx/configurator.py b/letsencrypt-nginx/letsencrypt_nginx/configurator.py
index 29e69e498..80b4ebc5d 100644
--- a/letsencrypt-nginx/letsencrypt_nginx/configurator.py
+++ b/letsencrypt-nginx/letsencrypt_nginx/configurator.py
@@ -297,7 +297,7 @@ class NginxConfigurator(common.Plugin):
         """Make a server SSL.
 
         Make a server SSL based on server_name and filename by adding a
-        ``listen IConfig.dvsni_port ssl`` directive to the server block.
+        ``listen IConfig.tls_sni_01_port ssl`` directive to the server block.
 
         .. todo:: Maybe this should create a new block instead of modifying
             the existing one?
@@ -307,7 +307,7 @@ class NginxConfigurator(common.Plugin):
 
         """
         snakeoil_cert, snakeoil_key = self._get_snakeoil_paths()
-        ssl_block = [['listen', '{0} ssl'.format(self.config.dvsni_port)],
+        ssl_block = [['listen', '{0} ssl'.format(self.config.tls_sni_01_port)],
                      # access and error logs necessary for integration
                      # testing (non-root)
                      ['access_log', os.path.join(
@@ -321,7 +321,8 @@ class NginxConfigurator(common.Plugin):
             vhost.filep, vhost.names, ssl_block)
         vhost.ssl = True
         vhost.raw.extend(ssl_block)
-        vhost.addrs.add(obj.Addr('', str(self.config.dvsni_port), True, False))
+        vhost.addrs.add(obj.Addr(
+            '', str(self.config.tls_sni_01_port), True, False))
 
     def get_all_certs_keys(self):
         """Find all existing keys, certs from configuration.
diff --git a/letsencrypt-nginx/letsencrypt_nginx/dvsni.py b/letsencrypt-nginx/letsencrypt_nginx/dvsni.py
index 662f10889..828dac650 100644
--- a/letsencrypt-nginx/letsencrypt_nginx/dvsni.py
+++ b/letsencrypt-nginx/letsencrypt_nginx/dvsni.py
@@ -48,7 +48,7 @@ class NginxDvsni(common.Dvsni):
 
         addresses = []
         default_addr = "{0} default_server ssl".format(
-            self.configurator.config.dvsni_port)
+            self.configurator.config.tls_sni_01_port)
 
         for achall in self.achalls:
             vhost = self.configurator.choose_vhost(achall.domain)
diff --git a/letsencrypt-nginx/letsencrypt_nginx/tests/util.py b/letsencrypt-nginx/letsencrypt_nginx/tests/util.py
index 953c5d367..cb4e08ddf 100644
--- a/letsencrypt-nginx/letsencrypt_nginx/tests/util.py
+++ b/letsencrypt-nginx/letsencrypt_nginx/tests/util.py
@@ -59,7 +59,7 @@ def get_nginx_configurator(
             temp_checkpoint_dir=os.path.join(work_dir, "temp_checkpoints"),
             in_progress_dir=os.path.join(backups, "IN_PROGRESS"),
             server="https://acme-server.org:443/new",
-            dvsni_port=5001,
+            tls_sni_01_port=5001,
         ),
         name="nginx",
         version=version)
diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py
index 5757783cd..c1f3edb70 100644
--- a/letsencrypt/cli.py
+++ b/letsencrypt/cli.py
@@ -850,8 +850,9 @@ def prepare_and_parse_args(plugins, args):
         help=config_help("no_verify_ssl"),
         default=flag_default("no_verify_ssl"))
     helpful.add(
-        "testing", "--dvsni-port", type=int, default=flag_default("dvsni_port"),
-        help=config_help("dvsni_port"))
+        "testing", "--tls-sni-01-port", type=int,
+        default=flag_default("tls_sni_01_port"),
+        help=config_help("tls_sni_01_port"))
     helpful.add("testing", "--http-01-port", dest="http01_port", type=int,
                 help=config_help("http01_port"))
 
diff --git a/letsencrypt/configuration.py b/letsencrypt/configuration.py
index b604651e9..c5a02dfef 100644
--- a/letsencrypt/configuration.py
+++ b/letsencrypt/configuration.py
@@ -37,10 +37,10 @@ class NamespaceConfig(object):
     def __init__(self, namespace):
         self.namespace = namespace
 
-        if self.http01_port == self.dvsni_port:
+        if self.http01_port == self.tls_sni_01_port:
             raise errors.Error(
-                "Trying to run http-01 and DVSNI "
-                "on the same port ({0})".format(self.dvsni_port))
+                "Trying to run http-01 and tls-sni-01 "
+                "on the same port ({0})".format(self.tls_sni_01_port))
 
     def __getattr__(self, name):
         return getattr(self.namespace, name)
diff --git a/letsencrypt/constants.py b/letsencrypt/constants.py
index 15f8c53f0..f71bf0329 100644
--- a/letsencrypt/constants.py
+++ b/letsencrypt/constants.py
@@ -23,7 +23,7 @@ CLI_DEFAULTS = dict(
     work_dir="/var/lib/letsencrypt",
     logs_dir="/var/log/letsencrypt",
     no_verify_ssl=False,
-    dvsni_port=challenges.DVSNI.PORT,
+    tls_sni_01_port=challenges.TLSSNI01Response.PORT,
 
     auth_cert_path="./cert.pem",
     auth_chain_path="./chain.pem",
@@ -41,7 +41,7 @@ RENEWER_DEFAULTS = dict(
 
 
 EXCLUSIVE_CHALLENGES = frozenset([frozenset([
-    challenges.DVSNI, challenges.HTTP01])])
+    challenges.TLSSNI01, challenges.HTTP01])])
 """Mutually exclusive challenges."""
 
 
diff --git a/letsencrypt/interfaces.py b/letsencrypt/interfaces.py
index 498b01683..987fdc25e 100644
--- a/letsencrypt/interfaces.py
+++ b/letsencrypt/interfaces.py
@@ -219,8 +219,8 @@ class IConfig(zope.interface.Interface):
 
     no_verify_ssl = zope.interface.Attribute(
         "Disable SSL certificate verification.")
-    dvsni_port = zope.interface.Attribute(
-        "Port number to perform DVSNI challenge. "
+    tls_sni_01_port = zope.interface.Attribute(
+        "Port number to perform tls-sni-01 challenge. "
         "Boulder in testing mode defaults to 5001.")
 
     http01_port = zope.interface.Attribute(
diff --git a/letsencrypt/plugins/standalone.py b/letsencrypt/plugins/standalone.py
index afe0b6b39..8b8612fd1 100644
--- a/letsencrypt/plugins/standalone.py
+++ b/letsencrypt/plugins/standalone.py
@@ -183,7 +183,7 @@ class Authenticator(common.Plugin):
         if challenges.HTTP01 in self.supported_challenges:
             necessary_ports.add(self.config.http01_port)
         if challenges.TLSSNI01 in self.supported_challenges:
-            necessary_ports.add(self.config.dvsni_port)
+            necessary_ports.add(self.config.tls_sni_01_port)
         return necessary_ports
 
     def more_info(self):  # pylint: disable=missing-docstring
@@ -243,7 +243,7 @@ class Authenticator(common.Plugin):
                         validation=validation))
             else:  # tls-sni-01
                 server = self.servers.run(
-                    self.config.dvsni_port, challenges.TLSSNI01)
+                    self.config.tls_sni_01_port, challenges.TLSSNI01)
                 response, (cert, _) = achall.response_and_validation(
                     cert_key=self.key)
                 self.certs[response.z_domain] = (self.key, cert)
diff --git a/letsencrypt/plugins/standalone_test.py b/letsencrypt/plugins/standalone_test.py
index 79718e244..26a040c2e 100644
--- a/letsencrypt/plugins/standalone_test.py
+++ b/letsencrypt/plugins/standalone_test.py
@@ -92,7 +92,7 @@ class AuthenticatorTest(unittest.TestCase):
     def setUp(self):
         from letsencrypt.plugins.standalone import Authenticator
         self.config = mock.MagicMock(
-            dvsni_port=1234, http01_port=4321,
+            tls_sni_01_port=1234, http01_port=4321,
             standalone_supported_challenges="tls-sni-01,http-01")
         self.auth = Authenticator(self.config, name="standalone")
 
diff --git a/letsencrypt/renewer.py b/letsencrypt/renewer.py
index 40e49702a..0a490d447 100644
--- a/letsencrypt/renewer.py
+++ b/letsencrypt/renewer.py
@@ -75,7 +75,7 @@ def renew(cert, old_version):
     # XXX: this loses type data (for example, the fact that key_size
     #      was an int, not a str)
     config.rsa_key_size = int(config.rsa_key_size)
-    config.dvsni_port = int(config.dvsni_port)
+    config.tls_sni_01_port = int(config.tls_sni_01_port)
     config.namespace.http01_port = int(config.namespace.http01_port)
     zope.component.provideUtility(config)
     try:
diff --git a/letsencrypt/tests/configuration_test.py b/letsencrypt/tests/configuration_test.py
index c7e227ee5..3a8bf40cf 100644
--- a/letsencrypt/tests/configuration_test.py
+++ b/letsencrypt/tests/configuration_test.py
@@ -14,12 +14,12 @@ class NamespaceConfigTest(unittest.TestCase):
         self.namespace = mock.MagicMock(
             config_dir='/tmp/config', work_dir='/tmp/foo', foo='bar',
             server='https://acme-server.org:443/new',
-            dvsni_port=1234, http01_port=4321)
+            tls_sni_01_port=1234, http01_port=4321)
         from letsencrypt.configuration import NamespaceConfig
         self.config = NamespaceConfig(self.namespace)
 
     def test_init_same_ports(self):
-        self.namespace.dvsni_port = 4321
+        self.namespace.tls_sni_01_port = 4321
         from letsencrypt.configuration import NamespaceConfig
         self.assertRaises(errors.Error, NamespaceConfig, self.namespace)
 
diff --git a/letsencrypt/tests/renewer_test.py b/letsencrypt/tests/renewer_test.py
index 05d7e123d..0a39b7987 100644
--- a/letsencrypt/tests/renewer_test.py
+++ b/letsencrypt/tests/renewer_test.py
@@ -688,7 +688,7 @@ class RenewableCertTests(BaseRenewableCertTest):
         self.test_rc.configfile["renewalparams"]["rsa_key_size"] = "2048"
         self.test_rc.configfile["renewalparams"]["server"] = "acme.example.com"
         self.test_rc.configfile["renewalparams"]["authenticator"] = "fake"
-        self.test_rc.configfile["renewalparams"]["dvsni_port"] = "4430"
+        self.test_rc.configfile["renewalparams"]["tls_sni_01_port"] = "4430"
         self.test_rc.configfile["renewalparams"]["http01_port"] = "1234"
         self.test_rc.configfile["renewalparams"]["account"] = "abcde"
         mock_auth = mock.MagicMock()
diff --git a/tests/integration/_common.sh b/tests/integration/_common.sh
index cd894fd10..dbc473728 100755
--- a/tests/integration/_common.sh
+++ b/tests/integration/_common.sh
@@ -15,7 +15,7 @@ letsencrypt_test () {
     letsencrypt \
         --server "${SERVER:-http://localhost:4000/directory}" \
         --no-verify-ssl \
-        --dvsni-port 5001 \
+        --tls-sni-01-port 5001 \
         --http-01-port 5002 \
         --manual-test-mode \
         $store_flags \