diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTInviteActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTInviteActivity.java
index fcfcbd51a..bcc4c325c 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTInviteActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTInviteActivity.java
@@ -65,7 +65,7 @@ public class BTInviteActivity extends InviteActivity
         BTService.clearDevices( this, null ); // will return names
     }
 
-    // BTService.BTEventListener interface
+    // MultiService.MultiEventListener interface
     @Override
     public void eventOccurred( MultiService.MultiEvent event, final Object ... args )
     {
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
index f62100c4e..4d6f8fd6d 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
@@ -147,7 +147,7 @@ public class BTService extends Service {
         }
     }
 
-    public static void setListener( MultiService.BTEventListener li )
+    public static void setListener( MultiService.MultiEventListener li )
     {
         if ( XWApp.BTSUPPORTED ) {
             if ( null == s_srcMgr ) {
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
index c4003c5fa..f8a5f802c 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
@@ -924,7 +924,7 @@ public class BoardActivity extends XWActivity
     }
 
     //////////////////////////////////////////////////
-    // BTService.BTEventListener interface
+    // MultiService.MultiEventListener interface
     //////////////////////////////////////////////////
     @Override
     @SuppressWarnings("fallthrough")
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
index 301f153da..306a7a4aa 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
@@ -419,7 +419,7 @@ public class GamesList extends XWListActivity
         }
     }
 
-    // BTService.BTEventListener interface
+    // BTService.MultiEventListener interface
     @Override
     public void eventOccurred( MultiService.MultiEvent event, 
                                final Object ... args )
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiService.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiService.java
index 4e4d21686..5d2a776eb 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiService.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiService.java
@@ -42,7 +42,7 @@ public class MultiService {
     public static final int OWNER_SMS = 1;
     public static final int OWNER_RELAY = 2;
 
-    private BTEventListener m_li;
+    private MultiEventListener m_li;
 
     public enum MultiEvent { BAD_PROTO
                           , BT_ENABLED
@@ -64,14 +64,14 @@ public class MultiService {
                           , SMS_SEND_FAILED_NORADIO
             };
 
-    public interface BTEventListener {
+    public interface MultiEventListener {
         public void eventOccurred( MultiEvent event, Object ... args );
     }
     // public interface MultiEventSrc {
     //     public void setBTEventListener( BTEventListener li );
     // }
 
-    public void setListener( BTEventListener li )
+    public void setListener( MultiEventListener li )
     {
         synchronized( this ) {
             m_li = li;
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameActivity.java
index 85bbccd63..d1b90148a 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameActivity.java
@@ -256,7 +256,7 @@ public class NewGameActivity extends XWActivity {
         return dialog;
     }
 
-    // BTService.BTEventListener interface
+    // MultiService.MultiEventListener interface
     @Override
     public void eventOccurred( MultiService.MultiEvent event, 
                                final Object ... args )
@@ -299,7 +299,7 @@ public class NewGameActivity extends XWActivity {
             super.eventOccurred( event, args );
             break;
         }
-    } // BTService.BTEventListener.eventOccurred
+    } // MultiService.MultiEventListener.eventOccurred
 
     private void makeNewGame( boolean networked, boolean launch )
     {
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java
index 6734e1220..be0a95ef2 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java
@@ -189,7 +189,7 @@ public class SMSService extends Service {
         return result;
     }
 
-    public static void setListener( MultiService.BTEventListener li )
+    public static void setListener( MultiService.MultiEventListener li )
     {
         if ( XWApp.SMSSUPPORTED ) {
             if ( null == s_srcMgr ) {
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java
index 18670d379..71e8a922d 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java
@@ -31,7 +31,7 @@ import android.widget.TextView;
 import junit.framework.Assert;
 
 public class XWActivity extends Activity
-    implements DlgDelegate.DlgClickNotify, MultiService.BTEventListener {
+    implements DlgDelegate.DlgClickNotify, MultiService.MultiEventListener {
 
     private DlgDelegate m_delegate;
 
@@ -192,7 +192,7 @@ public class XWActivity extends Activity
         Assert.fail();
     }
 
-    // BTService.BTEventListener interface
+    // BTService.MultiEventListener interface
     public void eventOccurred( MultiService.MultiEvent event, 
                                final Object ... args )
     {
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListActivity.java
index 9f10da3d4..927b73f78 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListActivity.java
@@ -28,7 +28,7 @@ import android.os.Bundle;
 import junit.framework.Assert;
 
 public class XWListActivity extends ListActivity 
-    implements DlgDelegate.DlgClickNotify, MultiService.BTEventListener {
+    implements DlgDelegate.DlgClickNotify, MultiService.MultiEventListener {
 
     private DlgDelegate m_delegate;
 
@@ -193,7 +193,7 @@ public class XWListActivity extends ListActivity
         m_delegate.launchLookup( words, lang, forceList );
     }
 
-    // BTService.BTEventListener interface
+    // MultiService.MultiEventListener interface
     public void eventOccurred( MultiService.MultiEvent event, 
                                final Object ... args )
     {