rename mvc at lvc

16 files changed, 242 insertions, 242 deletions

diff --git a/test/runtests.py b/test/runtests.py
index 7664487..83c75f3 100644
--- a/test/runtests.py
+++ b/test/runtests.py
@@ -1,9 +1,9 @@
 try:
-    import mvc
+    import lvc
 except ImportError:
     import os.path, sys
-    mvc_path = os.path.join(os.path.dirname(__file__), '..')
-    sys.path.append(mvc_path)
+    lvc_path = os.path.join(os.path.dirname(__file__), '..')
+    sys.path.append(lvc_path)
 
 from test_video import *
 from test_converter import *
@@ -12,6 +12,6 @@ from test_utils import *
 
 if __name__ == "__main__":
     import unittest
-    from mvc.widgets import initialize
+    from lvc.widgets import initialize
     initialize(None)
     unittest.main()
diff --git a/test/test_conversion.py b/test/test_conversion.py
index 41bbf27..8359b94 100644
--- a/test/test_conversion.py
+++ b/test/test_conversion.py
@@ -6,9 +6,9 @@ import sys
 import tempfile
 import time
 
-from mvc import video
-from mvc import converter
-from mvc import conversion
+from lvc import video
+from lvc import converter
+from lvc import conversion
 
 import base
 
diff --git a/test/test_converter.py b/test/test_converter.py
index 736b5b0..cb703d3 100644
--- a/test/test_converter.py
+++ b/test/test_converter.py
@@ -1,9 +1,9 @@
 import argparse
 import os.path
 
-from mvc.video import VideoFile
-from mvc import converter
-from mvc import settings
+from lvc.video import VideoFile
+from lvc import converter
+from lvc import settings
 
 import base
 import mock
diff --git a/test/test_utils.py b/test/test_utils.py
index 1eb16c6..d109d61 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -1,6 +1,6 @@
 from StringIO import StringIO
 
-from mvc import utils
+from lvc import utils
 
 import base
 
diff --git a/test/test_video.py b/test/test_video.py
index 821066f..3eb40de 100644
--- a/test/test_video.py
+++ b/test/test_video.py
@@ -5,7 +5,7 @@ import unittest
 
 import mock
 
-from mvc import video
+from lvc import video
 import base
 
 class GetMediaInfoTest(base.Test):
@@ -148,7 +148,7 @@ class GetThumbnailTest(base.Test):
 
     def generate_thumbnail(self, width, height):
         completion = mock.Mock()
