diff -r 17b5de70c6ab schema/Xen_ComputerSystem.mof
--- a/schema/Xen_ComputerSystem.mof	Thu Apr 27 22:26:52 2006
+++ b/schema/Xen_ComputerSystem.mof	Fri Apr 28 05:42:20 2006
@@ -7,7 +7,8 @@
  Description (
 	"A class derived from CIM_VirtualComputerSystem to represent "
 	"the Xen virtual machines/domains running on the system.")]
-class Xen_ComputerSystem : CIM_VirtualComputerSystem
+class Xen_ComputerSystem : CIM_ComputerSystem
+//Changed from VirtualComputerSystem since VirtualComputerSystem is deprecated - Raj@Unisys
 {
    [Description("Remove a DomU configuration, and stop the DomU if running.")]
    uint32 DestroyVirtualSystem();
diff -r 17b5de70c6ab schema/Xen_HostedComputerSystem.mof
--- a/schema/Xen_HostedComputerSystem.mof	Thu Apr 27 22:26:52 2006
+++ b/schema/Xen_HostedComputerSystem.mof	Fri Apr 28 05:42:20 2006
@@ -12,13 +12,13 @@
  Description (
 	"A class derived from CIM_HostedDependency to represent "
 	"the association of a Xen virtual machine/domain with the "
-	"host Linux_ComputerSystem.")]
+	"host CIM_ComputerSystem.")]
 class Xen_HostedComputerSystem : CIM_HostedDependency
 {
    [Override("Dependent")]
    Xen_ComputerSystem REF Dependent;
 
    [Override("Antecedent")]
-   Linux_ComputerSystem REF Antecedent;
+   CIM_ComputerSystem REF Antecedent;
 };
 
diff -r 17b5de70c6ab schema/Xen_HostedDisk.mof
--- a/schema/Xen_HostedDisk.mof	Thu Apr 27 22:26:52 2006
+++ b/schema/Xen_HostedDisk.mof	Fri Apr 28 05:42:20 2006
@@ -12,7 +12,7 @@
  Description (
 	"A class derived from CIM_HostedDependency to represent "
 	"the association of a Xen domain's disk devices with the " 
-	"host's Linux_LogicalDisk.")]
+	"host's CIM_LogicalDisk.")]
 class Xen_HostedDisk : CIM_HostedDependency
 {
    [Override("Dependent")]
diff -r 17b5de70c6ab schema/Xen_HostedMemory.mof
--- a/schema/Xen_HostedMemory.mof	Thu Apr 27 22:26:52 2006
+++ b/schema/Xen_HostedMemory.mof	Fri Apr 28 05:42:20 2006
@@ -12,7 +12,7 @@
  Description (
 	"A class derived from CIM_HostedDependency to represent "
 	"the association of a Xen domain's main memory with the "
-	"host's Linux_CacheMemory.")]
+	"host's CIM_CacheMemory.")]
 class Xen_HostedMemory : CIM_HostedDependency
 {
    [Override("Dependent")]
diff -r 17b5de70c6ab schema/Xen_HostedNetworkPort.mof
--- a/schema/Xen_HostedNetworkPort.mof	Thu Apr 27 22:26:52 2006
+++ b/schema/Xen_HostedNetworkPort.mof	Fri Apr 28 05:42:20 2006
@@ -12,7 +12,7 @@
  Description (
 	"A class derived from CIM_HostedDependency to represent "
 	"the association of a Xen domain's virtual network intefaces "
-	"with the host's Linux_LogicalNetworkAdapter.")]
+	"with the host's CIM_LogicalNetworkAdapter.")]
 class Xen_HostedNetworkPort : CIM_HostedDependency
 {
    [Override("Dependent")]
diff -r 17b5de70c6ab src/Xen_HostedComputerSystem.c
--- a/src/Xen_HostedComputerSystem.c	Thu Apr 27 22:26:52 2006
+++ b/src/Xen_HostedComputerSystem.c	Fri Apr 28 05:42:20 2006
@@ -51,7 +51,7 @@
 /* Name of the left and right hand side classes of this association. */
 static char * _ASSOCCLASS = "Xen_HostedComputerSystem";
 static char * _LHSCLASSNAME = "Xen_ComputerSystem";
-static char * _RHSCLASSNAME = "Linux_ComputerSystem";
+static char * _RHSCLASSNAME = "CIM_ComputerSystem";
 static char * _LHSPROPERTYNAME = "Dependent"; 
 static char * _RHSPROPERTYNAME = "Antecedent";