diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementation.cs
index 6d9310e..6bfe425 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementation.cs
@@ -17,10 +17,8 @@
 
 namespace Mocha.Core;
 
-public abstract class MethodImplementation
+public abstract class MethodImplementation : ClassImplementation
 {
-	public abstract Guid MethodClassGuid { get; }
-
 	protected abstract InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method);
 	public InstanceHandle Execute(Oms oms, OmsContext context, InstanceHandle method)
 	{
diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/AssignAttributeMethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/AssignAttributeMethodImplementation.cs
index 3661959..596550b 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/AssignAttributeMethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/AssignAttributeMethodImplementation.cs
@@ -19,7 +19,7 @@ namespace Mocha.Core.MethodImplementations;
 
 public class AssignAttributeMethodImplementation : MethodImplementation
 {
-    public override Guid MethodClassGuid => KnownInstanceGuids.MethodClasses.AssignAttributeMethod;
+    public override Guid ClassGuid => KnownInstanceGuids.MethodClasses.AssignAttributeMethod;
     protected override InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method)
 	{
 		InstanceHandle irForClass = oms.GetRelatedInstance(method, oms.GetInstance(KnownRelationshipGuids.Method__for__Class));
diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/BuildAttributeMethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/BuildAttributeMethodImplementation.cs
index 97a762a..5a535cb 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/BuildAttributeMethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/BuildAttributeMethodImplementation.cs
@@ -19,7 +19,7 @@ namespace Mocha.Core.MethodImplementations;
 
 public class BuildAttributeMethodImplementation : MethodImplementation
 {
-    public override Guid MethodClassGuid => KnownInstanceGuids.MethodClasses.BuildAttributeMethod;
+    public override Guid ClassGuid => KnownInstanceGuids.MethodClasses.BuildAttributeMethod;
     protected override InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method)
 	{
 		InstanceHandle irForClass = oms.GetRelatedInstance(method, oms.GetInstance(KnownRelationshipGuids.Method__for__Class));
diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/BuildElementMethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/BuildElementMethodImplementation.cs
index 7e33c02..57023d5 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/BuildElementMethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/BuildElementMethodImplementation.cs
@@ -6,7 +6,7 @@ namespace Mocha.Core.MethodImplementations;
 public class BuildElementMethodImplementation : MethodImplementation
 {
 
-	public override Guid MethodClassGuid => KnownInstanceGuids.MethodClasses.BuildElementMethod;
+	public override Guid ClassGuid => KnownInstanceGuids.MethodClasses.BuildElementMethod;
 
 	protected override InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method)
 	{
diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/BuildUIResponseMethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/BuildUIResponseMethodImplementation.cs
index 8c01543..a504e19 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/BuildUIResponseMethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/BuildUIResponseMethodImplementation.cs
@@ -21,7 +21,7 @@ namespace Mocha.Core.MethodImplementations;
 
 public class BuildUIResponseMethodImplementation : MethodImplementation
 {
-    public override Guid MethodClassGuid => KnownInstanceGuids.MethodClasses.BuildUIResponseMethod;
+    public override Guid ClassGuid => KnownInstanceGuids.MethodClasses.BuildUIResponseMethod;
     protected override InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method)
 	{
 		InstanceHandle irForClass = oms.GetRelatedInstance(method, oms.GetInstance(KnownRelationshipGuids.Method__for__Class));
diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/CalculateNumericMethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/CalculateNumericMethodImplementation.cs
index 4b4143c..da69461 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/CalculateNumericMethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/CalculateNumericMethodImplementation.cs
@@ -23,7 +23,7 @@ namespace Mocha.Core.MethodImplementations;
 
 public class CalculateNumericMethodImplementation : MethodImplementation
 {
-    public override Guid MethodClassGuid => KnownInstanceGuids.MethodClasses.CalculateNumericMethod;
+    public override Guid ClassGuid => KnownInstanceGuids.MethodClasses.CalculateNumericMethod;
     protected override InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method)
 	{
 		InstanceHandle irForClass = oms.GetRelatedInstance(method, oms.GetInstance(KnownRelationshipGuids.Method__for__Class));
diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/ConditionalSelectAttributeMethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/ConditionalSelectAttributeMethodImplementation.cs
index b579260..1108f80 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/ConditionalSelectAttributeMethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/ConditionalSelectAttributeMethodImplementation.cs
@@ -20,7 +20,7 @@ namespace Mocha.Core.MethodImplementations;
 
 public class ConditionalSelectAttributeMethodImplementation : MethodImplementation
 {
-	public override Guid MethodClassGuid => KnownInstanceGuids.MethodClasses.ConditionalSelectAttributeMethod;
+	public override Guid ClassGuid => KnownInstanceGuids.MethodClasses.ConditionalSelectAttributeMethod;
 
 	protected override InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method)
 	{
diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/ConditionalSelectFromInstanceSetMethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/ConditionalSelectFromInstanceSetMethodImplementation.cs
index 82d1142..69664fa 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/ConditionalSelectFromInstanceSetMethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/ConditionalSelectFromInstanceSetMethodImplementation.cs
@@ -20,7 +20,7 @@ namespace Mocha.Core.MethodImplementations;
 
 public class ConditionalSelectFromInstanceSetMethodImplementation : MethodImplementation
 {
-	public override Guid MethodClassGuid => KnownInstanceGuids.MethodClasses.ConditionalSelectFromInstanceSetMethod;
+	public override Guid ClassGuid => KnownInstanceGuids.MethodClasses.ConditionalSelectFromInstanceSetMethod;
 
 	protected override InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method)
 	{
diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/EvaluateBooleanExpressionMethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/EvaluateBooleanExpressionMethodImplementation.cs
index 8cdd756..2ccff1b 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/EvaluateBooleanExpressionMethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/EvaluateBooleanExpressionMethodImplementation.cs
@@ -23,7 +23,7 @@ namespace Mocha.Core.MethodImplementations;
 
 public class EvaluateBooleanExpressionMethodImplementation : MethodImplementation
 {
-    public override Guid MethodClassGuid => KnownInstanceGuids.MethodClasses.EvaluateBooleanExpressionMethod;
+    public override Guid ClassGuid => KnownInstanceGuids.MethodClasses.EvaluateBooleanExpressionMethod;
     protected override InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method)
 	{
 		InstanceHandle c_Class = oms.GetInstance(KnownInstanceGuids.Classes.Class);
diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetAttributeBySystemRoutineMethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetAttributeBySystemRoutineMethodImplementation.cs
index eb3c808..7f56bbd 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetAttributeBySystemRoutineMethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetAttributeBySystemRoutineMethodImplementation.cs
@@ -19,7 +19,7 @@ namespace Mocha.Core.MethodImplementations;
 
 public class GetAttributeBySystemRoutineMethodImplementation : MethodImplementation
 {
-    public override Guid MethodClassGuid => KnownInstanceGuids.MethodClasses.GetAttributeBySystemRoutineMethod;
+    public override Guid ClassGuid => KnownInstanceGuids.MethodClasses.GetAttributeBySystemRoutineMethod;
     protected override InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method)
 	{
 		InstanceHandle irForClass = oms.GetRelatedInstance(method, oms.GetInstance(KnownRelationshipGuids.Method__for__Class));
diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetAttributeMethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetAttributeMethodImplementation.cs
index d910766..93d3375 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetAttributeMethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetAttributeMethodImplementation.cs
@@ -19,7 +19,7 @@ namespace Mocha.Core.MethodImplementations;
 
 public class GetAttributeMethodImplementation : MethodImplementation
 {
-    public override Guid MethodClassGuid => KnownInstanceGuids.MethodClasses.GetAttributeMethod;
+    public override Guid ClassGuid => KnownInstanceGuids.MethodClasses.GetAttributeMethod;
     protected override InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method)
     {
 		InstanceHandle irForClass = oms.GetRelatedInstance(method, oms.GetInstance(KnownRelationshipGuids.Method__for__Class));
diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetInstanceSetBySystemRoutineMethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetInstanceSetBySystemRoutineMethodImplementation.cs
index 6a7c466..88d5e98 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetInstanceSetBySystemRoutineMethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetInstanceSetBySystemRoutineMethodImplementation.cs
@@ -19,7 +19,7 @@ namespace Mocha.Core.MethodImplementations;
 
 public class GetInstanceSetBySystemRoutineMethodImplementation : MethodImplementation
 {
-    public override Guid MethodClassGuid => KnownInstanceGuids.MethodClasses.GetInstanceSetBySystemRoutineMethod;
+    public override Guid ClassGuid => KnownInstanceGuids.MethodClasses.GetInstanceSetBySystemRoutineMethod;
     protected override InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method)
 	{
 		InstanceHandle irForClass = oms.GetRelatedInstance(method, oms.GetInstance(KnownRelationshipGuids.Method__for__Class));
diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetInstancesMethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetInstancesMethodImplementation.cs
index b2bbf6f..2b3d4f8 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetInstancesMethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetInstancesMethodImplementation.cs
@@ -20,7 +20,7 @@ namespace Mocha.Core.MethodImplementations;
 
 public class GetInstancesMethodImplementation : MethodImplementation
 {
-	public override Guid MethodClassGuid => new Guid("{0a379314-9d0f-432d-ae59-63194ab32dd3}");
+	public override Guid ClassGuid => new Guid("{0a379314-9d0f-432d-ae59-63194ab32dd3}");
 
     protected override InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method)
     {
diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetReferencedAttributeMethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetReferencedAttributeMethodImplementation.cs
index 484fe4c..c9f4021 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetReferencedAttributeMethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetReferencedAttributeMethodImplementation.cs
@@ -19,7 +19,7 @@ namespace Mocha.Core.MethodImplementations;
 
 public class GetReferencedAttributeMethodImplementation : MethodImplementation
 {
-    public override Guid MethodClassGuid => KnownInstanceGuids.MethodClasses.GetReferencedAttributeMethod;
+    public override Guid ClassGuid => KnownInstanceGuids.MethodClasses.GetReferencedAttributeMethod;
     protected override InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method)
 	{
 		Guid methodId = oms.GetGlobalIdentifier(method); 
diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetReferencedInstanceSetMethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetReferencedInstanceSetMethodImplementation.cs
index 4baf563..44f898b 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetReferencedInstanceSetMethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetReferencedInstanceSetMethodImplementation.cs
@@ -19,7 +19,7 @@ namespace Mocha.Core.MethodImplementations;
 
 public class GetReferencedInstanceSetMethodImplementation : MethodImplementation
 {
-    public override Guid MethodClassGuid => KnownInstanceGuids.MethodClasses.GetReferencedInstanceSetMethod;
+    public override Guid ClassGuid => KnownInstanceGuids.MethodClasses.GetReferencedInstanceSetMethod;
     protected override InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method)
 	{
 		Guid methodId = oms.GetGlobalIdentifier(method); 
diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetRelationshipMethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetRelationshipMethodImplementation.cs
index a54d14f..9df4090 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetRelationshipMethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetRelationshipMethodImplementation.cs
@@ -21,7 +21,7 @@ namespace Mocha.Core.MethodImplementations;
 
 public class GetRelationshipMethodImplementation : MethodImplementation
 {
-    public override Guid MethodClassGuid => KnownInstanceGuids.MethodClasses.GetRelationshipMethod;
+    public override Guid ClassGuid => KnownInstanceGuids.MethodClasses.GetRelationshipMethod;
     protected override InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method)
 	{
 		Guid methodId = oms.GetGlobalIdentifier(method); 
diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetSpecifiedInstancesMethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetSpecifiedInstancesMethodImplementation.cs
index 078e2f6..dd659ef 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetSpecifiedInstancesMethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/GetSpecifiedInstancesMethodImplementation.cs
@@ -19,7 +19,7 @@ namespace Mocha.Core.MethodImplementations;
 
 public class GetSpecifiedInstancesMethodImplementation : MethodImplementation
 {
-    public override Guid MethodClassGuid => KnownInstanceGuids.MethodClasses.GetSpecifiedInstancesMethod;
+    public override Guid ClassGuid => KnownInstanceGuids.MethodClasses.GetSpecifiedInstancesMethod;
 	
 
     protected override InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method)
diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/InstanceOpMethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/InstanceOpMethodImplementation.cs
index 0d76acc..0398a97 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/InstanceOpMethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/InstanceOpMethodImplementation.cs
@@ -19,7 +19,7 @@ namespace Mocha.Core.MethodImplementations;
 
 public class InstanceOpMethodImplementation : MethodImplementation
 {
-	public override Guid MethodClassGuid => KnownInstanceGuids.MethodClasses.InstanceOpMethod;
+	public override Guid ClassGuid => KnownInstanceGuids.MethodClasses.InstanceOpMethod;
 	protected override InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method)
 	{
 		InstanceHandle op = oms.GetRelatedInstance(method, oms.GetInstance(KnownRelationshipGuids.Op_Scope__invokes__Instance_Op));
diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/InvokeWebServiceMethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/InvokeWebServiceMethodImplementation.cs
index c89a627..80a5beb 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/InvokeWebServiceMethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/InvokeWebServiceMethodImplementation.cs
@@ -21,7 +21,7 @@ namespace Mocha.Core.MethodImplementations;
 
 public class InvokeWebServiceMethodImplementation : MethodImplementation
 {
-    public override Guid MethodClassGuid => KnownInstanceGuids.MethodClasses.InvokeWebServiceMethod;
+    public override Guid ClassGuid => KnownInstanceGuids.MethodClasses.InvokeWebServiceMethod;
 	
 
     protected override InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method)
diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/ProcessRelatedUpdatesMethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/ProcessRelatedUpdatesMethodImplementation.cs
index 9f2e506..e7da69a 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/ProcessRelatedUpdatesMethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/ProcessRelatedUpdatesMethodImplementation.cs
@@ -19,7 +19,7 @@ namespace Mocha.Core.MethodImplementations;
 
 public class ProcessRelatedUpdatesMethodImplementation : MethodImplementation
 {
-    public override Guid MethodClassGuid => KnownInstanceGuids.MethodClasses.ProcessRelatedUpdatesMethod;
+    public override Guid ClassGuid => KnownInstanceGuids.MethodClasses.ProcessRelatedUpdatesMethod;
     protected override InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method)
 	{
 		InstanceHandle forClass = oms.GetRelatedInstance(method, oms.GetInstance(KnownRelationshipGuids.Method__for__Class));
diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/ProcessUpdatesMethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/ProcessUpdatesMethodImplementation.cs
index 7cb1881..11ffd17 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/ProcessUpdatesMethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/ProcessUpdatesMethodImplementation.cs
@@ -19,7 +19,7 @@ namespace Mocha.Core.MethodImplementations;
 
 public class ProcessUpdatesMethodImplementation : MethodImplementation
 {
-    public override Guid MethodClassGuid => KnownInstanceGuids.MethodClasses.ProcessUpdatesMethod;
+    public override Guid ClassGuid => KnownInstanceGuids.MethodClasses.ProcessUpdatesMethod;
     protected override InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method)
 	{
 		InstanceHandle forClass = oms.GetRelatedInstance(method, oms.GetInstance(KnownRelationshipGuids.Method__for__Class));
diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/SelectFromInstanceSetMethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/SelectFromInstanceSetMethodImplementation.cs
index 6472693..808a2ee 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/SelectFromInstanceSetMethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/SelectFromInstanceSetMethodImplementation.cs
@@ -30,7 +30,7 @@ public class SelectFromInstanceSetMethodImplementation : MethodImplementation
 		public T Data;
 	}
 
-    public override Guid MethodClassGuid => KnownInstanceGuids.MethodClasses.SelectFromInstanceSetMethod;
+    public override Guid ClassGuid => KnownInstanceGuids.MethodClasses.SelectFromInstanceSetMethod;
     protected override InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method)
 	{
 		//! FIXME !
diff --git a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/UpdateBySystemRoutineMethodImplementation.cs b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/UpdateBySystemRoutineMethodImplementation.cs
index 43f1de1..d7019fe 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/UpdateBySystemRoutineMethodImplementation.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/MethodImplementations/UpdateBySystemRoutineMethodImplementation.cs
@@ -19,7 +19,7 @@ namespace Mocha.Core.MethodImplementations;
 
 public class UpdateBySystemRoutineMethodImplementation : MethodImplementation
 {
-    public override Guid MethodClassGuid => KnownInstanceGuids.MethodClasses.UpdateBySystemRoutineMethod;
+    public override Guid ClassGuid => KnownInstanceGuids.MethodClasses.UpdateBySystemRoutineMethod;
     protected override InstanceHandle ExecuteInternal(Oms oms, OmsContext context, InstanceHandle method)
 	{
 		InstanceHandle irForClass = oms.GetRelatedInstance(method, oms.GetInstance(KnownRelationshipGuids.Method__for__Class));
diff --git a/mocha-dotnet/src/lib/Mocha.Core/Oms.cs b/mocha-dotnet/src/lib/Mocha.Core/Oms.cs
index ba038b9..eb40733 100644
--- a/mocha-dotnet/src/lib/Mocha.Core/Oms.cs
+++ b/mocha-dotnet/src/lib/Mocha.Core/Oms.cs
@@ -55,7 +55,7 @@ public abstract class Oms
 		MethodImplementation[] methodImplementations = MBS.Core.Reflection.TypeLoader.GetAvailableTypes<MethodImplementation>(new System.Reflection.Assembly[] { Assembly.GetExecutingAssembly() });
 		foreach (MethodImplementation impl in methodImplementations)
 		{
-			RegisterMethodImplementation(impl.MethodClassGuid, impl);
+			RegisterMethodImplementation(impl.ClassGuid, impl);
 		}
 		
 		AttributeImplementation[] attributeImplementations = MBS.Core.Reflection.TypeLoader.GetAvailableTypes<AttributeImplementation>(new System.Reflection.Assembly[] { Assembly.GetExecutingAssembly() });