-        with mock.patch('mvc.video.idle_add') as mock_idle_add:
+        with mock.patch('lvc.video.idle_add') as mock_idle_add:
             with mock.patch('threading.Thread') as mock_thread:
                 video.get_thumbnail(self.video_path, width, height,
                                     self.temp_path.name, completion,
@@ -202,7 +202,7 @@ class VideoFileTest(base.Test):
         just runs the code in the current thread
         """
         completion = mock.Mock()
-        with mock.patch('mvc.video.idle_add') as mock_idle_add:
+        with mock.patch('lvc.video.idle_add') as mock_idle_add:
             with mock.patch('threading.Thread') as mock_thread:
                 initial_rv = self.video.get_thumbnail(completion, **kwargs)
                 if initial_rv is not None:
diff --git a/test/uitests.sikuli/mvc_steps.py b/test/uitests.sikuli/lvc_steps.py
index 0d00cc1..23a8fae 100644
--- a/test/uitests.sikuli/mvc_steps.py
+++ b/test/uitests.sikuli/lvc_steps.py
@@ -36,23 +36,23 @@ def device_output(option):
 def browse_for_files(step, new, several): # file or files determines 1 or many
     datadir, testfiles = test_data(several, new)
     print testfiles
-    world.mvc.browse_for_files(datadir, testfiles)
+    world.lvc.browse_for_files(datadir, testfiles)
 
 @step('The( new)? file(s)? (?:is|are) added to the list')
 def files_added_to_the_list(step, new, several):
     _, testfiles = test_data(several, new)
     for t in testfiles:
-        assert world.mvc.verify_file_in_list(t) 
+        assert world.lvc.verify_file_in_list(t) 
     
 @step('I browse to a directory of files')
 def add_a_directory(step):
     datadir, _ = test_data(many=True)
-    world.mvc.add_directory_of_files(datadir)
+    world.lvc.add_directory_of_files(datadir)
 
 @step(u'When I drag (?:a|several)( new)? file(s)? to the drop zone')
 def drag_to_the_drop_zone(step, new, several):
     datadir, testfiles = test_data(several, new)
-    world.mvc.drag_and_drop_files(datadir, testfiles)
+    world.lvc.drag_and_drop_files(datadir, testfiles)
 
 
 @step('Given I have files in the list')
@@ -61,7 +61,7 @@ def given_i_have_some_files(step):
 
 @step('I start conversion')
 def start_conversion(step):
-    world.mvc.start_conversions()
+    world.lvc.start_conversions()
 
 @step('I remove "([^"]*)" from the list')
 def when_i_remove_it_from_the_list(step, items):
@@ -71,13 +71,13 @@ def when_i_remove_it_from_the_list(step, items):
         _, testfile = test_data(True, False)
     else:
         testfile = items.split(', ')
-    world.mvc.remove_files(testfile)
+    world.lvc.remove_files(testfile)
 
 @step('"([^"]*)" is not in the list')
 def not_in_the_list(step, items):
     if items == "it":
         _, testfile = test_data()
-    assert False, world.mvc.verify_file_in_list(testfile)
+    assert False, world.lvc.verify_file_in_list(testfile)
 
 @step('I remove each of them from the list')
 def i_remove_each_of_them_from_the_list(step):
@@ -100,15 +100,15 @@ def have_converted_file(step, amount):
 
 @step('I clear finished conversions')
 def clear_finished_conversions(step, testfiles):
-    world.mvc.clear_finished_files()
+    world.lvc.clear_finished_files()
 
 
 @step('I (?:convert|have converted) "(.*?)" to "(.*?)"')
 def convert_file_to_format(step, filename, device):
    datadir = data.testfile_attr(filename, 'testdir')
-   world.mvc.browse_for_files(datadir, [filename])
-   world.mvc.choose_device_conversion(device)
-   world.mvc.start_conversions()
+   world.lvc.browse_for_files(datadir, [filename])
+   world.lvc.choose_device_conversion(device)
+   world.lvc.start_conversions()
 
 
 
@@ -116,7 +116,7 @@ def convert_file_to_format(step, filename, device):
 def file_is_removed(step, testfile):
     if testfile == "file":
         _, testfile = test_data()        
-    assert world.mvc.verify_file_not_in_list(testfile) 
+    assert world.lvc.verify_file_not_in_list(testfile) 
 
 @step('And I have some conversions in progress')
 def and_i_have_some_conversions_in_progress(step):
@@ -124,11 +124,11 @@ def and_i_have_some_conversions_in_progress(step):
 
 @step('the completed files are removed')
 def completed_files_are_removed(step):
-    assert world.mvc.verify_completed_removed() 
+    assert world.lvc.verify_completed_removed() 
 
 @step('the in-progress conversions remain')
 def and_the_in_progress_conversions_remain(step):
-    assert world.mvc.verify_in_progress()
+    assert world.lvc.verify_in_progress()
 
 @step('"(.*?)" is a failed conversion')
 def have_failed_conversion(step, item):
@@ -136,12 +136,12 @@ def have_failed_conversion(step, item):
 
 @step('the failed conversions are removed')
 def failed_conversions_removed(step):
-    assert world.mvc.verify_failed_removed() 
+    assert world.lvc.verify_failed_removed() 
 
 @step('I choose the custom size option')
 def change_custom_size(step):
-    world.mvc.choose_custom_size('on', '150', '175')
-    assert world.mvc.verify_test_img('_custom_size_test')
+    world.lvc.choose_custom_size('on', '150', '175')
+    assert world.lvc.verify_test_img('_custom_size_test')
 
 @step('I choose the aspect ratio')
 def when_i_choose_the_aspect_ratio(step):
@@ -151,12 +151,12 @@ def when_i_choose_the_aspect_ratio(step):
 def choose_conversion_format(step, device):
     if device == 'test_default':
         device = DEFAULT_DEVICE
-    world.mvc.choose_device_conversion(device)
+    world.lvc.choose_device_conversion(device)
 
 
 @step('I open the custom pulldown')
 def open_custom_pulldown(step):
-    world.mvc.open_custom_menu()
+    world.lvc.open_custom_menu()
 
 @step('I verify "([^"]*)" and "([^"]*)" size setting entry')
 def verify_the_size_value(step, width, height):
@@ -165,9 +165,9 @@ def verify_the_size_value(step, width, height):
 @step('I verify the "([^"]*)" (?:device|format)( not)? selected')
 def verify_format_selection_for_device(self, device, removed):
     if removed:
-        assert False, world.mvc.verify_device_format_selected(device)
+        assert False, world.lvc.verify_device_format_selected(device)
     else:
-        assert world.mvc.verify_device_format_selected(device)
+        assert world.lvc.verify_device_format_selected(device)
 
 
 @step('the menu is reset')
@@ -184,8 +184,8 @@ def and_therefore_if_you_have_a_size_selected_and_then_select_an_aspect_ratio_a_
 
 
 
-@step(u'When I restart mvc')
-def when_i_restart_mvc(step):
+@step(u'When I restart lvc')
+def when_i_restart_lvc(step):
     assert False, 'This step must be implemented'
 
 @step('I have Send to iTunes checked')
diff --git a/test/uitests.sikuli/mvcgui.py b/test/uitests.sikuli/lvcgui.py
index b76e41d..28e01d6 100644
--- a/test/uitests.sikuli/mvcgui.py
+++ b/test/uitests.sikuli/lvcgui.py
@@ -77,10 +77,10 @@ class MVCGui(object):
         else:
             self.CMDCTRL = Key.CTRL
 
-    def mvc_focus(self):
+    def lvc_focus(self):
         App.focus("Libre Video Converter")
 
-    def mvc_quit(self):
+    def lvc_quit(self):
         App.close("Libre Video Converter")
 
     def item_region(self, item):
diff --git a/test/uitests.sikuli/readme.md b/test/uitests.sikuli/readme.md
index 3996931..99e0424 100644
--- a/test/uitests.sikuli/readme.md
+++ b/test/uitests.sikuli/readme.md
@@ -1,13 +1,13 @@
-Libre Video Converter 3
+Libre Video Converter
 ======================
 
 <img src="http://cl.ly/ECBE/o"/></img>
 
-MVC3 has a complete UI overhaul designed to maintain the simplicity of previous versions but also provide
+LVC has a complete UI overhaul designed to maintain the simplicity of previous versions but also provide
 users with batch processing options and give users greater control over their converted files.
 
 
-This directory holds the UI tests for mvc that can be run like this:
+This directory holds the UI tests for lvc that can be run like this:
 
 1. install Sikuli from http://sikuli.org
 2. install nose (pip install nose)
diff --git a/test/uitests.sikuli/test_android_conversions.py b/test/uitests.sikuli/test_android_conversions.py
index 5023da6..f6df9af 100644
--- a/test/uitests.sikuli/test_android_conversions.py
+++ b/test/uitests.sikuli/test_android_conversions.py
@@ -4,7 +4,7 @@ import devices
 from sikuli.Sikuli import *
 import devices
 import config
-from mvcgui import MVCGui
+from lvcgui import MVCGui
 import datafiles
 data = datafiles.TestData()
 
@@ -23,22 +23,22 @@ def test_android_size_output_default():
     """
     device_list = devices.devices('Android')
     datadir, testfiles = data.test_data(many=True, new=True)
-    mvc = MVCGui()
-    mvc.mvc_focus()
-    mvc.browse_for_files(datadir, testfiles)
+    lvc = MVCGui()
+    lvc.lvc_focus()
+    lvc.browse_for_files(datadir, testfiles)
 
     for x in device_list:
-        yield device_defaults, x, mvc
+        yield device_defaults, x, lvc
 
 
-def device_defaults(device_output, mvc):
+def device_defaults(device_output, lvc):
     print device_output
-    mvc.choose_device_conversion(device_output)
+    lvc.choose_device_conversion(device_output)
     width = device.device_attr(device_output, 'width')
     height = device.device_attr(device_output, 'height')
     default_format = 'MP4'
-    assert mvc.verify_device_format_selected(device_output)
-    assert mvc.verify_device_size_default(str(width), str(height))
+    assert lvc.verify_device_format_selected(device_output)
+    assert lvc.verify_device_size_default(str(width), str(height))
     
 
 
@@ -46,21 +46,21 @@ def convert_to_format(device_output):
     """Scenario: Test items are converted to the specified format.
     """
     print device_output
-    mvc = MVCGui()
-    mvc.mvc_focus()
+    lvc = MVCGui()
+    lvc.lvc_focus()
     expected_failures = ['fake_video.mp4']
     datadir, testfiles = data.test_data(many=True, new=True)
-    mvc.browse_for_files(datadir, testfiles)
+    lvc.browse_for_files(datadir, testfiles)
     output_dir = tempfile.mkdtemp()
-    mvc.choose_save_location(output_dir)
-    mvc.choose_device_conversion("device_output")
-    mvc.start_conversions()
+    lvc.choose_save_location(output_dir)
+    lvc.choose_device_conversion("device_output")
+    lvc.start_conversions()
     for item in testfiles:
         if item in expected_failures:
-            mvc.verify_failed(item, 120)
+            lvc.verify_failed(item, 120)
         else:
-            mvc.verify_completed(item, 120)
-        mvc.clear_finished_files(item)
-    mvc.clear_and_start_over()
+            lvc.verify_completed(item, 120)
+        lvc.clear_finished_files(item)
+    lvc.clear_and_start_over()
 
        
diff --git a/test/uitests.sikuli/test_apple_conversions.py b/test/uitests.sikuli/test_apple_conversions.py
index f0702bd..794974d 100644
--- a/test/uitests.sikuli/test_apple_conversions.py
+++ b/test/uitests.sikuli/test_apple_conversions.py
@@ -4,7 +4,7 @@ import devices
 from sikuli.Sikuli import *
 import devices
 import config
-from mvcgui import MVCGui
+from lvcgui import MVCGui
 import datafiles
 
 data = datafiles.TestData()
@@ -24,40 +24,40 @@ def test_apple_size_output_default():
     """
     device_list = devices.devices('Android')
     datadir, testfiles = data.test_data(many=True, new=True)
-    mvc = MVCGui()
-    mvc.mvc_focus()
-    mvc.browse_for_files(datadir, testfiles)
+    lvc = MVCGui()
+    lvc.lvc_focus()
+    lvc.browse_for_files(datadir, testfiles)
 
     for x in device_list:
-        yield device_defaults, x, mvc
+        yield device_defaults, x, lvc
 
 
-def device_defaults(device_output, mvc):
+def device_defaults(device_output, lvc):
     print device_output
-    mvc.choose_device_conversion(device_output)
+    lvc.choose_device_conversion(device_output)
     width = device.device_attr(device_output, 'width')
     height = device.device_attr(device_output, 'height')
     default_format = 'MP4'
-    assert mvc.verify_device_format_selected(device_output)
-    assert mvc.verify_device_size_default(str(width), str(height))
+    assert lvc.verify_device_format_selected(device_output)
+    assert lvc.verify_device_size_default(str(width), str(height))
 
 def convert_to_format(device_output):
     print device_output
     expected_failures = ['fake_video.mp4']
-    mvc = MVCGui()
-    mvc.mvc_focus()
+    lvc = MVCGui()
+    lvc.lvc_focus()
     datadir, testfiles = data.test_data(many=True, new=True)
-    mvc.browse_for_files(datadir, testfiles)
+    lvc.browse_for_files(datadir, testfiles)
     output_dir = tempfile.mkdtemp()
-    mvc.choose_save_location(output_dir)
-    mvc.choose_device_conversion("device_output")
-    mvc.start_conversions()
+    lvc.choose_save_location(output_dir)
+    lvc.choose_device_conversion("device_output")
+    lvc.start_conversions()
     for item in testfiles:
         if item in expected_failures:
-            mvc.verify_failed(item, 120)
+            lvc.verify_failed(item, 120)
         else:
-            mvc.verify_completed(item, 120)
-        mvc.clear_finished_files(item)
-    mvc.clear_and_start_over()
+            lvc.verify_completed(item, 120)
+        lvc.clear_finished_files(item)
+    lvc.clear_and_start_over()
 
        
diff --git a/test/uitests.sikuli/test_choose_files.py b/test/uitests.sikuli/test_choose_files.py
index 7b86622..048133f 100644
--- a/test/uitests.sikuli/test_choose_files.py
+++ b/test/uitests.sikuli/test_choose_files.py
@@ -3,7 +3,7 @@ import os
 import tempfile
 import shutil
 import unittest
-from mvcgui import MVCGui
+from lvcgui import MVCGui
 import datafiles
 import devices
 
@@ -20,11 +20,11 @@ class Test_Choose_Files(unittest.TestCase):
         setup app for tests  
 
         """
-        self.mvc = MVCGui()
-        self.mvc.mvc_focus()
+        self.lvc = MVCGui()
+        self.lvc.lvc_focus()
         print "starting test: ", self.shortDescription()
         self.output_dir = tempfile.mkdtemp()
-        self.mvc.choose_save_location(self.output_dir)
+        self.lvc.choose_save_location(self.output_dir)
 
 
 
@@ -34,11 +34,11 @@ class Test_Choose_Files(unittest.TestCase):
         When I browse for a file
         Then the file is added to the list
         """
-        mvc = MVCGui()
+        lvc = MVCGui()
         datadir, testfiles = data.test_data(many=False)
-        mvc.browse_for_files(datadir, testfiles)
+        lvc.browse_for_files(datadir, testfiles)
         item = testfiles[0]
-        assert mvc.verify_file_in_list(item) 
+        assert lvc.verify_file_in_list(item) 
       
 
 
@@ -49,11 +49,11 @@ class Test_Choose_Files(unittest.TestCase):
         When I browse for several files
         Then the files are added to the list 
         """
-        mvc = MVCGui()
+        lvc = MVCGui()
         datadir, testfiles = data.test_data(many=True)
-        mvc.browse_for_files(datadir, testfiles)
+        lvc.browse_for_files(datadir, testfiles)
         for t in testfiles:
-            assert mvc.verify_file_in_list(t) 
+            assert lvc.verify_file_in_list(t) 
 
     def skip_test_choose_a_directory_files(self):
         """Scenario: Choose a directory of files.
@@ -68,11 +68,11 @@ class Test_Choose_Files(unittest.TestCase):
         When I drag a file to the drop zone 
         Then the file is added to the list 
         """
-        mvc = MVCGui()
+        lvc = MVCGui()
         datadir, testfiles = data.test_data(many=False)
-        mvc.drag_and_drop_files(datadir, testfiles)
+        lvc.drag_and_drop_files(datadir, testfiles)
         item = testfiles[0]
-        assert mvc.verify_file_in_list(item) 
+        assert lvc.verify_file_in_list(item) 
 
     def test_drag_and_drop_multiple_files(self):
         """Scenario: Drag multiple files.
@@ -80,11 +80,11 @@ class Test_Choose_Files(unittest.TestCase):
         When I drag several files to the drop zone 
         Then the files are added to the list
         """
-        mvc = MVCGui()
+        lvc = MVCGui()
         datadir, testfiles = data.test_data(many=True)
-        mvc.drag_and_drop_files(datadir, testfiles)
+        lvc.drag_and_drop_files(datadir, testfiles)
         for t in testfiles:
-            assert mvc.verify_file_in_list(t) 
+            assert lvc.verify_file_in_list(t) 
 
     def test_drag_more_files_to_drop_zone(self):
         """Scenario: Drag additional files to the existing list.
@@ -93,13 +93,13 @@ class Test_Choose_Files(unittest.TestCase):
         When I drag a new file to the drop zone
         Then the new file is added to the list
         """
-        mvc = MVCGui()
+        lvc = MVCGui()
         datadir, testfiles = data.test_data(many=True)
-        mvc.browse_for_files(datadir, testfiles)
+        lvc.browse_for_files(datadir, testfiles)
         moredatadir, moretestfiles = data.test_data(many=False, new=True)
         item = testfiles[0]
-        mvc.drag_and_drop_files(moredatadir, item)
-        assert mvc.verify_file_in_list(item) 
+        lvc.drag_and_drop_files(moredatadir, item)
+        assert lvc.verify_file_in_list(item) 
 
     def test_browse_for_more_files_and_add_them(self):
         """Scenario: Choose additional files and add to the existing list.
@@ -109,13 +109,13 @@ class Test_Choose_Files(unittest.TestCase):
         Then the new files are added to the list
         """
 
-        mvc = MVCGui()
+        lvc = MVCGui()
         datadir, testfiles = data.test_data(many=True)
-        mvc.browse_for_files(datadir, testfiles)
+        lvc.browse_for_files(datadir, testfiles)
         moredatadir, moretestfiles = data.test_data(many=False, new=True)
         item = testfiles[0]
-        mvc.browse_for_files(moredatadir, item)
-        assert mvc.verify_file_in_list(item) 
+        lvc.browse_for_files(moredatadir, item)
+        assert lvc.verify_file_in_list(item) 
 
         
     def test_drag_more_file_while_converting(self):
@@ -127,17 +127,17 @@ class Test_Choose_Files(unittest.TestCase):
         Then the new file is added to the list and is converted
         """
 
-        mvc = MVCGui()
+        lvc = MVCGui()
         datadir, testfiles = data.test_data(many=True)
-        mvc.browse_for_files(datadir, testfiles)
-        mvc.choose_device_conversion("iPad")
-        mvc.start_conversion()
+        lvc.browse_for_files(datadir, testfiles)
+        lvc.choose_device_conversion("iPad")
+        lvc.start_conversion()
 
         moredatadir, moretestfiles = data.test_data(many=False, new=True)
         item = testfiles[0]
-        mvc.drag_and_drop_files(moredatadir, item)
-        assert mvc.verify_file_in_list(item)
-        assert mvc.verify_completed(item, 60)
+        lvc.drag_and_drop_files(moredatadir, item)
+        assert lvc.verify_file_in_list(item)
+        assert lvc.verify_completed(item, 60)
 
     def test_browse_more_files_while_converting(self):
         """Scenario: Choose additional files and add to list with conversions in progress.
@@ -148,19 +148,19 @@ class Test_Choose_Files(unittest.TestCase):
         Then the new files are added to the list
         """
 
-        mvc = MVCGui()
+        lvc = MVCGui()
         datadir, testfiles = data.test_data(many=True)
-        mvc.browse_for_files(datadir, testfiles)
-        mvc.choose_device_conversion("iPad")
-        mvc.start_conversion()
+        lvc.browse_for_files(datadir, testfiles)
+        lvc.choose_device_conversion("iPad")
+        lvc.start_conversion()
 
         moredatadir, moretestfiles = data.test_data(many=False, new=True)
         item = testfiles[0]
-        mvc.browse_for_files(moredatadir, item)
-        assert mvc.verify_file_in_list(item)
-        assert mvc.verify_completed(item, 60)
+        lvc.browse_for_files(moredatadir, item)
+        assert lvc.verify_file_in_list(item)
+        assert lvc.verify_completed(item, 60)
 
     def tearDown(self):
         shutil.rmtree(self.output_dir)
-        self.mvc_quit()
+        self.lvc_quit()
 
diff --git a/test/uitests.sikuli/test_clear_finished_conversions.py b/test/uitests.sikuli/test_clear_finished_conversions.py
index 360d282..4e79e34 100644
--- a/test/uitests.sikuli/test_clear_finished_conversions.py
+++ b/test/uitests.sikuli/test_clear_finished_conversions.py
@@ -5,7 +5,7 @@ import os
 import tempfile
 import shutil
 import unittest
-from mvcgui import MVCGui
+from lvcgui import MVCGui
 import datafiles
 import devices
 
@@ -24,13 +24,13 @@ class Test_Clear_Finished_Conversions(unittest.TestCase):
         Each tests assumes that I there are files that have been converted. 
 
         """
-        self.mvc = MVCGui()
-        self.mvc.mvc_focus()
+        self.lvc = MVCGui()
+        self.lvc.lvc_focus()
         print "starting test: ", self.shortDescription()
         datadir, testfiles = data.test_data()
-        self.mvc.browse_for_files(datadir, testfiles)
+        self.lvc.browse_for_files(datadir, testfiles)
         self.output_dir = tempfile.mkdtemp()
-        self.mvc.choose_save_location(self.output_dir)
+        self.lvc.choose_save_location(self.output_dir)
 
     def test_clear_finished_conversions(self):
         """Feature: Clear a finished conversions.
@@ -39,10 +39,10 @@ class Test_Clear_Finished_Conversions(unittest.TestCase):
         When I clear finished conversions
         Then the file is removed
         """
-        mvc = MVCGui()
+        lvc = MVCGui()
         _, testfiles = data.test_data(many=True)
-        mvc.start_conversions()
-        assert mvc.clear_finished_conversions(testfiles)
+        lvc.start_conversions()
+        assert lvc.clear_finished_conversions(testfiles)
         
 
 
@@ -58,11 +58,11 @@ class Test_Clear_Finished_Conversions(unittest.TestCase):
         _, testfiles = data.test_data(many=True)
         item = 'slow_conversion.mkv'
         item_dir = data.testfile_attr(item, 'testdir')
-        mvc = MVCGui()
-        mvc.browse_for_files(item_dir, item)
-        mvc.start_conversions()
-        mvc.clear_finished_conversions(testfiles)
-        assert mvc.verify_converting(item)
+        lvc = MVCGui()
+        lvc.browse_for_files(item_dir, item)
+        lvc.start_conversions()
+        lvc.clear_finished_conversions(testfiles)
+        assert lvc.verify_converting(item)
         
 
         
@@ -77,15 +77,15 @@ class Test_Clear_Finished_Conversions(unittest.TestCase):
         _, testfiles = data.test_data(many=True)
         item = 'fake_video.mp4'
         item_dir = data.testfile_attr(item, 'testdir')
-        mvc = MVCGui()
-        mvc.browse_for_files(item_dir, item)
-        mvc.start_conversions()
-        mvc.verify_conversions_finished()
-        mvc.clear_and_start_over()
-        assert mvc.verify_file_not_in_list(testfiles[0])
-        assert mvc.verify_file_not_in_list(item)
+        lvc = MVCGui()
+        lvc.browse_for_files(item_dir, item)
+        lvc.start_conversions()
+        lvc.verify_conversions_finished()
+        lvc.clear_and_start_over()
+        assert lvc.verify_file_not_in_list(testfiles[0])
+        assert lvc.verify_file_not_in_list(item)
 
     def tearDown(self):
-        self.mvc.mvc_quit()
+        self.lvc.lvc_quit()
         shutil.rmtree(self.output_dir)
 
diff --git a/test/uitests.sikuli/test_conversions.py b/test/uitests.sikuli/test_conversions.py
index 740b61a..a150e43 100644
--- a/test/uitests.sikuli/test_conversions.py
+++ b/test/uitests.sikuli/test_conversions.py
@@ -5,7 +5,7 @@ import os
 import tempfile
 import shutil
 import unittest
-from mvcgui import MVCGui
+from lvcgui import MVCGui
 import datafiles
 import devices
 
@@ -23,13 +23,13 @@ class Test_Conversions(unittest.TestCase):
         Each tests assumes that I there are files in the list ready to be converted to some format. 
 
         """
-        self.mvc = MVCGui()
-        self.mvc.mvc_focus()
+        self.lvc = MVCGui()
+        self.lvc.lvc_focus()
         print "starting test: ", self.shortDescription()
         datadir, testfiles = data.test_data(many=True)
-        self.mvc.browse_for_files(datadir, testfiles)
+        self.lvc.browse_for_files(datadir, testfiles)
         self.output_dir = tempfile.mkdtemp()
-        self.mvc.choose_save_location(self.output_dir)
+        self.lvc.choose_save_location(self.output_dir)
 
 
     def test_send_file_to_itunes(self):
@@ -40,12 +40,12 @@ class Test_Conversions(unittest.TestCase):
         Then the file is added to my iTunes library
         """
         item = "mp4-0.mp4"
-        mvc = MVCGui()
-        mvc.choose_device_conversion("iPad")
-        mvc.choose_itunes()
-        mvc.start_conversions()
-        mvc.verify_completed(item, 30)
-        assert mvc.verify_itunes(item)
+        lvc = MVCGui()
+        lvc.choose_device_conversion("iPad")
+        lvc.choose_itunes()
+        lvc.start_conversions()
+        lvc.verify_completed(item, 30)
+        assert lvc.verify_itunes(item)
         
 
     def test_verify_custom_output_directory(self):
@@ -58,12 +58,12 @@ class Test_Conversions(unittest.TestCase):
 
         custom_output_dir = os.path.join(os.getenv("HOME"),"Desktop")
         item = "mp4-0.mp4"
-        mvc.mvcGui()
-        mvc.choose_device_conversion("KindleFire")
-        mvc.choose_save_location(custom_output_dir)
-        mvc.start_conversions()
-        mvc.verify_completed(item, 30)
-        assert mvc.verify_output_dir(self, item, custom_output_dir)
+        lvc.lvcGui()
+        lvc.choose_device_conversion("KindleFire")
+        lvc.choose_save_location(custom_output_dir)
+        lvc.start_conversions()
+        lvc.verify_completed(item, 30)
+        assert lvc.verify_output_dir(self, item, custom_output_dir)
 
     def test_file_in_default_location(self):
         """Scenario: File in default output location.
@@ -75,12 +75,12 @@ class Test_Conversions(unittest.TestCase):
 
         datadir, testfile = data.test_data()
         item = testfile[0]
-        mvc.mvcGui()
-        mvc.choose_device_conversion("Galaxy Tab")
-        mvc.choose_save_location('default')
-        mvc.start_conversions()
-        mvc.verify_completed(item, 30)
-        assert mvc.verify_output_dir(self, item, datadir)
+        lvc.lvcGui()
+        lvc.choose_device_conversion("Galaxy Tab")
+        lvc.choose_save_location('default')
+        lvc.start_conversions()
+        lvc.verify_completed(item, 30)
+        assert lvc.verify_output_dir(self, item, datadir)
 
     def test_output_file_name_in_default_dir(self):
         """Scenario: Output file name when saved in default (same) directory.
@@ -103,11 +103,11 @@ class Test_Conversions(unittest.TestCase):
     def test_output_video_no_upsize(self):
         datadir, testfile = data.test_data()
         item = testfile[0] #mp4-0.mp4 is smaller than the Apple Universal Setting
-        mvc.mvcGui()
-        mvc.choose_device_conversion("Apple Universal")
-        mvc.choose_dont_upsize('on')
-        mvc.start_conversion()
-        assert mvc.verify_size(os.path.join(datadir, item), width, height)
+        lvc.lvcGui()
+        lvc.choose_device_conversion("Apple Universal")
+        lvc.choose_dont_upsize('on')
+        lvc.start_conversion()
+        assert lvc.verify_size(os.path.join(datadir, item), width, height)
 
 
         """Scenario: Output file video size.
@@ -119,11 +119,11 @@ class Test_Conversions(unittest.TestCase):
         
 	##This test is best covered more completely in unittests to verify that we resize according to device sizes
         item = "mp4-0.mp4" #mp4-0.mp4 is smaller than the Apple Universal Setting
-        mvc.mvcGui()
-        mvc.choose_device_conversion("Apple Universal")
-        mvc.choose_dont_upsize('on')
-        mvc.start_conversion()
-        assert mvc.verify_size(os.path.join(self.output_dir, item), width, height)
+        lvc.lvcGui()
+        lvc.choose_device_conversion("Apple Universal")
+        lvc.choose_dont_upsize('on')
+        lvc.start_conversion()
+        assert lvc.verify_size(os.path.join(self.output_dir, item), width, height)
 
 
 
@@ -138,11 +138,11 @@ class Test_Conversions(unittest.TestCase):
 ##This test is best covered more completely in unittests to verify that we resize according to device sizes
 
         item = "mp4-0.mp4" #mp4-0.mp4 is smaller than the Apple Universal Setting
-        mvc.mvcGui()
-        mvc.choose_device_conversion("Apple Universal")
-        mvc.choose_dont_upsize('off')
-        mvc.start_conversion()
-        assert mvc.verify_size(os.path.join(self.output_dir, item), width, height)
+        lvc.lvcGui()
+        lvc.choose_device_conversion("Apple Universal")
+        lvc.choose_dont_upsize('off')
+        lvc.start_conversion()
+        assert lvc.verify_size(os.path.join(self.output_dir, item), width, height)
 
     def test_completed_conversions_display(self):
         """Scenario: File displays as completed.
@@ -151,11 +151,11 @@ class Test_Conversions(unittest.TestCase):
         Then the file displays as completed
         """
         item = "mp4-0.mp4"
-        mvc.mvcGui()
-        mvc.choose_device_conversion("Xoom")
-        mvc.choose_save_location(custom_output_dir)
-        mvc.start_conversions()
-        assert mvc.verify_completed(item, 30)
+        lvc.lvcGui()
+        lvc.choose_device_conversion("Xoom")
+        lvc.choose_save_location(custom_output_dir)
+        lvc.start_conversions()
+        assert lvc.verify_completed(item, 30)
 
 
     def test_failed_conversion_display(self):
@@ -166,11 +166,11 @@ class Test_Conversions(unittest.TestCase):
         """
         item = 'fake_video.mp4'
         item_dir = data.testfile_attr(item, 'testdir')
-        mvc.mvcGui()
-        mvc.browse_for_files(item_dir, item)
-        mvc.choose_device_conversion("iPhone")
-        mvc.start_conversion()
-        assert mvc.verify_failed(item)
+        lvc.lvcGui()
+        lvc.browse_for_files(item_dir, item)
+        lvc.choose_device_conversion("iPhone")
+        lvc.start_conversion()
+        assert lvc.verify_failed(item)
 
 
     def test_ffmpeg_log_output_on_failure(self):
@@ -182,15 +182,15 @@ class Test_Conversions(unittest.TestCase):
         """
         item = 'fake_video.mp4'
         item_dir = data.testfile_attr(item, 'testdir')
-        mvc.mvcGui()
-        mvc.browse_for_files(item_dir, item)
-        mvc.choose_device_conversion("iPhone")
-        mvc.start_conversion()
-        mvc.verify_failed(item)
-        assert mvc.show_ffmpeg_output(item)
+        lvc.lvcGui()
+        lvc.browse_for_files(item_dir, item)
+        lvc.choose_device_conversion("iPhone")
+        lvc.start_conversion()
+        lvc.verify_failed(item)
+        assert lvc.show_ffmpeg_output(item)
         
 
     def tearDown(self):
         shutil.rmtree(self.output_dir)
-        self.mvc_quit()
+        self.lvc_quit()
         
diff --git a/test/uitests.sikuli/test_other_conversions.py b/test/uitests.sikuli/test_other_conversions.py
index 3299616..d3b744b 100644
--- a/test/uitests.sikuli/test_other_conversions.py
+++ b/test/uitests.sikuli/test_other_conversions.py
@@ -4,7 +4,7 @@ import devices
 from sikuli.Sikuli import *
 import devices
 import config
-from mvcgui import MVCGui
+from lvcgui import MVCGui
 import datafiles
 
 data = datafiles.TestData()
@@ -20,20 +20,20 @@ def test_other_conversions():
 def convert_to_format(device_output):
     print device_output
     expected_failures = ['fake_video.mp4']
-    mvc = MVCGui()
-    mvc.mvc_focus()
+    lvc = MVCGui()
+    lvc.lvc_focus()
     datadir, testfiles = data.test_data(many=True, new=True)
-    mvc.browse_for_files(datadir, testfiles)
+    lvc.browse_for_files(datadir, testfiles)
     output_dir = tempfile.mkdtemp()
-    mvc.choose_save_location(output_dir)
-    mvc.choose_device_conversion("device_output")
-    mvc.start_conversions()
+    lvc.choose_save_location(output_dir)
+    lvc.choose_device_conversion("device_output")
+    lvc.start_conversions()
     for item in testfiles:
         if item in expected_failures:
-            mvc.verify_failed(item, 120)
+            lvc.verify_failed(item, 120)
         else:
-            mvc.verify_completed(item, 120)
-        mvc.clear_finished_files(item)
-    mvc.clear_and_start_over()
+            lvc.verify_completed(item, 120)
+        lvc.clear_finished_files(item)
+    lvc.clear_and_start_over()
 
        
diff --git a/test/uitests.sikuli/test_output_settings.py b/test/uitests.sikuli/test_output_settings.py
index 4c65cb0..621e057 100644
--- a/test/uitests.sikuli/test_output_settings.py
+++ b/test/uitests.sikuli/test_output_settings.py
@@ -5,7 +5,7 @@ import os
 import tempfile
 import shutil
 import unittest
-from mvcgui import MVCGui
+from lvcgui import MVCGui
 import datafiles
 import devices
 
@@ -21,29 +21,29 @@ class Test_Custom_Settings(unittest.TestCase):
         Each tests assumes that I there are files in the list ready to be converted to some format. 
 
         """
-        self.mvc = MVCGui()
-        self.mvc.mvc_focus()
+        self.lvc = MVCGui()
+        self.lvc.lvc_focus()
         print "starting test: ", self.shortDescription()
         datadir, testfiles = data.test_data(many=True)
-        self.mvc.browse_for_files(datadir, testfiles)
+        self.lvc.browse_for_files(datadir, testfiles)
         self.output_dir = tempfile.mkdtemp()
-        self.mvc.choose_save_location(self.output_dir)
+        self.lvc.choose_save_location(self.output_dir)
 
     def choose_custom_size(self):
         """Scenario: Choose custom size.
 
         When I enter a custom size option
         Then the conversion uses that setting."""
-        mvc = MVCGui()
+        lvc = MVCGui()
         _, testfiles = data.test_data()
         item = testfiles[0]
         w = '360'
         h = '180'
 
-        mvc.choose_custom_size(self, 'on', width=w, height=h)
-        mvc.mvc.choose_device_conversion('WebM')
-        mvc.start_conversions()
-        assert mvc.verify_size(item, width=w, height=h)                
+        lvc.choose_custom_size(self, 'on', width=w, height=h)
+        lvc.lvc.choose_device_conversion('WebM')
+        lvc.start_conversions()
+        assert lvc.verify_size(item, width=w, height=h)                
 
 
     def choose_aspect_ration(self):
@@ -62,13 +62,13 @@ class Test_Custom_Settings(unittest.TestCase):
         And I change size
         Then the selected size is used in the conversion
         """
-        mvc = MVCGui()
+        lvc = MVCGui()
         _, testfiles = data.test_data()
         item = testfiles[0]
         w = '240'
         h = '180'
-        mvc.choose_device_conversion('Galaxy Tab')
-        mvc.choose_custom_size(self, 'on', width=w, height=h)
-        mvc.start_conversions()
-        assert mvc.verify_size(item, width=w, height=h) 
+        lvc.choose_device_conversion('Galaxy Tab')
+        lvc.choose_custom_size(self, 'on', width=w, height=h)
+        lvc.start_conversions()
+        assert lvc.verify_size(item, width=w, height=h) 
  
diff --git a/test/uitests.sikuli/test_remove_files.py b/test/uitests.sikuli/test_remove_files.py
index e55f3b6..fe216ad 100644
--- a/test/uitests.sikuli/test_remove_files.py
+++ b/test/uitests.sikuli/test_remove_files.py
@@ -3,7 +3,7 @@ import os
 import tempfile
 import shutil
 import unittest
-from mvcgui import MVCGui
+from lvcgui import MVCGui
 import datafiles
 import devices
 
@@ -21,11 +21,11 @@ class Test_Remove_Files(unittest.TestCase):
         setup app for tests  
 
         """
-        mvc = MVCGui()
-        mvc.mvc_focus()
+        lvc = MVCGui()
+        lvc.lvc_focus()
         print "starting test: ", self.shortDescription()
         datadir, testfiles = data.test_data()
-        mvc.browse_for_files(datadir, testfiles)
+        lvc.browse_for_files(datadir, testfiles)
 
     def test_remove_a_file(self):
         """Scenario: Remove a file from the list of files.
@@ -35,10 +35,10 @@ class Test_Remove_Files(unittest.TestCase):
         Then it is not in the list
         """
         
-        mvc.mvcGui()
+        lvc.lvcGui()
         _, testfiles = data.test_data(many=False)
         item = testfiles[0]
-        assert mvc.remove_files(item)
+        assert lvc.remove_files(item)
 
     def test_remove_all_files(self):
         """Scenario: Remove all the files from the list.
@@ -47,9 +47,9 @@ class Test_Remove_Files(unittest.TestCase):
         When I remove them from the list
         Then the list of files is empty
         """
-        mvc.mvcGui()
+        lvc.lvcGui()
         _, testfiles = data.test_data()
-        assert mvc.remove_files(testfiles)
+        assert lvc.remove_files(testfiles)
 
     def test_remove_from_list_with_in_progress_conversions(self):
         """Scenario: Remove a file from the list of files with conversions in progress.
@@ -62,16 +62,16 @@ class Test_Remove_Files(unittest.TestCase):
         
         item = 'slow_conversion.mkv'
         item_dir = data.testfile_attr(item, 'testdir') 
-        mvc.mvcGui()
+        lvc.lvcGui()
  
-        mvc.browse_for_files(item_dir, item)
-        mvc.choose_device_conversion("WebM")
-        mvc.start_conversion()
+        lvc.browse_for_files(item_dir, item)
+        lvc.choose_device_conversion("WebM")
+        lvc.start_conversion()
 
         _, origtestfiles = test_data()
-        mvc.remove_files(origtestfiles[1])        
-        assert mvc.verify_file_in_list(item)
-        assert mvc.verify_completed(item, 160)
+        lvc.remove_files(origtestfiles[1])        
+        assert lvc.verify_file_in_list(item)
+        assert lvc.verify_completed(item, 160)
  
     def test_remove_last_queued_file_with_in_progress_conversions(self):
         """Scenario: Remove the last queued file from the list with conversions in progress.
@@ -83,13 +83,13 @@ class Test_Remove_Files(unittest.TestCase):
         """
         item = 'slow_conversion.mkv'
         item_dir = data.testfile_attr(item, 'testdir') 
-        mvc.mvcGui()
+        lvc.lvcGui()
  
-        mvc.browse_for_files(item_dir, item)
-        mvc.choose_device_conversion("Theora")
-        mvc.start_conversion()
-        mvc.remove_queued_conversions()
-        assert mvc.verify_conversions_finished()
+        lvc.browse_for_files(item_dir, item)
+        lvc.choose_device_conversion("Theora")
+        lvc.start_conversion()
+        lvc.remove_queued_conversions()
+        assert lvc.verify_conversions_finished()