Index: /branches/WorkingFEPSim/nbproject/Makefile-impl.mk
===================================================================
--- /branches/WorkingFEPSim/nbproject/Makefile-impl.mk	(revision 115)
+++ /branches/WorkingFEPSim/nbproject/Makefile-impl.mk	(revision 116)
@@ -25,5 +25,5 @@
 
 # Project Name
-PROJECTNAME=FEPSimulator
+PROJECTNAME=WorkingFEPSim
 
 # Active Configuration
Index: /branches/WorkingFEPSim/nbproject/Makefile-Debug.mk
===================================================================
--- /branches/WorkingFEPSim/nbproject/Makefile-Debug.mk	(revision 115)
+++ /branches/WorkingFEPSim/nbproject/Makefile-Debug.mk	(revision 116)
@@ -58,15 +58,15 @@
 
 # Link Libraries and Options
-LDLIBSOPTIONS=../../tmcsimulator/branches/FEPSimulator/tinyxml/libosxtinyxml.a
+LDLIBSOPTIONS=tinyxml/tinyxml.a
 
 # Build Targets
 .build-conf: ${BUILD_SUBPROJECTS}
-	"${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator
+	"${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/workingfepsim
 
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: ../../tmcsimulator/branches/FEPSimulator/tinyxml/libosxtinyxml.a
+${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/workingfepsim: tinyxml/tinyxml.a
 
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: ${OBJECTFILES}
+${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/workingfepsim: ${OBJECTFILES}
 	${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
-	${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator ${OBJECTFILES} ${LDLIBSOPTIONS}
+	${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/workingfepsim ${OBJECTFILES} ${LDLIBSOPTIONS}
 
 ${OBJECTDIR}/DataPacker.o: DataPacker.cpp 
@@ -106,5 +106,5 @@
 .clean-conf: ${CLEAN_SUBPROJECTS}
 	${RM} -r ${CND_BUILDDIR}/${CND_CONF}
-	${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator
+	${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/workingfepsim
 
 # Subprojects
Index: /branches/WorkingFEPSim/nbproject/Makefile-variables.mk
===================================================================
--- /branches/WorkingFEPSim/nbproject/Makefile-variables.mk	(revision 115)
+++ /branches/WorkingFEPSim/nbproject/Makefile-variables.mk	(revision 116)
@@ -10,9 +10,9 @@
 CND_PLATFORM_Debug=GNU-MacOSX
 CND_ARTIFACT_DIR_Debug=dist/Debug/GNU-MacOSX
-CND_ARTIFACT_NAME_Debug=fepsimulator
-CND_ARTIFACT_PATH_Debug=dist/Debug/GNU-MacOSX/fepsimulator
+CND_ARTIFACT_NAME_Debug=workingfepsim
+CND_ARTIFACT_PATH_Debug=dist/Debug/GNU-MacOSX/workingfepsim
 CND_PACKAGE_DIR_Debug=dist/Debug/GNU-MacOSX/package
-CND_PACKAGE_NAME_Debug=fepsimulator.tar
-CND_PACKAGE_PATH_Debug=dist/Debug/GNU-MacOSX/package/fepsimulator.tar
+CND_PACKAGE_NAME_Debug=workingfepsim.tar
+CND_PACKAGE_PATH_Debug=dist/Debug/GNU-MacOSX/package/workingfepsim.tar
 # Release configuration
 CND_PLATFORM_Release=GNU-Linux-x86
Index: /branches/WorkingFEPSim/nbproject/configurations.xml
===================================================================
--- /branches/WorkingFEPSim/nbproject/configurations.xml	(revision 115)
+++ /branches/WorkingFEPSim/nbproject/configurations.xml	(revision 116)
@@ -53,5 +53,5 @@
         <linkerTool>
           <linkerLibItems>
-            <linkerLibFileItem>../../tmcsimulator/branches/FEPSimulator/tinyxml/libosxtinyxml.a</linkerLibFileItem>
+            <linkerLibFileItem>tinyxml/tinyxml.a</linkerLibFileItem>
           </linkerLibItems>
         </linkerTool>
Index: /branches/WorkingFEPSim/nbproject/Package-Debug.bash
===================================================================
--- /branches/WorkingFEPSim/nbproject/Package-Debug.bash	(revision 115)
+++ /branches/WorkingFEPSim/nbproject/Package-Debug.bash	(revision 116)
@@ -14,7 +14,7 @@
 NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
 TMPDIRNAME=tmp-packaging
-OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator
-OUTPUT_BASENAME=fepsimulator
-PACKAGE_TOP_DIR=fepsimulator/
+OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/workingfepsim
+OUTPUT_BASENAME=workingfepsim
+PACKAGE_TOP_DIR=workingfepsim/
 
 # Functions
@@ -61,5 +61,5 @@
 # Copy files and create directories and links
 cd "${TOP}"
-makeDirectory "${NBTMPDIR}/fepsimulator/bin"
+makeDirectory "${NBTMPDIR}/workingfepsim/bin"
 copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755
 
@@ -67,7 +67,7 @@
 # Generate tar file
 cd "${TOP}"
-rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/fepsimulator.tar
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/workingfepsim.tar
 cd ${NBTMPDIR}
-tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/fepsimulator.tar *
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/workingfepsim.tar *
 checkReturnCode