--- a/mobile/android/gradle.configure
+++ b/mobile/android/gradle.configure
@@ -66,17 +66,17 @@ def gradle_android_build_config():
         geckoview_example=namespace(
             variant=variant(('official', 'withGeckoBinaries', 'noMinApi'), 'debug'),
         ),
     )
 
 
 @depends(gradle_android_build_config)
 def gradle_android_variant_name(build_config):
-    '''Like "officialPhotonDebug".'''
+    '''Like "officialWithoutGeckoBinariesNoMinApiPhotonDebug".'''
     def uncapitalize(s):
         if s:
             return s[0].lower() + s[1:]
         else:
             return s
 
     return namespace(
         app=uncapitalize(build_config.app.variant.name),

--- a/taskcluster/ci/build/android-stuff.yml
+++ b/taskcluster/ci/build/android-stuff.yml
@@ -57,24 +57,24 @@ android-lint/opt:
         symbol: A(lint)
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             PERFHERDER_EXTRA_OPTIONS: android-lint
         artifacts:
-            - name: public/android/lint/lint-results-officialPhotonDebug.html
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/reports/lint-results-officialPhotonDebug.html
+            - name: public/android/lint/lint-results-officialWithoutGeckoBinariesNoMinApiPhotonDebug.html
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/reports/lint-results-officialWithoutGeckoBinariesNoMinApiPhotonDebug.html
               type: file
-            - name: public/android/lint/lint-results-officialPhotonDebug.xml
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/reports/lint-results-officialPhotonDebug.xml
+            - name: public/android/lint/lint-results-officialWithoutGeckoBinariesNoMinApiPhotonDebug.xml
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/reports/lint-results-officialWithoutGeckoBinariesNoMinApiPhotonDebug.xml
               type: file
-            - name: public/android/lint/lint-results-officialPhotonDebug_files
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/reports/lint-results-officialPhotonDebug_files
+            - name: public/android/lint/lint-results-officialWithoutGeckoBinariesNoMinApiPhotonDebug_files
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/reports/lint-results-officialWithoutGeckoBinariesNoMinApiPhotonDebug_files
               type: directory
             - name: public/build
               path: /builds/worker/artifacts/
               type: directory
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build]
@@ -162,21 +162,21 @@ android-findbugs/opt:
         symbol: A(findbugs)
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             PERFHERDER_EXTRA_OPTIONS: android-findbugs
         artifacts:
-            - name: public/android/findbugs/findbugs-officialPhotonDebug-output.html
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/reports/findbugs/findbugs-officialPhotonDebug-output.html
+            - name: public/android/findbugs/findbugs-officialWithoutGeckoBinariesNoMinApiPhotonDebug-output.html
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/reports/findbugs/findbugs-officialWithoutGeckoBinariesNoMinApiPhotonDebug-output.html
               type: file
-            - name: public/android/findbugs/findbugs-officialPhotonDebug-output.xml
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/reports/findbugs/findbugs-officialPhotonDebug-output.xml
+            - name: public/android/findbugs/findbugs-officialWithoutGeckoBinariesNoMinApiPhotonDebug-output.xml
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/reports/findbugs/findbugs-officialWithoutGeckoBinariesNoMinApiPhotonDebug-output.xml
               type: file
             - name: public/build
               path: /builds/worker/artifacts/
               type: directory
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build]