Index: /build.xml
===================================================================
--- /build.xml	(revision 1)
+++ /build.xml	(revision 2)
@@ -8,6 +8,6 @@
 <!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
 <!-- in the project's Project Properties dialog box.-->
-<project name="ScriptBuilder_Most_Current" default="default" basedir=".">
-    <description>Builds, tests, and runs the project ScriptBuilder_Most_Current.</description>
+<project name="ScriptBuilder" default="default" basedir=".">
+    <description>Builds, tests, and runs the project ScriptBuilder.</description>
     <import file="nbproject/build-impl.xml"/>
     <!--
@@ -59,5 +59,5 @@
     An example of overriding the target for project execution could look like this:
 
-        <target name="run" depends="ScriptBuilder_Most_Current-impl.jar">
+        <target name="run" depends="ScriptBuilder-impl.jar">
             <exec dir="bin" executable="launcher.exe">
                 <arg file="${dist.jar}"/>
Index: /nbproject/build-impl.xml
===================================================================
--- /nbproject/build-impl.xml	(revision 1)
+++ /nbproject/build-impl.xml	(revision 2)
@@ -20,5 +20,5 @@
 
         -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="ScriptBuilder_Most_Current-impl">
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="ScriptBuilder-impl">
     <fail message="Please build using Ant 1.8.0 or higher.">
         <condition>
@@ -441,5 +441,5 @@
                 </union>
                 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
-                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="ScriptBuilder_Most_Current" testname="TestNG tests" workingDir="${work.dir}">
+                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="ScriptBuilder" testname="TestNG tests" workingDir="${work.dir}">
                     <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
                     <propertyset>
@@ -592,5 +592,5 @@
                     <isset property="test.method"/>
                 </condition>
-                <condition else="-suitename ScriptBuilder_Most_Current -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
+                <condition else="-suitename ScriptBuilder -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
                     <matches pattern=".*\.xml" string="@{testClass}"/>
                 </condition>
@@ -884,5 +884,5 @@
     </target>
     <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
-        <echo level="warn" message="Cycle detected: ScriptBuilder_Most_Current was already built"/>
+        <echo level="warn" message="Cycle detected: ScriptBuilder was already built"/>
     </target>
     <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
@@ -1366,5 +1366,5 @@
     </target>
     <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
-        <echo level="warn" message="Cycle detected: ScriptBuilder_Most_Current was already built"/>
+        <echo level="warn" message="Cycle detected: ScriptBuilder was already built"/>
     </target>
     <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
Index: /nbproject/project.properties
===================================================================
--- /nbproject/project.properties	(revision 1)
+++ /nbproject/project.properties	(revision 2)
@@ -1,8 +1,8 @@
 annotation.processing.enabled=true
 annotation.processing.enabled.in.editor=false
+annotation.processing.processor.options=
 annotation.processing.processors.list=
 annotation.processing.run.all.processors=true
-application.title=ScriptBuilder_Most_Current
-application.vendor=nathaniellehrer
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
@@ -21,9 +21,10 @@
 debug.test.classpath=\
     ${run.test.classpath}
+# Files in build.classes.dir which should be excluded from distribution jar
+dist.archive.excludes=
 # This directory is removed when the project is cleaned:
 dist.dir=dist
-dist.jar=${dist.dir}/ScriptBuilder_Most_Current.jar
+dist.jar=${dist.dir}/ScriptBuilder.jar
 dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
 excludes=
 includes=**
@@ -36,11 +37,11 @@
 javac.processorpath=\
     ${javac.classpath}
-javac.source=1.5
-javac.target=1.5
+javac.source=1.7
+javac.target=1.7
 javac.test.classpath=\
     ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${libs.junit_4.classpath}
+    ${build.classes.dir}
+javac.test.processorpath=\
+    ${javac.test.classpath}
 javadoc.additionalparam=
 javadoc.author=false
@@ -54,11 +55,5 @@
 javadoc.version=false
 javadoc.windowtitle=
-jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
-jnlp.codebase.type=local
-jnlp.descriptor=application
-jnlp.enabled=false
-jnlp.offline-allowed=false
-jnlp.signed=false
-main.class=scriptbuilder.gui.ScriptBuilderFrame
+main.class=scriptbuilder.ScriptBuilder
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
@@ -68,7 +63,7 @@
     ${javac.classpath}:\
     ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
+# Space-separated list of JVM arguments used when running the project.
+# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
+# To set system properties for unit tests define test-sys-prop.name=value:
 run.jvmargs=
 run.test.classpath=\
Index: /nbproject/project.xml
===================================================================
--- /nbproject/project.xml	(revision 1)
+++ /nbproject/project.xml	(revision 2)
@@ -4,5 +4,5 @@
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>ScriptBuilder_Most_Current</name>
+            <name>ScriptBuilder</name>
             <source-roots>
                 <root id="src.dir"/>
Index: /nbproject/genfiles.properties
===================================================================
--- /nbproject/genfiles.properties	(revision 1)
+++ /nbproject/genfiles.properties	(revision 2)
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=d8b803d7
-build.xml.script.CRC32=004d6282
+build.xml.data.CRC32=c690a94a
+build.xml.script.CRC32=5682d7f4
 build.xml.stylesheet.CRC32=8064a381@1.68.1.46
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=d8b803d7
-nbproject/build-impl.xml.script.CRC32=99aa3a4d
+nbproject/build-impl.xml.data.CRC32=c690a94a
+nbproject/build-impl.xml.script.CRC32=dfaa002b
 nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.1.46