diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/ProvisioningConnectListener.java b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/ProvisioningConnectListener.java
index 100c74bd4..bc817dcb0 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/ProvisioningConnectListener.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/ProvisioningConnectListener.java
@@ -5,7 +5,6 @@
 
 package org.whispersystems.textsecuregcm.websocket;
 
-import com.google.common.annotations.VisibleForTesting;
 import org.whispersystems.textsecuregcm.auth.AuthenticatedDevice;
 import org.whispersystems.textsecuregcm.entities.MessageProtos;
 import org.whispersystems.textsecuregcm.entities.ProvisioningMessage;
@@ -57,15 +56,15 @@ public class ProvisioningConnectListener implements WebSocketConnectListener {
     });
 
     context.getClient().sendRequest("PUT", "/v1/address", List.of(HeaderUtils.getTimestampHeader()),
-        Optional.of(generateProvisioningUuid().toByteArray()));
+        Optional.of(generateProvisioningAddress().toByteArray()));
   }
 
-  private static MessageProtos.ProvisioningUuid generateProvisioningUuid() {
+  private static MessageProtos.ProvisioningAddress generateProvisioningAddress() {
     final byte[] provisioningAddress = new byte[16];
     new SecureRandom().nextBytes(provisioningAddress);
 
-    return MessageProtos.ProvisioningUuid.newBuilder()
-        .setUuid(Base64.getUrlEncoder().encodeToString(provisioningAddress))
+    return MessageProtos.ProvisioningAddress.newBuilder()
+        .setAddress(Base64.getUrlEncoder().encodeToString(provisioningAddress))
         .build();
   }
 }
diff --git a/service/src/main/proto/TextSecure.proto b/service/src/main/proto/TextSecure.proto
index 5b7df2ff2..847cec476 100644
--- a/service/src/main/proto/TextSecure.proto
+++ b/service/src/main/proto/TextSecure.proto
@@ -38,8 +38,8 @@ message Envelope {
   // next: 19
 }
 
-message ProvisioningUuid {
-  optional string uuid = 1;
+message ProvisioningAddress {
+  optional string address = 1;
 }
 
 message ServerCertificate {