diff --git a/wlauto/workloads/adobereader/com.arm.wlauto.uiauto.adobereader.apk b/wlauto/workloads/adobereader/com.arm.wlauto.uiauto.adobereader.apk
new file mode 100644
index 00000000..718895fa
Binary files /dev/null and b/wlauto/workloads/adobereader/com.arm.wlauto.uiauto.adobereader.apk differ
diff --git a/wlauto/workloads/adobereader/com.arm.wlauto.uiauto.adobereader.uiautoapk b/wlauto/workloads/adobereader/com.arm.wlauto.uiauto.adobereader.uiautoapk
deleted file mode 100644
index 9d0b8e65..00000000
Binary files a/wlauto/workloads/adobereader/com.arm.wlauto.uiauto.adobereader.uiautoapk and /dev/null differ
diff --git a/wlauto/workloads/adobereader/uiauto/build.sh b/wlauto/workloads/adobereader/uiauto/build.sh
index c1e23b98..5ad2ec77 100755
--- a/wlauto/workloads/adobereader/uiauto/build.sh
+++ b/wlauto/workloads/adobereader/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.adobereader
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/andebench/com.arm.wlauto.uiauto.andebench.uiautoapk b/wlauto/workloads/andebench/com.arm.wlauto.uiauto.andebench.apk
similarity index 100%
rename from wlauto/workloads/andebench/com.arm.wlauto.uiauto.andebench.uiautoapk
rename to wlauto/workloads/andebench/com.arm.wlauto.uiauto.andebench.apk
diff --git a/wlauto/workloads/andebench/uiauto/build.sh b/wlauto/workloads/andebench/uiauto/build.sh
index 9c44ac7e..e70890f6 100755
--- a/wlauto/workloads/andebench/uiauto/build.sh
+++ b/wlauto/workloads/andebench/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.andebench
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/androbench/com.arm.wlauto.uiauto.androbench.uiautoapk b/wlauto/workloads/androbench/com.arm.wlauto.uiauto.androbench.apk
similarity index 100%
rename from wlauto/workloads/androbench/com.arm.wlauto.uiauto.androbench.uiautoapk
rename to wlauto/workloads/androbench/com.arm.wlauto.uiauto.androbench.apk
diff --git a/wlauto/workloads/androbench/uiauto/build.sh b/wlauto/workloads/androbench/uiauto/build.sh
index 4a6c5c4f..a38bafd0 100755
--- a/wlauto/workloads/androbench/uiauto/build.sh
+++ b/wlauto/workloads/androbench/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.androbench
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/antutu/com.arm.wlauto.uiauto.antutu.uiautoapk b/wlauto/workloads/antutu/com.arm.wlauto.uiauto.antutu.apk
similarity index 100%
rename from wlauto/workloads/antutu/com.arm.wlauto.uiauto.antutu.uiautoapk
rename to wlauto/workloads/antutu/com.arm.wlauto.uiauto.antutu.apk
diff --git a/wlauto/workloads/antutu/uiauto/build.sh b/wlauto/workloads/antutu/uiauto/build.sh
index 2de72dc8..bdd131a5 100755
--- a/wlauto/workloads/antutu/uiauto/build.sh
+++ b/wlauto/workloads/antutu/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.antutu
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/applaunch/__init__.py b/wlauto/workloads/applaunch/__init__.py
index 7b8ad8c0..06dc3ff1 100644
--- a/wlauto/workloads/applaunch/__init__.py
+++ b/wlauto/workloads/applaunch/__init__.py
@@ -116,7 +116,7 @@ class Applaunch(AndroidUxPerfWorkload):
         self.package = self.workload.package
 
     def init_workload_resources(self, context):
-        self.workload.uiauto_file = context.resolver.get(wlauto.common.android.resources.uiautoApkFile(self.workload))
+        self.workload.uiauto_file = context.resolver.get(wlauto.common.android.resources.ApkFile(self.workload, uiauto=True))
         if not self.workload.uiauto_file:
             raise ResourceError('No UI automation Uiauto APK file found for workload {}.'.format(self.workload.name))
         self.workload.device_uiauto_file = self.device.path.join(self.device.working_directory, os.path.basename(self.workload.uiauto_file))
