Index: DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/IntelNodeEEP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/IntelNodeEEP.java	(revision 1208)
+++ DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/IntelNodeEEP.java	(revision 1247)
@@ -4,5 +4,5 @@
 import java.io.IOException;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -15,5 +15,5 @@
 			PhysicalResource resource) {
 		double powerConsumption = 0;
-		ComputingNode node = (ComputingNode) resource;
+		Node node = (Node) resource;
 		
 		try {
Index: DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/RecsNodeModelEEP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/RecsNodeModelEEP.java	(revision 1208)
+++ DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/RecsNodeModelEEP.java	(revision 1247)
@@ -11,5 +11,5 @@
 import java.util.ResourceBundle;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Core;
 import schedframe.resources.computing.Processor;
@@ -45,5 +45,5 @@
 			PhysicalResource resource) {
 		double powerConsumption = 0;
-		ComputingNode node = (ComputingNode) resource;
+		Node node = (Node) resource;
 		
 		try {
@@ -92,6 +92,6 @@
 		
 		ProcessingElements pe = (ProcessingElements) peUnit;
-		if(pe.get(0) instanceof ComputingNode)
-			return ((ComputingNode)pe.get(0)).getCategory();
+		if(pe.get(0) instanceof Node)
+			return ((Node)pe.get(0)).getCategory();
 		if(pe.get(0) instanceof Processor)
 			return ((Processor)pe.get(0)).getParent().getCategory();
@@ -102,6 +102,6 @@
 	private int getFrequency(PEUnit peUnit){
 		ProcessingElements pe = (ProcessingElements) peUnit;
-		if(pe.get(0) instanceof ComputingNode)
-			return Double.valueOf(((ComputingNode)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
+		if(pe.get(0) instanceof Node)
+			return Double.valueOf(((Node)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
 		if(pe.get(0) instanceof Processor)
 			return Double.valueOf(((Processor)pe.get(0)).getPowerInterface().getFrequency()).intValue();
Index: DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/AtomZ510NodeEEP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/AtomZ510NodeEEP.java	(revision 1208)
+++ DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/AtomZ510NodeEEP.java	(revision 1247)
@@ -4,5 +4,5 @@
 import java.io.IOException;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -15,5 +15,5 @@
 			PhysicalResource resource) {
 		double powerConsumption = 0;
-		ComputingNode node = (ComputingNode) resource;
+		Node node = (Node) resource;
 		try {
 			if(jobRegistry.getRunningTasks().size() > 0) {
Index: DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/AmdNodeEEP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/AmdNodeEEP.java	(revision 1208)
+++ DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/AmdNodeEEP.java	(revision 1247)
@@ -4,5 +4,5 @@
 import java.io.IOException;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -15,5 +15,5 @@
 			PhysicalResource resource) {
 		double powerConsumption = 0;
-		ComputingNode node = (ComputingNode) resource;
+		Node node = (Node) resource;
 		try {
 			if(jobRegistry.getRunningTasks().size() > 0) {
Index: DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/RecsNodeBaseEEP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/RecsNodeBaseEEP.java	(revision 734)
+++ DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/RecsNodeBaseEEP.java	(revision 1247)
@@ -8,5 +8,5 @@
 import java.util.ResourceBundle;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Core;
 import schedframe.resources.computing.Processor;
@@ -47,6 +47,6 @@
 		
 		ProcessingElements pe = (ProcessingElements) peUnit;
-		if(pe.get(0) instanceof ComputingNode)
-			return ((ComputingNode)pe.get(0)).getCategory();
+		if(pe.get(0) instanceof Node)
+			return ((Node)pe.get(0)).getCategory();
 		Core core = (Core)pe.get(0);
 		return core.getParent().getParent().getCategory();
@@ -55,6 +55,6 @@
 	private int getFrequency(PEUnit peUnit){
 		ProcessingElements pe = (ProcessingElements) peUnit;
-		if(pe.get(0) instanceof ComputingNode)
-			return Double.valueOf(((ComputingNode)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
+		if(pe.get(0) instanceof Node)
+			return Double.valueOf(((Node)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
 		Core core = (Core)pe.get(0);
 		Processor proc = (Processor) core.getParent();
Index: DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/AtomD510NodeEEP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/AtomD510NodeEEP.java	(revision 1208)
+++ DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/AtomD510NodeEEP.java	(revision 1247)
@@ -4,5 +4,5 @@
 import java.io.IOException;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -15,5 +15,5 @@
 			PhysicalResource resource) {
 		double powerConsumption = 0;
-		ComputingNode node = (ComputingNode) resource;
+		Node node = (Node) resource;
 		try {
 			if(jobRegistry.getRunningTasks().size() > 0) {
Index: DCWoRMS/branches/coolemall/src/test/article/recs/plugins/timeestimation/RecsTimeEstimationPlugin.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article/recs/plugins/timeestimation/RecsTimeEstimationPlugin.java	(revision 734)
+++ DCWoRMS/branches/coolemall/src/test/article/recs/plugins/timeestimation/RecsTimeEstimationPlugin.java	(revision 1247)
@@ -10,5 +10,5 @@
 
 import schedframe.events.scheduling.SchedulingEvent;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Core;
 import schedframe.resources.computing.Processor;
@@ -74,6 +74,6 @@
 		
 		ProcessingElements pe = (ProcessingElements) peUnit;
-		if(pe.get(0) instanceof ComputingNode)
-			return ((ComputingNode)pe.get(0)).getCategory();
+		if(pe.get(0) instanceof Node)
+			return ((Node)pe.get(0)).getCategory();
 		Core core = (Core)pe.get(0);
 		return core.getParent().getParent().getCategory();
@@ -82,6 +82,6 @@
 	private int getFrequency(PEUnit peUnit){
 		ProcessingElements pe = (ProcessingElements) peUnit;
-		if(pe.get(0) instanceof ComputingNode)
-			return Double.valueOf(((ComputingNode)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
+		if(pe.get(0) instanceof Node)
+			return Double.valueOf(((Node)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
 		Core core = (Core)pe.get(0);
 		Processor proc = (Processor) core.getParent();
Index: DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptSP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptSP.java	(revision 1197)
+++ DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptSP.java	(revision 1247)
@@ -18,5 +18,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -81,8 +81,8 @@
 
 		Map<ResourceUnitName, ResourceUnit> map;
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
+		List<Node> nodes = resourceManager.getNodes();
 		Collections.sort(nodes, new EnergyComparator(task));
 		//System.out.println("*****");
-		for (ComputingNode node : nodes) {
+		for (Node node : nodes) {
 			//System.out.println(node.getCategory());
 			int cpuRequest;
@@ -149,5 +149,5 @@
 
 	
-	protected String createQuery(TaskInterface<?> task, ComputingNode node) {
+	protected String createQuery(TaskInterface<?> task, Node node) {
 		String query;
 		query = getApplicationType(task) + "." + getNodeCategory(node) + "." + getFrequency(node) + "." + getCoreCnt(task);
@@ -178,5 +178,5 @@
 		return timeBundle;
 	}
-	class EnergyComparator implements Comparator<ComputingNode>{
+	class EnergyComparator implements Comparator<Node>{
 		private TaskInterface<?> task;
 		
@@ -185,5 +185,5 @@
 		}
 		
-	    public int compare(ComputingNode node1, ComputingNode node2){    
+	    public int compare(Node node1, Node node2){    
 	    	double node1EU = Double.MAX_VALUE;
 	    	double node2EU = Double.MAX_VALUE;
Index: DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessRandomNodePowManSP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessRandomNodePowManSP.java	(revision 734)
+++ DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessRandomNodePowManSP.java	(revision 1247)
@@ -14,5 +14,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -64,5 +64,5 @@
 				}
 			}
-			turnOffIdleNodes(resourceManager.getComputingNodes());
+			turnOffIdleNodes(resourceManager.getNodes());
 			break;
 		}
@@ -75,9 +75,9 @@
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
 		
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
-		List<ComputingNode> avNodes = filterNodes(nodes, task);
+		List<Node> nodes = resourceManager.getNodes();
+		List<Node> avNodes = filterNodes(nodes, task);
 		if(avNodes.size() == 0)
 			return null;
-		ComputingNode node = randomNode(avNodes);
+		Node node = randomNode(avNodes);
 		if(node.getStatus() == ResourceStatus.UNAVAILABLE) {
 			node.getPowerInterface().setPowerState(StandardPowerStateName.ON);
@@ -113,7 +113,7 @@
 	}
 	
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes, TaskInterface<?> task){
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes, TaskInterface<?> task){
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -156,10 +156,10 @@
 	}
 	
-	private ComputingNode randomNode(List<ComputingNode> nodes){
+	private Node randomNode(List<Node> nodes){
 		return nodes.get(rand.nextInt(nodes.size()));
 	}
 	
-	private void turnOffIdleNodes(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void turnOffIdleNodes(List<Node> nodes){
+		for(Node node : nodes){
 			Processor proc = node.getProcessors().get(0);
 			int freeCores = 0;
Index: DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessDFSSP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessDFSSP.java	(revision 734)
+++ DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessDFSSP.java	(revision 1247)
@@ -14,5 +14,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -75,9 +75,9 @@
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
 		
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
-		List<ComputingNode> avNodes = filterNodes(nodes, task);
+		List<Node> nodes = resourceManager.getNodes();
+		List<Node> avNodes = filterNodes(nodes, task);
 		if(avNodes.size() == 0)
 			return null;
-		ComputingNode node = randomNode(avNodes);
+		Node node = randomNode(avNodes);
 
 		int cpuRequest;
@@ -111,7 +111,7 @@
 	}
 	
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes, TaskInterface<?> task){
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes, TaskInterface<?> task){
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -154,5 +154,5 @@
 	}
 	
-	private ComputingNode randomNode(List<ComputingNode> nodes){
+	private Node randomNode(List<Node> nodes){
 		return nodes.get(rand.nextInt(nodes.size()));
 	}
Index: DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptNodePowManSP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptNodePowManSP.java	(revision 1197)
+++ DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptNodePowManSP.java	(revision 1247)
@@ -18,5 +18,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -75,5 +75,5 @@
 				}
 			}
-			turnOffIdleNodes(resourceManager.getComputingNodes());
+			turnOffIdleNodes(resourceManager.getNodes());
 			break;
 		}
@@ -85,7 +85,7 @@
 
 		Map<ResourceUnitName, ResourceUnit> map;
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
+		List<Node> nodes = resourceManager.getNodes();
 		Collections.sort(nodes, new EnergyComparator(task));
-		for (ComputingNode node : nodes) {
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -155,5 +155,5 @@
 
 	
-	protected String createQuery(TaskInterface<?> task, ComputingNode node) {
+	protected String createQuery(TaskInterface<?> task, Node node) {
 		String query;
 		query = getApplicationType(task) + "." + getNodeCategory(node) + "." + getFrequency(node) + "." + getCoreCnt(task);
@@ -184,5 +184,5 @@
 		return timeBundle;
 	}
-	class EnergyComparator implements Comparator<ComputingNode>{
+	class EnergyComparator implements Comparator<Node>{
 		private TaskInterface<?> task;
 		
@@ -191,5 +191,5 @@
 		}
 		
-	    public int compare(ComputingNode node1, ComputingNode node2){    
+	    public int compare(Node node1, Node node2){    
 	    	double node1EU = Double.MAX_VALUE;
 	    	double node2EU = Double.MAX_VALUE;
@@ -221,6 +221,6 @@
 	}
 	
-	private void turnOffIdleNodes(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void turnOffIdleNodes(List<Node> nodes){
+		for(Node node : nodes){
 			Processor proc = node.getProcessors().get(0);
 			int freeCores = 0;
Index: DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsSP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsSP.java	(revision 1197)
+++ DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsSP.java	(revision 1247)
@@ -7,5 +7,5 @@
 import java.util.ResourceBundle;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.scheduling.tasks.TaskInterface;
@@ -27,5 +27,5 @@
 	}
 	
-	protected String createExecutivenessQuery(TaskInterface<?> task, ComputingNode node) {
+	protected String createExecutivenessQuery(TaskInterface<?> task, Node node) {
 		Executable exec = (Executable)task;
 		String query = getApplicationType(exec) + "." + getNodeCategory(node);
@@ -38,5 +38,5 @@
 	}
 	
-	protected String getNodeCategory(ComputingNode node){
+	protected String getNodeCategory(Node node){
 		return node.getCategory();
 	}
@@ -52,5 +52,5 @@
 	}
 	
-	protected int getFrequency(ComputingNode node){
+	protected int getFrequency(Node node){
 		Processor proc = (Processor) node.getProcessors().get(0);
 		double freq = proc.getPowerInterface().getFrequency();
Index: DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessRandomSP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessRandomSP.java	(revision 734)
+++ DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessRandomSP.java	(revision 1247)
@@ -14,5 +14,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -73,9 +73,9 @@
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
 		
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
-		List<ComputingNode> avNodes = filterNodes(nodes, task);
+		List<Node> nodes = resourceManager.getNodes();
+		List<Node> avNodes = filterNodes(nodes, task);
 		if(avNodes.size() == 0)
 			return null;
-		ComputingNode node = randomNode(avNodes);
+		Node node = randomNode(avNodes);
 
 		int cpuRequest;
@@ -109,7 +109,7 @@
 	}
 	
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes, TaskInterface<?> task){
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes, TaskInterface<?> task){
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -152,5 +152,5 @@
 	}
 	
-	private ComputingNode randomNode(List<ComputingNode> nodes){
+	private Node randomNode(List<Node> nodes){
 		return nodes.get(rand.nextInt(nodes.size()));
 	}
Index: DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptDFSSP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptDFSSP.java	(revision 1208)
+++ DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptDFSSP.java	(revision 1247)
@@ -18,5 +18,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -84,8 +84,8 @@
 
 		Map<ResourceUnitName, ResourceUnit> map;
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
+		List<Node> nodes = resourceManager.getNodes();
 		Collections.sort(nodes, new EnergyComparator(task));
 		//System.out.println("*****");
-		for (ComputingNode node : nodes) {
+		for (Node node : nodes) {
 			//System.out.println(node.getCategory());
 			int cpuRequest;
@@ -152,5 +152,5 @@
 
 	
-	protected String createQuery(TaskInterface<?> task, ComputingNode node) {
+	protected String createQuery(TaskInterface<?> task, Node node) {
 		String query;
 		query = getApplicationType(task) + "." + getNodeCategory(node) + "." + getFrequency(node) + "." + getCoreCnt(task);
@@ -181,5 +181,5 @@
 		return timeBundle;
 	}
-	class EnergyComparator implements Comparator<ComputingNode>{
+	class EnergyComparator implements Comparator<Node>{
 		private TaskInterface<?> task;
 		
@@ -188,5 +188,5 @@
 		}
 		
-	    public int compare(ComputingNode node1, ComputingNode node2){    
+	    public int compare(Node node1, Node node2){    
 	    	double node1EU = Double.MAX_VALUE;
 	    	double node2EU = Double.MAX_VALUE;
