diff --git a/wa/workloads/benchmarkpi/com.arm.wa.uiauto.benchmarkpi.apk b/wa/workloads/benchmarkpi/com.arm.wa.uiauto.benchmarkpi.apk
index 6cec9361..2b07af8f 100644
Binary files a/wa/workloads/benchmarkpi/com.arm.wa.uiauto.benchmarkpi.apk and b/wa/workloads/benchmarkpi/com.arm.wa.uiauto.benchmarkpi.apk differ
diff --git a/wa/workloads/benchmarkpi/uiauto/app/src/main/AndroidManifest.xml b/wa/workloads/benchmarkpi/uiauto/app/src/main/AndroidManifest.xml
index 192fc321..9edb4da5 100644
--- a/wa/workloads/benchmarkpi/uiauto/app/src/main/AndroidManifest.xml
+++ b/wa/workloads/benchmarkpi/uiauto/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.arm.wlauto.uiauto.benchmarkpi"
+    package="com.arm.wa.uiauto.benchmarkpi"
     android:versionCode="1"
     android:versionName="1.0">
 
diff --git a/wa/workloads/benchmarkpi/uiauto/app/src/main/java/com/arm/wa/uiauto/benchmarkpi/UiAutomation.java b/wa/workloads/benchmarkpi/uiauto/app/src/main/java/com/arm/wa/uiauto/benchmarkpi/UiAutomation.java
index 423452fe..134582c9 100644
--- a/wa/workloads/benchmarkpi/uiauto/app/src/main/java/com/arm/wa/uiauto/benchmarkpi/UiAutomation.java
+++ b/wa/workloads/benchmarkpi/uiauto/app/src/main/java/com/arm/wa/uiauto/benchmarkpi/UiAutomation.java
@@ -33,6 +33,9 @@ public class UiAutomation extends BaseUiAutomation {
 
     public static String TAG = "benchmarkpi";
 
+    public Bundle parameters;
+    public String packageID;
+
     @Test
     public void runWorkload() throws Exception {
         startTest();
@@ -43,7 +46,7 @@ public class UiAutomation extends BaseUiAutomation {
     public void extractResults() throws Exception {
         UiSelector selector = new UiSelector();
         UiObject resultsText = mDevice.findObject(selector.textContains("You calculated Pi in")
-                .className("android.widget.TextView"));
+                                                          .className("android.widget.TextView"));
         Log.v(TAG, resultsText.getText());
     }
 
diff --git a/wa/workloads/benchmarkpi/uiauto/build.sh b/wa/workloads/benchmarkpi/uiauto/build.sh
index 136c8502..b2901c48 100755
--- a/wa/workloads/benchmarkpi/uiauto/build.sh
+++ b/wa/workloads/benchmarkpi/uiauto/build.sh
@@ -29,7 +29,7 @@ if [[ ! -f gradlew ]]; then
     exit 9
 fi
 
-# Copy base class library from wlauto dist
+# Copy base class library from wa dist
 libs_dir=app/libs
 base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"`
 mkdir -p $libs_dir