diff --git a/wlauto/workloads/applaunch/com.arm.wlauto.uiauto.applaunch.uiautoapk b/wlauto/workloads/applaunch/com.arm.wlauto.uiauto.applaunch.apk
similarity index 100%
rename from wlauto/workloads/applaunch/com.arm.wlauto.uiauto.applaunch.uiautoapk
rename to wlauto/workloads/applaunch/com.arm.wlauto.uiauto.applaunch.apk
diff --git a/wlauto/workloads/applaunch/uiauto/build.sh b/wlauto/workloads/applaunch/uiauto/build.sh
index 8c7ea439..75f5b1af 100755
--- a/wlauto/workloads/applaunch/uiauto/build.sh
+++ b/wlauto/workloads/applaunch/uiauto/build.sh
@@ -34,7 +34,7 @@ package=com.arm.wlauto.uiauto.applaunch
 
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/appshare/com.arm.wlauto.uiauto.appshare.uiautoapk b/wlauto/workloads/appshare/com.arm.wlauto.uiauto.appshare.apk
similarity index 100%
rename from wlauto/workloads/appshare/com.arm.wlauto.uiauto.appshare.uiautoapk
rename to wlauto/workloads/appshare/com.arm.wlauto.uiauto.appshare.apk
diff --git a/wlauto/workloads/appshare/uiauto/build.sh b/wlauto/workloads/appshare/uiauto/build.sh
index 6a57dc18..64e54ccb 100755
--- a/wlauto/workloads/appshare/uiauto/build.sh
+++ b/wlauto/workloads/appshare/uiauto/build.sh
@@ -46,7 +46,7 @@ fi
 package=com.arm.wlauto.uiauto.appshare
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/benchmarkpi/com.arm.wlauto.uiauto.benchmarkpi.uiautoapk b/wlauto/workloads/benchmarkpi/com.arm.wlauto.uiauto.benchmarkpi.apk
similarity index 100%
rename from wlauto/workloads/benchmarkpi/com.arm.wlauto.uiauto.benchmarkpi.uiautoapk
rename to wlauto/workloads/benchmarkpi/com.arm.wlauto.uiauto.benchmarkpi.apk
diff --git a/wlauto/workloads/benchmarkpi/uiauto/build.sh b/wlauto/workloads/benchmarkpi/uiauto/build.sh
index d0d2bd5f..e0f36b09 100755
--- a/wlauto/workloads/benchmarkpi/uiauto/build.sh
+++ b/wlauto/workloads/benchmarkpi/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.benchmarkpi
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/caffeinemark/com.arm.wlauto.uiauto.caffeinemark.uiautoapk b/wlauto/workloads/caffeinemark/com.arm.wlauto.uiauto.caffeinemark.apk
similarity index 100%
rename from wlauto/workloads/caffeinemark/com.arm.wlauto.uiauto.caffeinemark.uiautoapk
rename to wlauto/workloads/caffeinemark/com.arm.wlauto.uiauto.caffeinemark.apk
diff --git a/wlauto/workloads/caffeinemark/uiauto/build.sh b/wlauto/workloads/caffeinemark/uiauto/build.sh
index d4dee8b8..b791e1b5 100755
--- a/wlauto/workloads/caffeinemark/uiauto/build.sh
+++ b/wlauto/workloads/caffeinemark/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.caffeinemark
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/cameracapture/com.arm.wlauto.uiauto.cameracapture.uiautoapk b/wlauto/workloads/cameracapture/com.arm.wlauto.uiauto.cameracapture.apk
similarity index 100%
rename from wlauto/workloads/cameracapture/com.arm.wlauto.uiauto.cameracapture.uiautoapk
rename to wlauto/workloads/cameracapture/com.arm.wlauto.uiauto.cameracapture.apk
diff --git a/wlauto/workloads/cameracapture/uiauto/build.sh b/wlauto/workloads/cameracapture/uiauto/build.sh
index 904be4c4..a6ffe010 100755
--- a/wlauto/workloads/cameracapture/uiauto/build.sh
+++ b/wlauto/workloads/cameracapture/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.cameracapture
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/camerarecord/com.arm.wlauto.uiauto.camerarecord.uiautoapk b/wlauto/workloads/camerarecord/com.arm.wlauto.uiauto.camerarecord.apk
similarity index 100%
rename from wlauto/workloads/camerarecord/com.arm.wlauto.uiauto.camerarecord.uiautoapk
rename to wlauto/workloads/camerarecord/com.arm.wlauto.uiauto.camerarecord.apk
diff --git a/wlauto/workloads/camerarecord/uiauto/build.sh b/wlauto/workloads/camerarecord/uiauto/build.sh
index cb36bc46..9f4ba31a 100755
--- a/wlauto/workloads/camerarecord/uiauto/build.sh
+++ b/wlauto/workloads/camerarecord/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.camerarecord
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/cfbench/com.arm.wlauto.uiauto.cfbench.uiautoapk b/wlauto/workloads/cfbench/com.arm.wlauto.uiauto.cfbench.apk
similarity index 100%
rename from wlauto/workloads/cfbench/com.arm.wlauto.uiauto.cfbench.uiautoapk
rename to wlauto/workloads/cfbench/com.arm.wlauto.uiauto.cfbench.apk
diff --git a/wlauto/workloads/cfbench/uiauto/build.sh b/wlauto/workloads/cfbench/uiauto/build.sh
index 1d576760..d2d90c2e 100755
--- a/wlauto/workloads/cfbench/uiauto/build.sh
+++ b/wlauto/workloads/cfbench/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.cfbench
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/facebook/com.arm.wlauto.uiauto.facebook.uiautoapk b/wlauto/workloads/facebook/com.arm.wlauto.uiauto.facebook.apk
similarity index 100%
rename from wlauto/workloads/facebook/com.arm.wlauto.uiauto.facebook.uiautoapk
rename to wlauto/workloads/facebook/com.arm.wlauto.uiauto.facebook.apk
diff --git a/wlauto/workloads/facebook/uiauto/build.sh b/wlauto/workloads/facebook/uiauto/build.sh
index 4b25ee5a..7d4ad567 100755
--- a/wlauto/workloads/facebook/uiauto/build.sh
+++ b/wlauto/workloads/facebook/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.facebook
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/geekbench/com.arm.wlauto.uiauto.geekbench.uiautoapk b/wlauto/workloads/geekbench/com.arm.wlauto.uiauto.geekbench.apk
similarity index 100%
rename from wlauto/workloads/geekbench/com.arm.wlauto.uiauto.geekbench.uiautoapk
rename to wlauto/workloads/geekbench/com.arm.wlauto.uiauto.geekbench.apk
diff --git a/wlauto/workloads/geekbench/uiauto/build.sh b/wlauto/workloads/geekbench/uiauto/build.sh
index 3eb6cfdc..c9134521 100755
--- a/wlauto/workloads/geekbench/uiauto/build.sh
+++ b/wlauto/workloads/geekbench/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.geekbench
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/glbenchmark/com.arm.wlauto.uiauto.glbenchmark.uiautoapk b/wlauto/workloads/glbenchmark/com.arm.wlauto.uiauto.glbenchmark.apk
similarity index 100%
rename from wlauto/workloads/glbenchmark/com.arm.wlauto.uiauto.glbenchmark.uiautoapk
rename to wlauto/workloads/glbenchmark/com.arm.wlauto.uiauto.glbenchmark.apk
diff --git a/wlauto/workloads/glbenchmark/uiauto/build.sh b/wlauto/workloads/glbenchmark/uiauto/build.sh
index fe378c52..410b8c88 100755
--- a/wlauto/workloads/glbenchmark/uiauto/build.sh
+++ b/wlauto/workloads/glbenchmark/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.glbenchmark
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/gmail/com.arm.wlauto.uiauto.gmail.uiautoapk b/wlauto/workloads/gmail/com.arm.wlauto.uiauto.gmail.apk
similarity index 100%
rename from wlauto/workloads/gmail/com.arm.wlauto.uiauto.gmail.uiautoapk
rename to wlauto/workloads/gmail/com.arm.wlauto.uiauto.gmail.apk
diff --git a/wlauto/workloads/gmail/uiauto/build.sh b/wlauto/workloads/gmail/uiauto/build.sh
index 63fc6098..3f79cab3 100755
--- a/wlauto/workloads/gmail/uiauto/build.sh
+++ b/wlauto/workloads/gmail/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.gmail
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/googlephotos/com.arm.wlauto.uiauto.googlephotos.uiautoapk b/wlauto/workloads/googlephotos/com.arm.wlauto.uiauto.googlephotos.apk
similarity index 100%
rename from wlauto/workloads/googlephotos/com.arm.wlauto.uiauto.googlephotos.uiautoapk
rename to wlauto/workloads/googlephotos/com.arm.wlauto.uiauto.googlephotos.apk
diff --git a/wlauto/workloads/googlephotos/uiauto/build.sh b/wlauto/workloads/googlephotos/uiauto/build.sh
index 8b05acc3..67d3c7dd 100755
--- a/wlauto/workloads/googlephotos/uiauto/build.sh
+++ b/wlauto/workloads/googlephotos/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.googlephotos
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/googleplaybooks/com.arm.wlauto.uiauto.googleplaybooks.uiautoapk b/wlauto/workloads/googleplaybooks/com.arm.wlauto.uiauto.googleplaybooks.apk
similarity index 100%
rename from wlauto/workloads/googleplaybooks/com.arm.wlauto.uiauto.googleplaybooks.uiautoapk
rename to wlauto/workloads/googleplaybooks/com.arm.wlauto.uiauto.googleplaybooks.apk
diff --git a/wlauto/workloads/googleplaybooks/uiauto/build.sh b/wlauto/workloads/googleplaybooks/uiauto/build.sh
index 0da43e6e..982029d7 100755
--- a/wlauto/workloads/googleplaybooks/uiauto/build.sh
+++ b/wlauto/workloads/googleplaybooks/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.googleplaybooks
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/googleslides/com.arm.wlauto.uiauto.googleslides.uiautoapk b/wlauto/workloads/googleslides/com.arm.wlauto.uiauto.googleslides.apk
similarity index 100%
rename from wlauto/workloads/googleslides/com.arm.wlauto.uiauto.googleslides.uiautoapk
rename to wlauto/workloads/googleslides/com.arm.wlauto.uiauto.googleslides.apk
diff --git a/wlauto/workloads/googleslides/uiauto/build.sh b/wlauto/workloads/googleslides/uiauto/build.sh
index c4e7b164..2b6c332b 100755
--- a/wlauto/workloads/googleslides/uiauto/build.sh
+++ b/wlauto/workloads/googleslides/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.googleslides
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/linpack/com.arm.wlauto.uiauto.linpack.uiautoapk b/wlauto/workloads/linpack/com.arm.wlauto.uiauto.linpack.apk
similarity index 100%
rename from wlauto/workloads/linpack/com.arm.wlauto.uiauto.linpack.uiautoapk
rename to wlauto/workloads/linpack/com.arm.wlauto.uiauto.linpack.apk
diff --git a/wlauto/workloads/linpack/uiauto/build.sh b/wlauto/workloads/linpack/uiauto/build.sh
index 15bf69da..69f71a68 100755
--- a/wlauto/workloads/linpack/uiauto/build.sh
+++ b/wlauto/workloads/linpack/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.linpack
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/peacekeeper/com.arm.wlauto.uiauto.peacekeeper.uiautoapk b/wlauto/workloads/peacekeeper/com.arm.wlauto.uiauto.peacekeeper.apk
similarity index 100%
rename from wlauto/workloads/peacekeeper/com.arm.wlauto.uiauto.peacekeeper.uiautoapk
rename to wlauto/workloads/peacekeeper/com.arm.wlauto.uiauto.peacekeeper.apk
diff --git a/wlauto/workloads/peacekeeper/uiauto/build.sh b/wlauto/workloads/peacekeeper/uiauto/build.sh
index e10b69cc..d05ec1dc 100755
--- a/wlauto/workloads/peacekeeper/uiauto/build.sh
+++ b/wlauto/workloads/peacekeeper/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.peacekeeper
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/quadrant/com.arm.wlauto.uiauto.quadrant.uiautoapk b/wlauto/workloads/quadrant/com.arm.wlauto.uiauto.quadrant.apk
similarity index 100%
rename from wlauto/workloads/quadrant/com.arm.wlauto.uiauto.quadrant.uiautoapk
rename to wlauto/workloads/quadrant/com.arm.wlauto.uiauto.quadrant.apk
diff --git a/wlauto/workloads/quadrant/uiauto/build.sh b/wlauto/workloads/quadrant/uiauto/build.sh
index d19d4687..b8eb79fb 100755
--- a/wlauto/workloads/quadrant/uiauto/build.sh
+++ b/wlauto/workloads/quadrant/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.quadrant
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/real_linpack/com.arm.wlauto.uiauto.reallinpack.uiautoapk b/wlauto/workloads/real_linpack/com.arm.wlauto.uiauto.reallinpack.apk
similarity index 100%
rename from wlauto/workloads/real_linpack/com.arm.wlauto.uiauto.reallinpack.uiautoapk
rename to wlauto/workloads/real_linpack/com.arm.wlauto.uiauto.reallinpack.apk
diff --git a/wlauto/workloads/real_linpack/uiauto/build.sh b/wlauto/workloads/real_linpack/uiauto/build.sh
index 451a4de6..beec9c17 100755
--- a/wlauto/workloads/real_linpack/uiauto/build.sh
+++ b/wlauto/workloads/real_linpack/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.reallinpack
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/skype/com.arm.wlauto.uiauto.skype.uiautoapk b/wlauto/workloads/skype/com.arm.wlauto.uiauto.skype.apk
similarity index 100%
rename from wlauto/workloads/skype/com.arm.wlauto.uiauto.skype.uiautoapk
rename to wlauto/workloads/skype/com.arm.wlauto.uiauto.skype.apk
diff --git a/wlauto/workloads/skype/uiauto/build.sh b/wlauto/workloads/skype/uiauto/build.sh
index bcc0feac..70601f6b 100755
--- a/wlauto/workloads/skype/uiauto/build.sh
+++ b/wlauto/workloads/skype/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.skype
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/smartbench/com.arm.wlauto.uiauto.smartbench.uiautoapk b/wlauto/workloads/smartbench/com.arm.wlauto.uiauto.smartbench.apk
similarity index 100%
rename from wlauto/workloads/smartbench/com.arm.wlauto.uiauto.smartbench.uiautoapk
rename to wlauto/workloads/smartbench/com.arm.wlauto.uiauto.smartbench.apk
diff --git a/wlauto/workloads/smartbench/uiauto/build.sh b/wlauto/workloads/smartbench/uiauto/build.sh
index b1629178..180a4ceb 100755
--- a/wlauto/workloads/smartbench/uiauto/build.sh
+++ b/wlauto/workloads/smartbench/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.smartbench
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/sqlite/com.arm.wlauto.uiauto.sqlite.uiautoapk b/wlauto/workloads/sqlite/com.arm.wlauto.uiauto.sqlite.apk
similarity index 100%
rename from wlauto/workloads/sqlite/com.arm.wlauto.uiauto.sqlite.uiautoapk
rename to wlauto/workloads/sqlite/com.arm.wlauto.uiauto.sqlite.apk
diff --git a/wlauto/workloads/sqlite/uiauto/build.sh b/wlauto/workloads/sqlite/uiauto/build.sh
index 5db04a15..e29ffb06 100755
--- a/wlauto/workloads/sqlite/uiauto/build.sh
+++ b/wlauto/workloads/sqlite/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.sqlite
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/vellamo/com.arm.wlauto.uiauto.vellamo.uiautoapk b/wlauto/workloads/vellamo/com.arm.wlauto.uiauto.vellamo.apk
similarity index 100%
rename from wlauto/workloads/vellamo/com.arm.wlauto.uiauto.vellamo.uiautoapk
rename to wlauto/workloads/vellamo/com.arm.wlauto.uiauto.vellamo.apk
diff --git a/wlauto/workloads/vellamo/uiauto/build.sh b/wlauto/workloads/vellamo/uiauto/build.sh
index 0175986f..a2f55749 100755
--- a/wlauto/workloads/vellamo/uiauto/build.sh
+++ b/wlauto/workloads/vellamo/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.vellamo
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/videostreaming/__init__.py b/wlauto/workloads/videostreaming/__init__.py
index 92c75890..43aa655a 100644
--- a/wlauto/workloads/videostreaming/__init__.py
+++ b/wlauto/workloads/videostreaming/__init__.py
@@ -17,6 +17,7 @@
 import os
 
 from wlauto import AndroidUiAutoBenchmark, Parameter
