rename mvc at lvc

159 files changed, 460 insertions, 452 deletions

diff --git a/.gitignore b/.gitignore
index 8455723..9161697 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,6 @@ build
 *_flymake.py
 Slicing
 ffmpeg-static
-mvc-env
+lvc-env
 downloads
 librevideoconverter.egg-info
diff --git a/MANIFEST.in b/MANIFEST.in
index 947e61c..d2e1f8b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,11 +1,11 @@
-include mvc/resources/converters/*.py
+include lvc/resources/converters/*.py
 include *.sh
 include LICENSE
 include README.md
 include README.widgets
-include mvc/widgets/osx/fasttypes.c
-include mvc/widgets/osx/Resources-Widgets/MainMenu.nib/*.nib
+include lvc/widgets/osx/fasttypes.c
+include lvc/widgets/osx/Resources-Widgets/MainMenu.nib/*.nib
 recursive-include helperscripts *
 recursive-include setup-files *
-recursive-include mvc/resources *
+recursive-include lvc/resources *
 recursive-include test *
diff --git a/README.md b/README.md
index 60fbaa9..4af37e9 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,8 @@ Para visualizar los archivos de vídeo desde UI es necesario tener instalado kon
     $ git clone `https://notabug.org/heckyel/librevideoconverter`
     $ cd LibreVideoConverter
     $ python2.7 test/runtests.py # para realizar pruebas.
-    $ python2.7 -m mvc.ui.widgets # Interfaz en GTK
-    $ python2.7 -m mvc.ui.console [filename to convert] [conversion type] # desde la terminal o consola
+    $ python2.7 -m lvc.ui.widgets # Interfaz en GTK
+    $ python2.7 -m lvc.ui.console [filename to convert] [conversion type] # desde la terminal o consola
 
 ## Contribuir ##
 
diff --git a/build-windows.sh b/build-windows.sh
index 2dba3cf..513bf17 100755
--- a/build-windows.sh
+++ b/build-windows.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-if [ ! -e mvc-env ] ; then
+if [ ! -e lvc-env ] ; then
         echo "LVC virtualenv is not present.  Run "
         echo
-        echo "   python helperscripts/windows-virtualenv/ mvc-env"
+        echo "   python helperscripts/windows-virtualenv/ lvc-env"
         echo
         echo "to build it"
         exit 1
 fi
 
-PYTHONPATH="." mvc-env/Scripts/python.exe setup.py bdist_nsis
+PYTHONPATH="." lvc-env/Scripts/python.exe setup.py bdist_nsis
diff --git a/build_installer.sh b/build_installer.sh
index 2d7e4d3..0d0f6f6 100644
--- a/build_installer.sh
+++ b/build_installer.sh
@@ -3,4 +3,4 @@
 productbuild \
     --component "dist/Libre Video Converter.app" /Applications \
     --sign 'Freedom System: Heckyel | 2017' \
-    --product setup-files/osx/mvc3_definition.plist mvc3.pkg
+    --product setup-files/osx/lvc3_definition.plist lvc3.pkg
diff --git a/helperscripts/windows-virtualenv/__main__.py b/helperscripts/windows-virtualenv/__main__.py
index 93ce533..ff4813a 100755
--- a/helperscripts/windows-virtualenv/__main__.py
+++ b/helperscripts/windows-virtualenv/__main__.py
@@ -125,7 +125,7 @@ def setup_global_dirs(parser_args):
     downloads_dir = os.path.abspath(
             os.path.join(os.path.dirname(__file__), '..', '..', 'downloads',
                 'windows-virtualenv'))
-    build_dir = os.path.abspath(os.path.join('mvc-env-build'))
+    build_dir = os.path.abspath(os.path.join('lvc-env-build'))
     site_packages_dir = os.path.join(env_dir, "Lib", "site-packages")
     scripts_dir = os.path.join(env_dir, "Scripts")
     python_dir = os.path.join(env_dir, "Python")
diff --git a/mvc/__init__.py b/lvc/__init__.py
index 94760ce..1cc637e 100644
--- a/mvc/__init__.py
+++ b/lvc/__init__.py
@@ -1,12 +1,12 @@
 import os
 
 import multiprocessing
-from mvc import converter
-from mvc import conversion
-from mvc import signals
-from mvc import video
+from lvc import converter
+from lvc import conversion
+from lvc import signals
+from lvc import video
 
-VERSION = '3.0a'
+VERSION = '1.0.1'
 
 class Application(signals.SignalEmitter):
 
diff --git a/lvc/__main__.py b/lvc/__main__.py
new file mode 100644
index 0000000..226f178
--- /dev/null
+++ b/lvc/__main__.py
@@ -0,0 +1,9 @@
+if __name__ == "__main__":
+    try:
+        from lvc.ui.widgets import Application
+    except ImportError:
+        from lvc.ui.console import Application
+    from lvc.widgets import app
+    from lvc.widgets import initialize
+    app.widgetapp = Application()
+    initialize(app.widgetapp)
diff --git a/mvc/basicconverters.py b/lvc/basicconverters.py
index 4cb4c0d..ddf99ec 100644
--- a/mvc/basicconverters.py
+++ b/lvc/basicconverters.py
@@ -1,14 +1,14 @@
 import logging
 import re
 
-from mvc import converter
+from lvc import converter
 
 class WebM_UHD(converter.FFmpegConverterInfo1080p):
     media_type = 'format'
     extension = 'webm'
-    parameters = ('-f webm -vcodec libvpx -g 120 -lag-in-frames 16 '
+    parameters = ('-f webm -vcodec libvpx -g 120 -lag-in-frames 23 '
                   '-deadline good -cpu-used 0 -vprofile 0 -qmax 51 -qmin 11 '
-                  '-slices 4 -b:v 4M -acodec libvorbis -ab 128k '
+                  '-slices 4 -b:v 4M -acodec libvorbis -ab 128k -map_metadata -1 '
                   '-ar 44100')
 
 class WebM_HD(converter.FFmpegConverterInfo720p):
@@ -16,7 +16,7 @@ class WebM_HD(converter.FFmpegConverterInfo720p):
     extension = 'webm'
     parameters = ('-f webm -vcodec libvpx -g 120 -lag-in-frames 16 '
                   '-deadline good -cpu-used 0 -vprofile 0 -qmax 51 -qmin 11 '
-                  '-slices 4 -b:v 2M -acodec libvorbis -ab 112k '
+                  '-slices 4 -b:v 2M -acodec libvorbis -ab 112k -map_metadata -1 '
                   '-ar 44100')
 
 class WebM_SD(converter.FFmpegConverterInfo480p):
@@ -24,13 +24,20 @@ class WebM_SD(converter.FFmpegConverterInfo480p):
     extension = 'webm'
     parameters = ('-f webm -vcodec libvpx -g 120 -lag-in-frames 16 '
                   '-deadline good -cpu-used 0 -vprofile 0 -qmax 53 -qmin 0 '
-                  '-b:v 768k -acodec libvorbis -ab 112k '
+                  '-b:v 768k -acodec libvorbis -ab 112k -map_metadata -1 '
                   '-ar 44100')
 
+class WebM_VP9(converter.FFmpegConverterInfo):
+    media_type = 'format'
+    extension = 'webm'
+    parameters = ('-f webm -vcodec libvpx-vp9 -g 240 -threads 8 '
+                  '-quality good -crf 32 '
+                  '-b:v 0 -acodec libopus -map_metadata -1')
+
 class MP4(converter.FFmpegConverterInfo):
     media_type = 'format'
     extension = 'mp4'
-    parameters = ('-acodec aac -ab 96k -vcodec libx264 -preset slow '
+    parameters = ('-acodec aac -ab 96k -vcodec libx264 -preset slow -map_metadata -1'
                   '-f mp4 -crf 22')
 
 class MP3(converter.FFmpegConverterInfo):
@@ -48,7 +55,7 @@ class OggVorbis(converter.FFmpegConverterInfo):
 class OggTheora(converter.FFmpegConverterInfo):
     media_type = 'format'
     extension = 'ogv'
-    parameters = '-f ogg -codec:v libtheora -qscale:v 7 -codec:a libvorbis -qscale:a 5'
+    parameters = '-f ogg -codec:v libtheora -qscale:v 7 -codec:a libvorbis -qscale:a 5 -map_metadata -1'
 
 class DNxHD_1080(converter.FFmpegConverterInfo1080p):
     media_type = 'format'
@@ -122,10 +129,11 @@ audio_formats = ('Audio', [mp3, ogg_vorbis])
 webm_uhd = WebM_UHD('WebM UHD')
 webm_hd = WebM_HD('WebM HD')
 webm_sd = WebM_SD('WebM SD')
+webm_vp9 = WebM_VP9('WebM VP9')
 mp4 = MP4('MP4')
 theora = OggTheora('Ogg Theora')
 
-video_formats = ('Video', [webm_uhd, webm_hd, webm_sd, mp4, theora])
+video_formats = ('Video', [webm_uhd, webm_hd, webm_sd, webm_vp9, mp4, theora])
 
 dnxhd_1080 = DNxHD_1080('DNxHD 1080p')
 dnxhd_720 = DNxHD_720('DNxHD 720p')
diff --git a/mvc/conversion.py b/lvc/conversion.py
index c7aa883..6d6f693 100644
--- a/mvc/conversion.py
+++ b/lvc/conversion.py
@@ -7,10 +7,10 @@ import threading
 import shutil
 import logging
 
-from mvc import execute
-from mvc.utils import line_reader
-from mvc.video import get_thumbnail_synchronous
-from mvc.widgets import get_conversion_directory
+from lvc import execute
+from lvc.utils import line_reader
+from lvc.video import get_thumbnail_synchronous
+from lvc.widgets import get_conversion_directory
 
 logger = logging.getLogger(__name__)
 
diff --git a/mvc/converter.py b/lvc/converter.py
index f845826..ed4e16c 100644
--- a/mvc/converter.py
+++ b/lvc/converter.py
@@ -4,11 +4,11 @@ import os
 import re
 import shutil
 
-from mvc import resources, settings, utils
-from mvc.utils import hms_to_seconds
+from lvc import resources, settings, utils
+from lvc.utils import hms_to_seconds
 
-from mvc.qtfaststart import processor
-from mvc.qtfaststart.exceptions import FastStartException
+from lvc.qtfaststart import processor
+from lvc.qtfaststart.exceptions import FastStartException
 
 logger = logging.getLogger(__name__)
 
@@ -238,7 +238,7 @@ class ConverterManager(object):
             return None
 
     def load_simple_converters(self):
-        from mvc import basicconverters
+        from lvc import basicconverters
         for converter in basicconverters.converters:
             if isinstance(converter, tuple):
                 brand, realconverters = converter
diff --git a/mvc/errors.py b/lvc/errors.py
index 504948b..504948b 100644
--- a/mvc/errors.py
+++ b/lvc/errors.py
diff --git a/mvc/execute.py b/lvc/execute.py
index 893d356..af6f463 100644
--- a/mvc/execute.py
+++ b/lvc/execute.py
@@ -1,6 +1,6 @@
 """execute.py -- Run executable programs.
 
-mvc.execute wraps the standard subprocess module in for MVC.
+lvc.execute wraps the standard subprocess module in for MVC.
 """
 
 import os
diff --git a/mvc/openfiles.py b/lvc/openfiles.py
index ef6710a..ef6710a 100644
--- a/mvc/openfiles.py
+++ b/lvc/openfiles.py
diff --git a/mvc/osx/__init__.py b/lvc/osx/__init__.py
index e69de29..e69de29 100644
--- a/mvc/osx/__init__.py
+++ b/lvc/osx/__init__.py
diff --git a/lvc/osx/app_main.py b/lvc/osx/app_main.py
new file mode 100644
index 0000000..487253d
--- /dev/null
+++ b/lvc/osx/app_main.py
@@ -0,0 +1,12 @@
+import os
+import sys
+
+from lvc.osx import autoupdate
+from lvc.widgets import app
+from lvc.widgets import initialize
+from lvc.ui.widgets import Application
+
+# run the app
+autoupdate.initialize()
+app.widgetapp = Application()
+initialize(app.widgetapp)
diff --git a/mvc/osx/autoupdate.py b/lvc/osx/autoupdate.py
index 7b17d47..7b17d47 100644
--- a/mvc/osx/autoupdate.py
+++ b/lvc/osx/autoupdate.py
diff --git a/mvc/qtfaststart/__init__.py b/lvc/qtfaststart/__init__.py
index f985b5c..f985b5c 100644
--- a/mvc/qtfaststart/__init__.py
+++ b/lvc/qtfaststart/__init__.py
diff --git a/mvc/qtfaststart/exceptions.py b/lvc/qtfaststart/exceptions.py
index f0767e1..f0767e1 100644
--- a/mvc/qtfaststart/exceptions.py
+++ b/lvc/qtfaststart/exceptions.py
diff --git a/mvc/qtfaststart/processor.py b/lvc/qtfaststart/processor.py
index df2a900..d0ed003 100755
--- a/mvc/qtfaststart/processor.py
+++ b/lvc/qtfaststart/processor.py
@@ -13,7 +13,7 @@ try:
 except ImportError:
     from io import StringIO
 
-from mvc.qtfaststart.exceptions import FastStartException
+from lvc.qtfaststart.exceptions import FastStartException
 
 CHUNK_SIZE = 8192
 
diff --git a/mvc/resources/__init__.py b/lvc/resources/__init__.py
index 005041d..005041d 100644
--- a/mvc/resources/__init__.py
+++ b/lvc/resources/__init__.py
diff --git a/mvc/resources/converters/android.py b/lvc/resources/converters/android.py
index ac2007d..ffe73f2 100644
--- a/mvc/resources/converters/android.py
+++ b/lvc/resources/converters/android.py
@@ -1,5 +1,5 @@
-from mvc.converter import FFmpegConverterInfo
-from mvc.basicconverters import MP4
+from lvc.converter import FFmpegConverterInfo
+from lvc.basicconverters import MP4
 
 class AndroidConversion(FFmpegConverterInfo):
     media_type = 'android'
diff --git a/mvc/resources/converters/apple.py b/lvc/resources/converters/apple.py
index 20cb76e..88dc973 100644
--- a/mvc/resources/converters/apple.py
+++ b/lvc/resources/converters/apple.py
@@ -1,5 +1,5 @@
-from mvc.converter import FFmpegConverterInfo
-from mvc.basicconverters import MP4
+from lvc.converter import FFmpegConverterInfo
+from lvc.basicconverters import MP4
 
 class AppleConversion(FFmpegConverterInfo):
     media_type = 'apple'
diff --git a/mvc/resources/converters/others.py b/lvc/resources/converters/others.py
index a05030f..13ad3b0 100644
--- a/mvc/resources/converters/others.py
+++ b/lvc/resources/converters/others.py
@@ -1,4 +1,4 @@
-from mvc.converter import FFmpegConverterInfo
+from lvc.converter import FFmpegConverterInfo
 
 class PlaystationPortable(FFmpegConverterInfo):
     media_type = 'other'
diff --git a/mvc/resources/images/android-icon-off.png b/lvc/resources/images/android-icon-off.png
index 5948f4c..5948f4c 100644
--- a/mvc/resources/images/android-icon-off.png
+++ b/lvc/resources/images/android-icon-off.png
diff --git a/mvc/resources/images/android-icon-on.png b/lvc/resources/images/android-icon-on.png
index 85be5be..85be5be 100644
--- a/mvc/resources/images/android-icon-on.png
+++ b/lvc/resources/images/android-icon-on.png
diff --git a/mvc/resources/images/apple-icon-off.png b/lvc/resources/images/apple-icon-off.png
index 947bfae..947bfae 100644
--- a/mvc/resources/images/apple-icon-off.png
+++ b/lvc/resources/images/apple-icon-off.png
diff --git a/mvc/resources/images/apple-icon-on.png b/lvc/resources/images/apple-icon-on.png
index 9949653..9949653 100644
--- a/mvc/resources/images/apple-icon-on.png
+++ b/lvc/resources/images/apple-icon-on.png
diff --git a/mvc/resources/images/arrow-down-off.png b/lvc/resources/images/arrow-down-off.png
index 368079f..368079f 100644
--- a/mvc/resources/images/arrow-down-off.png
+++ b/lvc/resources/images/arrow-down-off.png
diff --git a/mvc/resources/images/arrow-down-on.png b/lvc/resources/images/arrow-down-on.png
index 8963b5b..8963b5b 100644
--- a/mvc/resources/images/arrow-down-on.png
+++ b/lvc/resources/images/arrow-down-on.png
diff --git a/mvc/resources/images/audio.png b/lvc/resources/images/audio.png
index 4d59605..4d59605 100644
--- a/mvc/resources/images/audio.png
+++ b/lvc/resources/images/audio.png
diff --git a/mvc/resources/images/clear-icon.png b/lvc/resources/images/clear-icon.png
index 5b054fa..5b054fa 100644
--- a/mvc/resources/images/clear-icon.png
+++ b/lvc/resources/images/clear-icon.png
diff --git a/mvc/resources/images/convert-button-off.png b/lvc/resources/images/convert-button-off.png
index 307a8bd..307a8bd 100644
--- a/mvc/resources/images/convert-button-off.png
+++ b/lvc/resources/images/convert-button-off.png
diff --git a/mvc/resources/images/convert-button-on.png b/lvc/resources/images/convert-button-on.png
index 2a66c76..2a66c76 100644
--- a/mvc/resources/images/convert-button-on.png
+++ b/lvc/resources/images/convert-button-on.png
diff --git a/mvc/resources/images/convert-button-stop.png b/lvc/resources/images/convert-button-stop.png
index cb09a97..cb09a97 100644
--- a/mvc/resources/images/convert-button-stop.png
+++ b/lvc/resources/images/convert-button-stop.png
diff --git a/mvc/resources/images/converted_to-icon.png b/lvc/resources/images/converted_to-icon.png
index 14ee6d3..14ee6d3 100644
--- a/mvc/resources/images/converted_to-icon.png
+++ b/lvc/resources/images/converted_to-icon.png
diff --git a/mvc/resources/images/dropoff-icon-off.png b/lvc/resources/images/dropoff-icon-off.png
index e182d49..e182d49 100644
--- a/mvc/resources/images/dropoff-icon-off.png
+++ b/lvc/resources/images/dropoff-icon-off.png
diff --git a/mvc/resources/images/dropoff-icon-on.png b/lvc/resources/images/dropoff-icon-on.png
index 1dfd88f..1dfd88f 100644
--- a/mvc/resources/images/dropoff-icon-on.png
+++ b/lvc/resources/images/dropoff-icon-on.png
diff --git a/mvc/resources/images/dropoff-icon-small-off.png b/lvc/resources/images/dropoff-icon-small-off.png
index 186a7e6..186a7e6 100644
--- a/mvc/resources/images/dropoff-icon-small-off.png
+++ b/lvc/resources/images/dropoff-icon-small-off.png
diff --git a/mvc/resources/images/dropoff-icon-small-on.png b/lvc/resources/images/dropoff-icon-small-on.png
index 476ea49..476ea49 100644
--- a/mvc/resources/images/dropoff-icon-small-on.png
+++ b/lvc/resources/images/dropoff-icon-small-on.png
diff --git a/mvc/resources/images/error-icon.png b/lvc/resources/images/error-icon.png
index 656b2c3..656b2c3 100644
--- a/mvc/resources/images/error-icon.png
+++ b/lvc/resources/images/error-icon.png
diff --git a/mvc/resources/images/item-completed.png b/lvc/resources/images/item-completed.png
index 1400eda..1400eda 100644
--- a/mvc/resources/images/item-completed.png
+++ b/lvc/resources/images/item-completed.png
diff --git a/mvc/resources/images/item-delete-button-off.png b/lvc/resources/images/item-delete-button-off.png
index 12cd239..12cd239 100644
--- a/mvc/resources/images/item-delete-button-off.png
+++ b/lvc/resources/images/item-delete-button-off.png
diff --git a/mvc/resources/images/item-delete-button-on.png b/lvc/resources/images/item-delete-button-on.png
index 45786e5..45786e5 100644
--- a/mvc/resources/images/item-delete-button-on.png
+++ b/lvc/resources/images/item-delete-button-on.png
diff --git a/mvc/resources/images/item-error.png b/lvc/resources/images/item-error.png
index 710ff61..710ff61 100644
--- a/mvc/resources/images/item-error.png
+++ b/lvc/resources/images/item-error.png
diff --git a/mvc/resources/images/mvc-logo.png b/lvc/resources/images/lvc-logo.png
index fce15e4..fce15e4 100644
--- a/mvc/resources/images/mvc-logo.png
+++ b/lvc/resources/images/lvc-logo.png
diff --git a/mvc/resources/images/other-icon-off.png b/lvc/resources/images/other-icon-off.png
index a6c76f2..a6c76f2 100644
--- a/mvc/resources/images/other-icon-off.png
+++ b/lvc/resources/images/other-icon-off.png
diff --git a/mvc/resources/images/other-icon-on.png b/lvc/resources/images/other-icon-on.png
index 6c60edc..6c60edc 100644
--- a/mvc/resources/images/other-icon-on.png
+++ b/lvc/resources/images/other-icon-on.png
diff --git a/mvc/resources/images/progressbar-base.png b/lvc/resources/images/progressbar-base.png
index 298a6b6..298a6b6 100644
--- a/mvc/resources/images/progressbar-base.png
+++ b/lvc/resources/images/progressbar-base.png
diff --git a/mvc/resources/images/queued-icon.png b/lvc/resources/images/queued-icon.png
index d4e9242..d4e9242 100644
--- a/mvc/resources/images/queued-icon.png
+++ b/lvc/resources/images/queued-icon.png
diff --git a/mvc/resources/images/settings-base_center.png b/lvc/resources/images/settings-base_center.png
index d5f3065..d5f3065 100644
--- a/mvc/resources/images/settings-base_center.png
+++ b/lvc/resources/images/settings-base_center.png
diff --git a/mvc/resources/images/settings-base_left.png b/lvc/resources/images/settings-base_left.png
index a0f10c2..a0f10c2 100644
--- a/mvc/resources/images/settings-base_left.png
+++ b/lvc/resources/images/settings-base_left.png
diff --git a/mvc/resources/images/settings-base_right.png b/lvc/resources/images/settings-base_right.png
index 14456eb..14456eb 100644
--- a/mvc/resources/images/settings-base_right.png
+++ b/lvc/resources/images/settings-base_right.png
diff --git a/mvc/resources/images/settings-depth_center.png b/lvc/resources/images/settings-depth_center.png
index fb5f586..fb5f586 100644
--- a/mvc/resources/images/settings-depth_center.png
+++ b/lvc/resources/images/settings-depth_center.png
diff --git a/mvc/resources/images/settings-depth_left.png b/lvc/resources/images/settings-depth_left.png
index a13694b..a13694b 100644
--- a/mvc/resources/images/settings-depth_left.png
+++ b/lvc/resources/images/settings-depth_left.png
diff --git a/mvc/resources/images/settings-depth_right.png b/lvc/resources/images/settings-depth_right.png
index 5ddd21f..5ddd21f 100644
--- a/mvc/resources/images/settings-depth_right.png
+++ b/lvc/resources/images/settings-depth_right.png
diff --git a/mvc/resources/images/settings-dropdown-bottom-bg.png b/lvc/resources/images/settings-dropdown-bottom-bg.png
index bc650f8..bc650f8 100644
--- a/mvc/resources/images/settings-dropdown-bottom-bg.png
+++ b/lvc/resources/images/settings-dropdown-bottom-bg.png
diff --git a/mvc/resources/images/settings-icon-off.png b/lvc/resources/images/settings-icon-off.png
index 340b516..340b516 100644
--- a/mvc/resources/images/settings-icon-off.png
+++ b/lvc/resources/images/settings-icon-off.png
diff --git a/mvc/resources/images/settings-icon-on.png b/lvc/resources/images/settings-icon-on.png
index be008d4..be008d4 100644
--- a/mvc/resources/images/settings-icon-on.png
+++ b/lvc/resources/images/settings-icon-on.png
diff --git a/mvc/resources/images/showfile-icon.png b/lvc/resources/images/showfile-icon.png
index 7f9040f..7f9040f 100644
--- a/mvc/resources/images/showfile-icon.png
+++ b/lvc/resources/images/showfile-icon.png
diff --git a/mvc/resources/nsis/mvc-logo.ico b/lvc/resources/nsis/lvc-logo.ico
index 007a929..007a929 100644
--- a/mvc/resources/nsis/mvc-logo.ico
+++ b/lvc/resources/nsis/lvc-logo.ico
diff --git a/mvc/resources/nsis/modern-wizard.bmp b/lvc/resources/nsis/modern-wizard.bmp
index d8ea8d9..d8ea8d9 100644
--- a/mvc/resources/nsis/modern-wizard.bmp
+++ b/lvc/resources/nsis/modern-wizard.bmp
diff --git a/mvc/resources/nsis/plugins/nsProcess.dll b/lvc/resources/nsis/plugins/nsProcess.dll
index 4355d4a..4355d4a 100644
--- a/mvc/resources/nsis/plugins/nsProcess.dll
+++ b/lvc/resources/nsis/plugins/nsProcess.dll
diff --git a/mvc/resources/nsis/plugins/nsProcess.nsh b/lvc/resources/nsis/plugins/nsProcess.nsh
index 76642e0..76642e0 100644
--- a/mvc/resources/nsis/plugins/nsProcess.nsh
+++ b/lvc/resources/nsis/plugins/nsProcess.nsh
diff --git a/mvc/resources/windows/README b/lvc/resources/windows/README
index bcc603e..bcc603e 100644
--- a/mvc/resources/windows/README
+++ b/lvc/resources/windows/README
diff --git a/mvc/resources/windows/gtkrc b/lvc/resources/windows/gtkrc
index 45a6969..45a6969 100755
--- a/mvc/resources/windows/gtkrc
+++ b/lvc/resources/windows/gtkrc
diff --git a/mvc/settings.py b/lvc/settings.py
index 4d7255c..a9b8266 100644
--- a/mvc/settings.py
+++ b/lvc/settings.py
@@ -2,7 +2,7 @@ import logging
 import os
 import sys
 
-from mvc import execute
+from lvc import execute
 
 ffmpeg_version = None
 
diff --git a/mvc/signals.py b/lvc/signals.py
index 2f64dc9..2f64dc9 100644
--- a/mvc/signals.py
+++ b/lvc/signals.py
diff --git a/mvc/ui/__init__.py b/lvc/ui/__init__.py
index e69de29..e69de29 100644
--- a/mvc/ui/__init__.py
+++ b/lvc/ui/__init__.py
diff --git a/mvc/ui/console.py b/lvc/ui/console.py
index a9751ac..e7eec9c 100644
--- a/mvc/ui/console.py
+++ b/lvc/ui/console.py
@@ -4,14 +4,14 @@ import optparse
 import time
 import sys
 
-import mvc
-from mvc.widgets import app
-from mvc.widgets import initialize
+import lvc
+from lvc.widgets import app
+from lvc.widgets import initialize
 
 parser = optparse.OptionParser(
     usage='%prog [-l] [--list-converters] [-c <converter> <filenames..>]',
-    version='%prog ' + mvc.VERSION,
-    prog='python -m mvc.ui.console')
+    version='%prog ' + lvc.VERSION,
+    prog='python -m lvc.ui.console')
 parser.add_option('-j', '--json', action='store_true',
                   dest='json',
                   help='Output JSON documents, rather than text.')
@@ -21,7 +21,7 @@ parser.add_option('-l', '--list-converters', action='store_true',
 parser.add_option('-c', '--converter', dest='converter',
                   help="Specify the type of conversion to make.")
 
-class Application(mvc.Application):
+class Application(lvc.Application):
 
     def run(self):
         (options, args) = parser.parse_args()
diff --git a/mvc/ui/widgets.py b/lvc/ui/widgets.py
index 28dabff..7849e2a 100644
--- a/mvc/ui/widgets.py
+++ b/lvc/ui/widgets.py
@@ -6,31 +6,31 @@ import os
 import sys
 
 try:
-    import mvc
+    import lvc
 except ImportError:
-    mvc_path = os.path.join(os.path.dirname(__file__), '..', '..')
-    sys.path.append(mvc_path)
-    import mvc
+    lvc_path = os.path.join(os.path.dirname(__file__), '..', '..')
+    sys.path.append(lvc_path)
+    import lvc
 
 import copy
 import tempfile
 import urllib
 import urlparse
 
-from mvc.widgets import (initialize, idle_add, mainloop_start, mainloop_stop,
+from lvc.widgets import (initialize, idle_add, mainloop_start, mainloop_stop,
                          attach_menubar, reveal_file, get_conversion_directory)
-from mvc.widgets import menus
-from mvc.widgets import widgetset
-from mvc.widgets import cellpack
-from mvc.widgets import widgetconst
-from mvc.widgets import widgetutil
-from mvc.widgets import app
-
-from mvc.converter import ConverterInfo
-from mvc.video import VideoFile
-from mvc.resources import image_path
-from mvc.utils import size_string, round_even, convert_path_for_subprocess
-from mvc import openfiles
+from lvc.widgets import menus
+from lvc.widgets import widgetset
+from lvc.widgets import cellpack
+from lvc.widgets import widgetconst
+from lvc.widgets import widgetutil
+from lvc.widgets import app
+
+from lvc.converter import ConverterInfo
+from lvc.video import VideoFile
+from lvc.resources import image_path
+from lvc.utils import size_string, round_even, convert_path_for_subprocess
+from lvc import openfiles
 
 BUTTON_FONT = widgetutil.font_scale_from_osx_points(15.0)
 LARGE_FONT = widgetutil.font_scale_from_osx_points(13.0)
@@ -1018,9 +1018,9 @@ class TextDialog(widgetset.Dialog):
     def set_text(self, text):
         self.textbox.set_text(text)
 
-class Application(mvc.Application):
+class Application(lvc.Application):
     def __init__(self, simultaneous=None):
-        mvc.Application.__init__(self, simultaneous)
+        lvc.Application.__init__(self, simultaneous)
         self.create_signal('window-shown')
         self.sent_window_shown = False
 
@@ -1030,7 +1030,7 @@ class Application(mvc.Application):
 
         self.current_converter = EMPTY_CONVERTER
 
-        mvc.Application.startup(self)
+        lvc.Application.startup(self)
 
         self.menu_manager = menus.MenuManager()
         self.menu_manager.setup_menubar(self.menubar)
diff --git a/mvc/utils.py b/lvc/utils.py
index e0a64f3..e0a64f3 100644
--- a/mvc/utils.py
+++ b/lvc/utils.py
diff --git a/mvc/video.py b/lvc/video.py
index 0b89b63..81283be 100644
--- a/mvc/video.py
+++ b/lvc/video.py
@@ -4,10 +4,10 @@ import re
 import tempfile
 import threading
 
-from mvc import execute
-from mvc.widgets import idle_add
-from mvc.settings import get_ffmpeg_executable_path
-from mvc.utils import hms_to_seconds, convert_path_for_subprocess
+from lvc import execute
+from lvc.widgets import idle_add
+from lvc.settings import get_ffmpeg_executable_path
+from lvc.utils import hms_to_seconds, convert_path_for_subprocess
 
 logger = logging.getLogger(__name__)
 
diff --git a/mvc/widgets/__init__.py b/lvc/widgets/__init__.py
index 23a6edc..23a6edc 100644
--- a/mvc/widgets/__init__.py
+++ b/lvc/widgets/__init__.py
diff --git a/mvc/widgets/app.py b/lvc/widgets/app.py
index 531b745..531b745 100644
--- a/mvc/widgets/app.py
+++ b/lvc/widgets/app.py
diff --git a/mvc/widgets/cellpack.py b/lvc/widgets/cellpack.py
index 1347f56..1347f56 100644
--- a/mvc/widgets/cellpack.py
+++ b/lvc/widgets/cellpack.py
diff --git a/mvc/widgets/dialogs.py b/lvc/widgets/dialogs.py
index 3ccdcd7..b6b2b70 100644
--- a/mvc/widgets/dialogs.py
+++ b/lvc/widgets/dialogs.py
@@ -39,8 +39,8 @@ dialogs, so they can present a somewhat nicer API.  One important
 difference is that all of the dialogs run modally.
 """
 
-from mvc.widgets import widgetset
-from mvc.widgets import widgetutil
+from lvc.widgets import widgetset
+from lvc.widgets import widgetutil
 
 class DialogButton(object):
     def __init__(self, text):
diff --git a/mvc/widgets/gtk/__init__.py b/lvc/widgets/gtk/__init__.py
index 8e58700..e3d666b 100644
--- a/mvc/widgets/gtk/__init__.py
+++ b/lvc/widgets/gtk/__init__.py
@@ -10,7 +10,7 @@ def initialize(app):
     app.run()
 
 def attach_menubar():
-    from mvc.widgets import app
+    from lvc.widgets import app
     app.widgetapp.vbox.pack_start(app.widgetapp.menubar)
 
 def mainloop_start():
@@ -53,7 +53,7 @@ def reveal_file(filename):
         open_file_linux(filename)
 
 def get_conversion_directory_windows():
-    from mvc.windows import specialfolders
+    from lvc.windows import specialfolders
     return specialfolders.base_movies_directory
 
 def get_conversion_directory_linux():
diff --git a/mvc/widgets/gtk/base.py b/lvc/widgets/gtk/base.py
index e02db3f..ed6129f 100644
--- a/mvc/widgets/gtk/base.py
+++ b/lvc/widgets/gtk/base.py
@@ -31,7 +31,7 @@
 
 import gtk
 
-from mvc import signals
+from lvc import signals
 import wrappermap
 from .weakconnect import weak_connect
 import keymap
diff --git a/mvc/widgets/gtk/const.py b/lvc/widgets/gtk/const.py
index 5e9ec05..5e9ec05 100644
--- a/mvc/widgets/gtk/const.py
+++ b/lvc/widgets/gtk/const.py
diff --git a/mvc/widgets/gtk/contextmenu.py b/lvc/widgets/gtk/contextmenu.py
index cd5b6ba..cd5b6ba 100644
--- a/mvc/widgets/gtk/contextmenu.py
+++ b/lvc/widgets/gtk/contextmenu.py
diff --git a/mvc/widgets/gtk/controls.py b/lvc/widgets/gtk/controls.py
index 4367c1f..26ce6d6 100644
--- a/mvc/widgets/gtk/controls.py
+++ b/lvc/widgets/gtk/controls.py
@@ -32,7 +32,7 @@
 import gtk
 import pango
 
-from mvc.widgets import widgetconst
+from lvc.widgets import widgetconst
 import layout
 from .base import Widget
 from .simple import Label
diff --git a/mvc/widgets/gtk/customcontrols.py b/lvc/widgets/gtk/customcontrols.py
index 070cebd..ff5b068 100644
--- a/mvc/widgets/gtk/customcontrols.py
+++ b/lvc/widgets/gtk/customcontrols.py
@@ -43,7 +43,7 @@ from .base import Widget
 from .simple import Label, Image
 from .drawing import (CustomDrawingMixin, Drawable,
     ImageSurface)
-from mvc.widgets import widgetconst
+from lvc.widgets import widgetconst
 
 class CustomControlMixin(CustomDrawingMixin):
     def do_expose_event(self, event):
diff --git a/mvc/widgets/gtk/drawing.py b/lvc/widgets/gtk/drawing.py
index 5888851..5888851 100644
--- a/mvc/widgets/gtk/drawing.py
+++ b/lvc/widgets/gtk/drawing.py
diff --git a/mvc/widgets/gtk/gtkmenus.py b/lvc/widgets/gtk/gtkmenus.py
index 926ba15..0e89fa8 100644
--- a/mvc/widgets/gtk/gtkmenus.py
+++ b/lvc/widgets/gtk/gtkmenus.py
@@ -31,7 +31,7 @@
 
 import gtk
 
-from mvc.widgets import app
+from lvc.widgets import app
 
 import base
 import keymap
diff --git a/mvc/widgets/gtk/keymap.py b/lvc/widgets/gtk/keymap.py
index cf341ff..537525a 100644
--- a/mvc/widgets/gtk/keymap.py
+++ b/lvc/widgets/gtk/keymap.py
@@ -32,7 +32,7 @@
 
 import gtk
 
-from mvc.widgets import keyboard
+from lvc.widgets import keyboard
 
 menubar_mod_map = {
     keyboard.MOD: '<Ctrl>',
diff --git a/mvc/widgets/gtk/layout.py b/lvc/widgets/gtk/layout.py
index d887fcb..549311c 100644
--- a/mvc/widgets/gtk/layout.py
+++ b/lvc/widgets/gtk/layout.py
@@ -31,7 +31,7 @@
 
 import gtk
 
-from mvc.utils import Matrix
+from lvc.utils import Matrix
 from .base import Widget, Bin
 
 class Box(Widget):
diff --git a/mvc/widgets/gtk/layoutmanager.py b/lvc/widgets/gtk/layoutmanager.py
index fb60049..8097b2e 100644
--- a/mvc/widgets/gtk/layoutmanager.py
+++ b/lvc/widgets/gtk/layoutmanager.py
@@ -38,7 +38,7 @@ import cairo
 import gtk
 import pango
 
-from mvc import utils
+from lvc import utils
 
 use_native_buttons = False # not implemented in MVC
 
diff --git a/mvc/widgets/gtk/simple.py b/lvc/widgets/gtk/simple.py
index f0921e0..102fcd4 100644
--- a/mvc/widgets/gtk/simple.py
+++ b/lvc/widgets/gtk/simple.py
@@ -33,7 +33,7 @@ import gtk
 import gobject
 import pango
 
-from mvc.widgets import widgetconst
+from lvc.widgets import widgetconst
 from .base import Widget, Bin
 
 class Image(object):
diff --git a/mvc/widgets/gtk/tableview.py b/lvc/widgets/gtk/tableview.py
index 930270c..df66990 100644
--- a/mvc/widgets/gtk/tableview.py
+++ b/lvc/widgets/gtk/tableview.py
@@ -43,11 +43,11 @@ from collections import namedtuple
 CUSTOM_HEADER_HEIGHT = 25
 HEADER_HEIGHT = 25
 
-from mvc import signals
-from mvc.errors import (WidgetActionError, WidgetDomainError,
+from lvc import signals
+from lvc.errors import (WidgetActionError, WidgetDomainError,
                                 WidgetRangeError, WidgetNotReadyError)
-from mvc.widgets.tableselection import SelectionOwnerMixin
-from mvc.widgets.tablescroll import ScrollbarOwnerMixin
+from lvc.widgets.tableselection import SelectionOwnerMixin
+from lvc.widgets.tablescroll import ScrollbarOwnerMixin
 import drawing
 import wrappermap
 from .base import Widget
diff --git a/mvc/widgets/gtk/tableviewcells.py b/lvc/widgets/gtk/tableviewcells.py
index 33ac6f8..6511970 100644
--- a/mvc/widgets/gtk/tableviewcells.py
+++ b/lvc/widgets/gtk/tableviewcells.py
@@ -33,8 +33,8 @@ import gobject
 import gtk
 import pango
 
-from mvc import signals
-from mvc.widgets import widgetconst
+from lvc import signals
+from lvc.widgets import widgetconst
 import drawing
 import wrappermap
 from .base import make_gdk_color
diff --git a/mvc/widgets/gtk/weakconnect.py b/lvc/widgets/gtk/weakconnect.py
index b8b9526..204a855 100644
--- a/mvc/widgets/gtk/weakconnect.py
+++ b/lvc/widgets/gtk/weakconnect.py
@@ -33,7 +33,7 @@ This is a good thing because it prevents circular references between wrapper
 widgets and the wrapped GTK widget.
 """
 
-from mvc import signals
+from lvc import signals
 
 class WeakSignalHandler(object):
     def __init__(self, method):
diff --git a/mvc/widgets/gtk/widgets.py b/lvc/widgets/gtk/widgets.py
index 6c4280d..6c4280d 100644
--- a/mvc/widgets/gtk/widgets.py
+++ b/lvc/widgets/gtk/widgets.py
diff --git a/mvc/widgets/gtk/widgetset.py b/lvc/widgets/gtk/widgetset.py
index c63855c..c63855c 100644
--- a/mvc/widgets/gtk/widgetset.py
+++ b/lvc/widgets/gtk/widgetset.py
diff --git a/mvc/widgets/gtk/window.py b/lvc/widgets/gtk/window.py
index 3859a1a..de912cc 100644
--- a/mvc/widgets/gtk/window.py
+++ b/lvc/widgets/gtk/window.py
@@ -33,8 +33,8 @@ import gobject
 import gtk
 import os
 
-from mvc import resources
-from mvc import signals
+from lvc import resources
+from lvc import signals
 
 import keymap
 import layout
@@ -173,7 +173,7 @@ class Window(WindowBase):
 
     def setup_icon(self):
         icon_pixbuf = gtk.gdk.pixbuf_new_from_file(
-                resources.image_path("mvc-logo.png"))
+                resources.image_path("lvc-logo.png"))
         self._window.set_icon(icon_pixbuf)
 
 
@@ -428,7 +428,7 @@ class Dialog(DialogBase):
         return packing_vbox
 
     def add_button(self, text):
-        from mvc.widgets import dialogs
+        from lvc.widgets import dialogs
         _stock = {
             dialogs.BUTTON_OK.text: gtk.STOCK_OK,
             dialogs.BUTTON_CANCEL.text: gtk.STOCK_CANCEL,
@@ -614,7 +614,7 @@ class AboutDialog(Dialog):
         #        app.config.get(prefs.APP_REVISION_NUM))
         #else:
         #    version = "%s" % app.config.get(prefs.APP_VERSION)
-        version = '3.0'
+        version = '1.0.1'
         #name_label = gtk.Label(
         #    '<span size="xx-large" weight="bold">%s %s</span>' % (
         #        app.config.get(prefs.SHORT_APP_NAME), version))
diff --git a/mvc/widgets/gtk/wrappermap.py b/lvc/widgets/gtk/wrappermap.py
index c2b2aad..c2b2aad 100644
--- a/mvc/widgets/gtk/wrappermap.py
+++ b/lvc/widgets/gtk/wrappermap.py
diff --git a/mvc/widgets/keyboard.py b/lvc/widgets/keyboard.py
index 6700de2..6700de2 100644
--- a/mvc/widgets/keyboard.py
+++ b/lvc/widgets/keyboard.py
diff --git a/mvc/widgets/menus.py b/lvc/widgets/menus.py
index 62b0c68..4e23b46 100644
--- a/mvc/widgets/menus.py
+++ b/lvc/widgets/menus.py
@@ -7,12 +7,12 @@
 
 import collections
 
-from mvc import signals
-from mvc.widgets import widgetutil
-from mvc.widgets import widgetset
-from mvc.widgets import app
+from lvc import signals
+from lvc.widgets import widgetutil
+from lvc.widgets import widgetset
+from lvc.widgets import app
 
-from mvc.widgets.keyboard import (Shortcut, CTRL, ALT, SHIFT, CMD,
+from lvc.widgets.keyboard import (Shortcut, CTRL, ALT, SHIFT, CMD,
      MOD, RIGHT_ARROW, LEFT_ARROW, UP_ARROW, DOWN_ARROW, SPACE, ENTER, DELETE,
      BKSPACE, ESCAPE, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12)
 
diff --git a/mvc/widgets/osx/Resources-Widgets/MainMenu.nib/designable.nib b/lvc/widgets/osx/Resources-Widgets/MainMenu.nib/designable.nib
index b7fefd6..b7fefd6 100644
--- a/mvc/widgets/osx/Resources-Widgets/MainMenu.nib/designable.nib
+++ b/lvc/widgets/osx/Resources-Widgets/MainMenu.nib/designable.nib
diff --git a/mvc/widgets/osx/Resources-Widgets/MainMenu.nib/keyedobjects.nib b/lvc/widgets/osx/Resources-Widgets/MainMenu.nib/keyedobjects.nib
index 963b444..963b444 100644
--- a/mvc/widgets/osx/Resources-Widgets/MainMenu.nib/keyedobjects.nib
+++ b/lvc/widgets/osx/Resources-Widgets/MainMenu.nib/keyedobjects.nib
diff --git a/mvc/widgets/osx/__init__.py b/lvc/widgets/osx/__init__.py
index f227b35..86653eb 100644
--- a/mvc/widgets/osx/__init__.py
+++ b/lvc/widgets/osx/__init__.py
@@ -10,7 +10,7 @@ size_request_manager = None
 
 class AppController(NSObject):
     def applicationDidFinishLaunching_(self, notification):
-        from mvc.widgets.osx.osxmenus import MenuBar
+        from lvc.widgets.osx.osxmenus import MenuBar
         self.portableApp.menubar = MenuBar()
         self.portableApp.startup()
         self.portableApp.run()
@@ -19,7 +19,7 @@ class AppController(NSObject):
         self.portableApp = portableApp
 
     def handleMenuActivate_(self, menu_item):
-        from mvc.widgets.osx import osxmenus
+        from lvc.widgets.osx import osxmenus
         osxmenus.handle_menu_activate(menu_item)
 
 def initialize(app):
@@ -29,7 +29,7 @@ def initialize(app):
     nsapp.setDelegate_(delegate)
 
     global size_request_manager
-    from mvc.widgets.osx.widgetupdates import SizeRequestManager
+    from lvc.widgets.osx.widgetupdates import SizeRequestManager
     size_request_manager = SizeRequestManager()
 
     NSApplicationMain(sys.argv)
diff --git a/mvc/widgets/osx/base.py b/lvc/widgets/osx/base.py
index 913b372..30536aa 100644
--- a/mvc/widgets/osx/base.py
+++ b/lvc/widgets/osx/base.py
@@ -33,7 +33,7 @@ from AppKit import *
 from Foundation import *
 from objc import YES, NO, nil
 
-from mvc import signals
+from lvc import signals
 import wrappermap
 from .viewport import Viewport, BorrowedViewport
 
@@ -70,7 +70,7 @@ class Widget(signals.SignalEmitter):
         self.invalidate_size_request()
 
     def clear_size_request_cache(self):
-        from mvc.widgets.osx import size_request_manager
+        from lvc.widgets.osx import size_request_manager
         if size_request_manager is not None:
             while size_request_manager.widgets_to_request:
                 size_request_manager._run_requests()
@@ -93,7 +93,7 @@ class Widget(signals.SignalEmitter):
             return self.cached_size_request
 
     def invalidate_size_request(self):
-        from mvc.widgets.osx import size_request_manager
+        from lvc.widgets.osx import size_request_manager
         if size_request_manager is not None:
             size_request_manager.add_widget(self)
 
diff --git a/mvc/widgets/osx/const.py b/lvc/widgets/osx/const.py
index ae0da40..ae0da40 100644
--- a/mvc/widgets/osx/const.py
+++ b/lvc/widgets/osx/const.py
diff --git a/mvc/widgets/osx/contextmenu.py b/lvc/widgets/osx/contextmenu.py
index 7a8fa55..7a8fa55 100644
--- a/mvc/widgets/osx/contextmenu.py
+++ b/lvc/widgets/osx/contextmenu.py
diff --git a/mvc/widgets/osx/control.py b/lvc/widgets/osx/control.py
index ed6ea34..63419d5 100644
--- a/mvc/widgets/osx/control.py
+++ b/lvc/widgets/osx/control.py
@@ -33,7 +33,7 @@ from AppKit import *
 from Foundation import *
 from objc import YES, NO, nil
 
-from mvc.widgets import widgetconst
+from lvc.widgets import widgetconst
 import wrappermap
 from .base import Widget
 from .helpers import NotificationForwarder
diff --git a/mvc/widgets/osx/customcontrol.py b/lvc/widgets/osx/customcontrol.py
index d100f33..4a32b8e 100644
--- a/mvc/widgets/osx/customcontrol.py
+++ b/lvc/widgets/osx/customcontrol.py
@@ -35,7 +35,7 @@ from AppKit import *
 from Foundation import *
 from objc import YES, NO, nil
 
-from mvc.widgets import widgetconst
+from lvc.widgets import widgetconst
 import wrappermap
 from .base import Widget
 import drawing
diff --git a/mvc/widgets/osx/drawing.py b/lvc/widgets/osx/drawing.py
index aaad1e9..aaad1e9 100644
--- a/mvc/widgets/osx/drawing.py
+++ b/lvc/widgets/osx/drawing.py
diff --git a/mvc/widgets/osx/drawingwidgets.py b/lvc/widgets/osx/drawingwidgets.py
index 74e8232..74e8232 100644
--- a/mvc/widgets/osx/drawingwidgets.py
+++ b/lvc/widgets/osx/drawingwidgets.py
diff --git a/mvc/widgets/osx/fasttypes.c b/lvc/widgets/osx/fasttypes.c
index 72d3b5b..72d3b5b 100644
--- a/mvc/widgets/osx/fasttypes.c
+++ b/lvc/widgets/osx/fasttypes.c
diff --git a/mvc/widgets/osx/helpers.py b/lvc/widgets/osx/helpers.py
index e4aa23a..e4aa23a 100644
--- a/mvc/widgets/osx/helpers.py
+++ b/lvc/widgets/osx/helpers.py
diff --git a/mvc/widgets/osx/layout.py b/lvc/widgets/osx/layout.py
index 0238975..f18a47f 100644
--- a/mvc/widgets/osx/layout.py
+++ b/lvc/widgets/osx/layout.py
@@ -49,7 +49,7 @@ from objc import YES, NO, nil, signature, loadBundle
 import tableview
 import wrappermap
 from .base import Container, Bin, FlippedView
-from mvc.utils import Matrix
+from lvc.utils import Matrix
 
 # These don't seem to be in pyobjc's AppKit (yet)
 NSScrollerKnobStyleDefault = 0
diff --git a/mvc/widgets/osx/layoutmanager.py b/lvc/widgets/osx/layoutmanager.py
index de4301b..de4301b 100644
--- a/mvc/widgets/osx/layoutmanager.py
+++ b/lvc/widgets/osx/layoutmanager.py
diff --git a/mvc/widgets/osx/osxmenus.py b/lvc/widgets/osx/osxmenus.py
index 32ca469..91baf3a 100644
--- a/mvc/widgets/osx/osxmenus.py
+++ b/lvc/widgets/osx/osxmenus.py
@@ -37,10 +37,10 @@ import AppKit
 from AppKit import *
 from Foundation import *
 
-from mvc import signals
-from mvc.widgets import keyboard
+from lvc import signals
+from lvc.widgets import keyboard
 # import these names directly into our namespace for easy access
-from mvc.widgets.keyboard import Shortcut, MOD
+from lvc.widgets.keyboard import Shortcut, MOD
 
 # XXX hacks
 def _(text, *params):
diff --git a/mvc/widgets/osx/rect.py b/lvc/widgets/osx/rect.py
index 3c8d448..3c8d448 100644
--- a/mvc/widgets/osx/rect.py
+++ b/lvc/widgets/osx/rect.py
diff --git a/mvc/widgets/osx/simple.py b/lvc/widgets/osx/simple.py
index 1c12b06..37407a1 100644
--- a/mvc/widgets/osx/simple.py
+++ b/lvc/widgets/osx/simple.py
@@ -35,7 +35,7 @@ from AppKit import *
 from Foundation import *
 from objc import YES, NO, nil
 
-from mvc.widgets import widgetconst
+from lvc.widgets import widgetconst
 from .base import Widget, SimpleBin, FlippedView
 from .utils import filename_to_unicode
 import drawing
diff --git a/mvc/widgets/osx/tablemodel.py b/lvc/widgets/osx/tablemodel.py
index 980b60b..d81a8f5 100644
--- a/mvc/widgets/osx/tablemodel.py
+++ b/lvc/widgets/osx/tablemodel.py
@@ -36,8 +36,8 @@ from AppKit import (NSDragOperationNone, NSDragOperationAll, NSTableViewDropOn,
 from Foundation import NSObject, NSNotFound, NSMutableIndexSet
 from objc import YES, NO, nil
 
-from mvc import signals
-from mvc.errors import WidgetActionError
+from lvc import signals
+from lvc.errors import WidgetActionError
 import fasttypes
 import wrappermap
 
diff --git a/mvc/widgets/osx/tableview.py b/lvc/widgets/osx/tableview.py
index 2d2256f..9f490d2 100644
--- a/mvc/widgets/osx/tableview.py
+++ b/lvc/widgets/osx/tableview.py
@@ -40,11 +40,11 @@ from AppKit import *
 from Foundation import *
 from objc import YES, NO, nil
 
-from mvc import signals
-from mvc import errors
-from mvc.widgets import widgetconst
-from mvc.widgets.tableselection import SelectionOwnerMixin
-from mvc.widgets.tablescroll import ScrollbarOwnerMixin
+from lvc import signals
+from lvc import errors
+from lvc.widgets import widgetconst
+from lvc.widgets.tableselection import SelectionOwnerMixin
+from lvc.widgets.tablescroll import ScrollbarOwnerMixin
 from .utils import filename_to_unicode
 import wrappermap
 import tablemodel
diff --git a/mvc/widgets/osx/utils.py b/lvc/widgets/osx/utils.py
index c0c2d85..c0c2d85 100644
--- a/mvc/widgets/osx/utils.py
+++ b/lvc/widgets/osx/utils.py
diff --git a/mvc/widgets/osx/viewport.py b/lvc/widgets/osx/viewport.py
index e6564d4..e6564d4 100644
--- a/mvc/widgets/osx/viewport.py
+++ b/lvc/widgets/osx/viewport.py
diff --git a/mvc/widgets/osx/widgetset.py b/lvc/widgets/osx/widgetset.py
index 1203566..1203566 100644
--- a/mvc/widgets/osx/widgetset.py
+++ b/lvc/widgets/osx/widgetset.py
diff --git a/mvc/widgets/osx/widgetupdates.py b/lvc/widgets/osx/widgetupdates.py
index 30677c2..30677c2 100644
--- a/mvc/widgets/osx/widgetupdates.py
+++ b/lvc/widgets/osx/widgetupdates.py
diff --git a/mvc/widgets/osx/window.py b/lvc/widgets/osx/window.py
index b959333..53b1091 100644
--- a/mvc/widgets/osx/window.py
+++ b/lvc/widgets/osx/window.py
@@ -36,8 +36,8 @@ from Foundation import *
 from objc import YES, NO, nil
 from PyObjCTools import AppHelper
 
-from mvc import signals
-from mvc.widgets import widgetconst
+from lvc import signals
+from lvc.widgets import widgetconst
 import wrappermap
 import osxmenus
 from .helpers import NotificationForwarder
diff --git a/mvc/widgets/osx/wrappermap.py b/lvc/widgets/osx/wrappermap.py
index 624a496..624a496 100644
--- a/mvc/widgets/osx/wrappermap.py
+++ b/lvc/widgets/osx/wrappermap.py
diff --git a/mvc/widgets/tablescroll.py b/lvc/widgets/tablescroll.py
index 841e62c..f8b1acb 100644
--- a/mvc/widgets/tablescroll.py
+++ b/lvc/widgets/tablescroll.py
@@ -31,7 +31,7 @@
 like scroll_to_item works the same way across platforms.
 """
 
-from mvc.errors import WidgetActionError
+from lvc.errors import WidgetActionError
 
 
 class ScrollbarOwnerMixin(object):
diff --git a/mvc/widgets/tableselection.py b/lvc/widgets/tableselection.py
index d087d34..ee6472c 100644
--- a/mvc/widgets/tableselection.py
+++ b/lvc/widgets/tableselection.py
@@ -33,7 +33,7 @@ the platform tableview modules provide the platform-specific methods used here.
 
 from contextlib import contextmanager
 
-from mvc.errors import WidgetActionError, WidgetUsageError
+from lvc.errors import WidgetActionError, WidgetUsageError
 
 class SelectionOwnerMixin(object):
     """Encapsulates the selection functionality of a TableView, for
diff --git a/mvc/widgets/widgetconst.py b/lvc/widgets/widgetconst.py
index bbb513c..bbb513c 100644
--- a/mvc/widgets/widgetconst.py
+++ b/lvc/widgets/widgetconst.py
diff --git a/mvc/widgets/widgetutil.py b/lvc/widgets/widgetutil.py
index 5fb3db2..861ed5f 100644
--- a/mvc/widgets/widgetutil.py
+++ b/lvc/widgets/widgetutil.py
@@ -1,6 +1,6 @@
 from math import pi as PI
-from mvc.widgets import widgetset
-from mvc.resources import image_path
+from lvc.widgets import widgetset
+from lvc.resources import image_path
 
 def make_surface(image_name, height=None):
     path = image_path(image_name + '.png')
diff --git a/mvc/windows/__init__.py b/lvc/windows/__init__.py
index e69de29..e69de29 100644
--- a/mvc/windows/__init__.py
+++ b/lvc/windows/__init__.py
diff --git a/mvc/windows/autoupdate.py b/lvc/windows/autoupdate.py
index 6264912..f6d47c8 100644
--- a/mvc/windows/autoupdate.py
+++ b/lvc/windows/autoupdate.py
@@ -35,7 +35,7 @@ import logging
 
 winsparkle = ctypes.cdll.WinSparkle
 
-APPCAST_URL = 'http://miro-updates.participatoryculture.org/mvc-appcast.xml'
+APPCAST_URL = 'http://miro-updates.participatoryculture.org/lvc-appcast.xml'
 
 def startup():
     enable_automatic_checks()
@@ -61,8 +61,8 @@ def open_winsparkle_key():
     with open_or_create_key(winreg.HKEY_CURRENT_USER, "Software") as software:
         with open_or_create_key(software,
                                 "Participatory Culture Foundation") as pcf:
-            with open_or_create_key(pcf, "Libre Video Converter") as mvc:
-                return open_or_create_key(mvc, "WinSparkle",
+            with open_or_create_key(pcf, "Libre Video Converter") as lvc:
+                return open_or_create_key(lvc, "WinSparkle",
                                           write_access=True)
 
 def open_or_create_key(key, subkey, write_access=False):
@@ -95,7 +95,7 @@ def check_for_updates_set(winsparkle_key):
 def set_default_check_for_updates(winsparkle_key):
     """Initialize the WinSparkle regstry values with our defaults.
 
-    :param mvc_key winreg.HKey object for to the MVC registry
+    :param lvc_key winreg.HKey object for to the MVC registry
     """
     logging.info("Writing WinSparkle keys")
     winreg.SetValueEx(winsparkle_key, "CheckForUpdates", 0, winreg.REG_SZ, "1")
diff --git a/mvc/windows/exe_main.py b/lvc/windows/exe_main.py
index bd171d3..66b97a5 100755
--- a/mvc/windows/exe_main.py
+++ b/lvc/windows/exe_main.py
@@ -1,15 +1,15 @@
 # before anything else, settup logging
-from mvc.windows import exelogging
+from lvc.windows import exelogging
 exelogging.setup_logging()
 
 import os
 import sys
 
-from mvc import settings
-from mvc.windows import autoupdate
-from mvc.widgets import app
-from mvc.widgets import initialize
-from mvc.ui.widgets import Application
+from lvc import settings
+from lvc.windows import autoupdate
+from lvc.widgets import app
+from lvc.widgets import initialize
+from lvc.ui.widgets import Application
 
 # add the directories for ffmpeg and avconv to our search path
 exe_dir = os.path.dirname(sys.executable)
diff --git a/mvc/windows/exelogging.py b/lvc/windows/exelogging.py
index a90fbfc..a63c836 100644
--- a/mvc/windows/exelogging.py
+++ b/lvc/windows/exelogging.py
@@ -1,4 +1,4 @@
-"""mvc.windows.exelogging -- handle logging inside an exe file
+"""lvc.windows.exelogging -- handle logging inside an exe file
 
 Most of this is copied from the Miro code.
 """
diff --git a/mvc/windows/specialfolders.py b/lvc/windows/specialfolders.py
index 2e1e7c6..2e1e7c6 100644
--- a/mvc/windows/specialfolders.py
+++ b/lvc/windows/specialfolders.py
diff --git a/make_disk_image.sh b/make_disk_image.sh
index b6cda2c..6e818d8 100755
--- a/make_disk_image.sh
+++ b/make_disk_image.sh
@@ -2,7 +2,7 @@
 #echo "Building app..."
 #python2.7 setup.py py2app
 echo "Building disk image..."
-imgName=`date '+mvc-%Y-%m-%d.dmg'`
+imgName=`date '+lvc-%Y-%m-%d.dmg'`
 imgDirName="dist/img"
 imgPath="dist/$imgName"
 rm -rf $imgDirName $imgPath
@@ -10,6 +10,6 @@ mkdir $imgDirName
 cp -r dist/Libre\ Video\ Converter.app $imgDirName/
 ln -s /Applications $imgDirName/Applications
 echo "Creating DMG file... "
-hdiutil create -srcfolder $imgDirName -volname mvc -format UDZO dist/mvc.tmp.dmg
-hdiutil convert -format UDZO -imagekey zlib-level=9 -o $imgPath dist/mvc.tmp.dmg
-rm dist/mvc.tmp.dmg
+hdiutil create -srcfolder $imgDirName -volname lvc -format UDZO dist/lvc.tmp.dmg
+hdiutil convert -format UDZO -imagekey zlib-level=9 -o $imgPath dist/lvc.tmp.dmg
+rm dist/lvc.tmp.dmg
diff --git a/mvc/__main__.py b/mvc/__main__.py
deleted file mode 100644
index 1992c4e..0000000
--- a/mvc/__main__.py
+++ /dev/null
@@ -1,9 +0,0 @@
-if __name__ == "__main__":
-    try:
-        from mvc.ui.widgets import Application
-    except ImportError:
-        from mvc.ui.console import Application
-    from mvc.widgets import app
-    from mvc.widgets import initialize
-    app.widgetapp = Application()
-    initialize(app.widgetapp)
diff --git a/mvc/osx/app_main.py b/mvc/osx/app_main.py
deleted file mode 100644
index ef52ff6..0000000
--- a/mvc/osx/app_main.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import os
-import sys
-
-from mvc.osx import autoupdate
-from mvc.widgets import app
-from mvc.widgets import initialize
-from mvc.ui.widgets import Application
-
-# run the app
-autoupdate.initialize()
-app.widgetapp = Application()
-initialize(app.widgetapp)
diff --git a/run-windows.sh b/run-windows.sh
index 728a876..8531708 100755
--- a/run-windows.sh
+++ b/run-windows.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-if [ ! -e mvc-env ] ; then
+if [ ! -e lvc-env ] ; then
         echo "LVC virtualenv is not present.  Run "
         echo
-        echo "   python helperscripts/windows-virtualenv/ mvc-env"
+        echo "   python helperscripts/windows-virtualenv/ lvc-env"
         echo
         echo "to build it"
         exit 1
 fi
 
-mvc-env/Scripts/python.exe setup.py py2exe && ./dist/mvcdebug.exe
+lvc-env/Scripts/python.exe setup.py py2exe && ./dist/lvcdebug.exe
diff --git a/scripts/libre-video-converter.py b/scripts/libre-video-converter.py
index 2404a28..a405610 100644
--- a/scripts/libre-video-converter.py
+++ b/scripts/libre-video-converter.py
@@ -1,10 +1,10 @@
 #!/usr/bin/python
 
 try:
-    from mvc.ui.widgets import Application
+    from lvc.ui.widgets import Application
 except ImportError:
-    from mvc.ui.console import Application
-from mvc.widgets import app
-from mvc.widgets import initialize
+    from lvc.ui.console import Application
+from lvc.widgets import app
+from lvc.widgets import initialize
 app.widgetapp = Application()
 initialize(app.widgetapp)
diff --git a/setup-files/osx/mvc3.icns b/setup-files/osx/lvc3.icns
index a56fd4d..a56fd4d 100644
--- a/setup-files/osx/mvc3.icns
+++ b/setup-files/osx/lvc3.icns
diff --git a/setup-files/osx/mvc3_definition.plist b/setup-files/osx/lvc3_definition.plist
index e14b95a..e14b95a 100644
--- a/setup-files/osx/mvc3_definition.plist
+++ b/setup-files/osx/lvc3_definition.plist
diff --git a/setup-files/osx/setup.py b/setup-files/osx/setup.py
index cddca4c..975183e 100644
--- a/setup-files/osx/setup.py
+++ b/setup-files/osx/setup.py
@@ -21,14 +21,14 @@ from distutils.dir_util import mkpath
 
 from py2app.build_app import py2app as py2app_cmd
 
-APP = ['mvc/osx/app_main.py']
-DATA_FILES = ['mvc/widgets/osx/Resources-Widgets/MainMenu.nib']
+APP = ['lvc/osx/app_main.py']
+DATA_FILES = ['lvc/widgets/osx/Resources-Widgets/MainMenu.nib']
 OPTIONS = {
-    'iconfile': os.path.join(SETUP_DIR, 'mvc3.icns'),
-    'excludes': ['mvc.widgets.gtk'],
-    'includes': ['mvc.widgets.osx.fasttypes'],
-    'packages': ['mvc', 'mvc.widgets', 'mvc.widgets.osx', 'mvc.ui',
-                 'mvc.qtfaststart', 'mvc.resources']
+    'iconfile': os.path.join(SETUP_DIR, 'lvc3.icns'),
+    'excludes': ['lvc.widgets.gtk'],
+    'includes': ['lvc.widgets.osx.fasttypes'],
+    'packages': ['lvc', 'lvc.widgets', 'lvc.widgets.osx', 'lvc.ui',
+                 'lvc.qtfaststart', 'lvc.resources']
 }
 
 # this should work if run from build.sh
@@ -50,7 +50,7 @@ def copy_binaries(source, target, binaries):
 def extract_tarball(tar_file, target_directory):
     subprocess.check_call(["tar", "-C", target_directory, "-zxf", tar_file])
 
-class py2app_mvc(py2app_cmd):
+class py2app_lvc(py2app_cmd):
     def run(self):
         py2app_cmd.run(self)
         self.setup_directories()
@@ -105,7 +105,7 @@ plist['CFBundleExecutable'] = 'Miro Video Converter'
 plist['CFBundleName'] = 'Miro Video Converter'
 plist['CFBundleVersion'] = '3.0'
 plist['SUFeedURL'] = ('http://miro-updates.participatoryculture.org/'
-                      'mvc-appcast-osx.xml')
+                      'lvc-appcast-osx.xml')
 plist['SUPublicDSAKeyFile'] = 'dsa_pub.pem'
 
 OPTIONS['plist'] = plist
@@ -115,9 +115,9 @@ setup(
     data_files=DATA_FILES,
     options={'py2app': OPTIONS},
     setup_requires=['py2app'],
-    cmdclass={'py2app': py2app_mvc},
+    cmdclass={'py2app': py2app_lvc},
     ext_modules=[
-        Extension("mvc.widgets.osx.fasttypes",
-                  [os.path.join(ROOT_DIR, 'mvc', 'widgets', 'osx', 'fasttypes.c')])],
+        Extension("lvc.widgets.osx.fasttypes",
+                  [os.path.join(ROOT_DIR, 'lvc', 'widgets', 'osx', 'fasttypes.c')])],
     **SETUP_ARGS
     )
diff --git a/setup-files/windows/mvc.nsi b/setup-files/windows/lvc.nsi
index 638d421..d40755e 100755
--- a/setup-files/windows/mvc.nsi
+++ b/setup-files/windows/lvc.nsi
@@ -6,8 +6,8 @@
 !define CONFIG_SHORT_APP_NAME "MVC"

 !define CONFIG_LONG_APP_NAME  "Libre Video Converter"

 !define CONFIG_PUBLISHER "Participatory Culture Foundation"

-!define CONFIG_ICON "mvc-logo.ico"

-!define CONFIG_EXECUTABLE "mvc.exe"

+!define CONFIG_ICON "lvc-logo.ico"

+!define CONFIG_EXECUTABLE "lvc.exe"

 !define CONFIG_OUTPUT_FILE "MiroVideoConverter.exe"

 

 !define INST_KEY "Software\${CONFIG_PUBLISHER}\${CONFIG_LONG_APP_NAME}"

diff --git a/setup-files/windows/setup.py b/setup-files/windows/setup.py
index 067e9d2..4492862 100644
--- a/setup-files/windows/setup.py
+++ b/setup-files/windows/setup.py
@@ -13,20 +13,20 @@ import sys
 
 import py2exe
 
-from mvc import resources
+from lvc import resources
 
 env_path = os.path.abspath(os.path.dirname(os.path.dirname(sys.executable)))
 nsis_path = os.path.join(env_path, 'nsis-2.46', 'makensis.exe')
 scripts_path = os.path.join(env_path, 'Scripts')
 
 packages = [
-    'mvc',
-    'mvc.widgets',
-    'mvc.widgets.gtk',
-    'mvc.ui',
-    'mvc.resources',
-    'mvc.windows',
-    'mvc.qtfaststart',
+    'lvc',
+    'lvc.widgets',
+    'lvc.widgets.gtk',
+    'lvc.ui',
+    'lvc.resources',
+    'lvc.windows',
+    'lvc.qtfaststart',
 ]
 
 def resources_dir():
@@ -102,13 +102,13 @@ class bdist_nsis(Command):
 
         log.info("building installer")
 
-        nsis_source = os.path.join(SETUP_DIR, 'mvc.nsi')
+        nsis_source = os.path.join(SETUP_DIR, 'lvc.nsi')
         self.copy_file(nsis_source, self.dist_dir)
         for nsis_file in glob(os.path.join(resources_dir(), 'nsis', '*.*')):
             self.copy_file(nsis_file, self.dist_dir)
 
         plugins_dir = os.path.join(resources_dir(), 'nsis', 'plugins')
-        script_path = os.path.join(self.dist_dir, 'mvc.nsi')
+        script_path = os.path.join(self.dist_dir, 'lvc.nsi')
         nsis_defines = {
             'CONFIG_PLUGIN_DIR': plugins_dir,
         }
@@ -122,14 +122,14 @@ class bdist_nsis(Command):
             return
 setup(
     windows=[
-        {'script': 'mvc/windows/exe_main.py',
-         'dest_base': 'mvc',
+        {'script': 'lvc/windows/exe_main.py',
+         'dest_base': 'lvc',
          'company_name': 'Participatory Culture Foundation',
         },
     ],
     console=[
-        {'script': 'mvc/windows/exe_main.py',
-         'dest_base': 'mvcdebug',
+        {'script': 'lvc/windows/exe_main.py',
+         'dest_base': 'lvcdebug',
          'company_name': 'Participatory Culture Foundation',
         },
     ],
diff --git a/setup.py b/setup.py
index d79c1df..eec6db0 100644
--- a/setup.py
+++ b/setup.py
@@ -1,30 +1,30 @@
 import os
 import sys
 
-version = '3.0.2'
+version = '1.0.1'
 
 # platform-independent arguments for setup()
 setup_args = {
     'name': 'librevideoconverter',
-    'description': 'A simple video converter for WebM (vp8), Ogg Theora, MP4 and others, fork of Miro Video Converter',
+    'description': 'A simple video converter for WebM (vp8, vp9), Ogg Theora, MP4 and others, fork of Miro Video Converter',
     'author': 'Jesus Eduardo (Heckyel)',
     'author_email': 'heckyel@riseup.net',
     'url': 'https://notabug.org/heckyel/librevideoconverter',
     'license': 'GPL',
     'version': version,
     'packages': [
-        'mvc',
-        'mvc.osx',
-        'mvc.qtfaststart',
-        'mvc.resources',
-        'mvc.ui',
-        'mvc.widgets',
-        'mvc.widgets.gtk',
-        'mvc.widgets.osx',
-        'mvc.windows',
+        'lvc',
+        'lvc.osx',
+        'lvc.qtfaststart',
+        'lvc.resources',
+        'lvc.ui',
+        'lvc.widgets',
+        'lvc.widgets.gtk',
+        'lvc.widgets.osx',
+        'lvc.windows',
     ],
     'package_data': {
-        'mvc.resources': [
+        'lvc.resources': [
             'converters/*.py',
             'images/*.*',
         ],
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()