diff --git a/dstat-interface/dstat-interface/build_windows.py b/dstat-interface/dstat-interface/build_windows.py
index b5377bea146eaebd2484b376dc8d5c9030973922..14d1fbda70190e8c7c19bacc30e58a5891b6897c 100644
--- a/dstat-interface/dstat-interface/build_windows.py
+++ b/dstat-interface/dstat-interface/build_windows.py
@@ -5,7 +5,7 @@ __requires__ = 'PyInstaller==2.1'
 import os, sys
 os.chdir(os.path.dirname(sys.argv[0]))
 
-args = ['interface_test.spec']
+args = ['dstat.spec']
 args.extend(sys.argv[1:])
 
 import PyInstaller.main as pyi #For some reason, it gets the path here, so working dir must be set first
diff --git a/dstat-interface/dstat-interface/interface_test.spec b/dstat-interface/dstat-interface/dstat.spec
similarity index 79%
rename from dstat-interface/dstat-interface/interface_test.spec
rename to dstat-interface/dstat-interface/dstat.spec
index 1a9c7fe0024a3efef87d093945c88a57f2e852b8..c0f001d40d21cd853351472898e4aee887784fbb 100644
--- a/dstat-interface/dstat-interface/interface_test.spec
+++ b/dstat-interface/dstat-interface/dstat.spec
@@ -1,5 +1,5 @@
 # -*- mode: python -*-
-a = Analysis(['./interface_test.py'],
+a = Analysis(['./main.py'],
              pathex=['/Users/mdryden/src/dstat-interface2/dstatInterface'],
              hiddenimports=[],
              hookspath=None,
@@ -8,7 +8,7 @@ pyz = PYZ(a.pure)
 exe = EXE(pyz,
           a.scripts,
           exclude_binaries=True,
-          name='interface_test',
+          name='DStat',
           debug=False,
           strip=None,
           upx=True,
@@ -19,7 +19,7 @@ coll = COLLECT(exe,
                a.datas,
                strip=None,
                upx=True,
-               name='interface_test')
+               name='DStat')
 app = BUNDLE(coll,
-             name='interface_test.app',
+             name='DStat.app',
              icon=None)
diff --git a/dstat-interface/dstat-interface/interface_test.py b/dstat-interface/dstat-interface/main.py
similarity index 99%
rename from dstat-interface/dstat-interface/interface_test.py
rename to dstat-interface/dstat-interface/main.py
index b4a2e351ed9e00de0ed790c6f6323d8799495251..0411d19772589d477bf2f422bb26b8f63c3db41f 100644
--- a/dstat-interface/dstat-interface/interface_test.py
+++ b/dstat-interface/dstat-interface/main.py
@@ -198,11 +198,8 @@ class Main:
         
         try:
             if selection == 0:  # CA
-                parameters['potential'] = [int(r[0]) for r 
-                                           in self.chronoamp.model]
-                parameters['time'] = [int(r[1]) for r 
-                                      in self.chronoamp.model]
-            
+                # Add experiment parameters to existing
+                parameters.update(self.exp_window.get_params('cae'))
                 if not parameters['potential']:
                     raise InputError(parameters['potential'],
                                      "Step table is empty")