Index: UnitTests/FlowControlTests/TestsCallbackBasedNetwork.cxx
===================================================================
--- UnitTests/FlowControlTests/TestsCallbackBasedNetwork.cxx	(revision 13150)
+++ UnitTests/FlowControlTests/TestsCallbackBasedNetwork.cxx	(working copy)
@@ -211,7 +211,7 @@
 		CLAM::AudioSink * sink = new CLAM::AudioSink;
 		_network.AddProcessing("Source", source);
 		_network.AddProcessing("Sink", sink);
-		_network.ConnectPorts("Source.AudioOut", "Sink.AudioIn");
+		_network.ConnectPorts("Source.0", "Sink.0");
 		_network.Start();
 		source->SetExternalBuffer(_inFloat, 2);
 		sink->SetExternalBuffer(_outFloat, 2);
@@ -240,8 +240,8 @@
 		_network.AddProcessing("Source", source);
 		_network.AddProcessing("Sink", sink);
 		_network.AddProcessing("Filter", filter);
-		_network.ConnectPorts("Source.AudioOut", "Filter.in");
-		_network.ConnectPorts("Filter.out", "Sink.AudioIn");
+		_network.ConnectPorts("Source.0", "Filter.in");
+		_network.ConnectPorts("Filter.out", "Sink.0");
 		_network.Start();
 		source->SetExternalBuffer(_inFloat, 2);
 		sink->SetExternalBuffer(_outFloat, 2);
@@ -257,8 +257,8 @@
 		_network.AddProcessing("Source", source);
 		_network.AddProcessing("Sink", sink);
 		_network.AddProcessing("Filter", filter);
-		_network.ConnectPorts("Source.AudioOut", "Filter.in");
-		_network.ConnectPorts("Filter.out", "Sink.AudioIn");
+		_network.ConnectPorts("Source.0", "Filter.in");
+		_network.ConnectPorts("Filter.out", "Sink.0");
 		_network.Start();
 		source->SetExternalBuffer(_inFloat, 2);
 		sink->SetExternalBuffer(_outFloat, 2);
@@ -274,8 +274,8 @@
 		_network.AddProcessing("Source", source);
 		_network.AddProcessing("Sink", sink);
 		_network.AddProcessing("Filter", filter);
-		_network.ConnectPorts("Source.AudioOut", "Filter.in");
-		_network.ConnectPorts("Filter.out", "Sink.AudioIn");
+		_network.ConnectPorts("Source.0", "Filter.in");
+		_network.ConnectPorts("Filter.out", "Sink.0");
 		_network.Start();
 		source->SetExternalBuffer(_inFloat, 2);
 		sink->SetExternalBuffer(_outFloat, 2);
@@ -303,8 +303,8 @@
 		_network.AddProcessing("Source", source);
 		_network.AddProcessing("Sink", sink);
 		_network.AddProcessing("Filter", filter);
-		_network.ConnectPorts("Source.AudioOut", "Filter.in");
-		_network.ConnectPorts("Filter.out", "Sink.AudioIn");
+		_network.ConnectPorts("Source.0", "Filter.in");
+		_network.ConnectPorts("Filter.out", "Sink.0");
 		_network.Start();
 		source->SetExternalBuffer(_inFloat, 2);
 		sink->SetExternalBuffer(_outFloat, 2);
@@ -335,8 +335,8 @@
 		_network.AddProcessing("Source", source);
 		_network.AddProcessing("Sink", sink);
 		_network.AddProcessing("Filter", filter);
-		_network.ConnectPorts("Source.AudioOut", "Filter.in");
-		_network.ConnectPorts("Source.AudioOut", "Sink.AudioIn");
+		_network.ConnectPorts("Source.0", "Filter.in");
+		_network.ConnectPorts("Source.0", "Sink.0");
 		_network.Start();
 		for (int i=0; i<iterations; i++)
 		{
@@ -356,8 +356,8 @@
 		_network.AddProcessing("Source", source);
 		_network.AddProcessing("Sink", sink);
 		_network.AddProcessing("Filter", filter);
-		_network.ConnectPorts("Source.AudioOut", "Filter.in");
-		_network.ConnectPorts("Source.AudioOut", "Sink.AudioIn");
+		_network.ConnectPorts("Source.0", "Filter.in");
+		_network.ConnectPorts("Source.0", "Sink.0");
 		_network.Start();
 		source->SetExternalBuffer(_inFloat, callbackStep);
 		sink->SetExternalBuffer(_outFloat, callbackStep);
@@ -371,7 +371,7 @@
 		DummyGenerator * generator = new DummyGenerator(3);
 		_network.AddProcessing("Sink", sink);
 		_network.AddProcessing("Generator", generator);
-		_network.ConnectPorts("Generator.out", "Sink.AudioIn");
+		_network.ConnectPorts("Generator.out", "Sink.0");
 		_network.Start();
 		sink->SetExternalBuffer(_outFloat, 4);
 		_network.Do();
@@ -387,7 +387,7 @@
 		_network.AddProcessing("Source", source);
 		_network.AddProcessing("Sink", sink);
 		_network.AddProcessing("IsolatedGenerator", isolated);
-		_network.ConnectPorts("Source.AudioOut", "Sink.AudioIn");
+		_network.ConnectPorts("Source.0", "Sink.0");
 		_network.Start();
 		sink->SetExternalBuffer(_outFloat, 4);
 		source->SetExternalBuffer(_inFloat, 4);
Index: FunctionalTests/ProcessingTests/TestStreamingSMSAnalysisSynthesis.cxx
===================================================================
--- FunctionalTests/ProcessingTests/TestStreamingSMSAnalysisSynthesis.cxx	(revision 13145)
+++ FunctionalTests/ProcessingTests/TestStreamingSMSAnalysisSynthesis.cxx	(working copy)
@@ -196,10 +196,10 @@
 		net.AddProcessing( "Analysis", new CLAM::SMSAnalysisCore );
 		net.AddProcessing( "Synthesis", new CLAM::SMSSynthesis );
 
-		net.ConnectPorts("Source.AudioOut", "Analysis.Input Audio");
+		net.ConnectPorts("Source.0", "Analysis.Input Audio");
 		net.ConnectPorts("Analysis.Sinusoidal Peaks", "Synthesis.InputSinPeaks");
 		net.ConnectPorts("Analysis.Residual Spectrum", "Synthesis.InputResSpectrum");
-		net.ConnectPorts("Synthesis.OutputAudio", "Sink.AudioIn");
+		net.ConnectPorts("Synthesis.OutputAudio", "Sink.0");
 		net.ConfigureProcessing("Analysis", helperAnalysisConfigInstance() );
 		net.ConfigureProcessing("Synthesis", helperSynthesisConfigInstance() );