diff --git a/ChangeLog b/ChangeLog
index 8b8acd8d1..512aaf3a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-12  Mike Kestner  <mkestner@novell.com>
+
+	* sample/gnomevfs/*.cs : s/Test.Gnome.VFS/TestGnomeVfs to avoid
+	namespace collision problems with current mcs.
+
 2005-01-11  Ben Maurer  <bmaurer@ximian.com>
 
 	* configure.in: There might be multiple S.D assemblies (eg, if you
diff --git a/sample/gnomevfs/TestAsync.cs b/sample/gnomevfs/TestAsync.cs
index d0940a089..b3574fc06 100644
--- a/sample/gnomevfs/TestAsync.cs
+++ b/sample/gnomevfs/TestAsync.cs
@@ -4,7 +4,7 @@ using System;
 using System.Text;
 using System.Threading;
 
-namespace Test.Gnome.Vfs {
+namespace TestGnomeVfs {
 	public class TestAsync {
 		private static MainLoop loop;
 		private static Handle handle;
diff --git a/sample/gnomevfs/TestAsyncStream.cs b/sample/gnomevfs/TestAsyncStream.cs
index 6f39cf698..e9f5147c9 100644
--- a/sample/gnomevfs/TestAsyncStream.cs
+++ b/sample/gnomevfs/TestAsyncStream.cs
@@ -4,7 +4,7 @@ using System;
 using System.IO;
 using System.Text;
 
-namespace Test.Gnome.Vfs {
+namespace TestGnomeVfs {
 	public class TestAsyncStream {
 		private static MainLoop loop;
 		private static byte[] buffer;
diff --git a/sample/gnomevfs/TestCallback.cs b/sample/gnomevfs/TestCallback.cs
index 7cec3933c..f8e8a7704 100644
--- a/sample/gnomevfs/TestCallback.cs
+++ b/sample/gnomevfs/TestCallback.cs
@@ -3,7 +3,7 @@ using Gnome.Vfs;
 using System;
 using System.Text;
 
-namespace Test.Gnome.Vfs {
+namespace TestGnomeVfs {
 	public class TestCallback {
 		private static MainLoop loop;
 	
diff --git a/sample/gnomevfs/TestDirectory.cs b/sample/gnomevfs/TestDirectory.cs
index fa8889846..462115271 100644
--- a/sample/gnomevfs/TestDirectory.cs
+++ b/sample/gnomevfs/TestDirectory.cs
@@ -3,7 +3,7 @@ using Gnome.Vfs;
 using System;
 using System.Text;
 
-namespace Test.Gnome.Vfs {
+namespace TestGnomeVfs {
 	public class TestInfo {
 		private static MainLoop loop;
 	
diff --git a/sample/gnomevfs/TestInfo.cs b/sample/gnomevfs/TestInfo.cs
index 881a8024f..74b29d05e 100644
--- a/sample/gnomevfs/TestInfo.cs
+++ b/sample/gnomevfs/TestInfo.cs
@@ -2,7 +2,7 @@ using Gnome.Vfs;
 using System;
 using System.Text;
 
-namespace Test.Gnome.Vfs {
+namespace TestGnomeVfs {
 	public class TestInfo {
 		static void Main (string[] args)
 		{
diff --git a/sample/gnomevfs/TestMime.cs b/sample/gnomevfs/TestMime.cs
index 94651f2c9..a36f07e4c 100644
--- a/sample/gnomevfs/TestMime.cs
+++ b/sample/gnomevfs/TestMime.cs
@@ -3,7 +3,7 @@ using System;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-namespace Test.Gnome.Vfs {
+namespace TestGnomeVfs {
 	public class TestMime {
 		static void Main (string[] args)
 		{
diff --git a/sample/gnomevfs/TestMonitor.cs b/sample/gnomevfs/TestMonitor.cs
index 937e89f62..2d7371c96 100644
--- a/sample/gnomevfs/TestMonitor.cs
+++ b/sample/gnomevfs/TestMonitor.cs
@@ -3,7 +3,7 @@ using Gnome.Vfs;
 using System;
 using System.Text;
 
-namespace Test.Gnome.Vfs {
+namespace TestGnomeVfs {
 	public class TestMonitor {
 		static void Main (string[] args)
 		{
diff --git a/sample/gnomevfs/TestSync.cs b/sample/gnomevfs/TestSync.cs
index f18be5b54..ef5a6cef4 100644
--- a/sample/gnomevfs/TestSync.cs
+++ b/sample/gnomevfs/TestSync.cs
@@ -2,7 +2,7 @@ using Gnome.Vfs;
 using System;
 using System.Text;
 
-namespace Test.Gnome.Vfs {
+namespace TestGnomeVfs {
 	public class TestSync {
 		static void Main (string[] args)
 		{
diff --git a/sample/gnomevfs/TestSyncCreate.cs b/sample/gnomevfs/TestSyncCreate.cs
index 09365624e..7560fbcba 100644
--- a/sample/gnomevfs/TestSyncCreate.cs
+++ b/sample/gnomevfs/TestSyncCreate.cs
@@ -2,7 +2,7 @@ using Gnome.Vfs;
 using System;
 using System.Text;
 
-namespace Test.Gnome.Vfs {
+namespace TestGnomeVfs {
 	public class TestSyncCreate {
 		static void Main (string[] args)
 		{
diff --git a/sample/gnomevfs/TestSyncStream.cs b/sample/gnomevfs/TestSyncStream.cs
index 775542f75..ec4906ce6 100644
--- a/sample/gnomevfs/TestSyncStream.cs
+++ b/sample/gnomevfs/TestSyncStream.cs
@@ -4,7 +4,7 @@ using System;
 using System.IO;
 using System.Text;
 
-namespace Test.Gnome.Vfs {
+namespace TestGnomeVfs {
 	public class TestSyncStream {
 		private static MainLoop loop;
 	
diff --git a/sample/gnomevfs/TestSyncWrite.cs b/sample/gnomevfs/TestSyncWrite.cs
index a416a2208..3d2921be3 100644
--- a/sample/gnomevfs/TestSyncWrite.cs
+++ b/sample/gnomevfs/TestSyncWrite.cs
@@ -2,7 +2,7 @@ using Gnome.Vfs;
 using System;
 using System.Text;
 
-namespace Test.Gnome.Vfs {
+namespace TestGnomeVfs {
 	public class TestSyncWrite {
 		static void Main (string[] args)
 		{
diff --git a/sample/gnomevfs/TestUnlink.cs b/sample/gnomevfs/TestUnlink.cs
index a595ceaea..67cccbf49 100644
--- a/sample/gnomevfs/TestUnlink.cs
+++ b/sample/gnomevfs/TestUnlink.cs
@@ -1,7 +1,7 @@
 using Gnome.Vfs;
 using System;
 
-namespace Test.Gnome.Vfs {
+namespace TestGnomeVfs {
 	public class TestUnlink {
 		static void Main (string[] args)
 		{
diff --git a/sample/gnomevfs/TestVolumes.cs b/sample/gnomevfs/TestVolumes.cs
index ac528f23c..e3bfa43fc 100644
--- a/sample/gnomevfs/TestVolumes.cs
+++ b/sample/gnomevfs/TestVolumes.cs
@@ -1,7 +1,7 @@
 using Gnome.Vfs;
 using System;
 
-namespace Test.Gnome.Vfs {
+namespace TestGnomeVfs {
 	public class TestVolumes {
 		public TestVolumes ()
 		{
diff --git a/sample/gnomevfs/TestXfer.cs b/sample/gnomevfs/TestXfer.cs
index 70c744119..d5239cdb2 100644
--- a/sample/gnomevfs/TestXfer.cs
+++ b/sample/gnomevfs/TestXfer.cs
@@ -12,7 +12,7 @@ using System.Runtime.CompilerServices;
 [assembly: Mono.Author("Jeroen Zwartepoorte")]
 [assembly: AssemblyVersion("1.0.*")]
 
-namespace Test.Gnome.Vfs {
+namespace TestGnomeVfs {
 	class TestXferOptions : Options {
 		[Option("Copy directories recursively", 'r')]
 		public bool recursive = false;