diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle
index 66ec70910..6370209c8 100644
--- a/xwords4/android/app/build.gradle
+++ b/xwords4/android/app/build.gradle
@@ -75,7 +75,7 @@ android {
             buildConfigField "boolean", "LOG_LIFECYLE", "false"
         }
 
-        xw4 {
+        xw4NoSMS {
             dimension "variant"
             applicationId "org.eehouse.android.xw4"
             manifestPlaceholders = [ APP_ID: applicationId ]
@@ -194,12 +194,12 @@ android {
         // directories here. AS doesn't respect what's set here: it'll
         // compile, but post-install app launch and source-level
         // debugging don't work.
-        xw4 {
+        xw4NoSMS {
             release {
-                jniLibs.srcDir "../libs-xw4Release"
+                jniLibs.srcDir "../libs-xw4NoSMSRelease"
             }
             debug {
-                jniLibs.srcDir "../libs-xw4Debug"
+                jniLibs.srcDir "../libs-xw4NoSMSDebug"
             }
         }
         xw4d {
diff --git a/xwords4/android/app/src/xw4/google-services.json b/xwords4/android/app/src/xw4NoSMS/google-services.json
similarity index 100%
rename from xwords4/android/app/src/xw4/google-services.json
rename to xwords4/android/app/src/xw4NoSMS/google-services.json
diff --git a/xwords4/android/app/src/xw4/java/org/eehouse/android/xw4/CrashTrack.java b/xwords4/android/app/src/xw4NoSMS/java/org/eehouse/android/xw4/CrashTrack.java
similarity index 100%
rename from xwords4/android/app/src/xw4/java/org/eehouse/android/xw4/CrashTrack.java
rename to xwords4/android/app/src/xw4NoSMS/java/org/eehouse/android/xw4/CrashTrack.java
diff --git a/xwords4/android/app/src/xw4/java/org/eehouse/android/xw4/FBMService.java b/xwords4/android/app/src/xw4NoSMS/java/org/eehouse/android/xw4/FBMService.java
similarity index 100%
rename from xwords4/android/app/src/xw4/java/org/eehouse/android/xw4/FBMService.java
rename to xwords4/android/app/src/xw4NoSMS/java/org/eehouse/android/xw4/FBMService.java
diff --git a/xwords4/android/jni/andutils.c b/xwords4/android/jni/andutils.c
index 94867c05e..967dbbea9 100644
--- a/xwords4/android/jni/andutils.c
+++ b/xwords4/android/jni/andutils.c
@@ -754,7 +754,7 @@ android_debugf( const char* format, ... )
     }
     
     (void)__android_log_write( ANDROID_LOG_DEBUG, 
-# if defined VARIANT_xw4 || defined VARIANT_xw4fdroid || defined VARIANT_xw4SMS
+# if defined VARIANT_xw4NoSMS || defined VARIANT_xw4fdroid || defined VARIANT_xw4SMS
                                "xw4"
 # elif defined VARIANT_xw4d || defined VARIANT_xw4dNoSMS
                                "x4bg"
diff --git a/xwords4/android/jni/xwjni.c b/xwords4/android/jni/xwjni.c
index 6c5c3e19e..7bf2275a9 100644
--- a/xwords4/android/jni/xwjni.c
+++ b/xwords4/android/jni/xwjni.c
@@ -691,7 +691,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_comms_1getUUID
     jstring jstr = 
 #ifdef XWFEATURE_BLUETOOTH
         (*env)->NewStringUTF( env,
-# if defined VARIANT_xw4 || defined VARIANT_xw4fdroid || defined VARIANT_xw4SMS
+# if defined VARIANT_xw4NoSMS || defined VARIANT_xw4fdroid || defined VARIANT_xw4SMS
         XW_BT_UUID
 # elif defined VARIANT_xw4d || defined VARIANT_xw4dNoSMS
         XW_BT_UUID_DBG