Index: DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/AtomD510NodeEEP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/AtomD510NodeEEP.java	(revision 1210)
+++ DCWoRMS/branches/coolemall/src/test/article2/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/article2/recs/plugins/energy/IntelNodeEEP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/IntelNodeEEP.java	(revision 1210)
+++ DCWoRMS/branches/coolemall/src/test/article2/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/article2/recs/plugins/energy/DataCenterEnergyEstimationPlugin.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/DataCenterEnergyEstimationPlugin.java	(revision 1210)
+++ DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/DataCenterEnergyEstimationPlugin.java	(revision 1247)
@@ -1,5 +1,5 @@
 package test.article2.recs.plugins.energy;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.DataCenter;
@@ -17,5 +17,5 @@
 		double power = 0;
 		DataCenter dataCenter = (DataCenter)resource;
-		for(ComputingNode cn:dataCenter.getComputingNodes()){
+		for(Node cn:dataCenter.getNodes()){
 			PowerUsage powerUsage = cn.getPowerInterface().getRecentPowerUsage();
 			power += (powerUsage == null ? 0 : powerUsage.getValue());
Index: DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/AmdNodeEEP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/AmdNodeEEP.java	(revision 1210)
+++ DCWoRMS/branches/coolemall/src/test/article2/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/article2/recs/plugins/energy/RecsNodeBaseEEP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/RecsNodeBaseEEP.java	(revision 1210)
+++ DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/RecsNodeBaseEEP.java	(revision 1247)
@@ -10,5 +10,5 @@
 
 import schedframe.events.scheduling.EventReason;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -137,6 +137,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();
@@ -147,6 +147,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/article2/recs/plugins/timeestimation/RecsTimeEstimationPlugin.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/timeestimation/RecsTimeEstimationPlugin.java	(revision 826)
+++ DCWoRMS/branches/coolemall/src/test/article2/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();
 		if(pe.get(0) instanceof Processor)
 			return ((Processor)pe.get(0)).getParent().getCategory();
@@ -84,6 +84,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/article2/recs/plugins/scheduling/exp1/RecsOutOffSP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsOutOffSP.java	(revision 1211)
+++ DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsOutOffSP.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;
@@ -56,5 +56,5 @@
 			TaskQueue q = queues.get(0);
 
-			List<ComputingNode> notSelectedNodes = resourceManager.getComputingNodes();
+			List<Node> notSelectedNodes = resourceManager.getNodes();
 			// check all tasks in queue
 			for (int i = 0; i < q.size(); i++) {
@@ -62,5 +62,5 @@
 				// if status of the tasks in READY
 				if (task.getStatus() == DCWormsTags.READY) {
-					ComputingNode node = chooseProvider(resourceManager, task);
+					Node node = chooseProvider(resourceManager, task);
 					if (node != null) {
 						node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.ON);
@@ -70,5 +70,5 @@
 				}
 			}
-			turnOffIdleNodes(resourceManager.getComputingNodes());
+			turnOffIdleNodes(resourceManager.getNodes());
 			adjustOtherFans(notSelectedNodes);
 			break;
@@ -77,7 +77,7 @@
 	}
 	
-	private ComputingNode chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
-		List<ComputingNode> nodes = filterNodes(resourceManager.getComputingNodes(), task);
-		for(ComputingNode node: nodes){
+	private Node chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
+		List<Node> nodes = filterNodes(resourceManager.getNodes(), task);
+		for(Node node: nodes){
 			Integer id = Integer.parseInt(node.getName().split("_")[1]);
 			if((id >= START_ID  && id <= END_ID)){
@@ -93,5 +93,5 @@
 
 	private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(
-			ComputingNode node, TaskInterface<?> task) {
+			Node node, TaskInterface<?> task) {
 
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
@@ -127,7 +127,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 {
@@ -170,6 +170,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;
@@ -184,6 +184,6 @@
 	}
 	
-	private void adjustOtherFans(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void adjustOtherFans(List<Node> nodes){
+		for(Node node : nodes){
 			if(node.getFreeProcessorsNumber() == node.getProcessorsNumber()){
 				node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.OFF);
Index: DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsInIdleSP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsInIdleSP.java	(revision 1211)
+++ DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsInIdleSP.java	(revision 1247)
@@ -13,5 +13,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;
@@ -51,5 +51,5 @@
 			TaskQueue q = queues.get(0);
 
-			List<ComputingNode> notSelectedNodes = resourceManager.getComputingNodes();
+			List<Node> notSelectedNodes = resourceManager.getNodes();
 			// check all tasks in queue
 			for (int i = 0; i < q.size(); i++) {
@@ -57,5 +57,5 @@
 				// if status of the tasks in READY
 				if (task.getStatus() == DCWormsTags.READY) {
-					ComputingNode node = chooseProvider(resourceManager, task);
+					Node node = chooseProvider(resourceManager, task);
 					if (node != null) {
 						node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.ON);
@@ -71,7 +71,7 @@
 	}
 	
-	private ComputingNode chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
-		List<ComputingNode> nodes = filterNodes(resourceManager.getComputingNodes(), task);
-		for(ComputingNode node: nodes){
+	private Node chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
+		List<Node> nodes = filterNodes(resourceManager.getNodes(), task);
+		for(Node node: nodes){
 			Integer id = Integer.parseInt(node.getName().split("_")[1]);
 			if((id >= START_ID  && id <= END_ID)){
@@ -84,5 +84,5 @@
 
 	private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(
-			ComputingNode node, TaskInterface<?> task) {
+			Node node, TaskInterface<?> task) {
 
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
@@ -118,7 +118,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 {
@@ -161,6 +161,6 @@
 	}
 	
-	private void adjustOtherFans(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void adjustOtherFans(List<Node> nodes){
+		for(Node node : nodes){
 			if(node.getFreeProcessorsNumber() == node.getProcessorsNumber()){
 				//node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.FAN_OFF);
Index: DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsOutIdleSP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsOutIdleSP.java	(revision 1211)
+++ DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsOutIdleSP.java	(revision 1247)
@@ -13,5 +13,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;
@@ -51,5 +51,5 @@
 			TaskQueue q = queues.get(0);
 
-			List<ComputingNode> notSelectedNodes = resourceManager.getComputingNodes();
+			List<Node> notSelectedNodes = resourceManager.getNodes();
 			// check all tasks in queue
 			for (int i = 0; i < q.size(); i++) {
@@ -57,5 +57,5 @@
 				// if status of the tasks in READY
 				if (task.getStatus() == DCWormsTags.READY) {
-					ComputingNode node = chooseProvider(resourceManager, task);
+					Node node = chooseProvider(resourceManager, task);
 					if (node != null) {
 						node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.ON);
@@ -71,7 +71,7 @@
 	}
 	
-	private ComputingNode chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
-		List<ComputingNode> nodes = filterNodes(resourceManager.getComputingNodes(), task);
-		for(ComputingNode node: nodes){
+	private Node chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
+		List<Node> nodes = filterNodes(resourceManager.getNodes(), task);
+		for(Node node: nodes){
 			Integer id = Integer.parseInt(node.getName().split("_")[1]);
 			if((id >= START_ID  && id <= END_ID)){
@@ -84,5 +84,5 @@
 
 	private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(
-			ComputingNode node, TaskInterface<?> task) {
+			Node node, TaskInterface<?> task) {
 
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
@@ -118,7 +118,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 {
@@ -161,6 +161,6 @@
 	}
 	
-	private void adjustOtherFans(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void adjustOtherFans(List<Node> nodes){
+		for(Node node : nodes){
 			if(node.getFreeProcessorsNumber() == node.getProcessorsNumber()){
 				//node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.FAN_OFF);
Index: DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsInOutSP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsInOutSP.java	(revision 1211)
+++ DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsInOutSP.java	(revision 1247)
@@ -16,5 +16,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;
@@ -54,5 +54,5 @@
 			TaskQueue q = queues.get(0);
 
-			List<ComputingNode> notSelectedNodes = resourceManager.getComputingNodes();
+			List<Node> notSelectedNodes = resourceManager.getNodes();
 			// check all tasks in queue
 			for (int i = 0; i < q.size(); i++) {
@@ -60,5 +60,5 @@
 				// if status of the tasks in READY
 				if (task.getStatus() == DCWormsTags.READY) {
-					ComputingNode node = chooseProvider(resourceManager, task);
+					Node node = chooseProvider(resourceManager, task);
 					if (node != null) {
 						node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.ON);
@@ -74,8 +74,8 @@
 	}
 	
-	private ComputingNode chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
-		List<ComputingNode> nodes = filterNodes(resourceManager.getComputingNodes(), task);
+	private Node chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
+		List<Node> nodes = filterNodes(resourceManager.getNodes(), task);
 		Collections.sort(nodes, new ResourceIdRandomComparator());
-		for(ComputingNode node: nodes){
+		for(Node node: nodes){
 			Integer id = Integer.parseInt(node.getName().split("_")[1]);
 			if((id >= START_ID  && id <= END_ID)){
@@ -88,5 +88,5 @@
 
 	private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(
-			ComputingNode node, TaskInterface<?> task) {
+			Node node, TaskInterface<?> task) {
 
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
@@ -122,7 +122,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 {
@@ -165,6 +165,6 @@
 	}
 	
-	private void adjustOtherFans(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void adjustOtherFans(List<Node> nodes){
+		for(Node node : nodes){
 			if(node.getFreeProcessorsNumber() == node.getProcessorsNumber()){
 				//node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.FAN_OFF);
@@ -177,5 +177,5 @@
 
 
-class ResourceIdRandomComparator implements Comparator<ComputingNode>{
+class ResourceIdRandomComparator implements Comparator<Node>{
 	
 	protected Random random;
@@ -183,5 +183,5 @@
 		random = new Random(5);
 	}
-	public int compare(ComputingNode node1, ComputingNode node2){    
+	public int compare(Node node1, Node node2){    
 		return random.nextInt(3) - 1;
 	   
Index: DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsInOffSP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsInOffSP.java	(revision 1211)
+++ DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsInOffSP.java	(revision 1247)
@@ -13,5 +13,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;
@@ -55,5 +55,5 @@
 			TaskQueue q = queues.get(0);
 
-			List<ComputingNode> notSelectedNodes = resourceManager.getComputingNodes();
+			List<Node> notSelectedNodes = resourceManager.getNodes();
 			// check all tasks in queue
 			for (int i = 0; i < q.size(); i++) {
@@ -61,5 +61,5 @@
 				// if status of the tasks in READY
 				if (task.getStatus() == DCWormsTags.READY) {
-					ComputingNode node = chooseProvider(resourceManager, task);
+					Node node = chooseProvider(resourceManager, task);
 					if (node != null) {
 						node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.ON);
@@ -69,5 +69,5 @@
 				}
 			}
-			turnOffIdleNodes(resourceManager.getComputingNodes());
+			turnOffIdleNodes(resourceManager.getNodes());
 			adjustOtherFans(notSelectedNodes);
 			break;
@@ -76,7 +76,7 @@
 	}
 	
-	private ComputingNode chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
-		List<ComputingNode> nodes = filterNodes(resourceManager.getComputingNodes(), task);
-		for(ComputingNode node: nodes){
+	private Node chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
+		List<Node> nodes = filterNodes(resourceManager.getNodes(), task);
+		for(Node node: nodes){
 			Integer id = Integer.parseInt(node.getName().split("_")[1]);
 			if((id >= START_ID  && id <= END_ID)){
@@ -92,5 +92,5 @@
 
 	private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(
-			ComputingNode node, TaskInterface<?> task) {
+			Node node, TaskInterface<?> task) {
 
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
@@ -126,7 +126,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 {
@@ -169,6 +169,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;
@@ -183,6 +183,6 @@
 	}
 	
-	private void adjustOtherFans(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void adjustOtherFans(List<Node> nodes){
+		for(Node node : nodes){
 			if(node.getFreeProcessorsNumber() == node.getProcessorsNumber()){
 				node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.OFF);
Index: DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsLeft2RightSP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsLeft2RightSP.java	(revision 1211)
+++ DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsLeft2RightSP.java	(revision 1247)
@@ -15,5 +15,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;
@@ -54,5 +54,5 @@
 			TaskQueue q = queues.get(0);
 
-			List<ComputingNode> notSelectedNodes = resourceManager.getComputingNodes();
+			List<Node> notSelectedNodes = resourceManager.getNodes();
 			// check all tasks in queue
 			for (int i = 0; i < q.size(); i++) {
@@ -60,5 +60,5 @@
 				// if status of the tasks in READY
 				if (task.getStatus() == DCWormsTags.READY) {
-					ComputingNode node = chooseProvider(resourceManager, task);
+					Node node = chooseProvider(resourceManager, task);
 					if (node != null) {
 						node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.ON);
@@ -74,8 +74,8 @@
 	}
 
-	private ComputingNode chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
-		List<ComputingNode> nodes = filterNodes(resourceManager.getComputingNodes(), task);
+	private Node chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
+		List<Node> nodes = filterNodes(resourceManager.getNodes(), task);
 		Collections.sort(nodes, new ResourceIdComparator());
-		for (ComputingNode node : nodes) {
+		for (Node node : nodes) {
 			Integer id = Integer.parseInt(node.getName().split("_")[1]);
 			if ((id >= START_ID && id <= END_ID)) {
@@ -88,5 +88,5 @@
 	}
 
-	private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(ComputingNode node, TaskInterface<?> task) {
+	private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(Node node, TaskInterface<?> task) {
 
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
@@ -122,7 +122,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 {
@@ -165,6 +165,6 @@
 	}
 
-	private void adjustOtherFans(List<ComputingNode> nodes) {
-		for (ComputingNode node : nodes) {
+	private void adjustOtherFans(List<Node> nodes) {
+		for (Node node : nodes) {
 			if (node.getFreeProcessorsNumber() == node.getProcessorsNumber()) {
 				// node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.FAN_OFF);
@@ -175,7 +175,7 @@
 	}
 
-	class ResourceIdComparator implements Comparator<ComputingNode> {
+	class ResourceIdComparator implements Comparator<Node> {
 
-		public int compare(ComputingNode node1, ComputingNode node2) {
+		public int compare(Node node1, Node node2) {
 			Integer id1 = Integer.parseInt(node1.getName().split("_")[1]);
 			Integer id2 = Integer.parseInt(node2.getName().split("_")[1]);
Index: DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsIn2OutSP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsIn2OutSP.java	(revision 1211)
+++ DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsIn2OutSP.java	(revision 1247)
@@ -15,5 +15,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;
@@ -53,5 +53,5 @@
 			TaskQueue q = queues.get(0);
 
-			List<ComputingNode> notSelectedNodes = resourceManager.getComputingNodes();
+			List<Node> notSelectedNodes = resourceManager.getNodes();
 			// check all tasks in queue
 			for (int i = 0; i < q.size(); i++) {
@@ -59,5 +59,5 @@
 				// if status of the tasks in READY
 				if (task.getStatus() == DCWormsTags.READY) {
-					ComputingNode node = chooseProvider(resourceManager, task);
+					Node node = chooseProvider(resourceManager, task);
 					if (node != null) {
 						node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.ON);
@@ -73,8 +73,8 @@
 	}
 	
-	private ComputingNode chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
-		List<ComputingNode> nodes = filterNodes(resourceManager.getComputingNodes(), task);
+	private Node chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
+		List<Node> nodes = filterNodes(resourceManager.getNodes(), task);
 		Collections.sort(nodes, new ResourceIdComparator());
-		for(ComputingNode node: nodes){
+		for(Node node: nodes){
 			Integer id = Integer.parseInt(node.getName().split("_")[1]);
 			if((id >= START_ID  && id <= END_ID)){
@@ -88,5 +88,5 @@
 
 	private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(
-			ComputingNode node, TaskInterface<?> task) {
+			Node node, TaskInterface<?> task) {
 
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
@@ -122,7 +122,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 {
@@ -165,6 +165,6 @@
 	}
 	
-	private void adjustOtherFans(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void adjustOtherFans(List<Node> nodes){
+		for(Node node : nodes){
 			if(node.getFreeProcessorsNumber() == node.getProcessorsNumber()){
 				//node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.FAN_OFF);
@@ -175,7 +175,7 @@
 	}
 	
-	class ResourceIdComparator implements Comparator<ComputingNode> {
-
-		public int compare(ComputingNode node1, ComputingNode node2) {
+	class ResourceIdComparator implements Comparator<Node> {
+
+		public int compare(Node node1, Node node2) {
 			Integer id1 = Integer.parseInt(node1.getName().split("_")[1]);
 			Integer id2 = Integer.parseInt(node2.getName().split("_")[1]);
Index: DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsOut2InSP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsOut2InSP.java	(revision 1211)
+++ DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsOut2InSP.java	(revision 1247)
@@ -15,5 +15,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;
@@ -53,5 +53,5 @@
 			TaskQueue q = queues.get(0);
 
-			List<ComputingNode> notSelectedNodes = resourceManager.getComputingNodes();
+			List<Node> notSelectedNodes = resourceManager.getNodes();
 			// check all tasks in queue
 			for (int i = 0; i < q.size(); i++) {
@@ -59,5 +59,5 @@
 				// if status of the tasks in READY
 				if (task.getStatus() == DCWormsTags.READY) {
-					ComputingNode node = chooseProvider(resourceManager, task);
+					Node node = chooseProvider(resourceManager, task);
 					if (node != null) {
 						node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.ON);
@@ -73,8 +73,8 @@
 	}
 	
-	private ComputingNode chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
-		List<ComputingNode> nodes = filterNodes(resourceManager.getComputingNodes(), task);
+	private Node chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
+		List<Node> nodes = filterNodes(resourceManager.getNodes(), task);
 		Collections.sort(nodes, new ResourceIdComparator());
-		for(ComputingNode node: nodes){
+		for(Node node: nodes){
 			Integer id = Integer.parseInt(node.getName().split("_")[1]);
 			if((id >= START_ID  && id <= END_ID)){
@@ -87,5 +87,5 @@
 
 	private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(
-			ComputingNode node, TaskInterface<?> task) {
+			Node node, TaskInterface<?> task) {
 
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
@@ -121,7 +121,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 {
@@ -164,6 +164,6 @@
 	}
 	
-	private void adjustOtherFans(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void adjustOtherFans(List<Node> nodes){
+		for(Node node : nodes){
 			if(node.getFreeProcessorsNumber() == node.getProcessorsNumber()){
 				//node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.FAN_OFF);
@@ -174,7 +174,7 @@
 	}
 	
-	class ResourceIdComparator implements Comparator<ComputingNode> {
+	class ResourceIdComparator implements Comparator<Node> {
 
-		public int compare(ComputingNode node1, ComputingNode node2) {
+		public int compare(Node node1, Node node2) {
 			Integer id1 = Integer.parseInt(node1.getName().split("_")[1]);
 			Integer id2 = Integer.parseInt(node2.getName().split("_")[1]);
Index: DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsRandomSP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsRandomSP.java	(revision 1211)
+++ DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsRandomSP.java	(revision 1247)
@@ -11,5 +11,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;
@@ -50,5 +50,5 @@
 			TaskQueue q = queues.get(0);
 
-			List<ComputingNode> notSelectedNodes = resourceManager.getComputingNodes();
+			List<Node> notSelectedNodes = resourceManager.getNodes();
 			// check all tasks in queue
 			for (int i = 0; i < q.size(); i++) {
@@ -56,5 +56,5 @@
 				// if status of the tasks in READY
 				if (task.getStatus() == DCWormsTags.READY) {
-					ComputingNode node = chooseRandomProvider(resourceManager, task);
+					Node node = chooseRandomProvider(resourceManager, task);
 					if (node != null) {
 						node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.ON);
@@ -70,6 +70,6 @@
 	}
 	
-	private ComputingNode chooseRandomProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
-		List<ComputingNode> nodes = filterNodes(resourceManager.getComputingNodes(), task);
+	private Node chooseRandomProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
+		List<Node> nodes = filterNodes(resourceManager.getNodes(), task);
 		if(nodes.size() > 0)
 			return randomNode(nodes);
@@ -78,5 +78,5 @@
 
 	private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(
-			ComputingNode node, TaskInterface<?> task) {
+			Node node, TaskInterface<?> task) {
 
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
@@ -112,7 +112,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 {
@@ -145,10 +145,10 @@
 	}
 	
-	private ComputingNode randomNode(List<ComputingNode> nodes){
+	private Node randomNode(List<Node> nodes){
 		return nodes.get(rand.nextInt(nodes.size()));
 	}
 	
-	private void adjustOtherFans(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void adjustOtherFans(List<Node> nodes){
+		for(Node node : nodes){
 			if(node.getFreeProcessorsNumber() == node.getProcessorsNumber()){
 				node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.OFF);
Index: DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/RecsSP.java
===================================================================
--- DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/RecsSP.java	(revision 828)
+++ DCWoRMS/branches/coolemall/src/test/article2/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.scheduling.tasks.TaskInterface;
 import test.article2.recs.utils.AppType;
@@ -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 @@
 	}
 	
-	private String getNodeCategory(ComputingNode node){
+	private String getNodeCategory(Node node){
 		return node.getCategory();
 	}
