diff --git a/wlauto/common/android/device.py b/wlauto/common/android/device.py
index f4257268..31362173 100644
--- a/wlauto/common/android/device.py
+++ b/wlauto/common/android/device.py
@@ -619,7 +619,7 @@ class AndroidDevice(BaseLinuxDevice):  # pylint: disable=W0223
         self.pull_file(on_device_file, filepath)
         self.delete_file(on_device_file)
 
-    def capture_view_hierachy(self, filepath):
+    def capture_ui_hierarchy(self, filepath):
         """Captures the current view hierarchy into the specified file in a XML format."""
         on_device_file = self.path.join(self.working_directory, 'screen_capture.xml')
         self.execute('uiautomator dump {}'.format(on_device_file))
diff --git a/wlauto/core/execution.py b/wlauto/core/execution.py
index bc1e1acd..b9c17b38 100644
--- a/wlauto/core/execution.py
+++ b/wlauto/core/execution.py
@@ -742,7 +742,7 @@ class Runner(object):
             filepath = os.path.join(self.context.output_directory, filename)
         else:
             filepath = os.path.join(settings.output_directory, filename)
-        self.device.capture_view_hierachy(filepath)
+        self.device.capture_ui_hierarchy(filepath)
 
     @contextmanager
     def _handle_errors(self, action, on_error_status=IterationResult.FAILED):
@@ -764,7 +764,7 @@ class Runner(object):
                 try:
                     self._take_screenshot('error.png')
                     if self.device.platform == 'android':
-                        self._take_uiautomator_dump('error.xml')
+                        self._take_uiautomator_dump('error.uix')
                 except Exception, e:  # pylint: disable=W0703
                     # We're already in error state, so the fact that taking a
                     # screenshot failed is not surprising...