diff --git a/pkg/rpe/rmr_test.go b/pkg/rpe/rmr_test.go
index 950cd99..fe61356 100644
--- a/pkg/rpe/rmr_test.go
+++ b/pkg/rpe/rmr_test.go
@@ -22,7 +22,7 @@
 ==================================================================================
 */
 /*
-	Mnemonic:	nngpub_test.go
+	Mnemonic:	rmrpub_test.go
 	Abstract:
 	Date:		25 April 2019
 */
diff --git a/pkg/rpe/rpe.go b/pkg/rpe/rpe.go
index b080bcb..39c2bb1 100644
--- a/pkg/rpe/rpe.go
+++ b/pkg/rpe/rpe.go
@@ -115,7 +115,8 @@
 		if rx != nil {
 			rxList = []rtmgr.EndpointList{[]rtmgr.Endpoint{*rx}}
 		}
-		messageId := strconv.Itoa(xapp.RICMessageTypes[messageType])
+		//messageId := strconv.Itoa(xapp.RICMessageTypes[messageType])
+		messageId := rtmgr.Mtype[messageType]
 		route := rtmgr.RouteTableEntry{
 			MessageType: messageId,
 			TxList:      txList,
@@ -143,7 +144,8 @@
 		}
 	}
 
-	messageId := strconv.Itoa(xapp.RICMessageTypes[messageType])
+	//messageId := strconv.Itoa(xapp.RICMessageTypes[messageType])
+	messageId := rtmgr.Mtype[messageType]
 	route := rtmgr.RouteTableEntry{
 		MessageType: messageId,
 		TxList:      txList,
@@ -250,8 +252,6 @@
 			sendEp = subManEp
 		case "E2MAN":
 			sendEp = e2ManEp
-		//case "UEMAN":
-		//	sendEp = ueManEp
 		case "RSM":
 			sendEp = rsmEp
 		case "A1MEDIATOR":
@@ -300,11 +300,6 @@
 		xapp.Logger.Error("Platform component not found: %v", "E2 Manager")
 		xapp.Logger.Debug("Endpoints: %v", endPointList)
 	}
-	/*ueManEp := getEndpointByName(&endPointList, "UEMAN")
-	if ueManEp == nil {
-		xapp.Logger.Error("Platform component not found: %v", "UE Manger")
-		xapp.Logger.Debug("Endpoints: %v", endPointList)
-	}*/
 	rsmEp := getEndpointByName(&endPointList, "RSM")
 	if rsmEp == nil {
 		xapp.Logger.Error("Platform component not found: %v", "Resource Status Manager")