Index: java/main/src/test/resources/configs/FramsServerTest.xml
===================================================================
--- java/main/src/test/resources/configs/FramsServerTest.xml	(revision 96)
+++ java/main/src/test/resources/configs/FramsServerTest.xml	(revision 97)
@@ -2,9 +2,9 @@
 <Framsticks>
 	<import class="com.framsticks.running.FramsServer" />
-	<import class="com.framsticks.remote.RemoteInstance" />
+	<import class="com.framsticks.remote.RemoteTree" />
 	<import class="com.framsticks.running.LoggingOutputListener" />
 	<FramsServer name="frams" port="9008">
 		<LoggingOutputListener />
 	</FramsServer>
-	<!-- <RemoteInstance name="remote" address="localhost:9008" /> -->
+	<!-- <RemoteTree name="remote" address="localhost:9008" /> -->
 </Framsticks>
Index: java/main/src/test/resources/configs/ObjectInstanceBrowserTest.xml
===================================================================
--- java/main/src/test/resources/configs/ObjectInstanceBrowserTest.xml	(revision 96)
+++ 	(revision )
@@ -1,9 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Browser>
-	<import class="com.framsticks.model.ModelBuilder" />
-	<import class="com.framsticks.core.ObjectInstance" />
-	<import class="com.framsticks.model.ModelPackage" />
-	<ObjectInstance name="model">
-		<ModelBuilder resource="/examples/f0_example.txt" />
-	</ObjectInstance>
-</Browser>
Index: java/main/src/test/resources/configs/ObjectTreeBrowserTest.xml
===================================================================
--- java/main/src/test/resources/configs/ObjectTreeBrowserTest.xml	(revision 97)
+++ java/main/src/test/resources/configs/ObjectTreeBrowserTest.xml	(revision 97)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Browser>
+	<import class="com.framsticks.model.ModelBuilder" />
+	<import class="com.framsticks.core.ObjectTree" />
+	<import class="com.framsticks.model.ModelPackage" />
+	<ObjectTree name="model">
+		<ModelBuilder resource="/examples/f0_example.txt" />
+	</ObjectTree>
+</Browser>
Index: java/main/src/test/resources/configs/ProcedureBrowserTest.xml
===================================================================
--- java/main/src/test/resources/configs/ProcedureBrowserTest.xml	(revision 96)
+++ java/main/src/test/resources/configs/ProcedureBrowserTest.xml	(revision 97)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Browser>
-	<import class="com.framsticks.core.ObjectInstance" />
+	<import class="com.framsticks.core.ObjectTree" />
 	<import class="com.framsticks.test.TestClass" />
-	<ObjectInstance name="test">
+	<ObjectTree name="test">
 		<TestClass />
-	</ObjectInstance>
+	</ObjectTree>
 </Browser>
Index: java/main/src/test/resources/configs/ServerTest.xml
===================================================================
--- java/main/src/test/resources/configs/ServerTest.xml	(revision 96)
+++ java/main/src/test/resources/configs/ServerTest.xml	(revision 97)
@@ -2,13 +2,13 @@
 <Framsticks>
 	<import class="com.framsticks.hosting.Server" />
-	<import class="com.framsticks.remote.RemoteInstance" />
-	<import class="com.framsticks.core.ObjectInstance" />
+	<import class="com.framsticks.remote.RemoteTree" />
+	<import class="com.framsticks.core.ObjectTree" />
 	<import class="com.framsticks.test.TestClass" />
 	<import class="com.framsticks.running.LoggingOutputListener" />
 	<Server name="server" port="9007">
-		<ObjectInstance name="test">
+		<ObjectTree name="test">
 			<TestClass name="a test name" />
-		</ObjectInstance>
+		</ObjectTree>
 	</Server>
-	<RemoteInstance name="remote" address="localhost:9007" />
+	<RemoteTree name="remote" address="localhost:9007" />
 </Framsticks>
Index: java/main/src/test/resources/configs/test.xml
===================================================================
--- java/main/src/test/resources/configs/test.xml	(revision 96)
+++ java/main/src/test/resources/configs/test.xml	(revision 97)
@@ -2,7 +2,7 @@
 <Framsticks>
 	<import class="com.framsticks.gui.Browser" />
-	<import class="com.framsticks.remote.SimulatorInstance" />
+	<import class="com.framsticks.remote.SimulatorTree" />
 	<Browser name="browser">
-		<SimulatorInstance name="localhost:9009" address="localhost:9009" />
+		<SimulatorTree name="localhost:9009" address="localhost:9009" />
 	</Browser>
 </Framsticks>
Index: java/main/src/test/resources/log4j.properties
===================================================================
--- java/main/src/test/resources/log4j.properties	(revision 96)
+++ java/main/src/test/resources/log4j.properties	(revision 97)
@@ -26,11 +26,12 @@
 log4j.appender.STDOUT.layout.ConversionPattern=%d{ABSOLUTE} [%-5p] [%t] %c -- %m%n
 
-log4j.logger.com.framsticks=INFO
-# log4j.logger.com.framsticks.hosting.Server=DEBUG
+log4j.logger.com.framsticks=WARN
+log4j.logger.com.framsticks.test.TestConfiguration=INFO
+# log4j.logger.com.framsticks.gui.console.TrackConsole=DEBUG
+# log4j.logger.com.framsticks.gui.controls.ProcedureControl=DEBUG
+# log4j.logger.com.framsticks.test.TestClass=DEBUG
 # log4j.logger.com.framsticks.communication.ServerConnection=TRACE
-# log4j.logger.com.framsticks.util.dispatching.AbstractJoinable=DEBUG
+# log4j.logger.com.framsticks.util.dispatching.Dispatching=DEBUG
 # log4j.logger.com.framsticks.parsers.F0Writer=TRACE
-# log4j.logger.com.framsticks.core.ObjectInstance=DEBUG
-# log4j.logger.com.framsticks.core.Instance=DEBUG
 # log4j.logger.com.framsticks.running=DEBUG
 # log4j.logger.com.framsticks.parsers.XmlLoader=DEBUG