+from wlauto.common.android.resources import ApkFile
 import wlauto.common.android.resources
 
 
@@ -65,8 +66,8 @@ class Videostreaming(AndroidUiAutoBenchmark):
             self.uiauto_params['video_name'] = self.video_name
         else:
             self.uiauto_params['video_name'] = "abkk sathe {}".format(self.resolution)
-        self.apk_file = context.resolver.get(wlauto.common.android.resources.ApkFile(self))
-        self.uiauto_file = context.resolver.get(wlauto.common.android.resources.uiautoApkFile(self))
+        self.apk_file = context.resolver.get(ApkFile(self))
+        self.uiauto_file = context.resolver.get(ApkFile(self, uiauto=True))
         self.device_uiauto_file = self.device.path.join(self.device.working_directory,
                                                         os.path.basename(self.uiauto_file))
         if not self.uiauto_package:
diff --git a/wlauto/workloads/videostreaming/com.arm.wlauto.uiauto.videostreaming.uiautoapk b/wlauto/workloads/videostreaming/com.arm.wlauto.uiauto.videostreaming.apk
similarity index 100%
rename from wlauto/workloads/videostreaming/com.arm.wlauto.uiauto.videostreaming.uiautoapk
rename to wlauto/workloads/videostreaming/com.arm.wlauto.uiauto.videostreaming.apk
diff --git a/wlauto/workloads/videostreaming/uiauto/build.sh b/wlauto/workloads/videostreaming/uiauto/build.sh
index c2ec645a..48602458 100755
--- a/wlauto/workloads/videostreaming/uiauto/build.sh
+++ b/wlauto/workloads/videostreaming/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.videostreaming
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9
diff --git a/wlauto/workloads/youtube/com.arm.wlauto.uiauto.youtube.uiautoapk b/wlauto/workloads/youtube/com.arm.wlauto.uiauto.youtube.apk
similarity index 100%
rename from wlauto/workloads/youtube/com.arm.wlauto.uiauto.youtube.uiautoapk
rename to wlauto/workloads/youtube/com.arm.wlauto.uiauto.youtube.apk
diff --git a/wlauto/workloads/youtube/uiauto/build.sh b/wlauto/workloads/youtube/uiauto/build.sh
index 7f7c63d3..f92c078c 100755
--- a/wlauto/workloads/youtube/uiauto/build.sh
+++ b/wlauto/workloads/youtube/uiauto/build.sh
@@ -33,7 +33,7 @@ fi
 package=com.arm.wlauto.uiauto.youtube
 rm -f ../$package
 if [[ -f app/build/apk/$package.apk ]]; then
-    cp app/build/apk/$package.apk ../$package.uiautoapk
+    cp app/build/apk/$package.apk ../$package.apk
 else
     echo 'ERROR: UiAutomator apk could not be found!'
     exit 9