Setting gateway -> tenant
diff --git a/credential-store/credential-api/src/main/java/org/apache/custos/credential/api/controllers/AWSCredentialController.java b/credential-store/credential-api/src/main/java/org/apache/custos/credential/api/controllers/AWSCredentialController.java
index edeecef..82d1bcd 100644
--- a/credential-store/credential-api/src/main/java/org/apache/custos/credential/api/controllers/AWSCredentialController.java
+++ b/credential-store/credential-api/src/main/java/org/apache/custos/credential/api/controllers/AWSCredentialController.java
@@ -37,16 +37,16 @@
     @Autowired
     private DozerBeanMapper mapper;
 
-    @RequestMapping(value = "/{gateway}/{token}", method = RequestMethod.GET)
-    public AWSCredntial getAWSCredential(@PathVariable("gateway") String gateway, @PathVariable("token") String token) throws Exception {
-        AWSCredentialEntity credentialEntity = vaultManager.getCredentialEntity(AWSCredentialEntity.class, token, gateway);
+    @RequestMapping(value = "/{tenant}/{token}", method = RequestMethod.GET)
+    public AWSCredntial getAWSCredential(@PathVariable("tenant") String tenant, @PathVariable("token") String token) throws Exception {
+        AWSCredentialEntity credentialEntity = vaultManager.getCredentialEntity(AWSCredentialEntity.class, token, tenant);
         return mapper.map(credentialEntity, AWSCredntial.class);
     }
 
-    @RequestMapping(value = "/{gateway}", method = RequestMethod.POST)
-    public String createAWSCredential(@RequestBody AWSCredntial credntial, @PathVariable("gateway") String gateway) throws Exception {
+    @RequestMapping(value = "/{tenant}", method = RequestMethod.POST)
+    public String createAWSCredential(@RequestBody AWSCredntial credntial, @PathVariable("tenant") String tenant) throws Exception {
         AWSCredentialEntity credentialEntity = mapper.map(credntial, AWSCredentialEntity.class);
-        String token = vaultManager.saveCredentialEntity(credentialEntity, gateway);
+        String token = vaultManager.saveCredentialEntity(credentialEntity, tenant);
         return token;
     }
 }
diff --git a/credential-store/credential-api/src/main/java/org/apache/custos/credential/api/controllers/SSHCredentialsController.java b/credential-store/credential-api/src/main/java/org/apache/custos/credential/api/controllers/SSHCredentialsController.java
index bb9075b..8b2b1e4 100644
--- a/credential-store/credential-api/src/main/java/org/apache/custos/credential/api/controllers/SSHCredentialsController.java
+++ b/credential-store/credential-api/src/main/java/org/apache/custos/credential/api/controllers/SSHCredentialsController.java
@@ -36,16 +36,16 @@
     @Autowired
     private DozerBeanMapper mapper;
 
-    @RequestMapping(value = "/{gateway}/{token}", method = RequestMethod.GET)
-    public SSHCredential getSSHCredential(@PathVariable("gateway") String gateway, @PathVariable("token") String token) throws Exception {
-        SSHCredentialEntity credentialEntity = vaultManager.getCredentialEntity(SSHCredentialEntity.class, token, gateway);
+    @RequestMapping(value = "/{tenant}/{token}", method = RequestMethod.GET)
+    public SSHCredential getSSHCredential(@PathVariable("tenant") String tenant, @PathVariable("token") String token) throws Exception {
+        SSHCredentialEntity credentialEntity = vaultManager.getCredentialEntity(SSHCredentialEntity.class, token, tenant);
         return mapper.map(credentialEntity, SSHCredential.class);
     }
 
-    @RequestMapping(value = "/{gateway}", method = RequestMethod.POST)
-    public String createSSHCredential(@RequestBody SSHCredential sshCredential, @PathVariable("gateway") String gateway) throws Exception {
+    @RequestMapping(value = "/{tenant}", method = RequestMethod.POST)
+    public String createSSHCredential(@RequestBody SSHCredential sshCredential, @PathVariable("tenant") String tenant) throws Exception {
         SSHCredentialEntity credentialEntity = mapper.map(sshCredential, SSHCredentialEntity.class);
-        String token = vaultManager.saveCredentialEntity(credentialEntity, gateway);
+        String token = vaultManager.saveCredentialEntity(credentialEntity, tenant);
         return token;
     }
 }
diff --git a/credential-store/credential-core/src/main/java/org/apache/airavata/custos/credentials/aws/AWSCredentialEntity.java b/credential-store/credential-core/src/main/java/org/apache/airavata/custos/credentials/aws/AWSCredentialEntity.java
index 0368e48..8aa6966 100644
--- a/credential-store/credential-core/src/main/java/org/apache/airavata/custos/credentials/aws/AWSCredentialEntity.java
+++ b/credential-store/credential-core/src/main/java/org/apache/airavata/custos/credentials/aws/AWSCredentialEntity.java
@@ -24,10 +24,10 @@
 
 public class AWSCredentialEntity extends BaseCredentialEntity {
 
-    @VaultPath(path = "secret/aws/{gateway}/{token}", name = "access_key_id", required = true)
+    @VaultPath(path = "secret/aws/{tenant}/{token}", name = "access_key_id", required = true)
     private String accessKey;
 
-    @VaultPath(path = "secret/aws/{gateway}/{token}", name = "secret_access_key")
+    @VaultPath(path = "secret/aws/{tenant}/{token}", name = "secret_access_key")
     private String secretKey;
 
     public String getAccessKey() {
diff --git a/credential-store/credential-core/src/main/java/org/apache/airavata/custos/credentials/ssh/SSHCredentialEntity.java b/credential-store/credential-core/src/main/java/org/apache/airavata/custos/credentials/ssh/SSHCredentialEntity.java
index 2f32180..6c397c9 100644
--- a/credential-store/credential-core/src/main/java/org/apache/airavata/custos/credentials/ssh/SSHCredentialEntity.java
+++ b/credential-store/credential-core/src/main/java/org/apache/airavata/custos/credentials/ssh/SSHCredentialEntity.java
@@ -23,13 +23,13 @@
 import org.apache.airavata.custos.vault.annotations.VaultPath;
 
 public class SSHCredentialEntity extends BaseCredentialEntity {
-    @VaultPath(path = "secret/ssh/{gateway}/{token}", name = "private", required = true)
+    @VaultPath(path = "secret/ssh/{tenant}/{token}", name = "private", required = true)
     private String privateKey;
 
-    @VaultPath(path = "secret/ssh/{gateway}/{token}", name = "passphrase")
+    @VaultPath(path = "secret/ssh/{tenant}/{token}", name = "passphrase")
     private String passphrase;
 
-    @VaultPath(path = "secret/ssh/{gateway}/{token}", name = "public", required = true)
+    @VaultPath(path = "secret/ssh/{tenant}/{token}", name = "public", required = true)
     private String publicKey;
 
     public String getPrivateKey() {
diff --git a/credential-store/credential-core/src/main/java/org/apache/airavata/custos/vault/VaultManager.java b/credential-store/credential-core/src/main/java/org/apache/airavata/custos/vault/VaultManager.java
index d9f56cc..4bb0e73 100644
--- a/credential-store/credential-core/src/main/java/org/apache/airavata/custos/vault/VaultManager.java
+++ b/credential-store/credential-core/src/main/java/org/apache/airavata/custos/vault/VaultManager.java
@@ -47,11 +47,11 @@
         vault = new Vault(config);
     }
 
-    public <T extends BaseCredentialEntity> T getCredentialEntity(Class<T> clazz, final String token, final String gateway) throws Exception {
+    public <T extends BaseCredentialEntity> T getCredentialEntity(Class<T> clazz, final String token, final String tenant) throws Exception {
 
         Map<String, String> params = new HashMap<String, String>() {{
             put("token", token);
-            put("gateway", gateway);
+            put("tenant", tenant);
         }};
 
         Constructor<T> ctor = clazz.getConstructor();
@@ -72,15 +72,15 @@
         return obj;
     }
 
-    public <T extends BaseCredentialEntity> String saveCredentialEntity(final T credentialEntity, final String gateway) throws Exception {
+    public <T extends BaseCredentialEntity> String saveCredentialEntity(final T credentialEntity, final String tenant) throws Exception {
         final String token = UUID.randomUUID().toString();
 
-        credentialEntity.setGateway(gateway);
+        credentialEntity.setGateway(tenant);
         credentialEntity.setToken(token);
 
         Map<String, String> params = new HashMap<String, String>() {{
             put("token", token);
-            put("gateway", gateway);
+            put("tenant", tenant);
         }};
 
         Map<String, Map<String, Object>> summary = new HashMap<>();