diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/registration/RegistrationServiceClient.java b/service/src/main/java/org/whispersystems/textsecuregcm/registration/RegistrationServiceClient.java
index 54baca12a..fe1eb73bf 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/registration/RegistrationServiceClient.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/registration/RegistrationServiceClient.java
@@ -84,7 +84,7 @@ public class RegistrationServiceClient implements Managed {
         PhoneNumberUtil.getInstance().format(phoneNumber, PhoneNumberUtil.PhoneNumberFormat.E164).substring(1));
 
     return toCompletableFuture(stub.withDeadline(toDeadline(timeout))
-        .createSessionTemp(CreateRegistrationSessionRequest.newBuilder()
+        .createSession(CreateRegistrationSessionRequest.newBuilder()
             .setE164(e164)
             .setAccountExistsWithE164(accountExistsWithPhoneNumber)
             .build()))
@@ -124,7 +124,7 @@ public class RegistrationServiceClient implements Managed {
     }
 
     return toCompletableFuture(stub.withDeadline(toDeadline(timeout))
-        .sendVerificationCodeTemp(requestBuilder.build()))
+        .sendVerificationCode(requestBuilder.build()))
         .thenApply(response -> {
           if (response.hasError()) {
             switch (response.getError().getErrorType()) {
@@ -164,7 +164,7 @@ public class RegistrationServiceClient implements Managed {
       final String verificationCode,
       final Duration timeout) {
     return toCompletableFuture(stub.withDeadline(toDeadline(timeout))
-        .checkVerificationCodeTemp(CheckVerificationCodeRequest.newBuilder()
+        .checkVerificationCode(CheckVerificationCodeRequest.newBuilder()
             .setSessionId(ByteString.copyFrom(sessionId))
             .setVerificationCode(verificationCode)
             .build()))
@@ -199,7 +199,7 @@ public class RegistrationServiceClient implements Managed {
 
   public CompletableFuture<Optional<RegistrationServiceSession>> getSession(final byte[] sessionId,
       final Duration timeout) {
-    return toCompletableFuture(stub.withDeadline(toDeadline(timeout)).getSessionMetadataTemp(
+    return toCompletableFuture(stub.withDeadline(toDeadline(timeout)).getSessionMetadata(
         GetRegistrationSessionMetadataRequest.newBuilder()
             .setSessionId(ByteString.copyFrom(sessionId)).build()))
         .thenApply(response -> {
diff --git a/service/src/main/proto/RegistrationService.proto b/service/src/main/proto/RegistrationService.proto
index edd8d020f..5208059ac 100644
--- a/service/src/main/proto/RegistrationService.proto
+++ b/service/src/main/proto/RegistrationService.proto
@@ -8,24 +8,24 @@ service RegistrationService {
   /**
    * Create a new registration session for a given destination phone number.
    */
-  rpc create_session_temp (CreateRegistrationSessionRequest) returns (CreateRegistrationSessionResponse) {}
+  rpc CreateSession (CreateRegistrationSessionRequest) returns (CreateRegistrationSessionResponse) {}
 
   /**
    * Retrieves session metadata for a given session.
    */
-  rpc get_session_metadata_temp (GetRegistrationSessionMetadataRequest) returns (GetRegistrationSessionMetadataResponse) {}
+  rpc GetSessionMetadata (GetRegistrationSessionMetadataRequest) returns (GetRegistrationSessionMetadataResponse) {}
 
   /**
    * Sends a verification code to a destination phone number within the context
    * of a previously-created registration session.
    */
-  rpc send_verification_code_temp (SendVerificationCodeRequest) returns (SendVerificationCodeResponse) {}
+  rpc SendVerificationCode (SendVerificationCodeRequest) returns (SendVerificationCodeResponse) {}
 
   /**
    * Checks a client-provided verification code for a given registration
    * session.
    */
-  rpc check_verification_code_temp (CheckVerificationCodeRequest) returns (CheckVerificationCodeResponse) {}
+  rpc CheckVerificationCode (CheckVerificationCodeRequest) returns (CheckVerificationCodeResponse) {}
 }
 
 message CreateRegistrationSessionRequest {