diff --git a/image_creator/disk.py b/image_creator/disk.py
index be728a2d05ef35ceacd6f697e614b4c5ac501512..01ff41dd64ee314e7886aa368e0e3a05af31d781 100644
--- a/image_creator/disk.py
+++ b/image_creator/disk.py
@@ -275,11 +275,11 @@ class DiskDevice(object):
         self.g.e2fsck_f(part_dev)
         self.g.resize2fs_M(part_dev)
 
-        output = self.g.tune2fs_l(part_dev)
+        out = self.g.tune2fs_l(part_dev)
         block_size = int(
-            filter(lambda x: x[0] == 'Block size', output)[0][1])
+            filter(lambda x: x[0] == 'Block size', out)[0][1])
         block_cnt = int(
-            filter(lambda x: x[0] == 'Block count', output)[0][1])
+            filter(lambda x: x[0] == 'Block count', out)[0][1])
 
         sector_size = self.g.blockdev_getss(dev)
 
diff --git a/image_creator/os_type/__init__.py b/image_creator/os_type/__init__.py
index 1383807e4ee4b359766c27610ff72f3558780e6e..fc06ff9e48ee50eb1e96c160777260751703409f 100644
--- a/image_creator/os_type/__init__.py
+++ b/image_creator/os_type/__init__.py
@@ -191,7 +191,7 @@ class OSBase(object):
 
         output('Preparing system for image creation:')
 
-        tasks, _ = self.list_sysprep()
+        tasks, _ = self.list_syspreps()
         size = len(tasks)
         cnt = 0
         for task in tasks: