diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj
index 17c7a51aca..b75a9f1d32 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj
@@ -49,6 +49,7 @@
     <Compile Include="Src\Debugger\DebuggerEvents\DebuggerEventArgs.cs" />
     <Compile Include="Src\Debugger\DebuggerEvents\MessageEventArgs.cs" />
     <Compile Include="Src\Debugger\DebuggerEvents\PausedReason.cs" />
+    <Compile Include="Src\Debugger\DebuggerObject.cs" />
     <Compile Include="Src\Debugger\Exceptions.cs" />
     <Compile Include="Src\Debugger\Internal\ManagedCallback.cs" />
     <Compile Include="Src\Debugger\Internal\ManagedCallbackProxy.cs" />
@@ -57,7 +58,6 @@
     <Compile Include="Src\Modules\Module.cs" />
     <Compile Include="Src\Modules\ModuleEventArgs.cs" />
     <Compile Include="Src\Modules\Process-Modules.cs" />
-    <Compile Include="Src\Debugger\Internal\RemotingObjectBase.cs" />
     <Compile Include="Src\Threads\Exception.cs" />
     <Compile Include="Src\Threads\ExceptionType.cs" />
     <Compile Include="Src\Threads\Function.cs" />
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Breakpoints/Breakpoint.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Breakpoints/Breakpoint.cs
index e1d5c7a8f8..6b2d718fce 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Breakpoints/Breakpoint.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Breakpoints/Breakpoint.cs
@@ -10,7 +10,7 @@ using Debugger.Wrappers.CorDebug;
 
 namespace Debugger
 {
-	public class Breakpoint: RemotingObjectBase
+	public class Breakpoint: DebuggerObject
 	{
 		NDebugger debugger;
 
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerObject.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerObject.cs
new file mode 100644
index 0000000000..b792a977a7
--- /dev/null
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerObject.cs
@@ -0,0 +1,19 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
+//     <version>$Revision$</version>
+// </file>
+
+using System;
+
+namespace Debugger.Core.Debugger
+{
+	/// <summary>
+	/// A base class for all classes declared by the debugger
+	/// </summary>
+	public class DebuggerObject: MarshalByRefObject
+	{
+		
+	}
+}
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/RemotingObjectBase.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/RemotingObjectBase.cs
deleted file mode 100644
index beea0c0765..0000000000
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/RemotingObjectBase.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-
-namespace Debugger
-{
-	public class RemotingObjectBase: MarshalByRefObject
-	{
-	}
-}
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/NDebugger.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/NDebugger.cs
index 3948833f90..ffa14fdd29 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/NDebugger.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/NDebugger.cs
@@ -14,7 +14,7 @@ using Debugger.Wrappers.CorDebug;
 
 namespace Debugger
 {
-	public partial class NDebugger: RemotingObjectBase
+	public partial class NDebugger: DebuggerObject
 	{
 		ICorDebug                  corDebug;
 		ManagedCallbackSwitch      managedCallbackSwitch;
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/NamespaceDoc.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/NamespaceDoc.cs
index c583c15f5b..e08bf507e4 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/NamespaceDoc.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/NamespaceDoc.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision: 1965 $</version>
+//     <version>$Revision$</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/ClassFieldAttribute.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/ClassFieldAttribute.cs
index 11f0bb8dd7..f58204a9bc 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/ClassFieldAttribute.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/ClassFieldAttribute.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision: 2185 $</version>
+//     <version>$Revision$</version>
 // </file>
 
 namespace Debugger.Wrappers.MetaData
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorCallingConvention.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorCallingConvention.cs
index 0f7709921c..d2b7270c22 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorCallingConvention.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorCallingConvention.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision: 2185 $</version>
+//     <version>$Revision$</version>
 // </file>
 
 namespace Debugger.Wrappers.MetaData
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorElementType.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorElementType.cs
index c4d43b13af..22b8393981 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorElementType.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorElementType.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision: 2185 $</version>
+//     <version>$Revision$</version>
 // </file>
 
 namespace Debugger.Wrappers.CorDebug
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorMethodAttr.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorMethodAttr.cs
index 711a5e095d..749bf6b669 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorMethodAttr.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorMethodAttr.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision: 2185 $</version>
+//     <version>$Revision$</version>
 // </file>
 
 namespace Debugger.Wrappers.MetaData
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorTokenType.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorTokenType.cs
index fce022e6da..0b3be782b1 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorTokenType.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorTokenType.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision: 2185 $</version>
+//     <version>$Revision$</version>
 // </file>
 
 namespace Debugger.Wrappers.MetaData
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Modules/Module.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Modules/Module.cs
index 2979104d36..22da5547b3 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Modules/Module.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Modules/Module.cs
@@ -12,7 +12,7 @@ using Debugger.Wrappers.MetaData;
 
 namespace Debugger
 {
-	public class Module: RemotingObjectBase, IDisposable
+	public class Module: DebuggerObject, IDisposable
 	{
 		Process process;
 		
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Exception.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Exception.cs
index 1266e2d8b1..5d35e3776e 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Exception.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Exception.cs
@@ -10,7 +10,7 @@ using Debugger.Wrappers.CorDebug;
 
 namespace Debugger
 {	
-	public class Exception: RemotingObjectBase
+	public class Exception: DebuggerObject
 	{
 		Process           process;
 		Thread            thread;
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Function.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Function.cs
index a50cbb4979..ba8305dbd2 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Function.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Function.cs
@@ -19,7 +19,7 @@ namespace Debugger
 	/// A function (or also a method or frame) which is being executed on
 	/// some thread. Use to obtain arguments or local variables.
 	/// </summary>
-	public class Function: RemotingObjectBase, IExpirable
+	public class Function: DebuggerObject, IExpirable
 	{	
 		Process process;
 		
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Process.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Process.cs
index f73b83ec23..515dfc606d 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Process.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Process.cs
@@ -12,7 +12,7 @@ using Debugger.Wrappers.CorDebug;
 
 namespace Debugger
 {
-	public partial class Process: RemotingObjectBase, IExpirable
+	public partial class Process: DebuggerObject, IExpirable
 	{
 		NDebugger debugger;
 		
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Thread.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Thread.cs
index 7ebf9d7e88..d4711dacc8 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Thread.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Thread.cs
@@ -15,7 +15,7 @@ using Debugger.Wrappers.CorDebug;
 
 namespace Debugger
 {
-	public partial class Thread: RemotingObjectBase, IExpirable
+	public partial class Thread: DebuggerObject, IExpirable
 	{
 		Process process;
 
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Evals/Eval.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Evals/Eval.cs
index c47700b321..44a8fd3304 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Evals/Eval.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Evals/Eval.cs
@@ -17,7 +17,7 @@ namespace Debugger
 	/// <summary>
 	/// This class holds information about function evaluation.
 	/// </summary>
-	public class Eval: RemotingObjectBase
+	public class Eval: DebuggerObject
 	{
 		delegate void EvaluationInvoker(ICorDebugEval corEval);
 		
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/BindingFlags.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/BindingFlags.cs
index 4e94c856ce..ab46379ec6 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/BindingFlags.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/BindingFlags.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision: 2023 $</version>
+//     <version>$Revision$</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/DebugType-Helpers.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/DebugType-Helpers.cs
index 7164dfba7f..1d22826848 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/DebugType-Helpers.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/DebugType-Helpers.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision: 2023 $</version>
+//     <version>$Revision$</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/DebugType.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/DebugType.cs
index 6748df54fb..a0d2344cd4 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/DebugType.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/DebugType.cs
@@ -16,7 +16,7 @@ namespace Debugger
 	/// Represents a type in a debugee. That is, a class, array, value type or a primitive type.
 	/// <para> This class mimics the <see cref="System.Type"/> class. </para>
 	/// </summary>
-	public partial class DebugType: RemotingObjectBase
+	public partial class DebugType: DebuggerObject
 	{
 		Process process;
 		ICorDebugType corType;
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/FieldInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/FieldInfo.cs
index 3f8d6cd5a5..dcf8e8c40e 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/FieldInfo.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/FieldInfo.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision: 2023 $</version>
+//     <version>$Revision$</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/MemberInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/MemberInfo.cs
index d46b8d4d30..9f4b3007e8 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/MemberInfo.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/MemberInfo.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision: 2023 $</version>
+//     <version>$Revision$</version>
 // </file>
 
 using System;
@@ -16,7 +16,7 @@ namespace Debugger
 	/// Provides information about a member of some class
 	/// (eg. a field or a method).
 	/// </summary>
-	public abstract class MemberInfo: RemotingObjectBase
+	public abstract class MemberInfo: DebuggerObject
 	{
 		DebugType declaringType;
 		
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/MethodInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/MethodInfo.cs
index 13b2234336..0e0131b79f 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/MethodInfo.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/MethodInfo.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision: 2023 $</version>
+//     <version>$Revision$</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/PropertyInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/PropertyInfo.cs
index c3ca212f8c..a89f637e44 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/PropertyInfo.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Types/PropertyInfo.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision: 2023 $</version>
+//     <version>$Revision$</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/NamedValue.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/NamedValue.cs
index c9536a36e9..9d9ad5a202 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/NamedValue.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/NamedValue.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision: 2022 $</version>
+//     <version>$Revision$</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/NamedValueCollection.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/NamedValueCollection.cs
index 8178d4592b..0e4696298f 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/NamedValueCollection.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/NamedValueCollection.cs
@@ -14,7 +14,7 @@ namespace Debugger
 	/// <summary>
 	/// An enumerable collection of values accessible by name.
 	/// </summary>
-	public class NamedValueCollection: RemotingObjectBase, IEnumerable<NamedValue>, IEnumerable
+	public class NamedValueCollection: DebuggerObject, IEnumerable<NamedValue>, IEnumerable
 	{
 		internal static NamedValueCollection Empty = new NamedValueCollection(new NamedValue[0]);
 		
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value-Helpers.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value-Helpers.cs
index 326557d419..2b28fad7b8 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value-Helpers.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value-Helpers.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision: 2022 $</version>
+//     <version>$Revision$</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value.cs
index 052f3e3be9..aa4f2b65ab 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision: 2022 $</version>
+//     <version>$Revision$</version>
 // </file>
 
 using System;
@@ -34,7 +34,7 @@ namespace Debugger
 	/// called and internal value is neutred, new copy will be obatined)
 	/// </para>
 	/// </remarks>
-	public partial class Value: RemotingObjectBase, IExpirable, IMutable
+	public partial class Value: DebuggerObject, IExpirable, IMutable
 	{
 		Process process;
 		
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variables/MemberValue.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variables/MemberValue.cs
index e1a47cbf7e..11c977fb10 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variables/MemberValue.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variables/MemberValue.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision: 2022 $</version>
+//     <version>$Revision$</version>
 // </file>
 
 using System;
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/CorDebug/ICorDebugArrayValue.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/CorDebug/ICorDebugArrayValue.cs
index ab00c179d2..f3889e4588 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/CorDebug/ICorDebugArrayValue.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/CorDebug/ICorDebugArrayValue.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision: 1965 $</version>
+//     <version>$Revision$</version>
 // </file>
 
 #pragma warning disable 1591
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/CorDebug/ICorDebugTypeEnum.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/CorDebug/ICorDebugTypeEnum.cs
index 7cd68dbd20..e327e1f4e6 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/CorDebug/ICorDebugTypeEnum.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/CorDebug/ICorDebugTypeEnum.cs
@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision: 2077 $</version>
+//     <version>$Revision$</version>
 // </file>
 
 #pragma warning disable 1591