diff --git a/src/test/cord-api/Framework/restApi.py b/src/test/cord-api/Framework/restApi.py
index a11664f..ba2de91 100644
--- a/src/test/cord-api/Framework/restApi.py
+++ b/src/test/cord-api/Framework/restApi.py
@@ -28,8 +28,8 @@
         self.rp = readProperties(os.path.abspath(os.path.dirname(__file__))+"/../Properties/"+ propertyFile)
         self.controllerIP = self.getValueFromProperties("SERVER_IP")
         self.controllerPort = self.getValueFromProperties("SERVER_PORT")
-        self.user = self.getValueFromProperties("USER")
-        self.password = self.getValueFromProperties("PASSWD")
+        self.user = self.getValueFromProperties("XOS_USER")
+        self.password = self.getValueFromProperties("XOS_PASSWD")
         self.jsonHeader = {'Content-Type': 'application/json'}
 
     def getValueFromProperties(self, key):
diff --git a/src/test/cord-api/Properties/RestApiProperties.py b/src/test/cord-api/Properties/RestApiProperties.py
index 83a3253..c34a378 100644
--- a/src/test/cord-api/Properties/RestApiProperties.py
+++ b/src/test/cord-api/Properties/RestApiProperties.py
@@ -16,10 +16,10 @@
 
 #!/usr/bin/env python
 
-SERVER_IP = '10.192.4.62'
+SERVER_IP = 'localhost'
 SERVER_PORT = '9101'
-USER = 'xosadmin@opencord.org'
-PASSWD = ''
+XOS_USER = 'xosadmin@opencord.org'
+XOS_PASSWD = ''
 VOLT_SUBSCRIBER = '/xosapi/v1/rcord/cordsubscriberroots'
 VOLT_TENANT = '/xosapi/v1/volt/voltserviceinstances'
 CH_CORE_SERVICELINK = '/xosapi/v1/core/serviceinstancelinks'
diff --git a/src/test/cord-api/Tests/CordVTN.txt b/src/test/cord-api/Tests/CordVTN.txt
index 4ff9d33..08fb772 100644
--- a/src/test/cord-api/Tests/CordVTN.txt
+++ b/src/test/cord-api/Tests/CordVTN.txt
@@ -310,7 +310,7 @@
 
 *** Keywords ***
 Suite Setup
-    ${auth} =    Create List    ${USER}    ${PASSWD}
+    ${auth} =    Create List    ${XOS_USER}    ${XOS_PASSWD}
     ${HEADERS}    Create Dictionary    Content-Type=application/json
     Create Session    ${SERVER_IP}    http://${SERVER_IP}:${SERVER_PORT}    auth=${AUTH}    headers=${HEADERS}
     Read InputFile
diff --git a/src/test/cord-api/Tests/targets/xosapitests.xtarget b/src/test/cord-api/Tests/targets/xosapitests.xtarget
index 269f6bf..bfa3ff2 100644
--- a/src/test/cord-api/Tests/targets/xosapitests.xtarget
+++ b/src/test/cord-api/Tests/targets/xosapitests.xtarget
@@ -200,7 +200,7 @@
     {% endfor -%}
     @{dependent_models}=    Create List
     Set Suite Variable    ${dependent_models}
-    ${auth} =    Create List    ${USER}    ${PASSWD}
+    ${auth} =    Create List    ${XOS_USER}    ${XOS_PASSWD}
     ${HEADERS}    Create Dictionary    Content-Type=application/json
     Create Session    ${SERVER_IP}    http://${SERVER_IP}:${SERVER_PORT}    auth=${AUTH}    headers=${HEADERS}
     Generate JSON Data