diff --git a/acme/acme/client.py b/acme/acme/client.py
index ab99b8c3d..2241da03d 100644
--- a/acme/acme/client.py
+++ b/acme/acme/client.py
@@ -562,7 +562,7 @@ class BackwardsCompatibleClientV2(object):
 
     def __init__(self, net, key, server):
         self.directory = messages.Directory.from_json(net.get(server).json())
-        self.acme_version = self._acme_version_from_directory(directory)
+        self.acme_version = self._acme_version_from_directory(self.directory)
         if self.acme_version == 1:
             self.client = Client(directory, key=key, net=net)
         else:
@@ -571,6 +571,9 @@ class BackwardsCompatibleClientV2(object):
     def __getattr__(self, name):
         if name in dir(ClientBase):
             return getattr(self.client, name)
+        # temporary, for breaking changes into smaller pieces
+        elif name in dir(Client):
+            return getattr(self.client, name)
         else:
             raise AttributeError
 
diff --git a/acme/acme/messages.py b/acme/acme/messages.py
index 98993c4e1..1ee198061 100644
--- a/acme/acme/messages.py
+++ b/acme/acme/messages.py
@@ -172,6 +172,7 @@ class Directory(jose.JSONDeSerializable):
     class Meta(jose.JSONObjectWithFields):
         """Directory Meta."""
         terms_of_service = jose.Field('terms-of-service', omitempty=True)
+        terms_of_service_v2 = jose.Field('termsOfService', omitempty=True)
         website = jose.Field('website', omitempty=True)
         caa_identities = jose.Field('caa-identities', omitempty=True)
 
@@ -251,7 +252,7 @@ class Registration(ResourceBody):
     contact = jose.Field('contact', omitempty=True, default=())
     agreement = jose.Field('agreement', omitempty=True)
     status = jose.Field('status', omitempty=True)
-    terms_of_service_agreed = jose.Field('terms-of-service-agreed', omitempty=True)
+    terms_of_service_agreed = jose.Field('termsOfServiceAgreed', omitempty=True)
 
     phone_prefix = 'tel:'
     email_prefix = 'mailto:'