diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/sms/SenderIdSelector.java b/service/src/main/java/org/whispersystems/textsecuregcm/sms/SenderIdSupplier.java
similarity index 87%
rename from service/src/main/java/org/whispersystems/textsecuregcm/sms/SenderIdSelector.java
rename to service/src/main/java/org/whispersystems/textsecuregcm/sms/SenderIdSupplier.java
index 53f8bd80d..3957aada4 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/sms/SenderIdSelector.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/sms/SenderIdSupplier.java
@@ -12,12 +12,12 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-class SenderIdSelector {
+class SenderIdSupplier {
   private final String              defaultSenderId;
   private final Map<String, String> countrySpecificSenderIds;
   private final Set<String>         countryCodesWithoutSenderId;
 
-  SenderIdSelector(String defaultSenderId, List<TwilioCountrySenderIdConfiguration> countrySpecificSenderIds, Set<String> countryCodesWithoutSenderId) {
+  SenderIdSupplier(String defaultSenderId, List<TwilioCountrySenderIdConfiguration> countrySpecificSenderIds, Set<String> countryCodesWithoutSenderId) {
     this.defaultSenderId = defaultSenderId;
     this.countrySpecificSenderIds = countrySpecificSenderIds.stream().collect(Collectors.toMap(
             TwilioCountrySenderIdConfiguration::getCountryCode,
@@ -25,13 +25,13 @@ class SenderIdSelector {
     this.countryCodesWithoutSenderId = countryCodesWithoutSenderId;
   }
 
-  SenderIdSelector(TwilioSenderIdConfiguration configuration) {
+  SenderIdSupplier(TwilioSenderIdConfiguration configuration) {
     this(configuration.getDefaultSenderId(),
          configuration.getCountrySpecificSenderIds(),
          configuration.getCountryCodesWithoutSenderId());
   }
 
-  Optional<String> getSenderId(@NotNull String destination) {
+  Optional<String> get(@NotNull String destination) {
     final String countryCode = Util.getCountryCode(destination);
     if (countryCodesWithoutSenderId.contains(countryCode)) {
       return Optional.empty();
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/sms/TwilioSmsSender.java b/service/src/main/java/org/whispersystems/textsecuregcm/sms/TwilioSmsSender.java
index 8f646e7b4..c78a2041a 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/sms/TwilioSmsSender.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/sms/TwilioSmsSender.java
@@ -65,7 +65,7 @@ public class TwilioSmsSender {
   private final ArrayList<String> numbers;
   private final String            messagingServicesId;
   private final String            localDomain;
-  private final SenderIdSelector  senderIdSelector;
+  private final SenderIdSupplier  senderIdSupplier;
   private final Random            random;
 
   private final FaultTolerantHttpClient httpClient;
@@ -81,7 +81,7 @@ public class TwilioSmsSender {
     this.numbers             = new ArrayList<>(twilioConfiguration.getNumbers());
     this.localDomain         = twilioConfiguration.getLocalDomain();
     this.messagingServicesId = twilioConfiguration.getMessagingServicesId();
-    this.senderIdSelector    = new SenderIdSelector(twilioConfiguration.getSenderId());
+    this.senderIdSupplier    = new SenderIdSupplier(twilioConfiguration.getSenderId());
     this.random              = new Random(System.currentTimeMillis());
     this.smsUri              = URI.create(baseUri + "/2010-04-01/Accounts/" + accountId + "/Messages.json");
     this.voxUri              = URI.create(baseUri + "/2010-04-01/Accounts/" + accountId + "/Calls.json"   );
@@ -174,7 +174,7 @@ public class TwilioSmsSender {
   }
 
   private void setOriginationRequestParameter(String destination, Map<String, String> requestParameters) {
-    final Optional<String> senderId = senderIdSelector.getSenderId(destination);
+    final Optional<String> senderId = senderIdSupplier.get(destination);
     if (senderId.isPresent()) {
       requestParameters.put("From", senderId.get());
     } else if (Util.isEmpty(messagingServicesId)) {