diff --git a/src/com/eactive/eai/batch/scheduler/ScheduleHandlerProcess.java b/src/com/eactive/eai/batch/scheduler/ScheduleHandlerProcess.java
index 210d4e7..4141121 100644
--- a/src/com/eactive/eai/batch/scheduler/ScheduleHandlerProcess.java
+++ b/src/com/eactive/eai/batch/scheduler/ScheduleHandlerProcess.java
@@ -46,7 +46,7 @@ public class ScheduleHandlerProcess{
 				try{
 					BatchDoc batchDoc = moveJobToProcessing(info);
 					String instName = System.getProperty(Keys.SERVER_KEY);
-					String jobQueue = instName.equals("fepBapSvr11") ? Keys.BAP01_JOB_QUEUE : Keys.BAP02_JOB_QUEUE;
+					String jobQueue = instName.equals("bapSvr11") ? Keys.BAP01_JOB_QUEUE : Keys.BAP02_JOB_QUEUE;
 					JMSSender.sendToQueue(batchDoc, Keys.CONNECT_FACTORY, jobQueue);
 			        //JMSQueueSender sender = new JMSQueueSender();
 	//		        logger.debug("[ScheduleHandlerProcess][clientRequest]batchDoc-->" + batchDoc.getBatchMsg().getHeader().getUUID());
diff --git a/src/com/eactive/eai/common/routing/jms/AbstractQueueConsumer.java b/src/com/eactive/eai/common/routing/jms/AbstractQueueConsumer.java
index 3a5d469..e433be2 100644
--- a/src/com/eactive/eai/common/routing/jms/AbstractQueueConsumer.java
+++ b/src/com/eactive/eai/common/routing/jms/AbstractQueueConsumer.java
@@ -30,7 +30,7 @@ public abstract class AbstractQueueConsumer  implements Runnable, ExceptionListe
 		 try {
 			 
 			String serverName = System.getProperty(Keys.SERVER_KEY);
-		 	if("fepBapSvr11".equals(serverName)) {
+		 	if("bapSvr11".equals(serverName)) {
 		 		queue = queue.replace("21", "11");
 			}else {
 				queue = queue.replace("11", "21");
diff --git a/src/com/eactive/eai/common/routing/jms/JobPolingHandlerQueueConsumerService.java b/src/com/eactive/eai/common/routing/jms/JobPolingHandlerQueueConsumerService.java
index 8c2ed4a..1aa92b6 100644
--- a/src/com/eactive/eai/common/routing/jms/JobPolingHandlerQueueConsumerService.java
+++ b/src/com/eactive/eai/common/routing/jms/JobPolingHandlerQueueConsumerService.java
@@ -35,7 +35,7 @@ public class JobPolingHandlerQueueConsumerService  implements InitializingBean,
 	}
 
 	public void setUri(String uri) {
-		if("fepBapSvr11".equals(serverName)) {
+		if("bapSvr11".equals(serverName)) {
 			uri = uri.replace("21", "11");
 		}else {
 			uri = uri.replace("11", "21");
@@ -48,7 +48,7 @@ public class JobPolingHandlerQueueConsumerService  implements InitializingBean,
 	}
 
 	public void setQueue(String queue) {
-		if("fepBapSvr11".equals(serverName)) {
+		if("bapSvr11".equals(serverName)) {
 			queue = queue.replace("21", "11");
 		}else {
 			queue = queue.replace("11", "21");
diff --git a/src/com/eactive/eai/common/routing/jms/TimerEventListenerQueueConsumerService.java b/src/com/eactive/eai/common/routing/jms/TimerEventListenerQueueConsumerService.java
index 6a2b140..6656c62 100644
--- a/src/com/eactive/eai/common/routing/jms/TimerEventListenerQueueConsumerService.java
+++ b/src/com/eactive/eai/common/routing/jms/TimerEventListenerQueueConsumerService.java
@@ -35,7 +35,7 @@ public class TimerEventListenerQueueConsumerService  implements InitializingBean
 	}
 
 	public void setUri(String uri) {
-		if("fepBapSvr11".equals(serverName)) {
+		if("bapSvr11".equals(serverName)) {
 			uri = uri.replace("21", "11");
 		}else {
 			uri = uri.replace("11", "21");
@@ -48,7 +48,7 @@ public class TimerEventListenerQueueConsumerService  implements InitializingBean
 	}
 
 	public void setQueue(String queue) {
-		if("fepBapSvr11".equals(serverName)) {
+		if("bapSvr11".equals(serverName)) {
 			queue = queue.replace("21", "11");
 		}else {
 			queue = queue.replace("11", "21");
diff --git a/src/com/eactive/eai/common/scheduler/TimerEventJob.java b/src/com/eactive/eai/common/scheduler/TimerEventJob.java
index e191267..81f603d 100644
--- a/src/com/eactive/eai/common/scheduler/TimerEventJob.java
+++ b/src/com/eactive/eai/common/scheduler/TimerEventJob.java
@@ -18,7 +18,7 @@ public class TimerEventJob implements Job {
        
         try {
         	String instName = System.getProperty(Keys.SERVER_KEY);
-			String timerQueue = instName.equals("fepBapSvr11") ? Keys.BAP01_TIMER_QUEUE : Keys.BAP02_TIMER_QUEUE;
+			String timerQueue = instName.equals("bapSvr11") ? Keys.BAP01_TIMER_QUEUE : Keys.BAP02_TIMER_QUEUE;
             //sender.send(Keys.CONNECT_FACTORY, Keys.TIMER_QUEUE, msg, jobKey.getName());
         	JMSSender.sendToQueue(msg, Keys.CONNECT_FACTORY, timerQueue);
 		} catch (Exception e) {