diff --git a/LSL2/STPROC/MONA_SERVICES.txt b/LSL2/STPROC/MONA_SERVICES.txt
index c48fc0f..7e1ecb8 100644
--- a/LSL2/STPROC/MONA_SERVICES.txt
+++ b/LSL2/STPROC/MONA_SERVICES.txt
@@ -182,12 +182,15 @@ SwapResourceNames:
 			StatusName   = 'SFTP-Interface-Outbound-Dev'
 			
 	    Case ( (MonaResource EQ 'GRP_OPENINSIGHT_MES_OP_FE_SAP_INBOUND') and (StatusName EQ 'SetSAPBatchQueue') )
-			MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_SAP_INBOUND'
+			MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_DEV_SAP_INBOUND'
 			StatusName   = 'SetSAPBatchQueue-Dev'
 			
 		Case ( (MonaResource EQ 'GRP_OPENINSIGHT_MES_OP_FE_SAP_INBOUND') and (StatusName EQ 'SFTP-Interface-Inbound') )
 			MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_DEV_SAP_INBOUND'
 			StatusName   = 'SFTP-Interface-Inbound-Dev'
+			
+		Case (MonaResource EQ 'GRP_OPENINSIGHT_MES_OP_FE_NICAINTEGRATIONSERVICE')
+			MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_DEV_NICAINTEGRATIONSERVICE_DEV'
 	End Case
 	
 return
diff --git a/LSL2/STPROC/NICA_ORDERS_SERVICES.txt b/LSL2/STPROC/NICA_ORDERS_SERVICES.txt
index 5eea55d..7e0e103 100644
--- a/LSL2/STPROC/NICA_ORDERS_SERVICES.txt
+++ b/LSL2/STPROC/NICA_ORDERS_SERVICES.txt
@@ -382,8 +382,8 @@ Service CreateNewOrder(EntityType=ENTITY_TYPES, EntityID, OrderType=ORDER_TYPES,
 				end
 				
 				// Send MonA status
-				MonaResource = Environment_Services('GetEnvironmentVariable', 'MonaNicaIntegrationServiceGroup')
-				StatusName = 'CreateNicaOrder'
+				MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_NICAINTEGRATIONSERVICE'
+				StatusName   = 'CreateNicaOrder'
 				If IsSuccessful then
 					LogData     = ''
 					LogData<1>  = Oconv(Date(), 'D4/') : ' ' : Oconv(Time(), 'MTS') ; // Logging DTM
@@ -524,8 +524,8 @@ Service CancelOrder(OrderId)
 						SRP_JSON(ObjResponseJson, 'Release')
 					Repeat
 					
-					MonaResource = Environment_Services('GetEnvironmentVariable', 'MonaNicaIntegrationServiceGroup')
-					StatusName = 'CancelNicaOrder'
+					MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_NICAINTEGRATIONSERVICE'
+					StatusName   = 'CancelNicaOrder'
 					If ( (IsSuccessful EQ True$) and (Response NE 'error') and (ErrorMsg EQ '') ) then		
 						LogData     = ''
 						LogData<1>  = Oconv(Date(), 'D4/') : ' ' : Oconv(Time(), 'MTS') ; // Logging DTM
@@ -726,8 +726,8 @@ Service GetOrderStatusUpdate(OrderId)
 						end
 					Repeat
 					
-					MonaResource = Environment_Services('GetEnvironmentVariable', 'MonaNicaIntegrationServiceGroup')
-					StatusName = 'GetNicaOrderUpdate'
+					MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_NICAINTEGRATIONSERVICE'
+					StatusName   = 'GetNicaOrderUpdate'
 					If IsSuccessful and Response NE 'error' then
 						LogData     = ''
 						LogData<1>  = Oconv(Date(), 'D4/') : ' ' : Oconv(Time(), 'MTS') ; // Logging DTM