diff --git a/ipynb/examples/android/benchmarks/Android_UiBench.ipynb b/ipynb/examples/android/benchmarks/Android_UiBench.ipynb
index f5f9355a2228833a8c684c79c261055154c7b46d..29b8c2ab1e8ebb426ed00c7a41e9c88977ba4c64 100644
--- a/ipynb/examples/android/benchmarks/Android_UiBench.ipynb
+++ b/ipynb/examples/android/benchmarks/Android_UiBench.ipynb
@@ -112,7 +112,7 @@
     "    systrace_output = System.systrace_start(te, trace_file, 15)\n",
     "    \n",
     "    # UiBench\n",
-    "    db_file, nrg_report = wload.run(te.res_dir, 'TrivialAnimation', duration_s=10, collect='systrace')\n",
+    "    db_file, nrg_report = wload.run(te.res_dir, 'TrivialAnimationActivity', duration_s=10, collect='systrace')\n",
     "\n",
     "    if systrace_output:\n",
     "        logging.info('Waiting systrace report [%s]...', trace_file)\n",
diff --git a/ipynb/examples/android/workloads/Android_Workloads.ipynb b/ipynb/examples/android/workloads/Android_Workloads.ipynb
index fb957e2007828557adba7f32a5b95245ed7adb9a..cce3b9412676dbfb1521bc3c1ead0156b1bd04a3 100644
--- a/ipynb/examples/android/workloads/Android_Workloads.ipynb
+++ b/ipynb/examples/android/workloads/Android_Workloads.ipynb
@@ -431,7 +431,7 @@
     "# Params:\n",
     "# - test_name:  The name of the test to start\n",
     "# - duration:   playback time in [s]\n",
-    "    'UiBench 1 TrivialAnimation 10',\n",
+    "    'UiBench 1 TrivialAnimationActivity 10',\n",
     "\n",
     "# RT-App workload:\n",
     "# Params:\n",
diff --git a/libs/utils/android/workloads/uibench.py b/libs/utils/android/workloads/uibench.py
old mode 100644
new mode 100755
index 0a4219cad06eb69ab0f72a0ccbf7048e401a4c4c..bdba69fa88fbf17cbc0e654c293d14585b963b1f
--- a/libs/utils/android/workloads/uibench.py
+++ b/libs/utils/android/workloads/uibench.py
@@ -34,21 +34,21 @@ class UiBench(Workload):
 
     # Supported activities list, obtained via:
     # adb shell dumpsys package | grep -i uibench | grep Activity
-    test_BitmapUpload = 'BitmapUpload'
-    test_DialogList = 'DialogList'
-    test_EditTextType = 'EditTextType'
-    test_FullscreenOverdraw = 'FullscreenOverdraw'
-    test_GlTextureView = 'GlTextureView'
-    test_InflatingList = 'InflatingList'
-    test_Invalidate = 'Invalidate'
-    test_ShadowGrid = 'ShadowGrid'
-    test_TextCacheHighHitrate = 'TextCacheHighHitrate'
-    test_TextCacheLowHitrate = 'TextCacheLowHitrate'
-    test_Transition = 'Transition'
-    test_TransitionDetails = 'TransitionDetails'
-    test_TrivialAnimation = 'TrivialAnimation'
-    test_TrivialList = 'TrivialList'
-    test_TrivialRecyclerView = 'TrivialRecyclerView'
+    test_BitmapUpload = 'BitmapUploadActivity'
+    test_DialogList = 'DialogListActivity'
+    test_EditTextType = 'EditTextTypeActivity'
+    test_FullscreenOverdraw = 'FullscreenOverdrawActivity'
+    test_GlTextureView = 'GlTextureViewActivity'
+    test_InflatingList = 'InflatingListActivity'
+    test_Invalidate = 'InvalidateActivity'
+    test_ShadowGrid = 'ShadowGridActivity'
+    test_TextCacheHighHitrate = 'TextCacheHighHitrateActivity'
+    test_TextCacheLowHitrate = 'TextCacheLowHitrateActivity'
+    test_Transition = 'ActivityTransition'
+    test_TransitionDetails = 'ActivityTransitionDetails'
+    test_TrivialAnimation = 'TrivialAnimationActivity'
+    test_TrivialList = 'TrivialListActivity'
+    test_TrivialRecyclerView = 'TrivialRecyclerViewActivity'
 
     def __init__(self, test_env):
         super(UiBench, self).__init__(test_env)
@@ -79,7 +79,7 @@ class UiBench(Workload):
         :type collect: list(str)
         """
 
-        activity = '.' + test_name + 'Activity'
+        activity = '.' + test_name
 
         # Keep track of mandatory parameters
         self.out_dir = out_dir
diff --git a/tests/benchmarks/android_uibench.py b/tests/benchmarks/android_uibench.py
index 97e2a3fe2de4a3627b65be7fb18683b089869fdd..c59ae6d0405cef65183fee6f5a7c7f9df8c84149 100755
--- a/tests/benchmarks/android_uibench.py
+++ b/tests/benchmarks/android_uibench.py
@@ -162,21 +162,26 @@ governors = [
 ]
 
 tests = [
-    'TrivialAnimation',
-    'BitmapUpload',
-    'DialogList',
-    'EditTextType',
-    'FullscreenOverdraw',
-    'GlTextureView',
-    'InflatingList',
-    'Invalidate',
-    'ShadowGrid',
-    'TextCacheHighHitrate',
-    'TextCacheLowHitrate',
-    'Transition',
-    'TransitionDetails',
-    'TrivialList',
-    'TrivialRecyclerView',
+# General
+    'DialogListActivity',
+    'FullscreenOverdrawActivity',
+    'GlTextureViewActivity',
+    'InvalidateActivity',
+    'TrivialAnimationActivity',
+    'TrivialListActivity',
+    'TrivialRecyclerViewActivity',
+# Inflation
+    'InflatingListActivity',
+# Rendering
+    'BitmapUploadActivity',
+    'ShadowGridActivity',
+# Text
+    'EditTextTypeActivity',
+    'TextCacheHighHitrateActivity',
+    'TextCacheLowHitrateActivity',
+# Transitions
+    'ActivityTransition',
+    'ActivityTransitionDetails',
 ]
 
 # Reboot device only the first time