Upgrade SDC from Titan to Janus Graph

Upgrade SDC from Titan to Janus Graph

Change-Id: I67fb8b8e60cc6751697bc5ff2f06754c92803786
Issue-ID: SDC-2296
Signed-off-by: shrikantawachar <shrikant.awachar@amdocs.com>

122 files changed, 4110 insertions, 3585 deletions

diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml
index c5db734701..a28a040640 100644
--- a/catalog-model/pom.xml
+++ b/catalog-model/pom.xml
@@ -105,11 +105,10 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- TITAN -->
 		<dependency>
-			<groupId>com.thinkaurelius.titan</groupId>
-			<artifactId>titan-core</artifactId>
-			<version>${titan.version}</version>
+			<groupId>org.janusgraph</groupId>
+			<artifactId>janusgraph-core</artifactId>
+			<version>${janusgraph.version}</version>
 			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
@@ -132,9 +131,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.sdc.sdc-titan-cassandra</groupId>
-			<artifactId>sdc-titan-cassandra</artifactId>
-			<version>${sdc.titan.version}</version>
+			<groupId>org.janusgraph</groupId>
+			<artifactId>janusgraph-cassandra</artifactId>
+			<version>${janusgraph.version}</version>
 			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
@@ -143,7 +142,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<!-- TITAN END -->
 
 		<dependency>
 			<groupId>org.apache.commons</groupId>
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/config/CatalogModelSpringConfig.java b/catalog-model/src/main/java/org/openecomp/sdc/be/config/CatalogModelSpringConfig.java
index 6ba7a35836..5b9cf67dc1 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/config/CatalogModelSpringConfig.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/config/CatalogModelSpringConfig.java
@@ -8,8 +8,8 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 @ComponentScan({"org.openecomp.sdc.be.model.operations.impl",
                 "org.openecomp.sdc.be.model.cache",
-                "org.openecomp.sdc.be.model.jsontitan.utils",
-                "org.openecomp.sdc.be.model.jsontitan.operations",
+    "org.openecomp.sdc.be.model.jsonjanusgraph.utils",
+    "org.openecomp.sdc.be.model.jsonjanusgraph.operations",
                 "org.openecomp.sdc.be.dao.cassandra"
 })
 public class CatalogModelSpringConfig {
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/Component.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/Component.java
index b65997cb35..0a77ecd471 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/Component.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/Component.java
@@ -48,7 +48,7 @@ import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElementTypeEnum;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElementTypeEnum;
 import org.openecomp.sdc.common.api.ArtifactTypeEnum;
 
 import static java.util.stream.Collectors.toMap;
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/DerivedNodeTypeResolver.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/DerivedNodeTypeResolver.java
index 5104a172b5..5a670890a9 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/DerivedNodeTypeResolver.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/DerivedNodeTypeResolver.java
@@ -21,13 +21,13 @@
 package org.openecomp.sdc.be.model;
 
 import fj.data.Either;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 
 import java.util.List;
 
 public interface DerivedNodeTypeResolver {
 
-    Either<List<GraphVertex>, TitanOperationStatus> findDerivedResources(String parentResource);
+    Either<List<GraphVertex>, JanusGraphOperationStatus> findDerivedResources(String parentResource);
 
 }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/Service.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/Service.java
index 3c1ca26879..4920d4f10c 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/Service.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/Service.java
@@ -23,17 +23,13 @@ package org.openecomp.sdc.be.model;
 import org.apache.commons.lang.StringUtils;
 import org.openecomp.sdc.be.datatypes.components.ComponentMetadataDataDefinition;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import org.openecomp.sdc.be.datatypes.components.ServiceMetadataDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.ForwardingPathDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.InstantiationTypes;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElementTypeEnum;
-
-import java.util.HashMap;
-import java.util.Map;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElementTypeEnum;
 
 public class Service extends Component {
 
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ApplicationCache.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ApplicationCache.java
index e9b7f7a2e5..e70ab0ec63 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ApplicationCache.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ApplicationCache.java
@@ -21,14 +21,14 @@
 package org.openecomp.sdc.be.model.cache;
 
 import fj.data.Either;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 
 import java.util.Map;
 
 public interface ApplicationCache<T> {
 
-    public abstract Either<Map<String, T>, TitanOperationStatus> getAll();
+    public abstract Either<Map<String, T>, JanusGraphOperationStatus> getAll();
 
-    public abstract Either<T, TitanOperationStatus> get(String uniqueId);
+    public abstract Either<T, JanusGraphOperationStatus> get(String uniqueId);
 
 }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ApplicationDataTypeCache.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ApplicationDataTypeCache.java
index 94992111d3..fb49762736 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ApplicationDataTypeCache.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ApplicationDataTypeCache.java
@@ -28,7 +28,7 @@ import org.openecomp.sdc.be.config.BeEcompErrorManager.ErrorSeverity;
 import org.openecomp.sdc.be.config.Configuration.ApplicationL1CacheConfig;
 import org.openecomp.sdc.be.config.Configuration.ApplicationL1CacheInfo;
 import org.openecomp.sdc.be.config.ConfigurationManager;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.DataTypeDataDefinition;
 import org.openecomp.sdc.be.model.DataTypeDefinition;
 import org.openecomp.sdc.be.model.operations.impl.PropertyOperation;
@@ -146,7 +146,7 @@ public class ApplicationDataTypeCache implements ApplicationCache<DataTypeDefini
         }
     }
 
-    private Either<Map<String, DataTypeDefinition>, TitanOperationStatus> getAllDataTypesFromGraph() {
+    private Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> getAllDataTypesFromGraph() {
 
         return propertyOperation
                 .getAllDataTypes();
@@ -154,7 +154,7 @@ public class ApplicationDataTypeCache implements ApplicationCache<DataTypeDefini
     }
 
     @Override
-    public Either<Map<String, DataTypeDefinition>, TitanOperationStatus> getAll() {
+    public Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> getAll() {
 
         try {
 
@@ -171,7 +171,7 @@ public class ApplicationDataTypeCache implements ApplicationCache<DataTypeDefini
     }
 
     @Override
-    public Either<DataTypeDefinition, TitanOperationStatus> get(String uniqueId) {
+    public Either<DataTypeDefinition, JanusGraphOperationStatus> get(String uniqueId) {
 
         try {
             r.lock();
@@ -202,12 +202,12 @@ public class ApplicationDataTypeCache implements ApplicationCache<DataTypeDefini
 
             Long start = System.currentTimeMillis();
             log.trace("Start fetching all data types from db");
-            Either<List<DataTypeData>, TitanOperationStatus> allDataTypeNodes = propertyOperation.getAllDataTypeNodes();
+            Either<List<DataTypeData>, JanusGraphOperationStatus> allDataTypeNodes = propertyOperation.getAllDataTypeNodes();
             Long end = System.currentTimeMillis();
             log.trace("Finish fetching all data types from db. Took {} Milliseconds", (end - start));
             if (allDataTypeNodes.isRight()) {
-                TitanOperationStatus status = allDataTypeNodes.right().value();
-                if (status != TitanOperationStatus.OK) {
+                JanusGraphOperationStatus status = allDataTypeNodes.right().value();
+                if (status != JanusGraphOperationStatus.OK) {
                     log.debug("ApplicationDataTypesCache - Failed to fetch all data types nodes");
                     BeEcompErrorManager.getInstance().logInternalConnectionError("FetchDataTypes",
                             "Failed to fetch data types from graph(cache)", ErrorSeverity.INFO);
@@ -251,7 +251,7 @@ public class ApplicationDataTypeCache implements ApplicationCache<DataTypeDefini
                     "Failed to run refresh data types job", ErrorSeverity.INFO);
         } finally {
             try {
-                propertyOperation.getTitanGenericDao().commit();
+                propertyOperation.getJanusGraphGenericDao().commit();
             } catch (Exception e) {
                 log.trace("Failed to commit ApplicationDataTypeCache", e);
             }
@@ -301,11 +301,11 @@ public class ApplicationDataTypeCache implements ApplicationCache<DataTypeDefini
 
     private void replaceAllData() {
 
-        Either<Map<String, DataTypeDefinition>, TitanOperationStatus> allDataTypes = propertyOperation
+        Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> allDataTypes = propertyOperation
                 .getAllDataTypes();
 
         if (allDataTypes.isRight()) {
-            TitanOperationStatus status = allDataTypes.right().value();
+            JanusGraphOperationStatus status = allDataTypes.right().value();
             log.debug("Failed to fetch all data types from db. Status is {}", status);
         } else {
 
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ComponentCache.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ComponentCache.java
index b17a66434a..0fea33e8e5 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ComponentCache.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ComponentCache.java
@@ -37,7 +37,7 @@ import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.*;
-import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.resources.data.ComponentCacheData;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.SerializationUtils;
@@ -54,10 +54,6 @@ import java.util.stream.Collectors;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 @org.springframework.stereotype.Component("component-cache")
 public class ComponentCache {
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/DaoInfo.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/DaoInfo.java
index 4880afee81..85a7f2ec59 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/DaoInfo.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/DaoInfo.java
@@ -20,7 +20,7 @@
 
 package org.openecomp.sdc.be.model.cache;
 
-import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
 
 public class DaoInfo {
     private ToscaOperationFacade toscaOperationFacade;
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/workers/SyncWorker.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/workers/SyncWorker.java
index 7af806f55c..cd78063780 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/workers/SyncWorker.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/workers/SyncWorker.java
@@ -22,7 +22,7 @@ package org.openecomp.sdc.be.model.cache.workers;
 
 import fj.data.Either;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.operations.impl.CacheMangerOperation;
@@ -85,7 +85,7 @@ public class SyncWorker implements Runnable, IWorker {
             log.debug("sync worker:{} encounered an exception", workerName);
             log.debug("exception", e);
         } finally {
-            this.cacheMangerOperation.getTitanGenericDao().commit();
+            this.cacheMangerOperation.getJanusGraphGenericDao().commit();
         }
     }
 
@@ -97,11 +97,11 @@ public class SyncWorker implements Runnable, IWorker {
     private void clearCacheRecords() {
         cacheIdAndTimeMap.forEach((k, v) -> {
             try {
-                Either<ComponentMetadataData, TitanOperationStatus> componentFromGraphRes = getComponentMetaData(k,
+                Either<ComponentMetadataData, JanusGraphOperationStatus> componentFromGraphRes = getComponentMetaData(k,
                         NodeTypeEnum.getByName(v.getType()));
                 if (componentFromGraphRes.isRight()) {
-                    TitanOperationStatus error = componentFromGraphRes.right().value();
-                    if (TitanOperationStatus.NOT_FOUND.equals(error)) {
+                    JanusGraphOperationStatus error = componentFromGraphRes.right().value();
+                    if (JanusGraphOperationStatus.NOT_FOUND.equals(error)) {
                         long delay = System.currentTimeMillis() - v.getModificationTime().getTime();
                         if (delay > updateDelayInMilliseconds) {
                             this.cacheMangerOperation.deleteComponentInCache(k, v.getModificationTime().getTime(),
@@ -148,11 +148,11 @@ public class SyncWorker implements Runnable, IWorker {
     private void syncCacheByComponentType(NodeTypeEnum nodeTypeEnum) {
         if (!this.shutdown) {
             log.trace("syncCache records of type:{} .", nodeTypeEnum);
-            Either<List<ComponentMetadataData>, TitanOperationStatus> getAllResult = getAllComponentsMetaData(
+            Either<List<ComponentMetadataData>, JanusGraphOperationStatus> getAllResult = getAllComponentsMetaData(
                     nodeTypeEnum);
             List<ComponentMetadataData> componentList = new ArrayList<>();
-            if (getAllResult.isRight() && !TitanOperationStatus.NOT_FOUND.equals(getAllResult.right().value())) {
-                log.debug("error while trying to get all components of type:{} TitanOperationStatus:{}.", nodeTypeEnum,
+            if (getAllResult.isRight() && !JanusGraphOperationStatus.NOT_FOUND.equals(getAllResult.right().value())) {
+                log.debug("error while trying to get all components of type:{} JanusGraphOperationStatus:{}.", nodeTypeEnum,
                         getAllResult.right().value());
                 return;
             }
@@ -243,9 +243,9 @@ public class SyncWorker implements Runnable, IWorker {
      * @return a list of retrieved nodes matching the given type or not found in
      *         case no nodes were found or error in case of failure
      */
-    private Either<List<ComponentMetadataData>, TitanOperationStatus> getAllComponentsMetaData(
+    private Either<List<ComponentMetadataData>, JanusGraphOperationStatus> getAllComponentsMetaData(
             NodeTypeEnum nodeTypeEnum) {
-        return this.cacheMangerOperation.getTitanGenericDao().getByCriteria(nodeTypeEnum, null,
+        return this.cacheMangerOperation.getJanusGraphGenericDao().getByCriteria(nodeTypeEnum, null,
                 ComponentMetadataData.class);
     }
 
@@ -259,9 +259,9 @@ public class SyncWorker implements Runnable, IWorker {
      * @return the meta dat of the component or the error encountered during the
      *         get
      */
-    private Either<ComponentMetadataData, TitanOperationStatus> getComponentMetaData(String uid,
-            NodeTypeEnum nodeTypeEnum) {
-        return this.cacheMangerOperation.getTitanGenericDao().getNode(UniqueIdBuilder.getKeyByNodeType(nodeTypeEnum),
+    private Either<ComponentMetadataData, JanusGraphOperationStatus> getComponentMetaData(String uid,
+                                                                                          NodeTypeEnum nodeTypeEnum) {
+        return this.cacheMangerOperation.getJanusGraphGenericDao().getNode(UniqueIdBuilder.getKeyByNodeType(nodeTypeEnum),
                 uid, ComponentMetadataData.class);
     }
 }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/NodeType.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/datamodel/NodeType.java
index 4babd5d4a8..9c3b76d556 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/NodeType.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/datamodel/NodeType.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.datamodel;
+package org.openecomp.sdc.be.model.jsonjanusgraph.datamodel;
 
 import org.openecomp.sdc.be.datatypes.elements.*;
 
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/TopologyTemplate.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/datamodel/TopologyTemplate.java
index 8c0253a148..a02b07df15 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/TopologyTemplate.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/datamodel/TopologyTemplate.java
@@ -18,16 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.datamodel;
+package org.openecomp.sdc.be.model.jsonjanusgraph.datamodel;
 
 import org.apache.commons.collections.MapUtils;
 import org.openecomp.sdc.be.datatypes.elements.*;
 import org.openecomp.sdc.be.datatypes.elements.MapCapabilityProperty;
 import org.openecomp.sdc.be.datatypes.elements.MapListCapabilityDataDefinition;
 import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
-import org.openecomp.sdc.be.model.DataTypeDefinition;
 import org.openecomp.sdc.be.model.MapInterfaceInstanceDataDefinition;
-import org.openecomp.sdc.be.model.jsontitan.enums.JsonConstantKeysEnum;
+import org.openecomp.sdc.be.model.jsonjanusgraph.enums.JsonConstantKeysEnum;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/ToscaElement.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/datamodel/ToscaElement.java
index a18c75bca7..7685d1c348 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/ToscaElement.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/datamodel/ToscaElement.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.datamodel;
+package org.openecomp.sdc.be.model.jsonjanusgraph.datamodel;
 
 import org.openecomp.sdc.be.datatypes.elements.AdditionalInfoParameterDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition;
@@ -31,7 +31,7 @@ import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
-import org.openecomp.sdc.be.model.jsontitan.operations.NodeTypeOperation;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.NodeTypeOperation;
 import org.slf4j.MDC;
 
 import java.util.HashMap;
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/ToscaElementTypeEnum.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/datamodel/ToscaElementTypeEnum.java
index 3ee492b9bb..1e3620ba14 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/datamodel/ToscaElementTypeEnum.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/datamodel/ToscaElementTypeEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.datamodel;
+package org.openecomp.sdc.be.model.jsonjanusgraph.datamodel;
 
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
 
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/enums/JsonConstantKeysEnum.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/enums/JsonConstantKeysEnum.java
index 2a4496e793..308f2db445 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/enums/JsonConstantKeysEnum.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/enums/JsonConstantKeysEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.enums;
+package org.openecomp.sdc.be.model.jsonjanusgraph.enums;
 
 public enum JsonConstantKeysEnum {
 
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ArchiveOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ArchiveOperation.java
index f4033a2ffb..3f2b41e3b5 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ArchiveOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ArchiveOperation.java
@@ -1,19 +1,19 @@
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.ComponentInstanceDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.CompositionDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum;
 import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
-import org.openecomp.sdc.be.model.jsontitan.enums.JsonConstantKeysEnum;
+import org.openecomp.sdc.be.model.jsonjanusgraph.enums.JsonConstantKeysEnum;
 import org.openecomp.sdc.be.model.operations.api.IGraphLockOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.common.log.wrappers.Logger;
@@ -23,8 +23,8 @@ import org.springframework.stereotype.Component;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static org.openecomp.sdc.be.model.jsontitan.operations.ArchiveOperation.Action.ARCHIVE;
-import static org.openecomp.sdc.be.model.jsontitan.operations.ArchiveOperation.Action.RESTORE;
+import static org.openecomp.sdc.be.model.jsonjanusgraph.operations.ArchiveOperation.Action.ARCHIVE;
+import static org.openecomp.sdc.be.model.jsonjanusgraph.operations.ArchiveOperation.Action.RESTORE;
 
 /**
  * Created by yavivi on 25/03/2018.
@@ -41,13 +41,13 @@ public class ArchiveOperation extends BaseOperation {
         ARCHIVE, RESTORE;
     }
 
-    public ArchiveOperation(TitanDao titanDao, IGraphLockOperation graphLockOperation){
-        this.titanDao = titanDao;
+    public ArchiveOperation(JanusGraphDao janusGraphDao, IGraphLockOperation graphLockOperation){
+        this.janusGraphDao = janusGraphDao;
         this.graphLockOperation = graphLockOperation;
     }
 
     public Either<List<String>, ActionStatus> archiveComponent(String componentId) {
-        final Either<GraphVertex, TitanOperationStatus> vertexResult = this.titanDao.getVertexById(componentId);
+        final Either<GraphVertex, JanusGraphOperationStatus> vertexResult = this.janusGraphDao.getVertexById(componentId);
         if (vertexResult.isLeft()){
             return doAction(ARCHIVE, vertexResult.left().value());
         } else {
@@ -56,7 +56,7 @@ public class ArchiveOperation extends BaseOperation {
     }
 
     public Either<List<String>, ActionStatus> restoreComponent(String componentId) {
-        final Either<GraphVertex, TitanOperationStatus> vertexResult = this.titanDao.getVertexById(componentId);
+        final Either<GraphVertex, JanusGraphOperationStatus> vertexResult = this.janusGraphDao.getVertexById(componentId);
         if (vertexResult.isLeft()){
             return doAction(RESTORE, vertexResult.left().value());
         } else {
@@ -75,7 +75,8 @@ public class ArchiveOperation extends BaseOperation {
     private ActionStatus onVspStateChanged(Action action, String csarId) {
         Map<GraphPropertyEnum, Object> props = new HashMap<>();
         props.put(GraphPropertyEnum.CSAR_UUID, csarId);
-        Either<List<GraphVertex>, TitanOperationStatus> vfsE = titanDao.getByCriteria(VertexTypeEnum.TOPOLOGY_TEMPLATE, props);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> vfsE = janusGraphDao
+            .getByCriteria(VertexTypeEnum.TOPOLOGY_TEMPLATE, props);
         return vfsE.either(vList -> setVspArchived(action, vList), s -> onError("VSP_"+action.name(), csarId, s));
     }
 
@@ -85,7 +86,7 @@ public class ArchiveOperation extends BaseOperation {
             GraphVertex highestVersion = this.getHighestVersionFrom(vList.get(0));
             StorageOperationStatus lockStatus = this.graphLockOperation.lockComponent(highestVersion.getUniqueId(), highestVersion.getType().getNodeType());
             if (lockStatus != StorageOperationStatus.OK){
-                return onError(action.name(), highestVersion.getUniqueId(), TitanOperationStatus.ALREADY_LOCKED);
+                return onError(action.name(), highestVersion.getUniqueId(), JanusGraphOperationStatus.ALREADY_LOCKED);
             }
 
             try {
@@ -94,7 +95,7 @@ public class ArchiveOperation extends BaseOperation {
                     boolean val = action == ARCHIVE ? true : false;
                     v.setJsonMetadataField(JsonPresentationFields.IS_VSP_ARCHIVED, val);
                     v.addMetadataProperty(GraphPropertyEnum.IS_VSP_ARCHIVED, val);
-                    titanDao.updateVertex(v);
+                    janusGraphDao.updateVertex(v);
                 }
                 return commitAndCheck("VSP_"+action.name(), vList.toString());
             } finally {
@@ -107,8 +108,10 @@ public class ArchiveOperation extends BaseOperation {
 
     public List<String> setArchivedOriginsFlagInComponentInstances(GraphVertex compositionService) {
         List<String> ciUidsWithArchivedOrigins = new LinkedList();
-        Either<List<GraphVertex>, TitanOperationStatus> instanceOfVerticesE = titanDao.getChildrenVertecies(compositionService, EdgeLabelEnum.INSTANCE_OF, JsonParseFlagEnum.NoParse);
-        Either<List<GraphVertex>, TitanOperationStatus> proxyOfVerticesE = titanDao.getChildrenVertecies(compositionService, EdgeLabelEnum.PROXY_OF, JsonParseFlagEnum.NoParse);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> instanceOfVerticesE = janusGraphDao
+            .getChildrenVertecies(compositionService, EdgeLabelEnum.INSTANCE_OF, JsonParseFlagEnum.NoParse);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> proxyOfVerticesE = janusGraphDao
+            .getChildrenVertecies(compositionService, EdgeLabelEnum.PROXY_OF, JsonParseFlagEnum.NoParse);
 
         List<GraphVertex> all = new LinkedList<>();
         if (instanceOfVerticesE.isLeft()){
@@ -162,16 +165,17 @@ public class ArchiveOperation extends BaseOperation {
         //Lock the Highest Version
         StorageOperationStatus lockStatus = this.graphLockOperation.lockComponent(highestVersion.getUniqueId(), highestVersion.getType().getNodeType());
         if (lockStatus != StorageOperationStatus.OK){
-            return Either.right(onError(action.name(), componentVertex.getUniqueId(), TitanOperationStatus.ALREADY_LOCKED));
+            return Either.right(onError(action.name(), componentVertex.getUniqueId(), JanusGraphOperationStatus.ALREADY_LOCKED));
         }
 
         //Refetch latest version with full parsing
-        highestVersion = this.titanDao.getVertexById(highestVersion.getUniqueId(), JsonParseFlagEnum.ParseAll).left().value();
+        highestVersion = this.janusGraphDao
+            .getVertexById(highestVersion.getUniqueId(), JsonParseFlagEnum.ParseAll).left().value();
 
         try {
             //Get Catalog and Archive Roots
-            GraphVertex catalogRoot = titanDao.getVertexByLabel(VertexTypeEnum.CATALOG_ROOT).left().value();
-            GraphVertex archiveRoot = titanDao.getVertexByLabel(VertexTypeEnum.ARCHIVE_ROOT).left().value();
+            GraphVertex catalogRoot = janusGraphDao.getVertexByLabel(VertexTypeEnum.CATALOG_ROOT).left().value();
+            GraphVertex archiveRoot = janusGraphDao.getVertexByLabel(VertexTypeEnum.ARCHIVE_ROOT).left().value();
 
             if (action == ARCHIVE) {
                 archiveEdges(catalogRoot, archiveRoot, highestVersion);
@@ -179,7 +183,7 @@ public class ArchiveOperation extends BaseOperation {
                 restoreEdges(catalogRoot, archiveRoot, highestVersion);
             }
             setPropertiesByAction(highestVersion, action);
-            titanDao.updateVertex(highestVersion);
+            janusGraphDao.updateVertex(highestVersion);
 
             List<String> affectedComponentIds = handleParents(highestVersion, catalogRoot, archiveRoot, action);
             ActionStatus sc = commitAndCheck(action.name(), highestVersion.getUniqueId());
@@ -190,8 +194,8 @@ public class ArchiveOperation extends BaseOperation {
     }
 
     private ActionStatus commitAndCheck(String action, String componentId) {
-        TitanOperationStatus status = titanDao.commit();
-        if (!status.equals(TitanOperationStatus.OK)){
+        JanusGraphOperationStatus status = janusGraphDao.commit();
+        if (!status.equals(JanusGraphOperationStatus.OK)){
             return onError(action, componentId, status);
         }
         return ActionStatus.OK;
@@ -210,12 +214,14 @@ public class ArchiveOperation extends BaseOperation {
      * @return
      */
     private GraphVertex getHighestVersionFrom(GraphVertex v) {
-        Either<GraphVertex, TitanOperationStatus> childVertexE = titanDao.getChildVertex(v, EdgeLabelEnum.VERSION, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> childVertexE = janusGraphDao
+            .getChildVertex(v, EdgeLabelEnum.VERSION, JsonParseFlagEnum.NoParse);
         GraphVertex highestVersionVertex = v;
 
         while (childVertexE.isLeft()) {
             highestVersionVertex = childVertexE.left().value();
-            childVertexE = titanDao.getChildVertex(highestVersionVertex, EdgeLabelEnum.VERSION, JsonParseFlagEnum.NoParse);
+            childVertexE = janusGraphDao
+                .getChildVertex(highestVersionVertex, EdgeLabelEnum.VERSION, JsonParseFlagEnum.NoParse);
         }
         return highestVersionVertex;
     }
@@ -226,7 +232,8 @@ public class ArchiveOperation extends BaseOperation {
     }
 
     private List<String> handleParents(GraphVertex v, GraphVertex catalogRoot, GraphVertex archiveRoot, Action action) {
-        Either<GraphVertex, TitanOperationStatus> parentVertexE = titanDao.getParentVertex(v, EdgeLabelEnum.VERSION, JsonParseFlagEnum.ParseAll);
+        Either<GraphVertex, JanusGraphOperationStatus> parentVertexE = janusGraphDao
+            .getParentVertex(v, EdgeLabelEnum.VERSION, JsonParseFlagEnum.ParseAll);
         List<String> affectedCompIds = new ArrayList();
         affectedCompIds.add(v.getUniqueId());
 
@@ -242,21 +249,22 @@ public class ArchiveOperation extends BaseOperation {
                 }
             }
             setPropertiesByAction(cv, action);
-            titanDao.updateVertex(cv);
-            parentVertexE = titanDao.getParentVertex(cv, EdgeLabelEnum.VERSION, JsonParseFlagEnum.ParseAll);
+            janusGraphDao.updateVertex(cv);
+            parentVertexE = janusGraphDao
+                .getParentVertex(cv, EdgeLabelEnum.VERSION, JsonParseFlagEnum.ParseAll);
         }
         return affectedCompIds;
     }
 
     private void archiveEdges(GraphVertex catalogRoot, GraphVertex archiveRoot, GraphVertex v) {
-        titanDao.deleteAllEdges(catalogRoot, v, EdgeLabelEnum.CATALOG_ELEMENT);
-        titanDao.createEdge(archiveRoot, v, EdgeLabelEnum.ARCHIVE_ELEMENT, null);
+        janusGraphDao.deleteAllEdges(catalogRoot, v, EdgeLabelEnum.CATALOG_ELEMENT);
+        janusGraphDao.createEdge(archiveRoot, v, EdgeLabelEnum.ARCHIVE_ELEMENT, null);
         setPropertiesByAction(v, ARCHIVE);
     }
 
     private void restoreEdges(GraphVertex catalogRoot, GraphVertex archiveRoot, GraphVertex v) {
-        titanDao.deleteAllEdges(archiveRoot, v, EdgeLabelEnum.ARCHIVE_ELEMENT);
-        titanDao.createEdge(catalogRoot, v, EdgeLabelEnum.CATALOG_ELEMENT, null);
+        janusGraphDao.deleteAllEdges(archiveRoot, v, EdgeLabelEnum.ARCHIVE_ELEMENT);
+        janusGraphDao.createEdge(catalogRoot, v, EdgeLabelEnum.CATALOG_ELEMENT, null);
         setPropertiesByAction(v, RESTORE);
     }
 
@@ -270,11 +278,11 @@ public class ArchiveOperation extends BaseOperation {
         v.setJsonMetadataField(JsonPresentationFields.ARCHIVE_TIME, now);
     }
 
-    private ActionStatus onError(String action, String componentId, TitanOperationStatus s) {
+    private ActionStatus onError(String action, String componentId, JanusGraphOperationStatus s) {
         ActionStatus ret = ActionStatus.GENERAL_ERROR;
-        if (s == TitanOperationStatus.NOT_FOUND){
+        if (s == JanusGraphOperationStatus.NOT_FOUND){
             ret = ActionStatus.RESOURCE_NOT_FOUND;
-        } else if (s == TitanOperationStatus.ALREADY_LOCKED) {
+        } else if (s == JanusGraphOperationStatus.ALREADY_LOCKED) {
             ret = ActionStatus.COMPONENT_IN_USE;
         }
         String retCodeVal = ret.name();
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ArtifactsOperations.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ArtifactsOperations.java
index 3eb6a5211c..46617a563d 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ArtifactsOperations.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ArtifactsOperations.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
 import org.apache.commons.collections.MapUtils;
@@ -26,11 +26,11 @@ import org.apache.commons.lang3.tuple.ImmutableTriple;
 import org.apache.commons.lang3.tuple.Triple;
 import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.InterfaceDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.MapArtifactDataDefinition;
@@ -153,7 +153,7 @@ public class ArtifactsOperations extends BaseOperation {
 
     }
 	private ArtifactDataDefinition findInterfaceArtifact(String parentId, String id) {
-		Either<Map<String, InterfaceDefinition>, TitanOperationStatus> dataFromGraph = getDataFromGraph(parentId, EdgeLabelEnum.INTERFACE);
+		Either<Map<String, InterfaceDefinition>, JanusGraphOperationStatus> dataFromGraph = getDataFromGraph(parentId, EdgeLabelEnum.INTERFACE);
 		if (dataFromGraph.isRight()){
 			log.debug("failed to fetch interfaces {} for tosca element with id {}, error {}", id, parentId ,dataFromGraph.right().value());
 			return null;
@@ -214,12 +214,12 @@ public class ArtifactsOperations extends BaseOperation {
         Triple<EdgeLabelEnum, Boolean, VertexTypeEnum> triple = getEdgeLabelEnumFromArtifactGroupType(groupType, parentType);
         EdgeLabelEnum edgeLabelEnum = triple.getLeft();
 
-        Either<Map<String, ArtifactDefinition>, TitanOperationStatus> foundArtifact = null;
+        Either<Map<String, ArtifactDefinition>, JanusGraphOperationStatus> foundArtifact = null;
         Map<String, ArtifactDefinition> resMap = new HashMap<>();
         foundArtifact = getArtifactByLabel(parentId, instanceId, edgeLabelEnum);
         if (foundArtifact.isRight()) {
             log.debug("Failed to find artifact in component {} with label {} ", parentId, edgeLabelEnum);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(foundArtifact.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(foundArtifact.right().value()));
         }
 
         resMap.putAll(foundArtifact.left().value());
@@ -234,13 +234,13 @@ public class ArtifactsOperations extends BaseOperation {
      */
     public Either<Map<String, ArtifactDefinition>, StorageOperationStatus> getAllInstanceArtifacts(String parentId, String instanceId) {
         Map<String, ArtifactDataDefinition> resMap = new HashMap<>();
-        Either<Map<String, ArtifactDataDefinition>, TitanOperationStatus> instArtifacts = getInstanceArtifactsByLabel(parentId, instanceId, EdgeLabelEnum.INSTANCE_ARTIFACTS);
+        Either<Map<String, ArtifactDataDefinition>, JanusGraphOperationStatus> instArtifacts = getInstanceArtifactsByLabel(parentId, instanceId, EdgeLabelEnum.INSTANCE_ARTIFACTS);
         if (instArtifacts.isRight()) {
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(instArtifacts.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(instArtifacts.right().value()));
         }
-        Either<Map<String, ArtifactDataDefinition>, TitanOperationStatus> deployInstArtifacts = getInstanceArtifactsByLabel(parentId, instanceId, EdgeLabelEnum.INST_DEPLOYMENT_ARTIFACTS);
+        Either<Map<String, ArtifactDataDefinition>, JanusGraphOperationStatus> deployInstArtifacts = getInstanceArtifactsByLabel(parentId, instanceId, EdgeLabelEnum.INST_DEPLOYMENT_ARTIFACTS);
         if (deployInstArtifacts.isRight()) {
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(deployInstArtifacts.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(deployInstArtifacts.right().value()));
         }
         resMap.putAll(instArtifacts.left().value());
         resMap.putAll(deployInstArtifacts.left().value());
@@ -249,7 +249,7 @@ public class ArtifactsOperations extends BaseOperation {
 
     public Either<Map<String, ArtifactDefinition>, StorageOperationStatus> getArtifacts(String parentId) {
 
-        Either<Map<String, ArtifactDefinition>, TitanOperationStatus> foundArtifact = null;
+        Either<Map<String, ArtifactDefinition>, JanusGraphOperationStatus> foundArtifact = null;
         Map<String, ArtifactDefinition> resMap = new HashMap<>();
         foundArtifact = getArtifactByLabel(parentId, null, EdgeLabelEnum.ARTIFACTS);
         if (foundArtifact.isLeft()) {
@@ -367,10 +367,10 @@ public class ArtifactsOperations extends BaseOperation {
 
     public Either<ArtifactDefinition, StorageOperationStatus> updateHeatEnvArtifact(String id, ArtifactDefinition artifactEnvInfo, String artifactId, String newArtifactId, NodeTypeEnum type, String instanceId) {
 
-        Either<Map<String, ArtifactDefinition>, TitanOperationStatus> artifactsEither = getArtifactByLabel(id, instanceId, EdgeLabelEnum.DEPLOYMENT_ARTIFACTS);
+        Either<Map<String, ArtifactDefinition>, JanusGraphOperationStatus> artifactsEither = getArtifactByLabel(id, instanceId, EdgeLabelEnum.DEPLOYMENT_ARTIFACTS);
         if (artifactsEither.isRight()) {
             log.debug("Failed to find artifacts in component {} with id {} ", id, artifactsEither.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(artifactsEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(artifactsEither.right().value()));
         }
 
         Map<String, ArtifactDefinition> artifacts = artifactsEither.left().value();
@@ -410,7 +410,7 @@ public class ArtifactsOperations extends BaseOperation {
 
     private ArtifactDataDefinition getInstanceArtifactByLabelAndId(String parentId, String id, String containerId, EdgeLabelEnum edgeLabelEnum) {
         ArtifactDataDefinition foundArtifact = null;
-        Either<Map<String, MapArtifactDataDefinition>, TitanOperationStatus> artifactsEither = getDataFromGraph(containerId, edgeLabelEnum);
+        Either<Map<String, MapArtifactDataDefinition>, JanusGraphOperationStatus> artifactsEither = getDataFromGraph(containerId, edgeLabelEnum);
         if (artifactsEither.isRight()) {
             log.debug(FAILED_TO_FETCH_FOR_TOSCA_ELEMENT_WITH_ID_ERROR, edgeLabelEnum, containerId, artifactsEither.right().value());
             return null;
@@ -432,7 +432,7 @@ public class ArtifactsOperations extends BaseOperation {
 
     private ArtifactDataDefinition getArtifactByLabelAndId(String parentId, String id, EdgeLabelEnum edgeLabelEnum) {
         ArtifactDataDefinition foundArtifact = null;
-        Either<Map<String, ArtifactDataDefinition>, TitanOperationStatus> artifactsEither = getDataFromGraph(parentId, edgeLabelEnum);
+        Either<Map<String, ArtifactDataDefinition>, JanusGraphOperationStatus> artifactsEither = getDataFromGraph(parentId, edgeLabelEnum);
         if (artifactsEither.isRight()) {
             log.debug(FAILED_TO_FETCH_FOR_TOSCA_ELEMENT_WITH_ID_ERROR, edgeLabelEnum, parentId, artifactsEither.right().value());
             return null;
@@ -446,8 +446,8 @@ public class ArtifactsOperations extends BaseOperation {
         return foundArtifact;
     }
 
-    private Either<Map<String, ArtifactDefinition>, TitanOperationStatus> getArtifactByLabel(String parentId, String instanceId, EdgeLabelEnum edgeLabelEnum) {
-        Either<Map<String, ArtifactDataDefinition>, TitanOperationStatus> artifactsEither = getArtifactsDataByLabel(parentId, instanceId, edgeLabelEnum);
+    private Either<Map<String, ArtifactDefinition>, JanusGraphOperationStatus> getArtifactByLabel(String parentId, String instanceId, EdgeLabelEnum edgeLabelEnum) {
+        Either<Map<String, ArtifactDataDefinition>, JanusGraphOperationStatus> artifactsEither = getArtifactsDataByLabel(parentId, instanceId, edgeLabelEnum);
         if (artifactsEither.isRight()) {
             log.debug(FAILED_TO_FETCH_FOR_TOSCA_ELEMENT_WITH_ID_ERROR, edgeLabelEnum, parentId, artifactsEither.right().value());
             return Either.right(artifactsEither.right().value());
@@ -456,7 +456,7 @@ public class ArtifactsOperations extends BaseOperation {
         return Either.left(convertArtifactMapToArtifactDefinitionMap(artifactDataMap));
     }
 
-    private Either<Map<String, ArtifactDataDefinition>, TitanOperationStatus> getArtifactsDataByLabel(String parentId, String instanceId, EdgeLabelEnum edgeLabelEnum) {
+    private Either<Map<String, ArtifactDataDefinition>, JanusGraphOperationStatus> getArtifactsDataByLabel(String parentId, String instanceId, EdgeLabelEnum edgeLabelEnum) {
         return edgeLabelEnum.isInstanceArtifactsLabel() ? getInstanceArtifactsByLabel(parentId, instanceId, edgeLabelEnum) : getDataFromGraph(parentId, edgeLabelEnum);
     }
 
@@ -468,8 +468,8 @@ public class ArtifactsOperations extends BaseOperation {
         return artMap;
     }
 
-    private Either<Map<String, ArtifactDataDefinition>, TitanOperationStatus> getInstanceArtifactsByLabel(String parentId, String instanceId, EdgeLabelEnum edgeLabelEnum) {
-        Either<Map<String, MapArtifactDataDefinition>, TitanOperationStatus> resultEither = getDataFromGraph(parentId, edgeLabelEnum);
+    private Either<Map<String, ArtifactDataDefinition>, JanusGraphOperationStatus> getInstanceArtifactsByLabel(String parentId, String instanceId, EdgeLabelEnum edgeLabelEnum) {
+        Either<Map<String, MapArtifactDataDefinition>, JanusGraphOperationStatus> resultEither = getDataFromGraph(parentId, edgeLabelEnum);
         if (resultEither.isRight()) {
             log.debug(FAILED_TO_FETCH_FOR_TOSCA_ELEMENT_WITH_ID_ERROR, edgeLabelEnum, parentId, resultEither.right().value());
             return Either.right(resultEither.right().value());
@@ -555,7 +555,7 @@ public class ArtifactsOperations extends BaseOperation {
         Map<String, MapArtifactDataDefinition> artifactInst = null;
         if (edgeLabelEnum != EdgeLabelEnum.INST_DEPLOYMENT_ARTIFACTS && edgeLabelEnum != EdgeLabelEnum.INSTANCE_ARTIFACTS) {
 
-            Either<Map<String, ArtifactDataDefinition>, TitanOperationStatus> artifactsEither = this.getDataFromGraph(componentId, edgeLabelEnum);
+            Either<Map<String, ArtifactDataDefinition>, JanusGraphOperationStatus> artifactsEither = this.getDataFromGraph(componentId, edgeLabelEnum);
 
             if (artifactsEither.isLeft() && artifactsEither.left().value() != null && !artifactsEither.left().value().isEmpty()) {
                 artifacts = artifactsEither.left().value();
@@ -565,7 +565,7 @@ public class ArtifactsOperations extends BaseOperation {
             }
         } else {
 
-            Either<Map<String, MapArtifactDataDefinition>, TitanOperationStatus> artifactsEither = this.getDataFromGraph(componentId, edgeLabelEnum);
+            Either<Map<String, MapArtifactDataDefinition>, JanusGraphOperationStatus> artifactsEither = this.getDataFromGraph(componentId, edgeLabelEnum);
             if (artifactsEither.isLeft()) {
                 artifactInst = artifactsEither.left().value();
                 if (isNeedToClone && artifactInst != null) {
@@ -708,18 +708,19 @@ public class ArtifactsOperations extends BaseOperation {
         Boolean deleteElement = deleteMandatoryArtifact || !(artifactToDelete.getMandatory() || artifactToDelete.getServiceApi());
         Map<String, ToscaDataDefinition> artifacts = null;
         GraphVertex parentVertex = null;
-        Either<Map<String, ToscaDataDefinition>, TitanOperationStatus> getArtifactsRes = null;
+        Either<Map<String, ToscaDataDefinition>, JanusGraphOperationStatus> getArtifactsRes = null;
 
-        Either<GraphVertex, TitanOperationStatus> getToscaElementRes = titanDao.getVertexById(componentId, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> getToscaElementRes = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.NoParse);
         if (getToscaElementRes.isRight()) {
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to get tosca element {} upon getting tosca data from graph. Status is {}. ", componentId, getToscaElementRes.right().value());
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getToscaElementRes.right().value()));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getToscaElementRes.right().value()));
         }
         if (result == null) {
             parentVertex = getToscaElementRes.left().value();
             getArtifactsRes = this.getDataFromGraph(parentVertex, edgeLabel);
             if (getArtifactsRes.isRight()) {
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getArtifactsRes.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getArtifactsRes.right().value()));
             }
         }
         if (result == null) {
@@ -739,9 +740,10 @@ public class ArtifactsOperations extends BaseOperation {
             artifactToDelete.setDuplicated(Boolean.TRUE);
         }
         if (artifacts != null) {
-            TitanOperationStatus status = titanDao.deleteEdgeByDirection(parentVertex, Direction.OUT, edgeLabel);
-            if (status != TitanOperationStatus.OK) {
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            JanusGraphOperationStatus
+                status = janusGraphDao.deleteEdgeByDirection(parentVertex, Direction.OUT, edgeLabel);
+            if (status != JanusGraphOperationStatus.OK) {
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             } else if (MapUtils.isNotEmpty(artifacts)) {
                 Either<GraphVertex, StorageOperationStatus> associateResult = associateElementToData(parentVertex, vertexLabel, edgeLabel, artifacts);
                 if (associateResult.isRight()) {
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/BaseOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/BaseOperation.java
index d44865c399..a4fe67eb3f 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/BaseOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/BaseOperation.java
@@ -18,38 +18,40 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
-import com.thinkaurelius.titan.core.TitanVertex;
 import fj.data.Either;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Property;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.janusgraph.core.JanusGraphVertex;
+import org.openecomp.sdc.be.dao.impl.HealingPipelineDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
-import org.openecomp.sdc.be.dao.jsongraph.types.EdgePropertyEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
 import org.openecomp.sdc.be.dao.jsongraph.utils.IdBuilderUtils;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
-import org.openecomp.sdc.be.datatypes.elements.*;
+import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ComponentInstanceDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.GroupDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.GroupInstanceDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ListDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.MapDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum;
 import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElementTypeEnum;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElementTypeEnum;
 import org.openecomp.sdc.be.model.operations.StorageException;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
@@ -59,10 +61,14 @@ import org.openecomp.sdc.common.jsongraph.util.CommonUtility.LogLevelEnum;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.openecomp.sdc.be.dao.impl.HealingPipelineDao;
 
-import java.util.*;
-import java.util.EnumMap;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 /**
@@ -78,7 +84,7 @@ public abstract class BaseOperation {
     public static final String VF_MODULE = "org.openecomp.groups.VfModule";
 
     @Autowired
-    protected TitanDao titanDao;
+    protected JanusGraphDao janusGraphDao;
 
     @Autowired
     protected NodeTypeOperation nodeTypeOperation;
@@ -89,8 +95,8 @@ public abstract class BaseOperation {
 //    @Autowired
     protected HealingPipelineDao healingPipelineDao;
 
-    public void setTitanDao(TitanDao titanDao) {
-        this.titanDao = titanDao;
+    public void setJanusGraphDao(JanusGraphDao janusGraphDao) {
+        this.janusGraphDao = janusGraphDao;
     }
     /**
      * Returns reference to appropriate toscaTemplateOperation
@@ -191,8 +197,8 @@ public abstract class BaseOperation {
         return owner;
     }
 
-    protected <T extends ToscaDataDefinition> Either<Map<String, T>, TitanOperationStatus> getDataFromGraph(GraphVertex componentV, EdgeLabelEnum edgelabel) {
-        Either<Pair<GraphVertex, Map<String, T>>, TitanOperationStatus> dataVertex = getDataAndVertexFromGraph(componentV, edgelabel);
+    protected <T extends ToscaDataDefinition> Either<Map<String, T>, JanusGraphOperationStatus> getDataFromGraph(GraphVertex componentV, EdgeLabelEnum edgelabel) {
+        Either<Pair<GraphVertex, Map<String, T>>, JanusGraphOperationStatus> dataVertex = getDataAndVertexFromGraph(componentV, edgelabel);
         if (dataVertex.isRight()) {
             return Either.right(dataVertex.right().value());
         }
@@ -201,8 +207,8 @@ public abstract class BaseOperation {
     }
 
     @SuppressWarnings("unchecked")
-    protected <T extends ToscaDataDefinition> Either<Pair<GraphVertex, Map<String, T>>, TitanOperationStatus> getDataAndVertexFromGraph(GraphVertex componentV, EdgeLabelEnum edgelabel) {
-        Either<GraphVertex, TitanOperationStatus> dataVertex = getDataVertex(componentV, edgelabel);
+    protected <T extends ToscaDataDefinition> Either<Pair<GraphVertex, Map<String, T>>, JanusGraphOperationStatus> getDataAndVertexFromGraph(GraphVertex componentV, EdgeLabelEnum edgelabel) {
+        Either<GraphVertex, JanusGraphOperationStatus> dataVertex = getDataVertex(componentV, edgelabel);
         if (dataVertex.isRight()) {
             return Either.right(dataVertex.right().value());
         }
@@ -212,10 +218,11 @@ public abstract class BaseOperation {
         return Either.left(pair);
     }
 
-    protected <T extends ToscaDataDefinition> Either<GraphVertex, TitanOperationStatus> getDataVertex(GraphVertex componentV, EdgeLabelEnum edgelabel) {
-        Either<GraphVertex, TitanOperationStatus> childVertex = titanDao.getChildVertex(componentV, edgelabel, JsonParseFlagEnum.ParseJson);
+    protected <T extends ToscaDataDefinition> Either<GraphVertex, JanusGraphOperationStatus> getDataVertex(GraphVertex componentV, EdgeLabelEnum edgelabel) {
+        Either<GraphVertex, JanusGraphOperationStatus> childVertex = janusGraphDao
+            .getChildVertex(componentV, edgelabel, JsonParseFlagEnum.ParseJson);
         if (childVertex.isRight()) {
-            if (childVertex.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (childVertex.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 log.debug("failed to fetch {} for tosca element with id {}, error {}", edgelabel, componentV.getUniqueId(), childVertex.right().value());
             }
             return Either.right(childVertex.right().value());
@@ -231,14 +238,14 @@ public abstract class BaseOperation {
      * @param edgelabel
      * @return
      */
-    public <T extends ToscaDataDefinition> Either<Map<String, T>, TitanOperationStatus> getDataFromGraph(String toscaElementUid, EdgeLabelEnum edgelabel) {
+    public <T extends ToscaDataDefinition> Either<Map<String, T>, JanusGraphOperationStatus> getDataFromGraph(String toscaElementUid, EdgeLabelEnum edgelabel) {
 
-        Either<Map<String, T>, TitanOperationStatus> result = null;
-        Either<GraphVertex, TitanOperationStatus> getToscaElementRes;
+        Either<Map<String, T>, JanusGraphOperationStatus> result = null;
+        Either<GraphVertex, JanusGraphOperationStatus> getToscaElementRes;
 
-        getToscaElementRes = titanDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse);
+        getToscaElementRes = janusGraphDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse);
         if (getToscaElementRes.isRight()) {
-            TitanOperationStatus status = getToscaElementRes.right().value();
+            JanusGraphOperationStatus status = getToscaElementRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to get tosca element {} upon getting tosca data from graph. Status is {}. ", toscaElementUid, status);
             result = Either.right(status);
         }
@@ -248,8 +255,9 @@ public abstract class BaseOperation {
         return result;
     }
 
-    public Either<GraphVertex, TitanOperationStatus> findUserVertex(String userId) {
-        return titanDao.getVertexByPropertyAndLabel(GraphPropertyEnum.USERID, userId, VertexTypeEnum.USER, JsonParseFlagEnum.NoParse);
+    public Either<GraphVertex, JanusGraphOperationStatus> findUserVertex(String userId) {
+        return janusGraphDao
+            .getVertexByPropertyAndLabel(GraphPropertyEnum.USERID, userId, VertexTypeEnum.USER, JsonParseFlagEnum.NoParse);
     }
 
     /**
@@ -259,17 +267,18 @@ public abstract class BaseOperation {
      * @return
      */
     public Either<Boolean, StorageOperationStatus> isCloneNeeded(String elemementId, EdgeLabelEnum label) {
-        Either<GraphVertex, TitanOperationStatus> vertexById = titanDao.getVertexById(elemementId);
+        Either<GraphVertex, JanusGraphOperationStatus> vertexById = janusGraphDao.getVertexById(elemementId);
         if (vertexById.isRight()) {
             log.debug("Failed to fetch element by id {} error {}", elemementId, vertexById.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(vertexById.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(vertexById.right().value()));
         }
         GraphVertex toscaElementVertex = vertexById.left().value();
-        Either<GraphVertex, TitanOperationStatus> childVertex = titanDao.getChildVertex(toscaElementVertex, label, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> childVertex = janusGraphDao
+            .getChildVertex(toscaElementVertex, label, JsonParseFlagEnum.NoParse);
         if (childVertex.isRight()) {
-            if (childVertex.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (childVertex.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 log.debug("failed to fetch {} for tosca element with id {}, error {}", label, toscaElementVertex.getUniqueId(), childVertex.right().value());
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(childVertex.right().value()));
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(childVertex.right().value()));
             }
             return Either.left(Boolean.FALSE);
         }
@@ -287,7 +296,7 @@ public abstract class BaseOperation {
         }
     }
 
-    protected Either<GraphVertex, TitanOperationStatus> updateOrCopyOnUpdate(GraphVertex dataVertex, GraphVertex toscaElementVertex, EdgeLabelEnum label) {
+    protected Either<GraphVertex, JanusGraphOperationStatus> updateOrCopyOnUpdate(GraphVertex dataVertex, GraphVertex toscaElementVertex, EdgeLabelEnum label) {
 //        healingPipelineDao.setHealingVersion(dataVertex);
         Iterator<Edge> edges = dataVertex.getVertex().edges(Direction.IN, label.name());
         int edgeCount = 0;
@@ -296,24 +305,25 @@ public abstract class BaseOperation {
             Edge edge = edges.next();
             ++edgeCount;
             Vertex outVertex = edge.outVertex();
-            String outId = (String) titanDao.getProperty((TitanVertex) outVertex, GraphPropertyEnum.UNIQUE_ID.getProperty());
+            String outId = (String) janusGraphDao
+                .getProperty((JanusGraphVertex) outVertex, GraphPropertyEnum.UNIQUE_ID.getProperty());
             if (toscaElementVertex.getUniqueId().equals(outId)) {
                 edgeToRemove = edge;
             }
         }
         if (edgeToRemove == null) {
             log.debug("No edges {} from vertex {} to vertex {}", label, toscaElementVertex.getUniqueId(), dataVertex.getUniqueId());
-            return Either.right(TitanOperationStatus.GENERAL_ERROR);
+            return Either.right(JanusGraphOperationStatus.GENERAL_ERROR);
         }
         switch (edgeCount) {
         case 0:
             // error
             log.debug("No edges {} to vertex {}", label, dataVertex.getUniqueId());
-            return Either.right(TitanOperationStatus.GENERAL_ERROR);
+            return Either.right(JanusGraphOperationStatus.GENERAL_ERROR);
         case 1:
             // update
             log.trace("Only one edge {} to vertex {}. Update vertex", label, dataVertex.getUniqueId());
-            return titanDao.updateVertex(dataVertex);
+            return janusGraphDao.updateVertex(dataVertex);
         default:
             // copy on update
             log.trace("More than one edge {} to vertex {}. Need to clone vertex", label, dataVertex.getUniqueId());
@@ -321,20 +331,22 @@ public abstract class BaseOperation {
         }
     }
 
-    private Either<GraphVertex, TitanOperationStatus> cloneDataVertex(GraphVertex dataVertex, GraphVertex toscaElementVertex, EdgeLabelEnum label, Edge edgeToRemove) {
+    private Either<GraphVertex, JanusGraphOperationStatus> cloneDataVertex(GraphVertex dataVertex, GraphVertex toscaElementVertex, EdgeLabelEnum label, Edge edgeToRemove) {
         GraphVertex newDataVertex = new GraphVertex(dataVertex.getLabel());
         String id = IdBuilderUtils.generateChildId(toscaElementVertex.getUniqueId(), dataVertex.getLabel());
         newDataVertex.cloneData(dataVertex);
         newDataVertex.setUniqueId(id);
 
-        Either<GraphVertex, TitanOperationStatus> createVertex = titanDao.createVertex(newDataVertex);
+        Either<GraphVertex, JanusGraphOperationStatus> createVertex = janusGraphDao.createVertex(newDataVertex);
         if (createVertex.isRight()) {
             log.debug("Failed to clone data vertex for {} error {}", dataVertex.getUniqueId(), createVertex.right().value());
             return createVertex;
         }
         newDataVertex = createVertex.left().value();
-        TitanOperationStatus createEdge = titanDao.createEdge(toscaElementVertex, newDataVertex, label, titanDao.getEdgeProperties(edgeToRemove));
-        if (createEdge != TitanOperationStatus.OK) {
+        JanusGraphOperationStatus
+            createEdge = janusGraphDao
+            .createEdge(toscaElementVertex, newDataVertex, label, janusGraphDao.getEdgeProperties(edgeToRemove));
+        if (createEdge != JanusGraphOperationStatus.OK) {
             log.debug("Failed to associate vertex {} to vertex {}, error {}", toscaElementVertex.getUniqueId(), newDataVertex.getUniqueId(), createEdge);
             return Either.right(createEdge);
         }
@@ -347,16 +359,18 @@ public abstract class BaseOperation {
         String id = IdBuilderUtils.generateChildId(element.getUniqueId(), vertexLabel);
         dataV.setUniqueId(id);
         dataV.setJson(data);
-        Either<GraphVertex, TitanOperationStatus> createVertex = titanDao.createVertex(dataV);
+        Either<GraphVertex, JanusGraphOperationStatus> createVertex = janusGraphDao.createVertex(dataV);
         if (createVertex.isRight()) {
             log.trace("Failed to create {} vertex for type node {}", vertexLabel, element.getUniqueId());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(createVertex.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(createVertex.right().value()));
         }
         dataV = createVertex.left().value();
-        TitanOperationStatus createEdgeStatus = titanDao.createEdge(element.getVertex(), dataV.getVertex(), edgeLabel, new HashMap<>());
-        if (createEdgeStatus != TitanOperationStatus.OK) {
+        JanusGraphOperationStatus
+            createEdgeStatus = janusGraphDao
+            .createEdge(element.getVertex(), dataV.getVertex(), edgeLabel, new HashMap<>());
+        if (createEdgeStatus != JanusGraphOperationStatus.OK) {
             log.trace("Failed to create {} vertex for type node {}", vertexLabel, element.getUniqueId());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(createEdgeStatus));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(createEdgeStatus));
         }
         return Either.left(dataV);
     }
@@ -533,13 +547,13 @@ public abstract class BaseOperation {
             JsonPresentationFields mapKeyField) {
 
         StorageOperationStatus statusRes = null;
-        Either<GraphVertex, TitanOperationStatus> getToscaElementRes;
+        Either<GraphVertex, JanusGraphOperationStatus> getToscaElementRes;
 
-        getToscaElementRes = titanDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse);
+        getToscaElementRes = janusGraphDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse);
         if (getToscaElementRes.isRight()) {
-            TitanOperationStatus status = getToscaElementRes.right().value();
+            JanusGraphOperationStatus status = getToscaElementRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_TOSCA_ELEMENT_UPON_ADDING_THE_PROPERTIES_STATUS_IS, toscaElementUid, status);
-            statusRes = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+            statusRes = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
         }
         if (statusRes == null && CollectionUtils.isNotEmpty(toscaDataList)) {
             statusRes = updateToscaDataDeepElementsOfToscaElement(getToscaElementRes.left().value(), edgeLabel, vertexLabel, toscaDataList, pathKeys, mapKeyField);
@@ -551,22 +565,22 @@ public abstract class BaseOperation {
     }
 
     StorageOperationStatus overrideToscaDataOfToscaElement(String toscaElementUid, EdgeLabelEnum edgeLabel, Map<String, ? extends ToscaDataDefinition> toscaData) {
-        return titanDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse)
+        return janusGraphDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse)
                 .left()
                 .bind(graphVertex -> overrideToscaElementData(graphVertex, toscaData, edgeLabel))
                 .either(graphVertex -> StorageOperationStatus.OK,
-                        DaoStatusConverter::convertTitanStatusToStorageStatus);
+                        DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
     }
 
-    private Either<GraphVertex, TitanOperationStatus> overrideToscaElementData(GraphVertex toscaElement, Map<String, ? extends ToscaDataDefinition> toscaData, EdgeLabelEnum edgeLabelEnum) {
-        return titanDao.getChildVertex(toscaElement, edgeLabelEnum, JsonParseFlagEnum.ParseJson)
+    private Either<GraphVertex, JanusGraphOperationStatus> overrideToscaElementData(GraphVertex toscaElement, Map<String, ? extends ToscaDataDefinition> toscaData, EdgeLabelEnum edgeLabelEnum) {
+        return janusGraphDao.getChildVertex(toscaElement, edgeLabelEnum, JsonParseFlagEnum.ParseJson)
                 .left()
                 .bind(dataVertex -> overrideToscaElementData(dataVertex, toscaElement, toscaData, edgeLabelEnum))
                 .right()
                 .map(err -> logAndReturn(err, "failed to override tosca data for element {} of type {}. status: {}", toscaElement.getUniqueId(), edgeLabelEnum, err));
     }
 
-    private Either<GraphVertex, TitanOperationStatus> overrideToscaElementData(GraphVertex dataElement, GraphVertex toscaElement, Map<String, ? extends ToscaDataDefinition> toscaData, EdgeLabelEnum edgeLabelEnum) {
+    private Either<GraphVertex, JanusGraphOperationStatus> overrideToscaElementData(GraphVertex dataElement, GraphVertex toscaElement, Map<String, ? extends ToscaDataDefinition> toscaData, EdgeLabelEnum edgeLabelEnum) {
         dataElement.setJson(toscaData);
         return updateOrCopyOnUpdate(dataElement, toscaElement, edgeLabelEnum);
     }
@@ -586,13 +600,13 @@ public abstract class BaseOperation {
             JsonPresentationFields mapKeyField) {
 
         StorageOperationStatus statusRes = null;
-        Either<GraphVertex, TitanOperationStatus> getToscaElementRes;
+        Either<GraphVertex, JanusGraphOperationStatus> getToscaElementRes;
 
-        getToscaElementRes = titanDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse);
+        getToscaElementRes = janusGraphDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse);
         if (getToscaElementRes.isRight()) {
-            TitanOperationStatus status = getToscaElementRes.right().value();
+            JanusGraphOperationStatus status = getToscaElementRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_TOSCA_ELEMENT_UPON_ADDING_THE_PROPERTIES_STATUS_IS, toscaElementUid, status);
-            statusRes = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+            statusRes = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
         }
         if (statusRes == null && CollectionUtils.isNotEmpty(toscaDataList)) {
             statusRes = addToscaDataDeepElementsToToscaElement(getToscaElementRes.left().value(), edgeLabel, vertexLabel, toscaDataList, pathKeys, mapKeyField);
@@ -606,13 +620,13 @@ public abstract class BaseOperation {
 	public <T extends ToscaDataDefinition> StorageOperationStatus deleteToscaDataDeepElementsBlockOfToscaElement(String toscaElementUid, EdgeLabelEnum edgeLabel, VertexTypeEnum vertexLabel, String key) {
 
         StorageOperationStatus statusRes = null;
-        Either<GraphVertex, TitanOperationStatus> getToscaElementRes;
+        Either<GraphVertex, JanusGraphOperationStatus> getToscaElementRes;
 
-        getToscaElementRes = titanDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse);
+        getToscaElementRes = janusGraphDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse);
         if (getToscaElementRes.isRight()) {
-            TitanOperationStatus status = getToscaElementRes.right().value();
+            JanusGraphOperationStatus status = getToscaElementRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_TOSCA_ELEMENT_UPON_ADDING_THE_PROPERTIES_STATUS_IS, toscaElementUid, status);
-            statusRes = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+            statusRes = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
         }
         if (statusRes == null) {
             statusRes = deleteToscaDataDeepElementsBlockToToscaElement(getToscaElementRes.left().value(), edgeLabel, vertexLabel, key);
@@ -627,22 +641,23 @@ public abstract class BaseOperation {
 
         StorageOperationStatus result = null;
         GraphVertex toscaDataVertex = null;
-        Either<GraphVertex, TitanOperationStatus> toscaDataVertexRes = titanDao.getChildVertex(toscaElement, edgeLabel, JsonParseFlagEnum.ParseJson);
+        Either<GraphVertex, JanusGraphOperationStatus> toscaDataVertexRes = janusGraphDao
+            .getChildVertex(toscaElement, edgeLabel, JsonParseFlagEnum.ParseJson);
         if (toscaDataVertexRes.isRight()) {
-            TitanOperationStatus status = toscaDataVertexRes.right().value();
+            JanusGraphOperationStatus status = toscaDataVertexRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_CHILD_VERTEX_OF_THE_TOSCA_ELEMENT_BY_LABEL_STATUS_IS, toscaElement.getUniqueId(), edgeLabel, status);
-            result = DaoStatusConverter.convertTitanStatusToStorageStatus(toscaDataVertexRes.right().value());
+            result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(toscaDataVertexRes.right().value());
         }
         if (result == null) {
             toscaDataVertex = toscaDataVertexRes.left().value();
             result = deleteDeepElementsBlock(toscaDataVertex, key);
         }
         if (result == null) {
-            Either<GraphVertex, TitanOperationStatus> updateOrCopyRes = updateOrCopyOnUpdate(toscaDataVertex, toscaElement, edgeLabel);
+            Either<GraphVertex, JanusGraphOperationStatus> updateOrCopyRes = updateOrCopyOnUpdate(toscaDataVertex, toscaElement, edgeLabel);
             if (updateOrCopyRes.isRight()) {
-                TitanOperationStatus status = updateOrCopyRes.right().value();
+                JanusGraphOperationStatus status = updateOrCopyRes.right().value();
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to delete tosca data block {} from the tosca element {}. Status is {}. ", edgeLabel, toscaElement.getUniqueId(), status);
-                result = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+                result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
             }
         }
         if (result == null) {
@@ -655,13 +670,13 @@ public abstract class BaseOperation {
     public <T extends ToscaDataDefinition> StorageOperationStatus addToscaDataDeepElementsBlockToToscaElement(String toscaElementUid, EdgeLabelEnum edgeLabel, VertexTypeEnum vertexLabel, MapDataDefinition toscaDataMap, String key) {
 
         StorageOperationStatus statusRes = null;
-        Either<GraphVertex, TitanOperationStatus> getToscaElementRes;
+        Either<GraphVertex, JanusGraphOperationStatus> getToscaElementRes;
 
-        getToscaElementRes = titanDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse);
+        getToscaElementRes = janusGraphDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse);
         if (getToscaElementRes.isRight()) {
-            TitanOperationStatus status = getToscaElementRes.right().value();
+            JanusGraphOperationStatus status = getToscaElementRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_TOSCA_ELEMENT_UPON_ADDING_THE_PROPERTIES_STATUS_IS, toscaElementUid, status);
-            statusRes = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+            statusRes = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
         }
         if (statusRes == null && toscaDataMap != null) {
             statusRes = addToscaDataDeepElementsBlockToToscaElement(getToscaElementRes.left().value(), edgeLabel, vertexLabel, toscaDataMap, key);
@@ -677,11 +692,12 @@ public abstract class BaseOperation {
 
         StorageOperationStatus result = null;
         GraphVertex toscaDataVertex = null;
-        Either<GraphVertex, TitanOperationStatus> toscaDataVertexRes = titanDao.getChildVertex(toscaElement, edgeLabel, JsonParseFlagEnum.ParseJson);
-        if (toscaDataVertexRes.isRight() && toscaDataVertexRes.right().value() != TitanOperationStatus.NOT_FOUND) {
-            TitanOperationStatus status = toscaDataVertexRes.right().value();
+        Either<GraphVertex, JanusGraphOperationStatus> toscaDataVertexRes = janusGraphDao
+            .getChildVertex(toscaElement, edgeLabel, JsonParseFlagEnum.ParseJson);
+        if (toscaDataVertexRes.isRight() && toscaDataVertexRes.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
+            JanusGraphOperationStatus status = toscaDataVertexRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_CHILD_VERTEX_OF_THE_TOSCA_ELEMENT_BY_LABEL_STATUS_IS, toscaElement.getUniqueId(), edgeLabel, status);
-            result = DaoStatusConverter.convertTitanStatusToStorageStatus(toscaDataVertexRes.right().value());
+            result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(toscaDataVertexRes.right().value());
         }
         if (result == null && toscaDataVertexRes.isLeft()) {
                 toscaDataVertex = toscaDataVertexRes.left().value();
@@ -690,11 +706,11 @@ public abstract class BaseOperation {
         }
         if (result == null) {
             if (toscaDataVertex != null) {
-                Either<GraphVertex, TitanOperationStatus> updateOrCopyRes = updateOrCopyOnUpdate(toscaDataVertex, toscaElement, edgeLabel);
+                Either<GraphVertex, JanusGraphOperationStatus> updateOrCopyRes = updateOrCopyOnUpdate(toscaDataVertex, toscaElement, edgeLabel);
                 if (updateOrCopyRes.isRight()) {
-                    TitanOperationStatus status = updateOrCopyRes.right().value();
+                    JanusGraphOperationStatus status = updateOrCopyRes.right().value();
                     CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to add tosca data {} to the tosca element {}. Status is {}. ", edgeLabel, toscaElement.getUniqueId(), status);
-                    result = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+                    result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
                 }
             } else {
                 Map<String, MapDataDefinition> data = new HashMap<>();
@@ -722,20 +738,20 @@ public abstract class BaseOperation {
      * @return the status of the update operation
      */
     public <T extends ToscaDataDefinition> StorageOperationStatus updateToscaDataDeepElementsBlockToToscaElement(String toscaElementId, EdgeLabelEnum edgeLabel, MapDataDefinition<T> toscaDataMap, String key) {
-        return titanDao.getVertexById(toscaElementId, JsonParseFlagEnum.NoParse)
+        return janusGraphDao.getVertexById(toscaElementId, JsonParseFlagEnum.NoParse)
                 .either(toscaElement -> updateToscaDataDeepElementsBlockToToscaElement(toscaElement, edgeLabel, toscaDataMap, key),
-                        DaoStatusConverter::convertTitanStatusToStorageStatus);
+                        DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
     }
 
     private <T extends ToscaDataDefinition> StorageOperationStatus updateToscaDataDeepElementsBlockToToscaElement(GraphVertex toscaElement, EdgeLabelEnum edgeLabel, MapDataDefinition<T> toscaDataMap, String key) {
-        return titanDao.getChildVertex(toscaElement, edgeLabel, JsonParseFlagEnum.ParseJson)
+        return janusGraphDao.getChildVertex(toscaElement, edgeLabel, JsonParseFlagEnum.ParseJson)
                 .left()
                 .bind(dataVertex -> updateToscaDataDeepElementsBlockToToscaElement(toscaElement, dataVertex, edgeLabel, toscaDataMap, key))
                 .either(updatedVertex -> StorageOperationStatus.OK,
-                        DaoStatusConverter::convertTitanStatusToStorageStatus);
+                        DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
     }
 
-    private <T extends ToscaDataDefinition> Either<GraphVertex, TitanOperationStatus> updateToscaDataDeepElementsBlockToToscaElement(GraphVertex toscaElement, GraphVertex dataElement, EdgeLabelEnum edgeLabel, MapDataDefinition<T> toscaDataMap, String key) {
+    private <T extends ToscaDataDefinition> Either<GraphVertex, JanusGraphOperationStatus> updateToscaDataDeepElementsBlockToToscaElement(GraphVertex toscaElement, GraphVertex dataElement, EdgeLabelEnum edgeLabel, MapDataDefinition<T> toscaDataMap, String key) {
         Map<String, T> mapToscaDataDefinition = toscaDataMap.getMapToscaDataDefinition();
         updateDeepElements(dataElement, mapToscaDataDefinition, Collections.singletonList(key));
         return updateOrCopyOnUpdate(dataElement, toscaElement, edgeLabel)
@@ -773,13 +789,13 @@ public abstract class BaseOperation {
     public <T extends ToscaDataDefinition> StorageOperationStatus updateToscaDataOfToscaElement(String toscaElementUid, EdgeLabelEnum edgeLabel, VertexTypeEnum vertexLabel, List<T> toscaDataList, JsonPresentationFields mapKeyField) {
 
         StorageOperationStatus statusRes = null;
-        Either<GraphVertex, TitanOperationStatus> getToscaElementRes;
+        Either<GraphVertex, JanusGraphOperationStatus> getToscaElementRes;
 
-        getToscaElementRes = titanDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse);
+        getToscaElementRes = janusGraphDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse);
         if (getToscaElementRes.isRight()) {
-            TitanOperationStatus status = getToscaElementRes.right().value();
+            JanusGraphOperationStatus status = getToscaElementRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_TOSCA_ELEMENT_UPON_ADDING_THE_PROPERTIES_STATUS_IS, toscaElementUid, status);
-            statusRes = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+            statusRes = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
         }
         if (statusRes == null && CollectionUtils.isNotEmpty(toscaDataList)) {
             statusRes = updateToscaDataOfToscaElement(getToscaElementRes.left().value(), edgeLabel, vertexLabel, toscaDataList, mapKeyField);
@@ -803,13 +819,13 @@ public abstract class BaseOperation {
     public <T extends ToscaDataDefinition> StorageOperationStatus addToscaDataToToscaElement(String toscaElementUid, EdgeLabelEnum edgeLabel, VertexTypeEnum vertexLabel, List<T> toscaDataList, JsonPresentationFields mapKeyField) {
 
         StorageOperationStatus statusRes = null;
-        Either<GraphVertex, TitanOperationStatus> getToscaElementRes;
+        Either<GraphVertex, JanusGraphOperationStatus> getToscaElementRes;
 
-        getToscaElementRes = titanDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse);
+        getToscaElementRes = janusGraphDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse);
         if (getToscaElementRes.isRight()) {
-            TitanOperationStatus status = getToscaElementRes.right().value();
+            JanusGraphOperationStatus status = getToscaElementRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_TOSCA_ELEMENT_UPON_ADDING_THE_PROPERTIES_STATUS_IS, toscaElementUid, status);
-            statusRes = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+            statusRes = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
         }
         if (statusRes == null && CollectionUtils.isNotEmpty(toscaDataList)) {
             statusRes = addToscaDataToToscaElement(getToscaElementRes.left().value(), edgeLabel, vertexLabel, toscaDataList, mapKeyField);
@@ -866,7 +882,8 @@ public abstract class BaseOperation {
     }
 
     public boolean hasEdgeOfType(GraphVertex toscaElement, EdgeLabelEnum edgeLabel) {
-        Either<GraphVertex, TitanOperationStatus> vertex = titanDao.getChildVertex(toscaElement, edgeLabel, JsonParseFlagEnum.ParseJson);
+        Either<GraphVertex, JanusGraphOperationStatus> vertex = janusGraphDao
+            .getChildVertex(toscaElement, edgeLabel, JsonParseFlagEnum.ParseJson);
         return vertex.isLeft();
     }
 
@@ -877,11 +894,12 @@ public abstract class BaseOperation {
         Map<String, T> existingToscaDataMap = null;
         Either<Map<String, T>, StorageOperationStatus> validateRes = null;
         Map<String, T> mergedToscaDataMap;
-        Either<GraphVertex, TitanOperationStatus> toscaDataVertexRes = titanDao.getChildVertex(toscaElement, edgeLabel, JsonParseFlagEnum.ParseJson);
-        if (toscaDataVertexRes.isRight() && toscaDataVertexRes.right().value() != TitanOperationStatus.NOT_FOUND) {
-            TitanOperationStatus status = toscaDataVertexRes.right().value();
+        Either<GraphVertex, JanusGraphOperationStatus> toscaDataVertexRes = janusGraphDao
+            .getChildVertex(toscaElement, edgeLabel, JsonParseFlagEnum.ParseJson);
+        if (toscaDataVertexRes.isRight() && toscaDataVertexRes.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
+            JanusGraphOperationStatus status = toscaDataVertexRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_CHILD_VERTEX_OF_THE_TOSCA_ELEMENT_BY_LABEL_STATUS_IS, toscaElement.getUniqueId(), edgeLabel, status);
-            result = DaoStatusConverter.convertTitanStatusToStorageStatus(toscaDataVertexRes.right().value());
+            result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(toscaDataVertexRes.right().value());
         }
         if (result == null) {
             if (toscaDataVertexRes.isLeft()) {
@@ -912,11 +930,12 @@ public abstract class BaseOperation {
         GraphVertex toscaDataVertex = null;
         Map<String, T> existingToscaDataMap = null;
 
-        Either<GraphVertex, TitanOperationStatus> toscaDataVertexRes = titanDao.getChildVertex(toscaElement, edgeLabel, JsonParseFlagEnum.ParseJson);
-        if (toscaDataVertexRes.isRight() && toscaDataVertexRes.right().value() != TitanOperationStatus.NOT_FOUND) {
-            TitanOperationStatus status = toscaDataVertexRes.right().value();
+        Either<GraphVertex, JanusGraphOperationStatus> toscaDataVertexRes = janusGraphDao
+            .getChildVertex(toscaElement, edgeLabel, JsonParseFlagEnum.ParseJson);
+        if (toscaDataVertexRes.isRight() && toscaDataVertexRes.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
+            JanusGraphOperationStatus status = toscaDataVertexRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_CHILD_VERTEX_OF_THE_TOSCA_ELEMENT_BY_LABEL_STATUS_IS, toscaElement.getUniqueId(), edgeLabel, status);
-            result = DaoStatusConverter.convertTitanStatusToStorageStatus(toscaDataVertexRes.right().value());
+            result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(toscaDataVertexRes.right().value());
         }
         if (result == null) {
             if (toscaDataVertexRes.isLeft()) {
@@ -945,11 +964,12 @@ public abstract class BaseOperation {
         GraphVertex toscaDataVertex = null;
         Map<String, K> existingDeepElementsMap = null;
         Either<Map<String, K>, StorageOperationStatus> validateRes = null;
-        Either<GraphVertex, TitanOperationStatus> toscaDataVertexRes = titanDao.getChildVertex(toscaElement, edgeLabel, JsonParseFlagEnum.ParseJson);
-        if (toscaDataVertexRes.isRight() && toscaDataVertexRes.right().value() != TitanOperationStatus.NOT_FOUND) {
-            TitanOperationStatus status = toscaDataVertexRes.right().value();
+        Either<GraphVertex, JanusGraphOperationStatus> toscaDataVertexRes = janusGraphDao
+            .getChildVertex(toscaElement, edgeLabel, JsonParseFlagEnum.ParseJson);
+        if (toscaDataVertexRes.isRight() && toscaDataVertexRes.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
+            JanusGraphOperationStatus status = toscaDataVertexRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_CHILD_VERTEX_OF_THE_TOSCA_ELEMENT_BY_LABEL_STATUS_IS, toscaElement.getUniqueId(), edgeLabel, status);
-            result = DaoStatusConverter.convertTitanStatusToStorageStatus(toscaDataVertexRes.right().value());
+            result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(toscaDataVertexRes.right().value());
         }
         if (result == null) {
             if (toscaDataVertexRes.isLeft()) {
@@ -1064,13 +1084,13 @@ public abstract class BaseOperation {
     public StorageOperationStatus removeToscaData(String toscaElementUid, EdgeLabelEnum edgeLabel, VertexTypeEnum vertexLabel) {
 
         StorageOperationStatus statusRes = StorageOperationStatus.OK;
-        Either<GraphVertex, TitanOperationStatus> getToscaElementRes;
+        Either<GraphVertex, JanusGraphOperationStatus> getToscaElementRes;
 
-        getToscaElementRes = titanDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse);
+        getToscaElementRes = janusGraphDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse);
         if (getToscaElementRes.isRight()) {
-            TitanOperationStatus status = getToscaElementRes.right().value();
+            JanusGraphOperationStatus status = getToscaElementRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_TOSCA_ELEMENT_UPON_ADDING_THE_PROPERTIES_STATUS_IS, toscaElementUid, status);
-            statusRes = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+            statusRes = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
         }
         if (statusRes == StorageOperationStatus.OK) {
             statusRes = removeToscaDataVertex(getToscaElementRes.left().value(), edgeLabel, vertexLabel);
@@ -1093,11 +1113,12 @@ public abstract class BaseOperation {
         int edgeCounter = 0;
         Edge edge = null;
         Edge edgeToDelete = null;
-        Either<GraphVertex, TitanOperationStatus> toscaDataVertexRes = titanDao.getChildVertex(toscaElement, edgeLabel, JsonParseFlagEnum.ParseJson);
+        Either<GraphVertex, JanusGraphOperationStatus> toscaDataVertexRes = janusGraphDao
+            .getChildVertex(toscaElement, edgeLabel, JsonParseFlagEnum.ParseJson);
         if (toscaDataVertexRes.isRight()) {
-            TitanOperationStatus status = toscaDataVertexRes.right().value();
+            JanusGraphOperationStatus status = toscaDataVertexRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_REMOVE_TOSCA_DATA_VERTEX_OF_THE_TOSCA_ELEMENT_BY_LABEL_STATUS_IS, toscaElement.getUniqueId(), edgeLabel, status);
-            result = DaoStatusConverter.convertTitanStatusToStorageStatus(toscaDataVertexRes.right().value());
+            result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(toscaDataVertexRes.right().value());
         }
         if (result == null) {
             toscaDataVertex = toscaDataVertexRes.left().value();
@@ -1147,13 +1168,13 @@ public abstract class BaseOperation {
     public StorageOperationStatus deleteToscaDataElements(String toscaElementUid, EdgeLabelEnum edgeLabel, List<String> uniqueKeys) {
 
         StorageOperationStatus statusRes = StorageOperationStatus.OK;
-        Either<GraphVertex, TitanOperationStatus> getToscaElementRes;
+        Either<GraphVertex, JanusGraphOperationStatus> getToscaElementRes;
 
-        getToscaElementRes = titanDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse);
+        getToscaElementRes = janusGraphDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse);
         if (getToscaElementRes.isRight()) {
-            TitanOperationStatus status = getToscaElementRes.right().value();
+            JanusGraphOperationStatus status = getToscaElementRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_TOSCA_ELEMENT_UPON_ADDING_THE_PROPERTIES_STATUS_IS, toscaElementUid, status);
-            statusRes = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+            statusRes = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
         }
         if (statusRes == StorageOperationStatus.OK) {
             statusRes = deleteToscaDataElements(getToscaElementRes.left().value(), edgeLabel, uniqueKeys);
@@ -1174,13 +1195,13 @@ public abstract class BaseOperation {
     public StorageOperationStatus deleteToscaDataElement(String toscaElementUid, EdgeLabelEnum edgeLabel, VertexTypeEnum vertexLabel, String uniqueKey, JsonPresentationFields mapKeyField) {
 
         StorageOperationStatus statusRes = StorageOperationStatus.OK;
-        Either<GraphVertex, TitanOperationStatus> getToscaElementRes;
+        Either<GraphVertex, JanusGraphOperationStatus> getToscaElementRes;
 
-        getToscaElementRes = titanDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse);
+        getToscaElementRes = janusGraphDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse);
         if (getToscaElementRes.isRight()) {
-            TitanOperationStatus status = getToscaElementRes.right().value();
+            JanusGraphOperationStatus status = getToscaElementRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_TOSCA_ELEMENT_UPON_ADDING_THE_PROPERTIES_STATUS_IS, toscaElementUid, status);
-            statusRes = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+            statusRes = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
         }
         if (statusRes == StorageOperationStatus.OK) {
             statusRes = deleteToscaDataElement(getToscaElementRes.left().value(), edgeLabel, vertexLabel, uniqueKey, mapKeyField);
@@ -1203,13 +1224,13 @@ public abstract class BaseOperation {
     public StorageOperationStatus deleteToscaDataDeepElement(String toscaElementUid, EdgeLabelEnum edgeLabel, VertexTypeEnum vertexLabel, String uniqueKey, List<String> pathKeys, JsonPresentationFields mapKeyField) {
 
         StorageOperationStatus statusRes = StorageOperationStatus.OK;
-        Either<GraphVertex, TitanOperationStatus> getToscaElementRes;
+        Either<GraphVertex, JanusGraphOperationStatus> getToscaElementRes;
 
-        getToscaElementRes = titanDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse);
+        getToscaElementRes = janusGraphDao.getVertexById(toscaElementUid, JsonParseFlagEnum.NoParse);
         if (getToscaElementRes.isRight()) {
-            TitanOperationStatus status = getToscaElementRes.right().value();
+            JanusGraphOperationStatus status = getToscaElementRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_TOSCA_ELEMENT_UPON_ADDING_THE_PROPERTIES_STATUS_IS, toscaElementUid, status);
-            statusRes = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+            statusRes = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
         }
         if (statusRes == StorageOperationStatus.OK) {
             statusRes = deleteToscaDataDeepElement(getToscaElementRes.left().value(), edgeLabel, vertexLabel, uniqueKey, pathKeys, mapKeyField);
@@ -1241,11 +1262,12 @@ public abstract class BaseOperation {
         StorageOperationStatus result = null;
         GraphVertex toscaDataVertex;
         Map<String, ToscaDataDefinition> existingToscaDataMap = null;
-        Either<GraphVertex, TitanOperationStatus> toscaDataVertexRes = titanDao.getChildVertex(toscaElement, edgeLabel, JsonParseFlagEnum.ParseJson);
+        Either<GraphVertex, JanusGraphOperationStatus> toscaDataVertexRes = janusGraphDao
+            .getChildVertex(toscaElement, edgeLabel, JsonParseFlagEnum.ParseJson);
         if (toscaDataVertexRes.isRight()) {
-            TitanOperationStatus status = toscaDataVertexRes.right().value();
+            JanusGraphOperationStatus status = toscaDataVertexRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_CHILD_VERTEX_OF_THE_TOSCA_ELEMENT_BY_LABEL_STATUS_IS, toscaElement.getUniqueId(), edgeLabel, status);
-            result = DaoStatusConverter.convertTitanStatusToStorageStatus(toscaDataVertexRes.right().value());
+            result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(toscaDataVertexRes.right().value());
         }
         if (result == null) {
             toscaDataVertex = toscaDataVertexRes.left().value();
@@ -1300,11 +1322,12 @@ public abstract class BaseOperation {
         StorageOperationStatus result = null;
         GraphVertex toscaDataVertex;
         Map<String, ToscaDataDefinition> existingToscaDataMap;
-        Either<GraphVertex, TitanOperationStatus> toscaDataVertexRes = titanDao.getChildVertex(toscaElement, edgeLabel, JsonParseFlagEnum.ParseJson);
+        Either<GraphVertex, JanusGraphOperationStatus> toscaDataVertexRes = janusGraphDao
+            .getChildVertex(toscaElement, edgeLabel, JsonParseFlagEnum.ParseJson);
         if (toscaDataVertexRes.isRight()) {
-            TitanOperationStatus status = toscaDataVertexRes.right().value();
+            JanusGraphOperationStatus status = toscaDataVertexRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_CHILD_VERTEX_OF_THE_TOSCA_ELEMENT_BY_LABEL_STATUS_IS, toscaElement.getUniqueId(), edgeLabel, status);
-            result = DaoStatusConverter.convertTitanStatusToStorageStatus(toscaDataVertexRes.right().value());
+            result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(toscaDataVertexRes.right().value());
         }
         if (result == null) {
             toscaDataVertex = toscaDataVertexRes.left().value();
@@ -1334,9 +1357,9 @@ public abstract class BaseOperation {
 
     private <T extends ToscaDataDefinition> StorageOperationStatus updateToscaDataElement(GraphVertex toscaElement, EdgeLabelEnum edgeLabel, GraphVertex toscaDataVertex) {
         StorageOperationStatus result = StorageOperationStatus.OK;
-        Either<GraphVertex, TitanOperationStatus> updateOrCopyRes = updateOrCopyOnUpdate(toscaDataVertex, toscaElement, edgeLabel);
+        Either<GraphVertex, JanusGraphOperationStatus> updateOrCopyRes = updateOrCopyOnUpdate(toscaDataVertex, toscaElement, edgeLabel);
         if (updateOrCopyRes.isRight()) {
-            result = DaoStatusConverter.convertTitanStatusToStorageStatus(updateOrCopyRes.right().value());
+            result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(updateOrCopyRes.right().value());
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to update tosca data {} of the tosca element {}. Status is {}. ", edgeLabel, toscaElement.getUniqueId(), result);
         }
         return result;
@@ -1363,11 +1386,11 @@ public abstract class BaseOperation {
             }
         } else {
             toscaDataVertex.setJson(mergedToscaDataMap);
-            Either<GraphVertex, TitanOperationStatus> updateOrCopyRes = updateOrCopyOnUpdate(toscaDataVertex, toscaElement, edgeLabel);
+            Either<GraphVertex, JanusGraphOperationStatus> updateOrCopyRes = updateOrCopyOnUpdate(toscaDataVertex, toscaElement, edgeLabel);
             if (updateOrCopyRes.isRight()) {
-                TitanOperationStatus status = updateOrCopyRes.right().value();
+                JanusGraphOperationStatus status = updateOrCopyRes.right().value();
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to add tosca data {} to the tosca element {}. Status is {}. ", edgeLabel, toscaElement.getUniqueId(), status);
-                result = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+                result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
             }
         }
         return result;
@@ -1417,9 +1440,9 @@ public abstract class BaseOperation {
     }
 
 //    public StorageOperationStatus updateDataOnGraph(GraphVertex dataVertex) {
-//        Either<GraphVertex, TitanOperationStatus> updateVertex = titanDao.updateVertex(dataVertex);
+//        Either<GraphVertex, JanusGraphOperationStatus> updateVertex = janusGraphDao.updateVertex(dataVertex);
 //        if (updateVertex.isRight()) {
-//            return DaoStatusConverter.convertTitanStatusToStorageStatus(updateVertex.right().value());
+//            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(updateVertex.right().value());
 //        }
 //        return StorageOperationStatus.OK;
 //    }
@@ -1480,12 +1503,12 @@ public abstract class BaseOperation {
         properties.forEach(PropertyDataDefinition::convertPropertyDataToInstancePropertyData);
     }
 
-    private TitanOperationStatus logAndReturn(TitanOperationStatus titanOperationStatus, String logMsg, Object ... logParams) {
+    private JanusGraphOperationStatus logAndReturn(JanusGraphOperationStatus janusGraphOperationStatus, String logMsg, Object ... logParams) {
         log.debug(logMsg, logParams);
-        return titanOperationStatus;
+        return janusGraphOperationStatus;
     }
 
-    protected GraphVertex throwStorageException(TitanOperationStatus status) {
+  protected GraphVertex throwStorageException(JanusGraphOperationStatus status) {
         throw new StorageException(status);
     }
 
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ByToscaNameDerivedNodeTypeResolver.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ByToscaNameDerivedNodeTypeResolver.java
index 5748629584..a34dd7e920 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ByToscaNameDerivedNodeTypeResolver.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ByToscaNameDerivedNodeTypeResolver.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum;
 import org.openecomp.sdc.be.model.DerivedNodeTypeResolver;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
@@ -40,16 +40,17 @@ import java.util.Map;
 public class ByToscaNameDerivedNodeTypeResolver implements DerivedNodeTypeResolver {
 
     @Autowired
-    private TitanDao titanDao;
+    private JanusGraphDao janusGraphDao;
 
     @Override
-    public Either<List<GraphVertex>, TitanOperationStatus> findDerivedResources(String parentResource) {
+    public Either<List<GraphVertex>, JanusGraphOperationStatus> findDerivedResources(String parentResource) {
         Map<GraphPropertyEnum, Object> propertiesToMatch = new HashMap<>();
         propertiesToMatch.put(GraphPropertyEnum.STATE, LifecycleStateEnum.CERTIFIED.name());
 
         propertiesToMatch.put(GraphPropertyEnum.TOSCA_RESOURCE_NAME, parentResource);
         propertiesToMatch.put(GraphPropertyEnum.IS_HIGHEST_VERSION, true);
 
-        return titanDao.getByCriteria(VertexTypeEnum.NODE_TYPE, propertiesToMatch, JsonParseFlagEnum.NoParse);
+        return janusGraphDao
+            .getByCriteria(VertexTypeEnum.NODE_TYPE, propertiesToMatch, JsonParseFlagEnum.NoParse);
     }
 }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/CapabilitiesOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/CapabilitiesOperation.java
index 9d7f64c24a..3b544aaa39 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/CapabilitiesOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/CapabilitiesOperation.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
 import org.apache.commons.collections.MapUtils;
@@ -31,8 +31,8 @@ import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
 import org.openecomp.sdc.be.model.CapabilityDefinition;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.ComponentParametersView;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.TopologyTemplate;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElement;
 import org.openecomp.sdc.be.model.operations.StorageException;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.slf4j.Logger;
@@ -98,7 +98,8 @@ public class CapabilitiesOperation extends BaseOperation {
 
     private StorageOperationStatus createOrUpdateCapabilityProperties(String componentId, TopologyTemplate toscaElement,
                                                                       Map<String, MapPropertiesDataDefinition> propertiesMap) {
-        GraphVertex toscaElementV = titanDao.getVertexById(componentId, JsonParseFlagEnum.NoParse)
+        GraphVertex toscaElementV = janusGraphDao.getVertexById(componentId, JsonParseFlagEnum
+            .NoParse)
                 .left().on(this::throwStorageException);
         Map<String, MapPropertiesDataDefinition> capabilitiesProperties = toscaElement.getCapabilitiesProperties();
         if(MapUtils.isNotEmpty(capabilitiesProperties)) {
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/CategoryOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/CategoryOperation.java
index 88f0ea3fd7..7603657b9a 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/CategoryOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/CategoryOperation.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
@@ -53,12 +53,14 @@ public class CategoryOperation extends BaseOperation{
             String categoryUid = UniqueIdBuilder.buildComponentCategoryUid(name, type);
             Map<GraphPropertyEnum, Object> props = new HashMap<>();
             props.put(GraphPropertyEnum.NORMALIZED_NAME, ValidationUtils.normalizeCategoryName4Uniqueness(name));
-            Either<List<GraphVertex>, TitanOperationStatus> either = titanDao.getByCriteria(type, props);
+            Either<List<GraphVertex>, JanusGraphOperationStatus> either = janusGraphDao
+                .getByCriteria(type, props);
 
             if (either.isRight()) {
-                TitanOperationStatus titanOperationStatus = either.right().value();
-                log.debug("Problem while geting category with id {}. reason - {}", categoryUid, titanOperationStatus.name());
-                if (titanOperationStatus == TitanOperationStatus.NOT_FOUND) {
+                JanusGraphOperationStatus janusGraphOperationStatus = either.right().value();
+                log.debug("Problem while geting category with id {}. reason - {}", categoryUid, janusGraphOperationStatus
+                    .name());
+                if (janusGraphOperationStatus == JanusGraphOperationStatus.NOT_FOUND) {
                     return Either.right(StorageOperationStatus.CATEGORY_NOT_FOUND);
                 } else {
                     return Either.right(StorageOperationStatus.GENERAL_ERROR);
@@ -76,10 +78,11 @@ public class CategoryOperation extends BaseOperation{
      * @return
      */
     public  Either<GraphVertex, StorageOperationStatus> getSubCategoryForCategory(GraphVertex categoryV, String name ) {
-        Either<List<GraphVertex>, TitanOperationStatus> childrenVertecies = titanDao.getChildrenVertecies(categoryV, EdgeLabelEnum.SUB_CATEGORY, JsonParseFlagEnum.NoParse);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> childrenVertecies = janusGraphDao
+            .getChildrenVertecies(categoryV, EdgeLabelEnum.SUB_CATEGORY, JsonParseFlagEnum.NoParse);
         if ( childrenVertecies.isRight() ){
             log.debug("Failed to fetch children verticies for category {} error {}", categoryV.getUniqueId(), childrenVertecies.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(childrenVertecies.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(childrenVertecies.right().value()));
         }
         for ( GraphVertex childV : childrenVertecies.left().value() ){
             if ( childV.getMetadataProperty(GraphPropertyEnum.NAME).equals(name) ){
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ExternalReferencesOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ExternalReferencesOperation.java
index 70cfc5d238..6079c5ef15 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ExternalReferencesOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ExternalReferencesOperation.java
@@ -1,15 +1,15 @@
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 
 import fj.data.Either;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.MapComponentInstanceExternalRefs;
-import org.openecomp.sdc.be.model.jsontitan.utils.IdMapper;
+import org.openecomp.sdc.be.model.jsonjanusgraph.utils.IdMapper;
 import org.openecomp.sdc.be.model.operations.impl.OperationUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -34,8 +34,8 @@ public class ExternalReferencesOperation extends BaseOperation {
     /**
      * Constructor
      */
-    public ExternalReferencesOperation(TitanDao titanDao, NodeTypeOperation nto, TopologyTemplateOperation tto, IdMapper idMapper){
-        this.titanDao = titanDao;
+    public ExternalReferencesOperation(JanusGraphDao janusGraphDao, NodeTypeOperation nto, TopologyTemplateOperation tto, IdMapper idMapper){
+        this.janusGraphDao = janusGraphDao;
         this.topologyTemplateOperation = tto;
         this.nodeTypeOperation = nto;
         this.idMapper = idMapper;
@@ -43,26 +43,26 @@ public class ExternalReferencesOperation extends BaseOperation {
 
     public Either<String, ActionStatus> addExternalReferenceWithCommit(String serviceUuid, String componentInstanceName, String objectType, String reference) {
         Either<String, ActionStatus> addResult = addExternalReference(serviceUuid, componentInstanceName, objectType, reference);
-        titanDao.commit();
+        janusGraphDao.commit();
         return addResult;
     }
 
     public Either<String, ActionStatus> deleteExternalReferenceWithCommit(String serviceUuid, String componentInstanceName, String objectType, String reference) {
         Either<String, ActionStatus> result = deleteExternalReference(serviceUuid, componentInstanceName, objectType, reference);
-        titanDao.commit();
+        janusGraphDao.commit();
         return result;
     }
 
     public Either<String, ActionStatus> updateExternalReferenceWithCommit(String serviceVertexUuid, String componentInstanceName, String objectType, String oldRef, String newRef) {
         Either<String, ActionStatus> updateResult = updateExternalReference(serviceVertexUuid, componentInstanceName, objectType, oldRef, newRef);
-        titanDao.commit();
+        janusGraphDao.commit();
         return updateResult;
     }
 
     public Either<String, ActionStatus> addExternalReference(String assetUuid, String componentInstanceName, String objectType, String reference) {
 
         //Get Container vertex
-        Either<GraphVertex, TitanOperationStatus> vertexById = titanDao.getVertexById(assetUuid);
+        Either<GraphVertex, JanusGraphOperationStatus> vertexById = janusGraphDao.getVertexById(assetUuid);
         if (vertexById.isRight()){
             return Either.right(ActionStatus.RESOURCE_NOT_FOUND);
         }
@@ -75,7 +75,7 @@ public class ExternalReferencesOperation extends BaseOperation {
         }
 
         //Get the external references map vertex
-        final Either<GraphVertex, TitanOperationStatus> dataVertexResult = getDataVertex(serviceVertex, EdgeLabelEnum.EXTERNAL_REFS);
+        final Either<GraphVertex, JanusGraphOperationStatus> dataVertexResult = getDataVertex(serviceVertex, EdgeLabelEnum.EXTERNAL_REFS);
 
         //Check whether data vertex found
         GraphVertex externalRefsVertex = dataVertexResult.isLeft() ? dataVertexResult.left().value() : null;
@@ -99,7 +99,7 @@ public class ExternalReferencesOperation extends BaseOperation {
 
     public Either<String, ActionStatus> deleteExternalReference(String assetUuid, String componentInstanceName, String objectType, String reference){
         //Get Service vertex
-        Either<GraphVertex, TitanOperationStatus> vertexById = titanDao.getVertexById(assetUuid);
+        Either<GraphVertex, JanusGraphOperationStatus> vertexById = janusGraphDao.getVertexById(assetUuid);
         if (vertexById.isRight()){
             return Either.right(ActionStatus.RESOURCE_NOT_FOUND);
         }
@@ -111,7 +111,7 @@ public class ExternalReferencesOperation extends BaseOperation {
         }
 
         //Get the external references map vertex
-        final Either<GraphVertex, TitanOperationStatus> dataVertexResult = getDataVertex(serviceVertex, EdgeLabelEnum.EXTERNAL_REFS);
+        final Either<GraphVertex, JanusGraphOperationStatus> dataVertexResult = getDataVertex(serviceVertex, EdgeLabelEnum.EXTERNAL_REFS);
 
         //Check whether data vertex found
         GraphVertex externalRefsVertex = dataVertexResult.isLeft() ? dataVertexResult.left().value() : null;
@@ -133,7 +133,7 @@ public class ExternalReferencesOperation extends BaseOperation {
 
     public Either<String, ActionStatus> updateExternalReference(String assetUuid, String componentInstanceName, String objectType, String oldRef, String newRef) {
         //Get Service vertex
-        Either<GraphVertex, TitanOperationStatus> vertexById = titanDao.getVertexById(assetUuid);
+        Either<GraphVertex, JanusGraphOperationStatus> vertexById = janusGraphDao.getVertexById(assetUuid);
         if (vertexById.isRight()){
             return Either.right(ActionStatus.RESOURCE_NOT_FOUND);
         }
@@ -147,7 +147,7 @@ public class ExternalReferencesOperation extends BaseOperation {
         }
 
         //Get the external references map vertex
-        final Either<GraphVertex, TitanOperationStatus> dataVertexResult = getDataVertex(serviceVertex, EdgeLabelEnum.EXTERNAL_REFS);
+        final Either<GraphVertex, JanusGraphOperationStatus> dataVertexResult = getDataVertex(serviceVertex, EdgeLabelEnum.EXTERNAL_REFS);
 
         //Check whether data vertex found
         GraphVertex externalRefsVertex = dataVertexResult.isLeft() ? dataVertexResult.left().value() : null;
@@ -168,7 +168,7 @@ public class ExternalReferencesOperation extends BaseOperation {
 
     public Either<Map<String, List<String>>, ActionStatus> getExternalReferences(String assetUuid, String objectType) {
         //Get Service vertex
-        Either<GraphVertex, TitanOperationStatus> vertexById = titanDao.getVertexById(assetUuid);
+        Either<GraphVertex, JanusGraphOperationStatus> vertexById = janusGraphDao.getVertexById(assetUuid);
         if (vertexById.isRight()){
             return Either.right(ActionStatus.RESOURCE_NOT_FOUND);
         }
@@ -178,7 +178,7 @@ public class ExternalReferencesOperation extends BaseOperation {
         Map<String, List<String>> result = new HashMap();
 
         //Get the external references map vertex
-        final Either<GraphVertex, TitanOperationStatus> dataVertexResult = getDataVertex(serviceVertex, EdgeLabelEnum.EXTERNAL_REFS);
+        final Either<GraphVertex, JanusGraphOperationStatus> dataVertexResult = getDataVertex(serviceVertex, EdgeLabelEnum.EXTERNAL_REFS);
         //Check whether data vertex found
         GraphVertex externalRefsVertex = dataVertexResult.isLeft() ? dataVertexResult.left().value() : null;
         if (externalRefsVertex != null) {
@@ -203,10 +203,10 @@ public class ExternalReferencesOperation extends BaseOperation {
                                          String compInstanceUniqueId,
                                          Map<String, List<String>> instanceExternalReferences) {
 
-        GraphVertex serviceVertex = titanDao.getVertexById(containerUniqueId)
+        GraphVertex serviceVertex = janusGraphDao.getVertexById(containerUniqueId)
                 .left()
-                .on(operationUtils::onTitanOperationFailure);
-        Either<GraphVertex, TitanOperationStatus> dataVertex = getDataVertex(serviceVertex, EdgeLabelEnum.EXTERNAL_REFS);
+                .on(operationUtils::onJanusGraphOperationFailure);
+        Either<GraphVertex, JanusGraphOperationStatus> dataVertex = getDataVertex(serviceVertex, EdgeLabelEnum.EXTERNAL_REFS);
         Map<String, MapComponentInstanceExternalRefs> externalReferencesFullData;
         if (dataVertex.isLeft()) {
             externalReferencesFullData = (Map<String, MapComponentInstanceExternalRefs>) dataVertex.left().value().getJson();
@@ -219,11 +219,11 @@ public class ExternalReferencesOperation extends BaseOperation {
 
     public Map<String, List<String>> getAllExternalReferences(String containerUniqueId,
                                                               String compInstanceUniqueId) {
-        GraphVertex serviceVertex = titanDao.getVertexById(containerUniqueId)
+        GraphVertex serviceVertex = janusGraphDao.getVertexById(containerUniqueId)
             .left()
-            .on(operationUtils::onTitanOperationFailure);
+            .on(operationUtils::onJanusGraphOperationFailure);
 
-        Either<GraphVertex, TitanOperationStatus> dataVertex = getDataVertex(serviceVertex, EdgeLabelEnum.EXTERNAL_REFS);
+        Either<GraphVertex, JanusGraphOperationStatus> dataVertex = getDataVertex(serviceVertex, EdgeLabelEnum.EXTERNAL_REFS);
         if (dataVertex.isRight()) {
             return new HashMap<>();
         }
@@ -239,7 +239,7 @@ public class ExternalReferencesOperation extends BaseOperation {
 
     public Either<List<String>, ActionStatus> getExternalReferences(String assetUuid, String componentInstanceName, String objectType) {
         //Get Service vertex
-        Either<GraphVertex, TitanOperationStatus> vertexById = titanDao.getVertexById(assetUuid);
+        Either<GraphVertex, JanusGraphOperationStatus> vertexById = janusGraphDao.getVertexById(assetUuid);
         if (vertexById.isRight()){
             return Either.right(ActionStatus.RESOURCE_NOT_FOUND);
         }
@@ -251,7 +251,7 @@ public class ExternalReferencesOperation extends BaseOperation {
         }
 
         //Get the external references map vertex
-        final Either<GraphVertex, TitanOperationStatus> dataVertexResult = getDataVertex(serviceVertex, EdgeLabelEnum.EXTERNAL_REFS);
+        final Either<GraphVertex, JanusGraphOperationStatus> dataVertexResult = getDataVertex(serviceVertex, EdgeLabelEnum.EXTERNAL_REFS);
 
         //Check whether data vertex found
         GraphVertex externalRefsVertex = dataVertexResult.isLeft() ? dataVertexResult.left().value() : null;
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ForwardingPathOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ForwardingPathOperation.java
index 0d82b0f27d..f7372a6e28 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ForwardingPathOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ForwardingPathOperation.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.ForwardingPathDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.model.Service;
@@ -43,13 +43,14 @@ public class ForwardingPathOperation extends BaseOperation {
 
     public Either<Set<String>, StorageOperationStatus> deleteForwardingPath(Service service, Set<String> forwardingPathsToDelete) {
         Either<Set<String>, StorageOperationStatus> result = null;
-        Either<GraphVertex, TitanOperationStatus> getComponentVertex;
+        Either<GraphVertex, JanusGraphOperationStatus> getComponentVertex;
         StorageOperationStatus status = null;
 
         if (result == null) {
-            getComponentVertex = titanDao.getVertexById(service.getUniqueId(), JsonParseFlagEnum.NoParse);
+            getComponentVertex = janusGraphDao
+                .getVertexById(service.getUniqueId(), JsonParseFlagEnum.NoParse);
             if (getComponentVertex.isRight()) {
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getComponentVertex.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getComponentVertex.right().value()));
             }
         }
         if (result == null) {
@@ -78,13 +79,13 @@ public class ForwardingPathOperation extends BaseOperation {
     private Either<ForwardingPathDataDefinition, StorageOperationStatus> addOrUpdateForwardingPath(boolean isUpdateAction, String serviceId, ForwardingPathDataDefinition currentPath) {
 
         StorageOperationStatus statusRes;
-        Either<GraphVertex, TitanOperationStatus> getToscaElementRes;
+        Either<GraphVertex, JanusGraphOperationStatus> getToscaElementRes;
 
-        getToscaElementRes = titanDao.getVertexById(serviceId, JsonParseFlagEnum.NoParse);
+        getToscaElementRes = janusGraphDao.getVertexById(serviceId, JsonParseFlagEnum.NoParse);
         if (getToscaElementRes.isRight()) {
-            TitanOperationStatus status = getToscaElementRes.right().value();
+            JanusGraphOperationStatus status = getToscaElementRes.right().value();
             CommonUtility.addRecordToLog(log, CommonUtility.LogLevelEnum.DEBUG, "Failed to get tosca element {} upon adding the properties. Status is {}. ", serviceId, status);
-            statusRes = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+            statusRes = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
             return Either.right(statusRes);
         }
         GraphVertex serviceVertex = getToscaElementRes.left().value();
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/GroupsOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/GroupsOperation.java
index b417f83b74..03bab3b31e 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/GroupsOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/GroupsOperation.java
@@ -18,21 +18,21 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
 import org.apache.commons.collections.MapUtils;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.*;
 import org.openecomp.sdc.be.datatypes.elements.MapCapabilityProperty;
 import org.openecomp.sdc.be.datatypes.elements.MapListCapabilityDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.model.*;
-import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter;
+import org.openecomp.sdc.be.model.jsonjanusgraph.utils.ModelConverter;
 import org.openecomp.sdc.be.model.operations.StorageException;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
@@ -126,12 +126,12 @@ public class GroupsOperation extends BaseOperation {
     public Either<List<GroupDefinition>, StorageOperationStatus> createGroups(Component component, Map<String, GroupDataDefinition> groups) {
 
         Either<List<GroupDefinition>, StorageOperationStatus> result = null;
-        Either<GraphVertex, TitanOperationStatus> getComponentVertex = null;
+        Either<GraphVertex, JanusGraphOperationStatus> getComponentVertex = null;
         StorageOperationStatus status = null;
 
-		getComponentVertex = titanDao.getVertexById(component.getUniqueId(), JsonParseFlagEnum.NoParse);
+		getComponentVertex = janusGraphDao.getVertexById(component.getUniqueId(), JsonParseFlagEnum.NoParse);
 		if (getComponentVertex.isRight()) {
-			result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getComponentVertex.right().value()));
+			result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getComponentVertex.right().value()));
 		}
         if (result == null) {
             status = topologyTemplateOperation.associateGroupsToComponent(getComponentVertex.left().value(), groups);
@@ -147,12 +147,12 @@ public class GroupsOperation extends BaseOperation {
 
     public <T extends GroupDataDefinition> Either<List<GroupDefinition>, StorageOperationStatus> addGroups(Component component, List<T> groups) {
         Either<List<GroupDefinition>, StorageOperationStatus> result = null;
-        Either<GraphVertex, TitanOperationStatus> getComponentVertex;
+        Either<GraphVertex, JanusGraphOperationStatus> getComponentVertex;
         StorageOperationStatus status;
 
-		getComponentVertex = titanDao.getVertexById(component.getUniqueId(), JsonParseFlagEnum.NoParse);
+		getComponentVertex = janusGraphDao.getVertexById(component.getUniqueId(), JsonParseFlagEnum.NoParse);
 		if (getComponentVertex.isRight()) {
-			result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getComponentVertex.right().value()));
+			result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getComponentVertex.right().value()));
 		}
         if (result == null) {
             status = addToscaDataToToscaElement(component.getUniqueId(), EdgeLabelEnum.GROUPS, VertexTypeEnum.GROUPS, groups, JsonPresentationFields.NAME);
@@ -171,12 +171,12 @@ public class GroupsOperation extends BaseOperation {
 
     public Either<List<GroupDefinition>, StorageOperationStatus> deleteGroups(Component component, List<GroupDataDefinition> groups) {
         Either<List<GroupDefinition>, StorageOperationStatus> result = null;
-        Either<GraphVertex, TitanOperationStatus> getComponentVertex = null;
+        Either<GraphVertex, JanusGraphOperationStatus> getComponentVertex = null;
         StorageOperationStatus status = null;
 
-		getComponentVertex = titanDao.getVertexById(component.getUniqueId(), JsonParseFlagEnum.NoParse);
+		getComponentVertex = janusGraphDao.getVertexById(component.getUniqueId(), JsonParseFlagEnum.NoParse);
 		if (getComponentVertex.isRight()) {
-			result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getComponentVertex.right().value()));
+			result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getComponentVertex.right().value()));
 		}
         if (result == null) {
 			List<String> groupName = groups.stream().map(GroupDataDefinition::getName).collect(Collectors.toList());
@@ -196,12 +196,12 @@ public class GroupsOperation extends BaseOperation {
 
     public <T extends GroupDataDefinition> Either<List<GroupDefinition>, StorageOperationStatus> updateGroups(Component component, List<T> groups, boolean promoteVersion) {
         Either<List<GroupDefinition>, StorageOperationStatus> result = null;
-        Either<GraphVertex, TitanOperationStatus> getComponentVertex = null;
+        Either<GraphVertex, JanusGraphOperationStatus> getComponentVertex = null;
         StorageOperationStatus status = null;
 
-		getComponentVertex = titanDao.getVertexById(component.getUniqueId(), JsonParseFlagEnum.NoParse);
+		getComponentVertex = janusGraphDao.getVertexById(component.getUniqueId(), JsonParseFlagEnum.NoParse);
 		if (getComponentVertex.isRight()) {
-			result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getComponentVertex.right().value()));
+			result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getComponentVertex.right().value()));
 		}
         if (result == null) {
             groups.forEach(gr -> {
@@ -233,9 +233,9 @@ public class GroupsOperation extends BaseOperation {
     }
 
     public void updateGroupOnComponent(String componentId, GroupDefinition groupDefinition) {
-        GraphVertex componentVertex = titanDao.getVertexById(componentId, JsonParseFlagEnum.ParseMetadata)
+        GraphVertex componentVertex = janusGraphDao.getVertexById(componentId, JsonParseFlagEnum.ParseMetadata)
                 .left()
-                .on(this::onTitanError);
+                .on(this::onJanusGraphError);
 
         StorageOperationStatus updateToscaResult = updateToscaDataOfToscaElement(componentVertex, EdgeLabelEnum.GROUPS, VertexTypeEnum.GROUPS, groupDefinition,
                 JsonPresentationFields.NAME);
@@ -249,26 +249,26 @@ public class GroupsOperation extends BaseOperation {
 
     private void updateLastUpdateDate(GraphVertex componentVertex) {
         componentVertex.setJsonMetadataField(JsonPresentationFields.LAST_UPDATE_DATE, System.currentTimeMillis());
-        titanDao.updateVertex(componentVertex)
+        janusGraphDao.updateVertex(componentVertex)
                 .left()
-                .on(this::onTitanError);
+                .on(this::onJanusGraphError);
     }
 
-    GraphVertex onTitanError(TitanOperationStatus titanOperationStatus) {
+    GraphVertex onJanusGraphError(JanusGraphOperationStatus janusGraphOperationStatus) {
         throw new StorageException(
-                DaoStatusConverter.convertTitanStatusToStorageStatus(titanOperationStatus));
+                DaoStatusConverter.convertJanusGraphStatusToStorageStatus(janusGraphOperationStatus));
     }
 
     public Either<List<GroupProperty>, StorageOperationStatus> updateGroupPropertiesOnComponent(String componentId, GroupDefinition group, List<GroupProperty> newGroupProperties) {
 
         Either<List<GroupProperty>, StorageOperationStatus> result = null;
-        Either<GraphVertex, TitanOperationStatus> getComponentVertex = null;
+        Either<GraphVertex, JanusGraphOperationStatus> getComponentVertex = null;
         GraphVertex componentVertex = null;
 
-		getComponentVertex = titanDao.getVertexById(componentId, JsonParseFlagEnum.ParseMetadata);
+		getComponentVertex = janusGraphDao.getVertexById(componentId, JsonParseFlagEnum.ParseMetadata);
 		if (getComponentVertex.isRight()) {
 			CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to fetch component {}. Status is {} ", componentId);
-			result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getComponentVertex.right().value()));
+			result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getComponentVertex.right().value()));
 		}
         if (result == null) {
             componentVertex = getComponentVertex.left().value();
@@ -289,10 +289,10 @@ public class GroupsOperation extends BaseOperation {
         }
         if (result == null) {
             componentVertex.setJsonMetadataField(JsonPresentationFields.LAST_UPDATE_DATE, System.currentTimeMillis());
-            Either<GraphVertex, TitanOperationStatus> updateRes = titanDao.updateVertex(componentVertex);
+            Either<GraphVertex, JanusGraphOperationStatus> updateRes = janusGraphDao.updateVertex(componentVertex);
             if (updateRes.isRight()) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to update the component {}. Status is {} ", componentId, updateRes.right().value());
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(updateRes.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(updateRes.right().value()));
             }
         }
         if (result == null) {
@@ -323,9 +323,10 @@ public class GroupsOperation extends BaseOperation {
         Either<List<GroupInstance>, StorageOperationStatus> result = null;
         StorageOperationStatus status = null;
 
-        Either<GraphVertex, TitanOperationStatus> getComponentVertex = titanDao.getVertexById(component.getUniqueId(), JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> getComponentVertex = janusGraphDao
+            .getVertexById(component.getUniqueId(), JsonParseFlagEnum.NoParse);
         if (getComponentVertex.isRight()) {
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getComponentVertex.right().value()));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getComponentVertex.right().value()));
         }
         if (result == null) {
             List<String> pathKeys = new ArrayList<>();
@@ -369,10 +370,11 @@ public class GroupsOperation extends BaseOperation {
 
     public Either<GroupInstance, StorageOperationStatus> updateGroupInstancePropertyValuesOnGraph(String componentId, String instanceId, GroupInstance oldGroupInstance, List<GroupInstanceProperty> newProperties) {
 
-        Either<GraphVertex, TitanOperationStatus> getComponentVertex = titanDao.getVertexById(componentId, JsonParseFlagEnum.ParseMetadata);
+        Either<GraphVertex, JanusGraphOperationStatus> getComponentVertex = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.ParseMetadata);
         if (getComponentVertex.isRight()) {
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to fetch component {}. Status is {} ", componentId);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getComponentVertex.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getComponentVertex.right().value()));
         }
 
         List<PropertyDataDefinition> propertiesOld = oldGroupInstance.getProperties();
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/InstancesOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/InstancesOperation.java
index 84814e4863..3378e03318 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/InstancesOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/InstancesOperation.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 public class InstancesOperation extends BaseOperation {
 
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/InterfaceOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/InterfaceOperation.java
index b4433d1be0..0b6f48f051 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/InterfaceOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/InterfaceOperation.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
 import java.util.Collections;
@@ -22,9 +22,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import org.apache.commons.collections.MapUtils;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.InterfaceDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
@@ -78,10 +78,10 @@ public class InterfaceOperation extends BaseOperation {
             return Either.right(statusRes);
         }
 
-        Either<Map<String, InterfaceDataDefinition>, TitanOperationStatus> componentEither =
+        Either<Map<String, InterfaceDataDefinition>, JanusGraphOperationStatus> componentEither =
                 getDataFromGraph(componentId, EdgeLabelEnum.INTERFACE);
         if (componentEither.isRight()) {
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(componentEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(componentEither.right().value()));
         }
 
         Map<String, InterfaceDataDefinition> interfaceDataDefinitionMap = componentEither.left().value();
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeFilterOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeFilterOperation.java
index 7b3076ae8b..13ad534bbb 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeFilterOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeFilterOperation.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -26,11 +26,12 @@ import fj.data.Either;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.CINodeFilterDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.ListDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.RequirementNodeFilterPropertyDataDefinition;
@@ -48,18 +49,18 @@ public class NodeFilterOperation extends BaseOperation {
 
     public Either<Set<String>, StorageOperationStatus> deleteNodeFilters(Service service,
             Set<String> componentInstanceIds) {
-        Either<GraphVertex, TitanOperationStatus> getComponentVertex;
-        Either<GraphVertex, TitanOperationStatus> getNodeFilterVertex;
+        Either<GraphVertex, JanusGraphOperationStatus> getComponentVertex;
+        Either<GraphVertex, JanusGraphOperationStatus> getNodeFilterVertex;
         StorageOperationStatus status;
 
-        getComponentVertex = titanDao.getVertexById(service.getUniqueId(), JsonParseFlagEnum.NoParse);
+        getComponentVertex = janusGraphDao.getVertexById(service.getUniqueId(), JsonParseFlagEnum.NoParse);
         if (getComponentVertex.isRight()) {
             return Either.right(
-                    DaoStatusConverter.convertTitanStatusToStorageStatus(getComponentVertex.right().value()));
+                    DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getComponentVertex.right().value()));
         }
 
         getNodeFilterVertex =
-                titanDao.getChildVertex(getComponentVertex.left().value(), EdgeLabelEnum.NODE_FILTER_TEMPLATE,
+                janusGraphDao.getChildVertex(getComponentVertex.left().value(), EdgeLabelEnum.NODE_FILTER_TEMPLATE,
                         JsonParseFlagEnum.NoParse);
         if (getNodeFilterVertex.isLeft()) {
             status = deleteToscaDataElements(service.getUniqueId(), EdgeLabelEnum.NODE_FILTER_TEMPLATE,
@@ -132,27 +133,27 @@ public class NodeFilterOperation extends BaseOperation {
             String serviceId, String componentInstanceId, CINodeFilterDataDefinition ciNodeFilterDataDefinition) {
 
         StorageOperationStatus statusRes;
-        Either<GraphVertex, TitanOperationStatus> getToscaElementRes;
+        Either<GraphVertex, JanusGraphOperationStatus> getToscaElementRes;
 
-        getToscaElementRes = titanDao.getVertexById(serviceId, JsonParseFlagEnum.NoParse);
+        getToscaElementRes = janusGraphDao.getVertexById(serviceId, JsonParseFlagEnum.NoParse);
         if (getToscaElementRes.isRight()) {
-            TitanOperationStatus status = getToscaElementRes.right().value();
+            JanusGraphOperationStatus status = getToscaElementRes.right().value();
             CommonUtility.addRecordToLog(logger, CommonUtility.LogLevelEnum.DEBUG,
                     "Failed to get tosca element {} upon adding the properties. Status is {}. ", serviceId, status);
-            statusRes = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+            statusRes = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
             return Either.right(statusRes);
         }
         GraphVertex serviceVertex = getToscaElementRes.left().value();
         ciNodeFilterDataDefinition.setID(componentInstanceId);
         statusRes = performUpdateToscaAction(isUpdateAction, serviceVertex, ImmutableList.of(ciNodeFilterDataDefinition));
         if (!statusRes.equals(StorageOperationStatus.OK)) {
-            titanDao.rollback();
+            janusGraphDao.rollback();
             logger.error(
                     " Failed to perform tosca update for node filter in service {} , component instance {}. status is {}",
                     serviceId, componentInstanceId, statusRes);
             return Either.right(statusRes);
         }
-        titanDao.commit();
+        janusGraphDao.commit();
         return Either.left(ciNodeFilterDataDefinition);
 
     }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTemplateOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeTemplateOperation.java
index de396b4c1a..2861337aec 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTemplateOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeTemplateOperation.java
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
@@ -31,13 +31,13 @@ import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.config.ConfigurationManager;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgePropertyEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
 import org.openecomp.sdc.be.dao.jsongraph.utils.JsonParserUtils;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.CapabilityDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.ComponentInstanceDataDefinition;
@@ -80,12 +80,12 @@ import org.openecomp.sdc.be.model.RelationshipInfo;
 import org.openecomp.sdc.be.model.RequirementCapabilityRelDef;
 import org.openecomp.sdc.be.model.RequirementDefinition;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.NodeType;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.TopologyTemplate;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElementTypeEnum;
-import org.openecomp.sdc.be.model.jsontitan.enums.JsonConstantKeysEnum;
-import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.NodeType;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElementTypeEnum;
+import org.openecomp.sdc.be.model.jsonjanusgraph.enums.JsonConstantKeysEnum;
+import org.openecomp.sdc.be.model.jsonjanusgraph.utils.ModelConverter;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
@@ -138,13 +138,14 @@ public class NodeTemplateOperation extends BaseOperation {
         ComponentInstanceDataDefinition componentInstanceData = null;
         Either<String, StorageOperationStatus> newInstanceNameRes = null;
 
-        Either<GraphVertex, TitanOperationStatus> metadataVertex = titanDao.getVertexById(container.getUniqueId(), JsonParseFlagEnum.ParseJson);
+        Either<GraphVertex, JanusGraphOperationStatus> metadataVertex = janusGraphDao
+            .getVertexById(container.getUniqueId(), JsonParseFlagEnum.ParseJson);
         if (metadataVertex.isRight()) {
-            TitanOperationStatus status = metadataVertex.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.INVALID_ID;
+            JanusGraphOperationStatus status = metadataVertex.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.INVALID_ID;
             }
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
 
         if (result == null) {
@@ -335,7 +336,8 @@ public class NodeTemplateOperation extends BaseOperation {
             Map<String, MapPropertiesDataDefinition> instPropertiesMap = new HashMap<>();
             instPropertiesMap.put(componentInstance.getUniqueId(), instProperties);
             updatedContainer.setInstProperties(instPropertiesMap);
-            Either<GraphVertex, TitanOperationStatus> getToscaElementRes = titanDao.getVertexById(updatedContainer.getUniqueId(), JsonParseFlagEnum.NoParse);
+            Either<GraphVertex, JanusGraphOperationStatus> getToscaElementRes = janusGraphDao
+                .getVertexById(updatedContainer.getUniqueId(), JsonParseFlagEnum.NoParse);
            if(getToscaElementRes.isLeft()){
                deleteToscaDataDeepElementsBlockToToscaElement(getToscaElementRes.left().value(),  EdgeLabelEnum.INST_PROPERTIES,
                        VertexTypeEnum.INST_PROPERTIES,  componentInstance.getUniqueId());
@@ -410,7 +412,7 @@ public class NodeTemplateOperation extends BaseOperation {
         String containerComponentId = container.getUniqueId();
         CommonUtility.addRecordToLog(log, LogLevelEnum.TRACE, "Going to create component instance {} in component {}", componentInstance, containerComponentId);
         String instOriginComponentId = componentInstance.getComponentUid();
-        Either<GraphVertex, TitanOperationStatus> updateElement = null;
+        Either<GraphVertex, JanusGraphOperationStatus> updateElement = null;
 
         Boolean isDeleted = (Boolean) originToscaElement.getMetadataValue(JsonPresentationFields.IS_DELETED);
 
@@ -428,10 +430,10 @@ public class NodeTemplateOperation extends BaseOperation {
             container.addComponentInstance(componentInstance);
             metadataVertex.setJsonMetadataField(JsonPresentationFields.LAST_UPDATE_DATE, System.currentTimeMillis());
             topologyTemplateOperation.fillToscaElementVertexData(metadataVertex, container, JsonParseFlagEnum.ParseAll);
-            updateElement = titanDao.updateVertex(metadataVertex);
+            updateElement = janusGraphDao.updateVertex(metadataVertex);
             if (updateElement.isRight()) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_UPDATE_TOPOLOGY_TEMPLATE_WITH_NEW_COMPONENT_INSTANCE, container.getName(), componentInstance.getName());
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(updateElement.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(updateElement.right().value()));
             }
         }
         if (result == null) {
@@ -467,23 +469,25 @@ public class NodeTemplateOperation extends BaseOperation {
         CommonUtility.addRecordToLog(log, LogLevelEnum.TRACE, "Going to update component instance metadata {} of container component {}", componentInstance, containerComponentId);
         ComponentInstanceDataDefinition componentInstanceData = null;
 
-        Either<GraphVertex, TitanOperationStatus> metadataVertex = titanDao.getVertexById(container.getUniqueId(), JsonParseFlagEnum.ParseMetadata);
+        Either<GraphVertex, JanusGraphOperationStatus> metadataVertex = janusGraphDao
+            .getVertexById(container.getUniqueId(), JsonParseFlagEnum.ParseMetadata);
         if (metadataVertex.isRight()) {
-            TitanOperationStatus status = metadataVertex.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.INVALID_ID;
+            JanusGraphOperationStatus status = metadataVertex.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.INVALID_ID;
             }
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
         if (result == null) {
             componentInstanceData = buildComponentInstanceDataDefinition(componentInstance, container.getUniqueId(), componentInstance.getName(), false, originToscaElement);
             container.addComponentInstance(componentInstanceData);
             metadataVertex.left().value().setJsonMetadataField(JsonPresentationFields.LAST_UPDATE_DATE, System.currentTimeMillis());
             topologyTemplateOperation.fillToscaElementVertexData(metadataVertex.left().value(), container, JsonParseFlagEnum.ParseAll);
-            Either<GraphVertex, TitanOperationStatus> updateElement = titanDao.updateVertex(metadataVertex.left().value());
+            Either<GraphVertex, JanusGraphOperationStatus> updateElement = janusGraphDao
+                .updateVertex(metadataVertex.left().value());
             if (updateElement.isRight()) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_UPDATE_TOPOLOGY_TEMPLATE_WITH_NEW_COMPONENT_INSTANCE, container.getName(), componentInstance.getName());
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(updateElement.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(updateElement.right().value()));
             }
         }
         if (result == null) {
@@ -507,21 +511,23 @@ public class NodeTemplateOperation extends BaseOperation {
         String containerComponentId = container.getUniqueId();
         CommonUtility.addRecordToLog(log, LogLevelEnum.TRACE, "Going to update component instance metadata  of container component {}", containerComponentId);
 
-        Either<GraphVertex, TitanOperationStatus> metadataVertex = titanDao.getVertexById(container.getUniqueId(), JsonParseFlagEnum.ParseMetadata);
+        Either<GraphVertex, JanusGraphOperationStatus> metadataVertex = janusGraphDao
+            .getVertexById(container.getUniqueId(), JsonParseFlagEnum.ParseMetadata);
         if (metadataVertex.isRight()) {
-            TitanOperationStatus status = metadataVertex.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.INVALID_ID;
+            JanusGraphOperationStatus status = metadataVertex.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.INVALID_ID;
             }
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
         if (result == null) {
             metadataVertex.left().value().setJsonMetadataField(JsonPresentationFields.LAST_UPDATE_DATE, System.currentTimeMillis());
             topologyTemplateOperation.fillToscaElementVertexData(metadataVertex.left().value(), container, JsonParseFlagEnum.ParseAll);
-            Either<GraphVertex, TitanOperationStatus> updateElement = titanDao.updateVertex(metadataVertex.left().value());
+            Either<GraphVertex, JanusGraphOperationStatus> updateElement = janusGraphDao
+                .updateVertex(metadataVertex.left().value());
             if (updateElement.isRight()) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to update topology template {}. ", container.getName());
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(updateElement.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(updateElement.right().value()));
             }
         }
         if (result == null) {
@@ -545,13 +551,14 @@ public class NodeTemplateOperation extends BaseOperation {
         String containerComponentId = container.getUniqueId();
         CommonUtility.addRecordToLog(log, LogLevelEnum.TRACE, "Going to update component instance metadata {} of container component {}", componentInstanceId, containerComponentId);
 
-        Either<GraphVertex, TitanOperationStatus> metadataVertex = titanDao.getVertexById(container.getUniqueId(), JsonParseFlagEnum.ParseMetadata);
+        Either<GraphVertex, JanusGraphOperationStatus> metadataVertex = janusGraphDao
+            .getVertexById(container.getUniqueId(), JsonParseFlagEnum.ParseMetadata);
         if (metadataVertex.isRight()) {
-            TitanOperationStatus status = metadataVertex.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.INVALID_ID;
+            JanusGraphOperationStatus status = metadataVertex.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.INVALID_ID;
             }
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
         GraphVertex containerV = null;
         ComponentInstanceDataDefinition removedComponentInstance = null;
@@ -566,10 +573,10 @@ public class NodeTemplateOperation extends BaseOperation {
 
             containerV.setJsonMetadataField(JsonPresentationFields.LAST_UPDATE_DATE, System.currentTimeMillis());
             topologyTemplateOperation.fillToscaElementVertexData(containerV, container, JsonParseFlagEnum.ParseAll);
-            Either<GraphVertex, TitanOperationStatus> updateElement = titanDao.updateVertex(containerV);
+            Either<GraphVertex, JanusGraphOperationStatus> updateElement = janusGraphDao.updateVertex(containerV);
             if (updateElement.isRight()) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_UPDATE_TOPOLOGY_TEMPLATE_WITH_NEW_COMPONENT_INSTANCE, container.getName(), componentInstanceId);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(updateElement.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(updateElement.right().value()));
             }
         }
         if (result == null) {
@@ -1248,11 +1255,12 @@ public class NodeTemplateOperation extends BaseOperation {
     @SuppressWarnings({ "unchecked" })
     public <T extends ToscaDataDefinition> Either<List<RequirementCapabilityRelDef>, StorageOperationStatus> associateResourceInstances(String componentId, List<RequirementCapabilityRelDef> relations) {
 
-        Either<GraphVertex, TitanOperationStatus> containerVEither = titanDao.getVertexById(componentId, JsonParseFlagEnum.ParseAll);
+        Either<GraphVertex, JanusGraphOperationStatus> containerVEither = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.ParseAll);
         if (containerVEither.isRight()) {
-            TitanOperationStatus error = containerVEither.right().value();
+            JanusGraphOperationStatus error = containerVEither.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_FETCH_CONTAINER_VERTEX_ERROR, componentId, error);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(error));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(error));
         }
         GraphVertex containerV = containerVEither.left().value();
         Either<Pair<GraphVertex, Map<String, MapListCapabilityDataDefinition>>, StorageOperationStatus> capResult = fetchContainerCalculatedCapability(containerV, EdgeLabelEnum.CALCULATED_CAPABILITIES);
@@ -1294,7 +1302,8 @@ public class NodeTemplateOperation extends BaseOperation {
             if (relationships == null || relationships.isEmpty()) {
                 BeEcompErrorManager.getInstance().logBeFailedAddingResourceInstanceError("AssociateResourceInstances - missing relationship", fromNode, componentId);
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "No requirement definition sent in order to set the relation between {} to {}", fromNode, toNode);
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(TitanOperationStatus.ILLEGAL_ARGUMENT));
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(
+                    JanusGraphOperationStatus.ILLEGAL_ARGUMENT));
             }
 
             for (CapabilityRequirementRelationship immutablePair : relationships) {
@@ -1353,43 +1362,43 @@ public class NodeTemplateOperation extends BaseOperation {
             Either<Pair<GraphVertex, Map<String, MapListCapabilityDataDefinition>>, StorageOperationStatus> capFullResult, Either<Pair<GraphVertex, Map<String, MapListRequirementDataDefinition>>, StorageOperationStatus> reqResult,
             Either<Pair<GraphVertex, Map<String, MapListRequirementDataDefinition>>, StorageOperationStatus> reqFullResult) {
         containerV.setJsonMetadataField(JsonPresentationFields.LAST_UPDATE_DATE, System.currentTimeMillis());
-        Either<GraphVertex, TitanOperationStatus> updateElement = titanDao.updateVertex(containerV);
+        Either<GraphVertex, JanusGraphOperationStatus> updateElement = janusGraphDao.updateVertex(containerV);
         if (updateElement.isRight()) {
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to update topology template {} with new relations error {}. ", componentId, updateElement.right().value());
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(updateElement.right().value());
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(updateElement.right().value());
         }
         // update cap/req jsons, fulfilled cap/req jsons!!!!!
-        Either<GraphVertex, TitanOperationStatus> status;
+        Either<GraphVertex, JanusGraphOperationStatus> status;
         CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Update calculated capabilty for container {}", containerV.getUniqueId());
         status = updateOrCopyOnUpdate(capResult.left().value().getLeft(), containerV, EdgeLabelEnum.CALCULATED_CAPABILITIES);
         if (status.isRight()) {
-            TitanOperationStatus error = status.right().value();
+            JanusGraphOperationStatus error = status.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to update calculated capabilty for container {} error {}", containerV.getUniqueId(), error);
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(error);
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(error);
         }
 
         CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Update calculated requirement for container {}", containerV.getUniqueId());
         status = updateOrCopyOnUpdate(reqResult.left().value().getLeft(), containerV, EdgeLabelEnum.CALCULATED_REQUIREMENTS);
         if (status.isRight()) {
-            TitanOperationStatus error = status.right().value();
+            JanusGraphOperationStatus error = status.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to update calculated requiremnt for container {} error {}", containerV.getUniqueId(), error);
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(error);
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(error);
         }
 
         CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Update fullfilled capabilty for container {}", containerV.getUniqueId());
         status = updateOrCopyOnUpdate(capFullResult.left().value().getLeft(), containerV, EdgeLabelEnum.FULLFILLED_CAPABILITIES);
         if (status.isRight()) {
-            TitanOperationStatus error = status.right().value();
+            JanusGraphOperationStatus error = status.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to update fullfilled capabilty for container {} error {}", containerV.getUniqueId(), error);
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(error);
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(error);
         }
 
         CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Update fullfilled requirement for container {}", containerV.getUniqueId());
         status = updateOrCopyOnUpdate(reqFullResult.left().value().getLeft(), containerV, EdgeLabelEnum.FULLFILLED_REQUIREMENTS);
         if (status.isRight()) {
-            TitanOperationStatus error = status.right().value();
+            JanusGraphOperationStatus error = status.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to update fullfilled requirement for container {} error {}", containerV.getUniqueId(), error);
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(error);
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(error);
         }
         return StorageOperationStatus.OK;
     }
@@ -1404,11 +1413,12 @@ public class NodeTemplateOperation extends BaseOperation {
         String fromResInstanceUid = requirementDef.getFromNode();
         String toResInstanceUid = requirementDef.getToNode();
 
-        Either<GraphVertex, TitanOperationStatus> containerVEither = titanDao.getVertexById(componentId, JsonParseFlagEnum.ParseAll);
+        Either<GraphVertex, JanusGraphOperationStatus> containerVEither = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.ParseAll);
         if (containerVEither.isRight()) {
-            TitanOperationStatus error = containerVEither.right().value();
+            JanusGraphOperationStatus error = containerVEither.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_FETCH_CONTAINER_VERTEX_ERROR, componentId, error);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(error));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(error));
         }
         GraphVertex containerV = containerVEither.left().value();
 
@@ -1523,11 +1533,12 @@ public class NodeTemplateOperation extends BaseOperation {
         MapListRequirementDataDefinition reqMapOfLists = null;
         Optional<RequirementDataDefinition> foundRequirement;
         RelationshipInfo relationshipInfo = foundRelation.resolveSingleRelationship().getRelation();
-        Either<GraphVertex, TitanOperationStatus> containerVEither = titanDao.getVertexById(componentId, JsonParseFlagEnum.ParseAll);
+        Either<GraphVertex, JanusGraphOperationStatus> containerVEither = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.ParseAll);
         if (containerVEither.isRight()) {
-            TitanOperationStatus error = containerVEither.right().value();
+            JanusGraphOperationStatus error = containerVEither.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_FETCH_CONTAINER_VERTEX_ERROR, componentId, error);
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(error));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(error));
         }
         if (result == null) {
             GraphVertex containerV = containerVEither.left().value();
@@ -1572,11 +1583,12 @@ public class NodeTemplateOperation extends BaseOperation {
         Optional<CapabilityDataDefinition> foundRequirement;
 
         RelationshipInfo relationshipInfo = foundRelation.resolveSingleRelationship().getRelation();
-        Either<GraphVertex, TitanOperationStatus> containerVEither = titanDao.getVertexById(componentId, JsonParseFlagEnum.ParseAll);
+        Either<GraphVertex, JanusGraphOperationStatus> containerVEither = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.ParseAll);
         if (containerVEither.isRight()) {
-            TitanOperationStatus error = containerVEither.right().value();
+            JanusGraphOperationStatus error = containerVEither.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_FETCH_CONTAINER_VERTEX_ERROR, componentId, error);
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(error));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(error));
         }
         if (result == null) {
             GraphVertex containerV = containerVEither.left().value();
@@ -1821,22 +1833,22 @@ public class NodeTemplateOperation extends BaseOperation {
 
     private Either<Pair<GraphVertex, Map<String, MapListCapabilityDataDefinition>>, StorageOperationStatus> fetchContainerCalculatedCapability(GraphVertex containerV, EdgeLabelEnum capLabel) {
 
-        Either<Pair<GraphVertex, Map<String, MapListCapabilityDataDefinition>>, TitanOperationStatus> calculatedCapabiltyEither = getDataAndVertexFromGraph(containerV, capLabel);
+        Either<Pair<GraphVertex, Map<String, MapListCapabilityDataDefinition>>, JanusGraphOperationStatus> calculatedCapabiltyEither = getDataAndVertexFromGraph(containerV, capLabel);
         if (calculatedCapabiltyEither.isRight()) {
-            TitanOperationStatus error = calculatedCapabiltyEither.right().value();
+            JanusGraphOperationStatus error = calculatedCapabiltyEither.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to fetch calculated capabilties for container {}.", containerV.getUniqueId(), error);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(error));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(error));
         }
         Pair<GraphVertex, Map<String, MapListCapabilityDataDefinition>> calculatedCapabilty = calculatedCapabiltyEither.left().value();
         return Either.left(calculatedCapabilty);
     }
 
     private Either<Pair<GraphVertex, Map<String, MapListRequirementDataDefinition>>, StorageOperationStatus> fetchContainerCalculatedRequirement(GraphVertex containerV, EdgeLabelEnum reqLabel) {
-        Either<Pair<GraphVertex, Map<String, MapListRequirementDataDefinition>>, TitanOperationStatus> calculatedRequirementEither = getDataAndVertexFromGraph(containerV, reqLabel);
+        Either<Pair<GraphVertex, Map<String, MapListRequirementDataDefinition>>, JanusGraphOperationStatus> calculatedRequirementEither = getDataAndVertexFromGraph(containerV, reqLabel);
         if (calculatedRequirementEither.isRight()) {
-            TitanOperationStatus error = calculatedRequirementEither.right().value();
+            JanusGraphOperationStatus error = calculatedRequirementEither.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to fetch calculated requirements for container {}.", containerV.getUniqueId(), error);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(error));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(error));
         }
         Pair<GraphVertex, Map<String, MapListRequirementDataDefinition>> calculatedRequirement = calculatedRequirementEither.left().value();
         return Either.left(calculatedRequirement);
@@ -2000,7 +2012,7 @@ public class NodeTemplateOperation extends BaseOperation {
         StorageOperationStatus result = null;
         String containerId = containerComponent.getUniqueId();
         Map<String, ComponentInstanceDataDefinition> instancesJsonData = null;
-        Either<GraphVertex, TitanOperationStatus> updateElement = null;
+        Either<GraphVertex, JanusGraphOperationStatus> updateElement = null;
         if (!validateInstanceNames(componentInstanceTMap)) {
             result = StorageOperationStatus.INCONSISTENCY;
         }
@@ -2020,10 +2032,10 @@ public class NodeTemplateOperation extends BaseOperation {
             composition.setComponentInstances(instancesJsonData);
             compositions.put(JsonConstantKeysEnum.COMPOSITION.getValue(), composition);
             containerVertex.setJson(compositions);
-            updateElement = titanDao.updateVertex(containerVertex);
+            updateElement = janusGraphDao.updateVertex(containerVertex);
             if (updateElement.isRight()) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to update topology template {} with new component instances. ", containerComponent.getName());
-                result = DaoStatusConverter.convertTitanStatusToStorageStatus(updateElement.right().value());
+                result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(updateElement.right().value());
             }
         }
         if (result == null && updateElement != null) {
@@ -2084,13 +2096,14 @@ public class NodeTemplateOperation extends BaseOperation {
     }
 
     public StorageOperationStatus addArtifactsToInstance(String toscaElementId, String instanceId, Map<String, ArtifactDataDefinition> instDeplArtifacts, EdgeLabelEnum edgeLabel, VertexTypeEnum vertexType) {
-        Either<GraphVertex, TitanOperationStatus> metadataVertex = titanDao.getVertexById(toscaElementId, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> metadataVertex = janusGraphDao
+            .getVertexById(toscaElementId, JsonParseFlagEnum.NoParse);
         if (metadataVertex.isRight()) {
-            TitanOperationStatus status = metadataVertex.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.INVALID_ID;
+            JanusGraphOperationStatus status = metadataVertex.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.INVALID_ID;
             }
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
         }
         MapArtifactDataDefinition instArtifacts = new MapArtifactDataDefinition(instDeplArtifacts);
         return addToscaDataDeepElementsBlockToToscaElement(metadataVertex.left().value(), edgeLabel, vertexType, instArtifacts, instanceId);
@@ -2099,13 +2112,14 @@ public class NodeTemplateOperation extends BaseOperation {
 
     @SuppressWarnings({ "unchecked" })
     public StorageOperationStatus generateCustomizationUUIDOnInstance(String componentId, String instanceId) {
-        Either<GraphVertex, TitanOperationStatus> metadataVertex = titanDao.getVertexById(componentId, JsonParseFlagEnum.ParseAll);
+        Either<GraphVertex, JanusGraphOperationStatus> metadataVertex = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.ParseAll);
         if (metadataVertex.isRight()) {
-            TitanOperationStatus status = metadataVertex.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.INVALID_ID;
+            JanusGraphOperationStatus status = metadataVertex.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.INVALID_ID;
             }
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
         }
         GraphVertex metaVertex = metadataVertex.left().value();
         Map<String, CompositionDataDefinition> json = (Map<String, CompositionDataDefinition>) metaVertex.getJson();
@@ -2115,19 +2129,19 @@ public class NodeTemplateOperation extends BaseOperation {
             log.debug("Failed to update customization UUID for instance {} in component {} error {}", instanceId, componentId, status);
             return status;
         }
-        Either<GraphVertex, TitanOperationStatus> updateVertex = titanDao.updateVertex(metaVertex);
+        Either<GraphVertex, JanusGraphOperationStatus> updateVertex = janusGraphDao.updateVertex(metaVertex);
         if (updateVertex.isRight()) {
             log.debug("Failed to update vertex of component {} error {}", componentId, updateVertex.right().value());
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(updateVertex.right().value());
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(updateVertex.right().value());
         }
         return StorageOperationStatus.OK;
     }
 
     public StorageOperationStatus generateCustomizationUUIDOnInstanceGroup(String componentId, String instanceId, List<String> groupInstances) {
         if (groupInstances != null) {
-            Either<Map<String, MapGroupsDataDefinition>, TitanOperationStatus> dataFromGraph = getDataFromGraph(componentId, EdgeLabelEnum.INST_GROUPS);
+            Either<Map<String, MapGroupsDataDefinition>, JanusGraphOperationStatus> dataFromGraph = getDataFromGraph(componentId, EdgeLabelEnum.INST_GROUPS);
             if (dataFromGraph.isRight()) {
-                return DaoStatusConverter.convertTitanStatusToStorageStatus(dataFromGraph.right().value());
+                return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(dataFromGraph.right().value());
             }
             MapGroupsDataDefinition grInstPerInstance = dataFromGraph.left().value().get(instanceId);
             if (grInstPerInstance == null) {
@@ -2226,21 +2240,21 @@ public class NodeTemplateOperation extends BaseOperation {
 
         // create edge between container and origin ( in case of proxy this edge will be to ProxyService node type)
         StorageOperationStatus result = createOrUpdateInstanceEdge(metadataVertex, EdgeLabelEnum.INSTANCE_OF, componentInstance.getComponentUid(), instUniqueId).either(v -> StorageOperationStatus.OK,
-                 DaoStatusConverter::convertTitanStatusToStorageStatus);
+                 DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
 
         if (result == StorageOperationStatus.OK && componentInstance.getIsProxy()) {
                 // create edge between container and service origin
                 result = createOrUpdateInstanceEdge(metadataVertex, EdgeLabelEnum.PROXY_OF, componentInstance.getSourceModelUid(), instUniqueId)
-                        .either(v -> StorageOperationStatus.OK, DaoStatusConverter::convertTitanStatusToStorageStatus);
+                        .either(v -> StorageOperationStatus.OK, DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
         }
         return result;
     }
 
     public StorageOperationStatus createAllottedOfEdge(String componentId, String instanceId, String serviceUUID) {
-        Either<GraphVertex, TitanOperationStatus> vertexById = titanDao.getVertexById(componentId);
+        Either<GraphVertex, JanusGraphOperationStatus> vertexById = janusGraphDao.getVertexById(componentId);
         if ( vertexById.isRight() ){
             log.debug("Failed to fetch component metadata vertex for id {} error {}", componentId, vertexById.right().value());
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(vertexById.right().value());
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(vertexById.right().value());
         }
         GraphVertex metadataVertex = vertexById.left().value();
 
@@ -2251,10 +2265,11 @@ public class NodeTemplateOperation extends BaseOperation {
         EnumMap<GraphPropertyEnum, Object> hasNot = new EnumMap<>(GraphPropertyEnum.class);
         hasNot.put(GraphPropertyEnum.IS_DELETED, true);
 
-        Either<List<GraphVertex>, TitanOperationStatus> byCriteria = titanDao.getByCriteria(VertexTypeEnum.TOPOLOGY_TEMPLATE, props,hasNot, JsonParseFlagEnum.ParseMetadata );
+        Either<List<GraphVertex>, JanusGraphOperationStatus> byCriteria = janusGraphDao
+            .getByCriteria(VertexTypeEnum.TOPOLOGY_TEMPLATE, props,hasNot, JsonParseFlagEnum.ParseMetadata );
         if ( byCriteria.isRight() ){
             log.debug("Failed to fetch vertex by criteria {} error {}", props, byCriteria.right().value());
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(byCriteria.right().value());
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(byCriteria.right().value());
         }
         List<GraphVertex> vertecies = byCriteria.left().value();
         StorageOperationStatus result = StorageOperationStatus.OK;
@@ -2265,7 +2280,7 @@ public class NodeTemplateOperation extends BaseOperation {
             log.debug("Try to create or update edge between resource {} and service {} ", metadataVertex, serviceVertex.getUniqueId());
             // create edge between container and service reference
             result = createOrUpdateInstanceEdge(metadataVertex, EdgeLabelEnum.ALLOTTED_OF, serviceVertex.getUniqueId(), instanceId).either(v -> StorageOperationStatus.OK,
-                    DaoStatusConverter::convertTitanStatusToStorageStatus);
+                    DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
         }
         return result;
     }
@@ -2277,38 +2292,38 @@ public class NodeTemplateOperation extends BaseOperation {
         // create edge between container and origin ( in case of proxy this edge will be to ProxyService node type)
         StorageOperationStatus result = removeOrUpdateInstanceEdge(metadataVertex, EdgeLabelEnum.INSTANCE_OF, componentInstance.getComponentUid(), instUniqueId)
                 .either(v -> StorageOperationStatus.OK,
-                DaoStatusConverter::convertTitanStatusToStorageStatus);
+                DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
 
         if (componentInstance.getIsProxy()) {
             // create edge between container and service origin
             result = removeOrUpdateInstanceEdge(metadataVertex, EdgeLabelEnum.PROXY_OF, componentInstance.getSourceModelUid(), instUniqueId)
-                    .either(v -> StorageOperationStatus.OK, DaoStatusConverter::convertTitanStatusToStorageStatus);
+                    .either(v -> StorageOperationStatus.OK, DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
         }
         return result;
     }
 
-    private Either<GraphVertex, TitanOperationStatus> createOrUpdateInstanceEdge(GraphVertex metadataVertex, EdgeLabelEnum edgeLabel, String componentUid, String instUniqueId) {
+    private Either<GraphVertex, JanusGraphOperationStatus> createOrUpdateInstanceEdge(GraphVertex metadataVertex, EdgeLabelEnum edgeLabel, String componentUid, String instUniqueId) {
         Map<GraphPropertyEnum, Object> properties = new EnumMap<>(GraphPropertyEnum.class);
         properties.put(GraphPropertyEnum.UNIQUE_ID, componentUid);
 
-        return titanDao.getEdgeByChildrenVertexProperties(metadataVertex, edgeLabel, properties)
+        return janusGraphDao.getEdgeByChildrenVertexProperties(metadataVertex, edgeLabel, properties)
                 .left()
                 .bind(v -> addInstanceToPropertyOnEdge(instUniqueId, v, metadataVertex))
                 .right()
                 .bind(s -> createInstanceEdge(metadataVertex, edgeLabel, componentUid, instUniqueId, s));
     }
 
-    private Either<GraphVertex, TitanOperationStatus> removeOrUpdateInstanceEdge(GraphVertex metadataVertex, EdgeLabelEnum edgeLabel, String componentUid, String instUniqueId) {
+    private Either<GraphVertex, JanusGraphOperationStatus> removeOrUpdateInstanceEdge(GraphVertex metadataVertex, EdgeLabelEnum edgeLabel, String componentUid, String instUniqueId) {
         Map<GraphPropertyEnum, Object> properties = new EnumMap<>(GraphPropertyEnum.class);
         properties.put(GraphPropertyEnum.UNIQUE_ID, componentUid);
 
-        return titanDao.getEdgeByChildrenVertexProperties(metadataVertex, edgeLabel, properties).left().bind(v -> removeInstanceFromPropertyOnEdge(instUniqueId, v, metadataVertex)).right()
+        return janusGraphDao.getEdgeByChildrenVertexProperties(metadataVertex, edgeLabel, properties).left().bind(v -> removeInstanceFromPropertyOnEdge(instUniqueId, v, metadataVertex)).right()
                 .map(err -> removeInstanceEdgeLogError(metadataVertex, edgeLabel, componentUid, err));
     }
 
-    private Either<GraphVertex, TitanOperationStatus> addInstanceToPropertyOnEdge(String instUniqueId, Edge edge, GraphVertex metadataVertex) {
+    private Either<GraphVertex, JanusGraphOperationStatus> addInstanceToPropertyOnEdge(String instUniqueId, Edge edge, GraphVertex metadataVertex) {
         // edge exist need to add instance id to list on edge's property
-        List<String> property = (List<String>) titanDao.getProperty(edge, EdgePropertyEnum.INSTANCES);
+        List<String> property = (List<String>) janusGraphDao.getProperty(edge, EdgePropertyEnum.INSTANCES);
         if (property == null) {
             property = new ArrayList<>();
         }
@@ -2323,14 +2338,14 @@ public class NodeTemplateOperation extends BaseOperation {
             edge.property(EdgePropertyEnum.INSTANCES.getProperty(), jsonArr);
         } catch (IOException e) {
            log.debug("Failed to convert INSTANCES edge property to json for container {}", metadataVertex.getUniqueId(), e );
-           return Either.right(TitanOperationStatus.GENERAL_ERROR);
+           return Either.right(JanusGraphOperationStatus.GENERAL_ERROR);
         }
         return Either.left(metadataVertex);
     }
 
-    private Either<GraphVertex, TitanOperationStatus> removeInstanceFromPropertyOnEdge(String instUniqueId, Edge edge, GraphVertex metadataVertex) {
+    private Either<GraphVertex, JanusGraphOperationStatus> removeInstanceFromPropertyOnEdge(String instUniqueId, Edge edge, GraphVertex metadataVertex) {
         // edge exist need to add instance id to list on edge's property
-        List<String> property = (List<String>) titanDao.getProperty(edge, EdgePropertyEnum.INSTANCES);
+        List<String> property = (List<String>) janusGraphDao.getProperty(edge, EdgePropertyEnum.INSTANCES);
         if (property == null) {
             property = new ArrayList<>();
         }
@@ -2347,16 +2362,16 @@ public class NodeTemplateOperation extends BaseOperation {
                 edge.property(EdgePropertyEnum.INSTANCES.getProperty(), jsonArr);
             } catch (IOException e) {
                log.debug("Failed to convert INSTANCES edge property to json for container {}", metadataVertex.getUniqueId(), e );
-               return Either.right(TitanOperationStatus.GENERAL_ERROR);
+               return Either.right(JanusGraphOperationStatus.GENERAL_ERROR);
             }
         }
         return Either.left(metadataVertex);
     }
 
-    private Either<GraphVertex, TitanOperationStatus> createInstanceEdge(GraphVertex metadataVertex, EdgeLabelEnum edgeLabel, String componentUid, String instUniqueId, TitanOperationStatus retrieveEdgeStatus) {
-        if (retrieveEdgeStatus == TitanOperationStatus.NOT_FOUND) {
+    private Either<GraphVertex, JanusGraphOperationStatus> createInstanceEdge(GraphVertex metadataVertex, EdgeLabelEnum edgeLabel, String componentUid, String instUniqueId, JanusGraphOperationStatus retrieveEdgeStatus) {
+        if (retrieveEdgeStatus == JanusGraphOperationStatus.NOT_FOUND) {
             // create new edge
-            Either<GraphVertex, TitanOperationStatus> vertexById = titanDao.getVertexById(componentUid);
+            Either<GraphVertex, JanusGraphOperationStatus> vertexById = janusGraphDao.getVertexById(componentUid);
             if (vertexById.isRight()) {
                 return vertexById;
             }
@@ -2367,16 +2382,18 @@ public class NodeTemplateOperation extends BaseOperation {
             edgeProps.put(EdgePropertyEnum.INSTANCES, instList);
 
             log.debug("Create new edge {} between {} and {} and properties {} ", edgeLabel, metadataVertex.getUniqueId(), originVertex.getUniqueId(), edgeProps);
-            TitanOperationStatus edgeResult = titanDao.createEdge(metadataVertex, originVertex, edgeLabel, edgeProps);
-            return edgeResult == TitanOperationStatus.OK ? Either.left(metadataVertex) : Either.right(edgeResult);
+            JanusGraphOperationStatus
+                edgeResult = janusGraphDao
+                .createEdge(metadataVertex, originVertex, edgeLabel, edgeProps);
+            return edgeResult == JanusGraphOperationStatus.OK ? Either.left(metadataVertex) : Either.right(edgeResult);
         }
         // error
         log.debug("Failed to fetch edge with label {} and to vertex with id {} error {} ", edgeLabel, componentUid, retrieveEdgeStatus);
         return Either.right(retrieveEdgeStatus);
     }
 
-    private TitanOperationStatus removeInstanceEdgeLogError(GraphVertex metadataVertex, EdgeLabelEnum edgeLabel, String componentUid, TitanOperationStatus retrieveEdgeStatus) {
-        if (retrieveEdgeStatus == TitanOperationStatus.NOT_FOUND) {
+    private JanusGraphOperationStatus removeInstanceEdgeLogError(GraphVertex metadataVertex, EdgeLabelEnum edgeLabel, String componentUid, JanusGraphOperationStatus retrieveEdgeStatus) {
+        if (retrieveEdgeStatus == JanusGraphOperationStatus.NOT_FOUND) {
             log.debug("No edge {} to remove between container {} and origin {}", edgeLabel, metadataVertex.getUniqueId(), componentUid);
         } else {
             // error
@@ -2386,10 +2403,10 @@ public class NodeTemplateOperation extends BaseOperation {
     }
 
     public void removeAllAllotedEdges(String uniqueId) {
-        Either<GraphVertex, TitanOperationStatus> vertexById = titanDao.getVertexById(uniqueId);
+        Either<GraphVertex, JanusGraphOperationStatus> vertexById = janusGraphDao.getVertexById(uniqueId);
         if (vertexById.isLeft()) {
             GraphVertex originVertex = vertexById.left().value();
-            TitanVertex vertex = originVertex.getVertex();
+            JanusGraphVertex vertex = originVertex.getVertex();
             Iterator<Edge> edges = vertex.edges(Direction.OUT, EdgeLabelEnum.ALLOTTED_OF.name());
             while ( edges != null && edges.hasNext() ){
                 Edge edge = edges.next();
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTypeOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeTypeOperation.java
index 967fc16c49..eb8b90332c 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTypeOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeTypeOperation.java
@@ -18,16 +18,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
 import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.*;
 import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum;
 import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
@@ -35,9 +35,9 @@ import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
 import org.openecomp.sdc.be.model.ComponentParametersView;
 import org.openecomp.sdc.be.model.DerivedNodeTypeResolver;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.NodeType;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElementTypeEnum;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.NodeType;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElementTypeEnum;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
@@ -93,11 +93,11 @@ public class NodeTypeOperation extends ToscaElementOperation {
         fillToscaElementVertexData(nodeTypeVertex, nodeType, JsonParseFlagEnum.ParseAll);
 
 		//Create Node Type in Graph
-        Either<GraphVertex, TitanOperationStatus> createdVertex = titanDao.createVertex(nodeTypeVertex);
+        Either<GraphVertex, JanusGraphOperationStatus> createdVertex = janusGraphDao.createVertex(nodeTypeVertex);
         if (createdVertex.isRight()) {
-            TitanOperationStatus status = createdVertex.right().value();
+            JanusGraphOperationStatus status = createdVertex.right().value();
             log.error("Error returned after creating resource data node {}. status returned is ", nodeTypeVertex, status);
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             return result;
         }
         nodeTypeVertex = createdVertex.left().value();
@@ -197,140 +197,141 @@ public class NodeTypeOperation extends ToscaElementOperation {
     public Either<ToscaElement, StorageOperationStatus> getToscaElement(GraphVertex componentV, ComponentParametersView componentParametersView) {
         NodeType toscaElement;
         toscaElement = convertToComponent(componentV);
-        TitanOperationStatus status = null;
+        JanusGraphOperationStatus status = null;
         if (!componentParametersView.isIgnoreUsers()) {
             status = setCreatorFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
 
             status = setLastModifierFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
 
         if (!componentParametersView.isIgnoreProperties()) {
             status = setResourcePropertiesFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK && status != TitanOperationStatus.NOT_FOUND) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK && status != JanusGraphOperationStatus.NOT_FOUND) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
 
         if (!componentParametersView.isIgnoreAttributesFrom()) {
             status = setResourceAttributesFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
 
         if (!componentParametersView.isIgnoreDerivedFrom()) {
             status = setResourceDerivedFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
 
         if (!componentParametersView.isIgnoreCategories()) {
             status = setResourceCategoryFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
         if (!componentParametersView.isIgnoreRequirements()) {
             status = setResourceRequirementsFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
+            if (status != JanusGraphOperationStatus.OK) {
                 log.error("Failed to set requirement of resource {}. status is {}", componentV.getUniqueId(), status);
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
         if (!componentParametersView.isIgnoreCapabilities()) {
             status = setResourceCapabilitiesFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
 
         if (!componentParametersView.isIgnoreArtifacts()) {
             status = setArtifactsFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
         if (!componentParametersView.isIgnoreAdditionalInformation()) {
             status = setAdditionalInformationFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
         if (!componentParametersView.isIgnoreInterfaces()) {
             status = setInterfacesFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
         if (!componentParametersView.isIgnoreAllVersions()) {
             status = setAllVersions(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK && status != TitanOperationStatus.NOT_FOUND) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK && status != JanusGraphOperationStatus.NOT_FOUND) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
 
         if (!componentParametersView.isIgnoreCapabiltyProperties()) {
             status = setComponentCapPropertiesFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
 
             }
         }
         return Either.left(toscaElement);
     }
 
-    private TitanOperationStatus setComponentCapPropertiesFromGraph(GraphVertex componentV, NodeType toscaElement) {
-        Either<Map<String, MapPropertiesDataDefinition>, TitanOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.CAPABILITIES_PROPERTIES);
+    private JanusGraphOperationStatus setComponentCapPropertiesFromGraph(GraphVertex componentV, NodeType toscaElement) {
+        Either<Map<String, MapPropertiesDataDefinition>, JanusGraphOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.CAPABILITIES_PROPERTIES);
         if (result.isLeft()) {
             toscaElement.setCapabilitiesProperties(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    private TitanOperationStatus setInterfacesFromGraph(GraphVertex componentV, NodeType toscaElement) {
-        Either<Map<String, InterfaceDataDefinition>, TitanOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.INTERFACE_ARTIFACTS);
+    private JanusGraphOperationStatus setInterfacesFromGraph(GraphVertex componentV, NodeType toscaElement) {
+        Either<Map<String, InterfaceDataDefinition>, JanusGraphOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.INTERFACE_ARTIFACTS);
         if (result.isLeft()) {
             toscaElement.setInterfaceArtifacts(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    protected <T extends ToscaElement> TitanOperationStatus setCapabilitiesFromGraph(GraphVertex componentV, T toscaElement) {
+    protected <T extends ToscaElement> JanusGraphOperationStatus setCapabilitiesFromGraph(GraphVertex componentV, T toscaElement) {
         return setResourceCapabilitiesFromGraph(componentV, (NodeType) toscaElement);
     }
 
-    private TitanOperationStatus setResourceCapabilitiesFromGraph(GraphVertex componentV, NodeType toscaElement) {
-        Either<Map<String, ListCapabilityDataDefinition>, TitanOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.CAPABILITIES);
+    private JanusGraphOperationStatus setResourceCapabilitiesFromGraph(GraphVertex componentV, NodeType toscaElement) {
+        Either<Map<String, ListCapabilityDataDefinition>, JanusGraphOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.CAPABILITIES);
         if (result.isLeft()) {
             toscaElement.setCapabilities(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    private TitanOperationStatus setResourceDerivedFromGraph(GraphVertex componentV, NodeType toscaElement) {
+    private JanusGraphOperationStatus setResourceDerivedFromGraph(GraphVertex componentV, NodeType toscaElement) {
         List<String> derivedFromList = new ArrayList<>();
 
-        TitanOperationStatus listFromGraphStatus = findResourcesPathRecursively(componentV, derivedFromList);
-        if (TitanOperationStatus.OK != listFromGraphStatus) {
+        JanusGraphOperationStatus
+            listFromGraphStatus = findResourcesPathRecursively(componentV, derivedFromList);
+        if (JanusGraphOperationStatus.OK != listFromGraphStatus) {
             return listFromGraphStatus;
         }
 
@@ -346,74 +347,78 @@ public class NodeTypeOperation extends ToscaElementOperation {
             }
 
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    protected TitanOperationStatus findResourcesPathRecursively(GraphVertex nodeTypeV, List<String> resourcesPathList) {
-        Either<GraphVertex, TitanOperationStatus> parentResourceRes = titanDao.getChildVertex(nodeTypeV, EdgeLabelEnum.DERIVED_FROM, JsonParseFlagEnum.NoParse);
+    protected JanusGraphOperationStatus findResourcesPathRecursively(GraphVertex nodeTypeV, List<String> resourcesPathList) {
+        Either<GraphVertex, JanusGraphOperationStatus> parentResourceRes = janusGraphDao
+            .getChildVertex(nodeTypeV, EdgeLabelEnum.DERIVED_FROM, JsonParseFlagEnum.NoParse);
         resourcesPathList.add((String) nodeTypeV.getMetadataProperty(GraphPropertyEnum.TOSCA_RESOURCE_NAME));
         while (parentResourceRes.isLeft()) {
 
             GraphVertex parent = parentResourceRes.left().value();
             resourcesPathList.add((String) parent.getMetadataProperty(GraphPropertyEnum.TOSCA_RESOURCE_NAME));
-            parentResourceRes = titanDao.getChildVertex(parent, EdgeLabelEnum.DERIVED_FROM, JsonParseFlagEnum.NoParse);
+            parentResourceRes = janusGraphDao
+                .getChildVertex(parent, EdgeLabelEnum.DERIVED_FROM, JsonParseFlagEnum.NoParse);
         }
-        TitanOperationStatus operationStatus = parentResourceRes.right().value();
+        JanusGraphOperationStatus operationStatus = parentResourceRes.right().value();
 
-        if (operationStatus != TitanOperationStatus.NOT_FOUND) {
+        if (operationStatus != JanusGraphOperationStatus.NOT_FOUND) {
             return operationStatus;
         } else {
-            return TitanOperationStatus.OK;
+            return JanusGraphOperationStatus.OK;
         }
 
     }
 
-    protected <T extends ToscaElement> TitanOperationStatus setRequirementsFromGraph(GraphVertex componentV, T toscaElement) {
+    protected <T extends ToscaElement> JanusGraphOperationStatus setRequirementsFromGraph(GraphVertex componentV, T toscaElement) {
         return setResourceRequirementsFromGraph(componentV, (NodeType) toscaElement);
     }
 
-    private TitanOperationStatus setResourceRequirementsFromGraph(GraphVertex componentV, NodeType toscaElement) {
-        Either<Map<String, ListRequirementDataDefinition>, TitanOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.REQUIREMENTS);
+    private JanusGraphOperationStatus setResourceRequirementsFromGraph(GraphVertex componentV, NodeType toscaElement) {
+        Either<Map<String, ListRequirementDataDefinition>, JanusGraphOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.REQUIREMENTS);
         if (result.isLeft()) {
             toscaElement.setRequirements(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    private TitanOperationStatus setResourceAttributesFromGraph(GraphVertex componentV, NodeType toscaElement) {
-        Either<Map<String, PropertyDataDefinition>, TitanOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.ATTRIBUTES);
+    private JanusGraphOperationStatus setResourceAttributesFromGraph(GraphVertex componentV, NodeType toscaElement) {
+        Either<Map<String, PropertyDataDefinition>, JanusGraphOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.ATTRIBUTES);
         if (result.isLeft()) {
             toscaElement.setAttributes(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    private TitanOperationStatus setResourcePropertiesFromGraph(GraphVertex componentV, NodeType toscaElement) {
-        Either<Map<String, PropertyDataDefinition>, TitanOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.PROPERTIES);
+    private JanusGraphOperationStatus setResourcePropertiesFromGraph(GraphVertex componentV, NodeType toscaElement) {
+        Either<Map<String, PropertyDataDefinition>, JanusGraphOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.PROPERTIES);
         if (result.isLeft()) {
             toscaElement.setProperties(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
     private StorageOperationStatus assosiateToDerived(GraphVertex nodeTypeVertex, List<GraphVertex> derivedResources) {
         for (GraphVertex derivedV : derivedResources) {
-            TitanOperationStatus createEdge = titanDao.createEdge(nodeTypeVertex, derivedV, EdgeLabelEnum.DERIVED_FROM, null);
-            if (createEdge != TitanOperationStatus.OK) {
+            JanusGraphOperationStatus
+                createEdge = janusGraphDao
+                .createEdge(nodeTypeVertex, derivedV, EdgeLabelEnum.DERIVED_FROM, null);
+            if (createEdge != JanusGraphOperationStatus.OK) {
                 log.trace("Failed to associate resource {} to derived with id {}", nodeTypeVertex.getUniqueId(), derivedV.getUniqueId());
-                return DaoStatusConverter.convertTitanStatusToStorageStatus(createEdge);
+                return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(createEdge);
             }
         }
         return StorageOperationStatus.OK;
@@ -585,7 +590,7 @@ public class NodeTypeOperation extends ToscaElementOperation {
         if (derivedFromResources != null && !derivedFromResources.isEmpty()) {
 
             for (String parentResource : derivedFromResources) {
-                Either<List<GraphVertex>, TitanOperationStatus> getParentResources = derivedResourceResolver.findDerivedResources(parentResource);
+                Either<List<GraphVertex>, JanusGraphOperationStatus> getParentResources = derivedResourceResolver.findDerivedResources(parentResource);
                 List<GraphVertex> resources = null;
                 if (getParentResources.isRight()) {
                     log.error("Cannot find parent resource by tosca resource name {} in the graph.", parentResource);
@@ -639,11 +644,11 @@ public class NodeTypeOperation extends ToscaElementOperation {
         StorageOperationStatus result = StorageOperationStatus.OK;
         for (GraphVertex fetchedDerivedResource : fetchedDerivedResources) {
             fetchedDerivedResource.addMetadataProperty(GraphPropertyEnum.IS_HIGHEST_VERSION, false);
-            Either<GraphVertex, TitanOperationStatus> updateVertexRes = titanDao.updateVertex(fetchedDerivedResource);
+            Either<GraphVertex, JanusGraphOperationStatus> updateVertexRes = janusGraphDao.updateVertex(fetchedDerivedResource);
             if (updateVertexRes.isRight()) {
-                TitanOperationStatus titatStatus = updateVertexRes.right().value();
+                JanusGraphOperationStatus titatStatus = updateVertexRes.right().value();
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to set highest version of node type {} to false. Status is  {}", fetchedDerivedResource.getMetadataProperty(GraphPropertyEnum.TOSCA_RESOURCE_NAME), titatStatus);
-                result = DaoStatusConverter.convertTitanStatusToStorageStatus(titatStatus);
+                result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(titatStatus);
                 break;
             }
         }
@@ -665,34 +670,39 @@ public class NodeTypeOperation extends ToscaElementOperation {
             log.debug("Failed to fetch tosca element {} error {}", toscaElementVertex.getUniqueId(), nodeType.right().value());
             return nodeType;
         }
-        TitanOperationStatus status = disassociateAndDeleteCommonElements(toscaElementVertex);
-        if (status != TitanOperationStatus.OK) {
-            Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+        JanusGraphOperationStatus status = disassociateAndDeleteCommonElements(toscaElementVertex);
+        if (status != JanusGraphOperationStatus.OK) {
+            Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.CAPABILITIES);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao
+            .disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.CAPABILITIES);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate capabilties for {} error {}", toscaElementVertex.getUniqueId(), status);
-            Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.CAPABILITIES_PROPERTIES);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao
+            .disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.CAPABILITIES_PROPERTIES);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate capabilties properties for {} error {}", toscaElementVertex.getUniqueId(), status);
-            Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.REQUIREMENTS);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao
+            .disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.REQUIREMENTS);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate requirements for {} error {}", toscaElementVertex.getUniqueId(), status);
-            Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.ATTRIBUTES);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao
+            .disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.ATTRIBUTES);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate attributes for {} error {}", toscaElementVertex.getUniqueId(), status);
-            Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.INTERFACE_ARTIFACTS);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao
+            .disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.INTERFACE_ARTIFACTS);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate interface artifacts for {} error {}", toscaElementVertex.getUniqueId(), status);
-            Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
         toscaElementVertex.getVertex().remove();
         log.trace("Tosca element vertex for {} was removed", toscaElementVertex.getUniqueId());
@@ -707,7 +717,7 @@ public class NodeTypeOperation extends ToscaElementOperation {
     }
 
     @Override
-    protected <T extends ToscaElement> TitanOperationStatus setCategoriesFromGraph(GraphVertex vertexComponent, T toscaElement) {
+    protected <T extends ToscaElement> JanusGraphOperationStatus setCategoriesFromGraph(GraphVertex vertexComponent, T toscaElement) {
         return setResourceCategoryFromGraph(vertexComponent, toscaElement);
     }
 
@@ -727,11 +737,12 @@ public class NodeTypeOperation extends ToscaElementOperation {
         if (derivedFromResources != null && !derivedFromResources.isEmpty() && derivedFromResources.get(0) != null) {
             String firstDerived = derivedFromResources.get(0);
             boolean derivedFromGenericType = null != nodeType.getDerivedFromGenericType();
-            Either<GraphVertex, TitanOperationStatus> childVertex = titanDao.getChildVertex(nodeTypeV, EdgeLabelEnum.DERIVED_FROM, JsonParseFlagEnum.NoParse);
+            Either<GraphVertex, JanusGraphOperationStatus> childVertex = janusGraphDao
+                .getChildVertex(nodeTypeV, EdgeLabelEnum.DERIVED_FROM, JsonParseFlagEnum.NoParse);
             if (childVertex.isRight()) {
-                TitanOperationStatus getchieldError = childVertex.right().value();
+                JanusGraphOperationStatus getchieldError = childVertex.right().value();
                 log.debug("Failed to fetch derived resource for element {} error {}", nodeTypeV.getUniqueId(), getchieldError);
-                return DaoStatusConverter.convertTitanStatusToStorageStatus(getchieldError);
+                return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getchieldError);
             }
             GraphVertex firstDerivedInChain = childVertex.left().value();
 
@@ -744,12 +755,13 @@ public class NodeTypeOperation extends ToscaElementOperation {
                 propertiesToMatch.put(GraphPropertyEnum.TOSCA_RESOURCE_NAME, firstDerived);
                 propertiesToMatch.put(GraphPropertyEnum.IS_HIGHEST_VERSION, true);
 
-                Either<List<GraphVertex>, TitanOperationStatus> getParentResources = titanDao.getByCriteria(VertexTypeEnum.NODE_TYPE, propertiesToMatch, JsonParseFlagEnum.NoParse);
+                Either<List<GraphVertex>, JanusGraphOperationStatus> getParentResources = janusGraphDao
+                    .getByCriteria(VertexTypeEnum.NODE_TYPE, propertiesToMatch, JsonParseFlagEnum.NoParse);
 
                 if (getParentResources.isRight()) {
-                    TitanOperationStatus error = getParentResources.right().value();
+                    JanusGraphOperationStatus error = getParentResources.right().value();
                     CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to fetch derived by criteria {}. error {} ", propertiesToMatch, error);
-                    return DaoStatusConverter.convertTitanStatusToStorageStatus(error);
+                    return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(error);
                 }
                 // must be only one
                 GraphVertex newDerivedV = getParentResources.left().value().get(0);
@@ -771,11 +783,13 @@ public class NodeTypeOperation extends ToscaElementOperation {
     protected <T extends ToscaElement> StorageOperationStatus updateDerived(T toscaElementToUpdate, GraphVertex nodeTypeV, GraphVertex preDerivedV, GraphVertex newDerivedV, boolean mergeValues) {
         Set<String> preDerivedChainIdList = new HashSet();
         preDerivedChainIdList.add(preDerivedV.getUniqueId());
-        Either<GraphVertex, TitanOperationStatus> childVertex = titanDao.getChildVertex(preDerivedV, EdgeLabelEnum.DERIVED_FROM, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> childVertex = janusGraphDao
+            .getChildVertex(preDerivedV, EdgeLabelEnum.DERIVED_FROM, JsonParseFlagEnum.NoParse);
         while (childVertex.isLeft()) {
             GraphVertex currentChield = childVertex.left().value();
             preDerivedChainIdList.add(currentChield.getUniqueId());
-            childVertex = titanDao.getChildVertex(currentChield, EdgeLabelEnum.DERIVED_FROM, JsonParseFlagEnum.NoParse);
+            childVertex = janusGraphDao
+                .getChildVertex(currentChield, EdgeLabelEnum.DERIVED_FROM, JsonParseFlagEnum.NoParse);
         }
 
         List<GraphVertex> derivedResources = new ArrayList<>();
@@ -786,14 +800,15 @@ public class NodeTypeOperation extends ToscaElementOperation {
             return updateStatus;
         }
 
-        Either<Edge, TitanOperationStatus> deleteEdge = titanDao.deleteEdge(nodeTypeV, preDerivedV, EdgeLabelEnum.DERIVED_FROM);
+        Either<Edge, JanusGraphOperationStatus> deleteEdge = janusGraphDao
+            .deleteEdge(nodeTypeV, preDerivedV, EdgeLabelEnum.DERIVED_FROM);
         if (deleteEdge.isRight()) {
-            TitanOperationStatus deleteError = deleteEdge.right().value();
+            JanusGraphOperationStatus deleteError = deleteEdge.right().value();
             log.debug("Failed to disassociate element {} from derived {} , error {}", nodeTypeV.getUniqueId(), preDerivedV.getUniqueId(), deleteError);
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(deleteError);
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(deleteError);
         }
 
-        titanDao.createEdge(nodeTypeV, newDerivedV, EdgeLabelEnum.DERIVED_FROM, new HashMap<>());
+        janusGraphDao.createEdge(nodeTypeV, newDerivedV, EdgeLabelEnum.DERIVED_FROM, new HashMap<>());
 
         return StorageOperationStatus.OK;
     }
@@ -834,11 +849,11 @@ public class NodeTypeOperation extends ToscaElementOperation {
 
     private <T extends ToscaDataDefinition> StorageOperationStatus updateDataByType(List<GraphVertex> newDerivedList, GraphVertex nodeTypeV, EdgeLabelEnum label, NodeType nodeElement, boolean mergeValues, Set<String> preDerivedChainIdList) {
         log.debug("Update data from derived for element {} type {}", nodeTypeV.getUniqueId(), label);
-        Either<GraphVertex, TitanOperationStatus> dataFromGraph = getDataVertex(nodeTypeV, label);
+        Either<GraphVertex, JanusGraphOperationStatus> dataFromGraph = getDataVertex(nodeTypeV, label);
         if (dataFromGraph.isRight()) {
-            if (TitanOperationStatus.NOT_FOUND == dataFromGraph.right().value())
+            if (JanusGraphOperationStatus.NOT_FOUND == dataFromGraph.right().value())
                 return associateDerivedDataByType(label, nodeTypeV, nodeElement, newDerivedList);
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(dataFromGraph.right().value());
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(dataFromGraph.right().value());
         }
         GraphVertex dataV = dataFromGraph.left().value();
 
@@ -884,9 +899,9 @@ public class NodeTypeOperation extends ToscaElementOperation {
             });
         }
         dataV.setJson(dataFromDerivedAll);
-        Either<GraphVertex, TitanOperationStatus> updateDataV = updateOrCopyOnUpdate(dataV, nodeTypeV, label);
+        Either<GraphVertex, JanusGraphOperationStatus> updateDataV = updateOrCopyOnUpdate(dataV, nodeTypeV, label);
         if (updateDataV.isRight()) {
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(updateDataV.right().value());
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(updateDataV.right().value());
         }
         return StorageOperationStatus.OK;
     }
@@ -913,16 +928,17 @@ public class NodeTypeOperation extends ToscaElementOperation {
     public Either<ToscaElement, StorageOperationStatus> shouldUpdateDerivedVersion(ToscaElement toscaElementToUpdate, GraphVertex nodeTypeV) {
         NodeType nodeType = (NodeType) toscaElementToUpdate;
 
-        Either<GraphVertex, TitanOperationStatus> childVertex = titanDao.getChildVertex(nodeTypeV, EdgeLabelEnum.DERIVED_FROM, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> childVertex = janusGraphDao
+            .getChildVertex(nodeTypeV, EdgeLabelEnum.DERIVED_FROM, JsonParseFlagEnum.NoParse);
         if (childVertex.isRight()) {
-            TitanOperationStatus getchildError = childVertex.right().value();
-            if (getchildError == TitanOperationStatus.NOT_FOUND) {
+            JanusGraphOperationStatus getchildError = childVertex.right().value();
+            if (getchildError == JanusGraphOperationStatus.NOT_FOUND) {
                 log.debug("derived resource for element {} not found", nodeTypeV.getUniqueId());
                 return Either.right(StorageOperationStatus.OK);
             }
 
             log.debug("Failed to fetch derived resource for element {} error {}", nodeTypeV.getUniqueId(), getchildError);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getchildError));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getchildError));
         }
         GraphVertex firstDerivedInChain = childVertex.left().value();
 
@@ -935,10 +951,11 @@ public class NodeTypeOperation extends ToscaElementOperation {
 
         Map<GraphPropertyEnum, Object> propsHasNot = new HashMap<>();
         propsHasNot.put(GraphPropertyEnum.IS_DELETED, true);
-        Either<List<GraphVertex>, TitanOperationStatus> byCriteria = titanDao.getByCriteria(VertexTypeEnum.NODE_TYPE, props, propsHasNot, JsonParseFlagEnum.NoParse);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> byCriteria = janusGraphDao
+            .getByCriteria(VertexTypeEnum.NODE_TYPE, props, propsHasNot, JsonParseFlagEnum.NoParse);
         if (byCriteria.isRight()) {
             log.debug("Failed to fetch derived by props {} error {}", props, byCriteria.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(byCriteria.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(byCriteria.right().value()));
         }
         List<GraphVertex> lastDerived = byCriteria.left().value();
         // now supported only one derived!!! Change in future!(Evg)
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/PolicyOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/PolicyOperation.java
index efbac3301e..349ea809e7 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/PolicyOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/PolicyOperation.java
@@ -1,7 +1,7 @@
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.dao.utils.MapUtil;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
@@ -20,11 +20,11 @@ public class PolicyOperation {
 
     private static final Logger log = Logger.getLogger(PolicyOperation.class.getName());
     private TopologyTemplateOperation topologyTemplateOperation;
-    private TitanDao titanDao;
+    private JanusGraphDao janusGraphDao;
 
-    public PolicyOperation(TopologyTemplateOperation topologyTemplateOperation, TitanDao titanDao) {
+    public PolicyOperation(TopologyTemplateOperation topologyTemplateOperation, JanusGraphDao janusGraphDao) {
         this.topologyTemplateOperation = topologyTemplateOperation;
-        this.titanDao = titanDao;
+        this.janusGraphDao = janusGraphDao;
     }
 
     /**
@@ -37,9 +37,9 @@ public class PolicyOperation {
     public StorageOperationStatus updatePolicyProperties(Component containerComponent, String policyId, List<PropertyDataDefinition> propertiesToUpdate) {
         log.debug("#updatePolicyProperties - updating the properties of policy {} in component {}", policyId, containerComponent.getUniqueId());
         PolicyDefinition policy = containerComponent.getPolicyById(policyId);
-        return titanDao.getVertexById(containerComponent.getUniqueId(), JsonParseFlagEnum.NoParse)
+        return janusGraphDao.getVertexById(containerComponent.getUniqueId(), JsonParseFlagEnum.NoParse)
                 .either(containerVertex -> updatePolicyProperties(containerVertex, policy, propertiesToUpdate),
-                        DaoStatusConverter::convertTitanStatusToStorageStatus);
+                        DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
     }
 
     private StorageOperationStatus updatePolicyProperties(GraphVertex container, PolicyDefinition policy, List<PropertyDataDefinition> propertiesToUpdate) {
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/RequirementOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/RequirementOperation.java
index 1fd37500bf..9c1d1eec3b 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/RequirementOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/RequirementOperation.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
@@ -57,12 +57,12 @@ public class RequirementOperation extends BaseOperation {
                 componentId, Collections
                         .singletonList(convertToListRequirementDataDefinition(requirementDefinitions)));
         if (!statusRes.equals(StorageOperationStatus.OK)) {
-            titanDao.rollback();
+            janusGraphDao.rollback();
             LOGGER.error("Failed to find the parent capability of capability type {}."
                     + " status is {}", componentId, statusRes);
             return Either.right(statusRes);
         }
-        titanDao.commit();
+        janusGraphDao.commit();
         return Either.left(requirementDefinitions);
     }
 
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/TopologyTemplateOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/TopologyTemplateOperation.java
index 5ddc5287ed..a429033505 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/TopologyTemplateOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/TopologyTemplateOperation.java
@@ -18,19 +18,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import com.google.gson.reflect.TypeToken;
 import fj.data.Either;
 import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.AdditionalInfoParameterDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.CINodeFilterDataDefinition;
@@ -65,11 +64,11 @@ import org.openecomp.sdc.be.model.GroupDefinition;
 import org.openecomp.sdc.be.model.PolicyDefinition;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.TopologyTemplate;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElementTypeEnum;
-import org.openecomp.sdc.be.model.jsontitan.utils.CapabilityRequirementNameResolver;
-import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElementTypeEnum;
+import org.openecomp.sdc.be.model.jsonjanusgraph.utils.CapabilityRequirementNameResolver;
+import org.openecomp.sdc.be.model.jsonjanusgraph.utils.ModelConverter;
 import org.openecomp.sdc.be.model.operations.StorageException;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
@@ -118,11 +117,11 @@ public class TopologyTemplateOperation extends ToscaElementOperation {
         GraphVertex topologyTemplateVertex = new GraphVertex();
         topologyTemplateVertex = fillMetadata(topologyTemplateVertex, topologyTemplate, JsonParseFlagEnum.ParseAll);
 
-        Either<GraphVertex, TitanOperationStatus> createdVertex = titanDao.createVertex(topologyTemplateVertex);
+        Either<GraphVertex, JanusGraphOperationStatus> createdVertex = janusGraphDao.createVertex(topologyTemplateVertex);
         if (createdVertex.isRight()) {
-            TitanOperationStatus status = createdVertex.right().value();
+            JanusGraphOperationStatus status = createdVertex.right().value();
             log.debug("Error returned after creating topology template data node {}. status returned is ", topologyTemplateVertex, status);
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             return result;
         }
 
@@ -506,16 +505,16 @@ public class TopologyTemplateOperation extends ToscaElementOperation {
     }
 
     private <T extends MapDataDefinition> Either<GraphVertex, StorageOperationStatus> associateOrAddElementToData(GraphVertex nodeTypeVertex, VertexTypeEnum vertexTypeEnum, EdgeLabelEnum edgeLabelEnum, Map<String, T> dataMap) {
-        return titanDao.getChildVertex(nodeTypeVertex, edgeLabelEnum, JsonParseFlagEnum.ParseJson)
+        return janusGraphDao.getChildVertex(nodeTypeVertex, edgeLabelEnum, JsonParseFlagEnum.ParseJson)
                 .either(dataVertex -> addElementsToComponent(nodeTypeVertex, dataVertex, vertexTypeEnum, edgeLabelEnum, dataMap),
                         status -> associateElementToDataIfNotFound(status, nodeTypeVertex, vertexTypeEnum, edgeLabelEnum, dataMap));
     }
 
-    private Either<GraphVertex, StorageOperationStatus> associateElementToDataIfNotFound(TitanOperationStatus status, GraphVertex nodeTypeVertex, VertexTypeEnum vertexTypeEnum, EdgeLabelEnum edgeLabelEnum, Map<String, ? extends ToscaDataDefinition> dataMap) {
-        if (status == TitanOperationStatus.NOT_FOUND) {
+    private Either<GraphVertex, StorageOperationStatus> associateElementToDataIfNotFound(JanusGraphOperationStatus status, GraphVertex nodeTypeVertex, VertexTypeEnum vertexTypeEnum, EdgeLabelEnum edgeLabelEnum, Map<String, ? extends ToscaDataDefinition> dataMap) {
+        if (status == JanusGraphOperationStatus.NOT_FOUND) {
             return associateElementToData(nodeTypeVertex, vertexTypeEnum, edgeLabelEnum, dataMap);
         }
-        return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+        return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
     }
 
     private <T extends MapDataDefinition> Either<GraphVertex, StorageOperationStatus> addElementsToComponent(GraphVertex nodeTypeVertex, GraphVertex dataVertex, VertexTypeEnum vertexTypeEnum, EdgeLabelEnum edgeLabelEnum, Map<String, T> dataMap) {
@@ -622,10 +621,10 @@ public class TopologyTemplateOperation extends ToscaElementOperation {
             return StorageOperationStatus.CATEGORY_NOT_FOUND;
         }
         GraphVertex categoryV = category.left().value();
-        TitanOperationStatus createEdge = titanDao.createEdge(nodeTypeVertex, categoryV, EdgeLabelEnum.CATEGORY, new HashMap<>());
-        if (createEdge != TitanOperationStatus.OK) {
+        JanusGraphOperationStatus createEdge = janusGraphDao.createEdge(nodeTypeVertex, categoryV, EdgeLabelEnum.CATEGORY, new HashMap<>());
+        if (createEdge != JanusGraphOperationStatus.OK) {
             log.trace("Failed to associate resource {} to category {} with id {}", topologyTemplate.getUniqueId(), categoryName, categoryV.getUniqueId());
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(createEdge);
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(createEdge);
         }
         return StorageOperationStatus.OK;
     }
@@ -649,73 +648,73 @@ public class TopologyTemplateOperation extends ToscaElementOperation {
         TopologyTemplate toscaElement;
 
         toscaElement = convertToTopologyTemplate(componentV);
-        TitanOperationStatus status;
+        JanusGraphOperationStatus status;
         if (!componentParametersView.isIgnoreUsers()) {
             status = setCreatorFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
 
             status = setLastModifierFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
         if (!componentParametersView.isIgnoreCategories()) {
             status = setTopologyTempalteCategoriesFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
 
             }
         }
         if (!componentParametersView.isIgnoreArtifacts()) {
-            TitanOperationStatus storageStatus = setAllArtifactsFromGraph(componentV, toscaElement);
-            if (storageStatus != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(storageStatus));
+            JanusGraphOperationStatus storageStatus = setAllArtifactsFromGraph(componentV, toscaElement);
+            if (storageStatus != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(storageStatus));
             }
         }
         if (!componentParametersView.isIgnoreComponentInstancesProperties()) {
             status = setComponentInstancesPropertiesFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
         if (!componentParametersView.isIgnoreCapabilities()) {
             status = setCapabilitiesFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
         if (!componentParametersView.isIgnoreRequirements()) {
             status = setRequirementsFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
         if (!componentParametersView.isIgnoreAllVersions()) {
             status = setAllVersions(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
         if (!componentParametersView.isIgnoreAdditionalInformation()) {
             status = setAdditionalInformationFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
 
         if (!componentParametersView.isIgnoreGroups()) {
             status = setGroupsFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
 
         }
         if (!componentParametersView.isIgnorePolicies()) {
             status = setPoliciesFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
 
         }
@@ -725,134 +724,134 @@ public class TopologyTemplateOperation extends ToscaElementOperation {
             //Mark all CIs that has archived origins
             archiveOperation.setArchivedOriginsFlagInComponentInstances(componentV);
 
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
 
         }
         if (!componentParametersView.isIgnoreInputs()) {
             status = setInputsFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
 
         }
         if (!componentParametersView.isIgnoreProperties()) {
             status = setPropertiesFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
 
         }
 
         if (!componentParametersView.isIgnoreComponentInstancesInputs()) {
             status = setComponentInstancesInputsFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
 
             }
         }
 
         if (!componentParametersView.isIgnoreCapabiltyProperties()) {
             status = setComponentInstancesCapPropertiesFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
 
             }
         }
 
         if (!componentParametersView.isIgnoreForwardingPath()) {
             status = setForwardingGraphPropertiesFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
 
             }
         }
 
         if (!componentParametersView.isIgnoreNodeFilter()) {
             status = setNodeFilterComponentFromGraph(componentV, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
 
             }
         }
 
         if (!componentParametersView.isIgnoreInterfaces()) {
-            TitanOperationStatus storageStatus = setInterfacesFromGraph(componentV, toscaElement);
-            if (storageStatus != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(storageStatus));
+            JanusGraphOperationStatus storageStatus = setInterfacesFromGraph(componentV, toscaElement);
+            if (storageStatus != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(storageStatus));
 
             }
         }
 
         if (!componentParametersView.isIgnoreComponentInstancesInterfaces()) {
-            TitanOperationStatus storageStatus =
+            JanusGraphOperationStatus storageStatus =
                     setComponentInstancesInterfacesFromGraph(componentV, toscaElement);
-            if (storageStatus != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(storageStatus));
+            if (storageStatus != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(storageStatus));
             }
         }
 
         if (!componentParametersView.isIgnoreDataType()) {
-            TitanOperationStatus storageStatus = setDataTypesFromGraph(componentV, toscaElement);
-            if (storageStatus != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(storageStatus));
+            JanusGraphOperationStatus storageStatus = setDataTypesFromGraph(componentV, toscaElement);
+            if (storageStatus != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(storageStatus));
             }
         }
 
         return Either.left(toscaElement);
     }
 
-    private TitanOperationStatus setDataTypesFromGraph(GraphVertex componentV, TopologyTemplate toscaElement) {
-        Either<Map<String, DataTypeDataDefinition>, TitanOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.DATA_TYPES);
+    private JanusGraphOperationStatus setDataTypesFromGraph(GraphVertex componentV, TopologyTemplate toscaElement) {
+        Either<Map<String, DataTypeDataDefinition>, JanusGraphOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.DATA_TYPES);
         if (result.isLeft()) {
             toscaElement.setDataTypes(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    private TitanOperationStatus setPoliciesFromGraph(GraphVertex componentV, TopologyTemplate toscaElement) {
-        Either<Map<String, PolicyDataDefinition>, TitanOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.POLICIES);
+    private JanusGraphOperationStatus setPoliciesFromGraph(GraphVertex componentV, TopologyTemplate toscaElement) {
+        Either<Map<String, PolicyDataDefinition>, JanusGraphOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.POLICIES);
         if (result.isLeft()) {
             toscaElement.setPolicies(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    private TitanOperationStatus setInterfacesFromGraph(GraphVertex componentV, TopologyTemplate topologyTemplate) {
-        Either<Map<String, InterfaceDataDefinition>, TitanOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.INTERFACE);
+    private JanusGraphOperationStatus setInterfacesFromGraph(GraphVertex componentV, TopologyTemplate topologyTemplate) {
+        Either<Map<String, InterfaceDataDefinition>, JanusGraphOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.INTERFACE);
         if (result.isLeft()) {
             topologyTemplate.setInterfaces(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
 
-    private TitanOperationStatus setComponentInstancesInterfacesFromGraph(GraphVertex componentV,
+    private JanusGraphOperationStatus setComponentInstancesInterfacesFromGraph(GraphVertex componentV,
                                                                           TopologyTemplate topologyTemplate) {
-        Either<Map<String, MapInterfaceDataDefinition>, TitanOperationStatus> result =
+        Either<Map<String, MapInterfaceDataDefinition>, JanusGraphOperationStatus> result =
                 getDataFromGraph(componentV, EdgeLabelEnum.INST_INTERFACES);
         if (result.isLeft()) {
             result.left().value().entrySet().forEach(entry -> topologyTemplate
                     .addComponentInstanceInterfaceMap(entry.getKey(), entry.getValue()));
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
     private StorageOperationStatus associateInterfacesToComponent(GraphVertex topologyTemplateVertex, TopologyTemplate topologyTemplate) {
@@ -879,111 +878,111 @@ public class TopologyTemplateOperation extends ToscaElementOperation {
         return StorageOperationStatus.OK;
     }
 
-    private TitanOperationStatus setForwardingGraphPropertiesFromGraph(GraphVertex componentV, TopologyTemplate topologyTemplate) {
-        Either<Map<String, ForwardingPathDataDefinition>, TitanOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.FORWARDING_PATH);
+    private JanusGraphOperationStatus setForwardingGraphPropertiesFromGraph(GraphVertex componentV, TopologyTemplate topologyTemplate) {
+        Either<Map<String, ForwardingPathDataDefinition>, JanusGraphOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.FORWARDING_PATH);
         if (result.isLeft()) {
             topologyTemplate.setForwardingPaths(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
 
-    private TitanOperationStatus setComponentInstancesCapPropertiesFromGraph(GraphVertex componentV, TopologyTemplate topologyTemplate) {
-        Either<Map<String, MapCapabilityProperty>, TitanOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.CALCULATED_CAP_PROPERTIES);
+    private JanusGraphOperationStatus setComponentInstancesCapPropertiesFromGraph(GraphVertex componentV, TopologyTemplate topologyTemplate) {
+        Either<Map<String, MapCapabilityProperty>, JanusGraphOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.CALCULATED_CAP_PROPERTIES);
         if (result.isLeft()) {
             topologyTemplate.setCalculatedCapabilitiesProperties(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        Either<Map<String, MapPropertiesDataDefinition>, TitanOperationStatus> capPropResult =
+        Either<Map<String, MapPropertiesDataDefinition>, JanusGraphOperationStatus> capPropResult =
                 getDataFromGraph(componentV, EdgeLabelEnum.CAPABILITIES_PROPERTIES);
         if (capPropResult.isLeft()) {
             topologyTemplate.setCapabilitiesProperties(capPropResult.left().value());
         } else {
-            if (capPropResult.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (capPropResult.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return capPropResult.right().value();
             }
         }
 
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    private TitanOperationStatus setPropertiesFromGraph(GraphVertex componentV, TopologyTemplate toscaElement) {
-        Either<Map<String, PropertyDataDefinition>, TitanOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.PROPERTIES);
+    private JanusGraphOperationStatus setPropertiesFromGraph(GraphVertex componentV, TopologyTemplate toscaElement) {
+        Either<Map<String, PropertyDataDefinition>, JanusGraphOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.PROPERTIES);
         if (result.isLeft()) {
             toscaElement.setProperties(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    private TitanOperationStatus setInstGroupsFromGraph(GraphVertex componentV, TopologyTemplate topologyTemplate) {
-        Either<Map<String, MapGroupsDataDefinition>, TitanOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.INST_GROUPS);
+    private JanusGraphOperationStatus setInstGroupsFromGraph(GraphVertex componentV, TopologyTemplate topologyTemplate) {
+        Either<Map<String, MapGroupsDataDefinition>, JanusGraphOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.INST_GROUPS);
         if (result.isLeft()) {
             topologyTemplate.setInstGroups(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    private TitanOperationStatus setComponentInstancesPropertiesFromGraph(GraphVertex componentV, TopologyTemplate topologyTemplate) {
-        Either<Map<String, MapPropertiesDataDefinition>, TitanOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.INST_PROPERTIES);
+    private JanusGraphOperationStatus setComponentInstancesPropertiesFromGraph(GraphVertex componentV, TopologyTemplate topologyTemplate) {
+        Either<Map<String, MapPropertiesDataDefinition>, JanusGraphOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.INST_PROPERTIES);
         if (result.isLeft()) {
             topologyTemplate.setInstProperties(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    private TitanOperationStatus setComponentInstancesInputsFromGraph(GraphVertex componentV, TopologyTemplate topologyTemplate) {
-        Either<Map<String, MapPropertiesDataDefinition>, TitanOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.INST_INPUTS);
+    private JanusGraphOperationStatus setComponentInstancesInputsFromGraph(GraphVertex componentV, TopologyTemplate topologyTemplate) {
+        Either<Map<String, MapPropertiesDataDefinition>, JanusGraphOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.INST_INPUTS);
         if (result.isLeft()) {
             topologyTemplate.setInstInputs(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    private TitanOperationStatus setNodeFilterComponentFromGraph(GraphVertex componentV,
+    private JanusGraphOperationStatus setNodeFilterComponentFromGraph(GraphVertex componentV,
                                                                  TopologyTemplate topologyTemplate) {
-        Either<Map<String, CINodeFilterDataDefinition>, TitanOperationStatus> result =
+        Either<Map<String, CINodeFilterDataDefinition>, JanusGraphOperationStatus> result =
                 getDataFromGraph(componentV,
                         EdgeLabelEnum.NODE_FILTER_TEMPLATE);
         if (result.isLeft()) {
             topologyTemplate.setNodeFilterComponents(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
     @Override
-    protected <T extends ToscaElement> TitanOperationStatus setRequirementsFromGraph(GraphVertex componentV, T toscaElement) {
-        Either<Map<String, MapListRequirementDataDefinition>, TitanOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.CALCULATED_REQUIREMENTS);
+    protected <T extends ToscaElement> JanusGraphOperationStatus setRequirementsFromGraph(GraphVertex componentV, T toscaElement) {
+        Either<Map<String, MapListRequirementDataDefinition>, JanusGraphOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.CALCULATED_REQUIREMENTS);
         if (result.isLeft()) {
             ((TopologyTemplate) toscaElement).setCalculatedRequirements(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
@@ -991,29 +990,29 @@ public class TopologyTemplateOperation extends ToscaElementOperation {
         if (result.isLeft()) {
             ((TopologyTemplate) toscaElement).setFullfilledRequirements(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        Either<Map<String, ListRequirementDataDefinition>, TitanOperationStatus> requirementResult =
+        Either<Map<String, ListRequirementDataDefinition>, JanusGraphOperationStatus> requirementResult =
                 getDataFromGraph(componentV, EdgeLabelEnum.REQUIREMENTS);
         if (requirementResult.isLeft()) {
             toscaElement.setRequirements(requirementResult.left().value());
         } else {
-            if (requirementResult.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (requirementResult.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return requirementResult.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
 
     }
 
-    protected <T extends ToscaElement> TitanOperationStatus setCapabilitiesFromGraph(GraphVertex componentV, T toscaElement) {
-        Either<Map<String, MapListCapabilityDataDefinition>, TitanOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.CALCULATED_CAPABILITIES);
+    protected <T extends ToscaElement> JanusGraphOperationStatus setCapabilitiesFromGraph(GraphVertex componentV, T toscaElement) {
+        Either<Map<String, MapListCapabilityDataDefinition>, JanusGraphOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.CALCULATED_CAPABILITIES);
         if (result.isLeft()) {
             ((TopologyTemplate) toscaElement).setCalculatedCapabilities(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
@@ -1021,79 +1020,79 @@ public class TopologyTemplateOperation extends ToscaElementOperation {
         if (result.isLeft()) {
             ((TopologyTemplate) toscaElement).setFullfilledCapabilities(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        Either<Map<String, ListCapabilityDataDefinition>, TitanOperationStatus> capabilitiesResult =
+        Either<Map<String, ListCapabilityDataDefinition>, JanusGraphOperationStatus> capabilitiesResult =
                 getDataFromGraph(componentV, EdgeLabelEnum.CAPABILITIES);
         if (capabilitiesResult.isLeft()) {
             toscaElement.setCapabilities(capabilitiesResult.left().value());
         } else {
-            if (capabilitiesResult.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (capabilitiesResult.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return capabilitiesResult.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    private TitanOperationStatus setAllArtifactsFromGraph(GraphVertex componentV, TopologyTemplate toscaElement) {
-        TitanOperationStatus storageStatus = setArtifactsFromGraph(componentV, toscaElement);
-        if (storageStatus != TitanOperationStatus.OK) {
+    private JanusGraphOperationStatus setAllArtifactsFromGraph(GraphVertex componentV, TopologyTemplate toscaElement) {
+        JanusGraphOperationStatus storageStatus = setArtifactsFromGraph(componentV, toscaElement);
+        if (storageStatus != JanusGraphOperationStatus.OK) {
             return storageStatus;
         }
-        Either<Map<String, ArtifactDataDefinition>, TitanOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.SERVICE_API_ARTIFACTS);
+        Either<Map<String, ArtifactDataDefinition>, JanusGraphOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.SERVICE_API_ARTIFACTS);
         if (result.isLeft()) {
             toscaElement.setServiceApiArtifacts(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        Either<Map<String, MapArtifactDataDefinition>, TitanOperationStatus> resultInstArt = getDataFromGraph(componentV, EdgeLabelEnum.INST_DEPLOYMENT_ARTIFACTS);
+        Either<Map<String, MapArtifactDataDefinition>, JanusGraphOperationStatus> resultInstArt = getDataFromGraph(componentV, EdgeLabelEnum.INST_DEPLOYMENT_ARTIFACTS);
         if (resultInstArt.isLeft()) {
             toscaElement.setInstDeploymentArtifacts(resultInstArt.left().value());
         } else {
-            if (resultInstArt.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (resultInstArt.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return resultInstArt.right().value();
             }
         }
-        Either<Map<String, MapArtifactDataDefinition>, TitanOperationStatus> instanceArt = getDataFromGraph(componentV, EdgeLabelEnum.INSTANCE_ARTIFACTS);
+        Either<Map<String, MapArtifactDataDefinition>, JanusGraphOperationStatus> instanceArt = getDataFromGraph(componentV, EdgeLabelEnum.INSTANCE_ARTIFACTS);
         if (instanceArt.isLeft()) {
             toscaElement.setInstanceArtifacts(instanceArt.left().value());
         } else {
-            if (instanceArt.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (instanceArt.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return instanceArt.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    private TitanOperationStatus setInputsFromGraph(GraphVertex componentV, TopologyTemplate toscaElement) {
-        Either<Map<String, PropertyDataDefinition>, TitanOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.INPUTS);
+    private JanusGraphOperationStatus setInputsFromGraph(GraphVertex componentV, TopologyTemplate toscaElement) {
+        Either<Map<String, PropertyDataDefinition>, JanusGraphOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.INPUTS);
         if (result.isLeft()) {
             toscaElement.setInputs(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    private TitanOperationStatus setGroupsFromGraph(GraphVertex componentV, TopologyTemplate toscaElement) {
-        Either<Map<String, GroupDataDefinition>, TitanOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.GROUPS);
+    private JanusGraphOperationStatus setGroupsFromGraph(GraphVertex componentV, TopologyTemplate toscaElement) {
+        Either<Map<String, GroupDataDefinition>, JanusGraphOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.GROUPS);
         if (result.isLeft()) {
             toscaElement.setGroups(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    private TitanOperationStatus setTopologyTempalteCategoriesFromGraph(GraphVertex componentV, ToscaElement toscaElement) {
+    private JanusGraphOperationStatus setTopologyTempalteCategoriesFromGraph(GraphVertex componentV, ToscaElement toscaElement) {
         List<CategoryDefinition> categories = new ArrayList<>();
 
         switch (componentV.getType()) {
@@ -1106,11 +1105,11 @@ public class TopologyTemplateOperation extends ToscaElementOperation {
                 log.debug("Not supported component type {} ", componentV.getType());
                 break;
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    private TitanOperationStatus setServiceCategoryFromGraph(GraphVertex componentV, ToscaElement toscaElement, List<CategoryDefinition> categories) {
-        Either<GraphVertex, TitanOperationStatus> childVertex = titanDao.getChildVertex(componentV, EdgeLabelEnum.CATEGORY, JsonParseFlagEnum.NoParse);
+    private JanusGraphOperationStatus setServiceCategoryFromGraph(GraphVertex componentV, ToscaElement toscaElement, List<CategoryDefinition> categories) {
+        Either<GraphVertex, JanusGraphOperationStatus> childVertex = janusGraphDao.getChildVertex(componentV, EdgeLabelEnum.CATEGORY, JsonParseFlagEnum.NoParse);
         if (childVertex.isRight()) {
             log.debug("failed to fetch {} for tosca element with id {}, error {}", EdgeLabelEnum.CATEGORY, componentV.getUniqueId(), childVertex.right().value());
             return childVertex.right().value();
@@ -1129,7 +1128,7 @@ public class TopologyTemplateOperation extends ToscaElementOperation {
         categories.add(category);
         toscaElement.setCategories(categories);
 
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
     @SuppressWarnings("unchecked")
@@ -1150,126 +1149,126 @@ public class TopologyTemplateOperation extends ToscaElementOperation {
             log.debug("Failed to fetch tosca element {} error {}", toscaElementVertex.getUniqueId(), nodeType.right().value());
             return nodeType;
         }
-        TitanOperationStatus status = disassociateAndDeleteCommonElements(toscaElementVertex);
-        if (status != TitanOperationStatus.OK) {
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+        JanusGraphOperationStatus status = disassociateAndDeleteCommonElements(toscaElementVertex);
+        if (status != JanusGraphOperationStatus.OK) {
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.INST_ATTRIBUTES);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.INST_ATTRIBUTES);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate instances attributes for {} error {}", toscaElementVertex.getUniqueId(), status);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.INST_PROPERTIES);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.INST_PROPERTIES);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate instances properties for {} error {}", toscaElementVertex.getUniqueId(), status);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
 
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.INST_INPUTS);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.INST_INPUTS);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate instances inputs for {} error {}", toscaElementVertex.getUniqueId(), status);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
 
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.GROUPS);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.GROUPS);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate groups for {} error {}", toscaElementVertex.getUniqueId(), status);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.POLICIES);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.POLICIES);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate policies for {} error {}", toscaElementVertex.getUniqueId(), status);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.INST_GROUPS);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.INST_GROUPS);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate instance groups for {} error {}", toscaElementVertex.getUniqueId(), status);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.INPUTS);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.INPUTS);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate inputs for {} error {}", toscaElementVertex.getUniqueId(), status);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.INST_INPUTS);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.INST_INPUTS);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate instance inputs for {} error {}", toscaElementVertex.getUniqueId(), status);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.CAPABILITIES_PROPERTIES);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.CAPABILITIES_PROPERTIES);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate capabilities properties for {} error {}", toscaElementVertex.getUniqueId(), status);
-            Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.CALCULATED_CAPABILITIES);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.CALCULATED_CAPABILITIES);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate calculated capabiliites for {} error {}", toscaElementVertex.getUniqueId(), status);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.FULLFILLED_CAPABILITIES);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.FULLFILLED_CAPABILITIES);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate fullfilled capabilities for {} error {}", toscaElementVertex.getUniqueId(), status);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.CALCULATED_CAP_PROPERTIES);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.CALCULATED_CAP_PROPERTIES);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate calculated capabiliites properties for {} error {}", toscaElementVertex.getUniqueId(), status);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.CALCULATED_REQUIREMENTS);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.CALCULATED_REQUIREMENTS);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate calculated requirements for {} error {}", toscaElementVertex.getUniqueId(), status);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.FULLFILLED_REQUIREMENTS);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.FULLFILLED_REQUIREMENTS);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate full filled requirements for {} error {}", toscaElementVertex.getUniqueId(), status);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.INST_DEPLOYMENT_ARTIFACTS);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.INST_DEPLOYMENT_ARTIFACTS);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate instance artifacts for {} error {}", toscaElementVertex.getUniqueId(), status);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.SERVICE_API_ARTIFACTS);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.SERVICE_API_ARTIFACTS);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate service api artifacts for {} error {}", toscaElementVertex.getUniqueId(), status);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.FORWARDING_PATH);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.FORWARDING_PATH);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate service api artifacts for {} error {}", toscaElementVertex.getUniqueId(), status);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.INTERFACE);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.INTERFACE);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate interfaces for {} error {}", toscaElementVertex.getUniqueId(), status);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.INSTANCE_ARTIFACTS);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.INSTANCE_ARTIFACTS);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate instance artifact for {} error {}", toscaElementVertex.getUniqueId(), status);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
 
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT,
+        status = janusGraphDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT,
                 EdgeLabelEnum.REQUIREMENTS);
-        if (status != TitanOperationStatus.OK) {
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate requirements for {} error {}",
                     toscaElementVertex.getUniqueId(), status);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT,
+        status = janusGraphDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT,
                 EdgeLabelEnum.CAPABILITIES);
-        if (status != TitanOperationStatus.OK) {
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate capabilities for {} error {}",
                     toscaElementVertex.getUniqueId(), status);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.INST_INTERFACES);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.INST_INTERFACES);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disassociate instances interfaces for {} error {}", toscaElementVertex.getUniqueId(), status);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
         toscaElementVertex.getVertex().remove();
         log.trace("Tosca element vertex for {} was removed", toscaElementVertex.getUniqueId());
@@ -1284,7 +1283,7 @@ public class TopologyTemplateOperation extends ToscaElementOperation {
     }
 
     @Override
-    protected <T extends ToscaElement> TitanOperationStatus setCategoriesFromGraph(GraphVertex vertexComponent, T toscaElement) {
+    protected <T extends ToscaElement> JanusGraphOperationStatus setCategoriesFromGraph(GraphVertex vertexComponent, T toscaElement) {
         return setTopologyTempalteCategoriesFromGraph(vertexComponent, toscaElement);
     }
 
@@ -1316,10 +1315,10 @@ public class TopologyTemplateOperation extends ToscaElementOperation {
         List<CategoryDefinition> newCategoryList = toscaElementToUpdate.getCategories();
         CategoryDefinition newCategory = newCategoryList.get(0);
 
-        Either<GraphVertex, TitanOperationStatus> childVertex = titanDao.getChildVertex(elementV, EdgeLabelEnum.CATEGORY, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> childVertex = janusGraphDao.getChildVertex(elementV, EdgeLabelEnum.CATEGORY, JsonParseFlagEnum.NoParse);
         if (childVertex.isRight()) {
             log.debug("failed to fetch {} for tosca element with id {}, error {}", EdgeLabelEnum.CATEGORY, elementV.getUniqueId(), childVertex.right().value());
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(childVertex.right().value());
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(childVertex.right().value());
         }
 
         GraphVertex categoryV = childVertex.left().value();
@@ -1345,21 +1344,21 @@ public class TopologyTemplateOperation extends ToscaElementOperation {
 
         Either<GraphVertex, StorageOperationStatus> result = null;
         String userId = user.getUserId();
-        Either<GraphVertex, TitanOperationStatus> getRes = findUserVertex(userId);
+        Either<GraphVertex, JanusGraphOperationStatus> getRes = findUserVertex(userId);
         GraphVertex userVertex = null;
         GraphVertex serviceVertex = null;
         if (getRes.isRight()) {
-            TitanOperationStatus status = getRes.right().value();
+            JanusGraphOperationStatus status = getRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Cannot find user {} in the graph. status is {}", userId, status);
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
         if (result == null) {
             userVertex = getRes.left().value();
-            getRes = titanDao.getVertexById(uniqueId, JsonParseFlagEnum.ParseMetadata);
+            getRes = janusGraphDao.getVertexById(uniqueId, JsonParseFlagEnum.ParseMetadata);
             if (getRes.isRight()) {
-                TitanOperationStatus status = getRes.right().value();
+                JanusGraphOperationStatus status = getRes.right().value();
                 log.debug("Cannot find service {} in the graph. status is {}", uniqueId, status);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
         if (result == null) {
@@ -1371,19 +1370,19 @@ public class TopologyTemplateOperation extends ToscaElementOperation {
             }
         }
         if (result == null) {
-            TitanOperationStatus status = titanDao.createEdge(userVertex, serviceVertex, EdgeLabelEnum.LAST_DISTRIBUTION_STATE_MODIFIER, null);
-            if (status != TitanOperationStatus.OK) {
+            JanusGraphOperationStatus status = janusGraphDao.createEdge(userVertex, serviceVertex, EdgeLabelEnum.LAST_DISTRIBUTION_STATE_MODIFIER, null);
+            if (status != JanusGraphOperationStatus.OK) {
                 log.debug("Failed to associate user {} to component {}. Edge type is {}", userId, uniqueId, EdgeLabelEnum.LAST_DISTRIBUTION_STATE_MODIFIER);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
         if (result == null) {
             serviceVertex.addMetadataProperty(GraphPropertyEnum.DISTRIBUTION_STATUS, distributionStatus.name());
             long lastUpdateDate = System.currentTimeMillis();
             serviceVertex.setJsonMetadataField(JsonPresentationFields.LAST_UPDATE_DATE, lastUpdateDate);
-            Either<GraphVertex, TitanOperationStatus> updateRes = titanDao.updateVertex(serviceVertex);
+            Either<GraphVertex, JanusGraphOperationStatus> updateRes = janusGraphDao.updateVertex(serviceVertex);
             if (updateRes.isRight()) {
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(updateRes.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(updateRes.right().value()));
             }
         }
         if (result == null) {
@@ -1411,9 +1410,9 @@ public class TopologyTemplateOperation extends ToscaElementOperation {
             result = Either.right(componentByLabelAndId.right().value());
         }
         if (componentByLabelAndId.isLeft()) {
-            Either<Map<String, MapCapabilityProperty>, TitanOperationStatus> getDataRes = getDataFromGraph(componentByLabelAndId.left().value(), EdgeLabelEnum.CALCULATED_CAP_PROPERTIES);
+            Either<Map<String, MapCapabilityProperty>, JanusGraphOperationStatus> getDataRes = getDataFromGraph(componentByLabelAndId.left().value(), EdgeLabelEnum.CALCULATED_CAP_PROPERTIES);
             if (getDataRes.isRight()) {
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getDataRes.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getDataRes.right().value()));
             } else {
                 mapPropertiesDataDefinition = getDataRes.left().value();
             }
@@ -1517,7 +1516,7 @@ public class TopologyTemplateOperation extends ToscaElementOperation {
 
     void revertNamesOfCalculatedCapabilitiesRequirements(String componentId, TopologyTemplate toscaElement) {
         if (MapUtils.isNotEmpty(toscaElement.getComponentInstances()) || MapUtils.isNotEmpty(toscaElement.getGroups())) {
-            GraphVertex toscaElementV = titanDao.getVertexById(componentId, JsonParseFlagEnum.NoParse)
+            GraphVertex toscaElementV = janusGraphDao.getVertexById(componentId, JsonParseFlagEnum.NoParse)
                     .left()
                     .on(this::throwStorageException);
             if (MapUtils.isNotEmpty(toscaElement.getComponentInstances())) {
@@ -1534,7 +1533,7 @@ public class TopologyTemplateOperation extends ToscaElementOperation {
 
     public void updateNamesOfCalculatedCapabilitiesRequirements(String componentId, TopologyTemplate toscaElement) {
         if (MapUtils.isNotEmpty(toscaElement.getComponentInstances()) || MapUtils.isNotEmpty(toscaElement.getGroups())) {
-            GraphVertex toscaElementV = titanDao.getVertexById(componentId, JsonParseFlagEnum.NoParse)
+            GraphVertex toscaElementV = janusGraphDao.getVertexById(componentId, JsonParseFlagEnum.NoParse)
                     .left()
                     .on(this::throwStorageException);
             if (MapUtils.isNotEmpty(toscaElement.getComponentInstances())) {
@@ -1583,7 +1582,7 @@ public class TopologyTemplateOperation extends ToscaElementOperation {
         return filter;
     }
     public void updateCapReqPropertiesOwnerId(String componentId, TopologyTemplate toscaElement) {
-        GraphVertex toscaElementV = titanDao.getVertexById(componentId, JsonParseFlagEnum.NoParse)
+        GraphVertex toscaElementV = janusGraphDao.getVertexById(componentId, JsonParseFlagEnum.NoParse)
                 .left().on(this::throwStorageException);
         updateCapOwnerId(toscaElement, componentId);
         updateReqOwnerId(toscaElement, componentId);
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaDataOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaDataOperation.java
index 0abc0111bf..1501b79ca5 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaDataOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaDataOperation.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 @org.springframework.stereotype.Component("tosca-data-operation")
 public class ToscaDataOperation extends BaseOperation {
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementLifecycleOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementLifecycleOperation.java
index afad869bb1..771620d758 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementLifecycleOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementLifecycleOperation.java
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
@@ -30,6 +30,7 @@ import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.openecomp.sdc.be.config.ConfigurationManager;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgePropertyEnum;
@@ -38,21 +39,19 @@ import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
 import org.openecomp.sdc.be.dao.jsongraph.utils.IdBuilderUtils;
 import org.openecomp.sdc.be.dao.jsongraph.utils.JsonParserUtils;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.*;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum;
 import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.datatypes.enums.OriginTypeEnum;
 import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
-import org.openecomp.sdc.be.model.ComponentParametersView;
 import org.openecomp.sdc.be.model.DistributionStatusEnum;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.TopologyTemplate;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElementTypeEnum;
-import org.openecomp.sdc.be.model.jsontitan.enums.JsonConstantKeysEnum;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElementTypeEnum;
+import org.openecomp.sdc.be.model.jsonjanusgraph.enums.JsonConstantKeysEnum;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
@@ -92,10 +91,11 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
         Map<String, GraphVertex> vertices = null;
         ToscaElementOperation operation;
         try {
-            Either<Map<String, GraphVertex>, TitanOperationStatus> getVerticesRes = titanDao.getVerticesByUniqueIdAndParseFlag(prepareParametersToGetVerticesForCheckin(toscaElementId, modifierId, ownerId));
+            Either<Map<String, GraphVertex>, JanusGraphOperationStatus> getVerticesRes = janusGraphDao
+                .getVerticesByUniqueIdAndParseFlag(prepareParametersToGetVerticesForCheckin(toscaElementId, modifierId, ownerId));
             if (getVerticesRes.isRight()) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_VERTICES, toscaElementId);
-                updateResult = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVerticesRes.right().value()));
+                updateResult = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVerticesRes.right().value()));
             } else {
                 vertices = getVerticesRes.left().value();
                 updateResult = checkinToscaELement(currState, vertices.get(toscaElementId), vertices.get(ownerId), vertices.get(modifierId), LifecycleStateEnum.NOT_CERTIFIED_CHECKIN);
@@ -124,9 +124,10 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
     public Either<User, StorageOperationStatus> getToscaElementOwner(String toscaElementId) {
         Either<User, StorageOperationStatus> result = null;
         GraphVertex toscaElement = null;
-        Either<GraphVertex, TitanOperationStatus> getToscaElementRes = titanDao.getVertexById(toscaElementId, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> getToscaElementRes = janusGraphDao
+            .getVertexById(toscaElementId, JsonParseFlagEnum.NoParse);
         if (getToscaElementRes.isRight()) {
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getToscaElementRes.right().value()));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getToscaElementRes.right().value()));
         }
         if (result == null) {
             toscaElement = getToscaElementRes.left().value();
@@ -169,10 +170,11 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
         Either<ToscaElement, StorageOperationStatus> result = null;
         Map<String, GraphVertex> vertices = null;
         try {
-            Either<Map<String, GraphVertex>, TitanOperationStatus> getVerticesRes = titanDao.getVerticesByUniqueIdAndParseFlag(prepareParametersToGetVerticesForCheckout(toscaElementId, modifierId, ownerId));
+            Either<Map<String, GraphVertex>, JanusGraphOperationStatus> getVerticesRes = janusGraphDao
+                .getVerticesByUniqueIdAndParseFlag(prepareParametersToGetVerticesForCheckout(toscaElementId, modifierId, ownerId));
             if (getVerticesRes.isRight()) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_VERTICES, toscaElementId);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVerticesRes.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVerticesRes.right().value()));
             }
             if (result == null) {
                 vertices = getVerticesRes.left().value();
@@ -204,15 +206,15 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
      */
     public Either<ToscaElement, StorageOperationStatus> undoCheckout(String toscaElementId) {
         Either<ToscaElement, StorageOperationStatus> result = null;
-        Either<GraphVertex, TitanOperationStatus> getToscaElementRes = null;
+        Either<GraphVertex, JanusGraphOperationStatus> getToscaElementRes = null;
         Iterator<Edge> nextVersionComponentIter = null;
         ToscaElementOperation operation;
         Vertex preVersionVertex = null;
         try {
-            getToscaElementRes = titanDao.getVertexById(toscaElementId, JsonParseFlagEnum.ParseMetadata);
+            getToscaElementRes = janusGraphDao.getVertexById(toscaElementId, JsonParseFlagEnum.ParseMetadata);
             if (getToscaElementRes.isRight()) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_VERTICES, toscaElementId);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getToscaElementRes.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getToscaElementRes.right().value()));
             }
             GraphVertex currVersionV = getToscaElementRes.left().value();
             if (result == null && hasPreviousVersion(currVersionV)) {
@@ -231,7 +233,7 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
                 }
             }
             if (result == null) {
-                StorageOperationStatus updateCatalogRes = updateEdgeToCatalogRootByUndoCheckout((TitanVertex) preVersionVertex, currVersionV);
+                StorageOperationStatus updateCatalogRes = updateEdgeToCatalogRootByUndoCheckout((JanusGraphVertex) preVersionVertex, currVersionV);
                 if (updateCatalogRes != StorageOperationStatus.OK) {
                     return Either.right(updateCatalogRes);
                 }
@@ -267,10 +269,11 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
         GraphVertex modifier = null;
         GraphVertex owner;
         try {
-            Either<Map<String, GraphVertex>, TitanOperationStatus> getVerticesRes = titanDao.getVerticesByUniqueIdAndParseFlag(prepareParametersToGetVerticesForRequestCertification(toscaElementId, modifierId, ownerId));
+            Either<Map<String, GraphVertex>, JanusGraphOperationStatus> getVerticesRes = janusGraphDao
+                .getVerticesByUniqueIdAndParseFlag(prepareParametersToGetVerticesForRequestCertification(toscaElementId, modifierId, ownerId));
             if (getVerticesRes.isRight()) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_VERTICES, toscaElementId);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVerticesRes.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVerticesRes.right().value()));
             }
             if (result == null) {
                 toscaElement = getVerticesRes.left().value().get(toscaElementId);
@@ -321,10 +324,11 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
         GraphVertex modifier = null;
         GraphVertex owner;
         try {
-            Either<Map<String, GraphVertex>, TitanOperationStatus> getVerticesRes = titanDao.getVerticesByUniqueIdAndParseFlag(prepareParametersToGetVerticesForRequestCertification(toscaElementId, modifierId, ownerId));
+            Either<Map<String, GraphVertex>, JanusGraphOperationStatus> getVerticesRes = janusGraphDao
+                .getVerticesByUniqueIdAndParseFlag(prepareParametersToGetVerticesForRequestCertification(toscaElementId, modifierId, ownerId));
             if (getVerticesRes.isRight()) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_VERTICES, toscaElementId);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVerticesRes.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVerticesRes.right().value()));
             }
             if (result == null) {
                 toscaElement = getVerticesRes.left().value().get(toscaElementId);
@@ -368,10 +372,11 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
 
         StorageOperationStatus status;
         try {
-            Either<Map<String, GraphVertex>, TitanOperationStatus> getVerticesRes = titanDao.getVerticesByUniqueIdAndParseFlag(prepareParametersToGetVerticesForRequestCertification(toscaElementId, modifierId, ownerId));
+            Either<Map<String, GraphVertex>, JanusGraphOperationStatus> getVerticesRes = janusGraphDao
+                .getVerticesByUniqueIdAndParseFlag(prepareParametersToGetVerticesForRequestCertification(toscaElementId, modifierId, ownerId));
             if (getVerticesRes.isRight()) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_VERTICES, toscaElementId);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVerticesRes.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVerticesRes.right().value()));
             }
             if (result == null) {
                 toscaElement = getVerticesRes.left().value().get(toscaElementId);
@@ -423,9 +428,10 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
             Map<GraphPropertyEnum, Object> properties = new EnumMap<>(GraphPropertyEnum.class);
             properties.put(GraphPropertyEnum.UUID, uuid);
             properties.put(GraphPropertyEnum.NAME, componentName);
-            Either<List<GraphVertex>, TitanOperationStatus> getToscaElementsRes = titanDao.getByCriteria(vertexType, properties, JsonParseFlagEnum.ParseMetadata);
+            Either<List<GraphVertex>, JanusGraphOperationStatus> getToscaElementsRes = janusGraphDao
+                .getByCriteria(vertexType, properties, JsonParseFlagEnum.ParseMetadata);
             if (getToscaElementsRes.isRight()) {
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getToscaElementsRes.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getToscaElementsRes.right().value()));
             }
             if (result == null) {
                 result = markToscaElementsAsDeleted(operation, getToscaElementsRes.left().value());
@@ -455,10 +461,11 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
         GraphVertex toscaElement = null;
         GraphVertex modifier = null;
         try {
-            Either<Map<String, GraphVertex>, TitanOperationStatus> getVerticesRes = titanDao.getVerticesByUniqueIdAndParseFlag(prepareParametersToGetVerticesForRequestCertification(toscaElementId, modifierId, ownerId));
+            Either<Map<String, GraphVertex>, JanusGraphOperationStatus> getVerticesRes = janusGraphDao
+                .getVerticesByUniqueIdAndParseFlag(prepareParametersToGetVerticesForRequestCertification(toscaElementId, modifierId, ownerId));
             if (getVerticesRes.isRight()) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_VERTICES, toscaElementId);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVerticesRes.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVerticesRes.right().value()));
             }
             if (result == null) {
                 toscaElement = getVerticesRes.left().value().get(toscaElementId);
@@ -468,10 +475,10 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
                 toscaElement.setJsonMetadataField(JsonPresentationFields.USER_ID_LAST_UPDATER, modifier.getUniqueId());
                 toscaElement.addMetadataProperty(GraphPropertyEnum.STATE, nextState.name());
 
-                Either<GraphVertex, TitanOperationStatus> updateVertexRes = titanDao.updateVertex(toscaElement);
+                Either<GraphVertex, JanusGraphOperationStatus> updateVertexRes = janusGraphDao.updateVertex(toscaElement);
                 if (updateVertexRes.isRight()) {
                     CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to update vertex {} . Status is {}. ", toscaElementId, updateVertexRes.right().value());
-                    result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(updateVertexRes.right().value()));
+                    result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(updateVertexRes.right().value()));
                 }
             }
             if (result == null) {
@@ -497,7 +504,7 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
         return result;
     }
 
-    public Either<GraphVertex, TitanOperationStatus> findUser(String userId) {
+    public Either<GraphVertex, JanusGraphOperationStatus> findUser(String userId) {
         return findUserVertex(userId);
     }
 
@@ -528,18 +535,20 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
             result = StorageOperationStatus.NOT_FOUND;
         }
         if (result == null) {
-            TitanOperationStatus createVersionEdgeStatus = titanDao.createEdge(toscaElement, certifiedToscaElement, EdgeLabelEnum.VERSION, new HashMap<>());
-            if (createVersionEdgeStatus != TitanOperationStatus.OK) {
+            JanusGraphOperationStatus
+                createVersionEdgeStatus = janusGraphDao
+                .createEdge(toscaElement, certifiedToscaElement, EdgeLabelEnum.VERSION, new HashMap<>());
+            if (createVersionEdgeStatus != JanusGraphOperationStatus.OK) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to create version edge from last element {} to new certified element {}. status=", toscaElement.getUniqueId(), certifiedToscaElement.getUniqueId(),
                         createVersionEdgeStatus);
-                result = DaoStatusConverter.convertTitanStatusToStorageStatus(createVersionEdgeStatus);
+                result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(createVersionEdgeStatus);
             }
         }
         if (result == null) {
         	if (certReqUserEdgeIter!=null) {
 	            while (certReqUserEdgeIter.hasNext()) {
 	                Edge edge = certReqUserEdgeIter.next();
-	                if (((String) titanDao.getProperty(edge, EdgePropertyEnum.STATE)).equals(LifecycleStateEnum.READY_FOR_CERTIFICATION.name())) {
+	                if (((String) janusGraphDao.getProperty(edge, EdgePropertyEnum.STATE)).equals(LifecycleStateEnum.READY_FOR_CERTIFICATION.name())) {
 	                    foundEdge = edge;
 	                    break;
 	                }
@@ -552,10 +561,12 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
             }
         }
         if (result == null) {
-            TitanOperationStatus createEdgeRes = titanDao.createEdge(foundEdge.outVertex(), certifiedToscaElement.getVertex(), EdgeLabelEnum.LAST_STATE, foundEdge);
-            if (createEdgeRes != TitanOperationStatus.OK) {
+            JanusGraphOperationStatus
+                createEdgeRes = janusGraphDao
+                .createEdge(foundEdge.outVertex(), certifiedToscaElement.getVertex(), EdgeLabelEnum.LAST_STATE, foundEdge);
+            if (createEdgeRes != JanusGraphOperationStatus.OK) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to create rfc relation for component {}. status=", certifiedToscaElement.getUniqueId(), createEdgeRes);
-                result = DaoStatusConverter.convertTitanStatusToStorageStatus(createEdgeRes);
+                result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(createEdgeRes);
             }
         }
         if (result == null) {
@@ -566,7 +577,7 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
 
     private StorageOperationStatus handleRelationsUponFailCertification(GraphVertex toscaElement, LifecycleStateEnum nextState) {
         StorageOperationStatus result = null;
-        TitanOperationStatus status = null;
+        JanusGraphOperationStatus status = null;
         Edge originEdge;
         Vertex user = null;
         if (nextState == LifecycleStateEnum.NOT_CERTIFIED_CHECKIN) {
@@ -575,7 +586,8 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
             Map<GraphPropertyEnum, Object> properties = new EnumMap<>(GraphPropertyEnum.class);
             properties.put(GraphPropertyEnum.STATE, LifecycleStateEnum.CERTIFICATION_IN_PROGRESS);
 
-            Either<Edge, TitanOperationStatus> deleteResult = titanDao.deleteBelongingEdgeByCriteria(toscaElement, EdgeLabelEnum.STATE, properties);
+            Either<Edge, JanusGraphOperationStatus> deleteResult = janusGraphDao
+                .deleteBelongingEdgeByCriteria(toscaElement, EdgeLabelEnum.STATE, properties);
             if (deleteResult.isRight()) {
                 status = deleteResult.right().value();
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to delete state edge. Status is {}. ", status);
@@ -584,7 +596,8 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
             if (result == null) {
                 // delete relation READY_FOR_CERTIFICATION
                 properties.put(GraphPropertyEnum.STATE, LifecycleStateEnum.READY_FOR_CERTIFICATION);
-                deleteResult = titanDao.deleteBelongingEdgeByCriteria(toscaElement, EdgeLabelEnum.LAST_STATE, properties);
+                deleteResult = janusGraphDao
+                    .deleteBelongingEdgeByCriteria(toscaElement, EdgeLabelEnum.LAST_STATE, properties);
                 if (deleteResult.isRight()) {
                     status = deleteResult.right().value();
                     CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_DELETE_LAST_STATE_EDGE_STATUS_IS, status);
@@ -594,7 +607,8 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
             if (result == null) {
                 // delete relation NOT_CERTIFIED_CHECKIN (in order to change to STATE)
                 properties.put(GraphPropertyEnum.STATE, LifecycleStateEnum.NOT_CERTIFIED_CHECKIN);
-                deleteResult = titanDao.deleteBelongingEdgeByCriteria(toscaElement, EdgeLabelEnum.LAST_STATE, properties);
+                deleteResult = janusGraphDao
+                    .deleteBelongingEdgeByCriteria(toscaElement, EdgeLabelEnum.LAST_STATE, properties);
                 if (deleteResult.isRight()) {
                     status = deleteResult.right().value();
                     CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_DELETE_LAST_STATE_EDGE_STATUS_IS, status);
@@ -605,16 +619,18 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
                 // create new STATE relation NOT_CERTIFIED_CHECKIN
                 originEdge = deleteResult.left().value();
                 user = originEdge.outVertex();
-                status = titanDao.createEdge(user, toscaElement.getVertex(), EdgeLabelEnum.STATE, originEdge);
-                if (status != TitanOperationStatus.OK) {
+                status = janusGraphDao
+                    .createEdge(user, toscaElement.getVertex(), EdgeLabelEnum.STATE, originEdge);
+                if (status != JanusGraphOperationStatus.OK) {
                     CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to create state edge. Status is {}. ", status);
                     result = StorageOperationStatus.INCONSISTENCY;
                 }
             }
             if (result == null) {
                 // delete relation LAST_MODIFIER (in order to change tester to designer)
-                deleteResult = titanDao.deleteBelongingEdgeByCriteria(toscaElement, EdgeLabelEnum.LAST_MODIFIER, new HashMap<>());
-                if (status != TitanOperationStatus.OK) {
+                deleteResult = janusGraphDao
+                    .deleteBelongingEdgeByCriteria(toscaElement, EdgeLabelEnum.LAST_MODIFIER, new HashMap<>());
+                if (status != JanusGraphOperationStatus.OK) {
                     CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to create last modifier edge. Status is {}. ", status);
                     result = StorageOperationStatus.INCONSISTENCY;
                 }
@@ -622,8 +638,8 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
             if (result == null) {
                 // create new LAST_MODIFIER relation
                 originEdge = deleteResult.left().value();
-                status = titanDao.createEdge(user, toscaElement.getVertex(), EdgeLabelEnum.LAST_MODIFIER, originEdge);
-                if (status != TitanOperationStatus.OK) {
+                status = janusGraphDao.createEdge(user, toscaElement.getVertex(), EdgeLabelEnum.LAST_MODIFIER, originEdge);
+                if (status != JanusGraphOperationStatus.OK) {
                     CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to create last modifier edge. Status is {}. ", status);
                     result = StorageOperationStatus.INCONSISTENCY;
                 }
@@ -642,7 +658,8 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
             // delete relation CERTIFICATION_IN_PROGRESS
             Map<GraphPropertyEnum, Object> properties = new EnumMap<>(GraphPropertyEnum.class);
             properties.put(GraphPropertyEnum.STATE, LifecycleStateEnum.CERTIFICATION_IN_PROGRESS);
-            Either<Edge, TitanOperationStatus> deleteResult = titanDao.deleteBelongingEdgeByCriteria(toscaElement, EdgeLabelEnum.STATE, properties);
+            Either<Edge, JanusGraphOperationStatus> deleteResult = janusGraphDao
+                .deleteBelongingEdgeByCriteria(toscaElement, EdgeLabelEnum.STATE, properties);
 
             if (deleteResult.isRight()) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to delete state edge. Status is  {}. ", deleteResult.right().value());
@@ -651,7 +668,8 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
             if (result == null) {
                 // delete relation READY_FOR_CERTIFICATION (LAST_STATE)
                 properties.put(GraphPropertyEnum.STATE, nextState);
-                deleteResult = titanDao.deleteBelongingEdgeByCriteria(toscaElement, EdgeLabelEnum.LAST_STATE, properties);
+                deleteResult = janusGraphDao
+                    .deleteBelongingEdgeByCriteria(toscaElement, EdgeLabelEnum.LAST_STATE, properties);
 
                 if (deleteResult.isRight()) {
                     CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_DELETE_LAST_STATE_EDGE_STATUS_IS, deleteResult.right().value());
@@ -661,8 +679,10 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
             if (result == null) {
                 // create relation READY_FOR_CERTIFICATION (STATE)
                 originEdge = deleteResult.left().value();
-                TitanOperationStatus status = titanDao.createEdge(originEdge.outVertex(), toscaElement.getVertex(), EdgeLabelEnum.STATE, originEdge);
-                if (status != TitanOperationStatus.OK) {
+                JanusGraphOperationStatus
+                    status = janusGraphDao
+                    .createEdge(originEdge.outVertex(), toscaElement.getVertex(), EdgeLabelEnum.STATE, originEdge);
+                if (status != JanusGraphOperationStatus.OK) {
                     CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to create state edge. Status is {}. ", status);
                     result = StorageOperationStatus.INCONSISTENCY;
                 }
@@ -686,15 +706,17 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
                 Vertex lastCertifiedVertex = findRes.left().value();
                 Map<GraphPropertyEnum, Object> properties = new EnumMap<>(GraphPropertyEnum.class);
                 properties.put(GraphPropertyEnum.IS_HIGHEST_VERSION, false);
-                TitanOperationStatus status = titanDao.updateVertexMetadataPropertiesWithJson(lastCertifiedVertex, properties);
-                if (status != TitanOperationStatus.OK) {
+                JanusGraphOperationStatus status = janusGraphDao
+                    .updateVertexMetadataPropertiesWithJson(lastCertifiedVertex, properties);
+                if (status != JanusGraphOperationStatus.OK) {
                     CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to set highest version  of tosca element {} to [{}]. Status is {}", toscaElement.getUniqueId(), false, status);
-                    result = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+                    result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
                 }
                 // remove previous certified version from the catalog
                 GraphVertex lastCertifiedV = new GraphVertex();
-                lastCertifiedV.setVertex((TitanVertex) lastCertifiedVertex);
-                lastCertifiedV.setUniqueId((String) titanDao.getProperty((TitanVertex) lastCertifiedVertex, GraphPropertyEnum.UNIQUE_ID.getProperty()));
+                lastCertifiedV.setVertex((JanusGraphVertex) lastCertifiedVertex);
+                lastCertifiedV.setUniqueId((String) janusGraphDao
+                    .getProperty((JanusGraphVertex) lastCertifiedVertex, GraphPropertyEnum.UNIQUE_ID.getProperty()));
                 StorageOperationStatus res = updateEdgeToCatalogRoot(null, lastCertifiedV);
                 if (res != StorageOperationStatus.OK) {
                     return res;
@@ -708,41 +730,45 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
     }
 
     private StorageOperationStatus handleRelationsUponRequestForCertification(GraphVertex toscaElement, GraphVertex modifier, GraphVertex owner) {
-        TitanOperationStatus status;
+        JanusGraphOperationStatus status;
         StorageOperationStatus result = null;
 
         if (((String) toscaElement.getMetadataProperty(GraphPropertyEnum.STATE)).equals(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.name())) {
             // remove CHECKOUT relation
-            Either<Edge, TitanOperationStatus> deleteRes = titanDao.deleteEdge(owner, toscaElement, EdgeLabelEnum.STATE);
+            Either<Edge, JanusGraphOperationStatus> deleteRes = janusGraphDao
+                .deleteEdge(owner, toscaElement, EdgeLabelEnum.STATE);
             if (deleteRes.isRight()) {
                 status = deleteRes.right().value();
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to delete edge. Status is {}. ", status);
-                result = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+                result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
             }
             if (result == null) {
                 // create CHECKIN relation
                 Map<EdgePropertyEnum, Object> properties = new EnumMap<>(EdgePropertyEnum.class);
                 properties.put(EdgePropertyEnum.STATE, LifecycleStateEnum.NOT_CERTIFIED_CHECKIN);
-                status = titanDao.createEdge(modifier.getVertex(), toscaElement.getVertex(), EdgeLabelEnum.LAST_STATE, properties);
-                if (status != TitanOperationStatus.OK) {
+                status = janusGraphDao
+                    .createEdge(modifier.getVertex(), toscaElement.getVertex(), EdgeLabelEnum.LAST_STATE, properties);
+                if (status != JanusGraphOperationStatus.OK) {
                     CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to create edge. Status is {}", status);
-                    result = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+                    result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
                 }
             }
         } else {
-            status = titanDao.replaceEdgeLabel(owner.getVertex(), toscaElement.getVertex(), EdgeLabelEnum.STATE, EdgeLabelEnum.LAST_STATE);
-            if (status != TitanOperationStatus.OK) {
-                result = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+            status = janusGraphDao
+                .replaceEdgeLabel(owner.getVertex(), toscaElement.getVertex(), EdgeLabelEnum.STATE, EdgeLabelEnum.LAST_STATE);
+            if (status != JanusGraphOperationStatus.OK) {
+                result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
             }
         }
         if (result == null) {
             // create RFC relation
             Map<EdgePropertyEnum, Object> properties = new EnumMap<>(EdgePropertyEnum.class);
             properties.put(EdgePropertyEnum.STATE, LifecycleStateEnum.READY_FOR_CERTIFICATION);
-            status = titanDao.createEdge(modifier.getVertex(), toscaElement.getVertex(), EdgeLabelEnum.STATE, properties);
-            if (status != TitanOperationStatus.OK) {
+            status = janusGraphDao
+                .createEdge(modifier.getVertex(), toscaElement.getVertex(), EdgeLabelEnum.STATE, properties);
+            if (status != JanusGraphOperationStatus.OK) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to create edge. Status is {}", status);
-                result = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+                result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
             }
         }
         if (result == null) {
@@ -754,17 +780,19 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
     private StorageOperationStatus handleRelationsUponCertification(GraphVertex toscaElement, GraphVertex modifier, GraphVertex owner) {
 
         StorageOperationStatus result = null;
-        TitanOperationStatus status = titanDao.replaceEdgeLabel(owner.getVertex(), toscaElement.getVertex(), EdgeLabelEnum.STATE, EdgeLabelEnum.LAST_STATE);
-        if (status != TitanOperationStatus.OK) {
-            result = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+        JanusGraphOperationStatus status = janusGraphDao
+            .replaceEdgeLabel(owner.getVertex(), toscaElement.getVertex(), EdgeLabelEnum.STATE, EdgeLabelEnum.LAST_STATE);
+        if (status != JanusGraphOperationStatus.OK) {
+            result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
         }
         if (result == null) {
             Map<EdgePropertyEnum, Object> properties = new EnumMap<>(EdgePropertyEnum.class);
             properties.put(EdgePropertyEnum.STATE, LifecycleStateEnum.CERTIFICATION_IN_PROGRESS);
-            status = titanDao.createEdge(modifier, toscaElement, EdgeLabelEnum.STATE, properties);
-            if (status != TitanOperationStatus.OK) {
+            status = janusGraphDao
+                .createEdge(modifier, toscaElement, EdgeLabelEnum.STATE, properties);
+            if (status != JanusGraphOperationStatus.OK) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "failed to create edge. Status is {}", status);
-                result = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+                result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
             }
         }
         if (result == null) {
@@ -816,7 +844,7 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
                 jsonMetadataMap.put(GraphPropertyEnum.IS_HIGHEST_VERSION.getProperty(), true);
                 propertiesToUpdate.put(GraphPropertyEnum.METADATA.getProperty(), JsonParserUtils.toJson(jsonMetadataMap));
 
-                titanDao.setVertexProperties(previousVersionToscaElement, propertiesToUpdate);
+                janusGraphDao.setVertexProperties(previousVersionToscaElement, propertiesToUpdate);
 
                 Iterator<Edge> edgesIter = previousVersionToscaElement.edges(Direction.IN, EdgeLabelEnum.LAST_STATE.name());
                 if (!edgesIter.hasNext()) {
@@ -825,12 +853,13 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
                 } else {
                     Edge lastStateEdge = edgesIter.next();
                     Vertex lastModifier = lastStateEdge.outVertex();
-                    TitanOperationStatus replaceRes = titanDao.replaceEdgeLabel(lastModifier, previousVersionToscaElement, lastStateEdge, EdgeLabelEnum.LAST_STATE, EdgeLabelEnum.STATE);
-                    if (replaceRes != TitanOperationStatus.OK) {
+                    JanusGraphOperationStatus replaceRes = janusGraphDao
+                        .replaceEdgeLabel(lastModifier, previousVersionToscaElement, lastStateEdge, EdgeLabelEnum.LAST_STATE, EdgeLabelEnum.STATE);
+                    if (replaceRes != JanusGraphOperationStatus.OK) {
                         CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to replace label from {} to {}. status = {}", EdgeLabelEnum.LAST_STATE, EdgeLabelEnum.STATE, replaceRes);
                         result = StorageOperationStatus.INCONSISTENCY;
-                        if (replaceRes != TitanOperationStatus.INVALID_ID) {
-                            result = DaoStatusConverter.convertTitanStatusToStorageStatus(replaceRes);
+                        if (replaceRes != JanusGraphOperationStatus.INVALID_ID) {
+                            result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(replaceRes);
                         }
                     }
 
@@ -848,31 +877,34 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
         String toscaElementId = toscaElementVertex.getUniqueId();
         if (!toscaElementVertex.getMetadataProperty(GraphPropertyEnum.STATE).equals(LifecycleStateEnum.CERTIFIED.name())) {
             toscaElementVertex.addMetadataProperty(GraphPropertyEnum.IS_HIGHEST_VERSION, false);
-            Either<GraphVertex, TitanOperationStatus> updateVertexRes = titanDao.updateVertex(toscaElementVertex);
+            Either<GraphVertex, JanusGraphOperationStatus> updateVertexRes = janusGraphDao.updateVertex(toscaElementVertex);
             if (updateVertexRes.isRight()) {
-                TitanOperationStatus titatStatus = updateVertexRes.right().value();
+                JanusGraphOperationStatus titatStatus = updateVertexRes.right().value();
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to update tosca element vertex {}. Status is  {}", toscaElementVertex.getUniqueId(), titatStatus);
-                result = DaoStatusConverter.convertTitanStatusToStorageStatus(titatStatus);
+                result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(titatStatus);
             }
-            Either<Edge, TitanOperationStatus> deleteEdgeRes = null;
+            Either<Edge, JanusGraphOperationStatus> deleteEdgeRes = null;
             if (result == null) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.TRACE, "Going to replace edge with label {} to label {} from {} to {}. ", EdgeLabelEnum.STATE, EdgeLabelEnum.LAST_STATE, ownerId, toscaElementId);
 
-                deleteEdgeRes = titanDao.deleteEdge(ownerVertex, toscaElementVertex, EdgeLabelEnum.STATE);
+                deleteEdgeRes = janusGraphDao
+                    .deleteEdge(ownerVertex, toscaElementVertex, EdgeLabelEnum.STATE);
                 if (deleteEdgeRes.isRight()) {
-                    TitanOperationStatus titanStatus = deleteEdgeRes.right().value();
-                    CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to delete edge with label {} from {} to {}. Status is {} ", EdgeLabelEnum.STATE, EdgeLabelEnum.LAST_STATE, ownerId, toscaElementId, titanStatus);
-                    if (!titanStatus.equals(TitanOperationStatus.INVALID_ID)) {
-                        result = DaoStatusConverter.convertTitanStatusToStorageStatus(titanStatus);
+                    JanusGraphOperationStatus janusGraphStatus = deleteEdgeRes.right().value();
+                    CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to delete edge with label {} from {} to {}. Status is {} ", EdgeLabelEnum.STATE, EdgeLabelEnum.LAST_STATE, ownerId, toscaElementId, janusGraphStatus);
+                    if (!janusGraphStatus.equals(JanusGraphOperationStatus.INVALID_ID)) {
+                        result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(janusGraphStatus);
                     } else {
                         result = StorageOperationStatus.INCONSISTENCY;
                     }
                 }
             }
             if (result == null) {
-                TitanOperationStatus createEdgeRes = titanDao.createEdge(ownerVertex.getVertex(), toscaElementVertex.getVertex(), EdgeLabelEnum.LAST_STATE, deleteEdgeRes.left().value());
-                if (createEdgeRes != TitanOperationStatus.OK) {
-                    result = DaoStatusConverter.convertTitanStatusToStorageStatus(createEdgeRes);
+                JanusGraphOperationStatus
+                    createEdgeRes = janusGraphDao
+                    .createEdge(ownerVertex.getVertex(), toscaElementVertex.getVertex(), EdgeLabelEnum.LAST_STATE, deleteEdgeRes.left().value());
+                if (createEdgeRes != JanusGraphOperationStatus.OK) {
+                    result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(createEdgeRes);
                 }
             }
         }
@@ -907,11 +939,13 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
         GraphVertex clonedVertex = null;
         if (result == null) {
             clonedVertex = cloneResult.left().value();
-            TitanOperationStatus status = titanDao.createEdge(toscaElementVertex.getVertex(), cloneResult.left().value().getVertex(), EdgeLabelEnum.VERSION, new HashMap<>());
-            if (status != TitanOperationStatus.OK) {
+            JanusGraphOperationStatus
+                status = janusGraphDao
+                .createEdge(toscaElementVertex.getVertex(), cloneResult.left().value().getVertex(), EdgeLabelEnum.VERSION, new HashMap<>());
+            if (status != JanusGraphOperationStatus.OK) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to create edge with label {} from vertex {} to tosca element vertex {} on graph. Status is {}. ", EdgeLabelEnum.VERSION,
                         toscaElementVertex.getMetadataProperty(GraphPropertyEnum.NORMALIZED_NAME), cloneResult.left().value().getMetadataProperty(GraphPropertyEnum.NORMALIZED_NAME), status);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
         if (result == null) {
@@ -969,7 +1003,8 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
             if (!instInputs.isEmpty()) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "before add inst inputs {} ", instInputs == null ? 0 : instInputs.size());
                 GraphVertex toscaDataVertex = null;
-                Either<GraphVertex, TitanOperationStatus> instInpVertexEither = titanDao.getChildVertex(toscaElementVertex, EdgeLabelEnum.INST_INPUTS, JsonParseFlagEnum.ParseJson);
+                Either<GraphVertex, JanusGraphOperationStatus> instInpVertexEither = janusGraphDao
+                    .getChildVertex(toscaElementVertex, EdgeLabelEnum.INST_INPUTS, JsonParseFlagEnum.ParseJson);
                 if (instInpVertexEither.isLeft()) {
                     toscaDataVertex = instInpVertexEither.left().value();
                 }
@@ -985,7 +1020,8 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
             if (!instGroups.isEmpty()) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "before add inst groups {} ", instGroups == null ? 0 : instGroups.size());
                 GraphVertex toscaDataVertex = null;
-                Either<GraphVertex, TitanOperationStatus> instGrVertexEither = titanDao.getChildVertex(toscaElementVertex, EdgeLabelEnum.INST_GROUPS, JsonParseFlagEnum.ParseJson);
+                Either<GraphVertex, JanusGraphOperationStatus> instGrVertexEither = janusGraphDao
+                    .getChildVertex(toscaElementVertex, EdgeLabelEnum.INST_GROUPS, JsonParseFlagEnum.ParseJson);
                 if (instGrVertexEither.isLeft()) {
                     toscaDataVertex = instGrVertexEither.left().value();
                 }
@@ -1003,11 +1039,11 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
                 Map<String, CompositionDataDefinition> jsonComposition = (Map<String, CompositionDataDefinition>) clonedVertex.getJson();
                 CompositionDataDefinition compositionDataDefinition = jsonComposition.get(JsonConstantKeysEnum.COMPOSITION.getValue());
                 compositionDataDefinition.setComponentInstances(instancesMap);
-                Either<GraphVertex, TitanOperationStatus> updateElement = titanDao.updateVertex(clonedVertex);
+                Either<GraphVertex, JanusGraphOperationStatus> updateElement = janusGraphDao.updateVertex(clonedVertex);
                 if (updateElement.isRight()) {
-                    TitanOperationStatus status = updateElement.right().value();
+                    JanusGraphOperationStatus status = updateElement.right().value();
                     CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to update instances on metadata vertex . Status is {}. ", status);
-                    result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+                    result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
                     return result;
                 }
             }
@@ -1234,11 +1270,13 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
                 }
             }
             if (result == null) {
-                TitanOperationStatus status = titanDao.createEdge(previousCertifiedToscaElement, clonedToscaElement.getVertex(), EdgeLabelEnum.VERSION, new HashMap<>());
-                if (status != TitanOperationStatus.OK) {
+                JanusGraphOperationStatus
+                    status = janusGraphDao
+                    .createEdge(previousCertifiedToscaElement, clonedToscaElement.getVertex(), EdgeLabelEnum.VERSION, new HashMap<>());
+                if (status != JanusGraphOperationStatus.OK) {
                     CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to create edge with label {} from vertex {} to tosca element vertex {} on graph. Status is {}. ", EdgeLabelEnum.VERSION,
                             previousCertifiedToscaElement.property(GraphPropertyEnum.UNIQUE_ID.getProperty()), clonedToscaElement.getUniqueId(), status);
-                    result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+                    result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
                 }
             }
 
@@ -1269,9 +1307,10 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
             Map<GraphPropertyEnum, Object> properties = new HashMap<>();
             properties.put(GraphPropertyEnum.UUID, uuid);
             properties.put(GraphPropertyEnum.NAME, componentName);
-            Either<List<GraphVertex>, TitanOperationStatus> getToscaElementsRes = titanDao.getByCriteria(toscaElementVertex.getLabel(), properties, JsonParseFlagEnum.ParseMetadata);
+            Either<List<GraphVertex>, JanusGraphOperationStatus> getToscaElementsRes = janusGraphDao
+                .getByCriteria(toscaElementVertex.getLabel(), properties, JsonParseFlagEnum.ParseMetadata);
             if (getToscaElementsRes.isRight()) {
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getToscaElementsRes.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getToscaElementsRes.right().value()));
             }
             if (result == null) {
                 previosVersions = getToscaElementsRes.left().value();
@@ -1344,11 +1383,11 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
 
         Either<GraphVertex, StorageOperationStatus> result;
 
-        Either<GraphVertex, TitanOperationStatus> updateVertexRes = titanDao.updateVertex(toscaElementVertex);
+        Either<GraphVertex, JanusGraphOperationStatus> updateVertexRes = janusGraphDao.updateVertex(toscaElementVertex);
         if (updateVertexRes.isRight()) {
-            TitanOperationStatus titatStatus = updateVertexRes.right().value();
+            JanusGraphOperationStatus titatStatus = updateVertexRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to update state of tosca element vertex {} metadata. Status is  {}", toscaElementVertex.getUniqueId(), titatStatus);
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(titatStatus));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(titatStatus));
         } else {
             result = Either.left(updateVertexRes.left().value());
         }
@@ -1364,7 +1403,8 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
             // In case of cancel "ready for certification" remove last state edge with "STATE" property equals to "NOT_CERTIFIED_CHECKIN"
             Map<GraphPropertyEnum, Object> vertexProperties = new EnumMap<>(GraphPropertyEnum.class);
             vertexProperties.put(GraphPropertyEnum.STATE, nextState);
-            Either<Edge, TitanOperationStatus> deleteResult = titanDao.deleteBelongingEdgeByCriteria(toscaElementVertex, EdgeLabelEnum.LAST_STATE, vertexProperties);
+            Either<Edge, JanusGraphOperationStatus> deleteResult = janusGraphDao
+                .deleteBelongingEdgeByCriteria(toscaElementVertex, EdgeLabelEnum.LAST_STATE, vertexProperties);
             if (deleteResult.isRight()) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, faileToUpdateStateMsg, toscaElementVertex.getUniqueId(), deleteResult.right().value());
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "failed to update last state relation");
@@ -1373,20 +1413,23 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
         }
         if (result == null) {
             // Remove CHECKOUT relation
-            Either<Edge, TitanOperationStatus> deleteEdgeResult = titanDao.deleteEdge(ownerVertex, toscaElementVertex, EdgeLabelEnum.STATE);
+            Either<Edge, JanusGraphOperationStatus> deleteEdgeResult = janusGraphDao
+                .deleteEdge(ownerVertex, toscaElementVertex, EdgeLabelEnum.STATE);
             if (deleteEdgeResult.isRight()) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, faileToUpdateStateMsg, toscaElementVertex.getUniqueId());
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(deleteEdgeResult.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(deleteEdgeResult.right().value()));
             }
         }
         if (result == null) {
             // Create CHECKIN relation
             Map<EdgePropertyEnum, Object> edgeProperties = new EnumMap<>(EdgePropertyEnum.class);
             edgeProperties.put(EdgePropertyEnum.STATE, nextState);
-            TitanOperationStatus createEdgeRes = titanDao.createEdge(modifierVertex.getVertex(), toscaElementVertex.getVertex(), EdgeLabelEnum.STATE, edgeProperties);
-            if (createEdgeRes != TitanOperationStatus.OK) {
+            JanusGraphOperationStatus
+                createEdgeRes = janusGraphDao
+                .createEdge(modifierVertex.getVertex(), toscaElementVertex.getVertex(), EdgeLabelEnum.STATE, edgeProperties);
+            if (createEdgeRes != JanusGraphOperationStatus.OK) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, faileToUpdateStateMsg, toscaElementVertex.getUniqueId());
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(createEdgeRes));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(createEdgeRes));
             }
         }
         if (result == null) {
@@ -1398,17 +1441,19 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
     private Either<GraphVertex, StorageOperationStatus> updateLastModifierEdge(GraphVertex toscaElementVertex, GraphVertex ownerVertex, GraphVertex modifierVertex) {
         Either<GraphVertex, StorageOperationStatus> result = null;
         if (!modifierVertex.getMetadataProperties().get(GraphPropertyEnum.USERID).equals(ownerVertex.getMetadataProperties().get(GraphPropertyEnum.USERID))) {
-            Either<Edge, TitanOperationStatus> deleteEdgeRes = titanDao.deleteEdge(ownerVertex, toscaElementVertex, EdgeLabelEnum.LAST_MODIFIER);
+            Either<Edge, JanusGraphOperationStatus> deleteEdgeRes = janusGraphDao
+                .deleteEdge(ownerVertex, toscaElementVertex, EdgeLabelEnum.LAST_MODIFIER);
             if (deleteEdgeRes.isRight()) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to delete last modifier {} to tosca element {}. Edge type is {}", ownerVertex.getUniqueId(), ownerVertex.getUniqueId(), EdgeLabelEnum.LAST_MODIFIER);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(deleteEdgeRes.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(deleteEdgeRes.right().value()));
             }
             if (result == null) {
-                TitanOperationStatus createEdgeRes = titanDao.createEdge(modifierVertex.getVertex(), toscaElementVertex.getVertex(), EdgeLabelEnum.LAST_MODIFIER, new HashMap<>());
+                JanusGraphOperationStatus createEdgeRes = janusGraphDao
+                    .createEdge(modifierVertex.getVertex(), toscaElementVertex.getVertex(), EdgeLabelEnum.LAST_MODIFIER, new HashMap<>());
 
-                if (createEdgeRes != TitanOperationStatus.OK) {
+                if (createEdgeRes != JanusGraphOperationStatus.OK) {
                     CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to associate user {} to component {}. Edge type is {}", modifierVertex.getUniqueId(), ownerVertex.getUniqueId(), EdgeLabelEnum.LAST_MODIFIER);
-                    result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(createEdgeRes));
+                    result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(createEdgeRes));
                 } else {
                     result = Either.left(modifierVertex);
                 }
@@ -1473,10 +1518,11 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
         GraphVertex modifier = null;
         GraphVertex owner;
         try {
-            Either<Map<String, GraphVertex>, TitanOperationStatus> getVerticesRes = titanDao.getVerticesByUniqueIdAndParseFlag(prepareParametersToGetVerticesForRequestCertification(toscaElementId, modifierId, ownerId));
+            Either<Map<String, GraphVertex>, JanusGraphOperationStatus> getVerticesRes = janusGraphDao
+                .getVerticesByUniqueIdAndParseFlag(prepareParametersToGetVerticesForRequestCertification(toscaElementId, modifierId, ownerId));
             if (getVerticesRes.isRight()) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_GET_VERTICES, toscaElementId);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVerticesRes.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVerticesRes.right().value()));
             }
             if (result == null) {
                 toscaElement = getVerticesRes.left().value().get(toscaElementId);
@@ -1515,17 +1561,19 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
     private StorageOperationStatus handleRelationsUponForceCertification(GraphVertex toscaElement, GraphVertex modifier, GraphVertex owner) {
 
         StorageOperationStatus result = null;
-        TitanOperationStatus status = titanDao.replaceEdgeLabel(owner.getVertex(), toscaElement.getVertex(), EdgeLabelEnum.STATE, EdgeLabelEnum.LAST_STATE);
-        if (status != TitanOperationStatus.OK) {
-            result = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+        JanusGraphOperationStatus status = janusGraphDao
+            .replaceEdgeLabel(owner.getVertex(), toscaElement.getVertex(), EdgeLabelEnum.STATE, EdgeLabelEnum.LAST_STATE);
+        if (status != JanusGraphOperationStatus.OK) {
+            result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
         }
         if (result == null) {
             Map<EdgePropertyEnum, Object> properties = new EnumMap<>(EdgePropertyEnum.class);
             properties.put(EdgePropertyEnum.STATE, LifecycleStateEnum.CERTIFIED);
-            status = titanDao.createEdge(modifier, toscaElement, EdgeLabelEnum.STATE, properties);
-            if (status != TitanOperationStatus.OK) {
+            status = janusGraphDao
+                .createEdge(modifier, toscaElement, EdgeLabelEnum.STATE, properties);
+            if (status != JanusGraphOperationStatus.OK) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "failed to create edge. Status is {}", status);
-                result = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+                result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
             }
         }
         if (result == null) {
@@ -1534,25 +1582,27 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
         return result;
     }
 
-    private StorageOperationStatus updateEdgeToCatalogRootByUndoCheckout(TitanVertex preV, GraphVertex curV) {
+    private StorageOperationStatus updateEdgeToCatalogRootByUndoCheckout(JanusGraphVertex preV, GraphVertex curV) {
         if (preV == null) {
             return updateEdgeToCatalogRoot(null, curV);
         }
-        String uniqueIdPreVer = (String) titanDao.getProperty((TitanVertex) preV, GraphPropertyEnum.UNIQUE_ID.getProperty());
-        LifecycleStateEnum state = LifecycleStateEnum.findState((String) titanDao.getProperty(preV, GraphPropertyEnum.STATE.getProperty()));
+        String uniqueIdPreVer = (String) janusGraphDao
+            .getProperty((JanusGraphVertex) preV, GraphPropertyEnum.UNIQUE_ID.getProperty());
+        LifecycleStateEnum state = LifecycleStateEnum.findState((String) janusGraphDao
+            .getProperty(preV, GraphPropertyEnum.STATE.getProperty()));
         if (state == LifecycleStateEnum.CERTIFIED) {
             return updateEdgeToCatalogRoot(null, curV);
         }
-        return titanDao.getVertexById(uniqueIdPreVer)
+        return janusGraphDao.getVertexById(uniqueIdPreVer)
                 .either(l -> updateEdgeToCatalogRoot(l, curV),
-                        DaoStatusConverter::convertTitanStatusToStorageStatus);
+                        DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
     }
 
     private StorageOperationStatus updateEdgeToCatalogRoot(GraphVertex newVersionV, GraphVertex prevVersionV) {
-        Either<GraphVertex, TitanOperationStatus> catalog = titanDao.getVertexByLabel(VertexTypeEnum.CATALOG_ROOT);
+        Either<GraphVertex, JanusGraphOperationStatus> catalog = janusGraphDao.getVertexByLabel(VertexTypeEnum.CATALOG_ROOT);
         if (catalog.isRight()) {
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to fetch catalog vertex. error {}", catalog.right().value());
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(catalog.right().value());
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(catalog.right().value());
         }
         GraphVertex catalogV = catalog.left().value();
         if (newVersionV != null) {
@@ -1560,10 +1610,12 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
 			
 			if ( isAbstract == null || !isAbstract ) {
                 // no new vertex, only delete previous
-                TitanOperationStatus result = titanDao.createEdge(catalogV, newVersionV, EdgeLabelEnum.CATALOG_ELEMENT, null);
-                if (result != TitanOperationStatus.OK) {
+                JanusGraphOperationStatus
+                    result = janusGraphDao
+                    .createEdge(catalogV, newVersionV, EdgeLabelEnum.CATALOG_ELEMENT, null);
+                if (result != JanusGraphOperationStatus.OK) {
                     CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to create edge from {} to catalog vertex. error {}", newVersionV.getUniqueId(), result);
-                    return DaoStatusConverter.convertTitanStatusToStorageStatus(result);
+                    return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(result);
                 }
             }
         }
@@ -1571,10 +1623,11 @@ public class ToscaElementLifecycleOperation extends BaseOperation {
             Boolean isAbstract = (Boolean) prevVersionV.getMetadataProperty(GraphPropertyEnum.IS_ABSTRACT);
             if (isAbstract == null || !isAbstract) {
                 // if prev == null -> new resource was added
-                Either<Edge, TitanOperationStatus> deleteResult = titanDao.deleteEdge(catalogV, prevVersionV, EdgeLabelEnum.CATALOG_ELEMENT);
+                Either<Edge, JanusGraphOperationStatus> deleteResult = janusGraphDao
+                    .deleteEdge(catalogV, prevVersionV, EdgeLabelEnum.CATALOG_ELEMENT);
                 if (deleteResult.isRight()) {
                     CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to delete edge from {} to catalog vertex. error {}", prevVersionV.getUniqueId(), deleteResult.right().value());
-                    return DaoStatusConverter.convertTitanStatusToStorageStatus(deleteResult.right().value());
+                    return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(deleteResult.right().value());
                 }
             }
         }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementOperation.java
index f700c2eb69..791db33d66 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementOperation.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
@@ -29,6 +29,7 @@ import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.openecomp.sdc.be.config.ConfigurationManager;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgePropertyEnum;
@@ -36,7 +37,6 @@ import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
 import org.openecomp.sdc.be.dao.jsongraph.utils.JsonParserUtils;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.AdditionalInfoParameterDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
@@ -50,10 +50,10 @@ import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.catalog.CatalogComponent;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.NodeType;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.TopologyTemplate;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElementTypeEnum;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.NodeType;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElementTypeEnum;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
@@ -98,10 +98,11 @@ public abstract class ToscaElementOperation extends BaseOperation {
         propertiesToMatch.put(GraphPropertyEnum.UNIQUE_ID, uniqueId);
 
         VertexTypeEnum vertexType = ToscaElementTypeEnum.getVertexTypeByToscaType(nodeType);
-        Either<List<GraphVertex>, TitanOperationStatus> getResponse = titanDao.getByCriteria(vertexType, propertiesToMatch, parseFlag);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> getResponse = janusGraphDao
+            .getByCriteria(vertexType, propertiesToMatch, parseFlag);
         if (getResponse.isRight()) {
             log.debug("Couldn't fetch component with type {} and unique id {}, error: {}", vertexType, uniqueId, getResponse.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getResponse.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getResponse.right().value()));
 
         }
         List<GraphVertex> componentList = getResponse.left().value();
@@ -130,12 +131,12 @@ public abstract class ToscaElementOperation extends BaseOperation {
             componentToDelete.addMetadataProperty(GraphPropertyEnum.IS_DELETED, Boolean.TRUE);
             componentToDelete.setJsonMetadataField(JsonPresentationFields.LAST_UPDATE_DATE, System.currentTimeMillis());
 
-            Either<GraphVertex, TitanOperationStatus> updateNode = titanDao.updateVertex(componentToDelete);
+            Either<GraphVertex, JanusGraphOperationStatus> updateNode = janusGraphDao.updateVertex(componentToDelete);
 
             StorageOperationStatus updateComponent;
             if (updateNode.isRight()) {
                 log.debug("Failed to update component {}. status is {}", componentToDelete.getUniqueId(), updateNode.right().value());
-                updateComponent = DaoStatusConverter.convertTitanStatusToStorageStatus(updateNode.right().value());
+                updateComponent = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(updateNode.right().value());
                 result = Either.right(updateComponent);
                 return result;
             }
@@ -157,40 +158,43 @@ public abstract class ToscaElementOperation extends BaseOperation {
 
         Either<GraphVertex, StorageOperationStatus> result = null;
         GraphVertex createdToscaElementVertex = null;
-        TitanOperationStatus status;
+        JanusGraphOperationStatus status;
 
-        Either<GraphVertex, TitanOperationStatus> createNextVersionRes = titanDao.createVertex(nextToscaElement);
+        Either<GraphVertex, JanusGraphOperationStatus> createNextVersionRes = janusGraphDao.createVertex(nextToscaElement);
         if (createNextVersionRes.isRight()) {
             status = createNextVersionRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to create tosca element vertex {} with version {} on graph. Status is {}. ", previousToscaElement.getMetadataProperty(GraphPropertyEnum.NORMALIZED_NAME),
                     previousToscaElement.getMetadataProperty(GraphPropertyEnum.VERSION), status);
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
         if (result == null) {
             createdToscaElementVertex = createNextVersionRes.left().value();
             Map<EdgePropertyEnum, Object> properties = new HashMap<>();
             properties.put(EdgePropertyEnum.STATE, createdToscaElementVertex.getMetadataProperty(GraphPropertyEnum.STATE));
-            status = titanDao.createEdge(user.getVertex(), createdToscaElementVertex.getVertex(), EdgeLabelEnum.STATE, properties);
-            if (status != TitanOperationStatus.OK) {
+            status = janusGraphDao
+                .createEdge(user.getVertex(), createdToscaElementVertex.getVertex(), EdgeLabelEnum.STATE, properties);
+            if (status != JanusGraphOperationStatus.OK) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_CREATE_EDGE_WITH_LABEL_FROM_USER_VERTEX_TO_TOSCA_ELEMENT_VERTEX_ON_GRAPH_STATUS_IS, EdgeLabelEnum.STATE, user.getUniqueId(),
                         previousToscaElement.getMetadataProperty(GraphPropertyEnum.NORMALIZED_NAME), status);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
         if (result == null) {
-            status = titanDao.createEdge(user.getVertex(), createdToscaElementVertex.getVertex(), EdgeLabelEnum.LAST_MODIFIER, new HashMap<>());
-            if (status != TitanOperationStatus.OK) {
+            status = janusGraphDao
+                .createEdge(user.getVertex(), createdToscaElementVertex.getVertex(), EdgeLabelEnum.LAST_MODIFIER, new HashMap<>());
+            if (status != JanusGraphOperationStatus.OK) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_CREATE_EDGE_WITH_LABEL_FROM_USER_VERTEX_TO_TOSCA_ELEMENT_VERTEX_ON_GRAPH_STATUS_IS, EdgeLabelEnum.LAST_MODIFIER, user.getUniqueId(),
                         nextToscaElement.getMetadataProperty(GraphPropertyEnum.NORMALIZED_NAME), status);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
         if (result == null) {
-            status = titanDao.createEdge(user.getVertex(), createdToscaElementVertex.getVertex(), EdgeLabelEnum.CREATOR, new HashMap<>());
-            if (status != TitanOperationStatus.OK) {
+            status = janusGraphDao
+                .createEdge(user.getVertex(), createdToscaElementVertex.getVertex(), EdgeLabelEnum.CREATOR, new HashMap<>());
+            if (status != JanusGraphOperationStatus.OK) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, FAILED_TO_CREATE_EDGE_WITH_LABEL_FROM_USER_VERTEX_TO_TOSCA_ELEMENT_VERTEX_ON_GRAPH_STATUS_IS, EdgeLabelEnum.CREATOR, user.getUniqueId(),
                         nextToscaElement.getMetadataProperty(GraphPropertyEnum.NORMALIZED_NAME), status);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
         if (result == null) {
@@ -198,11 +202,12 @@ public abstract class ToscaElementOperation extends BaseOperation {
             while (edgesToCopyIter.hasNext()) {
                 Edge currEdge = edgesToCopyIter.next();
                 Vertex currVertex = currEdge.inVertex();
-                status = titanDao.createEdge(createdToscaElementVertex.getVertex(), currVertex, EdgeLabelEnum.getEdgeLabelEnum(currEdge.label()), currEdge);
-                if (status != TitanOperationStatus.OK) {
+                status = janusGraphDao
+                    .createEdge(createdToscaElementVertex.getVertex(), currVertex, EdgeLabelEnum.getEdgeLabelEnum(currEdge.label()), currEdge);
+                if (status != JanusGraphOperationStatus.OK) {
                     CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to create edge with label {} from tosca element vertex {} to vertex with label {} on graph. Status is {}. ", currEdge.label(), createdToscaElementVertex.getUniqueId(),
                             currVertex.property(GraphPropertyEnum.LABEL.getProperty()), status);
-                    result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+                    result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
                     break;
                 }
             }
@@ -216,8 +221,9 @@ public abstract class ToscaElementOperation extends BaseOperation {
         return result;
     }
 
-    protected TitanOperationStatus setLastModifierFromGraph(GraphVertex componentV, ToscaElement toscaElement) {
-        Either<GraphVertex, TitanOperationStatus> parentVertex = titanDao.getParentVertex(componentV, EdgeLabelEnum.LAST_MODIFIER, JsonParseFlagEnum.NoParse);
+    protected JanusGraphOperationStatus setLastModifierFromGraph(GraphVertex componentV, ToscaElement toscaElement) {
+        Either<GraphVertex, JanusGraphOperationStatus> parentVertex = janusGraphDao
+            .getParentVertex(componentV, EdgeLabelEnum.LAST_MODIFIER, JsonParseFlagEnum.NoParse);
         if (parentVertex.isRight()) {
             log.debug("Failed to fetch last modifier for tosca element with id {} error {}", componentV.getUniqueId(), parentVertex.right().value());
             return parentVertex.right().value();
@@ -226,7 +232,7 @@ public abstract class ToscaElementOperation extends BaseOperation {
         String userId = (String) userV.getMetadataProperty(GraphPropertyEnum.USERID);
         toscaElement.setLastUpdaterUserId(userId);
         toscaElement.setLastUpdaterFullName(buildFullName(userV));
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
     public String buildFullName(GraphVertex userV) {
@@ -244,8 +250,9 @@ public abstract class ToscaElementOperation extends BaseOperation {
         return fullName;
     }
 
-    protected TitanOperationStatus setCreatorFromGraph(GraphVertex componentV, ToscaElement toscaElement) {
-        Either<GraphVertex, TitanOperationStatus> parentVertex = titanDao.getParentVertex(componentV, EdgeLabelEnum.CREATOR, JsonParseFlagEnum.NoParse);
+    protected JanusGraphOperationStatus setCreatorFromGraph(GraphVertex componentV, ToscaElement toscaElement) {
+        Either<GraphVertex, JanusGraphOperationStatus> parentVertex = janusGraphDao
+            .getParentVertex(componentV, EdgeLabelEnum.CREATOR, JsonParseFlagEnum.NoParse);
         if (parentVertex.isRight()) {
             log.debug("Failed to fetch creator for tosca element with id {} error {}", componentV.getUniqueId(), parentVertex.right().value());
             return parentVertex.right().value();
@@ -255,7 +262,7 @@ public abstract class ToscaElementOperation extends BaseOperation {
         toscaElement.setCreatorUserId(creatorUserId);
         toscaElement.setCreatorFullName(buildFullName(userV));
 
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
     protected <T extends ToscaElement> T getResourceMetaDataFromResource(T toscaElement) {
@@ -310,12 +317,12 @@ public abstract class ToscaElementOperation extends BaseOperation {
         // handle user
         String userId = toscaElement.getCreatorUserId();
 
-        Either<GraphVertex, TitanOperationStatus> findUser = findUserVertex(userId);
+        Either<GraphVertex, JanusGraphOperationStatus> findUser = findUserVertex(userId);
 
         if (findUser.isRight()) {
-            TitanOperationStatus status = findUser.right().value();
+            JanusGraphOperationStatus status = findUser.right().value();
             log.error(CANNOT_FIND_USER_IN_THE_GRAPH_STATUS_IS, userId, status);
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
 
         }
         GraphVertex creatorVertex = findUser.left().value();
@@ -324,9 +331,9 @@ public abstract class ToscaElementOperation extends BaseOperation {
         if (updaterId != null && !updaterId.equals(userId)) {
             findUser = findUserVertex(updaterId);
             if (findUser.isRight()) {
-                TitanOperationStatus status = findUser.right().value();
+                JanusGraphOperationStatus status = findUser.right().value();
                 log.error(CANNOT_FIND_USER_IN_THE_GRAPH_STATUS_IS, userId, status);
-                return DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+                return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
             } else {
                 updaterVertex = findUser.left().value();
             }
@@ -334,26 +341,29 @@ public abstract class ToscaElementOperation extends BaseOperation {
         Map<EdgePropertyEnum, Object> props = new EnumMap<>(EdgePropertyEnum.class);
         props.put(EdgePropertyEnum.STATE, (String) toscaElement.getMetadataValue(JsonPresentationFields.LIFECYCLE_STATE));
 
-        TitanOperationStatus result = titanDao.createEdge(updaterVertex, nodeTypeVertex, EdgeLabelEnum.STATE, props);
+        JanusGraphOperationStatus
+            result = janusGraphDao
+            .createEdge(updaterVertex, nodeTypeVertex, EdgeLabelEnum.STATE, props);
         log.debug("After associating user {} to resource {}. Edge type is {}", updaterVertex, nodeTypeVertex.getUniqueId(), EdgeLabelEnum.STATE);
-        if (TitanOperationStatus.OK != result) {
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(result);
+        if (JanusGraphOperationStatus.OK != result) {
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(result);
         }
-        result = titanDao.createEdge(updaterVertex, nodeTypeVertex, EdgeLabelEnum.LAST_MODIFIER, null);
+        result = janusGraphDao
+            .createEdge(updaterVertex, nodeTypeVertex, EdgeLabelEnum.LAST_MODIFIER, null);
         log.debug("After associating user {}  to resource {}. Edge type is {}", updaterVertex, nodeTypeVertex.getUniqueId(), EdgeLabelEnum.LAST_MODIFIER);
-        if (!result.equals(TitanOperationStatus.OK)) {
+        if (!result.equals(JanusGraphOperationStatus.OK)) {
             log.error("Failed to associate user {}  to resource {}. Edge type is {}", updaterVertex, nodeTypeVertex.getUniqueId(), EdgeLabelEnum.LAST_MODIFIER);
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(result);
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(result);
         }
 
         toscaElement.setLastUpdaterUserId(toscaElement.getCreatorUserId());
         toscaElement.setLastUpdaterFullName(toscaElement.getCreatorFullName());
 
-        result = titanDao.createEdge(creatorVertex, nodeTypeVertex, EdgeLabelEnum.CREATOR, null);
+        result = janusGraphDao.createEdge(creatorVertex, nodeTypeVertex, EdgeLabelEnum.CREATOR, null);
         log.debug("After associating user {} to resource {}. Edge type is {} ", creatorVertex, nodeTypeVertex.getUniqueId(), EdgeLabelEnum.CREATOR);
-        if (!result.equals(TitanOperationStatus.OK)) {
+        if (!result.equals(JanusGraphOperationStatus.OK)) {
             log.error("Failed to associate user {} to resource {}. Edge type is {} ", creatorVertex, nodeTypeVertex.getUniqueId(), EdgeLabelEnum.CREATOR);
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(result);
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(result);
         }
         return StorageOperationStatus.OK;
     }
@@ -369,10 +379,12 @@ public abstract class ToscaElementOperation extends BaseOperation {
 
         GraphVertex subCategoryV = getCategoryVertex.left().value();
 
-        TitanOperationStatus createEdge = titanDao.createEdge(nodeTypeVertex, subCategoryV, EdgeLabelEnum.CATEGORY, new HashMap<>());
-        if (createEdge != TitanOperationStatus.OK) {
+        JanusGraphOperationStatus
+            createEdge = janusGraphDao
+            .createEdge(nodeTypeVertex, subCategoryV, EdgeLabelEnum.CATEGORY, new HashMap<>());
+        if (createEdge != JanusGraphOperationStatus.OK) {
             log.trace("Failed to associate resource {} to category {} with id {}", nodeType.getUniqueId(), subcategoryName, subCategoryV.getUniqueId());
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(createEdge);
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(createEdge);
         }
         return StorageOperationStatus.OK;
     }
@@ -436,53 +448,63 @@ public abstract class ToscaElementOperation extends BaseOperation {
         return StorageOperationStatus.OK;
     }
 
-    protected TitanOperationStatus disassociateAndDeleteCommonElements(GraphVertex toscaElementVertex) {
-        TitanOperationStatus status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.ARTIFACTS);
-        if (status != TitanOperationStatus.OK) {
+    protected JanusGraphOperationStatus disassociateAndDeleteCommonElements(GraphVertex toscaElementVertex) {
+        JanusGraphOperationStatus
+            status = janusGraphDao
+            .disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.ARTIFACTS);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disaccociate artifact for {} error {}", toscaElementVertex.getUniqueId(), status);
             return status;
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.TOSCA_ARTIFACTS);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao
+            .disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.TOSCA_ARTIFACTS);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disaccociate tosca artifact for {} error {}", toscaElementVertex.getUniqueId(), status);
             return status;
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.DEPLOYMENT_ARTIFACTS);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao
+            .disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.DEPLOYMENT_ARTIFACTS);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to deployment artifact for {} error {}", toscaElementVertex.getUniqueId(), status);
             return status;
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.PROPERTIES);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao
+            .disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.PROPERTIES);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disaccociate properties for {} error {}", toscaElementVertex.getUniqueId(), status);
             return status;
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.ATTRIBUTES);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao
+            .disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.ATTRIBUTES);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disaccociate attributes for {} error {}", toscaElementVertex.getUniqueId(), status);
             return status;
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.ADDITIONAL_INFORMATION);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao
+            .disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.ADDITIONAL_INFORMATION);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disaccociate additional information for {} error {}", toscaElementVertex.getUniqueId(), status);
             return status;
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.CAPABILITIES);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao
+            .disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.CAPABILITIES);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disaccociate capabilities for {} error {}", toscaElementVertex.getUniqueId(), status);
             return status;
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.REQUIREMENTS);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao
+            .disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.REQUIREMENTS);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disaccociate requirements for {} error {}", toscaElementVertex.getUniqueId(), status);
             return status;
         }
-        status = titanDao.disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.FORWARDING_PATH);
-        if (status != TitanOperationStatus.OK) {
+        status = janusGraphDao
+            .disassociateAndDeleteLast(toscaElementVertex, Direction.OUT, EdgeLabelEnum.FORWARDING_PATH);
+        if (status != JanusGraphOperationStatus.OK) {
             log.debug("Failed to disaccociate requirements for {} error {}", toscaElementVertex.getUniqueId(), status);
             return status;
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
     protected StorageOperationStatus assosiateCommonForToscaElement(GraphVertex nodeTypeVertex, ToscaElement toscaElement, List<GraphVertex> derivedResources) {
@@ -521,14 +543,16 @@ public abstract class ToscaElementOperation extends BaseOperation {
     }
 
     private StorageOperationStatus associateToCatalogRoot(GraphVertex nodeTypeVertex) {
-        Either<GraphVertex, TitanOperationStatus> catalog = titanDao.getVertexByLabel(VertexTypeEnum.CATALOG_ROOT);
+        Either<GraphVertex, JanusGraphOperationStatus> catalog = janusGraphDao.getVertexByLabel(VertexTypeEnum.CATALOG_ROOT);
         if (catalog.isRight()) {
             log.debug("Failed to fetch catalog vertex. error {}", catalog.right().value());
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(catalog.right().value());
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(catalog.right().value());
         }
-        TitanOperationStatus createEdge = titanDao.createEdge(catalog.left().value(), nodeTypeVertex, EdgeLabelEnum.CATALOG_ELEMENT, null);
+        JanusGraphOperationStatus
+            createEdge = janusGraphDao
+            .createEdge(catalog.left().value(), nodeTypeVertex, EdgeLabelEnum.CATALOG_ELEMENT, null);
 
-        return DaoStatusConverter.convertTitanStatusToStorageStatus(createEdge);
+        return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(createEdge);
     }
 
     protected StorageOperationStatus associatePropertiesToResource(GraphVertex nodeTypeVertex, ToscaElement nodeType, List<GraphVertex> derivedResources) {
@@ -579,11 +603,12 @@ public abstract class ToscaElementOperation extends BaseOperation {
 
         if (derivedResources != null && !derivedResources.isEmpty()) {
             for (GraphVertex derived : derivedResources) {
-                Either<List<GraphVertex>, TitanOperationStatus> derivedProperties = titanDao.getChildrenVertecies(derived, edge, JsonParseFlagEnum.ParseJson);
+                Either<List<GraphVertex>, JanusGraphOperationStatus> derivedProperties = janusGraphDao
+                    .getChildrenVertecies(derived, edge, JsonParseFlagEnum.ParseJson);
                 if (derivedProperties.isRight()) {
-                    if (derivedProperties.right().value() != TitanOperationStatus.NOT_FOUND) {
+                    if (derivedProperties.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                         log.debug("Failed to get properties for derived from {} error {}", derived.getUniqueId(), derivedProperties.right().value());
-                        return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(derivedProperties.right().value()));
+                        return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(derivedProperties.right().value()));
                     } else {
                         continue;
                     }
@@ -601,12 +626,12 @@ public abstract class ToscaElementOperation extends BaseOperation {
         return Either.left(propertiesAll);
     }
 
-    protected TitanOperationStatus setArtifactsFromGraph(GraphVertex componentV, ToscaElement toscaElement) {
-        Either<Map<String, ArtifactDataDefinition>, TitanOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.ARTIFACTS);
+    protected JanusGraphOperationStatus setArtifactsFromGraph(GraphVertex componentV, ToscaElement toscaElement) {
+        Either<Map<String, ArtifactDataDefinition>, JanusGraphOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.ARTIFACTS);
         if (result.isLeft()) {
             toscaElement.setArtifacts(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
@@ -614,7 +639,7 @@ public abstract class ToscaElementOperation extends BaseOperation {
         if (result.isLeft()) {
             toscaElement.setDeploymentArtifacts(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
@@ -622,37 +647,41 @@ public abstract class ToscaElementOperation extends BaseOperation {
         if (result.isLeft()) {
             toscaElement.setToscaArtifacts(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    protected TitanOperationStatus setAllVersions(GraphVertex componentV, ToscaElement toscaElement) {
+    protected JanusGraphOperationStatus setAllVersions(GraphVertex componentV, ToscaElement toscaElement) {
         Map<String, String> allVersion = new HashMap<>();
 
         allVersion.put((String) componentV.getMetadataProperty(GraphPropertyEnum.VERSION), componentV.getUniqueId());
         ArrayList<GraphVertex> allChildrenAndParants = new ArrayList<>();
-        Either<GraphVertex, TitanOperationStatus> childResourceRes = titanDao.getChildVertex(componentV, EdgeLabelEnum.VERSION, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> childResourceRes = janusGraphDao
+            .getChildVertex(componentV, EdgeLabelEnum.VERSION, JsonParseFlagEnum.NoParse);
         while (childResourceRes.isLeft()) {
             GraphVertex child = childResourceRes.left().value();
             allChildrenAndParants.add(child);
-            childResourceRes = titanDao.getChildVertex(child, EdgeLabelEnum.VERSION, JsonParseFlagEnum.NoParse);
+            childResourceRes = janusGraphDao
+                .getChildVertex(child, EdgeLabelEnum.VERSION, JsonParseFlagEnum.NoParse);
         }
-        TitanOperationStatus operationStatus = childResourceRes.right().value();
+        JanusGraphOperationStatus operationStatus = childResourceRes.right().value();
 
-        if (operationStatus != TitanOperationStatus.NOT_FOUND) {
+        if (operationStatus != JanusGraphOperationStatus.NOT_FOUND) {
             return operationStatus;
         } else {
-            Either<GraphVertex, TitanOperationStatus> parentResourceRes = titanDao.getParentVertex(componentV, EdgeLabelEnum.VERSION, JsonParseFlagEnum.NoParse);
+            Either<GraphVertex, JanusGraphOperationStatus> parentResourceRes = janusGraphDao
+                .getParentVertex(componentV, EdgeLabelEnum.VERSION, JsonParseFlagEnum.NoParse);
             while (parentResourceRes.isLeft()) {
                 GraphVertex parent = parentResourceRes.left().value();
                 allChildrenAndParants.add(parent);
-                parentResourceRes = titanDao.getParentVertex(parent, EdgeLabelEnum.VERSION, JsonParseFlagEnum.NoParse);
+                parentResourceRes = janusGraphDao
+                    .getParentVertex(parent, EdgeLabelEnum.VERSION, JsonParseFlagEnum.NoParse);
             }
             operationStatus = parentResourceRes.right().value();
-            if (operationStatus != TitanOperationStatus.NOT_FOUND) {
+            if (operationStatus != JanusGraphOperationStatus.NOT_FOUND) {
                 return operationStatus;
             } else {
                 allChildrenAndParants.stream().filter(vertex -> {
@@ -661,7 +690,7 @@ public abstract class ToscaElementOperation extends BaseOperation {
                 }).forEach(vertex -> allVersion.put((String) vertex.getMetadataProperty(GraphPropertyEnum.VERSION), vertex.getUniqueId()));
 
                 toscaElement.setAllVersions(allVersion);
-                return TitanOperationStatus.OK;
+                return JanusGraphOperationStatus.OK;
             }
         }
     }
@@ -679,10 +708,11 @@ public abstract class ToscaElementOperation extends BaseOperation {
         }
         // in case of user id == null -> get all users by label
         // for Tester and Admin retrieve all users
-        Either<List<GraphVertex>, TitanOperationStatus> usersByCriteria = titanDao.getByCriteria(VertexTypeEnum.USER, props, JsonParseFlagEnum.NoParse);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> usersByCriteria = janusGraphDao
+            .getByCriteria(VertexTypeEnum.USER, props, JsonParseFlagEnum.NoParse);
         if (usersByCriteria.isRight()) {
             log.debug("Failed to fetch users by criteria {} error {}", props, usersByCriteria.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(usersByCriteria.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(usersByCriteria.right().value()));
         }
         List<GraphVertex> users = usersByCriteria.left().value();
 
@@ -691,10 +721,11 @@ public abstract class ToscaElementOperation extends BaseOperation {
         for (GraphVertex userV : users) {
 
             HashSet<String> ids = new HashSet<>();
-            Either<List<GraphVertex>, TitanOperationStatus> childrenVertecies = titanDao.getChildrenVertecies(userV, EdgeLabelEnum.STATE, JsonParseFlagEnum.NoParse);
-            if (childrenVertecies.isRight() && childrenVertecies.right().value() != TitanOperationStatus.NOT_FOUND) {
+            Either<List<GraphVertex>, JanusGraphOperationStatus> childrenVertecies = janusGraphDao
+                .getChildrenVertecies(userV, EdgeLabelEnum.STATE, JsonParseFlagEnum.NoParse);
+            if (childrenVertecies.isRight() && childrenVertecies.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 log.debug("Failed to fetch children vertices for user {} by edge {} error {}", userV.getMetadataProperty(GraphPropertyEnum.USERID), EdgeLabelEnum.STATE, childrenVertecies.right().value());
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(childrenVertecies.right().value()));
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(childrenVertecies.right().value()));
             }
 
             // get all resource with current state
@@ -710,10 +741,11 @@ public abstract class ToscaElementOperation extends BaseOperation {
             }
             if (lastStateStates != null && !lastStateStates.isEmpty()) {
                 // get all resource with last state
-                childrenVertecies = titanDao.getChildrenVertecies(userV, EdgeLabelEnum.LAST_STATE, JsonParseFlagEnum.NoParse);
-                if (childrenVertecies.isRight() && childrenVertecies.right().value() != TitanOperationStatus.NOT_FOUND) {
+                childrenVertecies = janusGraphDao
+                    .getChildrenVertecies(userV, EdgeLabelEnum.LAST_STATE, JsonParseFlagEnum.NoParse);
+                if (childrenVertecies.isRight() && childrenVertecies.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                     log.debug("Failed to fetch children vertices for user {} by edge {} error {}", userV.getMetadataProperty(GraphPropertyEnum.USERID), EdgeLabelEnum.LAST_STATE, childrenVertecies.right().value());
-                    return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(childrenVertecies.right().value()));
+                    return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(childrenVertecies.right().value()));
                 }
                 if (childrenVertecies.isLeft()) {
                     boolean isFirst;
@@ -748,7 +780,7 @@ public abstract class ToscaElementOperation extends BaseOperation {
             Iterator<Edge> edges = node.getVertex().edges(Direction.IN, edgelabel.name());
             while (edges.hasNext()) {
                 Edge edge = edges.next();
-                String stateStr = (String) titanDao.getProperty(edge, EdgePropertyEnum.STATE);
+                String stateStr = (String) janusGraphDao.getProperty(edge, EdgePropertyEnum.STATE);
 
                 LifecycleStateEnum nodeState = LifecycleStateEnum.findState(stateStr);
                 if (nodeState == null) {
@@ -809,9 +841,9 @@ public abstract class ToscaElementOperation extends BaseOperation {
     }
 
     protected <T extends ToscaElement> Either<T, StorageOperationStatus> getLightComponent(String componentUid, ComponentTypeEnum nodeType, ComponentParametersView parametersFilter) {
-        Either<GraphVertex, TitanOperationStatus> getVertexRes = titanDao.getVertexById(componentUid);
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexRes = janusGraphDao.getVertexById(componentUid);
         if (getVertexRes.isRight()) {
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexRes.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexRes.right().value()));
         }
         return getLightComponent(getVertexRes.left().value(), nodeType, parametersFilter);
     }
@@ -820,39 +852,39 @@ public abstract class ToscaElementOperation extends BaseOperation {
 
         log.trace("Starting to build light component of type {}, id {}", nodeType, vertexComponent.getUniqueId());
 
-        titanDao.parseVertexProperties(vertexComponent, JsonParseFlagEnum.ParseMetadata);
+        janusGraphDao.parseVertexProperties(vertexComponent, JsonParseFlagEnum.ParseMetadata);
 
         T toscaElement = convertToComponent(vertexComponent);
 
-        TitanOperationStatus status = setCreatorFromGraph(vertexComponent, toscaElement);
-        if (status != TitanOperationStatus.OK) {
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+        JanusGraphOperationStatus status = setCreatorFromGraph(vertexComponent, toscaElement);
+        if (status != JanusGraphOperationStatus.OK) {
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
 
         status = setLastModifierFromGraph(vertexComponent, toscaElement);
-        if (status != TitanOperationStatus.OK) {
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+        if (status != JanusGraphOperationStatus.OK) {
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
         status = setCategoriesFromGraph(vertexComponent, toscaElement);
-        if (status != TitanOperationStatus.OK) {
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+        if (status != JanusGraphOperationStatus.OK) {
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
         if (!parametersFilter.isIgnoreAllVersions()) {
             status = setAllVersions(vertexComponent, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
         if (!parametersFilter.isIgnoreCapabilities()) {
             status = setCapabilitiesFromGraph(vertexComponent, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
         if (!parametersFilter.isIgnoreRequirements()) {
             status = setRequirementsFromGraph(vertexComponent, toscaElement);
-            if (status != TitanOperationStatus.OK) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            if (status != JanusGraphOperationStatus.OK) {
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
         }
         log.debug("Ended to build light component of type {}, id {}", nodeType, vertexComponent.getUniqueId());
@@ -882,24 +914,27 @@ public abstract class ToscaElementOperation extends BaseOperation {
         return (T) toscaElement;
     }
 
-    protected TitanOperationStatus setResourceCategoryFromGraphV(Vertex vertex, CatalogComponent catalogComponent) {
+    protected JanusGraphOperationStatus setResourceCategoryFromGraphV(Vertex vertex, CatalogComponent catalogComponent) {
 
-        Either<Vertex, TitanOperationStatus> childVertex = titanDao.getChildVertex(vertex, EdgeLabelEnum.CATEGORY, JsonParseFlagEnum.NoParse);
+        Either<Vertex, JanusGraphOperationStatus> childVertex = janusGraphDao
+            .getChildVertex(vertex, EdgeLabelEnum.CATEGORY, JsonParseFlagEnum.NoParse);
         if (childVertex.isRight()) {
             log.debug(FAILED_TO_FETCH_FOR_TOSCA_ELEMENT_WITH_ID_ERROR, EdgeLabelEnum.CATEGORY, catalogComponent.getUniqueId(), childVertex.right().value());
             return childVertex.right().value();
         }
         Vertex subCategoryV = childVertex.left().value();
         catalogComponent.setSubCategoryNormalizedName((String) subCategoryV.property(JsonPresentationFields.NORMALIZED_NAME.getPresentation()).value());
-        Either<Vertex, TitanOperationStatus> parentVertex = titanDao.getParentVertex(subCategoryV, EdgeLabelEnum.SUB_CATEGORY, JsonParseFlagEnum.NoParse);
+        Either<Vertex, JanusGraphOperationStatus> parentVertex = janusGraphDao
+            .getParentVertex(subCategoryV, EdgeLabelEnum.SUB_CATEGORY, JsonParseFlagEnum.NoParse);
         Vertex categoryV = parentVertex.left().value();
         catalogComponent.setCategoryNormalizedName((String) categoryV.property(JsonPresentationFields.NORMALIZED_NAME.getPresentation()).value());
 
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    protected TitanOperationStatus setServiceCategoryFromGraphV(Vertex vertex, CatalogComponent catalogComponent) {
-        Either<Vertex, TitanOperationStatus> childVertex = titanDao.getChildVertex(vertex, EdgeLabelEnum.CATEGORY, JsonParseFlagEnum.NoParse);
+    protected JanusGraphOperationStatus setServiceCategoryFromGraphV(Vertex vertex, CatalogComponent catalogComponent) {
+        Either<Vertex, JanusGraphOperationStatus> childVertex = janusGraphDao
+            .getChildVertex(vertex, EdgeLabelEnum.CATEGORY, JsonParseFlagEnum.NoParse);
         if (childVertex.isRight()) {
             log.debug(FAILED_TO_FETCH_FOR_TOSCA_ELEMENT_WITH_ID_ERROR, EdgeLabelEnum.CATEGORY, catalogComponent.getUniqueId(), childVertex.right().value());
             return childVertex.right().value();
@@ -907,14 +942,15 @@ public abstract class ToscaElementOperation extends BaseOperation {
         Vertex categoryV = childVertex.left().value();
         catalogComponent.setCategoryNormalizedName((String) categoryV.property(JsonPresentationFields.NORMALIZED_NAME.getPresentation()).value());
 
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    protected TitanOperationStatus setResourceCategoryFromGraph(GraphVertex componentV, ToscaElement toscaElement) {
+    protected JanusGraphOperationStatus setResourceCategoryFromGraph(GraphVertex componentV, ToscaElement toscaElement) {
         List<CategoryDefinition> categories = new ArrayList<>();
         SubCategoryDefinition subcategory;
 
-        Either<GraphVertex, TitanOperationStatus> childVertex = titanDao.getChildVertex(componentV, EdgeLabelEnum.CATEGORY, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> childVertex = janusGraphDao
+            .getChildVertex(componentV, EdgeLabelEnum.CATEGORY, JsonParseFlagEnum.NoParse);
         if (childVertex.isRight()) {
             log.debug(FAILED_TO_FETCH_FOR_TOSCA_ELEMENT_WITH_ID_ERROR, EdgeLabelEnum.CATEGORY, componentV.getUniqueId(), childVertex.right().value());
             return childVertex.right().value();
@@ -931,7 +967,8 @@ public abstract class ToscaElementOperation extends BaseOperation {
         List<String> iconsfromJsonSubcat = getGson().fromJson((String) metadataProperties.get(GraphPropertyEnum.ICONS), listTypeSubcat);
         subcategory.setIcons(iconsfromJsonSubcat);
 
-        Either<GraphVertex, TitanOperationStatus> parentVertex = titanDao.getParentVertex(subCategoryV, EdgeLabelEnum.SUB_CATEGORY, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> parentVertex = janusGraphDao
+            .getParentVertex(subCategoryV, EdgeLabelEnum.SUB_CATEGORY, JsonParseFlagEnum.NoParse);
         if (parentVertex.isRight()) {
             log.debug("failed to fetch {} for category with id {}, error {}", EdgeLabelEnum.SUB_CATEGORY, subCategoryV.getUniqueId(), parentVertex.right().value());
             return childVertex.right().value();
@@ -953,7 +990,7 @@ public abstract class ToscaElementOperation extends BaseOperation {
         categories.add(category);
         toscaElement.setCategories(categories);
 
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
     public <T extends ToscaElement> Either<T, StorageOperationStatus> updateToscaElement(T toscaElementToUpdate, GraphVertex elementV, ComponentParametersView filterResult) {
@@ -972,10 +1009,10 @@ public abstract class ToscaElementOperation extends BaseOperation {
             result = Either.right(StorageOperationStatus.BAD_REQUEST);
             return result;
         }
-        Either<GraphVertex, TitanOperationStatus> findUser = findUserVertex(modifierUserId);
+        Either<GraphVertex, JanusGraphOperationStatus> findUser = findUserVertex(modifierUserId);
 
         if (findUser.isRight()) {
-            TitanOperationStatus status = findUser.right().value();
+            JanusGraphOperationStatus status = findUser.right().value();
             log.error(CANNOT_FIND_USER_IN_THE_GRAPH_STATUS_IS, modifierUserId, status);
             return result;
         }
@@ -983,10 +1020,11 @@ public abstract class ToscaElementOperation extends BaseOperation {
         GraphVertex modifierV = findUser.left().value();
         String toscaElementId = toscaElementToUpdate.getUniqueId();
 
-        Either<GraphVertex, TitanOperationStatus> parentVertex = titanDao.getParentVertex(elementV, EdgeLabelEnum.LAST_MODIFIER, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> parentVertex = janusGraphDao
+            .getParentVertex(elementV, EdgeLabelEnum.LAST_MODIFIER, JsonParseFlagEnum.NoParse);
         if (parentVertex.isRight()) {
             log.debug("Failed to fetch last modifier for tosca element with id {} error {}", toscaElementId, parentVertex.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(parentVertex.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(parentVertex.right().value()));
         }
         GraphVertex userV = parentVertex.left().value();
         String currentModifier = (String) userV.getMetadataProperty(GraphPropertyEnum.USERID);
@@ -1018,11 +1056,11 @@ public abstract class ToscaElementOperation extends BaseOperation {
         // update all data on vertex
         fillToscaElementVertexData(elementV, toscaElementToUpdate, JsonParseFlagEnum.ParseMetadata);
 
-        Either<GraphVertex, TitanOperationStatus> updateElement = titanDao.updateVertex(elementV);
+        Either<GraphVertex, JanusGraphOperationStatus> updateElement = janusGraphDao.updateVertex(elementV);
 
         if (updateElement.isRight()) {
             log.error("Failed to update resource {}. status is {}", toscaElementId, updateElement.right().value());
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(updateElement.right().value()));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(updateElement.right().value()));
             return result;
         }
         GraphVertex updateElementV = updateElement.left().value();
@@ -1031,10 +1069,10 @@ public abstract class ToscaElementOperation extends BaseOperation {
         // file names accordingly
         String newSystemName = (String) updateElementV.getMetadataProperty(GraphPropertyEnum.SYSTEM_NAME);
         if (newSystemName != null && !newSystemName.equals(prevSystemName)) {
-            Either<Map<String, ArtifactDataDefinition>, TitanOperationStatus> resultToscaArt = getDataFromGraph(updateElementV, EdgeLabelEnum.TOSCA_ARTIFACTS);
+            Either<Map<String, ArtifactDataDefinition>, JanusGraphOperationStatus> resultToscaArt = getDataFromGraph(updateElementV, EdgeLabelEnum.TOSCA_ARTIFACTS);
             if (resultToscaArt.isRight()) {
                 log.debug("Failed to get  tosca artifact from graph for tosca element {} error {}", toscaElementId, resultToscaArt.right().value());
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(resultToscaArt.right().value()));
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(resultToscaArt.right().value()));
             }
 
             Map<String, ArtifactDataDefinition> toscaArtifacts = resultToscaArt.left().value();
@@ -1069,11 +1107,13 @@ public abstract class ToscaElementOperation extends BaseOperation {
     }
 
     protected StorageOperationStatus moveLastModifierEdge(GraphVertex elementV, GraphVertex modifierV) {
-        return DaoStatusConverter.convertTitanStatusToStorageStatus(titanDao.moveEdge(elementV, modifierV, EdgeLabelEnum.LAST_MODIFIER, Direction.IN));
+        return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(
+            janusGraphDao.moveEdge(elementV, modifierV, EdgeLabelEnum.LAST_MODIFIER, Direction.IN));
     }
 
     protected StorageOperationStatus moveCategoryEdge(GraphVertex elementV, GraphVertex categoryV) {
-        return DaoStatusConverter.convertTitanStatusToStorageStatus(titanDao.moveEdge(elementV, categoryV, EdgeLabelEnum.CATEGORY, Direction.OUT));
+        return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(
+            janusGraphDao.moveEdge(elementV, categoryV, EdgeLabelEnum.CATEGORY, Direction.OUT));
     }
 
     private void generateNewToscaFileName(String componentType, String componentName, ArtifactDataDefinition artifactInfo) {
@@ -1087,19 +1127,21 @@ public abstract class ToscaElementOperation extends BaseOperation {
         List<CategoryDefinition> newCategoryList = toscaElementToUpdate.getCategories();
         CategoryDefinition newCategory = newCategoryList.get(0);
 
-        Either<GraphVertex, TitanOperationStatus> childVertex = titanDao.getChildVertex(elementV, EdgeLabelEnum.CATEGORY, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> childVertex = janusGraphDao
+            .getChildVertex(elementV, EdgeLabelEnum.CATEGORY, JsonParseFlagEnum.NoParse);
         if (childVertex.isRight()) {
             log.debug(FAILED_TO_FETCH_FOR_TOSCA_ELEMENT_WITH_ID_ERROR, EdgeLabelEnum.CATEGORY, elementV.getUniqueId(), childVertex.right().value());
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(childVertex.right().value());
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(childVertex.right().value());
         }
         GraphVertex subCategoryV = childVertex.left().value();
         Map<GraphPropertyEnum, Object> metadataProperties = subCategoryV.getMetadataProperties();
         String subCategoryNameCurrent = (String) metadataProperties.get(GraphPropertyEnum.NAME);
 
-        Either<GraphVertex, TitanOperationStatus> parentVertex = titanDao.getParentVertex(subCategoryV, EdgeLabelEnum.SUB_CATEGORY, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> parentVertex = janusGraphDao
+            .getParentVertex(subCategoryV, EdgeLabelEnum.SUB_CATEGORY, JsonParseFlagEnum.NoParse);
         if (parentVertex.isRight()) {
             log.debug("failed to fetch {} for category with id {}, error {}", EdgeLabelEnum.SUB_CATEGORY, subCategoryV.getUniqueId(), parentVertex.right().value());
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(childVertex.right().value());
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(childVertex.right().value());
         }
         GraphVertex categoryV = parentVertex.left().value();
         metadataProperties = categoryV.getMetadataProperties();
@@ -1134,15 +1176,15 @@ public abstract class ToscaElementOperation extends BaseOperation {
     }
 
     public <T extends ToscaElement> Either<List<T>, StorageOperationStatus> getElementCatalogData(ComponentTypeEnum componentType, List<ResourceTypeEnum> excludeTypes, boolean isHighestVersions) {
-        Either<List<GraphVertex>, TitanOperationStatus> listOfComponents;
+        Either<List<GraphVertex>, JanusGraphOperationStatus> listOfComponents;
         if (isHighestVersions) {
             listOfComponents = getListOfHighestComponents(componentType, excludeTypes, JsonParseFlagEnum.NoParse);
         } else {
             listOfComponents = getListOfHighestAndAllCertifiedComponents(componentType, excludeTypes);
         }
 
-        if (listOfComponents.isRight() && listOfComponents.right().value() != TitanOperationStatus.NOT_FOUND) {
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(listOfComponents.right().value()));
+        if (listOfComponents.isRight() && listOfComponents.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(listOfComponents.right().value()));
         }
         List<T> result = new ArrayList<>();
         if (listOfComponents.isLeft()) {
@@ -1167,9 +1209,9 @@ public abstract class ToscaElementOperation extends BaseOperation {
         stopWatch.start();
 
         Map<String, CatalogComponent> existInCatalog = new HashMap<>();
-        Either<Iterator<Vertex>, TitanOperationStatus> verticesEither = titanDao.getCatalogOrArchiveVerticies(isCatalog);
+        Either<Iterator<Vertex>, JanusGraphOperationStatus> verticesEither = janusGraphDao.getCatalogOrArchiveVerticies(isCatalog);
         if (verticesEither.isRight()) {
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(verticesEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(verticesEither.right().value()));
         }
         Iterator<Vertex> vertices = verticesEither.left().value();
         while (vertices.hasNext()) {
@@ -1234,7 +1276,7 @@ public abstract class ToscaElementOperation extends BaseOperation {
         return isAddToCatalog;
     }
 
-    public Either<List<GraphVertex>, TitanOperationStatus> getListOfHighestComponents(ComponentTypeEnum
+    public Either<List<GraphVertex>, JanusGraphOperationStatus> getListOfHighestComponents(ComponentTypeEnum
                                                                                               componentType, List<ResourceTypeEnum> excludeTypes, JsonParseFlagEnum parseFlag) {
         Map<GraphPropertyEnum, Object> propertiesToMatch = new EnumMap<>(GraphPropertyEnum.class);
         Map<GraphPropertyEnum, Object> propertiesHasNotToMatch = new EnumMap<>(GraphPropertyEnum.class);
@@ -1248,14 +1290,15 @@ public abstract class ToscaElementOperation extends BaseOperation {
         propertiesHasNotToMatch.put(GraphPropertyEnum.IS_DELETED, true);
         propertiesHasNotToMatch.put(GraphPropertyEnum.IS_ARCHIVED, true); //US382674, US382683
 
-        return titanDao.getByCriteria(null, propertiesToMatch, propertiesHasNotToMatch, parseFlag);
+        return janusGraphDao
+            .getByCriteria(null, propertiesToMatch, propertiesHasNotToMatch, parseFlag);
     }
 
     // highest + (certified && !highest)
-    public Either<List<GraphVertex>, TitanOperationStatus> getListOfHighestAndAllCertifiedComponents
+    public Either<List<GraphVertex>, JanusGraphOperationStatus> getListOfHighestAndAllCertifiedComponents
     (ComponentTypeEnum componentType, List<ResourceTypeEnum> excludeTypes) {
         long startFetchAllStates = System.currentTimeMillis();
-        Either<List<GraphVertex>, TitanOperationStatus> highestNodes = getListOfHighestComponents(componentType, excludeTypes, JsonParseFlagEnum.ParseMetadata);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> highestNodes = getListOfHighestComponents(componentType, excludeTypes, JsonParseFlagEnum.ParseMetadata);
 
         Map<GraphPropertyEnum, Object> propertiesToMatchCertified = new EnumMap<>(GraphPropertyEnum.class);
         Map<GraphPropertyEnum, Object> propertiesHasNotToMatchCertified = new EnumMap<>(GraphPropertyEnum.class);
@@ -1270,8 +1313,9 @@ public abstract class ToscaElementOperation extends BaseOperation {
         propertiesHasNotToMatchCertified.put(GraphPropertyEnum.IS_ARCHIVED, true);  //US382674, US382683
         propertiesHasNotToMatchCertified.put(GraphPropertyEnum.IS_HIGHEST_VERSION, true);
 
-        Either<List<GraphVertex>, TitanOperationStatus> certifiedNotHighestNodes = titanDao.getByCriteria(null, propertiesToMatchCertified, propertiesHasNotToMatchCertified, JsonParseFlagEnum.ParseMetadata);
-        if (certifiedNotHighestNodes.isRight() && certifiedNotHighestNodes.right().value() != TitanOperationStatus.NOT_FOUND) {
+        Either<List<GraphVertex>, JanusGraphOperationStatus> certifiedNotHighestNodes = janusGraphDao
+            .getByCriteria(null, propertiesToMatchCertified, propertiesHasNotToMatchCertified, JsonParseFlagEnum.ParseMetadata);
+        if (certifiedNotHighestNodes.isRight() && certifiedNotHighestNodes.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
             return Either.right(certifiedNotHighestNodes.right().value());
         }
 
@@ -1298,32 +1342,33 @@ public abstract class ToscaElementOperation extends BaseOperation {
         props.put(GraphPropertyEnum.IS_DELETED, true);
         props.put(GraphPropertyEnum.COMPONENT_TYPE, componentType.name());
 
-        Either<List<GraphVertex>, TitanOperationStatus> componentsToDelete = titanDao.getByCriteria(null, props, JsonParseFlagEnum.NoParse);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> componentsToDelete = janusGraphDao
+            .getByCriteria(null, props, JsonParseFlagEnum.NoParse);
 
         if (componentsToDelete.isRight()) {
-            TitanOperationStatus error = componentsToDelete.right().value();
-            if (error.equals(TitanOperationStatus.NOT_FOUND)) {
+            JanusGraphOperationStatus error = componentsToDelete.right().value();
+            if (error.equals(JanusGraphOperationStatus.NOT_FOUND)) {
                 log.trace("no components to delete");
                 return Either.left(new ArrayList<>());
             } else {
                 log.info("failed to find components to delete. error : {}", error.name());
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(error));
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(error));
             }
         }
         return Either.left(componentsToDelete.left().value());
     }
 
-    protected TitanOperationStatus setAdditionalInformationFromGraph(GraphVertex componentV, ToscaElement
+    protected JanusGraphOperationStatus setAdditionalInformationFromGraph(GraphVertex componentV, ToscaElement
             toscaElement) {
-        Either<Map<String, AdditionalInfoParameterDataDefinition>, TitanOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.ADDITIONAL_INFORMATION);
+        Either<Map<String, AdditionalInfoParameterDataDefinition>, JanusGraphOperationStatus> result = getDataFromGraph(componentV, EdgeLabelEnum.ADDITIONAL_INFORMATION);
         if (result.isLeft()) {
             toscaElement.setAdditionalInformation(result.left().value());
         } else {
-            if (result.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (result.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 return result.right().value();
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
     // --------------------------------------------
@@ -1339,13 +1384,13 @@ public abstract class ToscaElementOperation extends BaseOperation {
     public abstract <T extends
             ToscaElement> Either<T, StorageOperationStatus> createToscaElement(ToscaElement toscaElement);
 
-    protected abstract <T extends ToscaElement> TitanOperationStatus
+    protected abstract <T extends ToscaElement> JanusGraphOperationStatus
     setCategoriesFromGraph(GraphVertex vertexComponent, T toscaElement);
 
-    protected abstract <T extends ToscaElement> TitanOperationStatus
+    protected abstract <T extends ToscaElement> JanusGraphOperationStatus
     setCapabilitiesFromGraph(GraphVertex componentV, T toscaElement);
 
-    protected abstract <T extends ToscaElement> TitanOperationStatus
+    protected abstract <T extends ToscaElement> JanusGraphOperationStatus
     setRequirementsFromGraph(GraphVertex componentV, T toscaElement);
 
     protected abstract <T extends ToscaElement> StorageOperationStatus
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaOperationFacade.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaOperationFacade.java
index dd9c3ca29e..43f3487924 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaOperationFacade.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaOperationFacade.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
 import org.apache.commons.collections.CollectionUtils;
@@ -27,20 +27,20 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.HealingTitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.HealingJanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.*;
 import org.openecomp.sdc.be.datatypes.elements.MapInterfaceDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.*;
 import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.catalog.CatalogComponent;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.TopologyTemplate;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
-import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsonjanusgraph.utils.ModelConverter;
 import org.openecomp.sdc.be.model.operations.StorageException;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
@@ -84,7 +84,7 @@ public class ToscaOperationFacade {
     @Autowired
     private GroupsOperation groupsOperation;
     @Autowired
-    private HealingTitanDao titanDao;
+    private HealingJanusGraphDao janusGraphDao;
 
     private static final Logger log = Logger.getLogger(ToscaOperationFacade.class.getName());
     // endregion
@@ -107,10 +107,11 @@ public class ToscaOperationFacade {
 
     public <T extends Component> Either<T, StorageOperationStatus> getToscaElement(String componentId, ComponentParametersView filters) {
 
-        Either<GraphVertex, TitanOperationStatus> getVertexEither = titanDao.getVertexById(componentId, filters.detectParseFlag());
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexEither = janusGraphDao
+            .getVertexById(componentId, filters.detectParseFlag());
         if (getVertexEither.isRight()) {
             log.debug(COULDNT_FETCH_COMPONENT_WITH_AND_UNIQUE_ID_ERROR, componentId, getVertexEither.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexEither.right().value()));
 
         }
         return getToscaElementByOperation(getVertexEither.left().value(), filters);
@@ -118,10 +119,11 @@ public class ToscaOperationFacade {
 
     public <T extends Component> Either<T, StorageOperationStatus> getToscaElement(String componentId, JsonParseFlagEnum parseFlag) {
 
-        Either<GraphVertex, TitanOperationStatus> getVertexEither = titanDao.getVertexById(componentId, parseFlag);
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexEither = janusGraphDao
+            .getVertexById(componentId, parseFlag);
         if (getVertexEither.isRight()) {
             log.debug(COULDNT_FETCH_COMPONENT_WITH_AND_UNIQUE_ID_ERROR, componentId, getVertexEither.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexEither.right().value()));
 
         }
         return getToscaElementByOperation(getVertexEither.left().value());
@@ -133,14 +135,15 @@ public class ToscaOperationFacade {
 
     public Either<Boolean, StorageOperationStatus> validateComponentExists(String componentId) {
 
-        Either<GraphVertex, TitanOperationStatus> getVertexEither = titanDao.getVertexById(componentId, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexEither = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.NoParse);
         if (getVertexEither.isRight()) {
-            TitanOperationStatus status = getVertexEither.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
+            JanusGraphOperationStatus status = getVertexEither.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
                 return Either.left(false);
             } else {
                 log.debug(COULDNT_FETCH_COMPONENT_WITH_AND_UNIQUE_ID_ERROR, componentId, getVertexEither.right().value());
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexEither.right().value()));
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexEither.right().value()));
             }
         }
         return Either.left(true);
@@ -152,10 +155,11 @@ public class ToscaOperationFacade {
         props.put(GraphPropertyEnum.STATE, LifecycleStateEnum.CERTIFIED.name());
         props.put(GraphPropertyEnum.IS_HIGHEST_VERSION, true);
 
-        Either<List<GraphVertex>, TitanOperationStatus> getVertexEither = titanDao.getByCriteria(ModelConverter.getVertexType(component), props);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> getVertexEither = janusGraphDao
+            .getByCriteria(ModelConverter.getVertexType(component), props);
         if (getVertexEither.isRight()) {
             log.debug(COULDNT_FETCH_COMPONENT_WITH_AND_UNIQUE_ID_ERROR, component.getUniqueId(), getVertexEither.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexEither.right().value()));
 
         }
         return getToscaElementByOperation(getVertexEither.left().value().get(0));
@@ -221,10 +225,11 @@ public class ToscaOperationFacade {
             return StorageOperationStatus.OK;
         } else {
 
-            Either<GraphVertex, TitanOperationStatus> getResponse = titanDao.getVertexById(componentToDelete.getUniqueId(), JsonParseFlagEnum.ParseAll);
+            Either<GraphVertex, JanusGraphOperationStatus> getResponse = janusGraphDao
+                .getVertexById(componentToDelete.getUniqueId(), JsonParseFlagEnum.ParseAll);
             if (getResponse.isRight()) {
                 log.debug(COULDNT_FETCH_COMPONENT_WITH_AND_UNIQUE_ID_ERROR, componentToDelete.getUniqueId(), getResponse.right().value());
-                return DaoStatusConverter.convertTitanStatusToStorageStatus(getResponse.right().value());
+                return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getResponse.right().value());
 
             }
             GraphVertex componentV = getResponse.left().value();
@@ -240,10 +245,11 @@ public class ToscaOperationFacade {
 
     public <T extends Component> Either<T, StorageOperationStatus> deleteToscaComponent(String componentId) {
 
-        Either<GraphVertex, TitanOperationStatus> getVertexEither = titanDao.getVertexById(componentId, JsonParseFlagEnum.ParseAll);
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexEither = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.ParseAll);
         if (getVertexEither.isRight()) {
             log.debug("Couldn't fetch component vertex with and unique id {}, error: {}", componentId, getVertexEither.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexEither.right().value()));
 
         }
         Either<ToscaElement, StorageOperationStatus> deleteElement = deleteToscaElement(getVertexEither.left().value());
@@ -303,14 +309,15 @@ public class ToscaOperationFacade {
         Map<GraphPropertyEnum, Object> properties = new EnumMap<>(GraphPropertyEnum.class);
         properties.put(GraphPropertyEnum.CSAR_UUID, csarUUID);
 
-        Either<List<GraphVertex>, TitanOperationStatus> resources = titanDao.getByCriteria(null, properties, JsonParseFlagEnum.ParseMetadata);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> resources = janusGraphDao
+            .getByCriteria(null, properties, JsonParseFlagEnum.ParseMetadata);
 
         if (resources.isRight()) {
-            if (resources.right().value() == TitanOperationStatus.NOT_FOUND) {
+            if (resources.right().value() == JanusGraphOperationStatus.NOT_FOUND) {
                 return StorageOperationStatus.OK;
             } else {
                 log.debug("failed to get resources from graph with property name: {}", csarUUID);
-                return DaoStatusConverter.convertTitanStatusToStorageStatus(resources.right().value());
+                return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(resources.right().value());
             }
         }
         return StorageOperationStatus.ENTITY_ALREADY_EXISTS;
@@ -351,12 +358,13 @@ public class ToscaOperationFacade {
         props.put(GraphPropertyEnum.TOSCA_RESOURCE_NAME, toscaResourceName);
         props.put(GraphPropertyEnum.IS_HIGHEST_VERSION, true);
         props.put(GraphPropertyEnum.STATE, LifecycleStateEnum.CERTIFIED.name());
-        Either<List<GraphVertex>, TitanOperationStatus> getLatestRes = titanDao.getByCriteria(vertexType, props, parseFlag);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> getLatestRes = janusGraphDao
+            .getByCriteria(vertexType, props, parseFlag);
 
         if (getLatestRes.isRight()) {
-            TitanOperationStatus status = getLatestRes.right().value();
+            JanusGraphOperationStatus status = getLatestRes.right().value();
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to fetch {} with name {}. status={} ", vertexType, toscaResourceName, status);
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
         if (result == null) {
             List<GraphVertex> resources = getLatestRes.left().value();
@@ -413,11 +421,12 @@ public class ToscaOperationFacade {
         Map<GraphPropertyEnum, Object> properties = new EnumMap<>(GraphPropertyEnum.class);
         properties.put(GraphPropertyEnum.TOSCA_RESOURCE_NAME, name);
 
-        Either<List<GraphVertex>, TitanOperationStatus> resources = titanDao.getByCriteria(null, properties, JsonParseFlagEnum.ParseMetadata);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> resources = janusGraphDao
+            .getByCriteria(null, properties, JsonParseFlagEnum.ParseMetadata);
 
-        if (resources.isRight() && resources.right().value() != TitanOperationStatus.NOT_FOUND) {
+        if (resources.isRight() && resources.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
             log.debug("failed to get resources from graph with property name: {}", name);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(resources.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(resources.right().value()));
         }
         List<GraphVertex> resourceList = (resources.isLeft() ? resources.left().value() : null);
         if (isNotEmpty(resourceList)) {
@@ -442,16 +451,18 @@ public class ToscaOperationFacade {
 
         copyArtifactsToNewComponent(newComponent, oldComponent);
 
-        Either<GraphVertex, TitanOperationStatus> componentVEither = titanDao.getVertexById(oldComponent.getUniqueId(), JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> componentVEither = janusGraphDao
+            .getVertexById(oldComponent.getUniqueId(), JsonParseFlagEnum.NoParse);
         if (componentVEither.isRight()) {
             log.debug("Falied to fetch component {} error {}", oldComponent.getUniqueId(), componentVEither.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(componentVEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(componentVEither.right().value()));
         }
         GraphVertex componentv = componentVEither.left().value();
-        Either<GraphVertex, TitanOperationStatus> parentVertexEither = titanDao.getParentVertex(componentv, EdgeLabelEnum.VERSION, JsonParseFlagEnum.NoParse);
-        if (parentVertexEither.isRight() && parentVertexEither.right().value() != TitanOperationStatus.NOT_FOUND) {
+        Either<GraphVertex, JanusGraphOperationStatus> parentVertexEither = janusGraphDao
+            .getParentVertex(componentv, EdgeLabelEnum.VERSION, JsonParseFlagEnum.NoParse);
+        if (parentVertexEither.isRight() && parentVertexEither.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
             log.debug("Falied to fetch parent version for component {} error {}", oldComponent.getUniqueId(), parentVertexEither.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(parentVertexEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(parentVertexEither.right().value()));
         }
 
         Either<ToscaElement, StorageOperationStatus> deleteToscaComponent = deleteToscaElement(componentv);
@@ -465,17 +476,20 @@ public class ToscaOperationFacade {
             return Either.right(createToscaComponent.right().value());
         }
         Resource newElement = createToscaComponent.left().value();
-        Either<GraphVertex, TitanOperationStatus> newVersionEither = titanDao.getVertexById(newElement.getUniqueId(), JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> newVersionEither = janusGraphDao
+            .getVertexById(newElement.getUniqueId(), JsonParseFlagEnum.NoParse);
         if (newVersionEither.isRight()) {
             log.debug("Falied to fetch new tosca element component {} error {}", newComponent.getUniqueId(), newVersionEither.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(newVersionEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(newVersionEither.right().value()));
         }
         if (parentVertexEither.isLeft()) {
             GraphVertex previousVersionV = parentVertexEither.left().value();
-            TitanOperationStatus createEdge = titanDao.createEdge(previousVersionV, newVersionEither.left().value(), EdgeLabelEnum.VERSION, null);
-            if (createEdge != TitanOperationStatus.OK) {
+            JanusGraphOperationStatus
+                createEdge = janusGraphDao
+                .createEdge(previousVersionV, newVersionEither.left().value(), EdgeLabelEnum.VERSION, null);
+            if (createEdge != JanusGraphOperationStatus.OK) {
                 log.debug("Falied to associate to previous version {} new version {} error {}", previousVersionV.getUniqueId(), newVersionEither.right().value(), createEdge);
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(createEdge));
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(createEdge));
             }
         }
         return Either.left(newElement);
@@ -512,10 +526,11 @@ public class ToscaOperationFacade {
 
     public <T extends Component> Either<T, StorageOperationStatus> updateToscaElement(T componentToUpdate, ComponentParametersView filterResult) {
         String componentId = componentToUpdate.getUniqueId();
-        Either<GraphVertex, TitanOperationStatus> getVertexEither = titanDao.getVertexById(componentId, JsonParseFlagEnum.ParseAll);
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexEither = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.ParseAll);
         if (getVertexEither.isRight()) {
             log.debug(COULDNT_FETCH_COMPONENT_WITH_AND_UNIQUE_ID_ERROR, componentId, getVertexEither.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexEither.right().value()));
         }
         GraphVertex elementV = getVertexEither.left().value();
         ToscaElementOperation toscaElementOperation = getToscaElementOperation(elementV);
@@ -544,11 +559,12 @@ public class ToscaOperationFacade {
 
         propertiesNotToMatch.put(GraphPropertyEnum.IS_DELETED, true);
 
-        Either<List<GraphVertex>, TitanOperationStatus> highestResources = titanDao.getByCriteria(null, propertiesToMatch, propertiesNotToMatch, parseFlag);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> highestResources = janusGraphDao
+            .getByCriteria(null, propertiesToMatch, propertiesNotToMatch, parseFlag);
         if (highestResources.isRight()) {
-            TitanOperationStatus status = highestResources.right().value();
+            JanusGraphOperationStatus status = highestResources.right().value();
             log.debug("failed to find resource with name {}. status={} ", nodeName, status);
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             return result;
         }
 
@@ -587,11 +603,12 @@ public class ToscaOperationFacade {
 
         propertiesNotToMatch.put(GraphPropertyEnum.IS_DELETED, true);
 
-        Either<List<GraphVertex>, TitanOperationStatus> getComponentsRes = titanDao.getByCriteria(null, propertiesToMatch, propertiesNotToMatch, JsonParseFlagEnum.ParseAll);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> getComponentsRes = janusGraphDao
+            .getByCriteria(null, propertiesToMatch, propertiesNotToMatch, JsonParseFlagEnum.ParseAll);
         if (getComponentsRes.isRight()) {
-            TitanOperationStatus status = getComponentsRes.right().value();
+            JanusGraphOperationStatus status = getComponentsRes.right().value();
             log.debug("Failed to fetch the component with system name {}. Status is {} ", systemName, status);
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
         if (result == null) {
             componentVertices = getComponentsRes.left().value();
@@ -629,11 +646,12 @@ public class ToscaOperationFacade {
         if (componentType != null) {
             hasProperties.put(GraphPropertyEnum.COMPONENT_TYPE, componentType.name());
         }
-        Either<List<GraphVertex>, TitanOperationStatus> getResourceRes = titanDao.getByCriteria(null, hasProperties, hasNotProperties, parseFlag);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> getResourceRes = janusGraphDao
+            .getByCriteria(null, hasProperties, hasNotProperties, parseFlag);
         if (getResourceRes.isRight()) {
-            TitanOperationStatus status = getResourceRes.right().value();
+            JanusGraphOperationStatus status = getResourceRes.right().value();
             log.debug("failed to find resource with name {}, version {}. Status is {} ", name, version, status);
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             return result;
         }
         return getToscaElementByOperation(getResourceRes.left().value().get(0));
@@ -711,7 +729,8 @@ public class ToscaOperationFacade {
             boolean isAllowedToDelete = true;
 
             for (EdgeLabelEnum edgeLabelEnum : forbiddenEdgeLabelEnums) {
-                Either<Edge, TitanOperationStatus> belongingEdgeByCriteria = titanDao.getBelongingEdgeByCriteria(elementV, edgeLabelEnum, null);
+                Either<Edge, JanusGraphOperationStatus> belongingEdgeByCriteria = janusGraphDao
+                    .getBelongingEdgeByCriteria(elementV, edgeLabelEnum, null);
                 if (belongingEdgeByCriteria.isLeft()){
                     log.debug("Marked element {} in use. don't delete it", elementV.getUniqueId());
                     isAllowedToDelete = false;
@@ -789,13 +808,14 @@ public class ToscaOperationFacade {
         StorageOperationStatus result = null;
         CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Going to add component instances to component {}", containerComponent.getUniqueId());
 
-        Either<GraphVertex, TitanOperationStatus> metadataVertex = titanDao.getVertexById(containerComponent.getUniqueId(), JsonParseFlagEnum.ParseAll);
+        Either<GraphVertex, JanusGraphOperationStatus> metadataVertex = janusGraphDao
+            .getVertexById(containerComponent.getUniqueId(), JsonParseFlagEnum.ParseAll);
         if (metadataVertex.isRight()) {
-            TitanOperationStatus status = metadataVertex.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.INVALID_ID;
+            JanusGraphOperationStatus status = metadataVertex.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.INVALID_ID;
             }
-            result = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+            result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
         }
         if (result == null) {
             result = nodeTemplateOperation.associateComponentInstancesToComponent(containerComponent, resourcesInstancesMap, metadataVertex.left().value(), allowDeleted);
@@ -920,10 +940,11 @@ public class ToscaOperationFacade {
 
     public Either<List<InputDefinition>, StorageOperationStatus> createAndAssociateInputs(Map<String, InputDefinition> inputs, String componentId) {
 
-        Either<GraphVertex, TitanOperationStatus> getVertexEither = titanDao.getVertexById(componentId, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexEither = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.NoParse);
         if (getVertexEither.isRight()) {
             log.debug(COULDNT_FETCH_COMPONENT_WITH_AND_UNIQUE_ID_ERROR, componentId, getVertexEither.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexEither.right().value()));
 
         }
 
@@ -948,10 +969,11 @@ public class ToscaOperationFacade {
 
     public Either<List<InputDefinition>, StorageOperationStatus> addInputsToComponent(Map<String, InputDefinition> inputs, String componentId) {
 
-        Either<GraphVertex, TitanOperationStatus> getVertexEither = titanDao.getVertexById(componentId, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexEither = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.NoParse);
         if (getVertexEither.isRight()) {
             log.debug(COULDNT_FETCH_COMPONENT_WITH_AND_UNIQUE_ID_ERROR, componentId, getVertexEither.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexEither.right().value()));
 
         }
 
@@ -984,11 +1006,12 @@ public class ToscaOperationFacade {
         log.trace("#addDataTypesToComponent - enter, componentId={}", componentId);
 
         /* get component vertex */
-        Either<GraphVertex, TitanOperationStatus> getVertexEither = titanDao.getVertexById(componentId, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexEither = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.NoParse);
         if (getVertexEither.isRight()) {
             /* not found / error */
             log.debug(COULDNT_FETCH_COMPONENT_WITH_AND_UNIQUE_ID_ERROR, componentId, getVertexEither.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexEither.right().value()));
         }
         GraphVertex vertex = getVertexEither.left().value();
         log.trace("#addDataTypesToComponent - get vertex ok");
@@ -1041,10 +1064,11 @@ public class ToscaOperationFacade {
 
     public Either<List<InputDefinition>, StorageOperationStatus> getComponentInputs(String componentId) {
 
-		Either<GraphVertex, TitanOperationStatus> getVertexEither = titanDao.getVertexById(componentId, JsonParseFlagEnum.NoParse);
+		Either<GraphVertex, JanusGraphOperationStatus> getVertexEither = janusGraphDao
+        .getVertexById(componentId, JsonParseFlagEnum.NoParse);
 		if (getVertexEither.isRight()) {
 			log.debug("Couldn't fetch component with and unique id {}, error: {}", componentId, getVertexEither.right().value());
-			return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexEither.right().value()));
+			return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexEither.right().value()));
 
 		}
 
@@ -1069,10 +1093,11 @@ public class ToscaOperationFacade {
 
 	public Either<List<InputDefinition>, StorageOperationStatus> updateInputsToComponent(List<InputDefinition> inputs, String componentId) {
 
-        Either<GraphVertex, TitanOperationStatus> getVertexEither = titanDao.getVertexById(componentId, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexEither = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.NoParse);
         if (getVertexEither.isRight()) {
             log.debug(COULDNT_FETCH_COMPONENT_WITH_AND_UNIQUE_ID_ERROR, componentId, getVertexEither.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexEither.right().value()));
 
         }
 
@@ -1096,10 +1121,11 @@ public class ToscaOperationFacade {
     // region - ComponentInstance
     public Either<Map<String, List<ComponentInstanceProperty>>, StorageOperationStatus> associateComponentInstancePropertiesToComponent(Map<String, List<ComponentInstanceProperty>> instProperties, String componentId) {
 
-        Either<GraphVertex, TitanOperationStatus> getVertexEither = titanDao.getVertexById(componentId, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexEither = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.NoParse);
         if (getVertexEither.isRight()) {
             log.debug(COULDNT_FETCH_COMPONENT_WITH_AND_UNIQUE_ID_ERROR, componentId, getVertexEither.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexEither.right().value()));
 
         }
 
@@ -1173,10 +1199,11 @@ public class ToscaOperationFacade {
 
     public Either<Map<String, List<ComponentInstanceInput>>, StorageOperationStatus> associateComponentInstanceInputsToComponent(Map<String, List<ComponentInstanceInput>> instInputs, String componentId) {
 
-        Either<GraphVertex, TitanOperationStatus> getVertexEither = titanDao.getVertexById(componentId, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexEither = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.NoParse);
         if (getVertexEither.isRight()) {
             log.debug(COULDNT_FETCH_COMPONENT_WITH_AND_UNIQUE_ID_ERROR, componentId, getVertexEither.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexEither.right().value()));
 
         }
         GraphVertex vertex = getVertexEither.left().value();
@@ -1365,10 +1392,11 @@ public class ToscaOperationFacade {
 
     public StorageOperationStatus associateDeploymentArtifactsToInstances(Map<String, Map<String, ArtifactDefinition>> instDeploymentArtifacts, String componentId, User user) {
 
-        Either<GraphVertex, TitanOperationStatus> getVertexEither = titanDao.getVertexById(componentId, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexEither = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.NoParse);
         if (getVertexEither.isRight()) {
             log.debug(COULDNT_FETCH_COMPONENT_WITH_AND_UNIQUE_ID_ERROR, componentId, getVertexEither.right().value());
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexEither.right().value());
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexEither.right().value());
 
         }
 
@@ -1392,10 +1420,11 @@ public class ToscaOperationFacade {
 
     public StorageOperationStatus associateArtifactsToInstances(Map<String, Map<String, ArtifactDefinition>> instArtifacts, String componentId) {
 
-        Either<GraphVertex, TitanOperationStatus> getVertexEither = titanDao.getVertexById(componentId, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexEither = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.NoParse);
         if (getVertexEither.isRight()) {
             log.debug(COULDNT_FETCH_COMPONENT_WITH_AND_UNIQUE_ID_ERROR, componentId, getVertexEither.right().value());
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexEither.right().value());
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexEither.right().value());
 
         }
 
@@ -1419,10 +1448,11 @@ public class ToscaOperationFacade {
 
     public StorageOperationStatus associateInstAttributeToComponentToInstances(Map<String, List<PropertyDefinition>> instArttributes, String componentId) {
 
-        Either<GraphVertex, TitanOperationStatus> getVertexEither = titanDao.getVertexById(componentId, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexEither = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.NoParse);
         if (getVertexEither.isRight()) {
             log.debug(COULDNT_FETCH_COMPONENT_WITH_AND_UNIQUE_ID_ERROR, componentId, getVertexEither.right().value());
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexEither.right().value());
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexEither.right().value());
 
         }
 
@@ -1444,10 +1474,11 @@ public class ToscaOperationFacade {
     // endregion
 
     public StorageOperationStatus associateOrAddCalculatedCapReq(Map<ComponentInstance, Map<String, List<CapabilityDefinition>>> instCapabilties, Map<ComponentInstance, Map<String, List<RequirementDefinition>>> instReg, String componentId) {
-        Either<GraphVertex, TitanOperationStatus> getVertexEither = titanDao.getVertexById(componentId, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexEither = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.NoParse);
         if (getVertexEither.isRight()) {
             log.debug(COULDNT_FETCH_COMPONENT_WITH_AND_UNIQUE_ID_ERROR, componentId, getVertexEither.right().value());
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexEither.right().value());
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexEither.right().value());
 
         }
 
@@ -1514,12 +1545,13 @@ public class ToscaOperationFacade {
         Map<GraphPropertyEnum, Object> hasProps = new EnumMap<>(GraphPropertyEnum.class);
         Map<GraphPropertyEnum, Object> hasNotProps = new EnumMap<>(GraphPropertyEnum.class);
         fillPropsMap(hasProps, hasNotProps, internalComponentType, componentTypeEnum, isAbstract, vertexType);
-        Either<List<GraphVertex>, TitanOperationStatus> getRes = titanDao.getByCriteria(vertexType, hasProps, hasNotProps, JsonParseFlagEnum.ParseMetadata);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> getRes = janusGraphDao
+            .getByCriteria(vertexType, hasProps, hasNotProps, JsonParseFlagEnum.ParseMetadata);
         if (getRes.isRight()) {
-            if (getRes.right().value().equals(TitanOperationStatus.NOT_FOUND)) {
+            if (getRes.right().value().equals(JanusGraphOperationStatus.NOT_FOUND)) {
                 return Either.left(new ArrayList<>());
             } else {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getRes.right().value()));
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getRes.right().value()));
             }
         }
         // region -> Fetch non checked-out services
@@ -1565,9 +1597,10 @@ public class ToscaOperationFacade {
         propertiesNotToMatch.put(GraphPropertyEnum.IS_DELETED, true);
         propertiesNotToMatch.put(GraphPropertyEnum.IS_ARCHIVED, true); //US382674, US382683
 
-        Either<List<GraphVertex>, TitanOperationStatus> getRes = titanDao.getByCriteria(null, hasProperties, propertiesNotToMatch, parseFlag);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> getRes = janusGraphDao
+            .getByCriteria(null, hasProperties, propertiesNotToMatch, parseFlag);
         if (getRes.isRight()) {
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getRes.right().value()));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getRes.right().value()));
         } else {
             List<ComponentMetadataData> latestVersionList = getRes.left().value().stream().map(ModelConverter::convertToComponentMetadata).collect(Collectors.toList());
             ComponentMetadataData latestVersion = latestVersionList.size() == 1 ? latestVersionList.get(0)
@@ -1579,9 +1612,10 @@ public class ToscaOperationFacade {
 
     public Either<ComponentMetadataData, StorageOperationStatus> getComponentMetadata(String componentId) {
         Either<ComponentMetadataData, StorageOperationStatus> result;
-        Either<GraphVertex, TitanOperationStatus> getRes = titanDao.getVertexById(componentId, JsonParseFlagEnum.ParseMetadata);
+        Either<GraphVertex, JanusGraphOperationStatus> getRes = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.ParseMetadata);
         if (getRes.isRight()) {
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getRes.right().value()));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getRes.right().value()));
         } else {
             ComponentMetadataData componentMetadata = ModelConverter.convertToComponentMetadata(getRes.left().value());
             result = Either.left(componentMetadata);
@@ -1672,10 +1706,11 @@ public class ToscaOperationFacade {
         properties.put(GraphPropertyEnum.NORMALIZED_NAME, normalizedName);
         properties.put(GraphPropertyEnum.COMPONENT_TYPE, componentType.name());
 
-        Either<List<GraphVertex>, TitanOperationStatus> vertexEither = titanDao.getByCriteria(vertexType, properties, JsonParseFlagEnum.NoParse);
-        if (vertexEither.isRight() && vertexEither.right().value() != TitanOperationStatus.NOT_FOUND) {
+        Either<List<GraphVertex>, JanusGraphOperationStatus> vertexEither = janusGraphDao
+            .getByCriteria(vertexType, properties, JsonParseFlagEnum.NoParse);
+        if (vertexEither.isRight() && vertexEither.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
             log.debug("failed to get vertex from graph with property normalizedName: {}", normalizedName);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(vertexEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(vertexEither.right().value()));
         }
         List<GraphVertex> vertexList = vertexEither.isLeft() ? vertexEither.left().value() : null;
         if (vertexList != null && !vertexList.isEmpty()) {
@@ -1776,9 +1811,10 @@ public class ToscaOperationFacade {
 
         Map<GraphPropertyEnum, Object> propertiesNotToMatch = new EnumMap<>(GraphPropertyEnum.class);
         propertiesNotToMatch.put(GraphPropertyEnum.IS_DELETED, true);
-        Either<List<GraphVertex>, TitanOperationStatus> vertexEither = titanDao.getByCriteria(null, propertiesToMatch, propertiesNotToMatch, JsonParseFlagEnum.ParseAll);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> vertexEither = janusGraphDao
+            .getByCriteria(null, propertiesToMatch, propertiesNotToMatch, JsonParseFlagEnum.ParseAll);
         if (vertexEither.isRight()) {
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(vertexEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(vertexEither.right().value()));
         }
 
         List<GraphVertex> vertexList = vertexEither.isLeft() ? vertexEither.left().value() : null;
@@ -1803,11 +1839,12 @@ public class ToscaOperationFacade {
         propertiesNotToMatch.put(GraphPropertyEnum.IS_DELETED, true);
         propertiesNotToMatch.put(GraphPropertyEnum.IS_ARCHIVED, true); //US382674, US382683
 
-        Either<List<GraphVertex>, TitanOperationStatus> vertexEither = titanDao.getByCriteria(null, propertiesToMatch, propertiesNotToMatch, JsonParseFlagEnum.ParseAll);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> vertexEither = janusGraphDao
+            .getByCriteria(null, propertiesToMatch, propertiesNotToMatch, JsonParseFlagEnum.ParseAll);
 
         if (vertexEither.isRight()) {
             log.debug("Couldn't fetch metadata for component with uuid {}, error: {}", componentUuid, vertexEither.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(vertexEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(vertexEither.right().value()));
         }
         List<GraphVertex> vertexList = vertexEither.isLeft() ? vertexEither.left().value() : null;
 
@@ -1883,11 +1920,12 @@ public class ToscaOperationFacade {
         propertiesToMatch.put(GraphPropertyEnum.COMPONENT_TYPE, ComponentTypeEnum.RESOURCE.name());
         propertiesNotToMatch.put(GraphPropertyEnum.IS_DELETED, true);
 
-        Either<List<GraphVertex>, TitanOperationStatus> getResourcesRes = titanDao.getByCriteria(null, propertiesToMatch, propertiesNotToMatch, JsonParseFlagEnum.ParseAll);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> getResourcesRes = janusGraphDao
+            .getByCriteria(null, propertiesToMatch, propertiesNotToMatch, JsonParseFlagEnum.ParseAll);
 
         if (getResourcesRes.isRight()) {
             log.debug("Failed to fetch all certified resources. Status is {}", getResourcesRes.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getResourcesRes.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getResourcesRes.right().value()));
         }
         List<GraphVertex> resourceVerticies = getResourcesRes.left().value();
         for (GraphVertex resourceV : resourceVerticies) {
@@ -1912,11 +1950,12 @@ public class ToscaOperationFacade {
 
         hasNotProperties.put(GraphPropertyEnum.IS_DELETED, true);
 
-        Either<List<GraphVertex>, TitanOperationStatus> getResourceRes = titanDao.getByCriteria(null, hasProperties, hasNotProperties, parseFlag);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> getResourceRes = janusGraphDao
+            .getByCriteria(null, hasProperties, hasNotProperties, parseFlag);
         if (getResourceRes.isRight()) {
-            TitanOperationStatus status = getResourceRes.right().value();
+            JanusGraphOperationStatus status = getResourceRes.right().value();
             log.debug("failed to find resource with name {}, version {}. Status is {} ", name, version, status);
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             return result;
         }
         return getToscaElementByOperation(getResourceRes.left().value().get(0));
@@ -1938,21 +1977,24 @@ public class ToscaOperationFacade {
 
         GraphVertex resourceMetadataData = null;
         List<GraphVertex> resourceMetadataDataList = null;
-        Either<List<GraphVertex>, TitanOperationStatus> byCsar = titanDao.getByCriteria(null, props, propsHasNot, JsonParseFlagEnum.ParseMetadata);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> byCsar = janusGraphDao
+            .getByCriteria(null, props, propsHasNot, JsonParseFlagEnum.ParseMetadata);
         if (byCsar.isRight()) {
-            if (TitanOperationStatus.NOT_FOUND == byCsar.right().value()) {
+            if (JanusGraphOperationStatus.NOT_FOUND == byCsar.right().value()) {
                 // Fix Defect DE256036
                 if (StringUtils.isEmpty(systemName)) {
-                    return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(TitanOperationStatus.NOT_FOUND));
+                    return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(
+                        JanusGraphOperationStatus.NOT_FOUND));
                 }
 
                 props.clear();
                 props.put(GraphPropertyEnum.IS_HIGHEST_VERSION, true);
                 props.put(GraphPropertyEnum.SYSTEM_NAME, systemName);
-                Either<List<GraphVertex>, TitanOperationStatus> bySystemname = titanDao.getByCriteria(null, props, JsonParseFlagEnum.ParseMetadata);
+                Either<List<GraphVertex>, JanusGraphOperationStatus> bySystemname = janusGraphDao
+                    .getByCriteria(null, props, JsonParseFlagEnum.ParseMetadata);
                 if (bySystemname.isRight()) {
                     log.debug("getLatestResourceByCsarOrName - Failed to find by system name {}  error {} ", systemName, bySystemname.right().value());
-                    return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(bySystemname.right().value()));
+                    return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(bySystemname.right().value()));
                 }
                 if (bySystemname.left().value().size() > 2) {
                     log.debug("getLatestResourceByCsarOrName - getByCriteria(by system name) must return only 2 latest version, but was returned - {}", bySystemname.left().value().size());
@@ -2035,10 +2077,11 @@ public class ToscaOperationFacade {
         props.put(GraphPropertyEnum.IS_HIGHEST_VERSION, true);
         Map<GraphPropertyEnum, Object> propsHasNotToMatch = new EnumMap<>(GraphPropertyEnum.class);
         propsHasNotToMatch.put(GraphPropertyEnum.IS_DELETED, true);
-        Either<List<GraphVertex>, TitanOperationStatus> resourcesByTypeEither = titanDao.getByCriteria(null, props, propsHasNotToMatch, JsonParseFlagEnum.ParseMetadata);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> resourcesByTypeEither = janusGraphDao
+            .getByCriteria(null, props, propsHasNotToMatch, JsonParseFlagEnum.ParseMetadata);
 
         if (resourcesByTypeEither.isRight()) {
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(resourcesByTypeEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(resourcesByTypeEither.right().value()));
         }
 
         List<GraphVertex> vertexList = resourcesByTypeEither.left().value();
@@ -2052,7 +2095,7 @@ public class ToscaOperationFacade {
     }
 
     public void commit() {
-        titanDao.commit();
+        janusGraphDao.commit();
     }
 
     public Either<Service, StorageOperationStatus> updateDistributionStatus(Service service, User user, DistributionStatusEnum distributionStatus) {
@@ -2070,21 +2113,22 @@ public class ToscaOperationFacade {
 
         Either<ComponentMetadataData, StorageOperationStatus> result = null;
         GraphVertex serviceVertex;
-        Either<GraphVertex, TitanOperationStatus> updateRes = null;
-        Either<GraphVertex, TitanOperationStatus> getRes = titanDao.getVertexById(component.getUniqueId(), JsonParseFlagEnum.ParseMetadata);
+        Either<GraphVertex, JanusGraphOperationStatus> updateRes = null;
+        Either<GraphVertex, JanusGraphOperationStatus> getRes = janusGraphDao
+            .getVertexById(component.getUniqueId(), JsonParseFlagEnum.ParseMetadata);
         if (getRes.isRight()) {
-            TitanOperationStatus status = getRes.right().value();
+            JanusGraphOperationStatus status = getRes.right().value();
             log.error("Failed to fetch component {}. status is {}", component.getUniqueId(), status);
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
         if (result == null) {
             serviceVertex = getRes.left().value();
             long lastUpdateDate = System.currentTimeMillis();
             serviceVertex.setJsonMetadataField(JsonPresentationFields.LAST_UPDATE_DATE, lastUpdateDate);
             component.setLastUpdateDate(lastUpdateDate);
-            updateRes = titanDao.updateVertex(serviceVertex);
+            updateRes = janusGraphDao.updateVertex(serviceVertex);
             if (updateRes.isRight()) {
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(updateRes.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(updateRes.right().value()));
             }
         }
         if (result == null) {
@@ -2093,8 +2137,8 @@ public class ToscaOperationFacade {
         return result;
     }
 
-    public HealingTitanDao getTitanDao() {
-        return titanDao;
+    public HealingJanusGraphDao getJanusGraphDao() {
+        return janusGraphDao;
     }
 
     public Either<List<Service>, StorageOperationStatus> getCertifiedServicesWithDistStatus(Set<DistributionStatusEnum> distStatus) {
@@ -2136,11 +2180,12 @@ public class ToscaOperationFacade {
     }
 
     private Either<List<Service>, StorageOperationStatus> fetchServicesByCriteria(List<Service> servicesAll, Map<GraphPropertyEnum, Object> propertiesToMatch, Map<GraphPropertyEnum, Object> propertiesNotToMatch) {
-        Either<List<GraphVertex>, TitanOperationStatus> getRes = titanDao.getByCriteria(VertexTypeEnum.TOPOLOGY_TEMPLATE, propertiesToMatch, propertiesNotToMatch, JsonParseFlagEnum.ParseAll);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> getRes = janusGraphDao
+            .getByCriteria(VertexTypeEnum.TOPOLOGY_TEMPLATE, propertiesToMatch, propertiesNotToMatch, JsonParseFlagEnum.ParseAll);
         if (getRes.isRight()) {
-            if (getRes.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (getRes.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to fetch certified services by match properties {} not match properties {} . Status is {}. ", propertiesToMatch, propertiesNotToMatch, getRes.right().value());
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getRes.right().value()));
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getRes.right().value()));
             }
         } else {
             for (GraphVertex vertex : getRes.left().value()) {
@@ -2158,7 +2203,7 @@ public class ToscaOperationFacade {
     }
 
     public void rollback() {
-        titanDao.rollback();
+        janusGraphDao.rollback();
     }
 
     public StorageOperationStatus addDeploymentArtifactsToInstance(String componentId, ComponentInstance componentInstance, Map<String, ArtifactDefinition> finalDeploymentArtifacts) {
@@ -2505,10 +2550,11 @@ public class ToscaOperationFacade {
 
     public Either<Component, StorageOperationStatus> shouldUpgradeToLatestDerived(Resource clonedResource) {
         String componentId = clonedResource.getUniqueId();
-        Either<GraphVertex, TitanOperationStatus> getVertexEither = titanDao.getVertexById(componentId, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexEither = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.NoParse);
         if (getVertexEither.isRight()) {
             log.debug(COULDNT_FETCH_COMPONENT_WITH_AND_UNIQUE_ID_ERROR, componentId, getVertexEither.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexEither.right().value()));
 
         }
         GraphVertex nodeTypeV = getVertexEither.left().value();
@@ -2518,7 +2564,7 @@ public class ToscaOperationFacade {
         Either<ToscaElement, StorageOperationStatus> shouldUpdateDerivedVersion = nodeTypeOperation.shouldUpdateDerivedVersion(toscaElementToUpdate, nodeTypeV);
         if (shouldUpdateDerivedVersion.isRight() && StorageOperationStatus.OK != shouldUpdateDerivedVersion.right().value()) {
             log.debug("Failed to update derived version for node type {} derived {}, error: {}", componentId, clonedResource.getDerivedFrom().get(0), shouldUpdateDerivedVersion.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexEither.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexEither.right().value()));
         }
         if (shouldUpdateDerivedVersion.isLeft()) {
             return Either.left(ModelConverter.convertFromToscaElement(shouldUpdateDerivedVersion.left().value()));
@@ -2559,11 +2605,11 @@ public class ToscaOperationFacade {
 
     public Either<PolicyDefinition, StorageOperationStatus> associatePolicyToComponent(String componentId, PolicyDefinition policyDefinition, int counter) {
         Either<PolicyDefinition, StorageOperationStatus> result = null;
-        Either<GraphVertex, TitanOperationStatus> getVertexEither;
-        getVertexEither = titanDao.getVertexById(componentId, JsonParseFlagEnum.ParseMetadata);
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexEither;
+        getVertexEither = janusGraphDao.getVertexById(componentId, JsonParseFlagEnum.ParseMetadata);
         if (getVertexEither.isRight()) {
             log.error(COULDNT_FETCH_A_COMPONENT_WITH_AND_UNIQUE_ID_ERROR, componentId, getVertexEither.right().value());
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexEither.right().value()));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexEither.right().value()));
         } else {
             if (getVertexEither.left().value().getLabel() != VertexTypeEnum.TOPOLOGY_TEMPLATE) {
                 log.error("Policy association to component of Tosca type {} is not allowed. ", getVertexEither.left().value().getLabel());
@@ -2584,18 +2630,18 @@ public class ToscaOperationFacade {
 
     public StorageOperationStatus associatePoliciesToComponent(String componentId, List<PolicyDefinition> policies) {
         log.debug("#associatePoliciesToComponent - associating policies for component {}.", componentId);
-        return titanDao.getVertexById(componentId, JsonParseFlagEnum.ParseMetadata)
+        return janusGraphDao.getVertexById(componentId, JsonParseFlagEnum.ParseMetadata)
                 .either(containerVertex -> topologyTemplateOperation.addPoliciesToToscaElement(containerVertex, policies),
-                        DaoStatusConverter::convertTitanStatusToStorageStatus);
+                        DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
     }
 
     public Either<PolicyDefinition, StorageOperationStatus> updatePolicyOfComponent(String componentId, PolicyDefinition policyDefinition) {
         Either<PolicyDefinition, StorageOperationStatus> result = null;
-        Either<GraphVertex, TitanOperationStatus> getVertexEither;
-        getVertexEither = titanDao.getVertexById(componentId, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexEither;
+        getVertexEither = janusGraphDao.getVertexById(componentId, JsonParseFlagEnum.NoParse);
         if (getVertexEither.isRight()) {
             log.error(COULDNT_FETCH_A_COMPONENT_WITH_AND_UNIQUE_ID_ERROR, componentId, getVertexEither.right().value());
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexEither.right().value()));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexEither.right().value()));
         }
         if (result == null) {
             StorageOperationStatus status = topologyTemplateOperation.updatePolicyOfToscaElement(getVertexEither.left().value(), policyDefinition);
@@ -2611,19 +2657,20 @@ public class ToscaOperationFacade {
 
     public StorageOperationStatus updatePoliciesOfComponent(String componentId, List<PolicyDefinition> policyDefinition) {
         log.debug("#updatePoliciesOfComponent - updating policies for component {}", componentId);
-        return titanDao.getVertexById(componentId, JsonParseFlagEnum.NoParse)
+        return janusGraphDao.getVertexById(componentId, JsonParseFlagEnum.NoParse)
                 .right()
-                .map(DaoStatusConverter::convertTitanStatusToStorageStatus)
+                .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus)
                 .either(containerVertex -> topologyTemplateOperation.updatePoliciesOfToscaElement(containerVertex, policyDefinition),
                         err -> err);
     }
 
     public StorageOperationStatus removePolicyFromComponent(String componentId, String policyId) {
         StorageOperationStatus status = null;
-        Either<GraphVertex, TitanOperationStatus> getVertexEither = titanDao.getVertexById(componentId, JsonParseFlagEnum.NoParse);
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexEither = janusGraphDao
+            .getVertexById(componentId, JsonParseFlagEnum.NoParse);
         if (getVertexEither.isRight()) {
             log.error(COULDNT_FETCH_A_COMPONENT_WITH_AND_UNIQUE_ID_ERROR, componentId, getVertexEither.right().value());
-            status = DaoStatusConverter.convertTitanStatusToStorageStatus(getVertexEither.right().value());
+            status = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getVertexEither.right().value());
         }
         if (status == null) {
             status = topologyTemplateOperation.removePolicyFromToscaElement(getVertexEither.left().value(), policyId);
@@ -2632,15 +2679,15 @@ public class ToscaOperationFacade {
     }
 
     public boolean canAddGroups(String componentId) {
-        GraphVertex vertex = titanDao.getVertexById(componentId)
+        GraphVertex vertex = janusGraphDao.getVertexById(componentId)
                 .left()
-                .on(this::onTitanError);
+                .on(this::onJanusGraphError);
         return topologyTemplateOperation.hasEdgeOfType(vertex, EdgeLabelEnum.GROUPS);
     }
 
-    GraphVertex onTitanError(TitanOperationStatus toe) {
+    GraphVertex onJanusGraphError(JanusGraphOperationStatus toe) {
         throw new StorageException(
-                DaoStatusConverter.convertTitanStatusToStorageStatus(toe));
+                DaoStatusConverter.convertJanusGraphStatusToStorageStatus(toe));
     }
 
     public void updateNamesOfCalculatedCapabilitiesRequirements(String componentId){
@@ -2672,7 +2719,7 @@ public class ToscaOperationFacade {
 
     public Either<Boolean, StorageOperationStatus> isComponentInUse(String componentId) {
         final List<EdgeLabelEnum> forbiddenEdgeLabelEnums = Arrays.asList(EdgeLabelEnum.INSTANCE_OF, EdgeLabelEnum.PROXY_OF, EdgeLabelEnum.ALLOTTED_OF);
-        Either<GraphVertex, TitanOperationStatus> vertexById = titanDao.getVertexById(componentId);
+        Either<GraphVertex, JanusGraphOperationStatus> vertexById = janusGraphDao.getVertexById(componentId);
         if (vertexById.isLeft()) {
             for (EdgeLabelEnum edgeLabelEnum : forbiddenEdgeLabelEnums) {
                 Iterator<Edge> edgeItr = vertexById.left().value().getVertex().edges(Direction.IN, edgeLabelEnum.name());
@@ -2693,11 +2740,12 @@ public class ToscaOperationFacade {
 		}
 		propertiesToMatch.put(GraphPropertyEnum.INVARIANT_UUID, componentInvariantUuid);
 
-		Either<List<GraphVertex>, TitanOperationStatus> vertexEither = titanDao.getByCriteria(null, propertiesToMatch, JsonParseFlagEnum.ParseMetadata);
+		Either<List<GraphVertex>, JanusGraphOperationStatus> vertexEither = janusGraphDao
+        .getByCriteria(null, propertiesToMatch, JsonParseFlagEnum.ParseMetadata);
 
 		if (vertexEither.isRight()) {
 			log.debug("Couldn't fetch metadata for component with type {} and invariantUUId {}, error: {}", componentInvariantUuid, vertexEither.right().value());
-			return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(vertexEither.right().value()));
+			return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(vertexEither.right().value()));
 		}
 		List<GraphVertex> vertexList = vertexEither.isLeft() ? vertexEither.left().value() : null;
 
@@ -2722,10 +2770,11 @@ public class ToscaOperationFacade {
     public Either<List<Component>, StorageOperationStatus> getParentComponents(String componentId) {
         List<Component> parentComponents = new ArrayList<>();
         final List<EdgeLabelEnum> relationEdgeLabelEnums = Arrays.asList(EdgeLabelEnum.INSTANCE_OF, EdgeLabelEnum.PROXY_OF);
-        Either<GraphVertex, TitanOperationStatus> vertexById = titanDao.getVertexById(componentId);
+        Either<GraphVertex, JanusGraphOperationStatus> vertexById = janusGraphDao.getVertexById(componentId);
         if (vertexById.isLeft()) {
             for (EdgeLabelEnum edgeLabelEnum : relationEdgeLabelEnums) {
-                Either<GraphVertex, TitanOperationStatus> parentVertexEither = titanDao.getParentVertex(vertexById.left().value(), edgeLabelEnum, JsonParseFlagEnum.ParseJson);
+                Either<GraphVertex, JanusGraphOperationStatus> parentVertexEither = janusGraphDao
+                    .getParentVertex(vertexById.left().value(), edgeLabelEnum, JsonParseFlagEnum.ParseJson);
                 if(parentVertexEither.isLeft()){
                     Either<Component, StorageOperationStatus> componentEither = getToscaElement(parentVertexEither.left().value().getUniqueId());
                     if(componentEither.isLeft()){
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/UpgradeOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/UpgradeOperation.java
index 5faa6bb8ad..3596fff3ec 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/UpgradeOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/UpgradeOperation.java
@@ -1,20 +1,20 @@
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgePropertyEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.ComponentInstanceDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.CompositionDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum;
 import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.model.ComponentDependency;
-import org.openecomp.sdc.be.model.jsontitan.enums.JsonConstantKeysEnum;
+import org.openecomp.sdc.be.model.jsonjanusgraph.enums.JsonConstantKeysEnum;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
 import org.openecomp.sdc.common.log.wrappers.Logger;
@@ -29,10 +29,10 @@ public class UpgradeOperation extends BaseOperation {
     private static final Logger log = Logger.getLogger(UpgradeOperation.class.getName());
 
     public Either<List<ComponentDependency>, StorageOperationStatus> getComponentDependencies(String componentId) {
-        Either<GraphVertex, TitanOperationStatus> vertexById = titanDao.getVertexById(componentId);
+        Either<GraphVertex, JanusGraphOperationStatus> vertexById = janusGraphDao.getVertexById(componentId);
         if (vertexById.isRight()) {
             log.debug("Failed to fetch vertex with id {} error {}", componentId, vertexById.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(vertexById.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(vertexById.right().value()));
         }
         List<ComponentDependency> dependencies = new ArrayList<>();
 
@@ -44,24 +44,26 @@ public class UpgradeOperation extends BaseOperation {
         }
 
         GraphVertex vertexToStart = vertex;
-        Function<GraphVertex, Either<GraphVertex, TitanOperationStatus>> getNextElement = vertexP -> titanDao.getParentVertex(vertexP, EdgeLabelEnum.VERSION, JsonParseFlagEnum.ParseAll);
+        Function<GraphVertex, Either<GraphVertex, JanusGraphOperationStatus>> getNextElement = vertexP -> janusGraphDao
+            .getParentVertex(vertexP, EdgeLabelEnum.VERSION, JsonParseFlagEnum.ParseAll);
         status = handleVersionChain(componentId, dependencies, vertex, getNextElement);
         if (status != StorageOperationStatus.OK) {
             return Either.right(status);
         }
         vertex = vertexToStart;
-        getNextElement = vertexP -> titanDao.getChildVertex(vertexP, EdgeLabelEnum.VERSION, JsonParseFlagEnum.ParseAll);
+        getNextElement = vertexP -> janusGraphDao
+            .getChildVertex(vertexP, EdgeLabelEnum.VERSION, JsonParseFlagEnum.ParseAll);
         status = handleVersionChain(componentId, dependencies, vertex, getNextElement);
 
         return status == StorageOperationStatus.OK ? Either.left(dependencies) : Either.right(status);
     }
 
-    private StorageOperationStatus handleVersionChain(String componentId, List<ComponentDependency> dependencies, GraphVertex vertexToStart, Function<GraphVertex, Either<GraphVertex, TitanOperationStatus>> getNextElement) {
+    private StorageOperationStatus handleVersionChain(String componentId, List<ComponentDependency> dependencies, GraphVertex vertexToStart, Function<GraphVertex, Either<GraphVertex, JanusGraphOperationStatus>> getNextElement) {
 
         StorageOperationStatus status;
         boolean nextInChain = true;
         GraphVertex vertex = vertexToStart;
-        Either<GraphVertex, TitanOperationStatus> nextInChainV;
+        Either<GraphVertex, JanusGraphOperationStatus> nextInChainV;
         while (nextInChain) {
             nextInChainV = getNextElement.apply(vertex);
             if (nextInChainV.isRight()) {
@@ -103,10 +105,11 @@ public class UpgradeOperation extends BaseOperation {
     }
 
     private StorageOperationStatus fillDependenciesByLabel(String componentId, GraphVertex vertex, ComponentDependency dependency, EdgeLabelEnum label) {
-        Either<List<GraphVertex>, TitanOperationStatus> parentVertecies = titanDao.getParentVertecies(vertex, label, JsonParseFlagEnum.ParseAll);
-        if (parentVertecies.isRight() && parentVertecies.right().value() != TitanOperationStatus.NOT_FOUND) {
+        Either<List<GraphVertex>, JanusGraphOperationStatus> parentVertecies = janusGraphDao
+            .getParentVertecies(vertex, label, JsonParseFlagEnum.ParseAll);
+        if (parentVertecies.isRight() && parentVertecies.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
             log.debug("Failed to fetch parent verticies by label INSTANCE_OF for vertex with id {} error {}", componentId, parentVertecies.right().value());
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(parentVertecies.right().value());
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(parentVertecies.right().value());
         }
         if (parentVertecies.isLeft()) {
             List<ComponentDependency> existIn = new ArrayList<>( );
@@ -119,8 +122,8 @@ public class UpgradeOperation extends BaseOperation {
     private void handleHighestVersion(GraphVertex vertexOrigin, EdgeLabelEnum label, List<ComponentDependency> exisIn, GraphVertex containerVertex) {
         Boolean isHighest = (Boolean) containerVertex.getMetadataProperty(GraphPropertyEnum.IS_HIGHEST_VERSION);
         if ( isHighest && needToAddToDepenedency(containerVertex) ) {  
-            TitanVertex titanVertex = containerVertex.getVertex();
-            Iterator<Edge> edges = titanVertex.edges(Direction.OUT, EdgeLabelEnum.VERSION.name());
+            JanusGraphVertex janusGraphVertex = containerVertex.getVertex();
+            Iterator<Edge> edges = janusGraphVertex.edges(Direction.OUT, EdgeLabelEnum.VERSION.name());
             //verify that it is a last version - highest by version number
             if ( edges == null || !edges.hasNext() ){
                 ComponentDependency container = fillDataFromVertex(containerVertex, vertexOrigin.getUniqueId(), label);
@@ -137,14 +140,15 @@ public class UpgradeOperation extends BaseOperation {
     }
 
     private boolean findAllottedChain(GraphVertex vertex, ComponentDependency container) {
-        Either<List<GraphVertex>, TitanOperationStatus> parentVertecies = titanDao.getParentVertecies(vertex, EdgeLabelEnum.INSTANCE_OF, JsonParseFlagEnum.ParseAll);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> parentVertecies = janusGraphDao
+            .getParentVertecies(vertex, EdgeLabelEnum.INSTANCE_OF, JsonParseFlagEnum.ParseAll);
         if (parentVertecies.isLeft()) {
             List<ComponentDependency> existIn = new ArrayList<>();
             parentVertecies.left().value().forEach(v -> {
                 Boolean isHighest = (Boolean) v.getMetadataProperty(GraphPropertyEnum.IS_HIGHEST_VERSION);
                 if ( isHighest && needToAddToDepenedency(v) ) {
-                   TitanVertex titanVertex = v.getVertex();
-                   Iterator<Edge> edges = titanVertex.edges(Direction.OUT, EdgeLabelEnum.VERSION.name());
+                   JanusGraphVertex janusGraphVertex = v.getVertex();
+                   Iterator<Edge> edges = janusGraphVertex.edges(Direction.OUT, EdgeLabelEnum.VERSION.name());
                    //verify that it is a last version - highest by version number
                    if ( edges == null || !edges.hasNext() ){
                        ComponentDependency parentContainer = fillDataFromVertex(v, vertex.getUniqueId(), EdgeLabelEnum.INSTANCE_OF);
@@ -178,14 +182,15 @@ public class UpgradeOperation extends BaseOperation {
     private void findInstanceNames(GraphVertex v, String originId, EdgeLabelEnum edgeLabel, ComponentDependency container) {
         Map<String, CompositionDataDefinition> jsonComposition = (Map<String, CompositionDataDefinition>) v.getJson();
         CompositionDataDefinition compositionDataDefinition = jsonComposition.get(JsonConstantKeysEnum.COMPOSITION.getValue());
-        TitanVertex vertex = v.getVertex();
+        JanusGraphVertex vertex = v.getVertex();
         Iterator<Edge> edges = vertex.edges(Direction.OUT, edgeLabel.name());
         while (edges != null && edges.hasNext()) {
             Edge edge = edges.next();
-            TitanVertex inVertex = (TitanVertex) edge.inVertex();
-            String id = (String) titanDao.getProperty(inVertex, GraphPropertyEnum.UNIQUE_ID.getProperty());
+            JanusGraphVertex inVertex = (JanusGraphVertex) edge.inVertex();
+            String id = (String) janusGraphDao.getProperty(inVertex, GraphPropertyEnum.UNIQUE_ID.getProperty());
             if (id.equals(originId)) {
-                List<String> instanceOnEdge = (List<String>) titanDao.getProperty(edge, EdgePropertyEnum.INSTANCES);
+                List<String> instanceOnEdge = (List<String>) janusGraphDao
+                    .getProperty(edge, EdgePropertyEnum.INSTANCES);
                 Map<String, ComponentInstanceDataDefinition> componentInstances = compositionDataDefinition.getComponentInstances();
 
                 if (componentInstances != null) {
@@ -205,17 +210,18 @@ public class UpgradeOperation extends BaseOperation {
     }
 
     public List<String> getInstanceIdFromAllottedEdge(String resourceId, String serviceInvariantUUID) {
-      Either<GraphVertex, TitanOperationStatus> vertexById = titanDao.getVertexById(resourceId);
+      Either<GraphVertex, JanusGraphOperationStatus> vertexById = janusGraphDao.getVertexById(resourceId);
       if ( vertexById.isLeft() ){
           GraphVertex vertexG = vertexById.left().value();
-          TitanVertex vertex = vertexG.getVertex();
+          JanusGraphVertex vertex = vertexG.getVertex();
           Iterator<Edge> edges = vertex.edges(Direction.OUT, EdgeLabelEnum.ALLOTTED_OF.name());
           while ( edges != null && edges.hasNext() ){
               Edge edge = edges.next();
-              TitanVertex inVertex = (TitanVertex)edge.inVertex();
-              String vertexInInvUUID = (String) titanDao.getProperty(inVertex, GraphPropertyEnum.INVARIANT_UUID.getProperty());
+              JanusGraphVertex inVertex = (JanusGraphVertex)edge.inVertex();
+              String vertexInInvUUID = (String) janusGraphDao
+                  .getProperty(inVertex, GraphPropertyEnum.INVARIANT_UUID.getProperty());
               if ( vertexInInvUUID.equals(serviceInvariantUUID) ){
-                  return (List<String>) titanDao.getProperty(edge, EdgePropertyEnum.INSTANCES) ;
+                  return (List<String>) janusGraphDao.getProperty(edge, EdgePropertyEnum.INSTANCES) ;
               }
           }
       }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/utils/CapabilityRequirementNameResolver.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/CapabilityRequirementNameResolver.java
index 6bdce99d95..c4b7882e50 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/utils/CapabilityRequirementNameResolver.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/CapabilityRequirementNameResolver.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.be.model.jsontitan.utils;
+package org.openecomp.sdc.be.model.jsonjanusgraph.utils;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
@@ -6,9 +6,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.datatypes.elements.*;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.TopologyTemplate;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElementTypeEnum;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElementTypeEnum;
 import org.openecomp.sdc.be.model.utils.ComponentUtilities;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 import java.util.*;
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/utils/IdMapper.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/IdMapper.java
index 2c3c98e133..cc28ae4f83 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/utils/IdMapper.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/IdMapper.java
@@ -1,10 +1,10 @@
-package org.openecomp.sdc.be.model.jsontitan.utils;
+package org.openecomp.sdc.be.model.jsonjanusgraph.utils;
 
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
 import org.openecomp.sdc.be.datatypes.elements.ComponentInstanceDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.CompositionDataDefinition;
-import org.openecomp.sdc.be.model.jsontitan.enums.JsonConstantKeysEnum;
-import org.openecomp.sdc.be.model.jsontitan.operations.ExternalReferencesOperation;
+import org.openecomp.sdc.be.model.jsonjanusgraph.enums.JsonConstantKeysEnum;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ExternalReferencesOperation;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.stereotype.Component;
 
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/utils/ModelConverter.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/ModelConverter.java
index 9412c5c70b..cd34ad5c18 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/utils/ModelConverter.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/ModelConverter.java
@@ -18,12 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.utils;
+package org.openecomp.sdc.be.model.jsonjanusgraph.utils;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.ListUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -36,11 +35,11 @@ import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.*;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.NodeType;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.TopologyTemplate;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElementTypeEnum;
-import org.openecomp.sdc.be.model.jsontitan.enums.JsonConstantKeysEnum;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.NodeType;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElementTypeEnum;
+import org.openecomp.sdc.be.model.jsonjanusgraph.enums.JsonConstantKeysEnum;
 import org.openecomp.sdc.be.resources.data.ComponentMetadataData;
 import org.openecomp.sdc.be.resources.data.ProductMetadataData;
 import org.openecomp.sdc.be.resources.data.ResourceMetadataData;
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/StorageException.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/StorageException.java
index 40c39f3405..e75533f447 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/StorageException.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/StorageException.java
@@ -1,6 +1,6 @@
 package org.openecomp.sdc.be.model.operations;
 
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
 
@@ -15,14 +15,16 @@ public class StorageException extends RuntimeException{
         this.params = params;
     }
 
-    public StorageException(String message, Throwable cause, TitanOperationStatus titanOperationStatus, String... params){
+    public StorageException(String message, Throwable cause, JanusGraphOperationStatus janusGraphOperationStatus, String... params){
         super(message, cause);
-        storageOperationStatus = DaoStatusConverter.convertTitanStatusToStorageStatus(titanOperationStatus);
+        storageOperationStatus = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(
+            janusGraphOperationStatus);
         this.params = params;
     }
 
-    public StorageException(TitanOperationStatus titanOperationStatus, String... params) {
-        storageOperationStatus = DaoStatusConverter.convertTitanStatusToStorageStatus(titanOperationStatus);
+    public StorageException(JanusGraphOperationStatus janusGraphOperationStatus, String... params) {
+        storageOperationStatus = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(
+            janusGraphOperationStatus);
         this.params = params;
     }
 
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/IAdditionalInformationOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/IAdditionalInformationOperation.java
index 3fb58a0fa3..b1ce9de66e 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/IAdditionalInformationOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/IAdditionalInformationOperation.java
@@ -20,9 +20,9 @@
 
 package org.openecomp.sdc.be.model.operations.api;
 
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.AdditionalInfoParameterInfo;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.AdditionalInformationDefinition;
@@ -32,19 +32,19 @@ import java.util.List;
 
 public interface IAdditionalInformationOperation {
 
-    public Either<AdditionalInformationDefinition, TitanOperationStatus> addAdditionalInformationParameter(NodeTypeEnum nodeType, String resourceId, String key, String value);
+    public Either<AdditionalInformationDefinition, JanusGraphOperationStatus> addAdditionalInformationParameter(NodeTypeEnum nodeType, String resourceId, String key, String value);
 
-    public Either<AdditionalInformationDefinition, TitanOperationStatus> updateAdditionalInformationParameter(NodeTypeEnum nodeType, String resourceId, String origKey, String key, String value);
+    public Either<AdditionalInformationDefinition, JanusGraphOperationStatus> updateAdditionalInformationParameter(NodeTypeEnum nodeType, String resourceId, String origKey, String key, String value);
 
-    public Either<AdditionalInformationDefinition, TitanOperationStatus> deleteAdditionalInformationParameter(NodeTypeEnum nodeType, String resourceId, String key);
+    public Either<AdditionalInformationDefinition, JanusGraphOperationStatus> deleteAdditionalInformationParameter(NodeTypeEnum nodeType, String resourceId, String key);
 
-    public Either<AdditionalInfoParameterData, TitanOperationStatus> addAdditionalInformationNode(NodeTypeEnum nodeType, String resourceUniqueId);
+    public Either<AdditionalInfoParameterData, JanusGraphOperationStatus> addAdditionalInformationNode(NodeTypeEnum nodeType, String resourceUniqueId);
 
-    public Either<AdditionalInformationDefinition, TitanOperationStatus> addAdditionalInformationNode(NodeTypeEnum nodeType, String componentId, AdditionalInformationDefinition parameters);
+    public Either<AdditionalInformationDefinition, JanusGraphOperationStatus> addAdditionalInformationNode(NodeTypeEnum nodeType, String componentId, AdditionalInformationDefinition parameters);
 
-    public TitanOperationStatus findResourceAllAdditionalInformationRecursively(String uniqueId, List<AdditionalInformationDefinition> properties);
+    public JanusGraphOperationStatus findResourceAllAdditionalInformationRecursively(String uniqueId, List<AdditionalInformationDefinition> properties);
 
-    public TitanOperationStatus findServiceAllAdditionalInformationRecursively(String uniqueId, List<AdditionalInformationDefinition> properties);
+    public JanusGraphOperationStatus findServiceAllAdditionalInformationRecursively(String uniqueId, List<AdditionalInformationDefinition> properties);
 
     public Either<AdditionalInformationDefinition, StorageOperationStatus> createAdditionalInformationParameter(NodeTypeEnum nodeType, String resourceId, String key, String value, boolean inTransaction);
 
@@ -54,20 +54,20 @@ public interface IAdditionalInformationOperation {
 
     public Either<Integer, StorageOperationStatus> getNumberOfAdditionalInformationParameters(NodeTypeEnum nodeType, String resourceId, boolean inTransaction);
 
-    public Either<Integer, TitanOperationStatus> getNumberOfParameters(NodeTypeEnum nodeType, String resourceId);
+    public Either<Integer, JanusGraphOperationStatus> getNumberOfParameters(NodeTypeEnum nodeType, String resourceId);
 
-    public Either<AdditionalInfoParameterInfo, TitanOperationStatus> getAdditionalInformationParameter(NodeTypeEnum nodeType, String resourceId, String id);
+    public Either<AdditionalInfoParameterInfo, JanusGraphOperationStatus> getAdditionalInformationParameter(NodeTypeEnum nodeType, String resourceId, String id);
 
     public Either<AdditionalInfoParameterInfo, StorageOperationStatus> getAdditionalInformationParameter(NodeTypeEnum nodeType, String resourceId, String id, boolean inTransaction);
 
-    public Either<AdditionalInformationDefinition, TitanOperationStatus> getAllAdditionalInformationParameters(NodeTypeEnum nodeType, String resourceId, boolean ignoreVerification);
+    public Either<AdditionalInformationDefinition, JanusGraphOperationStatus> getAllAdditionalInformationParameters(NodeTypeEnum nodeType, String resourceId, boolean ignoreVerification);
 
     public Either<AdditionalInformationDefinition, StorageOperationStatus> getAllAdditionalInformationParameters(NodeTypeEnum nodeType, String resourceId, boolean ignoreVerification, boolean inTransaction);
 
     public Either<AdditionalInformationDefinition, StorageOperationStatus> deleteAllAdditionalInformationParameters(NodeTypeEnum nodeType, String resourceId, boolean inTransaction);
 
-    public Either<TitanVertex, TitanOperationStatus> addAdditionalInformationNode(NodeTypeEnum nodeType, String componentId, TitanVertex matadatVertex);
+    public Either<JanusGraphVertex, JanusGraphOperationStatus> addAdditionalInformationNode(NodeTypeEnum nodeType, String componentId, JanusGraphVertex matadatVertex);
 
-    public TitanOperationStatus addAdditionalInformationNode(NodeTypeEnum nodeType, String componentId, AdditionalInformationDefinition parameters, TitanVertex metadataVertex);
+    public JanusGraphOperationStatus addAdditionalInformationNode(NodeTypeEnum nodeType, String componentId, AdditionalInformationDefinition parameters, JanusGraphVertex metadataVertex);
 
 }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/IArtifactOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/IArtifactOperation.java
index e1b04e9230..e3b7689d30 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/IArtifactOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/IArtifactOperation.java
@@ -20,7 +20,7 @@
 
 package org.openecomp.sdc.be.model.operations.api;
 
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.ArtifactDefinition;
@@ -37,6 +37,6 @@ public interface IArtifactOperation {
 
     public Either<Map<String, ArtifactDefinition>, StorageOperationStatus> getArtifacts(String parentId, NodeTypeEnum parentType, boolean inTransaction);
 
-    public StorageOperationStatus addArifactToComponent(ArtifactDefinition artifactInfo, String parentId, NodeTypeEnum type, boolean failIfExist, TitanVertex parentVertex);
+    public StorageOperationStatus addArifactToComponent(ArtifactDefinition artifactInfo, String parentId, NodeTypeEnum type, boolean failIfExist, JanusGraphVertex parentVertex);
 
 }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/ICapabilityOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/ICapabilityOperation.java
index da059fe3ad..3525e1362e 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/ICapabilityOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/ICapabilityOperation.java
@@ -21,13 +21,13 @@
 package org.openecomp.sdc.be.model.operations.api;
 
 import fj.data.Either;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.model.PropertyDefinition;
 
 import java.util.Map;
 
 public interface ICapabilityOperation {
 
-    Either<Map<String, PropertyDefinition>, TitanOperationStatus> getAllCapabilityTypePropertiesFromAllDerivedFrom(String firstParentType);
+    Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> getAllCapabilityTypePropertiesFromAllDerivedFrom(String firstParentType);
 
 }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/ICapabilityTypeOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/ICapabilityTypeOperation.java
index 4316f733a7..780b9af70e 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/ICapabilityTypeOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/ICapabilityTypeOperation.java
@@ -21,7 +21,7 @@
 package org.openecomp.sdc.be.model.operations.api;
 
 import fj.data.Either;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.model.CapabilityTypeDefinition;
 
 import java.util.Map;
@@ -46,5 +46,5 @@ public interface ICapabilityTypeOperation {
     public Either<CapabilityTypeDefinition, StorageOperationStatus> getCapabilityType(String uniqueId);
 
     public Either<CapabilityTypeDefinition, StorageOperationStatus> getCapabilityType(String uniqueId, boolean inTransaction);
-    Either<Map<String, CapabilityTypeDefinition>, TitanOperationStatus> getAllCapabilityTypes();
+    Either<Map<String, CapabilityTypeDefinition>, JanusGraphOperationStatus> getAllCapabilityTypes();
 }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/IInputsOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/IInputsOperation.java
index 0c03ee3bf0..100916fe9e 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/IInputsOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/IInputsOperation.java
@@ -21,13 +21,13 @@
 package org.openecomp.sdc.be.model.operations.api;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.model.ComponentInstanceInput;
 import org.openecomp.sdc.be.resources.data.InputValueData;
 
 public interface IInputsOperation {
 
-    ImmutablePair<TitanOperationStatus, String> findInputValue(String resourceInstanceId, String propertyId);
+    ImmutablePair<JanusGraphOperationStatus, String> findInputValue(String resourceInstanceId, String propertyId);
 
     ComponentInstanceInput buildResourceInstanceInput(InputValueData propertyValueData, ComponentInstanceInput resourceInstanceInput);
 
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/AbstractOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/AbstractOperation.java
index 3e987ed101..c53f3e3d86 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/AbstractOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/AbstractOperation.java
@@ -24,7 +24,7 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
 import com.google.gson.reflect.TypeToken;
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import java.lang.reflect.Type;
 import java.util.List;
@@ -37,9 +37,9 @@ import org.openecomp.sdc.be.config.BeEcompErrorManager.ErrorSeverity;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphNode;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation;
+import org.openecomp.sdc.be.dao.janusgraph.HealingJanusGraphGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
-import org.openecomp.sdc.be.dao.titan.HealingTitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
@@ -63,7 +63,7 @@ public abstract class AbstractOperation {
     private static final Logger log = Logger.getLogger(AbstractOperation.class.getName());
 
     @Autowired
-    protected HealingTitanGenericDao titanGenericDao;
+    protected HealingJanusGraphGenericDao janusGraphGenericDao;
 
     public static final String EMPTY_VALUE = null;
 
@@ -74,8 +74,8 @@ public abstract class AbstractOperation {
 
     protected DataTypeValidatorConverter dataTypeValidatorConverter = DataTypeValidatorConverter.getInstance();
 
-    protected <SomeData extends GraphNode, SomeDefenition> Either<SomeData, TitanOperationStatus> addDefinitionToNodeType(SomeDefenition someDefinition, NodeTypeEnum nodeType, String nodeUniqueId, final GraphEdgeLabels edgeType,
-            Supplier<SomeData> dataBuilder, Supplier<String> defNameGenerator) {
+    protected <SomeData extends GraphNode, SomeDefenition> Either<SomeData, JanusGraphOperationStatus> addDefinitionToNodeType(SomeDefenition someDefinition, NodeTypeEnum nodeType, String nodeUniqueId, final GraphEdgeLabels edgeType,
+                                                                                                                               Supplier<SomeData> dataBuilder, Supplier<String> defNameGenerator) {
         String defName = defNameGenerator.get();
         log.debug("Got {} {}", defName, someDefinition);
 
@@ -84,29 +84,31 @@ public abstract class AbstractOperation {
         log.debug("Before adding {} to graph. data = {}", defName, someData);
 
         @SuppressWarnings("unchecked")
-        Either<SomeData, TitanOperationStatus> eitherSomeData = titanGenericDao.createNode(someData, (Class<SomeData>) someData.getClass());
+        Either<SomeData, JanusGraphOperationStatus> eitherSomeData = janusGraphGenericDao
+            .createNode(someData, (Class<SomeData>) someData.getClass());
 
         log.debug("After adding {} to graph. status is = {}", defName, eitherSomeData);
 
         if (eitherSomeData.isRight()) {
-            TitanOperationStatus operationStatus = eitherSomeData.right().value();
+            JanusGraphOperationStatus operationStatus = eitherSomeData.right().value();
             log.error("Failed to add {}  to graph. status is {}", defName, operationStatus);
             return Either.right(operationStatus);
         }
         UniqueIdData uniqueIdData = new UniqueIdData(nodeType, nodeUniqueId);
         log.debug("Before associating {} to {}.", uniqueIdData, defName);
 
-        Either<GraphRelation, TitanOperationStatus> eitherRelations = titanGenericDao.createRelation(uniqueIdData, eitherSomeData.left().value(), edgeType, null);
+        Either<GraphRelation, JanusGraphOperationStatus> eitherRelations = janusGraphGenericDao
+            .createRelation(uniqueIdData, eitherSomeData.left().value(), edgeType, null);
         if (eitherRelations.isRight()) {
-            TitanOperationStatus operationStatus = eitherRelations.right().value();
+            JanusGraphOperationStatus operationStatus = eitherRelations.right().value();
             BeEcompErrorManager.getInstance().logInternalFlowError("AddDefinitionToNodeType", "Failed to associate" + nodeType.getName() + " " + nodeUniqueId + "to " + defName + "in graph. status is " + operationStatus, ErrorSeverity.ERROR);
             return Either.right(operationStatus);
         }
         return Either.left(eitherSomeData.left().value());
     }
 
-    protected <SomeData extends GraphNode, SomeDefenition> TitanOperationStatus addDefinitionToNodeType(TitanVertex vertex, SomeDefenition someDefinition, NodeTypeEnum nodeType, String nodeUniqueId, final GraphEdgeLabels edgeType,
-            Supplier<SomeData> dataBuilder, Supplier<String> defNameGenerator) {
+    protected <SomeData extends GraphNode, SomeDefenition> JanusGraphOperationStatus addDefinitionToNodeType(JanusGraphVertex vertex, SomeDefenition someDefinition, NodeTypeEnum nodeType, String nodeUniqueId, final GraphEdgeLabels edgeType,
+                                                                                                             Supplier<SomeData> dataBuilder, Supplier<String> defNameGenerator) {
         String defName = defNameGenerator.get();
         log.debug("Got {} {}", defName, someDefinition);
 
@@ -115,18 +117,20 @@ public abstract class AbstractOperation {
         log.debug("Before adding {} to graph. data = {}", defName, someData);
 
         @SuppressWarnings("unchecked")
-        Either<TitanVertex, TitanOperationStatus> eitherSomeData = titanGenericDao.createNode(someData);
+        Either<JanusGraphVertex, JanusGraphOperationStatus> eitherSomeData = janusGraphGenericDao.createNode(someData);
 
         log.debug("After adding {} to graph. status is = {}", defName, eitherSomeData);
 
         if (eitherSomeData.isRight()) {
-            TitanOperationStatus operationStatus = eitherSomeData.right().value();
+            JanusGraphOperationStatus operationStatus = eitherSomeData.right().value();
             log.error("Failed to add {}  to graph. status is {}", defName, operationStatus);
             return operationStatus;
         }
 
-        TitanOperationStatus relations = titanGenericDao.createEdge(vertex, eitherSomeData.left().value(), edgeType, null);
-        if (!relations.equals(TitanOperationStatus.OK)) {
+        JanusGraphOperationStatus
+            relations = janusGraphGenericDao
+            .createEdge(vertex, eitherSomeData.left().value(), edgeType, null);
+        if (!relations.equals(JanusGraphOperationStatus.OK)) {
             BeEcompErrorManager.getInstance().logInternalFlowError("AddDefinitionToNodeType", "Failed to associate" + nodeType.getName() + " " + nodeUniqueId + "to " + defName + "in graph. status is " + relations, ErrorSeverity.ERROR);
             return relations;
         }
@@ -134,25 +138,27 @@ public abstract class AbstractOperation {
     }
 
     interface NodeElementFetcher<ElementDefinition> {
-        TitanOperationStatus findAllNodeElements(String nodeId, List<ElementDefinition> listTofill);
+        JanusGraphOperationStatus findAllNodeElements(String nodeId, List<ElementDefinition> listTofill);
     }
 
-    public <ElementDefinition> TitanOperationStatus findAllResourceElementsDefinitionRecursively(String resourceId, List<ElementDefinition> elements, NodeElementFetcher<ElementDefinition> singleNodeFetcher) {
+    public <ElementDefinition> JanusGraphOperationStatus findAllResourceElementsDefinitionRecursively(String resourceId, List<ElementDefinition> elements, NodeElementFetcher<ElementDefinition> singleNodeFetcher) {
 
         if (log.isTraceEnabled())
             log.trace("Going to fetch elements under resource {}", resourceId);
-        TitanOperationStatus resourceAttributesStatus = singleNodeFetcher.findAllNodeElements(resourceId, elements);
+        JanusGraphOperationStatus
+            resourceAttributesStatus = singleNodeFetcher.findAllNodeElements(resourceId, elements);
 
-        if (resourceAttributesStatus != TitanOperationStatus.OK) {
+        if (resourceAttributesStatus != JanusGraphOperationStatus.OK) {
             return resourceAttributesStatus;
         }
 
-        Either<ImmutablePair<ResourceMetadataData, GraphEdge>, TitanOperationStatus> parentNodes = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Resource), resourceId, GraphEdgeLabels.DERIVED_FROM, NodeTypeEnum.Resource,
+        Either<ImmutablePair<ResourceMetadataData, GraphEdge>, JanusGraphOperationStatus> parentNodes = janusGraphGenericDao
+            .getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Resource), resourceId, GraphEdgeLabels.DERIVED_FROM, NodeTypeEnum.Resource,
                 ResourceMetadataData.class);
 
         if (parentNodes.isRight()) {
-            TitanOperationStatus parentNodesStatus = parentNodes.right().value();
-            if (parentNodesStatus != TitanOperationStatus.NOT_FOUND) {
+            JanusGraphOperationStatus parentNodesStatus = parentNodes.right().value();
+            if (parentNodesStatus != JanusGraphOperationStatus.NOT_FOUND) {
                 BeEcompErrorManager.getInstance().logInternalFlowError("findAllResourceElementsDefinitionRecursively", "Failed to find parent elements of resource " + resourceId + ". status is " + parentNodesStatus, ErrorSeverity.ERROR);
                 return parentNodesStatus;
             }
@@ -161,25 +167,25 @@ public abstract class AbstractOperation {
         if (parentNodes.isLeft()) {
             ImmutablePair<ResourceMetadataData, GraphEdge> parnetNodePair = parentNodes.left().value();
             String parentUniqueId = parnetNodePair.getKey().getMetadataDataDefinition().getUniqueId();
-            TitanOperationStatus addParentIntStatus = findAllResourceElementsDefinitionRecursively(parentUniqueId, elements, singleNodeFetcher);
+            JanusGraphOperationStatus addParentIntStatus = findAllResourceElementsDefinitionRecursively(parentUniqueId, elements, singleNodeFetcher);
 
-            if (addParentIntStatus != TitanOperationStatus.OK) {
+            if (addParentIntStatus != JanusGraphOperationStatus.OK) {
                 BeEcompErrorManager.getInstance().logInternalFlowError("findAllResourceElementsDefinitionRecursively", "Failed to find all resource elements of resource " + parentUniqueId, ErrorSeverity.ERROR);
 
                 return addParentIntStatus;
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
     protected <T, TStatus> void handleTransactionCommitRollback(boolean inTransaction, Either<T, TStatus> result) {
         if (!inTransaction) {
             if (result == null || result.isRight()) {
                 log.error("Going to execute rollback on graph.");
-                titanGenericDao.rollback();
+                janusGraphGenericDao.rollback();
             } else {
                 log.debug("Going to execute commit on graph.");
-                titanGenericDao.commit();
+                janusGraphGenericDao.commit();
             }
         }
     }
@@ -212,7 +218,7 @@ public abstract class AbstractOperation {
         }
         String innerType = null;
 
-        Either<String, TitanOperationStatus> checkInnerType = getInnerType(type, propertyDefinition::getSchema);
+        Either<String, JanusGraphOperationStatus> checkInnerType = getInnerType(type, propertyDefinition::getSchema);
         if (checkInnerType.isRight()) {
             return StorageOperationStatus.INVALID_TYPE;
         }
@@ -300,19 +306,19 @@ public abstract class AbstractOperation {
         return value;
     }
 
-    protected Either<String, TitanOperationStatus> getInnerType(ToscaPropertyType type, Supplier<SchemaDefinition> schemeGen) {
+    protected Either<String, JanusGraphOperationStatus> getInnerType(ToscaPropertyType type, Supplier<SchemaDefinition> schemeGen) {
         String innerType = null;
         if (type == ToscaPropertyType.LIST || type == ToscaPropertyType.MAP) {
 
             SchemaDefinition def = schemeGen.get();
             if (def == null) {
                 log.debug("Schema doesn't exists for property of type {}", type);
-                return Either.right(TitanOperationStatus.ILLEGAL_ARGUMENT);
+                return Either.right(JanusGraphOperationStatus.ILLEGAL_ARGUMENT);
             }
             PropertyDataDefinition propDef = def.getProperty();
             if (propDef == null) {
                 log.debug("Property in Schema Definition inside property of type {} doesn't exist", type);
-                return Either.right(TitanOperationStatus.ILLEGAL_ARGUMENT);
+                return Either.right(JanusGraphOperationStatus.ILLEGAL_ARGUMENT);
             }
             innerType = propDef.getType();
         }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/AdditionalInformationOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/AdditionalInformationOperation.java
index ebec8b134b..f247bbb74d 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/AdditionalInformationOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/AdditionalInformationOperation.java
@@ -20,7 +20,7 @@
 
 package org.openecomp.sdc.be.model.operations.impl;
 
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
@@ -29,10 +29,10 @@ import org.openecomp.sdc.be.dao.graph.GraphElementFactory;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphElementTypeEnum;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
 import org.openecomp.sdc.be.datatypes.elements.AdditionalInfoParameterDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.AdditionalInfoParameterInfo;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
@@ -58,7 +58,7 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
     private static final Logger log = Logger.getLogger(AdditionalInformationOperation.class.getName());
 
     @javax.annotation.Resource
-    private TitanGenericDao titanGenericDao;
+    private JanusGraphGenericDao janusGraphGenericDao;
 
     private static final String GOING_TO_EXECUTE_COMMIT_ON_GRAPH = "Going to execute commit on graph.";
 	private static final String GOING_TO_EXECUTE_ROLLBACK_ON_GRAPH = "Going to execute rollback on graph.";
@@ -71,18 +71,20 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
 
 
     @Override
-    public Either<AdditionalInformationDefinition, TitanOperationStatus> addAdditionalInformationParameter(NodeTypeEnum nodeType, String componentId, String key, String value) {
+    public Either<AdditionalInformationDefinition, JanusGraphOperationStatus> addAdditionalInformationParameter(NodeTypeEnum nodeType, String componentId, String key, String value) {
 
-        TitanOperationStatus verifyNodeTypeVsComponent = verifyNodeTypeVsComponent(nodeType, componentId);
-        if (verifyNodeTypeVsComponent != TitanOperationStatus.OK) {
+        JanusGraphOperationStatus
+            verifyNodeTypeVsComponent = verifyNodeTypeVsComponent(nodeType, componentId);
+        if (verifyNodeTypeVsComponent != JanusGraphOperationStatus.OK) {
             return Either.right(verifyNodeTypeVsComponent);
         }
 
-        Either<ImmutablePair<AdditionalInfoParameterData, GraphEdge>, TitanOperationStatus> getResult = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(nodeType), componentId, GraphEdgeLabels.ADDITIONAL_INFORMATION,
+        Either<ImmutablePair<AdditionalInfoParameterData, GraphEdge>, JanusGraphOperationStatus> getResult = janusGraphGenericDao
+            .getChild(UniqueIdBuilder.getKeyByNodeType(nodeType), componentId, GraphEdgeLabels.ADDITIONAL_INFORMATION,
                 NodeTypeEnum.AdditionalInfoParameters, AdditionalInfoParameterData.class);
 
         if (getResult.isRight()) {
-            TitanOperationStatus status = getResult.right().value();
+            JanusGraphOperationStatus status = getResult.right().value();
             return Either.right(status);
         }
 
@@ -104,17 +106,18 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
 
         if (parameters.containsKey(key)) {
             log.debug("The key {} already exists under component {}", key, componentId);
-            return Either.right(TitanOperationStatus.ALREADY_EXIST);
+            return Either.right(JanusGraphOperationStatus.ALREADY_EXIST);
         }
 
         idToKey.put(String.valueOf(lastCreatedCounter), key);
         parameters.put(key, value);
         parameterData.getAdditionalInfoParameterDataDefinition().setLastCreatedCounter(lastCreatedCounter);
 
-        Either<AdditionalInfoParameterData, TitanOperationStatus> updateNode = titanGenericDao.updateNode(parameterData, AdditionalInfoParameterData.class);
+        Either<AdditionalInfoParameterData, JanusGraphOperationStatus> updateNode = janusGraphGenericDao
+            .updateNode(parameterData, AdditionalInfoParameterData.class);
 
         if (updateNode.isRight()) {
-            TitanOperationStatus status = updateNode.right().value();
+            JanusGraphOperationStatus status = updateNode.right().value();
             BeEcompErrorManager.getInstance().logBeFailedUpdateNodeError("UpdateAdditionalInformationParameter", ADDITIONAL_INFORMATION_OF + nodeType.getName() + " " + componentId, String.valueOf(status));
             return Either.right(status);
         }
@@ -126,18 +129,20 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
     }
 
     @Override
-    public Either<AdditionalInformationDefinition, TitanOperationStatus> updateAdditionalInformationParameter(NodeTypeEnum nodeType, String componentId, String id, String key, String value) {
+    public Either<AdditionalInformationDefinition, JanusGraphOperationStatus> updateAdditionalInformationParameter(NodeTypeEnum nodeType, String componentId, String id, String key, String value) {
 
-        TitanOperationStatus verifyNodeTypeVsComponent = verifyNodeTypeVsComponent(nodeType, componentId);
-        if (verifyNodeTypeVsComponent != TitanOperationStatus.OK) {
+        JanusGraphOperationStatus
+            verifyNodeTypeVsComponent = verifyNodeTypeVsComponent(nodeType, componentId);
+        if (verifyNodeTypeVsComponent != JanusGraphOperationStatus.OK) {
             return Either.right(verifyNodeTypeVsComponent);
         }
 
-        Either<ImmutablePair<AdditionalInfoParameterData, GraphEdge>, TitanOperationStatus> getResult = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(nodeType), componentId, GraphEdgeLabels.ADDITIONAL_INFORMATION,
+        Either<ImmutablePair<AdditionalInfoParameterData, GraphEdge>, JanusGraphOperationStatus> getResult = janusGraphGenericDao
+            .getChild(UniqueIdBuilder.getKeyByNodeType(nodeType), componentId, GraphEdgeLabels.ADDITIONAL_INFORMATION,
                 NodeTypeEnum.AdditionalInfoParameters, AdditionalInfoParameterData.class);
 
         if (getResult.isRight()) {
-            TitanOperationStatus status = getResult.right().value();
+            JanusGraphOperationStatus status = getResult.right().value();
             return Either.right(status);
         }
 
@@ -146,7 +151,7 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
         Map<String, String> parameters = parameterData.getParameters();
         Map<String, String> idToKey = parameterData.getIdToKey();
         if (idToKey == null || !idToKey.containsKey(id)) {
-            return Either.right(TitanOperationStatus.INVALID_ID);
+            return Either.right(JanusGraphOperationStatus.INVALID_ID);
         }
 
         String origKey = idToKey.get(id);
@@ -154,7 +159,7 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
         if (!origKey.equals(key)) {
             if (parameters.containsKey(key)) {
                 log.debug("The key {} already exists", key);
-                return Either.right(TitanOperationStatus.ALREADY_EXIST);
+                return Either.right(JanusGraphOperationStatus.ALREADY_EXIST);
             }
             String removed = parameters.remove(origKey);
             log.trace("The key-value {} = {} was removed from additionalInformation", origKey, removed);
@@ -162,10 +167,11 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
         parameters.put(key, value);
         idToKey.put(id, key);
 
-        Either<AdditionalInfoParameterData, TitanOperationStatus> updateNode = titanGenericDao.updateNode(parameterData, AdditionalInfoParameterData.class);
+        Either<AdditionalInfoParameterData, JanusGraphOperationStatus> updateNode = janusGraphGenericDao
+            .updateNode(parameterData, AdditionalInfoParameterData.class);
 
         if (updateNode.isRight()) {
-            TitanOperationStatus status = updateNode.right().value();
+            JanusGraphOperationStatus status = updateNode.right().value();
             BeEcompErrorManager.getInstance().logBeFailedUpdateNodeError("UpdateAdditionalInformationParameter", "additional information of resource " + componentId, String.valueOf(status));
             return Either.right(status);
         }
@@ -177,18 +183,20 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
     }
 
     @Override
-    public Either<AdditionalInformationDefinition, TitanOperationStatus> deleteAdditionalInformationParameter(NodeTypeEnum nodeType, String componentId, String id) {
+    public Either<AdditionalInformationDefinition, JanusGraphOperationStatus> deleteAdditionalInformationParameter(NodeTypeEnum nodeType, String componentId, String id) {
 
-        TitanOperationStatus verifyNodeTypeVsComponent = verifyNodeTypeVsComponent(nodeType, componentId);
-        if (verifyNodeTypeVsComponent != TitanOperationStatus.OK) {
+        JanusGraphOperationStatus
+            verifyNodeTypeVsComponent = verifyNodeTypeVsComponent(nodeType, componentId);
+        if (verifyNodeTypeVsComponent != JanusGraphOperationStatus.OK) {
             return Either.right(verifyNodeTypeVsComponent);
         }
 
-        Either<ImmutablePair<AdditionalInfoParameterData, GraphEdge>, TitanOperationStatus> getResult = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(nodeType), componentId, GraphEdgeLabels.ADDITIONAL_INFORMATION,
+        Either<ImmutablePair<AdditionalInfoParameterData, GraphEdge>, JanusGraphOperationStatus> getResult = janusGraphGenericDao
+            .getChild(UniqueIdBuilder.getKeyByNodeType(nodeType), componentId, GraphEdgeLabels.ADDITIONAL_INFORMATION,
                 NodeTypeEnum.AdditionalInfoParameters, AdditionalInfoParameterData.class);
 
         if (getResult.isRight()) {
-            TitanOperationStatus status = getResult.right().value();
+            JanusGraphOperationStatus status = getResult.right().value();
             return Either.right(status);
         }
 
@@ -198,7 +206,7 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
         Map<String, String> idToKey = parameterData.getIdToKey();
 
         if (idToKey == null || !idToKey.containsKey(id)) {
-            return Either.right(TitanOperationStatus.INVALID_ID);
+            return Either.right(JanusGraphOperationStatus.INVALID_ID);
         }
 
         String key = idToKey.get(id);
@@ -206,10 +214,11 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
         String removedValue = parameters.remove(key);
         log.trace("The key-value {} = {} was removed from additionalInformation", removedKey, removedValue);
 
-        Either<AdditionalInfoParameterData, TitanOperationStatus> updateNode = titanGenericDao.updateNode(parameterData, AdditionalInfoParameterData.class);
+        Either<AdditionalInfoParameterData, JanusGraphOperationStatus> updateNode = janusGraphGenericDao
+            .updateNode(parameterData, AdditionalInfoParameterData.class);
 
         if (updateNode.isRight()) {
-            TitanOperationStatus status = updateNode.right().value();
+            JanusGraphOperationStatus status = updateNode.right().value();
             BeEcompErrorManager.getInstance().logBeFailedUpdateNodeError("DeleteAdditionalInformationParameter", ADDITIONAL_INFORMATION_OF + nodeType.getName() + " " + componentId, String.valueOf(status));
             return Either.right(status);
         }
@@ -248,7 +257,7 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
     }
 
     @Override
-    public Either<AdditionalInfoParameterData, TitanOperationStatus> addAdditionalInformationNode(NodeTypeEnum nodeType, String componentId) {
+    public Either<AdditionalInfoParameterData, JanusGraphOperationStatus> addAdditionalInformationNode(NodeTypeEnum nodeType, String componentId) {
 
         UniqueIdData from = new UniqueIdData(nodeType, componentId);
 
@@ -258,18 +267,20 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
 
         AdditionalInfoParameterData additionalInfoParameterData = new AdditionalInfoParameterData(additionalInfoParameterDataDefinition, new HashMap<>(), new HashMap<>());
 
-        Either<AdditionalInfoParameterData, TitanOperationStatus> createNode = titanGenericDao.createNode(additionalInfoParameterData, AdditionalInfoParameterData.class);
+        Either<AdditionalInfoParameterData, JanusGraphOperationStatus> createNode = janusGraphGenericDao
+            .createNode(additionalInfoParameterData, AdditionalInfoParameterData.class);
         if (createNode.isRight()) {
-            TitanOperationStatus status = createNode.right().value();
+            JanusGraphOperationStatus status = createNode.right().value();
             BeEcompErrorManager.getInstance().logBeFailedCreateNodeError("AddAdditionalInformationNode", uniqueId, String.valueOf(status));
             return Either.right(status);
         }
 
         AdditionalInfoParameterData to = createNode.left().value();
 
-        Either<GraphRelation, TitanOperationStatus> createRelation = titanGenericDao.createRelation(from, to, GraphEdgeLabels.ADDITIONAL_INFORMATION, null);
+        Either<GraphRelation, JanusGraphOperationStatus> createRelation = janusGraphGenericDao
+            .createRelation(from, to, GraphEdgeLabels.ADDITIONAL_INFORMATION, null);
         if (createRelation.isRight()) {
-            TitanOperationStatus status = createRelation.right().value();
+            JanusGraphOperationStatus status = createRelation.right().value();
             return Either.right(status);
         }
 
@@ -277,7 +288,7 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
     }
 
     @Override
-    public Either<TitanVertex, TitanOperationStatus> addAdditionalInformationNode(NodeTypeEnum nodeType, String componentId, TitanVertex metadataVertex) {
+    public Either<JanusGraphVertex, JanusGraphOperationStatus> addAdditionalInformationNode(NodeTypeEnum nodeType, String componentId, JanusGraphVertex metadataVertex) {
 
         String uniqueId = UniqueIdBuilder.buildAdditionalInformationUniqueId(componentId);
         AdditionalInfoParameterDataDefinition additionalInfoParameterDataDefinition = new AdditionalInfoParameterDataDefinition();
@@ -285,26 +296,27 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
 
         AdditionalInfoParameterData additionalInfoParameterData = new AdditionalInfoParameterData(additionalInfoParameterDataDefinition, new HashMap<>(), new HashMap<>());
 
-        Either<TitanVertex, TitanOperationStatus> createNode = titanGenericDao.createNode(additionalInfoParameterData);
+        Either<JanusGraphVertex, JanusGraphOperationStatus> createNode = janusGraphGenericDao.createNode(additionalInfoParameterData);
         if (createNode.isRight()) {
-            TitanOperationStatus status = createNode.right().value();
+            JanusGraphOperationStatus status = createNode.right().value();
             BeEcompErrorManager.getInstance().logBeFailedCreateNodeError("AddAdditionalInformationNode", uniqueId, String.valueOf(status));
             return Either.right(status);
         }
 
-        TitanVertex additionalInfoVertex = createNode.left().value();
+        JanusGraphVertex additionalInfoVertex = createNode.left().value();
 
-        TitanOperationStatus createRelation = titanGenericDao.createEdge(metadataVertex, additionalInfoVertex, GraphEdgeLabels.ADDITIONAL_INFORMATION, null);
+        JanusGraphOperationStatus createRelation = janusGraphGenericDao
+            .createEdge(metadataVertex, additionalInfoVertex, GraphEdgeLabels.ADDITIONAL_INFORMATION, null);
 
-        if (!createRelation.equals(TitanOperationStatus.OK)) {
+        if (!createRelation.equals(JanusGraphOperationStatus.OK)) {
             return Either.right(createRelation);
         }
         return Either.left(additionalInfoVertex);
     }
 
-    public Either<AdditionalInformationDefinition, TitanOperationStatus> addAdditionalInformationNode(NodeTypeEnum nodeType, String componentId, AdditionalInformationDefinition parameters) {
+    public Either<AdditionalInformationDefinition, JanusGraphOperationStatus> addAdditionalInformationNode(NodeTypeEnum nodeType, String componentId, AdditionalInformationDefinition parameters) {
 
-        Either<AdditionalInfoParameterData, TitanOperationStatus> status = this.addAdditionalInformationNode(nodeType, componentId);
+        Either<AdditionalInfoParameterData, JanusGraphOperationStatus> status = this.addAdditionalInformationNode(nodeType, componentId);
 
         if (status.isRight()) {
             return Either.right(status.right().value());
@@ -314,7 +326,8 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
 
         populateParameterNodeWithParameters(parameterData, parameters);
 
-        Either<AdditionalInfoParameterData, TitanOperationStatus> updateNode = titanGenericDao.updateNode(parameterData, AdditionalInfoParameterData.class);
+        Either<AdditionalInfoParameterData, JanusGraphOperationStatus> updateNode = janusGraphGenericDao
+            .updateNode(parameterData, AdditionalInfoParameterData.class);
 
         if (updateNode.isRight()) {
             return Either.right(updateNode.right().value());
@@ -325,21 +338,21 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
         return Either.left(informationDefinition);
     }
 
-    public TitanOperationStatus addAdditionalInformationNode(NodeTypeEnum nodeType, String componentId, AdditionalInformationDefinition parameters, TitanVertex metadataVertex) {
+    public JanusGraphOperationStatus addAdditionalInformationNode(NodeTypeEnum nodeType, String componentId, AdditionalInformationDefinition parameters, JanusGraphVertex metadataVertex) {
 
-        Either<TitanVertex, TitanOperationStatus> status = this.addAdditionalInformationNode(nodeType, componentId, metadataVertex);
+        Either<JanusGraphVertex, JanusGraphOperationStatus> status = this.addAdditionalInformationNode(nodeType, componentId, metadataVertex);
 
         if (status.isRight()) {
             return status.right().value();
         }
-        TitanVertex additionalInfoVertex = status.left().value();
+        JanusGraphVertex additionalInfoVertex = status.left().value();
 
-        Map<String, Object> newProp = titanGenericDao.getProperties(additionalInfoVertex);
+        Map<String, Object> newProp = janusGraphGenericDao.getProperties(additionalInfoVertex);
         AdditionalInfoParameterData parameterData = GraphElementFactory.createElement(NodeTypeEnum.AdditionalInfoParameters.getName(), GraphElementTypeEnum.Node, newProp, AdditionalInfoParameterData.class);
 
         populateParameterNodeWithParameters(parameterData, parameters);
 
-        return titanGenericDao.updateVertex(parameterData, additionalInfoVertex);
+        return janusGraphGenericDao.updateVertex(parameterData, additionalInfoVertex);
     }
 
     private void populateParameterNodeWithParameters(AdditionalInfoParameterData parameterData, AdditionalInformationDefinition aiDefinition) {
@@ -373,21 +386,22 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
     }
 
     @Override
-    public TitanOperationStatus findResourceAllAdditionalInformationRecursively(String uniqueId, List<AdditionalInformationDefinition> properties) {
+    public JanusGraphOperationStatus findResourceAllAdditionalInformationRecursively(String uniqueId, List<AdditionalInformationDefinition> properties) {
 
         log.trace("Going to fetch additional information under resource {}", uniqueId);
-        TitanOperationStatus resourceCapabilitiesStatus = findAdditionalInformationOfNode(NodeTypeEnum.Resource, uniqueId, properties);
+        JanusGraphOperationStatus resourceCapabilitiesStatus = findAdditionalInformationOfNode(NodeTypeEnum.Resource, uniqueId, properties);
 
-        if (!resourceCapabilitiesStatus.equals(TitanOperationStatus.OK)) {
+        if (!resourceCapabilitiesStatus.equals(JanusGraphOperationStatus.OK)) {
             return resourceCapabilitiesStatus;
         }
 
-        Either<ImmutablePair<ResourceMetadataData, GraphEdge>, TitanOperationStatus> parentNodes = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Resource), uniqueId, GraphEdgeLabels.DERIVED_FROM, NodeTypeEnum.Resource,
+        Either<ImmutablePair<ResourceMetadataData, GraphEdge>, JanusGraphOperationStatus> parentNodes = janusGraphGenericDao
+            .getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Resource), uniqueId, GraphEdgeLabels.DERIVED_FROM, NodeTypeEnum.Resource,
                 ResourceMetadataData.class);
 
         if (parentNodes.isRight()) {
-            TitanOperationStatus parentNodesStatus = parentNodes.right().value();
-            if (!parentNodesStatus.equals(TitanOperationStatus.NOT_FOUND)) {
+            JanusGraphOperationStatus parentNodesStatus = parentNodes.right().value();
+            if (!parentNodesStatus.equals(JanusGraphOperationStatus.NOT_FOUND)) {
                 log.error("Failed to find parent additional information of resource {}. status is {}", uniqueId, parentNodesStatus);
                 return parentNodesStatus;
             }
@@ -396,33 +410,34 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
         if (parentNodes.isLeft()) {
             ImmutablePair<ResourceMetadataData, GraphEdge> parnetNodePair = parentNodes.left().value();
             String parentUniqueId = parnetNodePair.getKey().getMetadataDataDefinition().getUniqueId();
-            TitanOperationStatus addParentIntStatus = findResourceAllAdditionalInformationRecursively(parentUniqueId, properties);
+            JanusGraphOperationStatus addParentIntStatus = findResourceAllAdditionalInformationRecursively(parentUniqueId, properties);
 
-            if (addParentIntStatus != TitanOperationStatus.OK) {
+            if (addParentIntStatus != JanusGraphOperationStatus.OK) {
                 log.error("Failed to find all resource additional information of resource {}", parentUniqueId);
                 return addParentIntStatus;
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
 
     }
 
     @Override
-    public TitanOperationStatus findServiceAllAdditionalInformationRecursively(String uniqueId, List<AdditionalInformationDefinition> properties) {
+    public JanusGraphOperationStatus findServiceAllAdditionalInformationRecursively(String uniqueId, List<AdditionalInformationDefinition> properties) {
 
         log.trace("Going to fetch additional information under service {}", uniqueId);
-        TitanOperationStatus resourceCapabilitiesStatus = findAdditionalInformationOfNode(NodeTypeEnum.Service, uniqueId, properties);
+        JanusGraphOperationStatus resourceCapabilitiesStatus = findAdditionalInformationOfNode(NodeTypeEnum.Service, uniqueId, properties);
 
-        if (!resourceCapabilitiesStatus.equals(TitanOperationStatus.OK)) {
+        if (!resourceCapabilitiesStatus.equals(JanusGraphOperationStatus.OK)) {
             return resourceCapabilitiesStatus;
         }
 
-        Either<ImmutablePair<ServiceMetadataData, GraphEdge>, TitanOperationStatus> parentNodes = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Service), uniqueId, GraphEdgeLabels.DERIVED_FROM, NodeTypeEnum.Service,
+        Either<ImmutablePair<ServiceMetadataData, GraphEdge>, JanusGraphOperationStatus> parentNodes = janusGraphGenericDao
+            .getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Service), uniqueId, GraphEdgeLabels.DERIVED_FROM, NodeTypeEnum.Service,
                 ServiceMetadataData.class);
 
         if (parentNodes.isRight()) {
-            TitanOperationStatus parentNodesStatus = parentNodes.right().value();
-            if (!parentNodesStatus.equals(TitanOperationStatus.NOT_FOUND)) {
+            JanusGraphOperationStatus parentNodesStatus = parentNodes.right().value();
+            if (!parentNodesStatus.equals(JanusGraphOperationStatus.NOT_FOUND)) {
                 log.error("Failed to find parent additional information of resource {}. status is {}", uniqueId, parentNodesStatus);
                 return parentNodesStatus;
             }
@@ -431,26 +446,27 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
         if (parentNodes.isLeft()) {
             ImmutablePair<ServiceMetadataData, GraphEdge> parnetNodePair = parentNodes.left().value();
             String parentUniqueId = parnetNodePair.getKey().getMetadataDataDefinition().getUniqueId();
-            TitanOperationStatus addParentIntStatus = findServiceAllAdditionalInformationRecursively(parentUniqueId, properties);
+            JanusGraphOperationStatus addParentIntStatus = findServiceAllAdditionalInformationRecursively(parentUniqueId, properties);
 
-            if (addParentIntStatus != TitanOperationStatus.OK) {
+            if (addParentIntStatus != JanusGraphOperationStatus.OK) {
                 log.error("Failed to find all resource additional information of resource {}", parentUniqueId);
                 return addParentIntStatus;
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
 
     }
 
-    private TitanOperationStatus findAdditionalInformationOfNode(NodeTypeEnum nodeType, String uniqueId, List<AdditionalInformationDefinition> properties) {
+    private JanusGraphOperationStatus findAdditionalInformationOfNode(NodeTypeEnum nodeType, String uniqueId, List<AdditionalInformationDefinition> properties) {
 
-        Either<ImmutablePair<AdditionalInfoParameterData, GraphEdge>, TitanOperationStatus> childNode = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(nodeType), uniqueId, GraphEdgeLabels.ADDITIONAL_INFORMATION,
+        Either<ImmutablePair<AdditionalInfoParameterData, GraphEdge>, JanusGraphOperationStatus> childNode = janusGraphGenericDao
+            .getChild(UniqueIdBuilder.getKeyByNodeType(nodeType), uniqueId, GraphEdgeLabels.ADDITIONAL_INFORMATION,
                 NodeTypeEnum.AdditionalInfoParameters, AdditionalInfoParameterData.class);
 
         if (childNode.isRight()) {
-            TitanOperationStatus status = childNode.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.OK;
+            JanusGraphOperationStatus status = childNode.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.OK;
             }
             return status;
         }
@@ -464,7 +480,7 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
             properties.add(additionalInfoDef);
         }
 
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
 
     }
 
@@ -483,13 +499,13 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
 
         try {
 
-            Either<AdditionalInformationDefinition, TitanOperationStatus> either = this.addAdditionalInformationParameter(nodeType, resourceId, key, value);
+            Either<AdditionalInformationDefinition, JanusGraphOperationStatus> either = this.addAdditionalInformationParameter(nodeType, resourceId, key, value);
 
             if (either.isRight()) {
-                TitanOperationStatus status = either.right().value();
+                JanusGraphOperationStatus status = either.right().value();
                 log.debug("Failed to add additional information property {} to component {}. Status is {}", key, resourceId, status);
                 BeEcompErrorManager.getInstance().logBeFailedUpdateNodeError("CreateAdditionalInformationParameter", ADDITIONAL_INFORMATION_OF + nodeType.getName() + " " + resourceId, String.valueOf(status));
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             } else {
                 AdditionalInformationDefinition additionalInformationDefinition = either.left().value();
                 result = Either.left(additionalInformationDefinition);
@@ -509,11 +525,11 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
 
         try {
 
-            Either<AdditionalInformationDefinition, TitanOperationStatus> either = this.updateAdditionalInformationParameter(nodeType, resourceId, id, key, value);
+            Either<AdditionalInformationDefinition, JanusGraphOperationStatus> either = this.updateAdditionalInformationParameter(nodeType, resourceId, id, key, value);
 
             if (either.isRight()) {
                 log.info("Failed to update additional information property {} to component {}", key, resourceId);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(either.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(either.right().value()));
             } else {
                 AdditionalInformationDefinition additionalInformationDefinition = either.left().value();
                 result = Either.left(additionalInformationDefinition);
@@ -534,11 +550,11 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
 
         try {
 
-            Either<AdditionalInformationDefinition, TitanOperationStatus> either = this.deleteAdditionalInformationParameter(nodeType, resourceId, id);
+            Either<AdditionalInformationDefinition, JanusGraphOperationStatus> either = this.deleteAdditionalInformationParameter(nodeType, resourceId, id);
 
             if (either.isRight()) {
                 log.error("Failed to delete additional information id {} to component {}", id, resourceId);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(either.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(either.right().value()));
             } else {
                 AdditionalInformationDefinition additionalInformationDefinition = either.left().value();
                 result = Either.left(additionalInformationDefinition);
@@ -559,11 +575,11 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
 
         try {
 
-            Either<Integer, TitanOperationStatus> either = this.getNumberOfParameters(nodeType, resourceId);
+            Either<Integer, JanusGraphOperationStatus> either = this.getNumberOfParameters(nodeType, resourceId);
 
             if (either.isRight()) {
                 log.error("Failed to get the number of additional information properties in component {}", resourceId);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(either.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(either.right().value()));
             } else {
                 Integer counter = either.left().value();
                 result = Either.left(counter);
@@ -574,10 +590,10 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
             if (!inTransaction) {
                 if (result == null || result.isRight()) {
                     log.error(GOING_TO_EXECUTE_ROLLBACK_ON_GRAPH);
-                    titanGenericDao.rollback();
+                    janusGraphGenericDao.rollback();
                 } else {
                     log.debug(GOING_TO_EXECUTE_COMMIT_ON_GRAPH);
-                    titanGenericDao.commit();
+                    janusGraphGenericDao.commit();
                 }
             }
         }
@@ -585,13 +601,14 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
     }
 
     @Override
-    public Either<Integer, TitanOperationStatus> getNumberOfParameters(NodeTypeEnum nodeType, String resourceId) {
+    public Either<Integer, JanusGraphOperationStatus> getNumberOfParameters(NodeTypeEnum nodeType, String resourceId) {
 
-        Either<ImmutablePair<AdditionalInfoParameterData, GraphEdge>, TitanOperationStatus> getResult = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(nodeType), resourceId, GraphEdgeLabels.ADDITIONAL_INFORMATION,
+        Either<ImmutablePair<AdditionalInfoParameterData, GraphEdge>, JanusGraphOperationStatus> getResult = janusGraphGenericDao
+            .getChild(UniqueIdBuilder.getKeyByNodeType(nodeType), resourceId, GraphEdgeLabels.ADDITIONAL_INFORMATION,
                 NodeTypeEnum.AdditionalInfoParameters, AdditionalInfoParameterData.class);
 
         if (getResult.isRight()) {
-            TitanOperationStatus status = getResult.right().value();
+            JanusGraphOperationStatus status = getResult.right().value();
             return Either.right(status);
         }
 
@@ -609,18 +626,20 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
     }
 
     @Override
-    public Either<AdditionalInfoParameterInfo, TitanOperationStatus> getAdditionalInformationParameter(NodeTypeEnum nodeType, String componentId, String id) {
+    public Either<AdditionalInfoParameterInfo, JanusGraphOperationStatus> getAdditionalInformationParameter(NodeTypeEnum nodeType, String componentId, String id) {
 
-        TitanOperationStatus verifyNodeTypeVsComponent = verifyNodeTypeVsComponent(nodeType, componentId);
-        if (verifyNodeTypeVsComponent != TitanOperationStatus.OK) {
+        JanusGraphOperationStatus
+            verifyNodeTypeVsComponent = verifyNodeTypeVsComponent(nodeType, componentId);
+        if (verifyNodeTypeVsComponent != JanusGraphOperationStatus.OK) {
             return Either.right(verifyNodeTypeVsComponent);
         }
 
-        Either<ImmutablePair<AdditionalInfoParameterData, GraphEdge>, TitanOperationStatus> getResult = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(nodeType), componentId, GraphEdgeLabels.ADDITIONAL_INFORMATION,
+        Either<ImmutablePair<AdditionalInfoParameterData, GraphEdge>, JanusGraphOperationStatus> getResult = janusGraphGenericDao
+            .getChild(UniqueIdBuilder.getKeyByNodeType(nodeType), componentId, GraphEdgeLabels.ADDITIONAL_INFORMATION,
                 NodeTypeEnum.AdditionalInfoParameters, AdditionalInfoParameterData.class);
 
         if (getResult.isRight()) {
-            TitanOperationStatus status = getResult.right().value();
+            JanusGraphOperationStatus status = getResult.right().value();
             return Either.right(status);
         }
 
@@ -630,7 +649,7 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
         Map<String, String> idToKey = parameterData.getIdToKey();
 
         if (idToKey == null || !idToKey.containsKey(id)) {
-            return Either.right(TitanOperationStatus.INVALID_ID);
+            return Either.right(JanusGraphOperationStatus.INVALID_ID);
         }
 
         String key = idToKey.get(id);
@@ -638,11 +657,12 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
 
         log.trace("The key-value {} = {} was retrieved for id {}", key, value, id);
 
-        Either<AdditionalInfoParameterData, TitanOperationStatus> updateNode = titanGenericDao.updateNode(parameterData, AdditionalInfoParameterData.class);
+        Either<AdditionalInfoParameterData, JanusGraphOperationStatus> updateNode = janusGraphGenericDao
+            .updateNode(parameterData, AdditionalInfoParameterData.class);
 
         if (updateNode.isRight()) {
-            TitanOperationStatus status = updateNode.right().value();
-            if (status != TitanOperationStatus.NOT_FOUND) {
+            JanusGraphOperationStatus status = updateNode.right().value();
+            if (status != JanusGraphOperationStatus.NOT_FOUND) {
                 BeEcompErrorManager.getInstance().logBeFailedRetrieveNodeError("GetAdditionnalInformationParameter", ADDITIONAL_INFORMATION_OF + nodeType.getName() + " " + componentId, String.valueOf(status));
             }
             return Either.right(status);
@@ -655,21 +675,23 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
     }
 
     @Override
-    public Either<AdditionalInformationDefinition, TitanOperationStatus> getAllAdditionalInformationParameters(NodeTypeEnum nodeType, String componentId, boolean ignoreVerification) {
+    public Either<AdditionalInformationDefinition, JanusGraphOperationStatus> getAllAdditionalInformationParameters(NodeTypeEnum nodeType, String componentId, boolean ignoreVerification) {
 
         if (!ignoreVerification) {
-            TitanOperationStatus verifyNodeTypeVsComponent = verifyNodeTypeVsComponent(nodeType, componentId);
-            if (verifyNodeTypeVsComponent != TitanOperationStatus.OK) {
+            JanusGraphOperationStatus
+                verifyNodeTypeVsComponent = verifyNodeTypeVsComponent(nodeType, componentId);
+            if (verifyNodeTypeVsComponent != JanusGraphOperationStatus.OK) {
                 return Either.right(verifyNodeTypeVsComponent);
             }
         }
 
-        Either<ImmutablePair<AdditionalInfoParameterData, GraphEdge>, TitanOperationStatus> getResult = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(nodeType), componentId, GraphEdgeLabels.ADDITIONAL_INFORMATION,
+        Either<ImmutablePair<AdditionalInfoParameterData, GraphEdge>, JanusGraphOperationStatus> getResult = janusGraphGenericDao
+            .getChild(UniqueIdBuilder.getKeyByNodeType(nodeType), componentId, GraphEdgeLabels.ADDITIONAL_INFORMATION,
                 NodeTypeEnum.AdditionalInfoParameters, AdditionalInfoParameterData.class);
 
         if (getResult.isRight()) {
-            TitanOperationStatus status = getResult.right().value();
-            if (status != TitanOperationStatus.NOT_FOUND) {
+            JanusGraphOperationStatus status = getResult.right().value();
+            if (status != JanusGraphOperationStatus.NOT_FOUND) {
                 BeEcompErrorManager.getInstance().logBeFailedRetrieveNodeError("GetAdditionnalInformationParameters", ADDITIONAL_INFORMATION_OF + nodeType.getName() + " " + componentId, String.valueOf(status));
             }
             return Either.right(status);
@@ -693,11 +715,11 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
 
         try {
 
-            Either<AdditionalInformationDefinition, TitanOperationStatus> either = this.getAllAdditionalInformationParameters(nodeType, resourceId, ignoreVerification);
+            Either<AdditionalInformationDefinition, JanusGraphOperationStatus> either = this.getAllAdditionalInformationParameters(nodeType, resourceId, ignoreVerification);
 
             if (either.isRight()) {
-                TitanOperationStatus status = either.right().value();
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+                JanusGraphOperationStatus status = either.right().value();
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             } else {
                 AdditionalInformationDefinition additionalInformationDefinition = either.left().value();
                 result = Either.left(additionalInformationDefinition);
@@ -716,10 +738,10 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
         if (!inTransaction) {
             if (result == null || result.isRight()) {
                 log.error(GOING_TO_EXECUTE_ROLLBACK_ON_GRAPH);
-                titanGenericDao.rollback();
+                janusGraphGenericDao.rollback();
             } else {
                 log.debug(GOING_TO_EXECUTE_COMMIT_ON_GRAPH);
-                titanGenericDao.commit();
+                janusGraphGenericDao.commit();
             }
         }
     }
@@ -732,11 +754,11 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
 
         try {
 
-            Either<AdditionalInfoParameterInfo, TitanOperationStatus> either = this.getAdditionalInformationParameter(nodeType, resourceId, id);
+            Either<AdditionalInfoParameterInfo, JanusGraphOperationStatus> either = this.getAdditionalInformationParameter(nodeType, resourceId, id);
 
             if (either.isRight()) {
                 log.error("Failed to fetch additional information property with id {} of component {}", id, resourceId);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(either.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(either.right().value()));
             } else {
                 AdditionalInfoParameterInfo additionalInformationDefinition = either.left().value();
                 result = Either.left(additionalInformationDefinition);
@@ -756,16 +778,17 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
 
         try {
 
-            Either<ImmutablePair<AdditionalInfoParameterData, GraphEdge>, TitanOperationStatus> getResult = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(nodeType), resourceId, GraphEdgeLabels.ADDITIONAL_INFORMATION,
+            Either<ImmutablePair<AdditionalInfoParameterData, GraphEdge>, JanusGraphOperationStatus> getResult = janusGraphGenericDao
+                .getChild(UniqueIdBuilder.getKeyByNodeType(nodeType), resourceId, GraphEdgeLabels.ADDITIONAL_INFORMATION,
                     NodeTypeEnum.AdditionalInfoParameters, AdditionalInfoParameterData.class);
 
             if (getResult.isRight()) {
-                TitanOperationStatus status = getResult.right().value();
-                if (status == TitanOperationStatus.NOT_FOUND) {
+                JanusGraphOperationStatus status = getResult.right().value();
+                if (status == JanusGraphOperationStatus.NOT_FOUND) {
                     return Either.right(StorageOperationStatus.OK);
                 } else {
                     BeEcompErrorManager.getInstance().logBeFailedDeleteNodeError("DeleteAdditionalInformationNode", ADDITIONAL_INFORMATION_OF + nodeType.getName() + " " + resourceId, String.valueOf(status));
-                    result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+                    result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
                 }
                 return result;
             }
@@ -773,11 +796,12 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
             ImmutablePair<AdditionalInfoParameterData, GraphEdge> value = getResult.left().value();
             AdditionalInfoParameterData parameterData = value.getLeft();
 
-            Either<AdditionalInfoParameterData, TitanOperationStatus> deleteNodeRes = titanGenericDao.deleteNode(parameterData, AdditionalInfoParameterData.class);
+            Either<AdditionalInfoParameterData, JanusGraphOperationStatus> deleteNodeRes = janusGraphGenericDao
+                .deleteNode(parameterData, AdditionalInfoParameterData.class);
             if (deleteNodeRes.isRight()) {
-                TitanOperationStatus status = getResult.right().value();
+                JanusGraphOperationStatus status = getResult.right().value();
                 BeEcompErrorManager.getInstance().logBeFailedDeleteNodeError("DeleteAdditionalInformationNode", (String) parameterData.getUniqueId(), String.valueOf(status));
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
                 return result;
             }
 
@@ -792,12 +816,13 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
         }
     }
 
-    private TitanOperationStatus verifyNodeTypeVsComponent(NodeTypeEnum nodeType, String componentId) {
-        Either<TitanVertex, TitanOperationStatus> vertexByProperty = titanGenericDao.getVertexByProperty(UniqueIdBuilder.getKeyByNodeType(nodeType), componentId);
+    private JanusGraphOperationStatus verifyNodeTypeVsComponent(NodeTypeEnum nodeType, String componentId) {
+        Either<JanusGraphVertex, JanusGraphOperationStatus> vertexByProperty = janusGraphGenericDao
+            .getVertexByProperty(UniqueIdBuilder.getKeyByNodeType(nodeType), componentId);
         if (vertexByProperty.isRight()) {
-            TitanOperationStatus status = vertexByProperty.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.INVALID_ID;
+            JanusGraphOperationStatus status = vertexByProperty.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.INVALID_ID;
             }
             return status;
         } else {
@@ -806,14 +831,14 @@ public class AdditionalInformationOperation implements IAdditionalInformationOpe
             if (label != null) {
                 if (!label.equals(nodeType.getName())) {
                     log.debug("The node type {} is not appropriate to component {}", nodeType, componentId);
-                    return TitanOperationStatus.INVALID_ID;
+                    return JanusGraphOperationStatus.INVALID_ID;
                 }
             } else {
                 log.debug("The node type {}  with id {} does not have a label property.", nodeType, componentId);
-                return TitanOperationStatus.INVALID_ID;
+                return JanusGraphOperationStatus.INVALID_ID;
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
 }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ArtifactOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ArtifactOperation.java
index 9beb2053a3..4e65fa5d2b 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ArtifactOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ArtifactOperation.java
@@ -20,8 +20,8 @@
 
 package org.openecomp.sdc.be.model.operations.impl;
 
-import com.thinkaurelius.titan.core.TitanGraph;
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraph;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.tinkerpop.gremlin.structure.Direction;
@@ -33,11 +33,11 @@ import org.openecomp.sdc.be.dao.graph.GraphElementFactory;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphElementTypeEnum;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgePropertiesDictionary;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
 import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.ArtifactDefinition;
@@ -61,7 +61,7 @@ public class ArtifactOperation implements IArtifactOperation {
     private static final String THE_RETURNED_ARTIFACT_DEFINTION_IS = "The returned ArtifactDefintion is {}";
 
 	@javax.annotation.Resource
-    private TitanGenericDao titanGenericDao;
+    private JanusGraphGenericDao janusGraphGenericDao;
 
     @javax.annotation.Resource
     private HeatParametersOperation heatParametersOperation;
@@ -77,12 +77,12 @@ public class ArtifactOperation implements IArtifactOperation {
         super();
     }
 
-    public TitanGenericDao getTitanGenericDao() {
-        return titanGenericDao;
+    public JanusGraphGenericDao getJanusGraphGenericDao() {
+        return janusGraphGenericDao;
     }
 
-    public void setTitanGenericDao(TitanGenericDao titanGenericDao) {
-        this.titanGenericDao = titanGenericDao;
+    public void setJanusGraphGenericDao(JanusGraphGenericDao janusGraphGenericDao) {
+        this.janusGraphGenericDao = janusGraphGenericDao;
     }
 
     public HeatParametersOperation getHeatParametersOperation() {
@@ -100,13 +100,13 @@ public class ArtifactOperation implements IArtifactOperation {
 
         if (status.isRight()) {
             if (!inTransaction) {
-                titanGenericDao.rollback();
+                janusGraphGenericDao.rollback();
             }
             log.debug("Failed to add artifact {} to {} {}", artifactInfo.getArtifactName(), type , parentId);
             return Either.right(status.right().value());
         } else {
             if (!inTransaction) {
-                titanGenericDao.commit();
+                janusGraphGenericDao.commit();
             }
             ArtifactData artifactData = status.left().value();
 
@@ -119,7 +119,7 @@ public class ArtifactOperation implements IArtifactOperation {
     }
 
     @Override
-    public StorageOperationStatus addArifactToComponent(ArtifactDefinition artifactInfo, String parentId, NodeTypeEnum type, boolean failIfExist, TitanVertex parentVertex) {
+    public StorageOperationStatus addArifactToComponent(ArtifactDefinition artifactInfo, String parentId, NodeTypeEnum type, boolean failIfExist, JanusGraphVertex parentVertex) {
 
         StorageOperationStatus status = addArtifactToGraph(artifactInfo, parentId, type, failIfExist, parentVertex);
 
@@ -129,7 +129,7 @@ public class ArtifactOperation implements IArtifactOperation {
         return status;
     }
 
-    private StorageOperationStatus addArtifactToGraph(ArtifactDefinition artifactInfo, String id, NodeTypeEnum type, boolean failIfexist, TitanVertex parentVertex) {
+    private StorageOperationStatus addArtifactToGraph(ArtifactDefinition artifactInfo, String id, NodeTypeEnum type, boolean failIfexist, JanusGraphVertex parentVertex) {
 
         if (artifactInfo.getUniqueId() == null || artifactInfo.getUniqueId().isEmpty()) {
             String uniqueId = UniqueIdBuilder.buildPropertyUniqueId(id, artifactInfo.getArtifactLabel());
@@ -142,20 +142,21 @@ public class ArtifactOperation implements IArtifactOperation {
 
         ArtifactData artifactData = new ArtifactData(artifactInfo);
 
-        Either<TitanVertex, TitanOperationStatus> existArtifact = titanGenericDao.getVertexByProperty(artifactData.getUniqueIdKey(), artifactData.getUniqueId());
+        Either<JanusGraphVertex, JanusGraphOperationStatus> existArtifact = janusGraphGenericDao
+            .getVertexByProperty(artifactData.getUniqueIdKey(), artifactData.getUniqueId());
         if (existArtifact.isRight()) {
-            if (existArtifact.right().value().equals(TitanOperationStatus.NOT_FOUND)) {
+            if (existArtifact.right().value().equals(JanusGraphOperationStatus.NOT_FOUND)) {
                 // create new node
                 log.debug("Before adding artifact to graph {}", artifactData);
                 if (artifactData.getArtifactDataDefinition().getArtifactUUID() == null || artifactData.getArtifactDataDefinition().getArtifactUUID().isEmpty())
                     updateUUID(artifactData.getArtifactDataDefinition(), null, artifactData.getArtifactDataDefinition().getArtifactVersion());
-                Either<TitanVertex, TitanOperationStatus> createNodeResult = titanGenericDao.createNode(artifactData);
+                Either<JanusGraphVertex, JanusGraphOperationStatus> createNodeResult = janusGraphGenericDao.createNode(artifactData);
 
                 if (createNodeResult.isRight()) {
-                    TitanOperationStatus operationStatus = createNodeResult.right().value();
+                    JanusGraphOperationStatus operationStatus = createNodeResult.right().value();
                     log.debug("Failed to add artifact {} to graph. status is {}", artifactData.getArtifactDataDefinition().getArtifactName(), operationStatus);
                     BeEcompErrorManager.getInstance().logBeFailedCreateNodeError("Add artifact", artifactData.getArtifactDataDefinition().getArtifactName(), String.valueOf(operationStatus));
-                    return DaoStatusConverter.convertTitanStatusToStorageStatus(operationStatus);
+                    return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(operationStatus);
                 }
 
                 // add heat parameters
@@ -169,11 +170,11 @@ public class ArtifactOperation implements IArtifactOperation {
 
             } else {
                 log.debug("Failed to check existance of artifact in graph for id {}", artifactData.getUniqueId());
-                return DaoStatusConverter.convertTitanStatusToStorageStatus(existArtifact.right().value());
+                return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(existArtifact.right().value());
             }
         } else if (failIfexist) {
             log.debug("Artifact {} already exist", artifactData.getUniqueId());
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(TitanOperationStatus.ALREADY_EXIST);
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(JanusGraphOperationStatus.ALREADY_EXIST);
         }
 
         // save logical artifact ref name on edge as property
@@ -181,10 +182,11 @@ public class ArtifactOperation implements IArtifactOperation {
         properties.put(GraphEdgePropertiesDictionary.NAME.getProperty(), artifactInfo.getArtifactLabel());
         if (artifactInfo.getArtifactGroupType() != null)
             properties.put(GraphEdgePropertiesDictionary.GROUP_TYPE.getProperty(), artifactInfo.getArtifactGroupType().getType());
-        TitanOperationStatus relation = titanGenericDao.createEdge(parentVertex, artifactData, GraphEdgeLabels.ARTIFACT_REF, properties);
-        if (!relation.equals(TitanOperationStatus.OK)) {
+        JanusGraphOperationStatus relation = janusGraphGenericDao
+            .createEdge(parentVertex, artifactData, GraphEdgeLabels.ARTIFACT_REF, properties);
+        if (!relation.equals(JanusGraphOperationStatus.OK)) {
             log.debug("Failed to create relation in graph for id {} to new artifact", id);
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(relation);
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(relation);
         }
 
         return StorageOperationStatus.OK;
@@ -203,21 +205,23 @@ public class ArtifactOperation implements IArtifactOperation {
 
         ArtifactData artifactData = new ArtifactData(artifactInfo);
 
-        Either<ArtifactData, TitanOperationStatus> existArtifact = titanGenericDao.getNode(artifactData.getUniqueIdKey(), artifactData.getUniqueId(), ArtifactData.class);
+        Either<ArtifactData, JanusGraphOperationStatus> existArtifact = janusGraphGenericDao
+            .getNode(artifactData.getUniqueIdKey(), artifactData.getUniqueId(), ArtifactData.class);
         if (existArtifact.isRight()) {
-            if (existArtifact.right().value().equals(TitanOperationStatus.NOT_FOUND)) {
+            if (existArtifact.right().value().equals(JanusGraphOperationStatus.NOT_FOUND)) {
                 // create new node
                 log.debug("Before adding artifact to graph {}" , artifactData);
                 if (artifactData.getArtifactDataDefinition().getArtifactUUID() == null || artifactData.getArtifactDataDefinition().getArtifactUUID().isEmpty())
                     updateUUID(artifactData.getArtifactDataDefinition(), null, artifactData.getArtifactDataDefinition().getArtifactVersion());
-                Either<ArtifactData, TitanOperationStatus> createNodeResult = titanGenericDao.createNode(artifactData, ArtifactData.class);
+                Either<ArtifactData, JanusGraphOperationStatus> createNodeResult = janusGraphGenericDao
+                    .createNode(artifactData, ArtifactData.class);
                 log.debug("After adding artifact to graph {}", artifactData);
 
                 if (createNodeResult.isRight()) {
-                    TitanOperationStatus operationStatus = createNodeResult.right().value();
+                    JanusGraphOperationStatus operationStatus = createNodeResult.right().value();
                     log.debug("Failed to add artifact {} to graph. status is {}", artifactData.getArtifactDataDefinition().getArtifactName(), operationStatus);
                     BeEcompErrorManager.getInstance().logBeFailedCreateNodeError("Add artifact", artifactData.getArtifactDataDefinition().getArtifactName(), String.valueOf(operationStatus));
-                    return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(operationStatus));
+                    return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(operationStatus));
                 }
                 artifactData = createNodeResult.left().value();
 
@@ -232,11 +236,12 @@ public class ArtifactOperation implements IArtifactOperation {
 
             } else {
                 log.debug("Failed to check existance of artifact in graph for id {}", artifactData.getUniqueId());
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(existArtifact.right().value()));
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(existArtifact.right().value()));
             }
         } else if (failIfexist) {
             log.debug("Artifact {} already exist", artifactData.getUniqueId());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(TitanOperationStatus.ALREADY_EXIST));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(
+                JanusGraphOperationStatus.ALREADY_EXIST));
         } else {
             artifactData = existArtifact.left().value();
         }
@@ -248,10 +253,11 @@ public class ArtifactOperation implements IArtifactOperation {
         properties.put(GraphEdgePropertiesDictionary.NAME.getProperty(), artifactInfo.getArtifactLabel());
         if (artifactInfo.getArtifactGroupType() != null)
             properties.put(GraphEdgePropertiesDictionary.GROUP_TYPE.getProperty(), artifactInfo.getArtifactGroupType().getType());
-        Either<GraphRelation, TitanOperationStatus> relation = titanGenericDao.createRelation(parent, artifactData, GraphEdgeLabels.ARTIFACT_REF, properties);
+        Either<GraphRelation, JanusGraphOperationStatus> relation = janusGraphGenericDao
+            .createRelation(parent, artifactData, GraphEdgeLabels.ARTIFACT_REF, properties);
         if (relation.isRight()) {
             log.debug("Failed to create relation in graph fro id {} to new artifact", id);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(relation.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(relation.right().value()));
         }
 
         return Either.left(artifactData);
@@ -291,14 +297,14 @@ public class ArtifactOperation implements IArtifactOperation {
 
         if (status.isRight()) {
             if (!inTransaction) {
-                titanGenericDao.rollback();
+                janusGraphGenericDao.rollback();
             }
             log.debug("Failed to update artifact {} of {} {}. status is {}", artifactId, type.getName(), id, status.right().value());
             BeEcompErrorManager.getInstance().logBeFailedUpdateNodeError("Update Artifact", artifactId, String.valueOf(status.right().value()));
             return Either.right(status.right().value());
         } else {
             if (!inTransaction) {
-                titanGenericDao.commit();
+                janusGraphGenericDao.commit();
             }
             ArtifactData artifactData = status.left().value();
 
@@ -314,7 +320,7 @@ public class ArtifactOperation implements IArtifactOperation {
 
         if (status.isRight()) {
             if (!inTransaction) {
-                titanGenericDao.rollback();
+                janusGraphGenericDao.rollback();
             }
             log.debug("Failed to delete artifact {} of resource {}", artifactId, id);
 
@@ -322,7 +328,7 @@ public class ArtifactOperation implements IArtifactOperation {
             return Either.right(status.right().value());
         } else {
             if (!inTransaction) {
-                titanGenericDao.commit();
+                janusGraphGenericDao.commit();
             }
             ArtifactData artifactData = status.left().value();
 
@@ -335,21 +341,21 @@ public class ArtifactOperation implements IArtifactOperation {
     @SuppressWarnings("null")
     private Either<ArtifactData, StorageOperationStatus> updateArtifactOnGraph(ArtifactDefinition artifactInfo, String artifactId, NodeTypeEnum type, String id) {
 
-        Either<TitanGraph, TitanOperationStatus> graph = titanGenericDao.getGraph();
+        Either<JanusGraph, JanusGraphOperationStatus> graph = janusGraphGenericDao.getGraph();
         if (graph.isRight()) {
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(graph.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(graph.right().value()));
         }
 
-        TitanGraph tGraph = graph.left().value();
+        JanusGraph tGraph = graph.left().value();
 
         @SuppressWarnings("unchecked")
-        Iterable<TitanVertex> verticesArtifact = tGraph.query().has(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.ArtifactRef), artifactId).vertices();
-        Iterator<TitanVertex> iterator = verticesArtifact.iterator();
+        Iterable<JanusGraphVertex> verticesArtifact = tGraph.query().has(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.ArtifactRef), artifactId).vertices();
+        Iterator<JanusGraphVertex> iterator = verticesArtifact.iterator();
         if (!iterator.hasNext()) {
             log.debug("No artifact node for id = {}", artifactId);
             return Either.right(StorageOperationStatus.NOT_FOUND);
         }
-        TitanVertex artifactV = iterator.next();
+        JanusGraphVertex artifactV = iterator.next();
 
         Iterator<Edge> iterEdge = artifactV.edges(Direction.IN, GraphEdgeLabels.ARTIFACT_REF.getProperty());
 
@@ -385,8 +391,10 @@ public class ArtifactOperation implements IArtifactOperation {
             String uniqueId = UniqueIdBuilder.buildPropertyUniqueId(id, artifactInfo.getArtifactLabel());
             artifactInfo.setUniqueId(uniqueId);
             // update UUID and artifact version
-            String oldChecksum = artifactV.valueOrNull(titanGenericDao.getGraph().left().value().getPropertyKey(GraphPropertiesDictionary.ARTIFACT_CHECKSUM.getProperty()));
-            String oldVersion = artifactV.valueOrNull(titanGenericDao.getGraph().left().value().getPropertyKey(GraphPropertiesDictionary.ARTIFACT_VERSION.getProperty()));
+            String oldChecksum = artifactV.valueOrNull(
+                janusGraphGenericDao.getGraph().left().value().getPropertyKey(GraphPropertiesDictionary.ARTIFACT_CHECKSUM.getProperty()));
+            String oldVersion = artifactV.valueOrNull(
+                janusGraphGenericDao.getGraph().left().value().getPropertyKey(GraphPropertiesDictionary.ARTIFACT_VERSION.getProperty()));
             updateUUID(artifactInfo, oldChecksum, oldVersion);
             log.debug("try to create new artifact ref node for id {}", uniqueId);
             Either<ArtifactData, StorageOperationStatus> addedArtifactRes = addArtifactToGraph(artifactInfo, id, type, true);
@@ -435,10 +443,11 @@ public class ArtifactOperation implements IArtifactOperation {
                     Vertex vertexIn = edgeToHeat.inVertex();
                     String generatedFromArtifactId = vertexIn.value(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.ArtifactRef));
                     UniqueIdData generatedFromArtifactNode = new UniqueIdData(NodeTypeEnum.ArtifactRef, generatedFromArtifactId);
-                    Either<GraphRelation, TitanOperationStatus> createRelationToGeneratedFromArtifactRes = titanGenericDao.createRelation(addedArtifact, generatedFromArtifactNode, GraphEdgeLabels.GENERATED_FROM, null);
+                    Either<GraphRelation, JanusGraphOperationStatus> createRelationToGeneratedFromArtifactRes = janusGraphGenericDao
+                        .createRelation(addedArtifact, generatedFromArtifactNode, GraphEdgeLabels.GENERATED_FROM, null);
                     if (createRelationToGeneratedFromArtifactRes.isRight()) {
                         log.error("Failed to create relation from heat_env {} to heat {}", addedArtifact.getUniqueId(), generatedFromArtifactNode);
-                        return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(createRelationToGeneratedFromArtifactRes.right().value()));
+                        return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(createRelationToGeneratedFromArtifactRes.right().value()));
                     }
                 }
             }
@@ -446,14 +455,17 @@ public class ArtifactOperation implements IArtifactOperation {
 
         } else {
             if (edgeCount == 1) {
-                String oldChecksum = artifactV.valueOrNull(titanGenericDao.getGraph().left().value().getPropertyKey(GraphPropertiesDictionary.ARTIFACT_CHECKSUM.getProperty()));
-                String oldVersion = artifactV.valueOrNull(titanGenericDao.getGraph().left().value().getPropertyKey(GraphPropertiesDictionary.ARTIFACT_VERSION.getProperty()));
+                String oldChecksum = artifactV.valueOrNull(
+                    janusGraphGenericDao.getGraph().left().value().getPropertyKey(GraphPropertiesDictionary.ARTIFACT_CHECKSUM.getProperty()));
+                String oldVersion = artifactV.valueOrNull(
+                    janusGraphGenericDao.getGraph().left().value().getPropertyKey(GraphPropertiesDictionary.ARTIFACT_VERSION.getProperty()));
                 updateUUID(artifactInfo, oldChecksum, oldVersion);
                 // update exist
-                Either<ArtifactData, TitanOperationStatus> updatedArtifact = titanGenericDao.updateNode(artifactData, ArtifactData.class);
+                Either<ArtifactData, JanusGraphOperationStatus> updatedArtifact = janusGraphGenericDao
+                    .updateNode(artifactData, ArtifactData.class);
                 if (updatedArtifact.isRight()) {
                     log.debug("failed to update artifact node for id {}", artifactData.getUniqueId());
-                    return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(updatedArtifact.right().value()));
+                    return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(updatedArtifact.right().value()));
                 }
 
                 if (artifactInfo.getArtifactType().equals(ArtifactTypeEnum.HEAT_ENV.getType())) {
@@ -511,7 +523,7 @@ public class ArtifactOperation implements IArtifactOperation {
         return false;
     }
 
-    private Either<Boolean, StorageOperationStatus> setRelevantHeatParamId(TitanVertex artifactV, ArtifactDefinition artifactInfo) {
+    private Either<Boolean, StorageOperationStatus> setRelevantHeatParamId(JanusGraphVertex artifactV, ArtifactDefinition artifactInfo) {
 
         Map<String, String> heatParametersHM = new HashMap<>();
 
@@ -524,7 +536,8 @@ public class ArtifactOperation implements IArtifactOperation {
         Vertex heatVertex = heat.inVertex();
         String heatUniqueId = (String) heatVertex.value(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.ArtifactRef));
 
-        Either<List<ImmutablePair<HeatParameterData, GraphEdge>>, TitanOperationStatus> getHeatParametersRes = titanGenericDao.getChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), heatUniqueId, GraphEdgeLabels.HEAT_PARAMETER,
+        Either<List<ImmutablePair<HeatParameterData, GraphEdge>>, JanusGraphOperationStatus> getHeatParametersRes = janusGraphGenericDao
+            .getChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), heatUniqueId, GraphEdgeLabels.HEAT_PARAMETER,
                 NodeTypeEnum.HeatParameter, HeatParameterData.class);
         if (getHeatParametersRes.isRight()) {
             log.debug("No heat parameters for heat artifact {}", heatUniqueId);
@@ -550,17 +563,18 @@ public class ArtifactOperation implements IArtifactOperation {
     }
 
     private Either<ArtifactData, StorageOperationStatus> removeArtifactOnGraph(String id, String artifactId, NodeTypeEnum type, boolean deleteMandatoryArtifact) {
-        Either<TitanGraph, StorageOperationStatus> graph = titanGenericDao.getGraph()
+        Either<JanusGraph, StorageOperationStatus> graph = janusGraphGenericDao.getGraph()
                 .right()
-                .map(DaoStatusConverter::convertTitanStatusToStorageStatus);
+                .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
         if (graph.isRight()) {
             return Either.right(graph.right().value());
         }
 
-        TitanGraph tGraph = graph.left().value();
-        Either<ArtifactData, StorageOperationStatus> artifactData = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.ArtifactRef), artifactId, ArtifactData.class)
+        JanusGraph tGraph = graph.left().value();
+        Either<ArtifactData, StorageOperationStatus> artifactData = janusGraphGenericDao
+            .getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.ArtifactRef), artifactId, ArtifactData.class)
                 .right()
-                .map(DaoStatusConverter::convertTitanStatusToStorageStatus);
+                .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
         if (artifactData.isRight()) {
             log.debug("Failed to retrieve  artifact for id = {}", artifactId);
             return Either.right(artifactData.right().value());
@@ -572,8 +586,8 @@ public class ArtifactOperation implements IArtifactOperation {
         }
 
         @SuppressWarnings("unchecked")
-        Iterable<TitanVertex> verticesArtifact = tGraph.query().has(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.ArtifactRef), artifactId).vertices();
-        Iterator<TitanVertex> iterator = verticesArtifact.iterator();
+        Iterable<JanusGraphVertex> verticesArtifact = tGraph.query().has(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.ArtifactRef), artifactId).vertices();
+        Iterator<JanusGraphVertex> iterator = verticesArtifact.iterator();
         if (!iterator.hasNext()) {
             log.debug("No artifact node for id = {}", artifactId);
             return Either.right(StorageOperationStatus.NOT_FOUND);
@@ -649,20 +663,20 @@ public class ArtifactOperation implements IArtifactOperation {
     public Either<Map<String, ArtifactDefinition>, StorageOperationStatus> getArtifacts(String parentId, NodeTypeEnum parentType, boolean inTransaction) {
         Either<Map<String, ArtifactDefinition>, StorageOperationStatus> result = null;
         try {
-            Either<TitanGraph, TitanOperationStatus> graph = titanGenericDao.getGraph();
+            Either<JanusGraph, JanusGraphOperationStatus> graph = janusGraphGenericDao.getGraph();
             if (graph.isRight()) {
                 log.debug("Failed to work with graph {}", graph.right().value());
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(graph.right().value()));
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(graph.right().value()));
             }
-            TitanGraph tGraph = graph.left().value();
+            JanusGraph tGraph = graph.left().value();
             @SuppressWarnings("unchecked")
-            Iterable<TitanVertex> vertices = tGraph.query().has(UniqueIdBuilder.getKeyByNodeType(parentType), parentId).vertices();
+            Iterable<JanusGraphVertex> vertices = tGraph.query().has(UniqueIdBuilder.getKeyByNodeType(parentType), parentId).vertices();
             if (vertices == null) {
                 log.debug("No nodes for type {}  for id = {}", parentType, parentId);
                 result = Either.right(StorageOperationStatus.NOT_FOUND);
                 return result;
             }
-            Iterator<TitanVertex> iterator = vertices.iterator();
+            Iterator<JanusGraphVertex> iterator = vertices.iterator();
 
             Map<String, ArtifactDefinition> artifactMap = new HashMap<>();
             while (iterator.hasNext()) {
@@ -676,15 +690,16 @@ public class ArtifactOperation implements IArtifactOperation {
 
                         Vertex artifactV = edge.inVertex();
 
-                        Map<String, Object> properties = this.titanGenericDao.getProperties(artifactV);
+                        Map<String, Object> properties = this.janusGraphGenericDao.getProperties(artifactV);
                         ArtifactData artifact = GraphElementFactory.createElement(NodeTypeEnum.ArtifactRef.getName(), GraphElementTypeEnum.Node, properties, ArtifactData.class);
                         if (artifact != null) {
 
                             ArtifactDefinition artifactDefinition = new ArtifactDefinition(artifact.getArtifactDataDefinition());
                             Iterator<Edge> edgesGeneratedFrom = artifactV.edges(Direction.OUT, GraphEdgeLabels.GENERATED_FROM.getProperty());
                             if (edgesGeneratedFrom != null && edgesGeneratedFrom.hasNext()) {
-                                TitanVertex inVertex = (TitanVertex) edgesGeneratedFrom.next().inVertex();
-                                String artifactIdGeneratedFrom = (String) titanGenericDao.getProperty(inVertex, GraphPropertiesDictionary.UNIQUE_ID.getProperty());
+                                JanusGraphVertex inVertex = (JanusGraphVertex) edgesGeneratedFrom.next().inVertex();
+                                String artifactIdGeneratedFrom = (String) janusGraphGenericDao
+                                    .getProperty(inVertex, GraphPropertiesDictionary.UNIQUE_ID.getProperty());
                                 artifactDefinition.setGeneratedFromId(artifactIdGeneratedFrom);
                             }
                             List<HeatParameterDefinition> heatParams = new ArrayList<>();
@@ -707,9 +722,9 @@ public class ArtifactOperation implements IArtifactOperation {
         } finally {
             if (!inTransaction) {
                 if (result == null || result.isRight()) {
-                    this.titanGenericDao.rollback();
+                    this.janusGraphGenericDao.rollback();
                 } else {
-                    this.titanGenericDao.commit();
+                    this.janusGraphGenericDao.commit();
                 }
 
             }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CacheMangerOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CacheMangerOperation.java
index 3a0eef1a46..abd3c91eea 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CacheMangerOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CacheMangerOperation.java
@@ -23,7 +23,7 @@ package org.openecomp.sdc.be.model.operations.impl;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import org.openecomp.sdc.be.config.Configuration;
 import org.openecomp.sdc.be.config.ConfigurationManager;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.cache.ComponentCache;
 import org.openecomp.sdc.be.model.cache.DaoInfo;
@@ -31,7 +31,7 @@ import org.openecomp.sdc.be.model.cache.jobs.*;
 import org.openecomp.sdc.be.model.cache.workers.CacheWorker;
 import org.openecomp.sdc.be.model.cache.workers.IWorker;
 import org.openecomp.sdc.be.model.cache.workers.SyncWorker;
-import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.ICacheMangerOperation;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,7 +50,7 @@ public class CacheMangerOperation implements ICacheMangerOperation {
     @Autowired
     private ToscaOperationFacade toscaOperationFacade;
     @Autowired
-    private TitanGenericDao titanGenericDao;
+    private JanusGraphGenericDao janusGraphGenericDao;
     @Autowired
     private ComponentCache componentCache;
 
@@ -183,8 +183,8 @@ public class CacheMangerOperation implements ICacheMangerOperation {
         }
     }
 
-    public TitanGenericDao getTitanGenericDao() {
-        return titanGenericDao;
+    public JanusGraphGenericDao getJanusGraphGenericDao() {
+        return janusGraphGenericDao;
     }
 
     public ComponentCache getComponentCache() {
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CapabilityOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CapabilityOperation.java
index 382a2e00f7..ed635d1a0a 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CapabilityOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CapabilityOperation.java
@@ -36,11 +36,11 @@ import java.util.stream.Collectors;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation;
+import org.openecomp.sdc.be.dao.janusgraph.HealingJanusGraphGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgePropertiesDictionary;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.HealingTitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.CapabilityDefinition;
 import org.openecomp.sdc.be.model.CapabilityTypeDefinition;
@@ -71,11 +71,11 @@ public class CapabilityOperation extends AbstractOperation {
     
     
     @VisibleForTesting
-    public void setTitanGenericDao(HealingTitanGenericDao titanGenericDao) {
-        this.titanGenericDao = titanGenericDao;
+    public void setJanusGraphGenericDao(HealingJanusGraphGenericDao janusGraphGenericDao) {
+        this.janusGraphGenericDao = janusGraphGenericDao;
     }
 
-    public Either<CapabilityData, TitanOperationStatus> addCapabilityToGraph(String resourceId, CapabilityTypeData capTypeData, CapabilityDefinition capabilityDefinition) {
+    public Either<CapabilityData, JanusGraphOperationStatus> addCapabilityToGraph(String resourceId, CapabilityTypeData capTypeData, CapabilityDefinition capabilityDefinition) {
 
         log.debug("#addCapabilityToGraph - capabilityDefinition={}", capabilityDefinition);
 
@@ -83,11 +83,12 @@ public class CapabilityOperation extends AbstractOperation {
         CapabilityData capabilityData = buildCapabilityData(capabilityDefinition, capUniqueId);
 
         log.debug("addCapabilityToGraph - Before adding capability to graph. capabilityTypeData = {}", capabilityData);
-        Either<CapabilityData, TitanOperationStatus> createCapResult = titanGenericDao.createNode(capabilityData, CapabilityData.class);
+        Either<CapabilityData, JanusGraphOperationStatus> createCapResult = janusGraphGenericDao
+            .createNode(capabilityData, CapabilityData.class);
         log.debug("addCapabilityToGraph - After adding capability to graph. status is = {}", createCapResult);
 
         if (createCapResult.isRight()) {
-            TitanOperationStatus operationStatus = createCapResult.right().value();
+            JanusGraphOperationStatus operationStatus = createCapResult.right().value();
             log.error("addCapabilityToGraph - Failed to add capability of type {} to graph. status is {}", capabilityDefinition.getType(), operationStatus);
             return createCapResult;
         }
@@ -101,14 +102,15 @@ public class CapabilityOperation extends AbstractOperation {
         return createCapResult;
     }
     
-    private Either<GraphRelation, TitanOperationStatus> connectToCapabilityType(CapabilityData capabilityData, CapabilityTypeData capabilityTypeData) {
+    private Either<GraphRelation, JanusGraphOperationStatus> connectToCapabilityType(CapabilityData capabilityData, CapabilityTypeData capabilityTypeData) {
         
         Map<String, Object> properties = new HashMap<>();
 
         String capabilityName = capabilityData.getCapabilityDataDefinition().getName();
         properties.put(GraphEdgePropertiesDictionary.NAME.getProperty(), capabilityName);
         
-        return titanGenericDao.createRelation(capabilityData, capabilityTypeData, GraphEdgeLabels.CAPABILITY_IMPL, properties);
+        return janusGraphGenericDao
+            .createRelation(capabilityData, capabilityTypeData, GraphEdgeLabels.CAPABILITY_IMPL, properties);
 
     }
     
@@ -117,13 +119,13 @@ public class CapabilityOperation extends AbstractOperation {
      * @param capabilites
      * @return
      */
-    public Either<List<CapabilityDefinition>, TitanOperationStatus> getCapabilitiesWithProps(List<ImmutablePair<CapabilityData, GraphEdge>> capabilites) {
-        List<Either<CapabilityDefinition, TitanOperationStatus>> listFilledCapabilitiesResults = capabilites.stream()
+    public Either<List<CapabilityDefinition>, JanusGraphOperationStatus> getCapabilitiesWithProps(List<ImmutablePair<CapabilityData, GraphEdge>> capabilites) {
+        List<Either<CapabilityDefinition, JanusGraphOperationStatus>> listFilledCapabilitiesResults = capabilites.stream()
                                                         .map(ImmutablePair::getLeft)
                                                         .map(this::toCapabilityDefinitionWithProps)
                                                         .collect(Collectors.toList());
         
-        Optional<TitanOperationStatus> status = listFilledCapabilitiesResults.stream().filter(Either::isRight)
+        Optional<JanusGraphOperationStatus> status = listFilledCapabilitiesResults.stream().filter(Either::isRight)
                                                                .map(res -> res.right().value())
                                                                .findFirst();
         
@@ -138,7 +140,7 @@ public class CapabilityOperation extends AbstractOperation {
         return Either.left(listCapabilities);
     }
     
-    private Either<CapabilityDefinition, TitanOperationStatus> toCapabilityDefinitionWithProps(CapabilityData capabilityData) {
+    private Either<CapabilityDefinition, JanusGraphOperationStatus> toCapabilityDefinitionWithProps(CapabilityData capabilityData) {
         CapabilityDefinition capabilityDefinition = new CapabilityDefinition(capabilityData.getCapabilityDataDefinition());
         return getCapabilityProperties(capabilityDefinition.getUniqueId(), capabilityDefinition.getType())
                     .left()
@@ -157,33 +159,34 @@ public class CapabilityOperation extends AbstractOperation {
      * @param capabilityUid
      * @return
      */
-    private Either<List<ComponentInstanceProperty>, TitanOperationStatus> getCapabilityProperties(String capabilityUid, String capabilityType) {
-        Either<CapabilityTypeDefinition, TitanOperationStatus> capabilityTypeRes = capabilityTypeOperation.getCapabilityTypeByType(capabilityType);
+    private Either<List<ComponentInstanceProperty>, JanusGraphOperationStatus> getCapabilityProperties(String capabilityUid, String capabilityType) {
+        Either<CapabilityTypeDefinition, JanusGraphOperationStatus> capabilityTypeRes = capabilityTypeOperation.getCapabilityTypeByType(capabilityType);
 
         if (capabilityTypeRes.isRight()) {
-            TitanOperationStatus status = capabilityTypeRes.right().value();
+            JanusGraphOperationStatus status = capabilityTypeRes.right().value();
             return Either.right(status);
         }
 
         CapabilityTypeDefinition capabilityTypeDefinition = capabilityTypeRes.left().value();
 
-        Either<Map<String, PropertyDefinition>, TitanOperationStatus> typesPropsRes = getPropertiesOfCapabilityTypeAndAcestors(capabilityTypeDefinition);
+        Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> typesPropsRes = getPropertiesOfCapabilityTypeAndAcestors(capabilityTypeDefinition);
         if (typesPropsRes.isRight()) {
-            TitanOperationStatus status = typesPropsRes.right().value();
+            JanusGraphOperationStatus status = typesPropsRes.right().value();
             return Either.right(status);
         }
         
         Map<String, PropertyDefinition> capabilityTypeProperties = typesPropsRes.left().value();
 
         if (isEmpty(capabilityTypeProperties)) {
-            return Either.right(TitanOperationStatus.OK);
+            return Either.right(JanusGraphOperationStatus.OK);
         }
 
         Map<String, PropertyDefinition> uidToPropDefMap = capabilityTypeProperties.values().stream()
                                                             .collect(Collectors.toMap(PropertyDefinition::getUniqueId, Function.identity()));
 
         // Find all properties values on the capability
-        Either<List<ImmutablePair<PropertyValueData, GraphEdge>>, TitanOperationStatus> propertyValNodes = titanGenericDao.getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Capability), capabilityUid, GraphEdgeLabels.PROPERTY_VALUE,
+        Either<List<ImmutablePair<PropertyValueData, GraphEdge>>, JanusGraphOperationStatus> propertyValNodes = janusGraphGenericDao
+            .getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Capability), capabilityUid, GraphEdgeLabels.PROPERTY_VALUE,
                 NodeTypeEnum.PropertyValue, PropertyValueData.class);
 
         if (propertyValNodes.isRight()) {
@@ -192,7 +195,7 @@ public class CapabilityOperation extends AbstractOperation {
 
         List<ImmutablePair<PropertyValueData, GraphEdge>> propValsRelationPairs = propertyValNodes.left().value();
         if (isEmpty(propValsRelationPairs)) {
-            return Either.right(TitanOperationStatus.OK);
+            return Either.right(JanusGraphOperationStatus.OK);
         }
 
         List<ComponentInstanceProperty> capabilityProperties = new ArrayList<>();
@@ -200,12 +203,13 @@ public class CapabilityOperation extends AbstractOperation {
         for (ImmutablePair<PropertyValueData, GraphEdge> propValRelPair : propValsRelationPairs) {
 
             PropertyValueData propertyValueData = propValRelPair.getLeft();
-            Either<ImmutablePair<PropertyData, GraphEdge>, TitanOperationStatus> propertyDefRes = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.PropertyValue), propertyValueData.getUniqueId(), GraphEdgeLabels.PROPERTY_IMPL,
+            Either<ImmutablePair<PropertyData, GraphEdge>, JanusGraphOperationStatus> propertyDefRes = janusGraphGenericDao
+                .getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.PropertyValue), propertyValueData.getUniqueId(), GraphEdgeLabels.PROPERTY_IMPL,
                     NodeTypeEnum.Property, PropertyData.class);
             if (propertyDefRes.isRight()) {
-                TitanOperationStatus status = propertyDefRes.right().value();
-                if (status == TitanOperationStatus.NOT_FOUND) {
-                    status = TitanOperationStatus.INVALID_ID;
+                JanusGraphOperationStatus status = propertyDefRes.right().value();
+                if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                    status = JanusGraphOperationStatus.INVALID_ID;
                 }
                 return Either.right(status);
             }
@@ -242,8 +246,8 @@ public class CapabilityOperation extends AbstractOperation {
                                     .collect(Collectors.toSet());
     }
     
-    private Either<List<ComponentInstanceProperty>, TitanOperationStatus> onLoadPropValuesFailure(TitanOperationStatus status, Map<String, PropertyDefinition> capabilityTypeProperties) {
-        if (status == TitanOperationStatus.NOT_FOUND) {
+    private Either<List<ComponentInstanceProperty>, JanusGraphOperationStatus> onLoadPropValuesFailure(JanusGraphOperationStatus status, Map<String, PropertyDefinition> capabilityTypeProperties) {
+        if (status == JanusGraphOperationStatus.NOT_FOUND) {
             return Either.left(buildPropsFromCapabilityTypeProps(capabilityTypeProperties));
         } else {
             return Either.right(status);
@@ -267,15 +271,15 @@ public class CapabilityOperation extends AbstractOperation {
      * @param capabilityTypeDefinition
      * @return
      */
-    private Either<Map<String, PropertyDefinition>, TitanOperationStatus> getPropertiesOfCapabilityTypeAndAcestors(CapabilityTypeDefinition capabilityTypeDefinition) {
+    private Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> getPropertiesOfCapabilityTypeAndAcestors(CapabilityTypeDefinition capabilityTypeDefinition) {
         // Get the properties on the group type of this capability
         Map<String, PropertyDefinition> capabilityTypeProperties = capabilityTypeDefinition.getProperties();
         
         String derivedFrom = capabilityTypeDefinition.getDerivedFrom();
         if (!Strings.isNullOrEmpty(derivedFrom)) {
-            Either<Map<String, PropertyDefinition>, TitanOperationStatus> parentPropsRes = capabilityTypeOperation.getAllCapabilityTypePropertiesFromAllDerivedFrom(derivedFrom);
+            Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> parentPropsRes = capabilityTypeOperation.getAllCapabilityTypePropertiesFromAllDerivedFrom(derivedFrom);
             if(parentPropsRes.isRight()) {
-                TitanOperationStatus status = parentPropsRes.right().value();
+                JanusGraphOperationStatus status = parentPropsRes.right().value();
                 return Either.right(status);
             }
             if (capabilityTypeProperties != null) {
@@ -297,15 +301,15 @@ public class CapabilityOperation extends AbstractOperation {
      * @param capabilityTypeData
      * @return
      */
-    private Either<List<ComponentInstanceProperty>, TitanOperationStatus> createCapabilityProperties(CapabilityData capabilityData,
-                                                                                                     CapabilityTypeData capabilityTypeData) {
+    private Either<List<ComponentInstanceProperty>, JanusGraphOperationStatus> createCapabilityProperties(CapabilityData capabilityData,
+                                                                                                          CapabilityTypeData capabilityTypeData) {
 
         CapabilityDefinition capabilityDefintion = (CapabilityDefinition)capabilityData.getCapabilityDataDefinition();
         CapabilityTypeDefinition capabilityTypeDefinition = (CapabilityTypeDefinition)capabilityTypeData.getCapabilityTypeDataDefinition();
 
-        Either<Map<String, PropertyDefinition>, TitanOperationStatus> typesPropsRes = getPropertiesOfCapabilityTypeAndAcestors(capabilityTypeDefinition);
+        Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> typesPropsRes = getPropertiesOfCapabilityTypeAndAcestors(capabilityTypeDefinition);
         if (typesPropsRes.isRight()) {
-            TitanOperationStatus status = typesPropsRes.right().value();
+            JanusGraphOperationStatus status = typesPropsRes.right().value();
             return Either.right(status);
         }
         
@@ -313,10 +317,10 @@ public class CapabilityOperation extends AbstractOperation {
         
         if (isEmpty(capabilityTypeProperties) && !isEmpty(capabilityDefintion.getProperties())) {
             log.debug("#createCapabilityProperties - It's not valid if group capability has properties while corresponding capability type doesn't.");
-            return Either.right(TitanOperationStatus.MATCH_NOT_FOUND);
+            return Either.right(JanusGraphOperationStatus.MATCH_NOT_FOUND);
         }
 
-        Optional<TitanOperationStatus> error = capabilityDefintion.getProperties().stream()
+        Optional<JanusGraphOperationStatus> error = capabilityDefintion.getProperties().stream()
                              .map(property -> createPropertyValue(property, capabilityData, capabilityTypeProperties.get(property.getName())))
                              .filter(Either::isRight)
                              .map(result -> result.right().value())
@@ -342,11 +346,11 @@ public class CapabilityOperation extends AbstractOperation {
                 .collect(Collectors.toList());
     }
 
-    private  Either<PropertyValueData, TitanOperationStatus> createPropertyValue(ComponentInstanceProperty capabilityProperty, 
-                                                                              CapabilityData capabilityData,
-                                                                              PropertyDefinition capTypePropertyDefinition) {
+    private  Either<PropertyValueData, JanusGraphOperationStatus> createPropertyValue(ComponentInstanceProperty capabilityProperty,
+                                                                                      CapabilityData capabilityData,
+                                                                                      PropertyDefinition capTypePropertyDefinition) {
         if (capTypePropertyDefinition == null) {
-            return Either.right(TitanOperationStatus.MATCH_NOT_FOUND);
+            return Either.right(JanusGraphOperationStatus.MATCH_NOT_FOUND);
         }
         
         CapabilityDefinition capabilityDefintion = (CapabilityDefinition)capabilityData.getCapabilityDataDefinition();
@@ -357,7 +361,8 @@ public class CapabilityOperation extends AbstractOperation {
         PropertyValueData propertyValueData = new PropertyValueData();
         propertyValueData.setUniqueId(uniqueId);
         propertyValueData.setValue(capabilityProperty.getValue());
-        Either<PropertyValueData, TitanOperationStatus> propResult = titanGenericDao.createNode(propertyValueData, PropertyValueData.class);
+        Either<PropertyValueData, JanusGraphOperationStatus> propResult = janusGraphGenericDao
+            .createNode(propertyValueData, PropertyValueData.class);
         // It's not accepted if Capability Type doesn't have suitable property
         propResult = propResult.left()
                 .bind(propValueData -> connectToProperty(propValueData, capTypePropertyDefinition))
@@ -372,22 +377,23 @@ public class CapabilityOperation extends AbstractOperation {
         return propResult;
     }
     
-    private Either<GraphRelation, TitanOperationStatus> connectCapability(PropertyValueData propValueData, String name, CapabilityData capabilityData) {
+    private Either<GraphRelation, JanusGraphOperationStatus> connectCapability(PropertyValueData propValueData, String name, CapabilityData capabilityData) {
         Map<String, Object> properties = new HashMap<>();
         properties.put(GraphEdgePropertiesDictionary.NAME.getProperty(), name);
 
-        return titanGenericDao.createRelation(capabilityData, propValueData, GraphEdgeLabels.PROPERTY_VALUE, properties);
+        return janusGraphGenericDao.createRelation(capabilityData, propValueData, GraphEdgeLabels.PROPERTY_VALUE, properties);
     }
     
-    private Either<GraphRelation, TitanOperationStatus> connectToProperty(PropertyValueData propValueData, PropertyDefinition propertyDefinition) {
-        Either<PropertyData, TitanOperationStatus> dataTypesRes = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Property), 
+    private Either<GraphRelation, JanusGraphOperationStatus> connectToProperty(PropertyValueData propValueData, PropertyDefinition propertyDefinition) {
+        Either<PropertyData, JanusGraphOperationStatus> dataTypesRes = janusGraphGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Property),
                                                                             propertyDefinition.getUniqueId(), PropertyData.class);
 
         Map<String, Object> properties = new HashMap<>();
         properties.put(GraphEdgePropertiesDictionary.NAME.getProperty(), propertyDefinition.getName());
         
         return dataTypesRes.left()
-                           .bind(propertyData -> titanGenericDao.createRelation(propValueData, propertyData, GraphEdgeLabels.PROPERTY_IMPL, properties));
+                           .bind(propertyData -> janusGraphGenericDao
+                               .createRelation(propValueData, propertyData, GraphEdgeLabels.PROPERTY_IMPL, properties));
     }
     
 
@@ -408,12 +414,14 @@ public class CapabilityOperation extends AbstractOperation {
 
     public StorageOperationStatus deleteCapability(CapabilityDefinition capabilityDef) {
         
-        return titanGenericDao.deleteChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), capabilityDef.getUniqueId(), GraphEdgeLabels.PROPERTY_VALUE,
+        return janusGraphGenericDao
+            .deleteChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), capabilityDef.getUniqueId(), GraphEdgeLabels.PROPERTY_VALUE,
                                                     NodeTypeEnum.PropertyValue, PropertyValueData.class)
                  .left()
-                 .bind(props -> titanGenericDao.deleteNode(new CapabilityData(capabilityDef), CapabilityData.class))
+                 .bind(props -> janusGraphGenericDao
+                     .deleteNode(new CapabilityData(capabilityDef), CapabilityData.class))
                  .right()
-                 .map(DaoStatusConverter::convertTitanStatusToStorageStatus)
+                 .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus)
                  .right()
                  .on(capData -> StorageOperationStatus.OK);
     }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CapabilityTypeOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CapabilityTypeOperation.java
index 1cc1380917..61c7e0c13e 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CapabilityTypeOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CapabilityTypeOperation.java
@@ -30,9 +30,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
-import org.openecomp.sdc.be.dao.titan.HealingTitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.HealingJanusGraphGenericDao;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.CapabilityTypeDefinition;
 import org.openecomp.sdc.be.model.PropertyDefinition;
@@ -66,10 +66,10 @@ public class CapabilityTypeOperation extends AbstractOperation implements ICapab
     /**
      * FOR TEST ONLY
      *
-     * @param titanGenericDao
+     * @param janusGraphGenericDao
      */
-    public void setTitanGenericDao(HealingTitanGenericDao titanGenericDao) {
-        this.titanGenericDao = titanGenericDao;
+    public void setJanusGraphGenericDao(HealingJanusGraphGenericDao janusGraphGenericDao) {
+        this.janusGraphGenericDao = janusGraphGenericDao;
     }
 
     @Override
@@ -102,26 +102,27 @@ public class CapabilityTypeOperation extends AbstractOperation implements ICapab
             if (!inTransaction) {
                 if (result == null || result.isRight()) {
                     log.error("#addCapabilityType - Going to execute rollback on graph.");
-                    titanGenericDao.rollback();
+                    janusGraphGenericDao.rollback();
                 } else {
                     log.debug("#addCapabilityType - Going to execute commit on graph.");
-                    titanGenericDao.commit();
+                    janusGraphGenericDao.commit();
                 }
             }
         }
 
     }
     
-    public Either<Map<String, PropertyDefinition>, TitanOperationStatus> getAllCapabilityTypePropertiesFromAllDerivedFrom(String firstParentType) {
+    public Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> getAllCapabilityTypePropertiesFromAllDerivedFrom(String firstParentType) {
         return propertyOperation.getAllTypePropertiesFromAllDerivedFrom(firstParentType, NodeTypeEnum.CapabilityType, CapabilityTypeData.class);
     }
 
     public Either<CapabilityTypeDefinition, StorageOperationStatus> validateUpdateProperties(CapabilityTypeDefinition capabilityTypeDefinition) {
-        TitanOperationStatus error = null;
+        JanusGraphOperationStatus error = null;
         if (MapUtils.isNotEmpty(capabilityTypeDefinition.getProperties()) && capabilityTypeDefinition.getDerivedFrom() != null) {
-            Either<Map<String, PropertyDefinition>, TitanOperationStatus> allPropertiesRes = 
+            Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> allPropertiesRes =
                                         getAllCapabilityTypePropertiesFromAllDerivedFrom(capabilityTypeDefinition.getDerivedFrom());
-            if (allPropertiesRes.isRight() && !allPropertiesRes.right().value().equals(TitanOperationStatus.NOT_FOUND)) {
+            if (allPropertiesRes.isRight() && !allPropertiesRes.right().value().equals(
+                JanusGraphOperationStatus.NOT_FOUND)) {
                 error = allPropertiesRes.right().value();
                 log.debug("Couldn't fetch derived from property nodes for capability type {}, error: {}", capabilityTypeDefinition.getType(), error);
             }
@@ -131,7 +132,7 @@ public class CapabilityTypeOperation extends AbstractOperation implements ICapab
                         .forEach(e -> e.getValue().setType(derivedFromProperties.get(e.getKey()).getType()));
 
                 List<PropertyDefinition> properties = capabilityTypeDefinition.getProperties().values().stream().collect(Collectors.toList());
-                Either<List<PropertyDefinition>, TitanOperationStatus> validatePropertiesRes = propertyOperation.validatePropertiesUniqueness(allPropertiesRes.left().value(),
+                Either<List<PropertyDefinition>, JanusGraphOperationStatus> validatePropertiesRes = propertyOperation.validatePropertiesUniqueness(allPropertiesRes.left().value(),
                         properties);
                 if (validatePropertiesRes.isRight()) {
                     error = validatePropertiesRes.right().value();
@@ -141,7 +142,7 @@ public class CapabilityTypeOperation extends AbstractOperation implements ICapab
         if (error == null) {
             return Either.left(capabilityTypeDefinition);
         }
-        return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(error));
+        return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(error));
     }
     
 
@@ -179,21 +180,22 @@ public class CapabilityTypeOperation extends AbstractOperation implements ICapab
         CapabilityTypeData capabilityTypeData = buildCapabilityTypeData(capabilityTypeDefinition, ctUniqueId);
 
         log.debug("Before adding capability type to graph. capabilityTypeData = {}", capabilityTypeData);
-        Either<CapabilityTypeData, TitanOperationStatus> createCTResult = titanGenericDao.createNode(capabilityTypeData, CapabilityTypeData.class);
+        Either<CapabilityTypeData, JanusGraphOperationStatus> createCTResult = janusGraphGenericDao
+            .createNode(capabilityTypeData, CapabilityTypeData.class);
         log.debug("After adding capability type to graph. status is = {}", createCTResult);
 
         if (createCTResult.isRight()) {
-            TitanOperationStatus operationStatus = createCTResult.right().value();
+            JanusGraphOperationStatus operationStatus = createCTResult.right().value();
             log.error("Failed to capability type {} to graph. status is {}", capabilityTypeDefinition.getType(), operationStatus);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(operationStatus));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(operationStatus));
         }
 
         CapabilityTypeData resultCTD = createCTResult.left().value();
         Map<String, PropertyDefinition> propertiesMap = capabilityTypeDefinition.getProperties();
-        Either<Map<String, PropertyData>, TitanOperationStatus> addPropertiesToCapablityType = propertyOperation.addPropertiesToElementType(resultCTD.getUniqueId(), NodeTypeEnum.CapabilityType, propertiesMap);
+        Either<Map<String, PropertyData>, JanusGraphOperationStatus> addPropertiesToCapablityType = propertyOperation.addPropertiesToElementType(resultCTD.getUniqueId(), NodeTypeEnum.CapabilityType, propertiesMap);
         if (addPropertiesToCapablityType.isRight()) {
             log.error("Failed add properties {} to capability {}", propertiesMap, capabilityTypeDefinition.getType());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(addPropertiesToCapablityType.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(addPropertiesToCapablityType.right().value()));
         }
 
         return addDerivedFromRelation(capabilityTypeDefinition, ctUniqueId)
@@ -223,14 +225,14 @@ public class CapabilityTypeOperation extends AbstractOperation implements ICapab
         Either<CapabilityTypeDefinition, StorageOperationStatus> result = null;
         try {
 
-            Either<CapabilityTypeDefinition, TitanOperationStatus> ctResult = this.getCapabilityTypeByUid(uniqueId);
+            Either<CapabilityTypeDefinition, JanusGraphOperationStatus> ctResult = this.getCapabilityTypeByUid(uniqueId);
 
             if (ctResult.isRight()) {
-                TitanOperationStatus status = ctResult.right().value();
-                if (status != TitanOperationStatus.NOT_FOUND) {
+                JanusGraphOperationStatus status = ctResult.right().value();
+                if (status != JanusGraphOperationStatus.NOT_FOUND) {
                     log.error("Failed to retrieve information on capability type {}. status is {}", uniqueId, status);
                 }
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(ctResult.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(ctResult.right().value()));
                 return result;
             }
 
@@ -240,13 +242,13 @@ public class CapabilityTypeOperation extends AbstractOperation implements ICapab
         } finally {
             if (!inTransaction) {
                 log.debug("Going to execute commit on graph.");
-                titanGenericDao.commit();
+                janusGraphGenericDao.commit();
             }
         }
     }
 
 
-    public Either<CapabilityTypeDefinition, TitanOperationStatus> getCapabilityTypeByType(String capabilityType) {
+    public Either<CapabilityTypeDefinition, JanusGraphOperationStatus> getCapabilityTypeByType(String capabilityType) {
         // Optimization: In case of Capability Type its unique ID is the same as type
         return getCapabilityTypeByUid(capabilityType);
     }
@@ -257,14 +259,15 @@ public class CapabilityTypeOperation extends AbstractOperation implements ICapab
      * @param uniqueId
      * @return
      */
-    public Either<CapabilityTypeDefinition, TitanOperationStatus> getCapabilityTypeByUid(String uniqueId) {
+    public Either<CapabilityTypeDefinition, JanusGraphOperationStatus> getCapabilityTypeByUid(String uniqueId) {
 
-        Either<CapabilityTypeDefinition, TitanOperationStatus> result = null;
+        Either<CapabilityTypeDefinition, JanusGraphOperationStatus> result = null;
 
-        Either<CapabilityTypeData, TitanOperationStatus> capabilityTypesRes = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.CapabilityType), uniqueId, CapabilityTypeData.class);
+        Either<CapabilityTypeData, JanusGraphOperationStatus> capabilityTypesRes = janusGraphGenericDao
+            .getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.CapabilityType), uniqueId, CapabilityTypeData.class);
 
         if (capabilityTypesRes.isRight()) {
-            TitanOperationStatus status = capabilityTypesRes.right().value();
+            JanusGraphOperationStatus status = capabilityTypesRes.right().value();
             log.debug("Capability type {} cannot be found in graph. status is {}", uniqueId, status);
             return Either.right(status);
         }
@@ -272,9 +275,9 @@ public class CapabilityTypeOperation extends AbstractOperation implements ICapab
         CapabilityTypeData ctData = capabilityTypesRes.left().value();
         CapabilityTypeDefinition capabilityTypeDefinition = new CapabilityTypeDefinition(ctData.getCapabilityTypeDataDefinition());
 
-        Either<Map<String, PropertyDefinition>, TitanOperationStatus> propertiesStatus =
+        Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> propertiesStatus =
                 OperationUtils.fillProperties(uniqueId, propertyOperation, NodeTypeEnum.CapabilityType);
-        if (propertiesStatus.isRight() && propertiesStatus.right().value() != TitanOperationStatus.OK) {
+        if (propertiesStatus.isRight() && propertiesStatus.right().value() != JanusGraphOperationStatus.OK) {
             log.error("Failed to fetch properties of capability type {}", uniqueId);
             return Either.right(propertiesStatus.right().value());
         }
@@ -283,14 +286,16 @@ public class CapabilityTypeOperation extends AbstractOperation implements ICapab
             capabilityTypeDefinition.setProperties(propertiesStatus.left().value());
         }
 
-        Either<ImmutablePair<CapabilityTypeData, GraphEdge>, TitanOperationStatus> parentNode = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.CapabilityType), uniqueId, GraphEdgeLabels.DERIVED_FROM,
+        Either<ImmutablePair<CapabilityTypeData, GraphEdge>, JanusGraphOperationStatus> parentNode = janusGraphGenericDao
+            .getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.CapabilityType), uniqueId, GraphEdgeLabels.DERIVED_FROM,
                 NodeTypeEnum.CapabilityType, CapabilityTypeData.class);
         log.debug("After retrieving DERIVED_FROM node of {}. status is {}", uniqueId, parentNode);
         if (parentNode.isRight()) {
-            TitanOperationStatus titanOperationStatus = parentNode.right().value();
-            if (titanOperationStatus != TitanOperationStatus.NOT_FOUND) {
-                log.error("Failed to find the parent capability of capability type {}. status is {}", uniqueId, titanOperationStatus);
-                result = Either.right(titanOperationStatus);
+            JanusGraphOperationStatus janusGraphOperationStatus = parentNode.right().value();
+            if (janusGraphOperationStatus != JanusGraphOperationStatus.NOT_FOUND) {
+                log.error("Failed to find the parent capability of capability type {}. status is {}", uniqueId,
+                    janusGraphOperationStatus);
+                result = Either.right(janusGraphOperationStatus);
                 return result;
             }
         } else {
@@ -319,9 +324,10 @@ public class CapabilityTypeOperation extends AbstractOperation implements ICapab
     
     
     private Either<CapabilityTypeDefinition, StorageOperationStatus> updateCapabilityTypeOnGraph(CapabilityTypeDefinition capabilityTypeDefinitionNew, CapabilityTypeDefinition capabilityTypeDefinitionOld) {
-        return titanGenericDao.updateNode(new CapabilityTypeData(capabilityTypeDefinitionNew), CapabilityTypeData.class)
+        return janusGraphGenericDao
+            .updateNode(new CapabilityTypeData(capabilityTypeDefinitionNew), CapabilityTypeData.class)
                 .right()
-                .map(DaoStatusConverter::convertTitanStatusToStorageStatus)
+                .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus)
                 .left()
                 .bind(updatedNode -> updateProperties(capabilityTypeDefinitionNew.getUniqueId(), capabilityTypeDefinitionNew.getProperties()))
                 .left()
@@ -336,7 +342,7 @@ public class CapabilityTypeOperation extends AbstractOperation implements ICapab
         log.debug("#updateCapabilityTypeProperties - updating properties for capability type with id {}", capabilityTypeId);
         return propertyOperation.mergePropertiesAssociatedToNode(NodeTypeEnum.CapabilityType, capabilityTypeId, properties)
                 .right()
-                .map(DaoStatusConverter::convertTitanStatusToStorageStatus);
+                .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
     }
 
     private Either<GraphRelation, StorageOperationStatus> updateDerivedFrom(CapabilityTypeDefinition updatedCapabilityType, String currDerivedFromCapabilityType) {
@@ -408,16 +414,17 @@ public class CapabilityTypeOperation extends AbstractOperation implements ICapab
     public Either<CapabilityTypeDefinition, StorageOperationStatus> getCapabilityType(String uniqueId) {
         return getCapabilityType(uniqueId, true);
     }
-    public Either<Map<String, CapabilityTypeDefinition>, TitanOperationStatus> getAllCapabilityTypes() {
+    public Either<Map<String, CapabilityTypeDefinition>, JanusGraphOperationStatus> getAllCapabilityTypes() {
 
         Map<String, CapabilityTypeDefinition> capabilityTypes = new HashMap<>();
-        Either<Map<String, CapabilityTypeDefinition>, TitanOperationStatus> result = Either.left(capabilityTypes);
+        Either<Map<String, CapabilityTypeDefinition>, JanusGraphOperationStatus> result = Either.left(capabilityTypes);
 
-        Either<List<CapabilityTypeData>, TitanOperationStatus> getAllCapabilityTypes =
-                titanGenericDao.getByCriteria(NodeTypeEnum.CapabilityType, null, CapabilityTypeData.class);
+        Either<List<CapabilityTypeData>, JanusGraphOperationStatus> getAllCapabilityTypes =
+                janusGraphGenericDao
+                    .getByCriteria(NodeTypeEnum.CapabilityType, null, CapabilityTypeData.class);
         if (getAllCapabilityTypes.isRight()) {
-            TitanOperationStatus status = getAllCapabilityTypes.right().value();
-            if (status != TitanOperationStatus.NOT_FOUND) {
+            JanusGraphOperationStatus status = getAllCapabilityTypes.right().value();
+            if (status != JanusGraphOperationStatus.NOT_FOUND) {
                 return Either.right(status);
             } else {
                 return result;
@@ -434,12 +441,12 @@ public class CapabilityTypeOperation extends AbstractOperation implements ICapab
                 log.trace("Going to fetch data type {}. uid is {}",
                         capabilityTypeData.getCapabilityTypeDataDefinition().getType(),
                         capabilityTypeData.getUniqueId());
-                Either<CapabilityTypeDefinition, TitanOperationStatus> capabilityTypesByUid =
+                Either<CapabilityTypeDefinition, JanusGraphOperationStatus> capabilityTypesByUid =
                         getAndAddPropertiesANdDerivedFrom(capabilityTypeData.getUniqueId(), capabilityTypes);
                 if (capabilityTypesByUid.isRight()) {
-                    TitanOperationStatus status = capabilityTypesByUid.right().value();
-                    if (status == TitanOperationStatus.NOT_FOUND) {
-                        status = TitanOperationStatus.INVALID_ID;
+                    JanusGraphOperationStatus status = capabilityTypesByUid.right().value();
+                    if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                        status = JanusGraphOperationStatus.INVALID_ID;
                     }
                     return Either.right(status);
                 }
@@ -473,18 +480,19 @@ public class CapabilityTypeOperation extends AbstractOperation implements ICapab
         return derivedFrom;
     }
 
-    private Either<CapabilityTypeDefinition, TitanOperationStatus> getAndAddPropertiesANdDerivedFrom(
+    private Either<CapabilityTypeDefinition, JanusGraphOperationStatus> getAndAddPropertiesANdDerivedFrom(
             String uniqueId, Map<String, CapabilityTypeDefinition> capabilityTypeDefinitionMap) {
         if (capabilityTypeDefinitionMap.containsKey(uniqueId)) {
             return Either.left(capabilityTypeDefinitionMap.get(uniqueId));
         }
 
-        Either<CapabilityTypeData, TitanOperationStatus> capabilityTypesRes =
-                titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.CapabilityType), uniqueId,
+        Either<CapabilityTypeData, JanusGraphOperationStatus> capabilityTypesRes =
+                janusGraphGenericDao
+                    .getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.CapabilityType), uniqueId,
                         CapabilityTypeData.class);
 
         if (capabilityTypesRes.isRight()) {
-            TitanOperationStatus status = capabilityTypesRes.right().value();
+            JanusGraphOperationStatus status = capabilityTypesRes.right().value();
             log.debug(DATA_TYPE_CANNOT_BE_FOUND_IN_GRAPH_STATUS_IS, uniqueId, status);
             return Either.right(status);
         }
@@ -493,10 +501,10 @@ public class CapabilityTypeOperation extends AbstractOperation implements ICapab
         CapabilityTypeDefinition capabilityTypeDefinition =
                 new CapabilityTypeDefinition(ctData.getCapabilityTypeDataDefinition());
 
-        Either<Map<String, PropertyDefinition>, TitanOperationStatus> propertiesStatus =
+        Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> propertiesStatus =
                 OperationUtils.fillProperties(uniqueId, propertyOperation, NodeTypeEnum.CapabilityType);
 
-        if (propertiesStatus.isRight() && propertiesStatus.right().value() != TitanOperationStatus.OK) {
+        if (propertiesStatus.isRight() && propertiesStatus.right().value() != JanusGraphOperationStatus.OK) {
             log.error(FAILED_TO_FETCH_PROPERTIES_OF_DATA_TYPE, uniqueId);
             return Either.right(propertiesStatus.right().value());
         }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CommonTypeOperations.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CommonTypeOperations.java
index 96b083274c..768a96e120 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CommonTypeOperations.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CommonTypeOperations.java
@@ -10,9 +10,9 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphNode;
+import org.openecomp.sdc.be.dao.janusgraph.HealingJanusGraphGenericDao;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.HealingTitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.springframework.stereotype.Component;
@@ -20,25 +20,25 @@ import org.springframework.stereotype.Component;
 @Component
 public class CommonTypeOperations {
 
-    private final HealingTitanGenericDao titanGenericDao;
+    private final HealingJanusGraphGenericDao janusGraphGenericDao;
     private final PropertyOperation propertyOperation;
     private final OperationUtils operationUtils;
 
-    public CommonTypeOperations(HealingTitanGenericDao titanGenericDao, PropertyOperation propertyOperation,
-            OperationUtils operationUtils) {
-        this.titanGenericDao = titanGenericDao;
+    public CommonTypeOperations(HealingJanusGraphGenericDao janusGraphGenericDao, PropertyOperation propertyOperation,
+                                OperationUtils operationUtils) {
+        this.janusGraphGenericDao = janusGraphGenericDao;
         this.propertyOperation = propertyOperation;
         this.operationUtils = operationUtils;
     }
 
     public <T extends GraphNode> void addType(T typeData, Class<T> clazz) {
-        titanGenericDao.createNode(typeData, clazz)
+        janusGraphGenericDao.createNode(typeData, clazz)
             .left()
-            .on(operationUtils::onTitanOperationFailure);
+            .on(operationUtils::onJanusGraphOperationFailure);
     }
 
     public <T extends GraphNode> Optional<T> getType(String uniqueId, Class<T> clazz, NodeTypeEnum nodeType) {
-        T type = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), uniqueId, clazz)
+        T type = janusGraphGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), uniqueId, clazz)
                 .left()
                 .on(err -> null);
         return Optional.ofNullable(type);
@@ -48,7 +48,7 @@ public class CommonTypeOperations {
         Map<String, Object> mapCriteria = new HashMap<>();
         mapCriteria.put(GraphPropertiesDictionary.TYPE.getProperty(), type);
         mapCriteria.put(GraphPropertiesDictionary.IS_HIGHEST_VERSION.getProperty(), true);
-        return titanGenericDao.getByCriteria(nodeType, mapCriteria, clazz)
+        return janusGraphGenericDao.getByCriteria(nodeType, mapCriteria, clazz)
                 .left()
                 .on(err -> emptyList())
                 .stream()
@@ -58,13 +58,14 @@ public class CommonTypeOperations {
     public void addProperties(String uniqueId, NodeTypeEnum nodeType, List<PropertyDefinition> properties) {
         propertyOperation.addPropertiesToElementType(uniqueId, nodeType, properties)
             .left()
-            .on(operationUtils::onTitanOperationFailure);
+            .on(operationUtils::onJanusGraphOperationFailure);
     }
 
     public void fillProperties(String uniqueId, NodeTypeEnum nodeType, Consumer<List<PropertyDefinition>> propertySetter) {
-        TitanOperationStatus status = propertyOperation.fillPropertiesList(uniqueId, nodeType, propertySetter);
-        if (status!=TitanOperationStatus.OK) {
-            operationUtils.onTitanOperationFailure(status);
+        JanusGraphOperationStatus
+            status = propertyOperation.fillPropertiesList(uniqueId, nodeType, propertySetter);
+        if (status!= JanusGraphOperationStatus.OK) {
+            operationUtils.onJanusGraphOperationFailure(status);
         }
     }
 
@@ -72,13 +73,13 @@ public class CommonTypeOperations {
      * Handle update of type without dervidedFrom attribute
      */
     public  <T extends GraphNode> void updateType(T typeData, List<PropertyDefinition> properties, Class<T> clazz, NodeTypeEnum nodeType) {
-        titanGenericDao.updateNode(typeData, clazz)
+        janusGraphGenericDao.updateNode(typeData, clazz)
                 .left()
-                .on(operationUtils::onTitanOperationFailure);
+                .on(operationUtils::onJanusGraphOperationFailure);
         Map<String, PropertyDefinition> newProperties = properties.stream()
                 .collect(Collectors.toMap(PropertyDefinition::getName, Function.identity()));
         propertyOperation.mergePropertiesAssociatedToNode(nodeType, typeData.getUniqueId(), newProperties)
                 .left()
-                .on(operationUtils::onTitanOperationFailure);
+                .on(operationUtils::onJanusGraphOperationFailure);
     }
 }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ComponentInstanceOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ComponentInstanceOperation.java
index 34dce75c7d..91b4e0a0ce 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ComponentInstanceOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ComponentInstanceOperation.java
@@ -20,8 +20,8 @@
 
 package org.openecomp.sdc.be.model.operations.impl;
 
-import com.thinkaurelius.titan.core.TitanGraph;
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraph;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import java.util.HashMap;
 import java.util.Map;
@@ -35,11 +35,11 @@ import org.openecomp.sdc.be.config.BeEcompErrorManager.ErrorSeverity;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphNode;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgePropertiesDictionary;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.HealingTitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.HealingJanusGraphGenericDao;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
@@ -83,10 +83,10 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
     /**
      * FOR TEST ONLY
      *
-     * @param titanGenericDao
+     * @param janusGraphGenericDao
      */
-    public void setTitanGenericDao(HealingTitanGenericDao titanGenericDao) {
-        this.titanGenericDao = titanGenericDao;
+    public void setJanusGraphGenericDao(HealingJanusGraphGenericDao janusGraphGenericDao) {
+        this.janusGraphGenericDao = janusGraphGenericDao;
     }
 
     @Override
@@ -95,19 +95,20 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
         Either<Integer, StorageOperationStatus> result = null;
         try {
 
-            Either<TitanGraph, TitanOperationStatus> graphResult = titanGenericDao.getGraph();
+            Either<JanusGraph, JanusGraphOperationStatus> graphResult = janusGraphGenericDao.getGraph();
             if (graphResult.isRight()) {
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(graphResult.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(graphResult.right().value()));
                 return result;
             }
-            Either<TitanVertex, TitanOperationStatus> vertexService = titanGenericDao.getVertexByProperty(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.ResourceInstance), resourceInstanceId);
+            Either<JanusGraphVertex, JanusGraphOperationStatus> vertexService = janusGraphGenericDao
+                .getVertexByProperty(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.ResourceInstance), resourceInstanceId);
             if (vertexService.isRight()) {
                 log.debug("failed to fetch vertex of resource instance for id = {}", resourceInstanceId);
-                TitanOperationStatus status = vertexService.right().value();
-                if (status == TitanOperationStatus.NOT_FOUND) {
-                    status = TitanOperationStatus.INVALID_ID;
+                JanusGraphOperationStatus status = vertexService.right().value();
+                if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                    status = JanusGraphOperationStatus.INVALID_ID;
                 }
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(vertexService.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(vertexService.right().value()));
                 return result;
             }
             Vertex vertex = vertexService.left().value();
@@ -130,34 +131,36 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
             if (!inTransaction) {
                 if (result == null || result.isRight()) {
                     log.error("increaseAndGetResourceInstanceSpecificCounter operation : Going to execute rollback on graph.");
-                    titanGenericDao.rollback();
+                    janusGraphGenericDao.rollback();
                 } else {
                     log.debug("increaseAndGetResourceInstanceSpecificCounter operation : Going to execute commit on graph.");
-                    titanGenericDao.commit();
+                    janusGraphGenericDao.commit();
                 }
             }
         }
 
     }
 
-    private void connectAttValueDataToComponentInstanceData(Wrapper<TitanOperationStatus> errorWrapper, ComponentInstanceData compIns, AttributeValueData attValueData) {
+    private void connectAttValueDataToComponentInstanceData(Wrapper<JanusGraphOperationStatus> errorWrapper, ComponentInstanceData compIns, AttributeValueData attValueData) {
 
-        Either<GraphRelation, TitanOperationStatus> createRelResult = titanGenericDao.createRelation(compIns, attValueData, GraphEdgeLabels.ATTRIBUTE_VALUE, null);
+        Either<GraphRelation, JanusGraphOperationStatus> createRelResult = janusGraphGenericDao
+            .createRelation(compIns, attValueData, GraphEdgeLabels.ATTRIBUTE_VALUE, null);
 
         if (createRelResult.isRight()) {
-            TitanOperationStatus operationStatus = createRelResult.right().value();
+            JanusGraphOperationStatus operationStatus = createRelResult.right().value();
             errorWrapper.setInnerElement(operationStatus);
             BeEcompErrorManager.getInstance().logInternalFlowError("connectAttValueDataToComponentInstanceData",
                     "Failed to associate resource instance " + compIns.getUniqueId() + " attribute value " + attValueData.getUniqueId() + " in graph. status is " + operationStatus, ErrorSeverity.ERROR);
         }
     }
 
-    private void connectAttValueDataToAttData(Wrapper<TitanOperationStatus> errorWrapper, AttributeData attData, AttributeValueData attValueData) {
+    private void connectAttValueDataToAttData(Wrapper<JanusGraphOperationStatus> errorWrapper, AttributeData attData, AttributeValueData attValueData) {
 
-        Either<GraphRelation, TitanOperationStatus> createRelResult = titanGenericDao.createRelation(attValueData, attData, GraphEdgeLabels.ATTRIBUTE_IMPL, null);
+        Either<GraphRelation, JanusGraphOperationStatus> createRelResult = janusGraphGenericDao
+            .createRelation(attValueData, attData, GraphEdgeLabels.ATTRIBUTE_IMPL, null);
 
         if (createRelResult.isRight()) {
-            TitanOperationStatus operationStatus = createRelResult.right().value();
+            JanusGraphOperationStatus operationStatus = createRelResult.right().value();
             BeEcompErrorManager.getInstance().logInternalFlowError("connectAttValueDataToAttData",
                     "Failed to associate attribute value " + attValueData.getUniqueId() + " to attribute " + attData.getUniqueId() + " in graph. status is " + operationStatus, ErrorSeverity.ERROR);
 
@@ -165,8 +168,8 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
         }
     }
 
-    private void createAttributeValueDataNode(ComponentInstanceProperty attributeInstanceProperty, Integer index, Wrapper<TitanOperationStatus> errorWrapper, ComponentInstanceData resourceInstanceData,
-            Wrapper<AttributeValueData> attValueDataWrapper) {
+    private void createAttributeValueDataNode(ComponentInstanceProperty attributeInstanceProperty, Integer index, Wrapper<JanusGraphOperationStatus> errorWrapper, ComponentInstanceData resourceInstanceData,
+                                              Wrapper<AttributeValueData> attValueDataWrapper) {
         String valueUniqueUid = attributeInstanceProperty.getValueUniqueUid();
         if (valueUniqueUid == null) {
 
@@ -174,11 +177,12 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
             AttributeValueData attributeValueData = buildAttributeValueDataFromComponentInstanceAttribute(attributeInstanceProperty, attValueDatauniqueId);
 
             log.debug("Before adding attribute value to graph {}", attributeValueData);
-            Either<AttributeValueData, TitanOperationStatus> createNodeResult = titanGenericDao.createNode(attributeValueData, AttributeValueData.class);
+            Either<AttributeValueData, JanusGraphOperationStatus> createNodeResult = janusGraphGenericDao
+                .createNode(attributeValueData, AttributeValueData.class);
             log.debug("After adding attribute value to graph {}", attributeValueData);
 
             if (createNodeResult.isRight()) {
-                TitanOperationStatus operationStatus = createNodeResult.right().value();
+                JanusGraphOperationStatus operationStatus = createNodeResult.right().value();
                 errorWrapper.setInnerElement(operationStatus);
             } else {
                 attValueDataWrapper.setInnerElement(createNodeResult.left().value());
@@ -186,7 +190,7 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
 
         } else {
             BeEcompErrorManager.getInstance().logInternalFlowError("CreateAttributeValueDataNode", "attribute value already exists.", ErrorSeverity.ERROR);
-            errorWrapper.setInnerElement(TitanOperationStatus.ALREADY_EXIST);
+            errorWrapper.setInnerElement(JanusGraphOperationStatus.ALREADY_EXIST);
         }
     }
 
@@ -258,10 +262,10 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
      * @param resourceInstanceId
      * @return
      */
-    private Either<AttributeValueData, TitanOperationStatus> updateAttributeOfResourceInstance(ComponentInstanceProperty resourceInstanceAttribute, String resourceInstanceId) {
+    private Either<AttributeValueData, JanusGraphOperationStatus> updateAttributeOfResourceInstance(ComponentInstanceProperty resourceInstanceAttribute, String resourceInstanceId) {
 
-        Either<AttributeValueData, TitanOperationStatus> result = null;
-        Wrapper<TitanOperationStatus> errorWrapper = new Wrapper<>();
+        Either<AttributeValueData, JanusGraphOperationStatus> result = null;
+        Wrapper<JanusGraphOperationStatus> errorWrapper = new Wrapper<>();
         UpdateDataContainer<AttributeData, AttributeValueData> updateDataContainer = new UpdateDataContainer<>(GraphEdgeLabels.ATTRIBUTE_IMPL, (() -> AttributeData.class), (() -> AttributeValueData.class), NodeTypeEnum.Attribute,
                 NodeTypeEnum.AttributeValue);
         preUpdateElementOfResourceInstanceValidations(updateDataContainer, resourceInstanceAttribute, resourceInstanceId, errorWrapper);
@@ -269,9 +273,10 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
             AttributeValueData attributeValueData = updateDataContainer.getValueDataWrapper().getInnerElement();
             attributeValueData.setHidden(resourceInstanceAttribute.isHidden());
             attributeValueData.setValue(resourceInstanceAttribute.getValue());
-            Either<AttributeValueData, TitanOperationStatus> updateRes = titanGenericDao.updateNode(attributeValueData, AttributeValueData.class);
+            Either<AttributeValueData, JanusGraphOperationStatus> updateRes = janusGraphGenericDao
+                .updateNode(attributeValueData, AttributeValueData.class);
             if (updateRes.isRight()) {
-                TitanOperationStatus status = updateRes.right().value();
+                JanusGraphOperationStatus status = updateRes.right().value();
                 errorWrapper.setInnerElement(status);
             } else {
                 result = Either.left(updateRes.left().value());
@@ -284,8 +289,8 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
 
     }
 
-    private Either<AttributeValueData, TitanOperationStatus> addAttributeToResourceInstance(ComponentInstanceProperty attributeInstanceProperty, String resourceInstanceId, Integer index) {
-        Wrapper<TitanOperationStatus> errorWrapper = new Wrapper<>();
+    private Either<AttributeValueData, JanusGraphOperationStatus> addAttributeToResourceInstance(ComponentInstanceProperty attributeInstanceProperty, String resourceInstanceId, Integer index) {
+        Wrapper<JanusGraphOperationStatus> errorWrapper = new Wrapper<>();
         Wrapper<ComponentInstanceData> compInsWrapper = new Wrapper<>();
         Wrapper<AttributeData> attDataWrapper = new Wrapper<>();
         Wrapper<AttributeValueData> attValueDataWrapper = new Wrapper<>();
@@ -320,7 +325,7 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
     }
 
     private <SomeData extends GraphNode, SomeValueData extends GraphNode> void preUpdateElementOfResourceInstanceValidations(UpdateDataContainer<SomeData, SomeValueData> updateDataContainer, IComponentInstanceConnectedElement resourceInstanceProerty,
-            String resourceInstanceId, Wrapper<TitanOperationStatus> errorWrapper) {
+            String resourceInstanceId, Wrapper<JanusGraphOperationStatus> errorWrapper) {
 
         if (errorWrapper.isEmpty()) {
             // Verify VFC instance Exist
@@ -344,14 +349,15 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
     }
 
     private <SomeData extends GraphNode, SomeValueData extends GraphNode> void validateElementConnectedToInstance(UpdateDataContainer<SomeData, SomeValueData> updateDataContainer, IComponentInstanceConnectedElement resourceInstanceProerty,
-            Wrapper<TitanOperationStatus> errorWrapper) {
-        Either<ImmutablePair<SomeData, GraphEdge>, TitanOperationStatus> child = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(updateDataContainer.getNodeTypeValue()), resourceInstanceProerty.getValueUniqueUid(),
+            Wrapper<JanusGraphOperationStatus> errorWrapper) {
+        Either<ImmutablePair<SomeData, GraphEdge>, JanusGraphOperationStatus> child = janusGraphGenericDao
+            .getChild(UniqueIdBuilder.getKeyByNodeType(updateDataContainer.getNodeTypeValue()), resourceInstanceProerty.getValueUniqueUid(),
                 updateDataContainer.getGraphEdge(), updateDataContainer.getNodeType(), updateDataContainer.getSomeDataClassGen().get());
 
         if (child.isRight()) {
-            TitanOperationStatus status = child.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.INVALID_ID;
+            JanusGraphOperationStatus status = child.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.INVALID_ID;
             }
             errorWrapper.setInnerElement(status);
 
@@ -361,16 +367,17 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
     }
 
     private <SomeValueData extends GraphNode, SomeData extends GraphNode> void validateElementConnectedToComponentInstanceExist(UpdateDataContainer<SomeData, SomeValueData> updateDataContainer,
-            IComponentInstanceConnectedElement resourceInstanceProerty, Wrapper<TitanOperationStatus> errorWrapper) {
+            IComponentInstanceConnectedElement resourceInstanceProerty, Wrapper<JanusGraphOperationStatus> errorWrapper) {
         String valueUniqueUid = resourceInstanceProerty.getValueUniqueUid();
         if (valueUniqueUid == null) {
-            errorWrapper.setInnerElement(TitanOperationStatus.INVALID_ID);
+            errorWrapper.setInnerElement(JanusGraphOperationStatus.INVALID_ID);
         } else {
-            Either<SomeValueData, TitanOperationStatus> findPropertyValueRes = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(updateDataContainer.getNodeTypeValue()), valueUniqueUid, updateDataContainer.getSomeValueDataClassGen().get());
+            Either<SomeValueData, JanusGraphOperationStatus> findPropertyValueRes = janusGraphGenericDao
+                .getNode(UniqueIdBuilder.getKeyByNodeType(updateDataContainer.getNodeTypeValue()), valueUniqueUid, updateDataContainer.getSomeValueDataClassGen().get());
             if (findPropertyValueRes.isRight()) {
-                TitanOperationStatus status = findPropertyValueRes.right().value();
-                if (status == TitanOperationStatus.NOT_FOUND) {
-                    status = TitanOperationStatus.INVALID_ID;
+                JanusGraphOperationStatus status = findPropertyValueRes.right().value();
+                if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                    status = JanusGraphOperationStatus.INVALID_ID;
                 }
                 errorWrapper.setInnerElement(status);
             } else {
@@ -380,31 +387,33 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
     }
 
     private <SomeData extends GraphNode, SomeValueData extends GraphNode> void validateElementConnectedToComponentExist(UpdateDataContainer<SomeData, SomeValueData> updateDataContainer,
-            IComponentInstanceConnectedElement resourceInstanceElementConnected, Wrapper<TitanOperationStatus> errorWrapper) {
+            IComponentInstanceConnectedElement resourceInstanceElementConnected, Wrapper<JanusGraphOperationStatus> errorWrapper) {
         String uniqueId = resourceInstanceElementConnected.getUniqueId();
-        Either<SomeData, TitanOperationStatus> findPropertyDefRes = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(updateDataContainer.getNodeType()), uniqueId, updateDataContainer.getSomeDataClassGen().get());
+        Either<SomeData, JanusGraphOperationStatus> findPropertyDefRes = janusGraphGenericDao
+            .getNode(UniqueIdBuilder.getKeyByNodeType(updateDataContainer.getNodeType()), uniqueId, updateDataContainer.getSomeDataClassGen().get());
 
         if (findPropertyDefRes.isRight()) {
-            TitanOperationStatus status = findPropertyDefRes.right().value();
+            JanusGraphOperationStatus status = findPropertyDefRes.right().value();
             errorWrapper.setInnerElement(status);
         }
     }
 
-    private void validateRIExist(String resourceInstanceId, Wrapper<TitanOperationStatus> errorWrapper) {
+    private void validateRIExist(String resourceInstanceId, Wrapper<JanusGraphOperationStatus> errorWrapper) {
         validateRIExist(resourceInstanceId, null, errorWrapper);
     }
 
-    private void validateRIExist(String resourceInstanceId, Wrapper<ComponentInstanceData> compInsDataWrapper, Wrapper<TitanOperationStatus> errorWrapper) {
+    private void validateRIExist(String resourceInstanceId, Wrapper<ComponentInstanceData> compInsDataWrapper, Wrapper<JanusGraphOperationStatus> errorWrapper) {
         validateElementExistInGraph(resourceInstanceId, NodeTypeEnum.ResourceInstance, () -> ComponentInstanceData.class, compInsDataWrapper, errorWrapper);
     }
 
     public <ElementData extends GraphNode> void validateElementExistInGraph(String elementUniqueId, NodeTypeEnum elementNodeType, Supplier<Class<ElementData>> elementClassGen, Wrapper<ElementData> elementDataWrapper,
-            Wrapper<TitanOperationStatus> errorWrapper) {
-        Either<ElementData, TitanOperationStatus> findResInstanceRes = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(elementNodeType), elementUniqueId, elementClassGen.get());
+            Wrapper<JanusGraphOperationStatus> errorWrapper) {
+        Either<ElementData, JanusGraphOperationStatus> findResInstanceRes = janusGraphGenericDao
+            .getNode(UniqueIdBuilder.getKeyByNodeType(elementNodeType), elementUniqueId, elementClassGen.get());
         if (findResInstanceRes.isRight()) {
-            TitanOperationStatus status = findResInstanceRes.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.INVALID_ID;
+            JanusGraphOperationStatus status = findResInstanceRes.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.INVALID_ID;
             }
             errorWrapper.setInnerElement(status);
         } else {
@@ -421,25 +430,27 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
      * @param index
      * @return
      */
-    private Either<InputValueData, TitanOperationStatus> addInputToResourceInstance(ComponentInstanceInput resourceInstanceInput, String resourceInstanceId, Integer index) {
+    private Either<InputValueData, JanusGraphOperationStatus> addInputToResourceInstance(ComponentInstanceInput resourceInstanceInput, String resourceInstanceId, Integer index) {
 
-        Either<ComponentInstanceData, TitanOperationStatus> findResInstanceRes = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.ResourceInstance), resourceInstanceId, ComponentInstanceData.class);
+        Either<ComponentInstanceData, JanusGraphOperationStatus> findResInstanceRes = janusGraphGenericDao
+            .getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.ResourceInstance), resourceInstanceId, ComponentInstanceData.class);
 
         if (findResInstanceRes.isRight()) {
-            TitanOperationStatus status = findResInstanceRes.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.INVALID_ID;
+            JanusGraphOperationStatus status = findResInstanceRes.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.INVALID_ID;
             }
             return Either.right(status);
         }
 
         String propertyId = resourceInstanceInput.getUniqueId();
-        Either<InputsData, TitanOperationStatus> findPropertyDefRes = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Input), propertyId, InputsData.class);
+        Either<InputsData, JanusGraphOperationStatus> findPropertyDefRes = janusGraphGenericDao
+            .getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Input), propertyId, InputsData.class);
 
         if (findPropertyDefRes.isRight()) {
-            TitanOperationStatus status = findPropertyDefRes.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.INVALID_ID;
+            JanusGraphOperationStatus status = findPropertyDefRes.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.INVALID_ID;
             }
             return Either.right(status);
         }
@@ -451,13 +462,13 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
 
             ComponentInstanceData resourceInstanceData = findResInstanceRes.left().value();
 
-            ImmutablePair<TitanOperationStatus, String> isInputValueExists = inputOperation.findInputValue(resourceInstanceId, propertyId);
-            if (isInputValueExists.getLeft() == TitanOperationStatus.ALREADY_EXIST) {
+            ImmutablePair<JanusGraphOperationStatus, String> isInputValueExists = inputOperation.findInputValue(resourceInstanceId, propertyId);
+            if (isInputValueExists.getLeft() == JanusGraphOperationStatus.ALREADY_EXIST) {
                 log.debug("The property {} already added to the resource instance {}", propertyId, resourceInstanceId);
                 resourceInstanceInput.setValueUniqueUid(isInputValueExists.getRight());
             }
 
-            if (isInputValueExists.getLeft() != TitanOperationStatus.NOT_FOUND) {
+            if (isInputValueExists.getLeft() != JanusGraphOperationStatus.NOT_FOUND) {
                 log.debug("After finding input value of {} on componenet instance {}", propertyId, resourceInstanceId);
                 return Either.right(isInputValueExists.getLeft());
             }
@@ -473,20 +484,20 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
                 SchemaDefinition def = propDataDef.getSchema();
                 if (def == null) {
                     log.debug("Schema doesn't exists for property of type {}", type);
-                    return Either.right(TitanOperationStatus.ILLEGAL_ARGUMENT);
+                    return Either.right(JanusGraphOperationStatus.ILLEGAL_ARGUMENT);
                 }
                 PropertyDataDefinition propDef = def.getProperty();
                 if (propDef == null) {
                     log.debug("Property in Schema Definition inside property of type {} doesn't exist", type);
-                    return Either.right(TitanOperationStatus.ILLEGAL_ARGUMENT);
+                    return Either.right(JanusGraphOperationStatus.ILLEGAL_ARGUMENT);
                 }
                 innerType = propDef.getType();
             }
 
             log.debug("Before validateAndUpdatePropertyValue");
-            Either<Map<String, DataTypeDefinition>, TitanOperationStatus> allDataTypes = dataTypeCache.getAll();
+            Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> allDataTypes = dataTypeCache.getAll();
             if (allDataTypes.isRight()) {
-                TitanOperationStatus status = allDataTypes.right().value();
+                JanusGraphOperationStatus status = allDataTypes.right().value();
                 BeEcompErrorManager.getInstance().logInternalFlowError("UpdatePropertyValueOnComponentInstance", "Failed to update property value on instance. Status is " + status, ErrorSeverity.ERROR);
                 return Either.right(status);
             }
@@ -501,21 +512,23 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
             log.debug("After validateAndUpdateRules. pair = {} ", pair);
             if (pair.getRight() != null && !pair.getRight()) {
                 BeEcompErrorManager.getInstance().logBeInvalidValueError("Add property value", pair.getLeft(), resourceInstanceInput.getName(), propertyType);
-                return Either.right(TitanOperationStatus.ILLEGAL_ARGUMENT);
+                return Either.right(JanusGraphOperationStatus.ILLEGAL_ARGUMENT);
             }
             log.debug("Before adding property value to graph {}", propertyValueData);
-            Either<InputValueData, TitanOperationStatus> createNodeResult = titanGenericDao.createNode(propertyValueData, InputValueData.class);
+            Either<InputValueData, JanusGraphOperationStatus> createNodeResult = janusGraphGenericDao
+                .createNode(propertyValueData, InputValueData.class);
             log.debug("After adding property value to graph {}", propertyValueData);
 
             if (createNodeResult.isRight()) {
-                TitanOperationStatus operationStatus = createNodeResult.right().value();
+                JanusGraphOperationStatus operationStatus = createNodeResult.right().value();
                 return Either.right(operationStatus);
             }
 
-            Either<GraphRelation, TitanOperationStatus> createRelResult = titanGenericDao.createRelation(propertyValueData, propertyData, GraphEdgeLabels.INPUT_IMPL, null);
+            Either<GraphRelation, JanusGraphOperationStatus> createRelResult = janusGraphGenericDao
+                .createRelation(propertyValueData, propertyData, GraphEdgeLabels.INPUT_IMPL, null);
 
             if (createRelResult.isRight()) {
-                TitanOperationStatus operationStatus = createRelResult.right().value();
+                JanusGraphOperationStatus operationStatus = createRelResult.right().value();
                 log.error("Failed to associate property value {} to property {} in graph. status is {}", uniqueId, propertyId, operationStatus);
                 return Either.right(operationStatus);
             }
@@ -525,10 +538,11 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
             properties1.put(GraphEdgePropertiesDictionary.NAME.getProperty(), resourceInstanceData.getComponentInstDataDefinition().getName());
             properties1.put(GraphEdgePropertiesDictionary.OWNER_ID.getProperty(), resourceInstanceData.getComponentInstDataDefinition().getUniqueId());
 
-            createRelResult = titanGenericDao.createRelation(resourceInstanceData, propertyValueData, GraphEdgeLabels.INPUT_VALUE, properties1);
+            createRelResult = janusGraphGenericDao
+                .createRelation(resourceInstanceData, propertyValueData, GraphEdgeLabels.INPUT_VALUE, properties1);
 
             if (createRelResult.isRight()) {
-                TitanOperationStatus operationStatus = createNodeResult.right().value();
+                JanusGraphOperationStatus operationStatus = createNodeResult.right().value();
                 log.error("Failed to associate resource instance {} property value {} in graph. status is {}", resourceInstanceId, uniqueId, operationStatus);
                 return Either.right(operationStatus);
 
@@ -537,7 +551,7 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
             return Either.left(createNodeResult.left().value());
         } else {
             log.error("property value already exists.");
-            return Either.right(TitanOperationStatus.ALREADY_EXIST);
+            return Either.right(JanusGraphOperationStatus.ALREADY_EXIST);
         }
 
     }
@@ -548,11 +562,11 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
 
         try {
 
-            Either<AttributeValueData, TitanOperationStatus> eitherStatus = this.addAttributeToResourceInstance(resourceInstanceAttribute, resourceInstanceId, index);
+            Either<AttributeValueData, JanusGraphOperationStatus> eitherStatus = this.addAttributeToResourceInstance(resourceInstanceAttribute, resourceInstanceId, index);
 
             if (eitherStatus.isRight()) {
                 log.error("Failed to add attribute value {} to resource instance {} in Graph. status is {}", resourceInstanceAttribute, resourceInstanceId, eitherStatus.right().value().name());
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(eitherStatus.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(eitherStatus.right().value()));
                 return result;
             } else {
                 AttributeValueData attributeValueData = eitherStatus.left().value();
@@ -582,11 +596,11 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
         Either<ComponentInstanceProperty, StorageOperationStatus> result = null;
 
         try {
-            Either<AttributeValueData, TitanOperationStatus> eitherAttributeValue = updateAttributeOfResourceInstance(resourceInstanceAttribute, resourceInstanceId);
+            Either<AttributeValueData, JanusGraphOperationStatus> eitherAttributeValue = updateAttributeOfResourceInstance(resourceInstanceAttribute, resourceInstanceId);
 
             if (eitherAttributeValue.isRight()) {
                 log.error("Failed to add attribute value {} to resource instance {} in Graph. status is {}", resourceInstanceAttribute, resourceInstanceId, eitherAttributeValue.right().value().name());
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(eitherAttributeValue.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(eitherAttributeValue.right().value()));
                 return result;
             } else {
                 AttributeValueData attributeValueData = eitherAttributeValue.left().value();
@@ -618,11 +632,11 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
 
         try {
 
-            Either<InputValueData, TitanOperationStatus> eitherStatus = addInputToResourceInstance(resourceInstanceInput, resourceInstanceId, index);
+            Either<InputValueData, JanusGraphOperationStatus> eitherStatus = addInputToResourceInstance(resourceInstanceInput, resourceInstanceId, index);
 
             if (eitherStatus.isRight()) {
                 log.error("Failed to add input value {} to resource instance {} in Graph. status is {}", resourceInstanceInput, resourceInstanceId, eitherStatus.right().value().name());
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(eitherStatus.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(eitherStatus.right().value()));
                 return result;
             } else {
                 InputValueData propertyValueData = eitherStatus.left().value();
@@ -630,9 +644,9 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
                 ComponentInstanceInput propertyValueResult = inputOperation.buildResourceInstanceInput(propertyValueData, resourceInstanceInput);
                 log.debug("The returned ResourceInstanceProperty is {}", propertyValueResult);
 
-                Either<String, TitanOperationStatus> findDefaultValue = propertyOperation.findDefaultValueFromSecondPosition(resourceInstanceInput.getPath(), resourceInstanceInput.getUniqueId(), resourceInstanceInput.getDefaultValue());
+                Either<String, JanusGraphOperationStatus> findDefaultValue = propertyOperation.findDefaultValueFromSecondPosition(resourceInstanceInput.getPath(), resourceInstanceInput.getUniqueId(), resourceInstanceInput.getDefaultValue());
                 if (findDefaultValue.isRight()) {
-                    result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(findDefaultValue.right().value()));
+                    result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(findDefaultValue.right().value()));
                     return result;
                 }
                 String defaultValue = findDefaultValue.left().value();
@@ -648,10 +662,10 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
             if (!inTransaction) {
                 if (result == null || result.isRight()) {
                     log.error("Going to execute rollback on graph.");
-                    titanGenericDao.rollback();
+                    janusGraphGenericDao.rollback();
                 } else {
                     log.debug("Going to execute commit on graph.");
-                    titanGenericDao.commit();
+                    janusGraphGenericDao.commit();
                 }
             }
         }
@@ -665,13 +679,13 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
 
     @Override
     public StorageOperationStatus updateCustomizationUUID(String componentInstanceId) {
-        Either<TitanVertex, TitanOperationStatus> vertexByProperty = titanGenericDao.getVertexByProperty(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), componentInstanceId);
+        Either<JanusGraphVertex, JanusGraphOperationStatus> vertexByProperty = janusGraphGenericDao.getVertexByProperty(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), componentInstanceId);
         if (vertexByProperty.isRight()) {
             log.debug("Failed to fetch component instance by id {} error {}", componentInstanceId, vertexByProperty.right().value());
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(vertexByProperty.right().value());
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(vertexByProperty.right().value());
         }
         UUID uuid = UUID.randomUUID();
-        TitanVertex ciVertex = vertexByProperty.left().value();
+        JanusGraphVertex ciVertex = vertexByProperty.left().value();
         ciVertex.property(GraphPropertiesDictionary.CUSTOMIZATION_UUID.getProperty(), uuid.toString());
 
         return StorageOperationStatus.OK;
@@ -686,10 +700,11 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
             ComponentInstanceData componentData = new ComponentInstanceData(componentInstance, componentInstance.getGroupInstances().size());
             componentData.getComponentInstDataDefinition().setModificationTime(modificationTime);
             componentData.getComponentInstDataDefinition().setCustomizationUUID(UUID.randomUUID().toString());
-            Either<ComponentInstanceData, TitanOperationStatus> updateNode = titanGenericDao.updateNode(componentData, ComponentInstanceData.class);
+            Either<ComponentInstanceData, JanusGraphOperationStatus> updateNode = janusGraphGenericDao
+                .updateNode(componentData, ComponentInstanceData.class);
             if (updateNode.isRight()) {
                 log.error("Failed to update resource {}. status is {}", componentInstance.getUniqueId(), updateNode.right().value());
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(updateNode.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(updateNode.right().value()));
             }else{
                 result = Either.left(updateNode.left().value());
             }
@@ -700,10 +715,10 @@ public class ComponentInstanceOperation extends AbstractOperation implements ICo
             if(!inTransaction){
                 if (result == null || result.isRight()) {
                     log.error("Going to execute rollback on graph.");
-                    titanGenericDao.rollback();
+                    janusGraphGenericDao.rollback();
                 } else {
                     log.debug("Going to execute commit on graph.");
-                    titanGenericDao.commit();
+                    janusGraphGenericDao.commit();
                 }
             }
         }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ConsumerOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ConsumerOperation.java
index c173b59020..b429071572 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ConsumerOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ConsumerOperation.java
@@ -21,9 +21,9 @@
 package org.openecomp.sdc.be.model.operations.impl;
 
 import fj.data.Either;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.operations.api.IConsumerOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
@@ -38,23 +38,25 @@ import java.util.List;
 @Component("consumer-operation")
 public class ConsumerOperation implements IConsumerOperation {
 
-    private TitanGenericDao titanGenericDao;
+    private JanusGraphGenericDao janusGraphGenericDao;
 
     private static final Logger log = Logger.getLogger(ConsumerOperation.class.getName());
 
-    public ConsumerOperation(@Qualifier("titan-generic-dao") TitanGenericDao titanGenericDao) {
-        this.titanGenericDao = titanGenericDao;
+    public ConsumerOperation(@Qualifier("janusgraph-generic-dao")
+                                 JanusGraphGenericDao janusGraphGenericDao) {
+        this.janusGraphGenericDao = janusGraphGenericDao;
     }
 
     @Override
     public Either<ConsumerData, StorageOperationStatus> getCredentials(String consumerName) {
         Either<ConsumerData, StorageOperationStatus> result = null;
         log.debug("retriving Credentials for: {}", consumerName);
-        Either<ConsumerData, TitanOperationStatus> getNode = titanGenericDao.getNode(GraphPropertiesDictionary.CONSUMER_NAME.getProperty(), consumerName, ConsumerData.class);
+        Either<ConsumerData, JanusGraphOperationStatus> getNode = janusGraphGenericDao
+            .getNode(GraphPropertiesDictionary.CONSUMER_NAME.getProperty(), consumerName, ConsumerData.class);
         if (getNode.isRight()) {
-            TitanOperationStatus status = getNode.right().value();
+            JanusGraphOperationStatus status = getNode.right().value();
             log.error("Error returned after get Consumer Data node {}. status returned is {}", consumerName, status);
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             return result;
         }
         ConsumerData consumerData = getNode.left().value();
@@ -64,8 +66,9 @@ public class ConsumerOperation implements IConsumerOperation {
     @Override
     public Either<List<ConsumerData>, StorageOperationStatus> getAll() {
         log.debug("retrieving all consumers");
-        return titanGenericDao.getByCriteria(NodeTypeEnum.ConsumerCredentials, Collections.emptyMap(), ConsumerData.class)
-                .right().map(DaoStatusConverter::convertTitanStatusToStorageStatus);
+        return janusGraphGenericDao
+            .getByCriteria(NodeTypeEnum.ConsumerCredentials, Collections.emptyMap(), ConsumerData.class)
+                .right().map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
     }
 
     @Override
@@ -78,11 +81,12 @@ public class ConsumerOperation implements IConsumerOperation {
         Either<ConsumerData, StorageOperationStatus> result = null;
         try {
             log.debug("creating Credentials for: {}", consumerData.getUniqueId());
-            Either<ConsumerData, TitanOperationStatus> createNode = titanGenericDao.createNode(consumerData, ConsumerData.class);
+            Either<ConsumerData, JanusGraphOperationStatus> createNode = janusGraphGenericDao
+                .createNode(consumerData, ConsumerData.class);
             if (createNode.isRight()) {
-                TitanOperationStatus status = createNode.right().value();
+                JanusGraphOperationStatus status = createNode.right().value();
                 log.error("Error returned after creating Consumer Data node {}. status returned is {}", consumerData.getUniqueId(), status);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
                 return result;
             }
             ConsumerData createdConsumerData = createNode.left().value();
@@ -103,11 +107,12 @@ public class ConsumerOperation implements IConsumerOperation {
         Either<ConsumerData, StorageOperationStatus> result = null;
         try {
             log.debug("delete Credentials for: {}", consumerName);
-            Either<ConsumerData, TitanOperationStatus> deleteNode = titanGenericDao.deleteNode(GraphPropertiesDictionary.CONSUMER_NAME.getProperty(), consumerName, ConsumerData.class);
+            Either<ConsumerData, JanusGraphOperationStatus> deleteNode = janusGraphGenericDao
+                .deleteNode(GraphPropertiesDictionary.CONSUMER_NAME.getProperty(), consumerName, ConsumerData.class);
             if (deleteNode.isRight()) {
-                TitanOperationStatus status = deleteNode.right().value();
+                JanusGraphOperationStatus status = deleteNode.right().value();
                 log.error("Error returned after delete Consumer Data node {}. status returned is {}", consumerName, status);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
                 return result;
             }
 
@@ -131,11 +136,12 @@ public class ConsumerOperation implements IConsumerOperation {
         Either<ConsumerData, StorageOperationStatus> result = null;
         try {
             log.debug("update Credentials for: {}", consumerData.getUniqueId());
-            Either<ConsumerData, TitanOperationStatus> updateNode = titanGenericDao.updateNode(consumerData, ConsumerData.class);
+            Either<ConsumerData, JanusGraphOperationStatus> updateNode = janusGraphGenericDao
+                .updateNode(consumerData, ConsumerData.class);
             if (updateNode.isRight()) {
-                TitanOperationStatus status = updateNode.right().value();
+                JanusGraphOperationStatus status = updateNode.right().value();
                 log.error("Error returned after delete Consumer Data node {}. status returned is {}", consumerData.getUniqueId(), status);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
                 return result;
             }
             ConsumerData updatedConsumerData = updateNode.left().value();
@@ -150,10 +156,10 @@ public class ConsumerOperation implements IConsumerOperation {
         if (!inTransaction) {
             if (result == null || result.isRight()) {
                 log.error("Going to execute rollback on graph.");
-                titanGenericDao.rollback();
+                janusGraphGenericDao.rollback();
             } else {
                 log.debug("Going to execute commit on graph.");
-                titanGenericDao.commit();
+                janusGraphGenericDao.commit();
             }
         }
     }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/DaoStatusConverter.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/DaoStatusConverter.java
index a66dce139b..bce7a2a73c 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/DaoStatusConverter.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/DaoStatusConverter.java
@@ -21,18 +21,18 @@
 package org.openecomp.sdc.be.model.operations.impl;
 
 import org.openecomp.sdc.be.dao.cassandra.CassandraOperationStatus;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 
 public class DaoStatusConverter {
 
-    public static StorageOperationStatus convertTitanStatusToStorageStatus(TitanOperationStatus titanStatus) {
+    public static StorageOperationStatus convertJanusGraphStatusToStorageStatus(JanusGraphOperationStatus janusGraphStatus) {
 
-        if (titanStatus == null) {
+        if (janusGraphStatus == null) {
             return StorageOperationStatus.GENERAL_ERROR;
         }
 
-        switch (titanStatus) {
+        switch (janusGraphStatus) {
 
         case OK:
             return StorageOperationStatus.OK;
@@ -54,7 +54,7 @@ public class DaoStatusConverter {
         case ALREADY_LOCKED:
             return StorageOperationStatus.FAILED_TO_LOCK_ELEMENT;
 
-        case TITAN_SCHEMA_VIOLATION:
+        case JANUSGRAPH_SCHEMA_VIOLATION:
             return StorageOperationStatus.SCHEMA_VIOLATION;
 
         case INVALID_ID:
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/DefaultDerivedFromOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/DefaultDerivedFromOperation.java
index 6f9555899b..e39f4b8f5a 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/DefaultDerivedFromOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/DefaultDerivedFromOperation.java
@@ -6,10 +6,10 @@ import org.apache.commons.lang3.tuple.Pair;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphNode;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.operations.api.DerivedFromOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
@@ -24,27 +24,28 @@ import java.util.function.Function;
 public class DefaultDerivedFromOperation implements DerivedFromOperation {
 
     private static final Logger log = Logger.getLogger(DefaultDerivedFromOperation.class.getName());
-    private TitanGenericDao titanGenericDao;
+    private JanusGraphGenericDao janusGraphGenericDao;
 
-    public DefaultDerivedFromOperation(TitanGenericDao titanGenericDao) {
-        this.titanGenericDao = titanGenericDao;
+    public DefaultDerivedFromOperation(JanusGraphGenericDao janusGraphGenericDao) {
+        this.janusGraphGenericDao = janusGraphGenericDao;
     }
 
     @Override
     public Either<GraphRelation, StorageOperationStatus> addDerivedFromRelation(String parentUniqueId, String derivedFromUniqueId, NodeTypeEnum nodeType) {
         UniqueIdData from = new UniqueIdData(nodeType, parentUniqueId);
         UniqueIdData to = new UniqueIdData(nodeType, derivedFromUniqueId);
-        return titanGenericDao.createRelation(from, to, GraphEdgeLabels.DERIVED_FROM, null)
+        return janusGraphGenericDao.createRelation(from, to, GraphEdgeLabels.DERIVED_FROM, null)
                 .right()
-                .map(DaoStatusConverter::convertTitanStatusToStorageStatus);
+                .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
     }
 
     @Override
     public <T extends GraphNode> Either<T, StorageOperationStatus> getDerivedFromChild(String uniqueId, NodeTypeEnum nodeType, Class<T> clazz) {
         log.debug("#getDerivedFromChild - fetching derived from entity for node type {} with id {}", nodeType, uniqueId);
-        return titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(nodeType), uniqueId, GraphEdgeLabels.DERIVED_FROM, nodeType, clazz)
+        return janusGraphGenericDao
+            .getChild(UniqueIdBuilder.getKeyByNodeType(nodeType), uniqueId, GraphEdgeLabels.DERIVED_FROM, nodeType, clazz)
                 .bimap(Pair::getKey,
-                       DaoStatusConverter::convertTitanStatusToStorageStatus);
+                       DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
     }
 
     @Override
@@ -53,19 +54,19 @@ public class DefaultDerivedFromOperation implements DerivedFromOperation {
         UniqueIdData to = new UniqueIdData(nodeType, derivedFromUniqueId);
         return isDerivedFromExists(from, to)
                 .either(isRelationExist -> isRelationExist ? deleteDerivedFrom(from, to) : StorageOperationStatus.OK,
-                        DaoStatusConverter::convertTitanStatusToStorageStatus);
+                        DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
 
 
     }
 
     private StorageOperationStatus deleteDerivedFrom(UniqueIdData from,  UniqueIdData to) {
-        return titanGenericDao.deleteRelation(from, to, GraphEdgeLabels.DERIVED_FROM)
+        return janusGraphGenericDao.deleteRelation(from, to, GraphEdgeLabels.DERIVED_FROM)
                 .either(deletedRelation -> StorageOperationStatus.OK,
-                        DaoStatusConverter::convertTitanStatusToStorageStatus);
+                        DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
     }
 
-    private Either<Boolean, TitanOperationStatus> isDerivedFromExists(UniqueIdData from, UniqueIdData to) {
-        return titanGenericDao.isRelationExist(from, to, GraphEdgeLabels.DERIVED_FROM);
+    private Either<Boolean, JanusGraphOperationStatus> isDerivedFromExists(UniqueIdData from, UniqueIdData to) {
+        return janusGraphGenericDao.isRelationExist(from, to, GraphEdgeLabels.DERIVED_FROM);
     }
     
     @Override
@@ -74,11 +75,14 @@ public class DefaultDerivedFromOperation implements DerivedFromOperation {
         Map<String, Object> propertiesToMatch = new HashMap<>();
         propertiesToMatch.put(GraphPropertiesDictionary.TYPE.getProperty(), childCandidateType);
         
-        Either<List<T>, TitanOperationStatus> getResponse = titanGenericDao.getByCriteria(nodeType, propertiesToMatch, clazz);
+        Either<List<T>, JanusGraphOperationStatus> getResponse = janusGraphGenericDao
+            .getByCriteria(nodeType, propertiesToMatch, clazz);
         if (getResponse.isRight()) {
-            TitanOperationStatus titanOperationStatus = getResponse.right().value();
-            log.debug("Couldn't fetch type {}, error: {}", childCandidateType, titanOperationStatus);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(titanOperationStatus));
+            JanusGraphOperationStatus janusGraphOperationStatus = getResponse.right().value();
+            log.debug("Couldn't fetch type {}, error: {}", childCandidateType,
+                janusGraphOperationStatus);
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(
+                janusGraphOperationStatus));
         }
         T node = getResponse.left().value().get(0);
         String childUniqueId = node.getUniqueId();
@@ -91,13 +95,16 @@ public class DefaultDerivedFromOperation implements DerivedFromOperation {
         
         do {
             travelledTypes.add(childType);
-            Either<List<ImmutablePair<T, GraphEdge>>, TitanOperationStatus> childrenNodes = titanGenericDao.getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(nodeType), childUniqueId, GraphEdgeLabels.DERIVED_FROM,
+            Either<List<ImmutablePair<T, GraphEdge>>, JanusGraphOperationStatus> childrenNodes = janusGraphGenericDao
+                .getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(nodeType), childUniqueId, GraphEdgeLabels.DERIVED_FROM,
                     nodeType, clazz);
             if (childrenNodes.isRight()) {
-                if (childrenNodes.right().value() != TitanOperationStatus.NOT_FOUND) {
-                    TitanOperationStatus titanOperationStatus = getResponse.right().value();
-                    log.debug("Couldn't fetch derived from node for type {}, error: {}", childCandidateType, titanOperationStatus);
-                    return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(titanOperationStatus));
+                if (childrenNodes.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
+                    JanusGraphOperationStatus janusGraphOperationStatus = getResponse.right().value();
+                    log.debug("Couldn't fetch derived from node for type {}, error: {}", childCandidateType,
+                        janusGraphOperationStatus);
+                    return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(
+                        janusGraphOperationStatus));
                 } else {
                     log.debug("Derived from node is not found for type {} - this is OK for root capability.", childCandidateType);
                     return Either.left(false);
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ElementOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ElementOperation.java
index fd455bcde8..ce9d320ed7 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ElementOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ElementOperation.java
@@ -20,8 +20,8 @@
 
 package org.openecomp.sdc.be.model.operations.impl;
 
-import com.thinkaurelius.titan.core.TitanGraph;
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraph;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
@@ -31,10 +31,10 @@ import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphNode;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
 import org.openecomp.sdc.be.datatypes.category.CategoryDataDefinition;
 import org.openecomp.sdc.be.datatypes.category.GroupingDataDefinition;
 import org.openecomp.sdc.be.datatypes.category.SubCategoryDataDefinition;
@@ -62,13 +62,14 @@ import java.util.*;
 @Component("element-operation")
 public class ElementOperation implements IElementOperation {
 
-    private static final String COULDN_T_FETCH_TITAN_GRAPH = "Couldn't fetch titan graph";
+    private static final String COULDN_T_FETCH_janusGraph_GRAPH = "Couldn't fetch janusgraph graph";
 	private static final String UNKNOWN_CATEGORY_TYPE = "Unknown category type {}";
-	private TitanGenericDao titanGenericDao;
+	private JanusGraphGenericDao janusGraphGenericDao;
 
-    public ElementOperation(@Qualifier("titan-generic-dao") TitanGenericDao titanGenericDao) {
+    public ElementOperation(@Qualifier("janusgraph-generic-dao")
+                                JanusGraphGenericDao janusGraphGenericDao) {
         super();
-        this.titanGenericDao = titanGenericDao;
+        this.janusGraphGenericDao = janusGraphGenericDao;
     }
 
     private static final Logger log = Logger.getLogger(ElementOperation.class.getName());
@@ -109,12 +110,13 @@ public class ElementOperation implements IElementOperation {
         CategoryData categoryData = new CategoryData(nodeType, category);
 
         try {
-            Either<CategoryData, TitanOperationStatus> createNode = titanGenericDao.createNode(categoryData, CategoryData.class);
+            Either<CategoryData, JanusGraphOperationStatus> createNode = janusGraphGenericDao
+                .createNode(categoryData, CategoryData.class);
             if (createNode.isRight()) {
-                TitanOperationStatus value = createNode.right().value();
+                JanusGraphOperationStatus value = createNode.right().value();
                 ActionStatus actionStatus = ActionStatus.GENERAL_ERROR;
                 log.debug("Problem while creating category, reason {}", value);
-                if (value == TitanOperationStatus.TITAN_SCHEMA_VIOLATION) {
+                if (value == JanusGraphOperationStatus.JANUSGRAPH_SCHEMA_VIOLATION) {
                     actionStatus = ActionStatus.COMPONENT_CATEGORY_ALREADY_EXISTS;
                 }
                 result = Either.right(actionStatus);
@@ -126,9 +128,9 @@ public class ElementOperation implements IElementOperation {
         } finally {
             if (!inTransaction) {
                 if (result != null && result.isLeft()) {
-                    titanGenericDao.commit();
+                    janusGraphGenericDao.commit();
                 } else {
-                    titanGenericDao.rollback();
+                    janusGraphGenericDao.rollback();
                 }
             }
         }
@@ -146,12 +148,13 @@ public class ElementOperation implements IElementOperation {
 
         try {
             // create edge from category to sub-category
-            Either<CategoryData, TitanOperationStatus> categoryNode = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), categoryId, CategoryData.class);
+            Either<CategoryData, JanusGraphOperationStatus> categoryNode = janusGraphGenericDao
+                .getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), categoryId, CategoryData.class);
             ActionStatus actionStatus = ActionStatus.GENERAL_ERROR;
             if (categoryNode.isRight()) {
-                TitanOperationStatus titanOperationStatus = categoryNode.right().value();
-                log.debug("Problem while fetching category, reason {}", titanOperationStatus);
-                if (titanOperationStatus == TitanOperationStatus.NOT_FOUND) {
+                JanusGraphOperationStatus janusGraphOperationStatus = categoryNode.right().value();
+                log.debug("Problem while fetching category, reason {}", janusGraphOperationStatus);
+                if (janusGraphOperationStatus == JanusGraphOperationStatus.NOT_FOUND) {
                     actionStatus = ActionStatus.COMPONENT_CATEGORY_NOT_FOUND;
                 }
                 result = Either.right(actionStatus);
@@ -162,18 +165,20 @@ public class ElementOperation implements IElementOperation {
             subCategory.setUniqueId(UniqueIdBuilder.buildSubCategoryUid(categoryDataDefinition.getUniqueId(), subCategory.getNormalizedName()));
             SubCategoryData subCategoryData = new SubCategoryData(nodeType, subCategory);
 
-            Either<SubCategoryData, TitanOperationStatus> subCategoryNode = titanGenericDao.createNode(subCategoryData, SubCategoryData.class);
+            Either<SubCategoryData, JanusGraphOperationStatus> subCategoryNode = janusGraphGenericDao
+                .createNode(subCategoryData, SubCategoryData.class);
             if (subCategoryNode.isRight()) {
-                TitanOperationStatus titanOperationStatus = subCategoryNode.right().value();
-                log.debug("Problem while creating category, reason {}", titanOperationStatus);
-                if (titanOperationStatus == TitanOperationStatus.TITAN_SCHEMA_VIOLATION) {
+                JanusGraphOperationStatus janusGraphOperationStatus = subCategoryNode.right().value();
+                log.debug("Problem while creating category, reason {}", janusGraphOperationStatus);
+                if (janusGraphOperationStatus == JanusGraphOperationStatus.JANUSGRAPH_SCHEMA_VIOLATION) {
                     actionStatus = ActionStatus.COMPONENT_SUB_CATEGORY_EXISTS_FOR_CATEGORY;
                 }
                 result = Either.right(actionStatus);
                 return result;
             }
 
-            Either<GraphRelation, TitanOperationStatus> relation = titanGenericDao.createRelation(categoryNode.left().value(), subCategoryNode.left().value(), GraphEdgeLabels.SUB_CATEGORY, null);
+            Either<GraphRelation, JanusGraphOperationStatus> relation = janusGraphGenericDao
+                .createRelation(categoryNode.left().value(), subCategoryNode.left().value(), GraphEdgeLabels.SUB_CATEGORY, null);
             if (relation.isRight()) {
                 log.debug("Problem while create relation between category and sub-category ", relation.right().value());
                 result = Either.right(actionStatus);
@@ -185,9 +190,9 @@ public class ElementOperation implements IElementOperation {
         } finally {
             if (!inTransaction) {
                 if (result != null && result.isLeft()) {
-                    titanGenericDao.commit();
+                    janusGraphGenericDao.commit();
                 } else {
-                    titanGenericDao.rollback();
+                    janusGraphGenericDao.rollback();
                 }
             }
         }
@@ -200,12 +205,13 @@ public class ElementOperation implements IElementOperation {
 
         try {
             // create edge from sub-category to grouping
-            Either<SubCategoryData, TitanOperationStatus> subCategoryNode = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), subCategoryId, SubCategoryData.class);
+            Either<SubCategoryData, JanusGraphOperationStatus> subCategoryNode = janusGraphGenericDao
+                .getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), subCategoryId, SubCategoryData.class);
             ActionStatus actionStatus = ActionStatus.GENERAL_ERROR;
             if (subCategoryNode.isRight()) {
-                TitanOperationStatus titanOperationStatus = subCategoryNode.right().value();
-                log.debug("Problem while fetching category, reason {}", titanOperationStatus);
-                if (titanOperationStatus == TitanOperationStatus.TITAN_SCHEMA_VIOLATION) {
+                JanusGraphOperationStatus janusGraphOperationStatus = subCategoryNode.right().value();
+                log.debug("Problem while fetching category, reason {}", janusGraphOperationStatus);
+                if (janusGraphOperationStatus == JanusGraphOperationStatus.JANUSGRAPH_SCHEMA_VIOLATION) {
                     actionStatus = ActionStatus.COMPONENT_CATEGORY_NOT_FOUND;
                 }
                 result = Either.right(actionStatus);
@@ -216,18 +222,20 @@ public class ElementOperation implements IElementOperation {
             grouping.setUniqueId(UniqueIdBuilder.buildGroupingUid(subCatData.getUniqueId(), grouping.getNormalizedName()));
             GroupingData groupingData = new GroupingData(nodeType, grouping);
 
-            Either<GroupingData, TitanOperationStatus> groupingNode = titanGenericDao.createNode(groupingData, GroupingData.class);
+            Either<GroupingData, JanusGraphOperationStatus> groupingNode = janusGraphGenericDao
+                .createNode(groupingData, GroupingData.class);
             if (groupingNode.isRight()) {
-                TitanOperationStatus titanOperationStatus = groupingNode.right().value();
-                log.debug("Problem while creating grouping, reason {}", titanOperationStatus);
-                if (titanOperationStatus == TitanOperationStatus.NOT_FOUND) {
+                JanusGraphOperationStatus janusGraphOperationStatus = groupingNode.right().value();
+                log.debug("Problem while creating grouping, reason {}", janusGraphOperationStatus);
+                if (janusGraphOperationStatus == JanusGraphOperationStatus.NOT_FOUND) {
                     actionStatus = ActionStatus.COMPONENT_GROUPING_EXISTS_FOR_SUB_CATEGORY;
                 }
                 result = Either.right(actionStatus);
                 return result;
             }
 
-            Either<GraphRelation, TitanOperationStatus> relation = titanGenericDao.createRelation(subCategoryNode.left().value(), groupingNode.left().value(), GraphEdgeLabels.GROUPING, null);
+            Either<GraphRelation, JanusGraphOperationStatus> relation = janusGraphGenericDao
+                .createRelation(subCategoryNode.left().value(), groupingNode.left().value(), GraphEdgeLabels.GROUPING, null);
             if (relation.isRight()) {
                 log.debug("Problem while create relation between sub-category and grouping", relation.right().value());
                 result = Either.right(actionStatus);
@@ -238,9 +246,9 @@ public class ElementOperation implements IElementOperation {
             return result;
         } finally {
             if (result != null && result.isLeft()) {
-                titanGenericDao.commit();
+                janusGraphGenericDao.commit();
             } else {
-                titanGenericDao.rollback();
+                janusGraphGenericDao.rollback();
             }
         }
     }
@@ -253,8 +261,9 @@ public class ElementOperation implements IElementOperation {
                 return Either.right(ActionStatus.GENERAL_ERROR);
             }
 
-            Either<List<org.openecomp.sdc.be.resources.data.category.CategoryData>, TitanOperationStatus> either = titanGenericDao.getAll(nodeType, org.openecomp.sdc.be.resources.data.category.CategoryData.class);
-            if (either.isRight() && (either.right().value() != TitanOperationStatus.NOT_FOUND)) {
+            Either<List<org.openecomp.sdc.be.resources.data.category.CategoryData>, JanusGraphOperationStatus> either = janusGraphGenericDao
+                .getAll(nodeType, org.openecomp.sdc.be.resources.data.category.CategoryData.class);
+            if (either.isRight() && (either.right().value() != JanusGraphOperationStatus.NOT_FOUND)) {
                 log.debug("Problem while get all categories. reason - {}", either.right().value());
                 return Either.right(ActionStatus.GENERAL_ERROR);
             }
@@ -267,8 +276,9 @@ public class ElementOperation implements IElementOperation {
                     CategoryDefinition categoryDefinition = new CategoryDefinition(categoryDataDefinition);
                     String categoryName = categoryDataDefinition.getName();
                     log.trace("Found category {}, category type {}", categoryName, nodeType);
-                    TitanOperationStatus setSubCategories = setSubCategories(nodeType, categoryDefinition);
-                    if (setSubCategories != TitanOperationStatus.OK) {
+                    JanusGraphOperationStatus
+                        setSubCategories = setSubCategories(nodeType, categoryDefinition);
+                    if (setSubCategories != JanusGraphOperationStatus.OK) {
                         log.debug("Failed to set sub-categories for category {}, category type {}, error {}", categoryName, nodeType, setSubCategories);
                         return Either.right(ActionStatus.GENERAL_ERROR);
                     }
@@ -278,25 +288,26 @@ public class ElementOperation implements IElementOperation {
             return Either.left(categoryList);
         } finally {
             if (!inTransaction) {
-                titanGenericDao.commit();
+                janusGraphGenericDao.commit();
             }
         }
     }
 
-    private TitanOperationStatus setSubCategories(NodeTypeEnum parentNodeType, CategoryDefinition parentCategory) {
+    private JanusGraphOperationStatus setSubCategories(NodeTypeEnum parentNodeType, CategoryDefinition parentCategory) {
         NodeTypeEnum childNodeType = getChildNodeType(parentNodeType);
         if (childNodeType != null) {
             String categoryName = parentCategory.getName();
             log.trace("Getting sub-categories for category {}, category type {}", categoryName, parentNodeType);
-            Either<List<ImmutablePair<SubCategoryData, GraphEdge>>, TitanOperationStatus> parentNode = titanGenericDao.getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(parentNodeType), parentCategory.getUniqueId(), GraphEdgeLabels.SUB_CATEGORY,
+            Either<List<ImmutablePair<SubCategoryData, GraphEdge>>, JanusGraphOperationStatus> parentNode = janusGraphGenericDao
+                .getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(parentNodeType), parentCategory.getUniqueId(), GraphEdgeLabels.SUB_CATEGORY,
                     childNodeType, SubCategoryData.class);
             if (parentNode.isRight()) {
-                TitanOperationStatus titanOperationStatus = parentNode.right().value();
-                if (titanOperationStatus == TitanOperationStatus.NOT_FOUND) {
+                JanusGraphOperationStatus janusGraphOperationStatus = parentNode.right().value();
+                if (janusGraphOperationStatus == JanusGraphOperationStatus.NOT_FOUND) {
                     log.trace("Didn't find subcategories for category {}, category type {}", categoryName, parentNodeType);
-                    titanOperationStatus = TitanOperationStatus.OK;
+                    janusGraphOperationStatus = JanusGraphOperationStatus.OK;
                 }
-                return titanOperationStatus;
+                return janusGraphOperationStatus;
             }
             List<ImmutablePair<SubCategoryData, GraphEdge>> subsCategoriesData = parentNode.left().value();
             List<SubCategoryDefinition> subCategoriesDefinitions = new ArrayList<>();
@@ -305,32 +316,34 @@ public class ElementOperation implements IElementOperation {
                 SubCategoryDefinition subCategoryDefinition = new SubCategoryDefinition(subCategoryDataDefinition);
 
                 log.trace("Found sub-category {} for category {}, category type {}", subCategoryDataDefinition.getName(), categoryName, parentNodeType);
-                TitanOperationStatus setGroupings = setGroupings(childNodeType, subCategoryDefinition);
-                if (setGroupings != TitanOperationStatus.OK) {
+                JanusGraphOperationStatus
+                    setGroupings = setGroupings(childNodeType, subCategoryDefinition);
+                if (setGroupings != JanusGraphOperationStatus.OK) {
                     log.debug("Failed to set groupings for sub-category {}, sub-category type {}, error {}", subCategoryDataDefinition.getName(), childNodeType, setGroupings);
-                    return TitanOperationStatus.GENERAL_ERROR;
+                    return JanusGraphOperationStatus.GENERAL_ERROR;
                 }
                 subCategoriesDefinitions.add(subCategoryDefinition);
             }
             parentCategory.setSubcategories(subCategoriesDefinitions);
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    private TitanOperationStatus setGroupings(NodeTypeEnum parentNodeType, SubCategoryDefinition parentSubCategory) {
+    private JanusGraphOperationStatus setGroupings(NodeTypeEnum parentNodeType, SubCategoryDefinition parentSubCategory) {
         NodeTypeEnum childNodeType = getChildNodeType(parentNodeType);
         if (childNodeType != null) {
             String subCategoryName = parentSubCategory.getName();
             log.trace("Getting groupings for subcategory {}, subcategory type {}", subCategoryName, parentNodeType);
-            Either<List<ImmutablePair<GroupingData, GraphEdge>>, TitanOperationStatus> parentNode = titanGenericDao.getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(parentNodeType), parentSubCategory.getUniqueId(), GraphEdgeLabels.GROUPING,
+            Either<List<ImmutablePair<GroupingData, GraphEdge>>, JanusGraphOperationStatus> parentNode = janusGraphGenericDao
+                .getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(parentNodeType), parentSubCategory.getUniqueId(), GraphEdgeLabels.GROUPING,
                     childNodeType, GroupingData.class);
             if (parentNode.isRight()) {
-                TitanOperationStatus titanOperationStatus = parentNode.right().value();
-                if (titanOperationStatus == TitanOperationStatus.NOT_FOUND) {
+                JanusGraphOperationStatus janusGraphOperationStatus = parentNode.right().value();
+                if (janusGraphOperationStatus == JanusGraphOperationStatus.NOT_FOUND) {
                     log.trace("Didn't find groupings for subcategory {}, subcategory type {}", subCategoryName, parentNodeType);
-                    titanOperationStatus = TitanOperationStatus.OK;
+                    janusGraphOperationStatus = JanusGraphOperationStatus.OK;
                 }
-                return titanOperationStatus;
+                return janusGraphOperationStatus;
             }
             List<ImmutablePair<GroupingData, GraphEdge>> groupingData = parentNode.left().value();
             List<GroupingDefinition> groupingDefinitions = new ArrayList<>();
@@ -341,7 +354,7 @@ public class ElementOperation implements IElementOperation {
             }
             parentSubCategory.setGroupings(groupingDefinitions);
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
     private static NodeTypeEnum getChildNodeType(NodeTypeEnum parentTypeEnum) {
@@ -370,11 +383,13 @@ public class ElementOperation implements IElementOperation {
                 return Either.right(ActionStatus.GENERAL_ERROR);
             }
 
-            Either<CategoryData, TitanOperationStatus> categoryDataEither = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), categoryId, CategoryData.class);
+            Either<CategoryData, JanusGraphOperationStatus> categoryDataEither = janusGraphGenericDao
+                .getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), categoryId, CategoryData.class);
             if (categoryDataEither.isRight()) {
-                TitanOperationStatus titanOperationStatus = categoryDataEither.right().value();
-                log.debug("Problem while get category by id {}. reason {}", categoryId, titanOperationStatus);
-                if (titanOperationStatus == TitanOperationStatus.NOT_FOUND) {
+                JanusGraphOperationStatus janusGraphOperationStatus = categoryDataEither.right().value();
+                log.debug("Problem while get category by id {}. reason {}", categoryId,
+                    janusGraphOperationStatus);
+                if (janusGraphOperationStatus == JanusGraphOperationStatus.NOT_FOUND) {
                     return Either.right(ActionStatus.COMPONENT_CATEGORY_NOT_FOUND);
                 }
                 return Either.right(ActionStatus.GENERAL_ERROR);
@@ -382,7 +397,7 @@ public class ElementOperation implements IElementOperation {
             CategoryDataDefinition categoryDataDefinition = categoryDataEither.left().value().getCategoryDataDefinition();
             return Either.left(new CategoryDefinition(categoryDataDefinition));
         } finally {
-            titanGenericDao.commit();
+            janusGraphGenericDao.commit();
         }
     }
 
@@ -394,11 +409,13 @@ public class ElementOperation implements IElementOperation {
                 return Either.right(ActionStatus.GENERAL_ERROR);
             }
 
-            Either<SubCategoryData, TitanOperationStatus> subCategoryDataEither = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), subCategoryId, SubCategoryData.class);
+            Either<SubCategoryData, JanusGraphOperationStatus> subCategoryDataEither = janusGraphGenericDao
+                .getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), subCategoryId, SubCategoryData.class);
             if (subCategoryDataEither.isRight()) {
-                TitanOperationStatus titanOperationStatus = subCategoryDataEither.right().value();
-                log.debug("Problem while get sub-category by id {}. reason {}", subCategoryId, titanOperationStatus);
-                if (titanOperationStatus == TitanOperationStatus.NOT_FOUND) {
+                JanusGraphOperationStatus janusGraphOperationStatus = subCategoryDataEither.right().value();
+                log.debug("Problem while get sub-category by id {}. reason {}", subCategoryId,
+                    janusGraphOperationStatus);
+                if (janusGraphOperationStatus == JanusGraphOperationStatus.NOT_FOUND) {
                     return Either.right(ActionStatus.COMPONENT_CATEGORY_NOT_FOUND);
                 }
                 return Either.right(ActionStatus.GENERAL_ERROR);
@@ -406,7 +423,7 @@ public class ElementOperation implements IElementOperation {
             SubCategoryDataDefinition subCategoryDataDefinition = subCategoryDataEither.left().value().getSubCategoryDataDefinition();
             return Either.left(new SubCategoryDefinition(subCategoryDataDefinition));
         } finally {
-            titanGenericDao.commit();
+            janusGraphGenericDao.commit();
         }
     }
 
@@ -419,24 +436,25 @@ public class ElementOperation implements IElementOperation {
                 result = Either.right(ActionStatus.GENERAL_ERROR);
                 return result;
             }
-            Either<CategoryData, TitanOperationStatus> categoryDataEither = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), categoryId, CategoryData.class);
+            Either<CategoryData, JanusGraphOperationStatus> categoryDataEither = janusGraphGenericDao
+                .getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), categoryId, CategoryData.class);
             if (categoryDataEither.isRight()) {
                 log.debug("Failed to retrieve  category for id {} ", categoryId);
                 result = Either.right(ActionStatus.GENERAL_ERROR);
                 return result;
             }
 
-            Either<TitanGraph, TitanOperationStatus> graph = titanGenericDao.getGraph();
+            Either<JanusGraph, JanusGraphOperationStatus> graph = janusGraphGenericDao.getGraph();
             if (graph.isRight()) {
-                log.debug(COULDN_T_FETCH_TITAN_GRAPH);
+                log.debug(COULDN_T_FETCH_janusGraph_GRAPH);
                 result = Either.right(ActionStatus.GENERAL_ERROR);
                 return result;
             }
 
-            TitanGraph tGraph = graph.left().value();
+            JanusGraph tGraph = graph.left().value();
 
-            Iterable<TitanVertex> verticesArtifact = tGraph.query().has(UniqueIdBuilder.getKeyByNodeType(nodeType), categoryId).vertices();
-            Iterator<TitanVertex> iterator = verticesArtifact.iterator();
+            Iterable<JanusGraphVertex> verticesArtifact = tGraph.query().has(UniqueIdBuilder.getKeyByNodeType(nodeType), categoryId).vertices();
+            Iterator<JanusGraphVertex> iterator = verticesArtifact.iterator();
             if (!iterator.hasNext()) {
                 log.debug("No category node for id = {}", categoryId);
                 result = Either.right(ActionStatus.GENERAL_ERROR);
@@ -449,9 +467,9 @@ public class ElementOperation implements IElementOperation {
             return result;
         } finally {
             if (result != null && result.isLeft()) {
-                titanGenericDao.commit();
+                janusGraphGenericDao.commit();
             } else {
-                titanGenericDao.rollback();
+                janusGraphGenericDao.rollback();
             }
         }
     }
@@ -465,24 +483,25 @@ public class ElementOperation implements IElementOperation {
                 result = Either.right(ActionStatus.GENERAL_ERROR);
                 return result;
             }
-            Either<SubCategoryData, TitanOperationStatus> subCategoryDataEither = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), subCategoryId, SubCategoryData.class);
+            Either<SubCategoryData, JanusGraphOperationStatus> subCategoryDataEither = janusGraphGenericDao
+                .getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), subCategoryId, SubCategoryData.class);
             if (subCategoryDataEither.isRight()) {
                 log.debug("Failed to retrieve  sub-category for id {}", subCategoryId);
                 result = Either.right(ActionStatus.GENERAL_ERROR);
                 return result;
             }
 
-            Either<TitanGraph, TitanOperationStatus> graph = titanGenericDao.getGraph();
+            Either<JanusGraph, JanusGraphOperationStatus> graph = janusGraphGenericDao.getGraph();
             if (graph.isRight()) {
-                log.debug(COULDN_T_FETCH_TITAN_GRAPH);
+                log.debug(COULDN_T_FETCH_janusGraph_GRAPH);
                 result = Either.right(ActionStatus.GENERAL_ERROR);
                 return result;
             }
 
-            TitanGraph tGraph = graph.left().value();
+            JanusGraph tGraph = graph.left().value();
 
-            Iterable<TitanVertex> verticesArtifact = tGraph.query().has(UniqueIdBuilder.getKeyByNodeType(nodeType), subCategoryId).vertices();
-            Iterator<TitanVertex> iterator = verticesArtifact.iterator();
+            Iterable<JanusGraphVertex> verticesArtifact = tGraph.query().has(UniqueIdBuilder.getKeyByNodeType(nodeType), subCategoryId).vertices();
+            Iterator<JanusGraphVertex> iterator = verticesArtifact.iterator();
             if (!iterator.hasNext()) {
                 log.debug("No sub-category node for id {}", subCategoryId);
                 result = Either.right(ActionStatus.GENERAL_ERROR);
@@ -496,9 +515,9 @@ public class ElementOperation implements IElementOperation {
             return result;
         } finally {
             if (result != null && result.isLeft()) {
-                titanGenericDao.commit();
+                janusGraphGenericDao.commit();
             } else {
-                titanGenericDao.rollback();
+                janusGraphGenericDao.rollback();
             }
         }
 
@@ -513,24 +532,25 @@ public class ElementOperation implements IElementOperation {
                 result = Either.right(ActionStatus.GENERAL_ERROR);
                 return result;
             }
-            Either<GroupingData, TitanOperationStatus> groupingDataEither = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), groupingId, GroupingData.class);
+            Either<GroupingData, JanusGraphOperationStatus> groupingDataEither = janusGraphGenericDao
+                .getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), groupingId, GroupingData.class);
             if (groupingDataEither.isRight()) {
                 log.debug("Failed to retrieve  grouping for id {}", groupingId);
                 result = Either.right(ActionStatus.GENERAL_ERROR);
                 return result;
             }
 
-            Either<TitanGraph, TitanOperationStatus> graph = titanGenericDao.getGraph();
+            Either<JanusGraph, JanusGraphOperationStatus> graph = janusGraphGenericDao.getGraph();
             if (graph.isRight()) {
-                log.debug(COULDN_T_FETCH_TITAN_GRAPH);
+                log.debug(COULDN_T_FETCH_janusGraph_GRAPH);
                 result = Either.right(ActionStatus.GENERAL_ERROR);
                 return result;
             }
 
-            TitanGraph tGraph = graph.left().value();
+            JanusGraph tGraph = graph.left().value();
 
-            Iterable<TitanVertex> verticesArtifact = tGraph.query().has(UniqueIdBuilder.getKeyByNodeType(nodeType), groupingId).vertices();
-            Iterator<TitanVertex> iterator = verticesArtifact.iterator();
+            Iterable<JanusGraphVertex> verticesArtifact = tGraph.query().has(UniqueIdBuilder.getKeyByNodeType(nodeType), groupingId).vertices();
+            Iterator<JanusGraphVertex> iterator = verticesArtifact.iterator();
             if (!iterator.hasNext()) {
                 log.debug("No grouping node for id {}", groupingId);
                 result = Either.right(ActionStatus.GENERAL_ERROR);
@@ -544,9 +564,9 @@ public class ElementOperation implements IElementOperation {
             return result;
         } finally {
             if (result != null && result.isLeft()) {
-                titanGenericDao.commit();
+                janusGraphGenericDao.commit();
             } else {
-                titanGenericDao.rollback();
+                janusGraphGenericDao.rollback();
             }
         }
     }
@@ -557,8 +577,9 @@ public class ElementOperation implements IElementOperation {
         Map<String, Object> properties = new HashMap<>();
         properties.put(GraphPropertiesDictionary.NORMALIZED_NAME.getProperty(), normalizedName);
         try {
-            Either<List<CategoryData>, TitanOperationStatus> categoryEither = titanGenericDao.getByCriteria(nodeType, properties, CategoryData.class);
-            if (categoryEither.isRight() && categoryEither.right().value() != TitanOperationStatus.NOT_FOUND) {
+            Either<List<CategoryData>, JanusGraphOperationStatus> categoryEither = janusGraphGenericDao
+                .getByCriteria(nodeType, properties, CategoryData.class);
+            if (categoryEither.isRight() && categoryEither.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 log.debug("Failed to get categories, nodeType {}, normalizedName {}, error {}", nodeType, normalizedName, categoryEither.right().value());
                 return Either.right(ActionStatus.GENERAL_ERROR);
             }
@@ -575,7 +596,7 @@ public class ElementOperation implements IElementOperation {
                 return Either.left(true);
             }
         } finally {
-            titanGenericDao.commit();
+            janusGraphGenericDao.commit();
         }
     }
 
@@ -584,8 +605,9 @@ public class ElementOperation implements IElementOperation {
 
         String subCategoryId = UniqueIdBuilder.buildSubCategoryUid(parentCategoryId, subCategoryNormName);
         try {
-            Either<SubCategoryData, TitanOperationStatus> subCategoryDataEither = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), subCategoryId, SubCategoryData.class);
-            if (subCategoryDataEither.isRight() && subCategoryDataEither.right().value() != TitanOperationStatus.NOT_FOUND) {
+            Either<SubCategoryData, JanusGraphOperationStatus> subCategoryDataEither = janusGraphGenericDao
+                .getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), subCategoryId, SubCategoryData.class);
+            if (subCategoryDataEither.isRight() && subCategoryDataEither.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 log.debug("Failed to get sub-category with id {}, error {}", subCategoryId, subCategoryDataEither.right().value());
                 return Either.right(ActionStatus.GENERAL_ERROR);
             }
@@ -598,7 +620,7 @@ public class ElementOperation implements IElementOperation {
                 return Either.left(true);
             }
         } finally {
-            titanGenericDao.commit();
+            janusGraphGenericDao.commit();
         }
     }
 
@@ -607,8 +629,9 @@ public class ElementOperation implements IElementOperation {
 
         String groupingId = UniqueIdBuilder.buildGroupingUid(parentSubCategoryId, groupingNormName);
         try {
-            Either<GroupingData, TitanOperationStatus> groupingDataEither = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), groupingId, GroupingData.class);
-            if (groupingDataEither.isRight() && groupingDataEither.right().value() != TitanOperationStatus.NOT_FOUND) {
+            Either<GroupingData, JanusGraphOperationStatus> groupingDataEither = janusGraphGenericDao
+                .getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), groupingId, GroupingData.class);
+            if (groupingDataEither.isRight() && groupingDataEither.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 log.debug("Failed to get grouping with id {}, error {}", groupingId, groupingDataEither.right().value());
                 return Either.right(ActionStatus.GENERAL_ERROR);
             }
@@ -621,7 +644,7 @@ public class ElementOperation implements IElementOperation {
                 return Either.left(true);
             }
         } finally {
-            titanGenericDao.commit();
+            janusGraphGenericDao.commit();
         }
     }
 
@@ -630,8 +653,9 @@ public class ElementOperation implements IElementOperation {
         Map<String, Object> properties = new HashMap<>();
         properties.put(GraphPropertiesDictionary.NORMALIZED_NAME.getProperty(), normalizedName);
         try {
-            Either<List<SubCategoryData>, TitanOperationStatus> subCategoryEither = titanGenericDao.getByCriteria(nodeType, properties, SubCategoryData.class);
-            if (subCategoryEither.isRight() && subCategoryEither.right().value() != TitanOperationStatus.NOT_FOUND) {
+            Either<List<SubCategoryData>, JanusGraphOperationStatus> subCategoryEither = janusGraphGenericDao
+                .getByCriteria(nodeType, properties, SubCategoryData.class);
+            if (subCategoryEither.isRight() && subCategoryEither.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 log.debug("Failed to get sub-categories, nodeType {}, normalizedName {}, error {}", nodeType, normalizedName, subCategoryEither.right().value());
                 return Either.right(ActionStatus.GENERAL_ERROR);
             }
@@ -646,7 +670,7 @@ public class ElementOperation implements IElementOperation {
                 return Either.left(null);
             }
         } finally {
-            titanGenericDao.commit();
+            janusGraphGenericDao.commit();
         }
     }
 
@@ -655,8 +679,9 @@ public class ElementOperation implements IElementOperation {
         Map<String, Object> properties = new HashMap<>();
         properties.put(GraphPropertiesDictionary.NORMALIZED_NAME.getProperty(), groupingNormalizedName);
         try {
-            Either<List<GroupingData>, TitanOperationStatus> groupingEither = titanGenericDao.getByCriteria(nodeType, properties, GroupingData.class);
-            if (groupingEither.isRight() && groupingEither.right().value() != TitanOperationStatus.NOT_FOUND) {
+            Either<List<GroupingData>, JanusGraphOperationStatus> groupingEither = janusGraphGenericDao
+                .getByCriteria(nodeType, properties, GroupingData.class);
+            if (groupingEither.isRight() && groupingEither.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 log.debug("Failed to get grouping, nodeType {}, normalizedName {}, error {}", nodeType, groupingNormalizedName, groupingEither.right().value());
                 return Either.right(ActionStatus.GENERAL_ERROR);
             }
@@ -671,7 +696,7 @@ public class ElementOperation implements IElementOperation {
                 return Either.left(null);
             }
         } finally {
-            titanGenericDao.commit();
+            janusGraphGenericDao.commit();
         }
     }
 
@@ -682,7 +707,8 @@ public class ElementOperation implements IElementOperation {
     @Override
     public Either<List<Tag>, ActionStatus> getAllTags() {
         try {
-            Either<List<TagData>, TitanOperationStatus> either = titanGenericDao.getAll(NodeTypeEnum.Tag, TagData.class);
+            Either<List<TagData>, JanusGraphOperationStatus> either = janusGraphGenericDao
+                .getAll(NodeTypeEnum.Tag, TagData.class);
             if (either.isRight()) {
                 log.debug("Problem while get all tags. reason - {}", either.right().value());
                 return Either.right(ActionStatus.GENERAL_ERROR);
@@ -691,7 +717,7 @@ public class ElementOperation implements IElementOperation {
             List<Tag> tagList = convertToListOfTag(tagDataList);
             return Either.left(tagList);
         } finally {
-            titanGenericDao.commit();
+            janusGraphGenericDao.commit();
         }
     }
 
@@ -708,12 +734,14 @@ public class ElementOperation implements IElementOperation {
             } else {
                 categoryUid = UniqueIdBuilder.buildServiceCategoryUid(name, type);
             }
-            Either<T, TitanOperationStatus> either = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(type), categoryUid, clazz);
+            Either<T, JanusGraphOperationStatus> either = janusGraphGenericDao
+                .getNode(UniqueIdBuilder.getKeyByNodeType(type), categoryUid, clazz);
 
             if (either.isRight()) {
-                TitanOperationStatus titanOperationStatus = either.right().value();
-                log.debug("Problem while geting category with id {}. reason - {}", categoryUid, titanOperationStatus.name());
-                if (titanOperationStatus == TitanOperationStatus.NOT_FOUND) {
+                JanusGraphOperationStatus janusGraphOperationStatus = either.right().value();
+                log.debug("Problem while geting category with id {}. reason - {}", categoryUid, janusGraphOperationStatus
+                    .name());
+                if (janusGraphOperationStatus == JanusGraphOperationStatus.NOT_FOUND) {
                     return Either.right(StorageOperationStatus.CATEGORY_NOT_FOUND);
                 } else {
                     return Either.right(StorageOperationStatus.GENERAL_ERROR);
@@ -804,12 +832,14 @@ public class ElementOperation implements IElementOperation {
             String categoryUid = UniqueIdBuilder.buildServiceCategoryUid(name, type);
             Map props = new HashMap<>();
             props.put(GraphPropertiesDictionary.NORMALIZED_NAME.getProperty(), ValidationUtils.normalizeCategoryName4Uniqueness(name));
-            Either<List<T>, TitanOperationStatus> either = titanGenericDao.getByCriteria(type, props, clazz);
+            Either<List<T>, JanusGraphOperationStatus> either = janusGraphGenericDao
+                .getByCriteria(type, props, clazz);
 
             if (either.isRight()) {
-                TitanOperationStatus titanOperationStatus = either.right().value();
-                log.debug("Problem while geting category with id {}. reason - {}", categoryUid, titanOperationStatus.name());
-                if (titanOperationStatus == TitanOperationStatus.NOT_FOUND) {
+                JanusGraphOperationStatus janusGraphOperationStatus = either.right().value();
+                log.debug("Problem while geting category with id {}. reason - {}", categoryUid, janusGraphOperationStatus
+                    .name());
+                if (janusGraphOperationStatus == JanusGraphOperationStatus.NOT_FOUND) {
                     return Either.right(StorageOperationStatus.CATEGORY_NOT_FOUND);
                 } else {
                     return Either.right(StorageOperationStatus.GENERAL_ERROR);
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GraphLockOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GraphLockOperation.java
index b87da5ad9a..009f375a13 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GraphLockOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GraphLockOperation.java
@@ -20,8 +20,8 @@
 
 package org.openecomp.sdc.be.model.operations.impl;
 
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.operations.api.IGraphLockOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
@@ -33,7 +33,7 @@ public class GraphLockOperation implements IGraphLockOperation {
     private static final Logger log = Logger.getLogger(GraphLockOperation.class.getName());
 
     @javax.annotation.Resource
-    private TitanGenericDao titanGenericDao;
+    private JanusGraphGenericDao janusGraphGenericDao;
 
     public GraphLockOperation() {
         super();
@@ -47,15 +47,15 @@ public class GraphLockOperation implements IGraphLockOperation {
     @Override
     public StorageOperationStatus lockComponent(String componentId, NodeTypeEnum nodeType) {
         log.info("lock resource with id {}", componentId);
-        TitanOperationStatus lockElementStatus = null;
+        JanusGraphOperationStatus lockElementStatus = null;
         try {
-            lockElementStatus = titanGenericDao.lockElement(componentId, nodeType);
+            lockElementStatus = janusGraphGenericDao.lockElement(componentId, nodeType);
         } catch (Exception e) {
-            lockElementStatus = TitanOperationStatus.ALREADY_LOCKED;
+            lockElementStatus = JanusGraphOperationStatus.ALREADY_LOCKED;
 
         }
 
-        return DaoStatusConverter.convertTitanStatusToStorageStatus(lockElementStatus);
+        return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(lockElementStatus);
 
     }
 
@@ -66,30 +66,32 @@ public class GraphLockOperation implements IGraphLockOperation {
      */
     @Override
     public StorageOperationStatus unlockComponent(String componentId, NodeTypeEnum nodeType) {
-        TitanOperationStatus lockElementStatus = titanGenericDao.releaseElement(componentId, nodeType);
-        return DaoStatusConverter.convertTitanStatusToStorageStatus(lockElementStatus);
+        JanusGraphOperationStatus lockElementStatus = janusGraphGenericDao
+            .releaseElement(componentId, nodeType);
+        return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(lockElementStatus);
     }
 
     @Override
     public StorageOperationStatus unlockComponentByName(String name, String componentId, NodeTypeEnum nodeType) {
-        TitanOperationStatus lockElementStatus = titanGenericDao.releaseElement(name, nodeType);
-        return DaoStatusConverter.convertTitanStatusToStorageStatus(lockElementStatus);
+        JanusGraphOperationStatus
+            lockElementStatus = janusGraphGenericDao.releaseElement(name, nodeType);
+        return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(lockElementStatus);
     }
 
     @Override
     public StorageOperationStatus lockComponentByName(String name, NodeTypeEnum nodeType) {
         log.info("lock resource with name {}", name);
-        TitanOperationStatus lockElementStatus = null;
+        JanusGraphOperationStatus lockElementStatus = null;
         try {
 
-            lockElementStatus = titanGenericDao.lockElement(name, nodeType);
+            lockElementStatus = janusGraphGenericDao.lockElement(name, nodeType);
 
         } catch (Exception e) {
-            lockElementStatus = TitanOperationStatus.ALREADY_LOCKED;
+            lockElementStatus = JanusGraphOperationStatus.ALREADY_LOCKED;
 
         }
 
-        return DaoStatusConverter.convertTitanStatusToStorageStatus(lockElementStatus);
+        return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(lockElementStatus);
 
     }
 }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GroupInstanceOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GroupInstanceOperation.java
index 4c86af45e5..39d4c73afb 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GroupInstanceOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GroupInstanceOperation.java
@@ -20,8 +20,8 @@
 
 package org.openecomp.sdc.be.model.operations.impl;
 
-import com.thinkaurelius.titan.core.TitanGraph;
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraph;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
@@ -31,9 +31,9 @@ import org.openecomp.sdc.be.config.BeEcompErrorManager.ErrorSeverity;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphNode;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.GroupInstanceDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition;
@@ -74,37 +74,38 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
         Either<List<GroupInstance>, StorageOperationStatus> result = null;
         List<GroupInstance> groupInstanceRes = new ArrayList<>();
 
-        Either<TitanGraph, TitanOperationStatus> graph = titanGenericDao.getGraph();
+        Either<JanusGraph, JanusGraphOperationStatus> graph = janusGraphGenericDao.getGraph();
         if (graph.isRight()) {
             log.debug("Failed to work with graph {}", graph.right().value());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(graph.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(graph.right().value()));
         }
-        TitanGraph tGraph = graph.left().value();
+        JanusGraph tGraph = graph.left().value();
         @SuppressWarnings("unchecked")
-        Iterable<TitanVertex> vertices = tGraph.query().has(UniqueIdBuilder.getKeyByNodeType(parentType), parentId).vertices();
+        Iterable<JanusGraphVertex> vertices = tGraph.query().has(UniqueIdBuilder.getKeyByNodeType(parentType), parentId).vertices();
         if (vertices == null || vertices.iterator() == null || !vertices.iterator().hasNext()) {
             log.debug("No nodes for type {}  for id = {}", parentType, parentId);
             result = Either.right(StorageOperationStatus.NOT_FOUND);
             return result;
         }
 
-        Iterator<TitanVertex> iterator = vertices.iterator();
+        Iterator<JanusGraphVertex> iterator = vertices.iterator();
         Vertex vertex = iterator.next();
 
         Map<String, Object> edgeProperties = null;
 
-        Either<List<ImmutablePair<GroupInstanceData, GraphEdge>>, TitanOperationStatus> childrenByEdgeCriteria = titanGenericDao.getChildrenByEdgeCriteria(vertex, parentId, GraphEdgeLabels.GROUP_INST, NodeTypeEnum.GroupInstance,
+        Either<List<ImmutablePair<GroupInstanceData, GraphEdge>>, JanusGraphOperationStatus> childrenByEdgeCriteria = janusGraphGenericDao
+            .getChildrenByEdgeCriteria(vertex, parentId, GraphEdgeLabels.GROUP_INST, NodeTypeEnum.GroupInstance,
                 GroupInstanceData.class, edgeProperties);
 
         if (childrenByEdgeCriteria.isRight()) {
-            TitanOperationStatus status = childrenByEdgeCriteria.right().value();
+            JanusGraphOperationStatus status = childrenByEdgeCriteria.right().value();
             log.debug("Failed to find group instance {} on graph", childrenByEdgeCriteria.right().value());
 
-            if (status == TitanOperationStatus.NOT_FOUND) {
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
                 return Either.left(groupInstanceRes);
             }
             
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
         }
 
         List<ImmutablePair<GroupInstanceData, GraphEdge>> list = childrenByEdgeCriteria.left().value();
@@ -120,16 +121,16 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
             }
             
             GroupDefinition groupDefinition = groupRes.left().value();
-            Either<Map<String, PropertyValueData>, TitanOperationStatus> groupInstancePropertyValuesRes = getAllGroupInstancePropertyValuesData(groupInstData);
+            Either<Map<String, PropertyValueData>, JanusGraphOperationStatus> groupInstancePropertyValuesRes = getAllGroupInstancePropertyValuesData(groupInstData);
             if(groupInstancePropertyValuesRes.isRight()){
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(groupInstancePropertyValuesRes.right().value()));
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(groupInstancePropertyValuesRes.right().value()));
             }
             buildGroupInstanceFromGroup(groupInstance, groupDefinition, groupInstancePropertyValuesRes.left().value());
-            Either<List<ImmutablePair<String, String>>, TitanOperationStatus> artifactsRes = getGroupArtifactsPairs(groupInstance.getUniqueId());
+            Either<List<ImmutablePair<String, String>>, JanusGraphOperationStatus> artifactsRes = getGroupArtifactsPairs(groupInstance.getUniqueId());
             if (artifactsRes.isRight()) {
-                TitanOperationStatus status = artifactsRes.right().value();
-                if (status != TitanOperationStatus.OK) {
-                    result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+                JanusGraphOperationStatus status = artifactsRes.right().value();
+                if (status != JanusGraphOperationStatus.OK) {
+                    result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
                     return result;
                 }
             } else {
@@ -175,11 +176,11 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
 
         try {
 
-            Either<PropertyValueData, TitanOperationStatus> eitherStatus = addPropertyToGroupInstance(groupInstanceProperty, groupInstanceId, index);
+            Either<PropertyValueData, JanusGraphOperationStatus> eitherStatus = addPropertyToGroupInstance(groupInstanceProperty, groupInstanceId, index);
 
             if (eitherStatus.isRight()) {
                 log.error("Failed to add property value {} to resource instance {} in Graph. status is {}", groupInstanceProperty, groupInstanceId, eitherStatus.right().value().name());
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(eitherStatus.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(eitherStatus.right().value()));
                 return result;
             } else {
                 PropertyValueData propertyValueData = eitherStatus.left().value();
@@ -187,9 +188,9 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
                 ComponentInstanceProperty propertyValueResult = propertyOperation.buildResourceInstanceProperty(propertyValueData, groupInstanceProperty);
                 log.debug("The returned GroupInstanceProperty is {}", propertyValueResult);
 
-                Either<String, TitanOperationStatus> findDefaultValue = propertyOperation.findDefaultValueFromSecondPosition(groupInstanceProperty.getPath(), groupInstanceProperty.getUniqueId(), groupInstanceProperty.getDefaultValue());
+                Either<String, JanusGraphOperationStatus> findDefaultValue = propertyOperation.findDefaultValueFromSecondPosition(groupInstanceProperty.getPath(), groupInstanceProperty.getUniqueId(), groupInstanceProperty.getDefaultValue());
                 if (findDefaultValue.isRight()) {
-                    result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(findDefaultValue.right().value()));
+                    result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(findDefaultValue.right().value()));
                     return result;
                 }
                 String defaultValue = findDefaultValue.left().value();
@@ -205,10 +206,10 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
             if (!inTransaction) {
                 if (result == null || result.isRight()) {
                     log.error("Going to execute rollback on graph.");
-                    titanGenericDao.rollback();
+                    janusGraphGenericDao.rollback();
                 } else {
                     log.debug("Going to execute commit on graph.");
-                    titanGenericDao.commit();
+                    janusGraphGenericDao.commit();
                 }
             }
         }
@@ -233,25 +234,27 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
      * @param index
      * @return
      */
-    public Either<PropertyValueData, TitanOperationStatus> addPropertyToGroupInstance(ComponentInstanceProperty groupInstanceProperty, String groupInstanceId, Integer index) {
+    public Either<PropertyValueData, JanusGraphOperationStatus> addPropertyToGroupInstance(ComponentInstanceProperty groupInstanceProperty, String groupInstanceId, Integer index) {
 
-        Either<GroupInstanceData, TitanOperationStatus> findResInstanceRes = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.GroupInstance), groupInstanceId, GroupInstanceData.class);
+        Either<GroupInstanceData, JanusGraphOperationStatus> findResInstanceRes = janusGraphGenericDao
+            .getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.GroupInstance), groupInstanceId, GroupInstanceData.class);
 
         if (findResInstanceRes.isRight()) {
-            TitanOperationStatus status = findResInstanceRes.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.INVALID_ID;
+            JanusGraphOperationStatus status = findResInstanceRes.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.INVALID_ID;
             }
             return Either.right(status);
         }
 
         String propertyId = groupInstanceProperty.getUniqueId();
-        Either<PropertyData, TitanOperationStatus> findPropertyDefRes = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Property), propertyId, PropertyData.class);
+        Either<PropertyData, JanusGraphOperationStatus> findPropertyDefRes = janusGraphGenericDao
+            .getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Property), propertyId, PropertyData.class);
 
         if (findPropertyDefRes.isRight()) {
-            TitanOperationStatus status = findPropertyDefRes.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.INVALID_ID;
+            JanusGraphOperationStatus status = findPropertyDefRes.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.INVALID_ID;
             }
             return Either.right(status);
         }
@@ -262,11 +265,11 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
             PropertyData propertyData = findPropertyDefRes.left().value();
             GroupInstanceData resourceInstanceData = findResInstanceRes.left().value();
 
-            ImmutablePair<TitanOperationStatus, String> isPropertyValueExists = propertyOperation.findPropertyValue(groupInstanceId, propertyId);
-            if (isPropertyValueExists.getLeft() == TitanOperationStatus.ALREADY_EXIST) {
+            ImmutablePair<JanusGraphOperationStatus, String> isPropertyValueExists = propertyOperation.findPropertyValue(groupInstanceId, propertyId);
+            if (isPropertyValueExists.getLeft() == JanusGraphOperationStatus.ALREADY_EXIST) {
                 log.debug("The property {} already added to the resource instance {}", propertyId, groupInstanceId);
                 groupInstanceProperty.setValueUniqueUid(isPropertyValueExists.getRight());
-                Either<PropertyValueData, TitanOperationStatus> updatePropertyOfResourceInstance = updatePropertyOfGroupInstance(groupInstanceProperty, groupInstanceId);
+                Either<PropertyValueData, JanusGraphOperationStatus> updatePropertyOfResourceInstance = updatePropertyOfGroupInstance(groupInstanceProperty, groupInstanceId);
                 if (updatePropertyOfResourceInstance.isRight()) {
                     BeEcompErrorManager.getInstance().logInternalFlowError(UPDATE_PROPERTY_VALUE_ON_COMPONENT_INSTANCE, FAILED_TO_UPDATE_PROPERTY_VALUE_ON_INSTANCE_STATUS_IS + updatePropertyOfResourceInstance.right().value(), ErrorSeverity.ERROR);
                     return Either.right(updatePropertyOfResourceInstance.right().value());
@@ -274,7 +277,7 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
                 return Either.left(updatePropertyOfResourceInstance.left().value());
             }
 
-            if (isPropertyValueExists.getLeft() != TitanOperationStatus.NOT_FOUND) {
+            if (isPropertyValueExists.getLeft() != JanusGraphOperationStatus.NOT_FOUND) {
                 log.debug("After finding property value of {} on componenet instance {}", propertyId, groupInstanceId);
                 return Either.right(isPropertyValueExists.getLeft());
             }
@@ -290,20 +293,20 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
                 SchemaDefinition def = propDataDef.getSchema();
                 if (def == null) {
                     log.debug("Schema doesn't exists for property of type {}", type);
-                    return Either.right(TitanOperationStatus.ILLEGAL_ARGUMENT);
+                    return Either.right(JanusGraphOperationStatus.ILLEGAL_ARGUMENT);
                 }
                 PropertyDataDefinition propDef = def.getProperty();
                 if (propDef == null) {
                     log.debug("Property in Schema Definition inside property of type {} doesn't exist", type);
-                    return Either.right(TitanOperationStatus.ILLEGAL_ARGUMENT);
+                    return Either.right(JanusGraphOperationStatus.ILLEGAL_ARGUMENT);
                 }
                 innerType = propDef.getType();
             }
 
             log.debug("Before validateAndUpdatePropertyValue");
-            Either<Map<String, DataTypeDefinition>, TitanOperationStatus> allDataTypes = dataTypeCache.getAll();
+            Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> allDataTypes = dataTypeCache.getAll();
             if (allDataTypes.isRight()) {
-                TitanOperationStatus status = allDataTypes.right().value();
+                JanusGraphOperationStatus status = allDataTypes.right().value();
                 BeEcompErrorManager.getInstance().logInternalFlowError(UPDATE_PROPERTY_VALUE_ON_COMPONENT_INSTANCE, FAILED_TO_UPDATE_PROPERTY_VALUE_ON_INSTANCE_STATUS_IS + status, ErrorSeverity.ERROR);
                 return Either.right(status);
             }
@@ -314,7 +317,7 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
             if (isValid.isRight()) {
                 Boolean res = isValid.right().value();
                 if (!res) {
-                    return Either.right(TitanOperationStatus.ILLEGAL_ARGUMENT);
+                    return Either.right(JanusGraphOperationStatus.ILLEGAL_ARGUMENT);
                 }
             } else {
                 Object object = isValid.left().value();
@@ -333,32 +336,35 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
             log.debug("After validateAndUpdateRules. pair = {}", pair);
             if (pair.getRight() != null && !pair.getRight()) {
                 BeEcompErrorManager.getInstance().logBeInvalidValueError("Add property value", pair.getLeft(), groupInstanceProperty.getName(), propertyType);
-                return Either.right(TitanOperationStatus.ILLEGAL_ARGUMENT);
+                return Either.right(JanusGraphOperationStatus.ILLEGAL_ARGUMENT);
             }
             propertyOperation.addRulesToNewPropertyValue(propertyValueData, groupInstanceProperty, groupInstanceId);
 
             log.debug("Before adding property value to graph {}", propertyValueData);
-            Either<PropertyValueData, TitanOperationStatus> createNodeResult = titanGenericDao.createNode(propertyValueData, PropertyValueData.class);
+            Either<PropertyValueData, JanusGraphOperationStatus> createNodeResult = janusGraphGenericDao
+                .createNode(propertyValueData, PropertyValueData.class);
             log.debug("After adding property value to graph {}", propertyValueData);
 
             if (createNodeResult.isRight()) {
-                TitanOperationStatus operationStatus = createNodeResult.right().value();
+                JanusGraphOperationStatus operationStatus = createNodeResult.right().value();
                 return Either.right(operationStatus);
             }
             propertyValueData = createNodeResult.left().value();
 
-            Either<GraphRelation, TitanOperationStatus> createRelResult = titanGenericDao.createRelation(propertyValueData, propertyData, GraphEdgeLabels.PROPERTY_IMPL, null);
+            Either<GraphRelation, JanusGraphOperationStatus> createRelResult = janusGraphGenericDao
+                .createRelation(propertyValueData, propertyData, GraphEdgeLabels.PROPERTY_IMPL, null);
 
             if (createRelResult.isRight()) {
-                TitanOperationStatus operationStatus = createRelResult.right().value();
+                JanusGraphOperationStatus operationStatus = createRelResult.right().value();
                 log.error("Failed to associate property value {} to property {} in graph. status is {}", uniqueId, propertyId, operationStatus);
                 return Either.right(operationStatus);
             }
 
-            createRelResult = titanGenericDao.createRelation(resourceInstanceData, propertyValueData, GraphEdgeLabels.PROPERTY_VALUE, null);
+            createRelResult = janusGraphGenericDao
+                .createRelation(resourceInstanceData, propertyValueData, GraphEdgeLabels.PROPERTY_VALUE, null);
 
             if (createRelResult.isRight()) {
-                TitanOperationStatus operationStatus = createRelResult.right().value();
+                JanusGraphOperationStatus operationStatus = createRelResult.right().value();
                 log.error("Failed to associate resource instance {} property value {} in graph. status is {}", groupInstanceId, uniqueId, operationStatus);
                 return Either.right(operationStatus);
             }
@@ -366,7 +372,7 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
             return Either.left(propertyValueData);
         } else {
             log.error("property value already exists.");
-            return Either.right(TitanOperationStatus.ALREADY_EXIST);
+            return Either.right(JanusGraphOperationStatus.ALREADY_EXIST);
         }
 
     }
@@ -376,9 +382,9 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
      *
      * @return
      */
-    public Either<PropertyValueData, TitanOperationStatus> updatePropertyOfGroupInstance(ComponentInstanceProperty groupInstanceProerty, String groupInstanceId) {
+    public Either<PropertyValueData, JanusGraphOperationStatus> updatePropertyOfGroupInstance(ComponentInstanceProperty groupInstanceProerty, String groupInstanceId) {
 
-        Wrapper<TitanOperationStatus> errorWrapper = new Wrapper<>();
+        Wrapper<JanusGraphOperationStatus> errorWrapper = new Wrapper<>();
         UpdateDataContainer<PropertyData, PropertyValueData> updateDataContainer = new UpdateDataContainer<>(GraphEdgeLabels.PROPERTY_IMPL, (() -> PropertyData.class), (() -> PropertyValueData.class), NodeTypeEnum.Property,
                 NodeTypeEnum.PropertyValue);
 
@@ -403,19 +409,19 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
                 SchemaDefinition def = propDataDef.getSchema();
                 if (def == null) {
                     log.debug("Schema doesn't exists for property of type {}", type);
-                    return Either.right(TitanOperationStatus.ILLEGAL_ARGUMENT);
+                    return Either.right(JanusGraphOperationStatus.ILLEGAL_ARGUMENT);
                 }
                 PropertyDataDefinition propDef = def.getProperty();
                 if (propDef == null) {
                     log.debug("Property in Schema Definition inside property of type {} doesn't exist", type);
-                    return Either.right(TitanOperationStatus.ILLEGAL_ARGUMENT);
+                    return Either.right(JanusGraphOperationStatus.ILLEGAL_ARGUMENT);
                 }
                 innerType = propDef.getType();
             }
             // Specific Update Logic
-            Either<Map<String, DataTypeDefinition>, TitanOperationStatus> allDataTypes = dataTypeCache.getAll();
+            Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> allDataTypes = dataTypeCache.getAll();
             if (allDataTypes.isRight()) {
-                TitanOperationStatus status = allDataTypes.right().value();
+                JanusGraphOperationStatus status = allDataTypes.right().value();
                 BeEcompErrorManager.getInstance().logInternalFlowError(UPDATE_PROPERTY_VALUE_ON_COMPONENT_INSTANCE, FAILED_TO_UPDATE_PROPERTY_VALUE_ON_INSTANCE_STATUS_IS + status, ErrorSeverity.ERROR);
                 return Either.right(status);
             }
@@ -425,7 +431,7 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
             if (isValid.isRight()) {
                 Boolean res = isValid.right().value();
                 if (!res) {
-                    return Either.right(TitanOperationStatus.ILLEGAL_ARGUMENT);
+                    return Either.right(JanusGraphOperationStatus.ILLEGAL_ARGUMENT);
                 }
             } else {
                 Object object = isValid.left().value();
@@ -440,13 +446,14 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
             ImmutablePair<String, Boolean> pair = propertyOperation.validateAndUpdateRules(propertyType, groupInstanceProerty.getRules(), innerType, allDataTypes.left().value(), true);
             if (pair.getRight() != null && !pair.getRight()) {
                 BeEcompErrorManager.getInstance().logBeInvalidValueError("Add property value", pair.getLeft(), groupInstanceProerty.getName(), propertyType);
-                return Either.right(TitanOperationStatus.ILLEGAL_ARGUMENT);
+                return Either.right(JanusGraphOperationStatus.ILLEGAL_ARGUMENT);
             }
             propertyOperation.updateRulesInPropertyValue(propertyValueData, groupInstanceProerty, groupInstanceId);
 
-            Either<PropertyValueData, TitanOperationStatus> updateRes = titanGenericDao.updateNode(propertyValueData, PropertyValueData.class);
+            Either<PropertyValueData, JanusGraphOperationStatus> updateRes = janusGraphGenericDao
+                .updateNode(propertyValueData, PropertyValueData.class);
             if (updateRes.isRight()) {
-                TitanOperationStatus status = updateRes.right().value();
+                JanusGraphOperationStatus status = updateRes.right().value();
                 return Either.right(status);
             } else {
                 return Either.left(updateRes.left().value());
@@ -505,7 +512,7 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
     }
 
     private <SomeData extends GraphNode, SomeValueData extends GraphNode> void preUpdateElementOfResourceInstanceValidations(UpdateDataContainer<SomeData, SomeValueData> updateDataContainer, IComponentInstanceConnectedElement resourceInstanceProerty,
-            String resourceInstanceId, Wrapper<TitanOperationStatus> errorWrapper) {
+            String resourceInstanceId, Wrapper<JanusGraphOperationStatus> errorWrapper) {
 
         if (errorWrapper.isEmpty()) {
             // Verify VFC instance Exist
@@ -529,14 +536,15 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
     }
 
     private <SomeData extends GraphNode, SomeValueData extends GraphNode> void validateElementConnectedToInstance(UpdateDataContainer<SomeData, SomeValueData> updateDataContainer, IComponentInstanceConnectedElement resourceInstanceProerty,
-            Wrapper<TitanOperationStatus> errorWrapper) {
-        Either<ImmutablePair<SomeData, GraphEdge>, TitanOperationStatus> child = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(updateDataContainer.getNodeTypeValue()), resourceInstanceProerty.getValueUniqueUid(),
+            Wrapper<JanusGraphOperationStatus> errorWrapper) {
+        Either<ImmutablePair<SomeData, GraphEdge>, JanusGraphOperationStatus> child = janusGraphGenericDao
+            .getChild(UniqueIdBuilder.getKeyByNodeType(updateDataContainer.getNodeTypeValue()), resourceInstanceProerty.getValueUniqueUid(),
                 updateDataContainer.getGraphEdge(), updateDataContainer.getNodeType(), updateDataContainer.getSomeDataClassGen().get());
 
         if (child.isRight()) {
-            TitanOperationStatus status = child.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.INVALID_ID;
+            JanusGraphOperationStatus status = child.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.INVALID_ID;
             }
             errorWrapper.setInnerElement(status);
 
@@ -546,16 +554,17 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
     }
 
     private <SomeValueData extends GraphNode, SomeData extends GraphNode> void validateElementConnectedToComponentInstanceExist(UpdateDataContainer<SomeData, SomeValueData> updateDataContainer,
-            IComponentInstanceConnectedElement resourceInstanceProerty, Wrapper<TitanOperationStatus> errorWrapper) {
+            IComponentInstanceConnectedElement resourceInstanceProerty, Wrapper<JanusGraphOperationStatus> errorWrapper) {
         String valueUniqueUid = resourceInstanceProerty.getValueUniqueUid();
         if (valueUniqueUid == null) {
-            errorWrapper.setInnerElement(TitanOperationStatus.INVALID_ID);
+            errorWrapper.setInnerElement(JanusGraphOperationStatus.INVALID_ID);
         } else {
-            Either<SomeValueData, TitanOperationStatus> findPropertyValueRes = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(updateDataContainer.getNodeTypeValue()), valueUniqueUid, updateDataContainer.getSomeValueDataClassGen().get());
+            Either<SomeValueData, JanusGraphOperationStatus> findPropertyValueRes = janusGraphGenericDao
+                .getNode(UniqueIdBuilder.getKeyByNodeType(updateDataContainer.getNodeTypeValue()), valueUniqueUid, updateDataContainer.getSomeValueDataClassGen().get());
             if (findPropertyValueRes.isRight()) {
-                TitanOperationStatus status = findPropertyValueRes.right().value();
-                if (status == TitanOperationStatus.NOT_FOUND) {
-                    status = TitanOperationStatus.INVALID_ID;
+                JanusGraphOperationStatus status = findPropertyValueRes.right().value();
+                if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                    status = JanusGraphOperationStatus.INVALID_ID;
                 }
                 errorWrapper.setInnerElement(status);
             } else {
@@ -565,31 +574,33 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
     }
 
     private <SomeData extends GraphNode, SomeValueData extends GraphNode> void validateElementConnectedToComponentExist(UpdateDataContainer<SomeData, SomeValueData> updateDataContainer,
-            IComponentInstanceConnectedElement resourceInstanceElementConnected, Wrapper<TitanOperationStatus> errorWrapper) {
+            IComponentInstanceConnectedElement resourceInstanceElementConnected, Wrapper<JanusGraphOperationStatus> errorWrapper) {
         String uniqueId = resourceInstanceElementConnected.getUniqueId();
-        Either<SomeData, TitanOperationStatus> findPropertyDefRes = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(updateDataContainer.getNodeType()), uniqueId, updateDataContainer.getSomeDataClassGen().get());
+        Either<SomeData, JanusGraphOperationStatus> findPropertyDefRes = janusGraphGenericDao
+            .getNode(UniqueIdBuilder.getKeyByNodeType(updateDataContainer.getNodeType()), uniqueId, updateDataContainer.getSomeDataClassGen().get());
 
         if (findPropertyDefRes.isRight()) {
-            TitanOperationStatus status = findPropertyDefRes.right().value();
+            JanusGraphOperationStatus status = findPropertyDefRes.right().value();
             errorWrapper.setInnerElement(status);
         }
     }
 
-    private void validateGIExist(String resourceInstanceId, Wrapper<TitanOperationStatus> errorWrapper) {
+    private void validateGIExist(String resourceInstanceId, Wrapper<JanusGraphOperationStatus> errorWrapper) {
         validateGIExist(resourceInstanceId, null, errorWrapper);
     }
 
-    private void validateGIExist(String resourceInstanceId, Wrapper<GroupInstanceData> compInsDataWrapper, Wrapper<TitanOperationStatus> errorWrapper) {
+    private void validateGIExist(String resourceInstanceId, Wrapper<GroupInstanceData> compInsDataWrapper, Wrapper<JanusGraphOperationStatus> errorWrapper) {
         validateElementExistInGraph(resourceInstanceId, NodeTypeEnum.GroupInstance, () -> GroupInstanceData.class, compInsDataWrapper, errorWrapper);
     }
 
     public <ElementData extends GraphNode> void validateElementExistInGraph(String elementUniqueId, NodeTypeEnum elementNodeType, Supplier<Class<ElementData>> elementClassGen, Wrapper<ElementData> elementDataWrapper,
-            Wrapper<TitanOperationStatus> errorWrapper) {
-        Either<ElementData, TitanOperationStatus> findResInstanceRes = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(elementNodeType), elementUniqueId, elementClassGen.get());
+            Wrapper<JanusGraphOperationStatus> errorWrapper) {
+        Either<ElementData, JanusGraphOperationStatus> findResInstanceRes = janusGraphGenericDao
+            .getNode(UniqueIdBuilder.getKeyByNodeType(elementNodeType), elementUniqueId, elementClassGen.get());
         if (findResInstanceRes.isRight()) {
-            TitanOperationStatus status = findResInstanceRes.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.INVALID_ID;
+            JanusGraphOperationStatus status = findResInstanceRes.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.INVALID_ID;
             }
             errorWrapper.setInnerElement(status);
         } else {
@@ -627,16 +638,17 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
         return updatedProperty;
     }
 
-    private Either<List<ImmutablePair<String, String>>, TitanOperationStatus> getGroupArtifactsPairs(String groupUniqueId) {
+    private Either<List<ImmutablePair<String, String>>, JanusGraphOperationStatus> getGroupArtifactsPairs(String groupUniqueId) {
 
-        Either<List<ImmutablePair<String, String>>, TitanOperationStatus> result = null;
+        Either<List<ImmutablePair<String, String>>, JanusGraphOperationStatus> result = null;
 
-        Either<List<ImmutablePair<ArtifactData, GraphEdge>>, TitanOperationStatus> childrenNodes = titanGenericDao.getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.GroupInstance), groupUniqueId, GraphEdgeLabels.GROUP_ARTIFACT_REF,
+        Either<List<ImmutablePair<ArtifactData, GraphEdge>>, JanusGraphOperationStatus> childrenNodes = janusGraphGenericDao
+            .getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.GroupInstance), groupUniqueId, GraphEdgeLabels.GROUP_ARTIFACT_REF,
                 NodeTypeEnum.ArtifactRef, ArtifactData.class);
         if (childrenNodes.isRight()) {
-            TitanOperationStatus status = childrenNodes.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.OK;
+            JanusGraphOperationStatus status = childrenNodes.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.OK;
             }
             result = Either.right(status);
 
@@ -696,24 +708,26 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
             for (GroupInstance groupDefinition : associatedGroups) {
                 UniqueIdData groupData = new UniqueIdData(NodeTypeEnum.GroupInstance, groupDefinition.getUniqueId());
 
-                Either<GraphRelation, TitanOperationStatus> deleteRelation = titanGenericDao.deleteRelation(groupData, oldArtifactData, GraphEdgeLabels.GROUP_ARTIFACT_REF);
+                Either<GraphRelation, JanusGraphOperationStatus> deleteRelation = janusGraphGenericDao
+                    .deleteRelation(groupData, oldArtifactData, GraphEdgeLabels.GROUP_ARTIFACT_REF);
                 log.trace("After dissociate group {} from artifact {}", groupDefinition.getName(), oldArtifactId);
                 if (deleteRelation.isRight()) {
-                    TitanOperationStatus status = deleteRelation.right().value();
-                    if (status == TitanOperationStatus.NOT_FOUND) {
-                        status = TitanOperationStatus.INVALID_ID;
+                    JanusGraphOperationStatus status = deleteRelation.right().value();
+                    if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                        status = JanusGraphOperationStatus.INVALID_ID;
                     }
-                    return DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+                    return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
                 }
 
-                Either<GraphRelation, TitanOperationStatus> createRelation = titanGenericDao.createRelation(groupData, newArtifactData, GraphEdgeLabels.GROUP_ARTIFACT_REF, props);
+                Either<GraphRelation, JanusGraphOperationStatus> createRelation = janusGraphGenericDao
+                    .createRelation(groupData, newArtifactData, GraphEdgeLabels.GROUP_ARTIFACT_REF, props);
                 log.trace("After associate group {} to artifact {}", groupDefinition.getName(), newArtifact.getUniqueIdKey());
                 if (createRelation.isRight()) {
-                    TitanOperationStatus status = createRelation.right().value();
-                    if (status == TitanOperationStatus.NOT_FOUND) {
-                        status = TitanOperationStatus.INVALID_ID;
+                    JanusGraphOperationStatus status = createRelation.right().value();
+                    if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                        status = JanusGraphOperationStatus.INVALID_ID;
                     }
-                    return DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+                    return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
                 }
             }
 
@@ -721,17 +735,17 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
         return StorageOperationStatus.OK;
     }
 
-    private Either<Map<String, PropertyValueData>, TitanOperationStatus> getAllGroupInstancePropertyValuesData(GroupInstanceData groupInstData) {
+    private Either<Map<String, PropertyValueData>, JanusGraphOperationStatus> getAllGroupInstancePropertyValuesData(GroupInstanceData groupInstData) {
 
-        Either<Map<String, PropertyValueData>, TitanOperationStatus> result = null;
+        Either<Map<String, PropertyValueData>, JanusGraphOperationStatus> result = null;
         try{
-            Either<List<ImmutablePair<PropertyValueData, GraphEdge>>, TitanOperationStatus> getPropertyValueChildrenRes =
-                    titanGenericDao.getChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), groupInstData.getUniqueId(), GraphEdgeLabels.PROPERTY_VALUE,
+            Either<List<ImmutablePair<PropertyValueData, GraphEdge>>, JanusGraphOperationStatus> getPropertyValueChildrenRes =
+                    janusGraphGenericDao.getChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), groupInstData.getUniqueId(), GraphEdgeLabels.PROPERTY_VALUE,
                             NodeTypeEnum.PropertyValue, PropertyValueData.class, true);
             if(getPropertyValueChildrenRes.isRight()){
-                TitanOperationStatus status = getPropertyValueChildrenRes.right().value();
+                JanusGraphOperationStatus status = getPropertyValueChildrenRes.right().value();
                 log.debug("Failed to fetch property value nodes for group instance {}. Status is {}. ", groupInstData.getName(), status);
-                if(status == TitanOperationStatus.NOT_FOUND){
+                if(status == JanusGraphOperationStatus.NOT_FOUND){
                     result = Either.left(null);
                 }else{
                     result = Either.right(status);
@@ -743,7 +757,7 @@ public class GroupInstanceOperation extends AbstractOperation implements IGroupI
         } catch(Exception e){
             log.debug("The Exception occured during fetch group instance () property values. The message is {}. ", groupInstData.getName(), e.getMessage(), e);
             if(result == null){
-                result = Either.right(TitanOperationStatus.GENERAL_ERROR);
+                result = Either.right(JanusGraphOperationStatus.GENERAL_ERROR);
             }
         }
         return result;
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GroupOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GroupOperation.java
index 11878376f5..c8135ad54b 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GroupOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GroupOperation.java
@@ -25,19 +25,19 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.dao.utils.MapUtil;
 import org.openecomp.sdc.be.datatypes.elements.GroupDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.cache.ApplicationDataTypeCache;
-import org.openecomp.sdc.be.model.jsontitan.operations.TopologyTemplateOperation;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.TopologyTemplateOperation;
 import org.openecomp.sdc.be.model.operations.StorageException;
 import org.openecomp.sdc.be.model.operations.api.IGroupOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
@@ -58,14 +58,14 @@ public class GroupOperation extends AbstractOperation implements IGroupOperation
 
 
     private static final Logger log = Logger.getLogger(GroupOperation.class.getName());
-	private final TitanDao titanDao;
+	private final JanusGraphDao janusGraphDao;
 	private final TopologyTemplateOperation topologyTemplateOperation;
     private final PropertyOperation propertyOperation;
     private final GroupTypeOperation groupTypeOperation;
     private final ApplicationDataTypeCache dataTypeCache;
 
-    public GroupOperation(TitanDao titanDao, TopologyTemplateOperation topologyTemplateOperation, PropertyOperation propertyOperation, GroupTypeOperation groupTypeOperation, ApplicationDataTypeCache dataTypeCache) {
-        this.titanDao = titanDao;
+    public GroupOperation(JanusGraphDao janusGraphDao, TopologyTemplateOperation topologyTemplateOperation, PropertyOperation propertyOperation, GroupTypeOperation groupTypeOperation, ApplicationDataTypeCache dataTypeCache) {
+        this.janusGraphDao = janusGraphDao;
         this.topologyTemplateOperation = topologyTemplateOperation;
         this.propertyOperation = propertyOperation;
         this.groupTypeOperation = groupTypeOperation;
@@ -83,17 +83,18 @@ public class GroupOperation extends AbstractOperation implements IGroupOperation
      * @param groupUniqueId
      * @return
      */
-    private Either<Map<String, String>, TitanOperationStatus> getGroupMembers(String groupUniqueId) {
+    private Either<Map<String, String>, JanusGraphOperationStatus> getGroupMembers(String groupUniqueId) {
 
-        Either<Map<String, String>, TitanOperationStatus> result = null;
+        Either<Map<String, String>, JanusGraphOperationStatus> result = null;
 
-        Either<List<ImmutablePair<ComponentInstanceData, GraphEdge>>, TitanOperationStatus> childrenNodes = titanGenericDao.getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Group), groupUniqueId, GraphEdgeLabels.GROUP_MEMBER,
+        Either<List<ImmutablePair<ComponentInstanceData, GraphEdge>>, JanusGraphOperationStatus> childrenNodes = janusGraphGenericDao
+            .getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Group), groupUniqueId, GraphEdgeLabels.GROUP_MEMBER,
                 NodeTypeEnum.ResourceInstance, ComponentInstanceData.class);
 
         if (childrenNodes.isRight()) {
-            TitanOperationStatus status = childrenNodes.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.OK;
+            JanusGraphOperationStatus status = childrenNodes.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.OK;
             }
             result = Either.right(status);
 
@@ -119,10 +120,11 @@ public class GroupOperation extends AbstractOperation implements IGroupOperation
 
     private Either<GroupTypeDefinition, StorageOperationStatus> getGroupTypeOfGroup(String groupUniqueId) {
 
-        Either<ImmutablePair<GroupTypeData, GraphEdge>, StorageOperationStatus> groupTypeRes = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Group), groupUniqueId, GraphEdgeLabels.TYPE_OF, NodeTypeEnum.GroupType,
+        Either<ImmutablePair<GroupTypeData, GraphEdge>, StorageOperationStatus> groupTypeRes = janusGraphGenericDao
+            .getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Group), groupUniqueId, GraphEdgeLabels.TYPE_OF, NodeTypeEnum.GroupType,
                 GroupTypeData.class)
                 .right()
-                .map(DaoStatusConverter::convertTitanStatusToStorageStatus);
+                .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
 
         if (groupTypeRes.isRight()) {
             StorageOperationStatus status = groupTypeRes.right().value();
@@ -169,10 +171,11 @@ public class GroupOperation extends AbstractOperation implements IGroupOperation
         Map<String, PropertyDefinition> uidToPropDefMap = groupTypeProperties.stream().collect(Collectors.toMap(PropertyDefinition::getUniqueId, Function.identity()));
 
         // Find all properties values on the group
-        Either<List<ImmutablePair<PropertyValueData, GraphEdge>>, StorageOperationStatus> propertyImplNodes = titanGenericDao.getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Group), groupUid, GraphEdgeLabels.PROPERTY_VALUE,
+        Either<List<ImmutablePair<PropertyValueData, GraphEdge>>, StorageOperationStatus> propertyImplNodes = janusGraphGenericDao
+            .getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Group), groupUid, GraphEdgeLabels.PROPERTY_VALUE,
                 NodeTypeEnum.PropertyValue, PropertyValueData.class)
                 .right()
-                .map(DaoStatusConverter::convertTitanStatusToStorageStatus);
+                .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
 
         if (propertyImplNodes.isRight()) {
             StorageOperationStatus status = propertyImplNodes.right().value();
@@ -197,10 +200,11 @@ public class GroupOperation extends AbstractOperation implements IGroupOperation
             String propertyValueUid = propertyValueData.getUniqueId();
             String value = propertyValueData.getValue();
 
-            Either<ImmutablePair<PropertyData, GraphEdge>, StorageOperationStatus> propertyDefRes = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.PropertyValue), propertyValueUid, GraphEdgeLabels.PROPERTY_IMPL,
+            Either<ImmutablePair<PropertyData, GraphEdge>, StorageOperationStatus> propertyDefRes = janusGraphGenericDao
+                .getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.PropertyValue), propertyValueUid, GraphEdgeLabels.PROPERTY_IMPL,
                     NodeTypeEnum.Property, PropertyData.class)
                     .right()
-                    .map(DaoStatusConverter::convertTitanStatusToStorageStatus);
+                    .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
             if (propertyDefRes.isRight()) {
                 StorageOperationStatus status = propertyDefRes.right().value();
                 if (status == StorageOperationStatus.NOT_FOUND) {
@@ -262,9 +266,10 @@ public class GroupOperation extends AbstractOperation implements IGroupOperation
             UniqueIdData artifactData = new UniqueIdData(NodeTypeEnum.ArtifactRef, artifactId);
             for (GroupDefinition groupDefinition : associatedGroups) {
                 UniqueIdData groupData = new UniqueIdData(NodeTypeEnum.Group, groupDefinition.getUniqueId());
-                Either<GraphRelation, StorageOperationStatus> deleteRelation = titanGenericDao.deleteRelation(groupData, artifactData, GraphEdgeLabels.GROUP_ARTIFACT_REF)
+                Either<GraphRelation, StorageOperationStatus> deleteRelation = janusGraphGenericDao
+                    .deleteRelation(groupData, artifactData, GraphEdgeLabels.GROUP_ARTIFACT_REF)
                         .right()
-                        .map(DaoStatusConverter::convertTitanStatusToStorageStatus);
+                        .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
                 if (deleteRelation.isRight()) {
                     StorageOperationStatus status = deleteRelation.right().value();
                     if (status == StorageOperationStatus.NOT_FOUND) {
@@ -289,9 +294,10 @@ public class GroupOperation extends AbstractOperation implements IGroupOperation
 
         Either<GroupDefinition, StorageOperationStatus> result = null;
 
-        Either<GroupData, StorageOperationStatus> groupRes = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Group), uniqueId, GroupData.class)
+        Either<GroupData, StorageOperationStatus> groupRes = janusGraphGenericDao
+            .getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Group), uniqueId, GroupData.class)
                 .right()
-                .map(DaoStatusConverter::convertTitanStatusToStorageStatus);
+                .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
         if (groupRes.isRight()) {
             StorageOperationStatus status = groupRes.right().value();
             log.debug("Failed to retrieve group {}  from graph. Status is {}", uniqueId, status);
@@ -321,7 +327,7 @@ public class GroupOperation extends AbstractOperation implements IGroupOperation
         if (!skipMembers) {
             Either<Map<String, String>, StorageOperationStatus> membersRes = getGroupMembers(uniqueId)
                     .right()
-                    .map(DaoStatusConverter::convertTitanStatusToStorageStatus);
+                    .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
             if (membersRes.isRight()) {
                 StorageOperationStatus status = membersRes.right().value();
                 if (status != StorageOperationStatus.OK) {
@@ -351,7 +357,7 @@ public class GroupOperation extends AbstractOperation implements IGroupOperation
         if (!skipArtifacts) {
             Either<List<ImmutablePair<String, String>>, StorageOperationStatus> artifactsRes = getGroupArtifactsPairs(uniqueId)
                     .right()
-                    .map(DaoStatusConverter::convertTitanStatusToStorageStatus);
+                    .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
             if (artifactsRes.isRight()) {
                 StorageOperationStatus status = artifactsRes.right().value();
                 if (status != StorageOperationStatus.OK) {
@@ -384,12 +390,13 @@ public class GroupOperation extends AbstractOperation implements IGroupOperation
     @Override
     public boolean isGroupExist(String groupName, boolean inTransaction) {
 
-        Either<List<GroupData>, TitanOperationStatus> eitherGroup = null;
+        Either<List<GroupData>, JanusGraphOperationStatus> eitherGroup = null;
         try {
             Map<String, Object> properties = new HashMap<>();
             properties.put(GraphPropertiesDictionary.NAME.getProperty(), groupName);
 
-            eitherGroup = titanGenericDao.getByCriteria(NodeTypeEnum.Group, properties, GroupData.class);
+            eitherGroup = janusGraphGenericDao
+                .getByCriteria(NodeTypeEnum.Group, properties, GroupData.class);
             return eitherGroup.isLeft() && !eitherGroup.left().value().isEmpty();
 
         } finally {
@@ -401,10 +408,11 @@ public class GroupOperation extends AbstractOperation implements IGroupOperation
 
         List<GroupDefinition> groups = new ArrayList<>();
 
-        Either<List<ImmutablePair<GroupData, GraphEdge>>, StorageOperationStatus> childrenNodes = titanGenericDao.getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(componentTypeEnum), componentId, GraphEdgeLabels.GROUP, NodeTypeEnum.Group,
+        Either<List<ImmutablePair<GroupData, GraphEdge>>, StorageOperationStatus> childrenNodes = janusGraphGenericDao
+            .getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(componentTypeEnum), componentId, GraphEdgeLabels.GROUP, NodeTypeEnum.Group,
                 GroupData.class)
                 .right()
-                .map(DaoStatusConverter::convertTitanStatusToStorageStatus);
+                .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
 
         if (childrenNodes.isRight()) {
             StorageOperationStatus status = childrenNodes.right().value();
@@ -467,9 +475,10 @@ public class GroupOperation extends AbstractOperation implements IGroupOperation
             for (GroupDefinition groupDefinition : associatedGroups) {
                 UniqueIdData groupData = new UniqueIdData(NodeTypeEnum.Group, groupDefinition.getUniqueId());
 
-                Either<GraphRelation, StorageOperationStatus> deleteRelation = titanGenericDao.deleteRelation(groupData, oldArtifactData, GraphEdgeLabels.GROUP_ARTIFACT_REF)
+                Either<GraphRelation, StorageOperationStatus> deleteRelation = janusGraphGenericDao
+                    .deleteRelation(groupData, oldArtifactData, GraphEdgeLabels.GROUP_ARTIFACT_REF)
                         .right()
-                        .map(DaoStatusConverter::convertTitanStatusToStorageStatus);
+                        .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
                 log.trace("After dissociate group {} from artifact {}"  , groupDefinition.getName(), oldArtifactId);
                 if (deleteRelation.isRight()) {
                     StorageOperationStatus status = deleteRelation.right().value();
@@ -479,9 +488,10 @@ public class GroupOperation extends AbstractOperation implements IGroupOperation
                     return status;
                 }
 
-                Either<GraphRelation, StorageOperationStatus> createRelation = titanGenericDao.createRelation(groupData, newArtifactData, GraphEdgeLabels.GROUP_ARTIFACT_REF, props)
+                Either<GraphRelation, StorageOperationStatus> createRelation = janusGraphGenericDao
+                    .createRelation(groupData, newArtifactData, GraphEdgeLabels.GROUP_ARTIFACT_REF, props)
                         .right()
-                        .map(DaoStatusConverter::convertTitanStatusToStorageStatus);
+                        .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
                 log.trace("After associate group {} to artifact {}" , groupDefinition.getName(), newArtifact.getUniqueIdKey());
                 if (createRelation.isRight()) {
                     StorageOperationStatus status = createRelation.right().value();
@@ -516,25 +526,26 @@ public class GroupOperation extends AbstractOperation implements IGroupOperation
                 if (result == null || result != StorageOperationStatus.OK) {
                     log.debug("Going to execute rollback on graph.");
                     BeEcompErrorManager.getInstance().logBeExecuteRollbackError("Rollback on graph");
-                    titanGenericDao.rollback();
+                    janusGraphGenericDao.rollback();
                 } else {
                     log.debug("Going to execute commit on graph.");
-                    titanGenericDao.commit();
+                    janusGraphGenericDao.commit();
                 }
             }
         }
     }
 
-    private Either<List<ImmutablePair<String, String>>, TitanOperationStatus> getGroupArtifactsPairs(String groupUniqueId) {
+    private Either<List<ImmutablePair<String, String>>, JanusGraphOperationStatus> getGroupArtifactsPairs(String groupUniqueId) {
 
-        Either<List<ImmutablePair<String, String>>, TitanOperationStatus> result = null;
+        Either<List<ImmutablePair<String, String>>, JanusGraphOperationStatus> result = null;
 
-        Either<List<ImmutablePair<ArtifactData, GraphEdge>>, TitanOperationStatus> childrenNodes = titanGenericDao.getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Group), groupUniqueId, GraphEdgeLabels.GROUP_ARTIFACT_REF,
+        Either<List<ImmutablePair<ArtifactData, GraphEdge>>, JanusGraphOperationStatus> childrenNodes = janusGraphGenericDao
+            .getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Group), groupUniqueId, GraphEdgeLabels.GROUP_ARTIFACT_REF,
                 NodeTypeEnum.ArtifactRef, ArtifactData.class);
         if (childrenNodes.isRight()) {
-            TitanOperationStatus status = childrenNodes.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.OK;
+            JanusGraphOperationStatus status = childrenNodes.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.OK;
             }
             result = Either.right(status);
 
@@ -565,12 +576,12 @@ public class GroupOperation extends AbstractOperation implements IGroupOperation
 
         StorageOperationStatus result = null;
         String innerType = property.getSchema() == null ? null : property.getSchema().getProperty() == null ? null : property.getSchema().getProperty().getType();
-        Either<Map<String, DataTypeDefinition>, TitanOperationStatus> allDataTypes = dataTypeCache.getAll();
+        Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> allDataTypes = dataTypeCache.getAll();
         Either<Object, Boolean> isValid = null;
         if (allDataTypes.isRight()) {
-            TitanOperationStatus status = allDataTypes.right().value();
+            JanusGraphOperationStatus status = allDataTypes.right().value();
             log.debug("Failed to fetch data types from cache. Status is {}. ", status);
-            result = DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+            result = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
         }
         if(result == null){
             isValid = propertyOperation.validateAndUpdatePropertyValue(property.getType(), property.getValue(), innerType, allDataTypes.left().value());
@@ -591,9 +602,9 @@ public class GroupOperation extends AbstractOperation implements IGroupOperation
 		log.debug("#updateGroupProperties - updating the properties of group {} in component {}", groupId, containerComponent.getUniqueId());
 		Optional<GroupDefinition> group = containerComponent.getGroupById(groupId);
 		if (group.isPresent()){
-			return titanDao.getVertexById(containerComponent.getUniqueId(), JsonParseFlagEnum.NoParse)
+			return janusGraphDao.getVertexById(containerComponent.getUniqueId(), JsonParseFlagEnum.NoParse)
 					.either(containerVertex -> updateGroupProperties(containerVertex, group.get(), propertiesToUpdate),
-							DaoStatusConverter::convertTitanStatusToStorageStatus);
+							DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
 		} else {
 			throw new StorageException(StorageOperationStatus.NOT_FOUND, groupId);
 		}
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GroupTypeOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GroupTypeOperation.java
index 1817868255..430ba59e75 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GroupTypeOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GroupTypeOperation.java
@@ -21,7 +21,7 @@
 package org.openecomp.sdc.be.model.operations.impl;
 
 import com.google.common.base.Strings;
-import com.thinkaurelius.titan.graphdb.query.TitanPredicate;
+import org.janusgraph.graphdb.query.JanusGraphPredicate;
 import fj.data.Either;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
@@ -30,11 +30,11 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgePropertiesDictionary;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.GroupTypeDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.CapabilityDefinition;
@@ -54,7 +54,7 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static org.openecomp.sdc.be.dao.titan.TitanUtils.buildNotInPredicate;
+import static org.openecomp.sdc.be.dao.janusgraph.JanusGraphUtils.buildNotInPredicate;
 
 @Component("group-type-operation")
 public class GroupTypeOperation implements IGroupTypeOperation {
@@ -63,19 +63,19 @@ public class GroupTypeOperation implements IGroupTypeOperation {
     private static final String CREATE_FLOW_CONTEXT = "CreateGroupType";
 
     private final PropertyOperation propertyOperation;
-    private final TitanGenericDao titanGenericDao;
+    private final JanusGraphGenericDao janusGraphGenericDao;
     private final CapabilityTypeOperation capabilityTypeOperation;
     private final CapabilityOperation capabilityOperation;
     private final DerivedFromOperation derivedFromOperation;
     private final OperationUtils operationUtils;
 
 
-    public GroupTypeOperation(TitanGenericDao titanGenericDao,
+    public GroupTypeOperation(JanusGraphGenericDao janusGraphGenericDao,
                               PropertyOperation propertyOperation,
                               CapabilityTypeOperation capabilityTypeOperation,
                               CapabilityOperation capabilityOperation,
                               DerivedFromOperation derivedFromOperation, OperationUtils operationUtils) {
-        this.titanGenericDao = titanGenericDao;
+        this.janusGraphGenericDao = janusGraphGenericDao;
         this.propertyOperation = propertyOperation;
         this.capabilityTypeOperation = capabilityTypeOperation;
         this.capabilityOperation = capabilityOperation;
@@ -101,11 +101,11 @@ public class GroupTypeOperation implements IGroupTypeOperation {
 
         try {
 
-            Either<GroupTypeData, TitanOperationStatus> eitherStatus = addGroupTypeToGraph(groupTypeDefinition);
+            Either<GroupTypeData, JanusGraphOperationStatus> eitherStatus = addGroupTypeToGraph(groupTypeDefinition);
 
             if (eitherStatus.isRight()) {
                 BeEcompErrorManager.getInstance().logBeFailedCreateNodeError(CREATE_FLOW_CONTEXT, groupTypeDefinition.getType(), eitherStatus.right().value().name());
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(eitherStatus.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(eitherStatus.right().value()));
             }
             else {
                 result = getGroupType(eitherStatus.left().value().getUniqueId(), inTransaction);
@@ -114,7 +114,7 @@ public class GroupTypeOperation implements IGroupTypeOperation {
             return result;
 
         } finally {
-            titanGenericDao.handleTransactionCommitRollback(inTransaction, result);
+            janusGraphGenericDao.handleTransactionCommitRollback(inTransaction, result);
         }
 
     }
@@ -127,16 +127,17 @@ public class GroupTypeOperation implements IGroupTypeOperation {
     
     
     public Either<GroupTypeDefinition, StorageOperationStatus> validateUpdateProperties(GroupTypeDefinition groupTypeDefinition) {
-        TitanOperationStatus error = null;
+        JanusGraphOperationStatus error = null;
         if (CollectionUtils.isNotEmpty(groupTypeDefinition.getProperties()) && !Strings.isNullOrEmpty(groupTypeDefinition.getDerivedFrom())) {
-            Either<Map<String, PropertyDefinition>, TitanOperationStatus> allPropertiesRes = 
+            Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> allPropertiesRes =
                                         getAllGroupTypePropertiesFromAllDerivedFrom(groupTypeDefinition.getDerivedFrom());
-            if (allPropertiesRes.isRight() && !allPropertiesRes.right().value().equals(TitanOperationStatus.NOT_FOUND)) {
+            if (allPropertiesRes.isRight() && !allPropertiesRes.right().value().equals(
+                JanusGraphOperationStatus.NOT_FOUND)) {
                 error = allPropertiesRes.right().value();
                 log.debug("Couldn't fetch derived from property nodes for group type {}, error: {}", groupTypeDefinition.getType(), error);
             }
             if (error == null && !allPropertiesRes.left().value().isEmpty()) {
-                Either<List<PropertyDefinition>, TitanOperationStatus> validatePropertiesRes = propertyOperation.validatePropertiesUniqueness(allPropertiesRes.left().value(),
+                Either<List<PropertyDefinition>, JanusGraphOperationStatus> validatePropertiesRes = propertyOperation.validatePropertiesUniqueness(allPropertiesRes.left().value(),
                         groupTypeDefinition.getProperties());
                 if (validatePropertiesRes.isRight()) {
                     error = validatePropertiesRes.right().value();
@@ -146,11 +147,12 @@ public class GroupTypeOperation implements IGroupTypeOperation {
         if (error == null) {
             return Either.left(groupTypeDefinition);
         }
-        return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(error));
+        return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(error));
     }
     
-    private Either<Map<String, PropertyDefinition>, TitanOperationStatus> getAllGroupTypePropertiesFromAllDerivedFrom(String firstParentType) {
-        return titanGenericDao.getNode(GraphPropertiesDictionary.TYPE.getProperty(), firstParentType, GroupTypeData.class)
+    private Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> getAllGroupTypePropertiesFromAllDerivedFrom(String firstParentType) {
+        return janusGraphGenericDao
+            .getNode(GraphPropertiesDictionary.TYPE.getProperty(), firstParentType, GroupTypeData.class)
                     .left()
                     .bind(parentGroup -> propertyOperation.getAllTypePropertiesFromAllDerivedFrom(parentGroup.getUniqueId(), NodeTypeEnum.GroupType, GroupTypeData.class));
     }
@@ -185,8 +187,8 @@ public class GroupTypeOperation implements IGroupTypeOperation {
             }
         }
 
-        TitanOperationStatus createCapResult = createCapabilities(new GroupTypeData(groupTypeDef), newGroupTypeCapabilities);
-        return DaoStatusConverter.convertTitanStatusToStorageStatus(createCapResult);
+        JanusGraphOperationStatus createCapResult = createCapabilities(new GroupTypeData(groupTypeDef), newGroupTypeCapabilities);
+        return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(createCapResult);
     }
 
     /**
@@ -239,9 +241,9 @@ public class GroupTypeOperation implements IGroupTypeOperation {
                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue) ): null;
     }
 
-    private TitanOperationStatus createCapabilities(GroupTypeData groupTypeData, Map<String, CapabilityDefinition> groupCapabilities) {
+    private JanusGraphOperationStatus createCapabilities(GroupTypeData groupTypeData, Map<String, CapabilityDefinition> groupCapabilities) {
         if (MapUtils.isEmpty(groupCapabilities)) {
-            return TitanOperationStatus.OK;
+            return JanusGraphOperationStatus.OK;
         }
         
         return groupCapabilities.values().stream()
@@ -249,11 +251,11 @@ public class GroupTypeOperation implements IGroupTypeOperation {
                 .filter(Either::isRight)
                 .findFirst()
                 .map(either -> either.right().value())
-                .orElse(TitanOperationStatus.OK);
+                .orElse(JanusGraphOperationStatus.OK);
     }
 
-    private Either<GraphRelation, TitanOperationStatus> createCapability(GroupTypeData groupTypeData, CapabilityDefinition  capabilityDef) {
-        Either<CapabilityTypeDefinition, TitanOperationStatus> eitherCapData = capabilityTypeOperation.getCapabilityTypeByType(capabilityDef.getType());
+    private Either<GraphRelation, JanusGraphOperationStatus> createCapability(GroupTypeData groupTypeData, CapabilityDefinition  capabilityDef) {
+        Either<CapabilityTypeDefinition, JanusGraphOperationStatus> eitherCapData = capabilityTypeOperation.getCapabilityTypeByType(capabilityDef.getType());
         return eitherCapData
                 .left()
                 .map(CapabilityTypeData::new)
@@ -270,15 +272,15 @@ public class GroupTypeOperation implements IGroupTypeOperation {
      * @return
      */
     private Either<List<CapabilityDefinition>, StorageOperationStatus> getCapablities(String groupTypeId) {
-        Either<List<ImmutablePair<CapabilityData, GraphEdge>>, TitanOperationStatus> groupCapabilitiesOnGraph =
-                titanGenericDao.getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.GroupType), groupTypeId, GraphEdgeLabels.GROUP_TYPE_CAPABILITY, NodeTypeEnum.Capability, CapabilityData.class, true);
+        Either<List<ImmutablePair<CapabilityData, GraphEdge>>, JanusGraphOperationStatus> groupCapabilitiesOnGraph =
+                janusGraphGenericDao.getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.GroupType), groupTypeId, GraphEdgeLabels.GROUP_TYPE_CAPABILITY, NodeTypeEnum.Capability, CapabilityData.class, true);
 
         if (groupCapabilitiesOnGraph.isRight()) {
-            TitanOperationStatus capabilityStatus = groupCapabilitiesOnGraph.right().value();
-            if (capabilityStatus == TitanOperationStatus.NOT_FOUND) {
+            JanusGraphOperationStatus capabilityStatus = groupCapabilitiesOnGraph.right().value();
+            if (capabilityStatus == JanusGraphOperationStatus.NOT_FOUND) {
                 return Either.left(Collections.emptyList());
             }
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(capabilityStatus));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(capabilityStatus));
         }
 
         List<ImmutablePair<CapabilityData, GraphEdge>> groupCapabilites = groupCapabilitiesOnGraph.left().value();
@@ -286,26 +288,27 @@ public class GroupTypeOperation implements IGroupTypeOperation {
 
         return capabilityOperation.getCapabilitiesWithProps(groupCapabilites)
                 .right()
-                .map(DaoStatusConverter::convertTitanStatusToStorageStatus);
+                .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
     }
 
     private void fillCapabilityName(ImmutablePair<CapabilityData, GraphEdge> pair) {
         pair.getLeft().getCapabilityDataDefinition().setName((String)pair.getRight().getProperties().get(GraphEdgePropertiesDictionary.NAME.getProperty()));
     }
 
-    private Either<GraphRelation, TitanOperationStatus> connectToCapability(GroupTypeData groupTypeData, CapabilityData capabilityData, String capabilityName) {
+    private Either<GraphRelation, JanusGraphOperationStatus> connectToCapability(GroupTypeData groupTypeData, CapabilityData capabilityData, String capabilityName) {
         Map<String, Object> properties = new HashMap<>();
         properties.put(GraphEdgePropertiesDictionary.NAME.getProperty(), capabilityName);
 
-        return titanGenericDao.createRelation(groupTypeData, capabilityData, GraphEdgeLabels.GROUP_TYPE_CAPABILITY, properties);
+        return janusGraphGenericDao.createRelation(groupTypeData, capabilityData, GraphEdgeLabels.GROUP_TYPE_CAPABILITY, properties);
     }
 
 
     public List<GroupTypeDefinition> getAllGroupTypes(Set<String> excludedGroupTypes) {
-        Map<String, Map.Entry<TitanPredicate, Object>> predicateCriteria = buildNotInPredicate(GraphPropertiesDictionary.TYPE.getProperty(), excludedGroupTypes);
-        List<GroupTypeData> groupTypes = titanGenericDao.getByCriteriaWithPredicate(NodeTypeEnum.GroupType, predicateCriteria, GroupTypeData.class)
+        Map<String, Map.Entry<JanusGraphPredicate, Object>> predicateCriteria = buildNotInPredicate(GraphPropertiesDictionary.TYPE.getProperty(), excludedGroupTypes);
+        List<GroupTypeData> groupTypes = janusGraphGenericDao
+            .getByCriteriaWithPredicate(NodeTypeEnum.GroupType, predicateCriteria, GroupTypeData.class)
                 .left()
-                .on(operationUtils::onTitanOperationFailure);
+                .on(operationUtils::onJanusGraphOperationFailure);
         return convertGroupTypesToDefinition(groupTypes);
     }
 
@@ -319,9 +322,10 @@ public class GroupTypeOperation implements IGroupTypeOperation {
 
     public Either<GroupTypeDefinition, StorageOperationStatus> getGroupTypeByUid(String uniqueId) {
         log.debug("#getGroupTypeByUid - fetching group type with id {}", uniqueId);
-        return titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.GroupType), uniqueId, GroupTypeData.class)
+        return janusGraphGenericDao
+            .getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.GroupType), uniqueId, GroupTypeData.class)
                 .right()
-                .map(DaoStatusConverter::convertTitanStatusToStorageStatus)
+                .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus)
                 .left()
                 .bind(groupType -> buildGroupTypeDefinition(uniqueId, groupType));
     }
@@ -346,7 +350,7 @@ public class GroupTypeOperation implements IGroupTypeOperation {
 
             return result;
         } finally {
-            titanGenericDao.handleTransactionCommitRollback(inTransaction, result);
+            janusGraphGenericDao.handleTransactionCommitRollback(inTransaction, result);
         }
 
     }
@@ -375,9 +379,10 @@ public class GroupTypeOperation implements IGroupTypeOperation {
                 return result;
             }
 
-            Either<List<GroupTypeData>, StorageOperationStatus> groupTypeEither = titanGenericDao.getByCriteria(NodeTypeEnum.GroupType, properties, GroupTypeData.class)
+            Either<List<GroupTypeData>, StorageOperationStatus> groupTypeEither = janusGraphGenericDao
+                .getByCriteria(NodeTypeEnum.GroupType, properties, GroupTypeData.class)
                     .right()
-                    .map(DaoStatusConverter::convertTitanStatusToStorageStatus);
+                    .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
             if (groupTypeEither.isRight()) {
                 result = Either.right(groupTypeEither.right().value());
             } else {
@@ -391,7 +396,7 @@ public class GroupTypeOperation implements IGroupTypeOperation {
             return result;
 
         } finally {
-            titanGenericDao.handleTransactionCommitRollback(inTransaction, result);
+            janusGraphGenericDao.handleTransactionCommitRollback(inTransaction, result);
         }
     }
 
@@ -432,11 +437,11 @@ public class GroupTypeOperation implements IGroupTypeOperation {
                 .bind(propsMap -> fillDerivedFromProperties(groupType, derivedFromNode, new ArrayList<>(propsMap.values())));
     }
 
-    Either<Map<String, PropertyDefinition>, StorageOperationStatus> handleGroupTypeHasNoProperties(TitanOperationStatus err) {
-        if (err == TitanOperationStatus.NOT_FOUND) {
+    Either<Map<String, PropertyDefinition>, StorageOperationStatus> handleGroupTypeHasNoProperties(JanusGraphOperationStatus err) {
+        if (err == JanusGraphOperationStatus.NOT_FOUND) {
             return Either.left(new HashMap<>());
         }
-        return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(err));
+        return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(err));
     }
 
     private Either<List<PropertyDefinition>, StorageOperationStatus> fillDerivedFromProperties(GroupTypeDefinition groupType, GroupTypeData derivedFromNode, List<PropertyDefinition> groupTypeDirectProperties) {
@@ -493,7 +498,7 @@ public class GroupTypeOperation implements IGroupTypeOperation {
      * @param groupTypeDefinition
      * @return
      */
-    private Either<GroupTypeData, TitanOperationStatus> addGroupTypeToGraph(GroupTypeDefinition groupTypeDefinition) {
+    private Either<GroupTypeData, JanusGraphOperationStatus> addGroupTypeToGraph(GroupTypeDefinition groupTypeDefinition) {
 
         log.debug("Got group type {}", groupTypeDefinition);
 
@@ -503,18 +508,19 @@ public class GroupTypeOperation implements IGroupTypeOperation {
 
         log.debug("Before adding group type to graph. groupTypeData = {}", groupTypeData);
 
-        Either<GroupTypeData, TitanOperationStatus> createGTResult = titanGenericDao.createNode(groupTypeData, GroupTypeData.class);
+        Either<GroupTypeData, JanusGraphOperationStatus> createGTResult = janusGraphGenericDao
+            .createNode(groupTypeData, GroupTypeData.class);
         log.debug("After adding group type to graph. status is = {}", createGTResult);
 
         if (createGTResult.isRight()) {
-            TitanOperationStatus operationStatus = createGTResult.right().value();
+            JanusGraphOperationStatus operationStatus = createGTResult.right().value();
             log.error("Failed to add group type {} to graph. status is {}", groupTypeDefinition.getType(), operationStatus);
             return Either.right(operationStatus);
         }
 
         GroupTypeData resultCTD = createGTResult.left().value();
         List<PropertyDefinition> properties = groupTypeDefinition.getProperties();
-        Either<Map<String, PropertyData>, TitanOperationStatus> addPropertiesToCapablityType = propertyOperation.addPropertiesToElementType(resultCTD.getUniqueId(), NodeTypeEnum.GroupType, properties);
+        Either<Map<String, PropertyData>, JanusGraphOperationStatus> addPropertiesToCapablityType = propertyOperation.addPropertiesToElementType(resultCTD.getUniqueId(), NodeTypeEnum.GroupType, properties);
         if (addPropertiesToCapablityType.isRight()) {
             log.error("Failed add properties {} to capability {}", properties, groupTypeDefinition.getType());
             return Either.right(addPropertiesToCapablityType.right().value());
@@ -522,7 +528,7 @@ public class GroupTypeOperation implements IGroupTypeOperation {
 
         String derivedFrom = groupTypeDefinition.getDerivedFrom();
         if (derivedFrom != null) {
-            Either<GraphRelation, TitanOperationStatus> createRelation = connectToDerivedFrom(ctUniqueId, derivedFrom);
+            Either<GraphRelation, JanusGraphOperationStatus> createRelation = connectToDerivedFrom(ctUniqueId, derivedFrom);
             if (createRelation.isRight()) {
                 return Either.right(createRelation.right().value());
             }
@@ -530,8 +536,8 @@ public class GroupTypeOperation implements IGroupTypeOperation {
         
         Map<String, CapabilityDefinition> groupCapTypes = groupTypeDefinition.getCapabilities();
         if (!MapUtils.isEmpty(groupCapTypes)) {
-            TitanOperationStatus status = createCapabilities(groupTypeData, groupCapTypes);
-            if (status != TitanOperationStatus.OK) {
+            JanusGraphOperationStatus status = createCapabilities(groupTypeData, groupCapTypes);
+            if (status != JanusGraphOperationStatus.OK) {
                 return Either.right(status);
             }
         }
@@ -541,21 +547,23 @@ public class GroupTypeOperation implements IGroupTypeOperation {
     }
 
 
-    private Either<GraphRelation, TitanOperationStatus> connectToDerivedFrom(String ctUniqueId, String derivedFrom) {
+    private Either<GraphRelation, JanusGraphOperationStatus> connectToDerivedFrom(String ctUniqueId, String derivedFrom) {
         log.debug("Before creating relation between Group Type with id {} to its parent {}", ctUniqueId, derivedFrom);
 
-        Either<GroupTypeData, TitanOperationStatus> derivedFromGroupTypeResult =
-                titanGenericDao.getNode(GraphPropertiesDictionary.TYPE.getProperty(), derivedFrom, GroupTypeData.class);
+        Either<GroupTypeData, JanusGraphOperationStatus> derivedFromGroupTypeResult =
+                janusGraphGenericDao
+                    .getNode(GraphPropertiesDictionary.TYPE.getProperty(), derivedFrom, GroupTypeData.class);
 
         if (derivedFromGroupTypeResult.isLeft()) {
             UniqueIdData from = new UniqueIdData(NodeTypeEnum.GroupType, ctUniqueId);
             GroupTypeData to = derivedFromGroupTypeResult.left().value();
 
-            Either<GraphRelation, TitanOperationStatus> createRelation = titanGenericDao.createRelation(from, to, GraphEdgeLabels.DERIVED_FROM, null);
+            Either<GraphRelation, JanusGraphOperationStatus> createRelation = janusGraphGenericDao
+                .createRelation(from, to, GraphEdgeLabels.DERIVED_FROM, null);
             log.debug("After create relation between Group Type with id {} to its parent {}, status is {}.", ctUniqueId, derivedFrom, createRelation);
             return createRelation;
         } else {
-            TitanOperationStatus status = derivedFromGroupTypeResult.right().value();
+            JanusGraphOperationStatus status = derivedFromGroupTypeResult.right().value();
             log.debug("Failed to found parent Group Type {}, stauts is {}.", derivedFrom, status);
             return Either.right(status);
         }
@@ -579,23 +587,29 @@ public class GroupTypeOperation implements IGroupTypeOperation {
     public Either<Boolean, StorageOperationStatus> isCapabilityTypeDerivedFrom(String childCandidateType, String parentCandidateType) {
         Map<String, Object> propertiesToMatch = new HashMap<>();
         propertiesToMatch.put(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.CapabilityType), childCandidateType);
-        Either<List<CapabilityTypeData>, TitanOperationStatus> getResponse = titanGenericDao.getByCriteria(NodeTypeEnum.CapabilityType, propertiesToMatch, CapabilityTypeData.class);
+        Either<List<CapabilityTypeData>, JanusGraphOperationStatus> getResponse = janusGraphGenericDao
+            .getByCriteria(NodeTypeEnum.CapabilityType, propertiesToMatch, CapabilityTypeData.class);
         if (getResponse.isRight()) {
-            TitanOperationStatus titanOperationStatus = getResponse.right().value();
-            log.debug("Couldn't fetch capability type {}, error: {}", childCandidateType, titanOperationStatus);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(titanOperationStatus));
+            JanusGraphOperationStatus janusGraphOperationStatus = getResponse.right().value();
+            log.debug("Couldn't fetch capability type {}, error: {}", childCandidateType,
+                janusGraphOperationStatus);
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(
+                janusGraphOperationStatus));
         }
         String childUniqueId = getResponse.left().value().get(0).getUniqueId();
         Set<String> travelledTypes = new HashSet<>();
         do {
             travelledTypes.add(childUniqueId);
-            Either<List<ImmutablePair<CapabilityTypeData, GraphEdge>>, TitanOperationStatus> childrenNodes = titanGenericDao.getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.CapabilityType), childUniqueId, GraphEdgeLabels.DERIVED_FROM,
+            Either<List<ImmutablePair<CapabilityTypeData, GraphEdge>>, JanusGraphOperationStatus> childrenNodes = janusGraphGenericDao
+                .getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.CapabilityType), childUniqueId, GraphEdgeLabels.DERIVED_FROM,
                     NodeTypeEnum.CapabilityType, CapabilityTypeData.class);
             if (childrenNodes.isRight()) {
-                if (childrenNodes.right().value() != TitanOperationStatus.NOT_FOUND) {
-                    TitanOperationStatus titanOperationStatus = getResponse.right().value();
-                    log.debug("Couldn't fetch derived from node for capability type {}, error: {}", childCandidateType, titanOperationStatus);
-                    return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(titanOperationStatus));
+                if (childrenNodes.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
+                    JanusGraphOperationStatus janusGraphOperationStatus = getResponse.right().value();
+                    log.debug("Couldn't fetch derived from node for capability type {}, error: {}", childCandidateType,
+                        janusGraphOperationStatus);
+                    return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(
+                        janusGraphOperationStatus));
                 } else {
                     log.debug("Derived from node is not found for type {} - this is OK for root capability.", childCandidateType);
                     return Either.left(false);
@@ -627,9 +641,9 @@ public class GroupTypeOperation implements IGroupTypeOperation {
 
     private Either<GroupTypeDefinition, StorageOperationStatus> updateGroupTypeOnGraph(GroupTypeDefinition updatedGroupType, GroupTypeDefinition currGroupType) {
         updateGroupTypeData(updatedGroupType, currGroupType);
-        return titanGenericDao.updateNode(new GroupTypeData(updatedGroupType), GroupTypeData.class)
+        return janusGraphGenericDao.updateNode(new GroupTypeData(updatedGroupType), GroupTypeData.class)
                 .right()
-                .map(DaoStatusConverter::convertTitanStatusToStorageStatus)
+                .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus)
                 .left()
                 .bind(updatedNode -> updateGroupProperties(updatedGroupType.getUniqueId(), updatedGroupType.getProperties()))
                 .left()
@@ -649,7 +663,7 @@ public class GroupTypeOperation implements IGroupTypeOperation {
                 .collect(Collectors.toMap(PropertyDefinition::getName, Function.identity())): null;
         return propertyOperation.mergePropertiesAssociatedToNode(NodeTypeEnum.GroupType, groupId, mapProperties)
                 .right()
-                .map(DaoStatusConverter::convertTitanStatusToStorageStatus);
+                .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
     }
 
 
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/HeatParametersOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/HeatParametersOperation.java
index 6d050afb2c..823c33a311 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/HeatParametersOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/HeatParametersOperation.java
@@ -25,10 +25,10 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.HeatParameterDefinition;
 import org.openecomp.sdc.be.model.heat.HeatParameterType;
@@ -55,27 +55,28 @@ public class HeatParametersOperation implements IHeatParametersOperation {
     private static final Logger log = Logger.getLogger(HeatParametersOperation.class.getName());
 
     @javax.annotation.Resource
-    private TitanGenericDao titanGenericDao;
+    private JanusGraphGenericDao janusGraphGenericDao;
 
-    public TitanGenericDao getTitanGenericDao() {
-        return titanGenericDao;
+    public JanusGraphGenericDao getJanusGraphGenericDao() {
+        return janusGraphGenericDao;
     }
 
-    public void setTitanGenericDao(TitanGenericDao titanGenericDao) {
-        this.titanGenericDao = titanGenericDao;
+    public void setJanusGraphGenericDao(JanusGraphGenericDao janusGraphGenericDao) {
+        this.janusGraphGenericDao = janusGraphGenericDao;
     }
 
     public StorageOperationStatus getHeatParametersOfNode(NodeTypeEnum nodeType, String uniqueId, List<HeatParameterDefinition> properties) {
 
-        Either<List<ImmutablePair<HeatParameterData, GraphEdge>>, TitanOperationStatus> childrenNodes = titanGenericDao.getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(nodeType), uniqueId, GraphEdgeLabels.HEAT_PARAMETER, NodeTypeEnum.HeatParameter,
+        Either<List<ImmutablePair<HeatParameterData, GraphEdge>>, JanusGraphOperationStatus> childrenNodes = janusGraphGenericDao
+            .getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(nodeType), uniqueId, GraphEdgeLabels.HEAT_PARAMETER, NodeTypeEnum.HeatParameter,
                 HeatParameterData.class);
 
         if (childrenNodes.isRight()) {
-            TitanOperationStatus status = childrenNodes.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.OK;
+            JanusGraphOperationStatus status = childrenNodes.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.OK;
             }
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
         }
 
         List<ImmutablePair<HeatParameterData, GraphEdge>> values = childrenNodes.left().value();
@@ -103,15 +104,16 @@ public class HeatParametersOperation implements IHeatParametersOperation {
 
     public StorageOperationStatus getParametersValueNodes(NodeTypeEnum parentNodeType, String parentUniqueId, List<HeatParameterValueData> heatValues) {
 
-        Either<List<ImmutablePair<HeatParameterValueData, GraphEdge>>, TitanOperationStatus> childrenNodes = titanGenericDao.getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(parentNodeType), parentUniqueId, GraphEdgeLabels.PARAMETER_VALUE,
+        Either<List<ImmutablePair<HeatParameterValueData, GraphEdge>>, JanusGraphOperationStatus> childrenNodes = janusGraphGenericDao
+            .getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(parentNodeType), parentUniqueId, GraphEdgeLabels.PARAMETER_VALUE,
                 NodeTypeEnum.HeatParameterValue, HeatParameterValueData.class);
 
         if (childrenNodes.isRight()) {
-            TitanOperationStatus status = childrenNodes.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.OK;
+            JanusGraphOperationStatus status = childrenNodes.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.OK;
             }
-            return DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+            return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
         }
 
         List<ImmutablePair<HeatParameterValueData, GraphEdge>> values = childrenNodes.left().value();
@@ -144,14 +146,14 @@ public class HeatParametersOperation implements IHeatParametersOperation {
         for (HeatParameterDefinition propertyDefinition : heatParams) {
 
             String propertyUid = propertyDefinition.getUniqueId();
-            Either<HeatParameterData, TitanOperationStatus> deletePropertyRes = deleteHeatParameterFromGraph(propertyUid);
+            Either<HeatParameterData, JanusGraphOperationStatus> deletePropertyRes = deleteHeatParameterFromGraph(propertyUid);
             if (deletePropertyRes.isRight()) {
                 log.error("Failed to delete heat parameter with id {}", propertyUid);
-                TitanOperationStatus status = deletePropertyRes.right().value();
-                if (status == TitanOperationStatus.NOT_FOUND) {
-                    status = TitanOperationStatus.INVALID_ID;
+                JanusGraphOperationStatus status = deletePropertyRes.right().value();
+                if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                    status = JanusGraphOperationStatus.INVALID_ID;
                 }
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
             }
 
         }
@@ -173,14 +175,14 @@ public class HeatParametersOperation implements IHeatParametersOperation {
         for (HeatParameterValueData propertyDefinition : heatValues) {
 
             String propertyUid = (String) propertyDefinition.getUniqueId();
-            Either<HeatParameterValueData, TitanOperationStatus> deletePropertyRes = deleteHeatParameterValueFromGraph(propertyUid);
+            Either<HeatParameterValueData, JanusGraphOperationStatus> deletePropertyRes = deleteHeatParameterValueFromGraph(propertyUid);
             if (deletePropertyRes.isRight()) {
                 log.error("Failed to delete heat parameter value with id {}", propertyUid);
-                TitanOperationStatus status = deletePropertyRes.right().value();
-                if (status == TitanOperationStatus.NOT_FOUND) {
-                    status = TitanOperationStatus.INVALID_ID;
+                JanusGraphOperationStatus status = deletePropertyRes.right().value();
+                if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                    status = JanusGraphOperationStatus.INVALID_ID;
                 }
-                return DaoStatusConverter.convertTitanStatusToStorageStatus(status);
+                return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status);
             }
 
         }
@@ -189,14 +191,15 @@ public class HeatParametersOperation implements IHeatParametersOperation {
         return StorageOperationStatus.OK;
     }
 
-    private Either<HeatParameterData, TitanOperationStatus> deleteHeatParameterFromGraph(String propertyId) {
+    private Either<HeatParameterData, JanusGraphOperationStatus> deleteHeatParameterFromGraph(String propertyId) {
         log.debug("Before deleting heat parameter from graph {}" , propertyId);
-        return titanGenericDao.deleteNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.HeatParameter), propertyId, HeatParameterData.class);
+        return janusGraphGenericDao
+            .deleteNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.HeatParameter), propertyId, HeatParameterData.class);
     }
 
-    private Either<HeatParameterValueData, TitanOperationStatus> deleteHeatParameterValueFromGraph(String propertyId) {
+    private Either<HeatParameterValueData, JanusGraphOperationStatus> deleteHeatParameterValueFromGraph(String propertyId) {
         log.debug("Before deleting heat parameter from graph {}" , propertyId);
-        return titanGenericDao.deleteNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.HeatParameterValue), propertyId, HeatParameterValueData.class);
+        return janusGraphGenericDao.deleteNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.HeatParameterValue), propertyId, HeatParameterValueData.class);
     }
 
     @Override
@@ -207,10 +210,10 @@ public class HeatParametersOperation implements IHeatParametersOperation {
 
                 String propertyName = propertyDefinition.getName();
 
-                Either<HeatParameterData, TitanOperationStatus> addPropertyToGraph = addPropertyToGraph(propertyName, propertyDefinition, parentId, nodeType);
+                Either<HeatParameterData, JanusGraphOperationStatus> addPropertyToGraph = addPropertyToGraph(propertyName, propertyDefinition, parentId, nodeType);
 
                 if (addPropertyToGraph.isRight()) {
-                    return DaoStatusConverter.convertTitanStatusToStorageStatus(addPropertyToGraph.right().value());
+                    return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(addPropertyToGraph.right().value());
                 }
             }
         }
@@ -228,17 +231,18 @@ public class HeatParametersOperation implements IHeatParametersOperation {
         for (HeatParameterDefinition property : properties) {
 
             HeatParameterData heatParameterData = new HeatParameterData(property);
-            Either<HeatParameterData, TitanOperationStatus> updateNode = titanGenericDao.updateNode(heatParameterData, HeatParameterData.class);
+            Either<HeatParameterData, JanusGraphOperationStatus> updateNode = janusGraphGenericDao
+                .updateNode(heatParameterData, HeatParameterData.class);
             if (updateNode.isRight()) {
                 log.debug("failed to update heat parameter in graph. id = {}", property.getUniqueId());
-                return DaoStatusConverter.convertTitanStatusToStorageStatus(updateNode.right().value());
+                return DaoStatusConverter.convertJanusGraphStatusToStorageStatus(updateNode.right().value());
             }
         }
 
         return StorageOperationStatus.OK;
     }
 
-    public Either<HeatParameterData, TitanOperationStatus> addPropertyToGraph(String propertyName, HeatParameterDefinition propertyDefinition, String parentId, NodeTypeEnum nodeType) {
+    public Either<HeatParameterData, JanusGraphOperationStatus> addPropertyToGraph(String propertyName, HeatParameterDefinition propertyDefinition, String parentId, NodeTypeEnum nodeType) {
 
         UniqueIdData parentNode = new UniqueIdData(nodeType, parentId);
 
@@ -246,19 +250,21 @@ public class HeatParametersOperation implements IHeatParametersOperation {
         HeatParameterData propertyData = new HeatParameterData(propertyDefinition);
 
         log.debug("Before adding property to graph {}" , propertyData);
-        Either<HeatParameterData, TitanOperationStatus> createNodeResult = titanGenericDao.createNode(propertyData, HeatParameterData.class);
+        Either<HeatParameterData, JanusGraphOperationStatus> createNodeResult = janusGraphGenericDao
+            .createNode(propertyData, HeatParameterData.class);
         log.debug("After adding property to graph {}" , propertyData);
         if (createNodeResult.isRight()) {
-            TitanOperationStatus operationStatus = createNodeResult.right().value();
+            JanusGraphOperationStatus operationStatus = createNodeResult.right().value();
             log.error("Failed to add property {} to graph. status is {}", propertyName, operationStatus);
             return Either.right(operationStatus);
         }
 
         Map<String, Object> props = new HashMap<>();
         props.put(GraphPropertiesDictionary.NAME.getProperty(), propertyName);
-        Either<GraphRelation, TitanOperationStatus> createRelResult = titanGenericDao.createRelation(parentNode, propertyData, GraphEdgeLabels.HEAT_PARAMETER, props);
+        Either<GraphRelation, JanusGraphOperationStatus> createRelResult = janusGraphGenericDao
+            .createRelation(parentNode, propertyData, GraphEdgeLabels.HEAT_PARAMETER, props);
         if (createRelResult.isRight()) {
-            TitanOperationStatus operationStatus = createRelResult.right().value();
+            JanusGraphOperationStatus operationStatus = createRelResult.right().value();
             log.error("Failed to associate {} {} to heat parameter {} in graph. status is {}", nodeType.getName(), parentId, propertyName, operationStatus);
             return Either.right(operationStatus);
         }
@@ -371,7 +377,8 @@ public class HeatParametersOperation implements IHeatParametersOperation {
     @Override
     public Either<HeatParameterValueData, StorageOperationStatus> updateHeatParameterValue(HeatParameterDefinition heatParam, String artifactId, String resourceInstanceId, String artifactLabel) {
         String heatEnvId = UniqueIdBuilder.buildHeatParameterValueUniqueId(resourceInstanceId, artifactLabel, heatParam.getName());
-        Either<HeatParameterValueData, TitanOperationStatus> getNode = titanGenericDao.getNode(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), heatEnvId, HeatParameterValueData.class);
+        Either<HeatParameterValueData, JanusGraphOperationStatus> getNode = janusGraphGenericDao
+            .getNode(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), heatEnvId, HeatParameterValueData.class);
         if (getNode.isRight() || getNode.left().value() == null) {
             if (heatParam.getCurrentValue() == null || (heatParam.getDefaultValue() != null && heatParam.getCurrentValue().equals(heatParam.getDefaultValue()))) {
                 log.debug("Updated heat parameter value equals default value. No need to create heat parameter value for heat parameter {}", heatParam.getUniqueId());
@@ -388,15 +395,17 @@ public class HeatParametersOperation implements IHeatParametersOperation {
         HeatParameterValueData heatParameterValue = new HeatParameterValueData();
         heatParameterValue.setUniqueId(heatParam.getUniqueId());
         if (heatParam.getCurrentValue() == null || (heatParam.getDefaultValue() != null && heatParam.getCurrentValue().equals(heatParam.getDefaultValue()))) {
-            Either<GraphRelation, TitanOperationStatus> deleteParameterValueIncomingRelation = titanGenericDao.deleteIncomingRelationByCriteria(heatParameterValue, GraphEdgeLabels.PARAMETER_VALUE, null);
+            Either<GraphRelation, JanusGraphOperationStatus> deleteParameterValueIncomingRelation = janusGraphGenericDao
+                .deleteIncomingRelationByCriteria(heatParameterValue, GraphEdgeLabels.PARAMETER_VALUE, null);
             if (deleteParameterValueIncomingRelation.isRight()) {
                 log.debug("Failed to delete heat parameter value incoming relation on graph. id = {}", heatParameterValue.getUniqueId());
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(deleteParameterValueIncomingRelation.right().value()));
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(deleteParameterValueIncomingRelation.right().value()));
             }
-            Either<Edge, TitanOperationStatus> getOutgoingRelation = titanGenericDao.getOutgoingEdgeByCriteria(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), (String) heatParameterValue.getUniqueId(), GraphEdgeLabels.PARAMETER_IMPL, null);
+            Either<Edge, JanusGraphOperationStatus> getOutgoingRelation = janusGraphGenericDao
+                .getOutgoingEdgeByCriteria(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), (String) heatParameterValue.getUniqueId(), GraphEdgeLabels.PARAMETER_IMPL, null);
             if (getOutgoingRelation.isRight()) {
                 log.debug("Failed to get heat parameter value outgoing relation from graph. id = {}", heatParameterValue.getUniqueId());
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(getOutgoingRelation.right().value()));
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(getOutgoingRelation.right().value()));
             }
             Edge edge = getOutgoingRelation.left().value();
             if (edge == null) {
@@ -405,33 +414,35 @@ public class HeatParametersOperation implements IHeatParametersOperation {
             }
             edge.remove();
 
-            Either<HeatParameterValueData, TitanOperationStatus> deleteNode = titanGenericDao.deleteNode(heatParameterValue, HeatParameterValueData.class);
+            Either<HeatParameterValueData, JanusGraphOperationStatus> deleteNode = janusGraphGenericDao
+                .deleteNode(heatParameterValue, HeatParameterValueData.class);
             if (deleteNode.isRight()) {
                 log.debug("Failed to delete heat parameter value on graph. id = {}", heatParameterValue.getUniqueId());
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(deleteNode.right().value()));
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(deleteNode.right().value()));
             }
             return Either.left(deleteNode.left().value());
         }
         heatParameterValue.setValue(heatParam.getCurrentValue());
-        Either<HeatParameterValueData, TitanOperationStatus> updateNode = titanGenericDao.updateNode(heatParameterValue, HeatParameterValueData.class);
+        Either<HeatParameterValueData, JanusGraphOperationStatus> updateNode = janusGraphGenericDao
+            .updateNode(heatParameterValue, HeatParameterValueData.class);
         if (updateNode.isRight()) {
             log.debug("Failed to update heat parameter value in graph. id = {}", heatParameterValue.getUniqueId());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(updateNode.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(updateNode.right().value()));
         }
         return Either.left(updateNode.left().value());
     }
 
     public Either<HeatParameterValueData, StorageOperationStatus> createHeatParameterValue(HeatParameterDefinition heatParam, String artifactId, String resourceInstanceId, String artifactLabel) {
 
-        Either<HeatParameterValueData, TitanOperationStatus> addHeatValueToGraph = addHeatValueToGraph(heatParam, artifactLabel, artifactId, resourceInstanceId);
+        Either<HeatParameterValueData, JanusGraphOperationStatus> addHeatValueToGraph = addHeatValueToGraph(heatParam, artifactLabel, artifactId, resourceInstanceId);
         if (addHeatValueToGraph.isRight()) {
             log.debug("Failed to create heat parameters value on graph for artifact {}", artifactId);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(addHeatValueToGraph.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(addHeatValueToGraph.right().value()));
         }
         return Either.left(addHeatValueToGraph.left().value());
     }
 
-    public Either<HeatParameterValueData, TitanOperationStatus> addHeatValueToGraph(HeatParameterDefinition heatParameter, String artifactLabel, String artifactId, String resourceInstanceId) {
+    public Either<HeatParameterValueData, JanusGraphOperationStatus> addHeatValueToGraph(HeatParameterDefinition heatParameter, String artifactLabel, String artifactId, String resourceInstanceId) {
 
         UniqueIdData heatEnvNode = new UniqueIdData(NodeTypeEnum.ArtifactRef, artifactId);
         HeatParameterValueData heatValueData = new HeatParameterValueData();
@@ -439,26 +450,29 @@ public class HeatParametersOperation implements IHeatParametersOperation {
         heatValueData.setValue(heatParameter.getCurrentValue());
 
         log.debug("Before adding property to graph {}", heatValueData);
-        Either<HeatParameterValueData, TitanOperationStatus> createNodeResult = titanGenericDao.createNode(heatValueData, HeatParameterValueData.class);
+        Either<HeatParameterValueData, JanusGraphOperationStatus> createNodeResult = janusGraphGenericDao
+            .createNode(heatValueData, HeatParameterValueData.class);
         log.debug("After adding property to graph {}", heatValueData);
         if (createNodeResult.isRight()) {
-            TitanOperationStatus operationStatus = createNodeResult.right().value();
+            JanusGraphOperationStatus operationStatus = createNodeResult.right().value();
             log.error("Failed to add heat value {} to graph. status is {}", heatValueData.getUniqueId(), operationStatus);
             return Either.right(operationStatus);
         }
 
         Map<String, Object> props = new HashMap<>();
         props.put(GraphPropertiesDictionary.NAME.getProperty(), heatParameter.getName());
-        Either<GraphRelation, TitanOperationStatus> createRelResult = titanGenericDao.createRelation(heatEnvNode, heatValueData, GraphEdgeLabels.PARAMETER_VALUE, props);
+        Either<GraphRelation, JanusGraphOperationStatus> createRelResult = janusGraphGenericDao
+            .createRelation(heatEnvNode, heatValueData, GraphEdgeLabels.PARAMETER_VALUE, props);
         if (createRelResult.isRight()) {
-            TitanOperationStatus operationStatus = createRelResult.right().value();
+            JanusGraphOperationStatus operationStatus = createRelResult.right().value();
             log.error("Failed to associate heat value {} to heat env artifact {} in graph. status is {}", heatValueData.getUniqueId(), artifactId, operationStatus);
             return Either.right(operationStatus);
         }
         UniqueIdData heatParameterNode = new UniqueIdData(NodeTypeEnum.HeatParameter, heatParameter.getUniqueId());
-        Either<GraphRelation, TitanOperationStatus> createRel2Result = titanGenericDao.createRelation(heatValueData, heatParameterNode, GraphEdgeLabels.PARAMETER_IMPL, null);
+        Either<GraphRelation, JanusGraphOperationStatus> createRel2Result = janusGraphGenericDao
+            .createRelation(heatValueData, heatParameterNode, GraphEdgeLabels.PARAMETER_IMPL, null);
         if (createRel2Result.isRight()) {
-            TitanOperationStatus operationStatus = createRel2Result.right().value();
+            JanusGraphOperationStatus operationStatus = createRel2Result.right().value();
             log.error("Failed to associate heat value {} to heat parameter {} in graph. status is {}", heatValueData.getUniqueId(), heatParameter.getName(), operationStatus);
             return Either.right(operationStatus);
         }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/InputsOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/InputsOperation.java
index 9c5445a8c2..b9a4c7f66f 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/InputsOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/InputsOperation.java
@@ -26,10 +26,10 @@ import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.config.BeEcompErrorManager.ErrorSeverity;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgePropertiesDictionary;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.ComponentInstanceInput;
 import org.openecomp.sdc.be.model.operations.api.IInputsOperation;
@@ -48,20 +48,22 @@ public class InputsOperation extends AbstractOperation implements IInputsOperati
     @Autowired
     PropertyOperation propertyOperation;
 
-    public <ElementDefinition> TitanOperationStatus findAllResourceElementsDefinitionRecursively(String resourceId, List<ElementDefinition> elements, NodeElementFetcher<ElementDefinition> singleNodeFetcher) {
+    public <ElementDefinition> JanusGraphOperationStatus findAllResourceElementsDefinitionRecursively(String resourceId, List<ElementDefinition> elements, NodeElementFetcher<ElementDefinition> singleNodeFetcher) {
 
         log.trace("Going to fetch elements under resource {}" , resourceId);
-        TitanOperationStatus resourceAttributesStatus = singleNodeFetcher.findAllNodeElements(resourceId, elements);
+        JanusGraphOperationStatus
+            resourceAttributesStatus = singleNodeFetcher.findAllNodeElements(resourceId, elements);
 
-        if (resourceAttributesStatus != TitanOperationStatus.OK) {
+        if (resourceAttributesStatus != JanusGraphOperationStatus.OK) {
             return resourceAttributesStatus;
         }
 
-        Either<ImmutablePair<ResourceMetadataData, GraphEdge>, TitanOperationStatus> parentNodes = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Resource), resourceId, GraphEdgeLabels.DERIVED_FROM, NodeTypeEnum.Resource, ResourceMetadataData.class);
+        Either<ImmutablePair<ResourceMetadataData, GraphEdge>, JanusGraphOperationStatus> parentNodes = janusGraphGenericDao
+            .getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Resource), resourceId, GraphEdgeLabels.DERIVED_FROM, NodeTypeEnum.Resource, ResourceMetadataData.class);
 
         if (parentNodes.isRight()) {
-            TitanOperationStatus parentNodesStatus = parentNodes.right().value();
-            if (parentNodesStatus != TitanOperationStatus.NOT_FOUND) {
+            JanusGraphOperationStatus parentNodesStatus = parentNodes.right().value();
+            if (parentNodesStatus != JanusGraphOperationStatus.NOT_FOUND) {
                 BeEcompErrorManager.getInstance().logInternalFlowError("findAllResourceElementsDefinitionRecursively", "Failed to find parent elements of resource " + resourceId + ". status is " + parentNodesStatus, ErrorSeverity.ERROR);
                 return parentNodesStatus;
             }
@@ -70,26 +72,26 @@ public class InputsOperation extends AbstractOperation implements IInputsOperati
         if (parentNodes.isLeft()) {
             ImmutablePair<ResourceMetadataData, GraphEdge> parnetNodePair = parentNodes.left().value();
             String parentUniqueId = parnetNodePair.getKey().getMetadataDataDefinition().getUniqueId();
-            TitanOperationStatus addParentIntStatus = findAllResourceElementsDefinitionRecursively(parentUniqueId, elements, singleNodeFetcher);
+            JanusGraphOperationStatus addParentIntStatus = findAllResourceElementsDefinitionRecursively(parentUniqueId, elements, singleNodeFetcher);
 
-            if (addParentIntStatus != TitanOperationStatus.OK) {
+            if (addParentIntStatus != JanusGraphOperationStatus.OK) {
                 BeEcompErrorManager.getInstance().logInternalFlowError("findAllResourceElementsDefinitionRecursively", "Failed to find all resource elements of resource " + parentUniqueId, ErrorSeverity.ERROR);
 
                 return addParentIntStatus;
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
 
     @Override
-    public ImmutablePair<TitanOperationStatus, String> findInputValue(String resourceInstanceId, String propertyId) {
+    public ImmutablePair<JanusGraphOperationStatus, String> findInputValue(String resourceInstanceId, String propertyId) {
 
         log.debug("Going to check whether the property {} already added to resource instance {}", propertyId, resourceInstanceId);
 
-        Either<List<ComponentInstanceInput>, TitanOperationStatus> getAllRes = getAllInputsOfResourceInstanceOnlyInputDefId(resourceInstanceId);
+        Either<List<ComponentInstanceInput>, JanusGraphOperationStatus> getAllRes = getAllInputsOfResourceInstanceOnlyInputDefId(resourceInstanceId);
         if (getAllRes.isRight()) {
-            TitanOperationStatus status = getAllRes.right().value();
+            JanusGraphOperationStatus status = getAllRes.right().value();
             log.trace("After fetching all properties of resource instance {}. Status is {}" ,resourceInstanceId, status);
             return new ImmutablePair<>(status, null);
         }
@@ -102,12 +104,12 @@ public class InputsOperation extends AbstractOperation implements IInputsOperati
                 log.trace("Go over property {} under resource instance {}. valueUniqueId = {}" ,propertyUniqueId, resourceInstanceId, valueUniqueUid);
                 if (propertyId.equals(propertyUniqueId) && valueUniqueUid != null) {
                     log.debug("The property {} already created under resource instance {}", propertyId, resourceInstanceId);
-                    return new ImmutablePair<>(TitanOperationStatus.ALREADY_EXIST, valueUniqueUid);
+                    return new ImmutablePair<>(JanusGraphOperationStatus.ALREADY_EXIST, valueUniqueUid);
                 }
             }
         }
 
-        return new ImmutablePair<>(TitanOperationStatus.NOT_FOUND, null);
+        return new ImmutablePair<>(JanusGraphOperationStatus.NOT_FOUND, null);
     }
 
     /**
@@ -116,34 +118,36 @@ public class InputsOperation extends AbstractOperation implements IInputsOperati
      * @param resourceInstanceUid
      * @return
      */
-    public Either<List<ComponentInstanceInput>, TitanOperationStatus> getAllInputsOfResourceInstanceOnlyInputDefId(String resourceInstanceUid) {
+    public Either<List<ComponentInstanceInput>, JanusGraphOperationStatus> getAllInputsOfResourceInstanceOnlyInputDefId(String resourceInstanceUid) {
 
         return getAllInputsOfResourceInstanceOnlyInputDefId(resourceInstanceUid, NodeTypeEnum.ResourceInstance);
 
     }
 
-    public Either<List<ComponentInstanceInput>, TitanOperationStatus> getAllInputsOfResourceInstanceOnlyInputDefId(String resourceInstanceUid, NodeTypeEnum instanceNodeType) {
+    public Either<List<ComponentInstanceInput>, JanusGraphOperationStatus> getAllInputsOfResourceInstanceOnlyInputDefId(String resourceInstanceUid, NodeTypeEnum instanceNodeType) {
 
-        Either<ComponentInstanceData, TitanOperationStatus> findResInstanceRes = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(instanceNodeType), resourceInstanceUid, ComponentInstanceData.class);
+        Either<ComponentInstanceData, JanusGraphOperationStatus> findResInstanceRes = janusGraphGenericDao
+            .getNode(UniqueIdBuilder.getKeyByNodeType(instanceNodeType), resourceInstanceUid, ComponentInstanceData.class);
 
         if (findResInstanceRes.isRight()) {
-            TitanOperationStatus status = findResInstanceRes.right().value();
-            if (status == TitanOperationStatus.NOT_FOUND) {
-                status = TitanOperationStatus.INVALID_ID;
+            JanusGraphOperationStatus status = findResInstanceRes.right().value();
+            if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                status = JanusGraphOperationStatus.INVALID_ID;
             }
             return Either.right(status);
         }
 
-        Either<List<ImmutablePair<InputValueData, GraphEdge>>, TitanOperationStatus> propertyImplNodes = titanGenericDao.getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(instanceNodeType), resourceInstanceUid, GraphEdgeLabels.INPUT_VALUE, NodeTypeEnum.InputValue, InputValueData.class);
+        Either<List<ImmutablePair<InputValueData, GraphEdge>>, JanusGraphOperationStatus> propertyImplNodes = janusGraphGenericDao
+            .getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(instanceNodeType), resourceInstanceUid, GraphEdgeLabels.INPUT_VALUE, NodeTypeEnum.InputValue, InputValueData.class);
 
         if (propertyImplNodes.isRight()) {
-            TitanOperationStatus status = propertyImplNodes.right().value();
+            JanusGraphOperationStatus status = propertyImplNodes.right().value();
             return Either.right(status);
         }
 
         List<ImmutablePair<InputValueData, GraphEdge>> list = propertyImplNodes.left().value();
         if (list == null || list.isEmpty()) {
-            return Either.right(TitanOperationStatus.NOT_FOUND);
+            return Either.right(JanusGraphOperationStatus.NOT_FOUND);
         }
 
         List<ComponentInstanceInput> result = new ArrayList<>();
@@ -155,7 +159,8 @@ public class InputsOperation extends AbstractOperation implements IInputsOperati
             String propertyValueUid = propertyValueData.getUniqueId();
             String value = propertyValueData.getValue();
 
-            Either<ImmutablePair<InputsData, GraphEdge>, TitanOperationStatus> inputNodes = titanGenericDao.getParentNode(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), propertyValueData.getUniqueId(), GraphEdgeLabels.GET_INPUT, NodeTypeEnum.Input, InputsData.class);
+            Either<ImmutablePair<InputsData, GraphEdge>, JanusGraphOperationStatus> inputNodes = janusGraphGenericDao
+                .getParentNode(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), propertyValueData.getUniqueId(), GraphEdgeLabels.GET_INPUT, NodeTypeEnum.Input, InputsData.class);
 
             if (inputNodes.isRight()) {
 
@@ -165,25 +170,28 @@ public class InputsOperation extends AbstractOperation implements IInputsOperati
             InputsData input = inputNodes.left().value().left;
             String inputId = input.getPropertyDataDefinition().getUniqueId();
 
-            Either<ImmutablePair<PropertyData, GraphEdge>, TitanOperationStatus> propertyDefRes = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.InputValue), propertyValueUid, GraphEdgeLabels.INPUT_IMPL, NodeTypeEnum.Property, PropertyData.class);
+            Either<ImmutablePair<PropertyData, GraphEdge>, JanusGraphOperationStatus> propertyDefRes = janusGraphGenericDao
+                .getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.InputValue), propertyValueUid, GraphEdgeLabels.INPUT_IMPL, NodeTypeEnum.Property, PropertyData.class);
             if (propertyDefRes.isRight()) {
-                TitanOperationStatus status = propertyDefRes.right().value();
-                if (status == TitanOperationStatus.NOT_FOUND) {
-                    status = TitanOperationStatus.INVALID_ID;
+                JanusGraphOperationStatus status = propertyDefRes.right().value();
+                if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                    status = JanusGraphOperationStatus.INVALID_ID;
                 }
                 return Either.right(status);
             }
 
             ImmutablePair<PropertyData, GraphEdge> propertyDefPair = propertyDefRes.left().value();
             PropertyData propertyData = propertyDefPair.left;
-            Either<Edge, TitanOperationStatus> inputsEges = titanGenericDao.getIncomingEdgeByCriteria(propertyData, GraphEdgeLabels.INPUT, null);
+            Either<Edge, JanusGraphOperationStatus> inputsEges = janusGraphGenericDao
+                .getIncomingEdgeByCriteria(propertyData, GraphEdgeLabels.INPUT, null);
             if (inputsEges.isRight()) {
-                TitanOperationStatus status = inputsEges.right().value();
+                JanusGraphOperationStatus status = inputsEges.right().value();
 
                 return Either.right(status);
             }
             Edge edge = inputsEges.left().value();
-            String inputName = (String) titanGenericDao.getProperty(edge, GraphEdgePropertiesDictionary.NAME.getProperty());
+            String inputName = (String) janusGraphGenericDao
+                .getProperty(edge, GraphEdgePropertiesDictionary.NAME.getProperty());
 
             ComponentInstanceInput resourceInstanceProperty = new ComponentInstanceInput(propertyData.getPropertyDataDefinition(), inputId, value, propertyValueUid);
 
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/InterfaceLifecycleOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/InterfaceLifecycleOperation.java
index ab2eb0323d..b9e95c507f 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/InterfaceLifecycleOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/InterfaceLifecycleOperation.java
@@ -24,10 +24,10 @@ import fj.data.Either;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
 import org.openecomp.sdc.be.datatypes.elements.InterfaceDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.OperationDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
@@ -63,7 +63,7 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
     private ArtifactOperation artifactOperation;
 
     @javax.annotation.Resource
-    private TitanGenericDao titanGenericDao;
+    private JanusGraphGenericDao janusGraphGenericDao;
 
     @Override
     public Either<InterfaceDefinition, StorageOperationStatus> addInterfaceToResource(InterfaceDefinition interf, String resourceId, String interfaceName, boolean inTransaction) {
@@ -72,27 +72,29 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
 
     }
 
-    private Either<OperationData, TitanOperationStatus> addOperationToGraph(InterfaceDefinition interf, String opName, Operation op, InterfaceData interfaceData) {
+    private Either<OperationData, JanusGraphOperationStatus> addOperationToGraph(InterfaceDefinition interf, String opName, Operation op, InterfaceData interfaceData) {
 
         op.setUniqueId(UniqueIdBuilder.buildPropertyUniqueId((String) interfaceData.getUniqueId(), opName));
         OperationData operationData = new OperationData(op);
 
         log.debug("Before adding operation to graph {}", operationData);
-        Either<OperationData, TitanOperationStatus> createOpNodeResult = titanGenericDao.createNode(operationData, OperationData.class);
+        Either<OperationData, JanusGraphOperationStatus> createOpNodeResult = janusGraphGenericDao
+            .createNode(operationData, OperationData.class);
         log.debug("After adding operation to graph {}", operationData);
 
         if (createOpNodeResult.isRight()) {
-            TitanOperationStatus opStatus = createOpNodeResult.right().value();
+            JanusGraphOperationStatus opStatus = createOpNodeResult.right().value();
             log.error("Failed to add operation {} to graph. status is {}", opName, opStatus);
             return Either.right(opStatus);
         }
 
         Map<String, Object> props = new HashMap<>();
         props.put(GraphPropertiesDictionary.NAME.getProperty(), opName);
-        Either<GraphRelation, TitanOperationStatus> createRelResult = titanGenericDao.createRelation(interfaceData, operationData, GraphEdgeLabels.INTERFACE_OPERATION, props);
+        Either<GraphRelation, JanusGraphOperationStatus> createRelResult = janusGraphGenericDao
+            .createRelation(interfaceData, operationData, GraphEdgeLabels.INTERFACE_OPERATION, props);
 
         if (createRelResult.isRight()) {
-            TitanOperationStatus operationStatus = createOpNodeResult.right().value();
+            JanusGraphOperationStatus operationStatus = createOpNodeResult.right().value();
             log.error("Failed to associate operation {} to property {} in graph. status is {}", interfaceData.getUniqueId(), opName, operationStatus);
 
             return Either.right(operationStatus);
@@ -118,7 +120,7 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
 
     }
 
-    private Either<InterfaceData, TitanOperationStatus> addInterfaceToGraph(InterfaceDefinition interfaceInfo, String interfaceName, String resourceId) {
+    private Either<InterfaceData, JanusGraphOperationStatus> addInterfaceToGraph(InterfaceDefinition interfaceInfo, String interfaceName, String resourceId) {
 
         InterfaceData interfaceData = new InterfaceData(interfaceInfo);
 
@@ -129,33 +131,36 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
 
         interfaceInfo.setUniqueId(UniqueIdBuilder.buildPropertyUniqueId(resourceId, interfaceNameSplitted));
 
-        Either<InterfaceData, TitanOperationStatus> existInterface = titanGenericDao.getNode(interfaceData.getUniqueIdKey(), interfaceData.getUniqueId(), InterfaceData.class);
+        Either<InterfaceData, JanusGraphOperationStatus> existInterface = janusGraphGenericDao
+            .getNode(interfaceData.getUniqueIdKey(), interfaceData.getUniqueId(), InterfaceData.class);
 
         if (existInterface.isRight()) {
 
             return createInterfaceNodeAndRelation(interfaceNameSplitted, resourceId, interfaceData, resourceData);
         } else {
             log.debug("Interface {} already exist", interfaceData.getUniqueId());
-            return Either.right(TitanOperationStatus.ALREADY_EXIST);
+            return Either.right(JanusGraphOperationStatus.ALREADY_EXIST);
         }
     }
 
-    private Either<InterfaceData, TitanOperationStatus> createInterfaceNodeAndRelation(String interfaceName, String resourceId, InterfaceData interfaceData, ResourceMetadataData resourceData) {
+    private Either<InterfaceData, JanusGraphOperationStatus> createInterfaceNodeAndRelation(String interfaceName, String resourceId, InterfaceData interfaceData, ResourceMetadataData resourceData) {
         log.debug("Before adding interface to graph {}", interfaceData);
-        Either<InterfaceData, TitanOperationStatus> createNodeResult = titanGenericDao.createNode(interfaceData, InterfaceData.class);
+        Either<InterfaceData, JanusGraphOperationStatus> createNodeResult = janusGraphGenericDao
+            .createNode(interfaceData, InterfaceData.class);
         log.debug("After adding property to graph {}", interfaceData);
 
         if (createNodeResult.isRight()) {
-            TitanOperationStatus operationStatus = createNodeResult.right().value();
+            JanusGraphOperationStatus operationStatus = createNodeResult.right().value();
             log.error("Failed to add interface {} to graph. status is {}", interfaceName, operationStatus);
             return Either.right(operationStatus);
         }
 
         Map<String, Object> props = new HashMap<>();
         props.put(GraphPropertiesDictionary.NAME.getProperty(), interfaceName);
-        Either<GraphRelation, TitanOperationStatus> createRelResult = titanGenericDao.createRelation(resourceData, interfaceData, GraphEdgeLabels.INTERFACE, props);
+        Either<GraphRelation, JanusGraphOperationStatus> createRelResult = janusGraphGenericDao
+            .createRelation(resourceData, interfaceData, GraphEdgeLabels.INTERFACE, props);
         if (createRelResult.isRight()) {
-            TitanOperationStatus operationStatus = createNodeResult.right().value();
+            JanusGraphOperationStatus operationStatus = createNodeResult.right().value();
             log.error("Failed to associate resource {} to property {} in graph. status is {}", resourceId, interfaceName, operationStatus);
 
             return Either.right(operationStatus);
@@ -164,22 +169,24 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
         return Either.left(createNodeResult.left().value());
     }
 
-    private Either<OperationData, TitanOperationStatus> createOperationNodeAndRelation(String operationName, OperationData operationData, InterfaceData interfaceData) {
+    private Either<OperationData, JanusGraphOperationStatus> createOperationNodeAndRelation(String operationName, OperationData operationData, InterfaceData interfaceData) {
         log.debug("Before adding operation to graph {}", operationData);
-        Either<OperationData, TitanOperationStatus> createNodeResult = titanGenericDao.createNode(operationData, OperationData.class);
+        Either<OperationData, JanusGraphOperationStatus> createNodeResult = janusGraphGenericDao
+            .createNode(operationData, OperationData.class);
         log.debug("After adding operation to graph {}", interfaceData);
 
         if (createNodeResult.isRight()) {
-            TitanOperationStatus operationStatus = createNodeResult.right().value();
+            JanusGraphOperationStatus operationStatus = createNodeResult.right().value();
             log.error("Failed to add interfoperationce {} to graph. status is {}", operationName, operationStatus);
             return Either.right(operationStatus);
         }
 
         Map<String, Object> props = new HashMap<>();
         props.put(GraphPropertiesDictionary.NAME.getProperty(), operationName);
-        Either<GraphRelation, TitanOperationStatus> createRelResult = titanGenericDao.createRelation(interfaceData, operationData, GraphEdgeLabels.INTERFACE_OPERATION, props);
+        Either<GraphRelation, JanusGraphOperationStatus> createRelResult = janusGraphGenericDao
+            .createRelation(interfaceData, operationData, GraphEdgeLabels.INTERFACE_OPERATION, props);
         if (createRelResult.isRight()) {
-            TitanOperationStatus operationStatus = createNodeResult.right().value();
+            JanusGraphOperationStatus operationStatus = createNodeResult.right().value();
             log.error("Failed to associate operation {} to interface {} in graph. status is {}", operationName, interfaceData.getUniqueId(), operationStatus);
 
             return Either.right(operationStatus);
@@ -205,15 +212,15 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
                 return result;
             }
 
-            TitanOperationStatus findInterfacesRes = TitanOperationStatus.GENERAL_ERROR;
+            JanusGraphOperationStatus findInterfacesRes = JanusGraphOperationStatus.GENERAL_ERROR;
             if (recursively) {
                 findInterfacesRes = findAllInterfacesRecursively(resourceId, interfaces);
             } else {
                 findInterfacesRes = findAllInterfacesNotRecursively(resourceId, interfaces);
             }
-            if (!findInterfacesRes.equals(TitanOperationStatus.OK)) {
+            if (!findInterfacesRes.equals(JanusGraphOperationStatus.OK)) {
                 log.error("Failed to get all interfaces of resource {}. status is {}", resourceId, findInterfacesRes);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(findInterfacesRes));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(findInterfacesRes));
                 return result;
             }
             result = Either.left(interfaces);
@@ -222,23 +229,24 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
             if (!inTransaction) {
                 if (result == null || result.isRight()) {
                     log.error("Going to execute rollback on graph.");
-                    titanGenericDao.rollback();
+                    janusGraphGenericDao.rollback();
                 } else {
                     log.debug("Going to execute commit on graph.");
-                    titanGenericDao.commit();
+                    janusGraphGenericDao.commit();
                 }
             }
         }
     }
 
-    private TitanOperationStatus findAllInterfacesNotRecursively(String resourceId, Map<String, InterfaceDefinition> interfaces) {
+    private JanusGraphOperationStatus findAllInterfacesNotRecursively(String resourceId, Map<String, InterfaceDefinition> interfaces) {
 
-        Either<List<ImmutablePair<InterfaceData, GraphEdge>>, TitanOperationStatus> interfaceNodes = titanGenericDao.getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Resource), resourceId, GraphEdgeLabels.INTERFACE,
+        Either<List<ImmutablePair<InterfaceData, GraphEdge>>, JanusGraphOperationStatus> interfaceNodes = janusGraphGenericDao
+            .getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Resource), resourceId, GraphEdgeLabels.INTERFACE,
                 NodeTypeEnum.Interface, InterfaceData.class);
 
         if (interfaceNodes.isRight()) {
-            TitanOperationStatus status = interfaceNodes.right().value();
-            if (status != TitanOperationStatus.NOT_FOUND) {
+            JanusGraphOperationStatus status = interfaceNodes.right().value();
+            if (status != JanusGraphOperationStatus.NOT_FOUND) {
                 return status;
             }
         } else {
@@ -246,15 +254,15 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
             if (interfaceList != null) {
                 for (ImmutablePair<InterfaceData, GraphEdge> interfacePair : interfaceList) {
                     String interfaceUniqueId = (String) interfacePair.getKey().getUniqueId();
-                    Either<String, TitanOperationStatus> interfaceNameRes = getPropertyValueFromEdge(interfacePair.getValue(), GraphPropertiesDictionary.NAME);
+                    Either<String, JanusGraphOperationStatus> interfaceNameRes = getPropertyValueFromEdge(interfacePair.getValue(), GraphPropertiesDictionary.NAME);
                     if (interfaceNameRes.isRight()) {
                         log.error("The requirement name is missing on the edge of requirement {}", interfaceUniqueId);
                         return interfaceNameRes.right().value();
                     }
                     String interfaceName = interfaceNameRes.left().value();
-                    Either<InterfaceDefinition, TitanOperationStatus> interfaceDefRes = getNonRecursiveInterface(interfacePair.getKey());
+                    Either<InterfaceDefinition, JanusGraphOperationStatus> interfaceDefRes = getNonRecursiveInterface(interfacePair.getKey());
                     if (interfaceDefRes.isRight()) {
-                        TitanOperationStatus status = interfaceDefRes.right().value();
+                        JanusGraphOperationStatus status = interfaceDefRes.right().value();
                         log.error("Failed to get interface actions of interface {}", interfaceUniqueId);
                         return status;
                     }
@@ -271,24 +279,26 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
                 }
             }
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    public TitanOperationStatus findAllInterfacesRecursively(String resourceId, Map<String, InterfaceDefinition> interfaces) {
+    public JanusGraphOperationStatus findAllInterfacesRecursively(String resourceId, Map<String, InterfaceDefinition> interfaces) {
 
-        TitanOperationStatus findAllInterfacesNotRecursively = findAllInterfacesNotRecursively(resourceId, interfaces);
-        if (!findAllInterfacesNotRecursively.equals(TitanOperationStatus.OK)) {
+        JanusGraphOperationStatus
+            findAllInterfacesNotRecursively = findAllInterfacesNotRecursively(resourceId, interfaces);
+        if (!findAllInterfacesNotRecursively.equals(JanusGraphOperationStatus.OK)) {
             log.error("failed to get interfaces for resource {}. status is {}", resourceId, findAllInterfacesNotRecursively);
         }
 
-        Either<ImmutablePair<ResourceMetadataData, GraphEdge>, TitanOperationStatus> parentNodes = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Resource), resourceId, GraphEdgeLabels.DERIVED_FROM, NodeTypeEnum.Resource,
+        Either<ImmutablePair<ResourceMetadataData, GraphEdge>, JanusGraphOperationStatus> parentNodes = janusGraphGenericDao
+            .getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Resource), resourceId, GraphEdgeLabels.DERIVED_FROM, NodeTypeEnum.Resource,
                 ResourceMetadataData.class);
 
         if (parentNodes.isRight()) {
-            TitanOperationStatus parentNodesStatus = parentNodes.right().value();
-            if (parentNodesStatus == TitanOperationStatus.NOT_FOUND) {
+            JanusGraphOperationStatus parentNodesStatus = parentNodes.right().value();
+            if (parentNodesStatus == JanusGraphOperationStatus.NOT_FOUND) {
                 log.debug("Finish to lookup for parnet interfaces");
-                return TitanOperationStatus.OK;
+                return JanusGraphOperationStatus.OK;
             } else {
                 log.error("Failed to find parent interfaces of resource {}. status is {}", resourceId, parentNodesStatus);
                 return parentNodesStatus;
@@ -296,42 +306,44 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
         }
         ImmutablePair<ResourceMetadataData, GraphEdge> parnetNodePair = parentNodes.left().value();
         String parentUniqueId = parnetNodePair.getKey().getMetadataDataDefinition().getUniqueId();
-        TitanOperationStatus addParentIntStatus = findAllInterfacesRecursively(parentUniqueId, interfaces);
+        JanusGraphOperationStatus
+            addParentIntStatus = findAllInterfacesRecursively(parentUniqueId, interfaces);
 
-        if (addParentIntStatus != TitanOperationStatus.OK) {
+        if (addParentIntStatus != JanusGraphOperationStatus.OK) {
             log.error("Failed to fetch all interfaces of resource {}", parentUniqueId);
             return addParentIntStatus;
         }
 
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    private Either<String, TitanOperationStatus> getPropertyValueFromEdge(GraphEdge edge, GraphPropertiesDictionary property) {
+    private Either<String, JanusGraphOperationStatus> getPropertyValueFromEdge(GraphEdge edge, GraphPropertiesDictionary property) {
         Map<String, Object> edgeProps = edge.getProperties();
         String interfaceName = null;
         if (edgeProps != null) {
             interfaceName = (String) edgeProps.get(property.getProperty());
             if (interfaceName == null) {
-                return Either.right(TitanOperationStatus.INVALID_ELEMENT);
+                return Either.right(JanusGraphOperationStatus.INVALID_ELEMENT);
             }
         } else {
-            return Either.right(TitanOperationStatus.INVALID_ELEMENT);
+            return Either.right(JanusGraphOperationStatus.INVALID_ELEMENT);
         }
         return Either.left(interfaceName);
     }
 
-    private Either<InterfaceDefinition, TitanOperationStatus> getNonRecursiveInterface(InterfaceData interfaceData) {
+    private Either<InterfaceDefinition, JanusGraphOperationStatus> getNonRecursiveInterface(InterfaceData interfaceData) {
 
         log.debug("Going to fetch the operations associate to interface {}", interfaceData.getUniqueId());
         InterfaceDefinition interfaceDefinition = new InterfaceDefinition(interfaceData.getInterfaceDataDefinition());
 
         String interfaceId = interfaceData.getUniqueId();
-        Either<List<ImmutablePair<OperationData, GraphEdge>>, TitanOperationStatus> operationsRes = titanGenericDao.getChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), interfaceId, GraphEdgeLabels.INTERFACE_OPERATION,
+        Either<List<ImmutablePair<OperationData, GraphEdge>>, JanusGraphOperationStatus> operationsRes = janusGraphGenericDao
+            .getChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), interfaceId, GraphEdgeLabels.INTERFACE_OPERATION,
                 NodeTypeEnum.InterfaceOperation, OperationData.class);
 
         if (operationsRes.isRight()) {
-            TitanOperationStatus status = operationsRes.right().value();
-            if (status != TitanOperationStatus.NOT_FOUND) {
+            JanusGraphOperationStatus status = operationsRes.right().value();
+            if (status != JanusGraphOperationStatus.NOT_FOUND) {
                 return Either.right(status);
             } else {
                 return Either.left(interfaceDefinition);
@@ -342,7 +354,7 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
         if (operationList != null && !operationList.isEmpty()) {
             for (ImmutablePair<OperationData, GraphEdge> operationPair : operationList) {
                 Operation operation = new Operation(operationPair.getKey().getOperationDataDefinition());
-                Either<String, TitanOperationStatus> operationNameRes = getPropertyValueFromEdge(operationPair.getValue(), GraphPropertiesDictionary.NAME);
+                Either<String, JanusGraphOperationStatus> operationNameRes = getPropertyValueFromEdge(operationPair.getValue(), GraphPropertiesDictionary.NAME);
                 if (operationNameRes.isRight()) {
                     log.error("The operation name is missing on the edge of operation {}", operationPair.getKey().getUniqueId());
                     return Either.right(operationNameRes.right().value());
@@ -401,7 +413,8 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
 
     private Either<Operation, StorageOperationStatus> updateOperationOnGraph(Operation operation, String resourceId, String interfaceName, String operationName) {
 
-        Either<List<ImmutablePair<InterfaceData, GraphEdge>>, TitanOperationStatus> childrenNodes = titanGenericDao.getChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), resourceId, GraphEdgeLabels.INTERFACE, NodeTypeEnum.Interface,
+        Either<List<ImmutablePair<InterfaceData, GraphEdge>>, JanusGraphOperationStatus> childrenNodes = janusGraphGenericDao
+            .getChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), resourceId, GraphEdgeLabels.INTERFACE, NodeTypeEnum.Interface,
                 InterfaceData.class);
 
         if (childrenNodes.isRight()) {
@@ -415,7 +428,7 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
     }
 
     private Either<Operation, StorageOperationStatus> updateExistingOperation(String resourceId, Operation operation, String interfaceName, String operationName,
-            Either<List<ImmutablePair<InterfaceData, GraphEdge>>, TitanOperationStatus> childrenNodes) {
+            Either<List<ImmutablePair<InterfaceData, GraphEdge>>, JanusGraphOperationStatus> childrenNodes) {
         Operation newOperation = null;
         StorageOperationStatus storageOperationStatus = StorageOperationStatus.GENERAL_ERROR;
 
@@ -426,11 +439,12 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
             InterfaceData interfaceData = interfaceDataNode.getKey();
 
             if (interfaceEdgeProp.get(GraphPropertiesDictionary.NAME.getProperty()).equals(interfaceName)) {
-                Either<List<ImmutablePair<OperationData, GraphEdge>>, TitanOperationStatus> operationRes = titanGenericDao.getChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), (String) interfaceDataNode.getLeft().getUniqueId(),
+                Either<List<ImmutablePair<OperationData, GraphEdge>>, JanusGraphOperationStatus> operationRes = janusGraphGenericDao
+                    .getChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), (String) interfaceDataNode.getLeft().getUniqueId(),
                         GraphEdgeLabels.INTERFACE_OPERATION, NodeTypeEnum.InterfaceOperation, OperationData.class);
                 if (operationRes.isRight()) {
                     log.error("Failed to find operation  {} on interface {}", operationName, interfaceName);
-                    return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(operationRes.right().value()));
+                    return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(operationRes.right().value()));
                 } else {
                     List<ImmutablePair<OperationData, GraphEdge>> operations = operationRes.left().value();
                     for (ImmutablePair<OperationData, GraphEdge> operationPairEdge : operations) {
@@ -439,7 +453,8 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
                         Map<String, Object> opEdgeProp = opEdge.getProperties();
                         if (opEdgeProp.get(GraphPropertiesDictionary.NAME.getProperty()).equals(operationName)) {
                             ArtifactDefinition artifact = operation.getImplementationArtifact();
-                            Either<ImmutablePair<ArtifactData, GraphEdge>, TitanOperationStatus> artifactRes = titanGenericDao.getChild(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), (String) opData.getUniqueId(), GraphEdgeLabels.ARTIFACT_REF,
+                            Either<ImmutablePair<ArtifactData, GraphEdge>, JanusGraphOperationStatus> artifactRes = janusGraphGenericDao
+                                .getChild(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), (String) opData.getUniqueId(), GraphEdgeLabels.ARTIFACT_REF,
                                     NodeTypeEnum.ArtifactRef, ArtifactData.class);
                             Either<ArtifactDefinition, StorageOperationStatus> artStatus;
                             if (artifactRes.isRight()) {
@@ -448,7 +463,7 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
                                 artStatus = artifactOperation.updateArifactOnResource(artifact, (String) operationPairEdge.getLeft().getUniqueId(), (String) artifactRes.left().value().getLeft().getUniqueId(), NodeTypeEnum.InterfaceOperation, true);
                             }
                             if (artStatus.isRight()) {
-                                titanGenericDao.rollback();
+                                janusGraphGenericDao.rollback();
                                 log.error("Failed to add artifact {} to interface {}", operationName, interfaceName);
                                 return Either.right(artStatus.right().value());
                             } else {
@@ -461,18 +476,19 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
 
                     }
                     if (newOperation == null) {
-                        Either<InterfaceData, TitanOperationStatus> parentInterfaceStatus = findInterfaceOnParentNode(resourceId, interfaceName);
+                        Either<InterfaceData, JanusGraphOperationStatus> parentInterfaceStatus = findInterfaceOnParentNode(resourceId, interfaceName);
                         if (parentInterfaceStatus.isRight()) {
                             log.debug("Interface {} not exist", interfaceName);
-                            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(parentInterfaceStatus.right().value()));
+                            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(parentInterfaceStatus.right().value()));
                         }
 
                         InterfaceData parentInterfaceData = parentInterfaceStatus.left().value();
-                        Either<List<ImmutablePair<OperationData, GraphEdge>>, TitanOperationStatus> opRes = titanGenericDao.getChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), (String) parentInterfaceData.getUniqueId(),
+                        Either<List<ImmutablePair<OperationData, GraphEdge>>, JanusGraphOperationStatus> opRes = janusGraphGenericDao
+                            .getChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), (String) parentInterfaceData.getUniqueId(),
                                 GraphEdgeLabels.INTERFACE_OPERATION, NodeTypeEnum.InterfaceOperation, OperationData.class);
                         if (opRes.isRight()) {
                             log.error("Failed to find operation  {} on interface {}", operationName, interfaceName);
-                            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(operationRes.right().value()));
+                            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(operationRes.right().value()));
 
                         } else {
                             List<ImmutablePair<OperationData, GraphEdge>> parentOperations = opRes.left().value();
@@ -503,21 +519,21 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
     }
 
     private Either<Operation, StorageOperationStatus> copyAndCreateNewOperation(Operation operation, String interfaceName, String operationName, Operation newOperation, InterfaceData interfaceData,
-            Either<List<ImmutablePair<OperationData, GraphEdge>>, TitanOperationStatus> operationRes, OperationData opData) {
+                                                                                Either<List<ImmutablePair<OperationData, GraphEdge>>, JanusGraphOperationStatus> operationRes, OperationData opData) {
         OperationDataDefinition opDataInfo = opData.getOperationDataDefinition();
         OperationDataDefinition newOperationInfo = new OperationDataDefinition(opDataInfo);
         newOperationInfo.setUniqueId(UniqueIdBuilder.buildPropertyUniqueId(interfaceData.getUniqueId(), operationName.toLowerCase()));
         OperationData newopData = new OperationData(newOperationInfo);
-        Either<OperationData, TitanOperationStatus> operationStatus = createOperationNodeAndRelation(operationName, newopData, interfaceData);
+        Either<OperationData, JanusGraphOperationStatus> operationStatus = createOperationNodeAndRelation(operationName, newopData, interfaceData);
         if (operationStatus.isRight()) {
             log.error("Failed to create operation  {} on interface {}", operationName, interfaceName);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(operationRes.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(operationRes.right().value()));
         }
         ArtifactDefinition artifact = operation.getImplementationArtifact();
         if (artifact != null) {
             Either<ArtifactDefinition, StorageOperationStatus> artStatus = artifactOperation.addArifactToComponent(artifact, (String) operationStatus.left().value().getUniqueId(), NodeTypeEnum.InterfaceOperation, true, true);
             if (artStatus.isRight()) {
-                titanGenericDao.rollback();
+                janusGraphGenericDao.rollback();
                 log.error("Failed to add artifact {} to interface {}", operationName, interfaceName);
             } else {
                 newOperation = this.convertOperationDataToOperation(opData);
@@ -532,10 +548,10 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
         // Operation newOperation = null;
         ResourceMetadataData resourceData = new ResourceMetadataData();
         resourceData.getMetadataDataDefinition().setUniqueId(resourceId);
-        Either<InterfaceData, TitanOperationStatus> parentInterfaceStatus = findInterfaceOnParentNode(resourceId, interfaceName);
+        Either<InterfaceData, JanusGraphOperationStatus> parentInterfaceStatus = findInterfaceOnParentNode(resourceId, interfaceName);
         if (parentInterfaceStatus.isRight()) {
             log.debug("Interface {} not exist", interfaceName);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(parentInterfaceStatus.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(parentInterfaceStatus.right().value()));
         }
 
         InterfaceData interfaceData = parentInterfaceStatus.left().value();
@@ -546,25 +562,27 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
 
         newInterfaceInfo.setUniqueId(UniqueIdBuilder.buildPropertyUniqueId(resourceId, interfaceNameSplitted));
         InterfaceData updatedInterfaceData = new InterfaceData(newInterfaceInfo);
-        Either<InterfaceData, TitanOperationStatus> createStatus = createInterfaceNodeAndRelation(interfaceName, resourceId, updatedInterfaceData, resourceData);
+        Either<InterfaceData, JanusGraphOperationStatus> createStatus = createInterfaceNodeAndRelation(interfaceName, resourceId, updatedInterfaceData, resourceData);
         if (createStatus.isRight()) {
             log.debug("failed to create interface node  {} on resource  {}", interfaceName,  resourceId);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(createStatus.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(createStatus.right().value()));
         }
 
         InterfaceData newInterfaceNode = createStatus.left().value();
-        Either<GraphRelation, TitanOperationStatus> createRelResult = titanGenericDao.createRelation(newInterfaceNode, interfaceData, GraphEdgeLabels.DERIVED_FROM, null);
+        Either<GraphRelation, JanusGraphOperationStatus> createRelResult = janusGraphGenericDao
+            .createRelation(newInterfaceNode, interfaceData, GraphEdgeLabels.DERIVED_FROM, null);
         if (createRelResult.isRight()) {
-            TitanOperationStatus operationStatus = createRelResult.right().value();
+            JanusGraphOperationStatus operationStatus = createRelResult.right().value();
             log.error("Failed to associate interface {} to interface {} in graph. status is {}", interfaceData.getUniqueId(), newInterfaceNode.getUniqueId(),  operationStatus);
 
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(operationStatus));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(operationStatus));
         }
-        Either<List<ImmutablePair<OperationData, GraphEdge>>, TitanOperationStatus> operationRes = titanGenericDao.getChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), (String) interfaceData.getUniqueId(),
+        Either<List<ImmutablePair<OperationData, GraphEdge>>, JanusGraphOperationStatus> operationRes = janusGraphGenericDao
+            .getChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), (String) interfaceData.getUniqueId(),
                 GraphEdgeLabels.INTERFACE_OPERATION, NodeTypeEnum.InterfaceOperation, OperationData.class);
         if (operationRes.isRight()) {
             log.error("Failed to find operation  {} on interface {}", operationName, interfaceName);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(operationRes.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(operationRes.right().value()));
 
         } else {
             List<ImmutablePair<OperationData, GraphEdge>> operations = operationRes.left().value();
@@ -585,9 +603,10 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
         return Either.right(StorageOperationStatus.GENERAL_ERROR);
     }
 
-    private Either<InterfaceData, TitanOperationStatus> findInterfaceOnParentNode(String resourceId, String interfaceName) {
+    private Either<InterfaceData, JanusGraphOperationStatus> findInterfaceOnParentNode(String resourceId, String interfaceName) {
 
-        Either<ImmutablePair<ResourceMetadataData, GraphEdge>, TitanOperationStatus> parentRes = titanGenericDao.getChild(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), resourceId, GraphEdgeLabels.DERIVED_FROM, NodeTypeEnum.Resource,
+        Either<ImmutablePair<ResourceMetadataData, GraphEdge>, JanusGraphOperationStatus> parentRes = janusGraphGenericDao
+            .getChild(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), resourceId, GraphEdgeLabels.DERIVED_FROM, NodeTypeEnum.Resource,
                 ResourceMetadataData.class);
         if (parentRes.isRight()) {
             log.debug("interface {} not found ", interfaceName);
@@ -595,7 +614,8 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
         }
         ImmutablePair<ResourceMetadataData, GraphEdge> parenNode = parentRes.left().value();
 
-        Either<List<ImmutablePair<InterfaceData, GraphEdge>>, TitanOperationStatus> childrenNodes = titanGenericDao.getChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), parenNode.getKey().getMetadataDataDefinition().getUniqueId(),
+        Either<List<ImmutablePair<InterfaceData, GraphEdge>>, JanusGraphOperationStatus> childrenNodes = janusGraphGenericDao
+            .getChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), parenNode.getKey().getMetadataDataDefinition().getUniqueId(),
                 GraphEdgeLabels.INTERFACE, NodeTypeEnum.Interface, InterfaceData.class);
         if (childrenNodes.isRight()) {
             return findInterfaceOnParentNode(parenNode.getKey().getMetadataDataDefinition().getUniqueId(), interfaceName);
@@ -619,16 +639,16 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
     @Override
     public Either<InterfaceDefinition, StorageOperationStatus> createInterfaceOnResource(InterfaceDefinition interf, String resourceId, String interfaceName, boolean failIfExist, boolean inTransaction) {
 
-        Either<InterfaceData, TitanOperationStatus> status = addInterfaceToGraph(interf, interfaceName, resourceId);
+        Either<InterfaceData, JanusGraphOperationStatus> status = addInterfaceToGraph(interf, interfaceName, resourceId);
 
         if (status.isRight()) {
-            titanGenericDao.rollback();
+            janusGraphGenericDao.rollback();
             log.error("Failed to add interface {} to resource {}", interfaceName, resourceId);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status.right().value()));
         } else {
 
             if (!inTransaction) {
-                titanGenericDao.commit();
+                janusGraphGenericDao.commit();
             }
             InterfaceData interfaceData = status.left().value();
 
@@ -640,13 +660,13 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
                 for (String operationName : opNames) {
 
                     Operation op = operations.get(operationName);
-                    Either<OperationData, TitanOperationStatus> opStatus = addOperationToGraph(interf, operationName, op, interfaceData);
+                    Either<OperationData, JanusGraphOperationStatus> opStatus = addOperationToGraph(interf, operationName, op, interfaceData);
                     if (status.isRight()) {
-                        titanGenericDao.rollback();
+                        janusGraphGenericDao.rollback();
                         log.error("Failed to add operation {} to interface {}", operationName, interfaceName);
                     } else if (status.isLeft()) {
                         if (!inTransaction) {
-                            titanGenericDao.commit();
+                            janusGraphGenericDao.commit();
                         }
                         OperationData opData = opStatus.left().value();
                         Operation newOperation = this.convertOperationDataToOperation(opData);
@@ -655,7 +675,7 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
                         if (art != null) {
                             Either<ArtifactDefinition, StorageOperationStatus> artRes = artifactOperation.addArifactToComponent(art, (String) opData.getUniqueId(), NodeTypeEnum.InterfaceOperation, failIfExist, true);
                             if (artRes.isRight()) {
-                                titanGenericDao.rollback();
+                                janusGraphGenericDao.rollback();
                                 log.error("Failed to add artifact {} to interface {}", operationName, interfaceName);
                             } else {
                                 newOperation.setImplementation(artRes.left().value());
@@ -675,16 +695,16 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
     @Override
     public Either<Operation, StorageOperationStatus> deleteInterfaceOperation(String resourceId, String interfaceName, String operationId, boolean inTransaction) {
 
-        Either<Operation, TitanOperationStatus> status = removeOperationOnGraph(resourceId, interfaceName, operationId);
+        Either<Operation, JanusGraphOperationStatus> status = removeOperationOnGraph(resourceId, interfaceName, operationId);
         if (status.isRight()) {
             if (!inTransaction) {
-                titanGenericDao.rollback();
+                janusGraphGenericDao.rollback();
             }
             log.error("Failed to delete operation {} of interface {} resource {}", operationId, interfaceName, resourceId);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status.right().value()));
         } else {
             if (!inTransaction) {
-                titanGenericDao.commit();
+                janusGraphGenericDao.commit();
             }
 
             Operation opDefResult = status.left().value();// convertOperationDataToOperation(operationData);
@@ -694,10 +714,11 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
 
     }
 
-    private Either<Operation, TitanOperationStatus> removeOperationOnGraph(String resourceId, String interfaceName, String operationId) {
+    private Either<Operation, JanusGraphOperationStatus> removeOperationOnGraph(String resourceId, String interfaceName, String operationId) {
         log.debug("Before deleting operation from graph {}", operationId);
 
-        Either<List<ImmutablePair<InterfaceData, GraphEdge>>, TitanOperationStatus> childrenNodes = titanGenericDao.getChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), resourceId, GraphEdgeLabels.INTERFACE, NodeTypeEnum.Interface,
+        Either<List<ImmutablePair<InterfaceData, GraphEdge>>, JanusGraphOperationStatus> childrenNodes = janusGraphGenericDao
+            .getChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), resourceId, GraphEdgeLabels.INTERFACE, NodeTypeEnum.Interface,
                 InterfaceData.class);
 
         if (childrenNodes.isRight()) {
@@ -713,7 +734,8 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
             String interfaceSplitedName = splitType(interfaceName);
 
             if (interfaceEdgeProp.get(GraphPropertiesDictionary.NAME.getProperty()).equals(interfaceSplitedName)) {
-                Either<List<ImmutablePair<OperationData, GraphEdge>>, TitanOperationStatus> operationRes = titanGenericDao.getChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), (String) interfaceDataNode.getLeft().getUniqueId(),
+                Either<List<ImmutablePair<OperationData, GraphEdge>>, JanusGraphOperationStatus> operationRes = janusGraphGenericDao
+                    .getChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), (String) interfaceDataNode.getLeft().getUniqueId(),
                         GraphEdgeLabels.INTERFACE_OPERATION, NodeTypeEnum.InterfaceOperation, OperationData.class);
                 if (operationRes.isRight()) {
                     log.error("Failed to find operation {} on interface {}", operationId, interfaceName);
@@ -726,7 +748,8 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
                     opData = operationPairEdge.getLeft();
                     if (opData.getUniqueId().equals(operationId)) {
 
-                        Either<ImmutablePair<ArtifactData, GraphEdge>, TitanOperationStatus> artifactRes = titanGenericDao.getChild(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), (String) operationPairEdge.getLeft().getUniqueId(),
+                        Either<ImmutablePair<ArtifactData, GraphEdge>, JanusGraphOperationStatus> artifactRes = janusGraphGenericDao
+                            .getChild(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), (String) operationPairEdge.getLeft().getUniqueId(),
                                 GraphEdgeLabels.ARTIFACT_REF, NodeTypeEnum.ArtifactRef, ArtifactData.class);
                         Either<ArtifactDefinition, StorageOperationStatus> arStatus = null;
                         if (artifactRes.isLeft()) {
@@ -734,13 +757,14 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
                             arStatus = artifactOperation.removeArifactFromResource((String) operationPairEdge.getLeft().getUniqueId(), (String) arData.getUniqueId(), NodeTypeEnum.InterfaceOperation, true, true);
                             if (arStatus.isRight()) {
                                 log.debug("failed to delete artifact {}", arData.getUniqueId());
-                                return Either.right(TitanOperationStatus.INVALID_ID);
+                                return Either.right(JanusGraphOperationStatus.INVALID_ID);
                             }
                         }
-                        Either<OperationData, TitanOperationStatus> deleteOpStatus = titanGenericDao.deleteNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.InterfaceOperation), opData.getUniqueId(), OperationData.class);
+                        Either<OperationData, JanusGraphOperationStatus> deleteOpStatus = janusGraphGenericDao
+                            .deleteNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.InterfaceOperation), opData.getUniqueId(), OperationData.class);
                         if (deleteOpStatus.isRight()) {
                             log.debug("failed to delete operation {}", opData.getUniqueId());
-                            return Either.right(TitanOperationStatus.INVALID_ID);
+                            return Either.right(JanusGraphOperationStatus.INVALID_ID);
                         }
                         opData = deleteOpStatus.left().value();
                         Operation operation = new Operation(opData.getOperationDataDefinition());
@@ -748,10 +772,11 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
                             operation.setImplementation(arStatus.left().value());
                         }
                         if (operations.size() <= 1) {
-                            Either<InterfaceData, TitanOperationStatus> deleteInterfaceStatus = titanGenericDao.deleteNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Interface), interfaceDataNode.left.getUniqueId(), InterfaceData.class);
+                            Either<InterfaceData, JanusGraphOperationStatus> deleteInterfaceStatus = janusGraphGenericDao
+                                .deleteNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Interface), interfaceDataNode.left.getUniqueId(), InterfaceData.class);
                             if (deleteInterfaceStatus.isRight()) {
                                 log.debug("failed to delete interface {}", interfaceDataNode.left.getUniqueId());
-                                return Either.right(TitanOperationStatus.INVALID_ID);
+                                return Either.right(JanusGraphOperationStatus.INVALID_ID);
                             }
 
                         }
@@ -764,7 +789,7 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
         }
 
         log.debug("Not found operation {}", interfaceName);
-        return Either.right(TitanOperationStatus.INVALID_ID);
+        return Either.right(JanusGraphOperationStatus.INVALID_ID);
     }
 
     private String splitType(String interfaceName) {
@@ -783,10 +808,10 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
     /**
      * FOR TEST ONLY
      *
-     * @param titanGenericDao
+     * @param janusGraphGenericDao
      */
-    public void setTitanGenericDao(TitanGenericDao titanGenericDao) {
-        this.titanGenericDao = titanGenericDao;
+    public void setJanusGraphGenericDao(JanusGraphGenericDao janusGraphGenericDao) {
+        this.janusGraphGenericDao = janusGraphGenericDao;
     }
 
     public void setArtifactOperation(ArtifactOperation artifactOperation) {
@@ -801,7 +826,8 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
             InterfaceData interfaceData = new InterfaceData(interf);
             interf.setUniqueId(interf.getType().toLowerCase());
 
-            Either<InterfaceData, TitanOperationStatus> existInterface = titanGenericDao.getNode(interfaceData.getUniqueIdKey(), interfaceData.getUniqueId(), InterfaceData.class);
+            Either<InterfaceData, JanusGraphOperationStatus> existInterface = janusGraphGenericDao
+                .getNode(interfaceData.getUniqueIdKey(), interfaceData.getUniqueId(), InterfaceData.class);
 
             if (existInterface.isLeft()) {
                 // already exist
@@ -811,13 +837,14 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
             }
 
             log.debug("Before adding interface type to graph {}", interfaceData);
-            Either<InterfaceData, TitanOperationStatus> createNodeResult = titanGenericDao.createNode(interfaceData, InterfaceData.class);
+            Either<InterfaceData, JanusGraphOperationStatus> createNodeResult = janusGraphGenericDao
+                .createNode(interfaceData, InterfaceData.class);
             log.debug("After adding property type to graph {}", interfaceData);
 
             if (createNodeResult.isRight()) {
-                TitanOperationStatus operationStatus = createNodeResult.right().value();
+                JanusGraphOperationStatus operationStatus = createNodeResult.right().value();
                 log.error("Failed to add interface {} to graph. status is {}", interf.getType(), operationStatus);
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(operationStatus));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(operationStatus));
                 return result;
             }
 
@@ -828,12 +855,12 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
                 Map<String, Operation> newOperations = new HashMap<>();
 
                 for (Map.Entry<String, Operation> operation : operations.entrySet()) {
-                    Either<OperationData, TitanOperationStatus> opStatus = addOperationToGraph(interf, operation.getKey(), operation.getValue(), interfaceData);
+                    Either<OperationData, JanusGraphOperationStatus> opStatus = addOperationToGraph(interf, operation.getKey(), operation.getValue(), interfaceData);
                     if (opStatus.isRight()) {
-                        titanGenericDao.rollback();
+                        janusGraphGenericDao.rollback();
                         log.error("Failed to add operation {} to interface {}", operation.getKey(), interf.getType());
 
-                        result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(opStatus.right().value()));
+                        result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(opStatus.right().value()));
                         return result;
                     } else {
                         OperationData opData = opStatus.left().value();
@@ -849,10 +876,10 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
             if (!inTransaction) {
                 if (result == null || result.isRight()) {
                     log.error("Going to execute rollback on graph.");
-                    titanGenericDao.rollback();
+                    janusGraphGenericDao.rollback();
                 } else {
                     log.debug("Going to execute commit on graph.");
-                    titanGenericDao.commit();
+                    janusGraphGenericDao.commit();
                 }
             }
         }
@@ -861,14 +888,15 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
 
     @Override
     public Either<InterfaceDefinition, StorageOperationStatus> getInterface(String interfaceId) {
-        Either<InterfaceData, TitanOperationStatus> getResult = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Interface), interfaceId, InterfaceData.class);
+        Either<InterfaceData, JanusGraphOperationStatus> getResult = janusGraphGenericDao
+            .getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Interface), interfaceId, InterfaceData.class);
         if (getResult.isLeft()) {
             InterfaceData interfaceData = getResult.left().value();
             return Either.left(convertInterfaceDataToInterfaceDefinition(interfaceData));
         } else {
-            TitanOperationStatus titanStatus = getResult.right().value();
-            log.debug("Node with id {} was not found in the graph. status: {}", interfaceId, titanStatus);
-            StorageOperationStatus storageOperationStatus = DaoStatusConverter.convertTitanStatusToStorageStatus(titanStatus);
+            JanusGraphOperationStatus janusGraphStatus = getResult.right().value();
+            log.debug("Node with id {} was not found in the graph. status: {}", interfaceId, janusGraphStatus);
+            StorageOperationStatus storageOperationStatus = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(janusGraphStatus);
             return Either.right(storageOperationStatus);
         }
     }
@@ -894,10 +922,11 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
     @Override
     public Either<Map<String, InterfaceDefinition>, StorageOperationStatus> getAllInterfaceLifecycleTypes() {
 
-        Either<List<InterfaceData>, TitanOperationStatus> allInterfaceLifecycleTypes =
-            titanGenericDao.getByCriteria(NodeTypeEnum.Interface, Collections.emptyMap(), InterfaceData.class);
+        Either<List<InterfaceData>, JanusGraphOperationStatus> allInterfaceLifecycleTypes =
+            janusGraphGenericDao
+                .getByCriteria(NodeTypeEnum.Interface, Collections.emptyMap(), InterfaceData.class);
         if (allInterfaceLifecycleTypes.isRight()) {
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus
                 (allInterfaceLifecycleTypes.right().value()));
         }
 
@@ -909,8 +938,8 @@ public class InterfaceLifecycleOperation implements IInterfaceLifecycleOperation
             .collect(Collectors.toList());
 
         for (InterfaceDefinition interfaceDefinition : interfaceDefinitions) {
-            Either<List<ImmutablePair<OperationData, GraphEdge>>, TitanOperationStatus>
-                    childrenNodes = titanGenericDao.getChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(),
+            Either<List<ImmutablePair<OperationData, GraphEdge>>, JanusGraphOperationStatus>
+                    childrenNodes = janusGraphGenericDao.getChildrenNodes(GraphPropertiesDictionary.UNIQUE_ID.getProperty(),
                     interfaceDefinition.getUniqueId(), GraphEdgeLabels.INTERFACE_OPERATION, NodeTypeEnum.InterfaceOperation, OperationData.class);
             if (childrenNodes.isLeft()) {
                 Map<String, OperationDataDefinition> operationsDataDefinitionMap = new HashMap<>();
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/OperationUtils.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/OperationUtils.java
index a06d342d26..2266acf88f 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/OperationUtils.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/OperationUtils.java
@@ -1,8 +1,8 @@
 package org.openecomp.sdc.be.model.operations.impl;
 
 import fj.data.Either;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.openecomp.sdc.be.model.operations.StorageException;
@@ -14,32 +14,33 @@ import java.util.Map;
 @Component
 public class OperationUtils {
 
-    private final TitanDao titanDao;
+    private final JanusGraphDao janusGraphDao;
 
     private static final Logger logger = Logger.getLogger(OperationUtils.class.getName());
 
-    public OperationUtils(TitanDao titanDao) {
-        this.titanDao = titanDao;
+    public OperationUtils(JanusGraphDao janusGraphDao) {
+        this.janusGraphDao = janusGraphDao;
     }
 
-    public <T> T onTitanOperationFailure(TitanOperationStatus status) {
-        titanDao.rollback();
+    public <T> T onJanusGraphOperationFailure(JanusGraphOperationStatus status) {
+        janusGraphDao.rollback();
         throw new StorageException(status);
     }
 
-    static Either<Map<String, PropertyDefinition>, TitanOperationStatus> fillProperties(String uniqueId,
-                                                                                        PropertyOperation propertyOperation,
-                                                                                        NodeTypeEnum nodeTypeEnum) {
+    static Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> fillProperties(String uniqueId,
+                                                                                             PropertyOperation propertyOperation,
+                                                                                             NodeTypeEnum nodeTypeEnum) {
 
-        Either<Map<String, PropertyDefinition>, TitanOperationStatus> findPropertiesOfNode =
+        Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> findPropertiesOfNode =
                 propertyOperation.findPropertiesOfNode(nodeTypeEnum, uniqueId);
         if (findPropertiesOfNode.isRight()) {
-            TitanOperationStatus titanOperationStatus = findPropertiesOfNode.right().value();
-            logger.debug("After looking for properties of vertex {}. status is {}", uniqueId, titanOperationStatus);
-            if (TitanOperationStatus.NOT_FOUND.equals(titanOperationStatus)) {
-                return Either.right(TitanOperationStatus.OK);
+            JanusGraphOperationStatus janusGraphOperationStatus = findPropertiesOfNode.right().value();
+            logger.debug("After looking for properties of vertex {}. status is {}", uniqueId,
+                janusGraphOperationStatus);
+            if (JanusGraphOperationStatus.NOT_FOUND.equals(janusGraphOperationStatus)) {
+                return Either.right(JanusGraphOperationStatus.OK);
             } else {
-                return Either.right(titanOperationStatus);
+                return Either.right(janusGraphOperationStatus);
             }
         } else {
             return Either.left(findPropertiesOfNode.left().value());
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/PolicyTypeOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/PolicyTypeOperation.java
index 76652e1cce..e8a74fe79d 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/PolicyTypeOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/PolicyTypeOperation.java
@@ -20,12 +20,12 @@
 
 package org.openecomp.sdc.be.model.operations.impl;
 
-import com.thinkaurelius.titan.graphdb.query.TitanPredicate;
+import org.janusgraph.graphdb.query.JanusGraphPredicate;
 import fj.data.Either;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.PolicyTypeDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.PolicyTypeDefinition;
@@ -42,7 +42,7 @@ import org.springframework.stereotype.Component;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static org.openecomp.sdc.be.dao.titan.TitanUtils.buildNotInPredicate;
+import static org.openecomp.sdc.be.dao.janusgraph.JanusGraphUtils.buildNotInPredicate;
 
 @Component("policy-type-operation")
 public class PolicyTypeOperation extends AbstractOperation implements IPolicyTypeOperation {
@@ -94,12 +94,13 @@ public class PolicyTypeOperation extends AbstractOperation implements IPolicyTyp
 
     @Override
     public List<PolicyTypeDefinition> getAllPolicyTypes(Set<String> excludedPolicyTypes) {
-        Map<String, Map.Entry<TitanPredicate, Object>> predicateCriteria = buildNotInPredicate(GraphPropertiesDictionary.TYPE.getProperty(), excludedPolicyTypes);
-        return titanGenericDao.getByCriteriaWithPredicate(NodeTypeEnum.PolicyType, predicateCriteria, PolicyTypeData.class)
+        Map<String, Map.Entry<JanusGraphPredicate, Object>> predicateCriteria = buildNotInPredicate(GraphPropertiesDictionary.TYPE.getProperty(), excludedPolicyTypes);
+        return janusGraphGenericDao
+            .getByCriteriaWithPredicate(NodeTypeEnum.PolicyType, predicateCriteria, PolicyTypeData.class)
                 .left()
                 .map(this::convertPolicyTypesToDefinition)
                 .left()
-                .on(operationUtils::onTitanOperationFailure);
+                .on(operationUtils::onJanusGraphOperationFailure);
     }
 
     private List<PolicyTypeDefinition> convertPolicyTypesToDefinition(List<PolicyTypeData> policiesTypes) {
@@ -113,18 +114,19 @@ public class PolicyTypeOperation extends AbstractOperation implements IPolicyTyp
         String ptUniqueId = UniqueIdBuilder.buildPolicyTypeUid(policyTypeDef.getType(), policyTypeDef.getVersion(), "policytype");
         PolicyTypeData policyTypeData = buildPolicyTypeData(policyTypeDef, ptUniqueId);
         log.debug("Before adding policy type to graph. policyTypeData = {}", policyTypeData);
-        Either<PolicyTypeData, TitanOperationStatus> eitherPolicyTypeData = titanGenericDao.createNode(policyTypeData, PolicyTypeData.class);
+        Either<PolicyTypeData, JanusGraphOperationStatus> eitherPolicyTypeData = janusGraphGenericDao
+            .createNode(policyTypeData, PolicyTypeData.class);
         log.debug("After adding policy type to graph. status is = {}", eitherPolicyTypeData);
         if (eitherPolicyTypeData.isRight()) {
-            TitanOperationStatus operationStatus = eitherPolicyTypeData.right().value();
+            JanusGraphOperationStatus operationStatus = eitherPolicyTypeData.right().value();
             log.error("Failed to add policy type {} to graph. status is {}", policyTypeDef.getType(), operationStatus);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(operationStatus));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(operationStatus));
         }
         List<PropertyDefinition> properties = policyTypeDef.getProperties();
-        Either<Map<String, PropertyData>, TitanOperationStatus> addPropertiesToPolicyType = propertyOperation.addPropertiesToElementType(ptUniqueId, NodeTypeEnum.PolicyType, properties);
+        Either<Map<String, PropertyData>, JanusGraphOperationStatus> addPropertiesToPolicyType = propertyOperation.addPropertiesToElementType(ptUniqueId, NodeTypeEnum.PolicyType, properties);
         if (addPropertiesToPolicyType.isRight()) {
             log.error("Failed add properties {} to policy {}", properties, policyTypeDef.getType());
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(addPropertiesToPolicyType.right().value()));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(addPropertiesToPolicyType.right().value()));
         }
         return addDerivedFromRelation(policyTypeDef, ptUniqueId)
             .left()
@@ -139,9 +141,10 @@ public class PolicyTypeOperation extends AbstractOperation implements IPolicyTyp
             return result;
         }
 
-        Either<List<PolicyTypeData>, TitanOperationStatus> eitherPolicyData = titanGenericDao.getByCriteria(NodeTypeEnum.PolicyType, properties, PolicyTypeData.class);
+        Either<List<PolicyTypeData>, JanusGraphOperationStatus> eitherPolicyData = janusGraphGenericDao
+            .getByCriteria(NodeTypeEnum.PolicyType, properties, PolicyTypeData.class);
         if (eitherPolicyData.isRight()) {
-            result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(eitherPolicyData.right().value()));
+            result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(eitherPolicyData.right().value()));
         } else {
             PolicyTypeDataDefinition dataDefinition = eitherPolicyData.left().value().stream().map(PolicyTypeData::getPolicyTypeDataDefinition).findFirst().get();
             result = getPolicyTypeByUid(dataDefinition.getUniqueId());
@@ -152,9 +155,10 @@ public class PolicyTypeOperation extends AbstractOperation implements IPolicyTyp
 
     private Either<PolicyTypeDefinition, StorageOperationStatus> getPolicyTypeByUid(String uniqueId) {
         log.debug("#getPolicyTypeByUid - fetching policy type with id {}", uniqueId);
-        return titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.PolicyType), uniqueId, PolicyTypeData.class)
+        return janusGraphGenericDao
+            .getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.PolicyType), uniqueId, PolicyTypeData.class)
                 .right()
-                .map(DaoStatusConverter::convertTitanStatusToStorageStatus)
+                .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus)
                 .left()
                 .bind(policyType -> createPolicyTypeDefinition(uniqueId, policyType));
     }
@@ -207,11 +211,11 @@ public class PolicyTypeOperation extends AbstractOperation implements IPolicyTyp
         return Either.right(err);
     }
 
-    Either<Map<String, PropertyDefinition>, StorageOperationStatus> handlePolicyTypeHasNoProperties(TitanOperationStatus err) {
-        if (err == TitanOperationStatus.NOT_FOUND) {
+    Either<Map<String, PropertyDefinition>, StorageOperationStatus> handlePolicyTypeHasNoProperties(JanusGraphOperationStatus err) {
+        if (err == JanusGraphOperationStatus.NOT_FOUND) {
             return Either.left(new HashMap<>());
         }
-        return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(err));
+        return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(err));
     }
 
     private PolicyTypeData setDerivedFrom(PolicyTypeDefinition policyTypeDefinition, PolicyTypeData derivedFrom) {
@@ -238,9 +242,9 @@ public class PolicyTypeOperation extends AbstractOperation implements IPolicyTyp
 
     private Either<PolicyTypeDefinition, StorageOperationStatus> updatePolicyTypeOnGraph(PolicyTypeDefinition updatedPolicyType, PolicyTypeDefinition currPolicyType) {
         updatePolicyTypeData(updatedPolicyType, currPolicyType);
-        return titanGenericDao.updateNode(new PolicyTypeData(updatedPolicyType), PolicyTypeData.class)
+        return janusGraphGenericDao.updateNode(new PolicyTypeData(updatedPolicyType), PolicyTypeData.class)
                 .right()
-                .map(DaoStatusConverter::convertTitanStatusToStorageStatus)
+                .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus)
                 .left()
                 .bind(updatedNode -> updatePolicyProperties(updatedPolicyType.getUniqueId(), updatedPolicyType.getProperties()))
                 .left()
@@ -291,7 +295,7 @@ public class PolicyTypeOperation extends AbstractOperation implements IPolicyTyp
         log.debug("#addPropertiesToPolicy - adding policy type properties for policy type with id {}", policyTypeId);
         return propertyOperation.addPropertiesToElementType(policyTypeId, NodeTypeEnum.PolicyType, properties)
                 .right()
-                .map(DaoStatusConverter::convertTitanStatusToStorageStatus);
+                .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
     }
 
     private void updatePolicyTypeData(PolicyTypeDefinition updatedTypeDefinition, PolicyTypeDefinition currTypeDefinition) {
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperation.java
index fb023c7f45..54fea421a0 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperation.java
@@ -33,9 +33,9 @@ import com.google.gson.JsonParseException;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
-import com.thinkaurelius.titan.core.TitanGraph;
-import com.thinkaurelius.titan.core.TitanVertex;
-import com.thinkaurelius.titan.core.TitanVertexProperty;
+import org.janusgraph.core.JanusGraph;
+import org.janusgraph.core.JanusGraphVertex;
+import org.janusgraph.core.JanusGraphVertexProperty;
 import fj.data.Either;
 import java.io.IOException;
 import java.lang.reflect.Type;
@@ -66,11 +66,11 @@ import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphElementTypeEnum;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphNode;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.HealingTitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.HealingJanusGraphGenericDao;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.PropertyRule;
 import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition;
@@ -132,8 +132,8 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 
 	}
 
-	public PropertyOperation(HealingTitanGenericDao titanGenericDao, DerivedFromOperation derivedFromOperation) {
-		this.titanGenericDao = titanGenericDao;
+	public PropertyOperation(HealingJanusGraphGenericDao janusGraphGenericDao, DerivedFromOperation derivedFromOperation) {
+		this.janusGraphGenericDao = janusGraphGenericDao;
 		this.derivedFromOperation = derivedFromOperation;
 	}
 
@@ -331,9 +331,9 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 
 	public Either<PropertyData, StorageOperationStatus> addProperty(String propertyName, PropertyDefinition propertyDefinition, String resourceId) {
 
-		Either<PropertyData, TitanOperationStatus> either = addPropertyToGraph(propertyName, propertyDefinition, resourceId);
+		Either<PropertyData, JanusGraphOperationStatus> either = addPropertyToGraph(propertyName, propertyDefinition, resourceId);
 		if (either.isRight()) {
-			StorageOperationStatus storageStatus = DaoStatusConverter.convertTitanStatusToStorageStatus(either.right().value());
+			StorageOperationStatus storageStatus = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(either.right().value());
 			return Either.right(storageStatus);
 		}
 		return Either.left(either.left().value());
@@ -366,7 +366,7 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 		}
 		String innerType = null;
 
-		Either<String, TitanOperationStatus> checkInnerType = getInnerType(type, propertyDefinition::getSchema);
+		Either<String, JanusGraphOperationStatus> checkInnerType = getInnerType(type, propertyDefinition::getSchema);
 		if (checkInnerType.isRight()) {
 			return StorageOperationStatus.INVALID_TYPE;
 		}
@@ -392,7 +392,7 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 		return StorageOperationStatus.OK;
 	}
 
-	public Either<PropertyData, TitanOperationStatus> addPropertyToGraph(String propertyName, PropertyDefinition propertyDefinition, String resourceId) {
+	public Either<PropertyData, JanusGraphOperationStatus> addPropertyToGraph(String propertyName, PropertyDefinition propertyDefinition, String resourceId) {
 
 		ResourceMetadataData resourceData = new ResourceMetadataData();
 		resourceData.getMetadataDataDefinition().setUniqueId(resourceId);
@@ -403,19 +403,21 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 		PropertyData propertyData = new PropertyData(propertyDefinition, convertConstraintsToString(constraints));
 
 		log.debug(BEFORE_ADDING_PROPERTY_TO_GRAPH, propertyData);
-		Either<PropertyData, TitanOperationStatus> createNodeResult = titanGenericDao.createNode(propertyData, PropertyData.class);
+		Either<PropertyData, JanusGraphOperationStatus> createNodeResult = janusGraphGenericDao
+				.createNode(propertyData, PropertyData.class);
 		log.debug(AFTER_ADDING_PROPERTY_TO_GRAPH, propertyData);
 		if (createNodeResult.isRight()) {
-			TitanOperationStatus operationStatus = createNodeResult.right().value();
+			JanusGraphOperationStatus operationStatus = createNodeResult.right().value();
 			log.error("Failed to add property {} to graph. status is {}", propertyName, operationStatus);
 			return Either.right(operationStatus);
 		}
 
 		Map<String, Object> props = new HashMap<>();
 		props.put(GraphPropertiesDictionary.NAME.getProperty(), propertyName);
-		Either<GraphRelation, TitanOperationStatus> createRelResult = titanGenericDao.createRelation(resourceData, propertyData, GraphEdgeLabels.PROPERTY, props);
+		Either<GraphRelation, JanusGraphOperationStatus> createRelResult = janusGraphGenericDao
+				.createRelation(resourceData, propertyData, GraphEdgeLabels.PROPERTY, props);
 		if (createRelResult.isRight()) {
-			TitanOperationStatus operationStatus = createNodeResult.right().value();
+			JanusGraphOperationStatus operationStatus = createNodeResult.right().value();
 			log.error(FAILED_TO_ASSOCIATE_RESOURCE_TO_PROPERTY_IN_GRAPH_STATUS_IS, resourceId, propertyName, operationStatus);
 			return Either.right(operationStatus);
 		}
@@ -424,7 +426,7 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 
 	}
 
-	public TitanOperationStatus addPropertyToGraphByVertex(TitanVertex metadataVertex, String propertyName, PropertyDefinition propertyDefinition, String resourceId) {
+	public JanusGraphOperationStatus addPropertyToGraphByVertex(JanusGraphVertex metadataVertex, String propertyName, PropertyDefinition propertyDefinition, String resourceId) {
 
 		List<PropertyConstraint> constraints = propertyDefinition.getConstraints();
 
@@ -432,19 +434,21 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 		PropertyData propertyData = new PropertyData(propertyDefinition, convertConstraintsToString(constraints));
 
 		log.debug(BEFORE_ADDING_PROPERTY_TO_GRAPH, propertyData);
-		Either<TitanVertex, TitanOperationStatus> createNodeResult = titanGenericDao.createNode(propertyData);
+		Either<JanusGraphVertex, JanusGraphOperationStatus> createNodeResult = janusGraphGenericDao.createNode(propertyData);
 		log.debug(AFTER_ADDING_PROPERTY_TO_GRAPH, propertyData);
 		if (createNodeResult.isRight()) {
-			TitanOperationStatus operationStatus = createNodeResult.right().value();
+			JanusGraphOperationStatus operationStatus = createNodeResult.right().value();
 			log.error("Failed to add property {} to graph. status is ", propertyName, operationStatus);
 			return operationStatus;
 		}
 
 		Map<String, Object> props = new HashMap<>();
 		props.put(GraphPropertiesDictionary.NAME.getProperty(), propertyName);
-		TitanVertex propertyVertex = createNodeResult.left().value();
-		TitanOperationStatus createRelResult = titanGenericDao.createEdge(metadataVertex, propertyVertex, GraphEdgeLabels.PROPERTY, props);
-		if (!createRelResult.equals(TitanOperationStatus.OK)) {
+		JanusGraphVertex propertyVertex = createNodeResult.left().value();
+		JanusGraphOperationStatus
+				createRelResult = janusGraphGenericDao
+				.createEdge(metadataVertex, propertyVertex, GraphEdgeLabels.PROPERTY, props);
+		if (!createRelResult.equals(JanusGraphOperationStatus.OK)) {
 			log.error(FAILED_TO_ASSOCIATE_RESOURCE_TO_PROPERTY_IN_GRAPH_STATUS_IS, resourceId, propertyName, createRelResult);
 			return createRelResult;
 		}
@@ -453,13 +457,14 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 
 	}
 
-	public TitanGenericDao getTitanGenericDao() {
-		return titanGenericDao;
+	public JanusGraphGenericDao getJanusGraphGenericDao() {
+		return janusGraphGenericDao;
 	}
 
-	public Either<PropertyData, TitanOperationStatus> deletePropertyFromGraph(String propertyId) {
+	public Either<PropertyData, JanusGraphOperationStatus> deletePropertyFromGraph(String propertyId) {
 		log.debug("Before deleting property from graph {}", propertyId);
-		return titanGenericDao.deleteNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Property), propertyId, PropertyData.class);
+		return janusGraphGenericDao
+				.deleteNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Property), propertyId, PropertyData.class);
 	}
 
 	public Either<PropertyData, StorageOperationStatus> updateProperty(String propertyId, PropertyDefinition newPropertyDefinition, Map<String, DataTypeDefinition> dataTypes) {
@@ -469,20 +474,21 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 			return Either.right(validateAndUpdateProperty);
 		}
 
-		Either<PropertyData, TitanOperationStatus> either = updatePropertyFromGraph(propertyId, newPropertyDefinition);
+		Either<PropertyData, JanusGraphOperationStatus> either = updatePropertyFromGraph(propertyId, newPropertyDefinition);
 		if (either.isRight()) {
-			StorageOperationStatus storageStatus = DaoStatusConverter.convertTitanStatusToStorageStatus(either.right().value());
+			StorageOperationStatus storageStatus = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(either.right().value());
 			return Either.right(storageStatus);
 		}
 		return Either.left(either.left().value());
 	}
 
-	public Either<PropertyData, TitanOperationStatus> updatePropertyFromGraph(String propertyId, PropertyDefinition propertyDefinition) {
+	public Either<PropertyData, JanusGraphOperationStatus> updatePropertyFromGraph(String propertyId, PropertyDefinition propertyDefinition) {
 		if (log.isDebugEnabled())
 			log.debug("Before updating property on graph {}", propertyId);
 
 		// get the original property data
-		Either<PropertyData, TitanOperationStatus> statusProperty = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Property), propertyId, PropertyData.class);
+		Either<PropertyData, JanusGraphOperationStatus> statusProperty = janusGraphGenericDao
+				.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Property), propertyId, PropertyData.class);
 		if (statusProperty.isRight()) {
 			log.debug("Problem while get property with id {}. Reason - {}", propertyId, statusProperty.right().value().name());
 			return Either.right(statusProperty.right().value());
@@ -518,19 +524,19 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 		}
 		orgPropertyDataDefinition.setSchema(newPropertyDataDefinition.getSchema());
 
-		return titanGenericDao.updateNode(orgPropertyData, PropertyData.class);
+		return janusGraphGenericDao.updateNode(orgPropertyData, PropertyData.class);
 	}
 
 	/**
 	 * FOR TEST ONLY
 	 * 
-	 * @param titanGenericDao
+	 * @param janusGraphGenericDao
 	 */
-	public void setTitanGenericDao(HealingTitanGenericDao titanGenericDao) {
-		this.titanGenericDao = titanGenericDao;
+	public void setJanusGraphGenericDao(HealingJanusGraphGenericDao janusGraphGenericDao) {
+		this.janusGraphGenericDao = janusGraphGenericDao;
 	}
 
-	public Either<PropertyData, TitanOperationStatus> addPropertyToNodeType(String propertyName, PropertyDefinition propertyDefinition, NodeTypeEnum nodeType, String uniqueId) {
+	public Either<PropertyData, JanusGraphOperationStatus> addPropertyToNodeType(String propertyName, PropertyDefinition propertyDefinition, NodeTypeEnum nodeType, String uniqueId) {
 
 		List<PropertyConstraint> constraints = propertyDefinition.getConstraints();
 
@@ -539,11 +545,12 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 
 		if (log.isDebugEnabled())
 			log.debug(BEFORE_ADDING_PROPERTY_TO_GRAPH, propertyData);
-		Either<PropertyData, TitanOperationStatus> createNodeResult = titanGenericDao.createNode(propertyData, PropertyData.class);
+		Either<PropertyData, JanusGraphOperationStatus> createNodeResult = janusGraphGenericDao
+				.createNode(propertyData, PropertyData.class);
 		if (log.isDebugEnabled())
 			log.debug(AFTER_ADDING_PROPERTY_TO_GRAPH, propertyData);
 		if (createNodeResult.isRight()) {
-			TitanOperationStatus operationStatus = createNodeResult.right().value();
+			JanusGraphOperationStatus operationStatus = createNodeResult.right().value();
 			log.error("Failed to add property {} to graph. status is {}", propertyName, operationStatus);
 			return Either.right(operationStatus);
 		}
@@ -553,9 +560,10 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 
 		UniqueIdData uniqueIdData = new UniqueIdData(nodeType, uniqueId);
 		log.debug("Before associating {} to property {}", uniqueIdData, propertyName);
-		Either<GraphRelation, TitanOperationStatus> createRelResult = titanGenericDao.createRelation(uniqueIdData, propertyData, GraphEdgeLabels.PROPERTY, props);
+		Either<GraphRelation, JanusGraphOperationStatus> createRelResult = janusGraphGenericDao
+				.createRelation(uniqueIdData, propertyData, GraphEdgeLabels.PROPERTY, props);
 		if (createRelResult.isRight()) {
-			TitanOperationStatus operationStatus = createNodeResult.right().value();
+			JanusGraphOperationStatus operationStatus = createNodeResult.right().value();
 			log.error(FAILED_TO_ASSOCIATE_RESOURCE_TO_PROPERTY_IN_GRAPH_STATUS_IS, uniqueId, propertyName, operationStatus);
 			return Either.right(operationStatus);
 		}
@@ -564,15 +572,16 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 
 	}
 
-	public Either<Map<String, PropertyDefinition>, TitanOperationStatus> findPropertiesOfNode(NodeTypeEnum nodeType, String uniqueId) {
+	public Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> findPropertiesOfNode(NodeTypeEnum nodeType, String uniqueId) {
 
 		Map<String, PropertyDefinition> resourceProps = new HashMap<>();
 
-		Either<List<ImmutablePair<PropertyData, GraphEdge>>, TitanOperationStatus> childrenNodes = titanGenericDao.getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(nodeType), uniqueId, GraphEdgeLabels.PROPERTY, NodeTypeEnum.Property,
+		Either<List<ImmutablePair<PropertyData, GraphEdge>>, JanusGraphOperationStatus> childrenNodes = janusGraphGenericDao
+				.getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(nodeType), uniqueId, GraphEdgeLabels.PROPERTY, NodeTypeEnum.Property,
 				PropertyData.class);
 
 		if (childrenNodes.isRight()) {
-			TitanOperationStatus operationStatus = childrenNodes.right().value();
+			JanusGraphOperationStatus operationStatus = childrenNodes.right().value();
 			return Either.right(operationStatus);
 		}
 
@@ -600,15 +609,15 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
                 .bind(err -> err == StorageOperationStatus.OK ? Either.left(Collections.emptyMap()) : Either.right(err));
     }
     
-    public Either<Map<String, PropertyData>, TitanOperationStatus> mergePropertiesAssociatedToNode(NodeTypeEnum nodeType, String uniqueId, Map<String, PropertyDefinition> newProperties) {
-        Either<Map<String, PropertyDefinition>, TitanOperationStatus> oldPropertiesRes = findPropertiesOfNode(nodeType, uniqueId);
+    public Either<Map<String, PropertyData>, JanusGraphOperationStatus> mergePropertiesAssociatedToNode(NodeTypeEnum nodeType, String uniqueId, Map<String, PropertyDefinition> newProperties) {
+        Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> oldPropertiesRes = findPropertiesOfNode(nodeType, uniqueId);
         
         Map<String, PropertyDefinition> reallyNewProperties;
         Map<String, PropertyData> unchangedPropsData;
         
         if (oldPropertiesRes.isRight()) {
-            TitanOperationStatus err  = oldPropertiesRes.right().value();
-            if (err == TitanOperationStatus.NOT_FOUND) {
+            JanusGraphOperationStatus err  = oldPropertiesRes.right().value();
+            if (err == JanusGraphOperationStatus.NOT_FOUND) {
                 reallyNewProperties = newProperties;
                 unchangedPropsData = Collections.emptyMap();
             }
@@ -625,8 +634,8 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
                 PropertyDefinition newPropDef = newProperties != null? newProperties.get(key): null;
                 PropertyDefinition oldPropDef = oldEntry.getValue();
 
-                TitanOperationStatus status = updateOldProperty(newPropDef, oldPropDef);
-                if (status != TitanOperationStatus.OK) {
+                JanusGraphOperationStatus status = updateOldProperty(newPropDef, oldPropDef);
+                if (status != JanusGraphOperationStatus.OK) {
                     return Either.right(status);
                 }
             }
@@ -654,9 +663,9 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
      * @param newPropDef
      * @param oldPropDef
      */
-    private TitanOperationStatus updateOldProperty(PropertyDefinition newPropDef, PropertyDefinition oldPropDef) {
+    private JanusGraphOperationStatus updateOldProperty(PropertyDefinition newPropDef, PropertyDefinition oldPropDef) {
         if (!isUpdateAllowed(newPropDef, oldPropDef)) {
-            return TitanOperationStatus.MATCH_NOT_FOUND;
+            return JanusGraphOperationStatus.MATCH_NOT_FOUND;
         }
         
         if (isUpdateRequired(newPropDef, oldPropDef)) {
@@ -664,14 +673,15 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
             
             List<PropertyConstraint> constraints = oldPropDef.getConstraints();
             PropertyData node = new PropertyData(oldPropDef, convertConstraintsToString(constraints));
-            Either<PropertyData, TitanOperationStatus> updateResult = titanGenericDao.updateNode(node, PropertyData.class);
+            Either<PropertyData, JanusGraphOperationStatus> updateResult = janusGraphGenericDao
+								.updateNode(node, PropertyData.class);
             
             if (updateResult.isRight()) {
                 return updateResult.right().value();
             }
         }
         
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
     /**
@@ -703,7 +713,7 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
         oldPropDef.setDescription(newPropDef.getDescription());
         oldPropDef.setRequired(newPropDef.isRequired());
 
-        // Type is updated to fix possible null type issue in TITAN DB
+        // Type is updated to fix possible null type issue in janusGraph DB
         oldPropDef.setType(newPropDef.getType());
     }
 
@@ -723,7 +733,7 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
      * @param unchangedPropsData
      * @return
      */
-    private Either<Map<String, PropertyData>, TitanOperationStatus> addPropertiesToElementType(NodeTypeEnum nodeType, String uniqueId, Map<String, PropertyDefinition> newProperties, Map<String, PropertyData> unchangedPropsData) {
+    private Either<Map<String, PropertyData>, JanusGraphOperationStatus> addPropertiesToElementType(NodeTypeEnum nodeType, String uniqueId, Map<String, PropertyDefinition> newProperties, Map<String, PropertyData> unchangedPropsData) {
         return addPropertiesToElementType(uniqueId, nodeType, newProperties)
                 .left()
                 .map(m -> { 
@@ -735,28 +745,28 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 
 	public Either<Map<String, PropertyDefinition>, StorageOperationStatus> deleteAllPropertiesAssociatedToNode(NodeTypeEnum nodeType, String uniqueId) {
 
-		Either<Map<String, PropertyDefinition>, TitanOperationStatus> propertiesOfNodeRes = findPropertiesOfNode(nodeType, uniqueId);
+		Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> propertiesOfNodeRes = findPropertiesOfNode(nodeType, uniqueId);
 
 		if (propertiesOfNodeRes.isRight()) {
-			TitanOperationStatus status = propertiesOfNodeRes.right().value();
-			if (status == TitanOperationStatus.NOT_FOUND) {
+			JanusGraphOperationStatus status = propertiesOfNodeRes.right().value();
+			if (status == JanusGraphOperationStatus.NOT_FOUND) {
 				return Either.right(StorageOperationStatus.OK);
 			}
-			return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+			return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
 		}
 
 		Map<String, PropertyDefinition> value = propertiesOfNodeRes.left().value();
 		for (PropertyDefinition propertyDefinition : value.values()) {
 
 			String propertyUid = propertyDefinition.getUniqueId();
-			Either<PropertyData, TitanOperationStatus> deletePropertyRes = deletePropertyFromGraph(propertyUid);
+			Either<PropertyData, JanusGraphOperationStatus> deletePropertyRes = deletePropertyFromGraph(propertyUid);
 			if (deletePropertyRes.isRight()) {
 				log.error("Failed to delete property with id {}", propertyUid);
-				TitanOperationStatus status = deletePropertyRes.right().value();
-				if (status == TitanOperationStatus.NOT_FOUND) {
-					status = TitanOperationStatus.INVALID_ID;
+				JanusGraphOperationStatus status = deletePropertyRes.right().value();
+				if (status == JanusGraphOperationStatus.NOT_FOUND) {
+					status = JanusGraphOperationStatus.INVALID_ID;
 				}
-				return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+				return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
 			}
 
 		}
@@ -855,13 +865,13 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 		return rules;
 	}
 
-	public ImmutablePair<TitanOperationStatus, String> findPropertyValue(String resourceInstanceId, String propertyId) {
+	public ImmutablePair<JanusGraphOperationStatus, String> findPropertyValue(String resourceInstanceId, String propertyId) {
 
 		log.debug("Going to check whether the property {} already added to resource instance {}", propertyId, resourceInstanceId);
 
-		Either<List<ComponentInstanceProperty>, TitanOperationStatus> getAllRes = this.getAllPropertiesOfResourceInstanceOnlyPropertyDefId(resourceInstanceId);
+		Either<List<ComponentInstanceProperty>, JanusGraphOperationStatus> getAllRes = this.getAllPropertiesOfResourceInstanceOnlyPropertyDefId(resourceInstanceId);
 		if (getAllRes.isRight()) {
-			TitanOperationStatus status = getAllRes.right().value();
+			JanusGraphOperationStatus status = getAllRes.right().value();
 			log.trace("After fetching all properties of resource instance {}. Status is {}", resourceInstanceId, status);
 			return new ImmutablePair<>(status, null);
 		}
@@ -874,12 +884,12 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 				log.trace("Go over property {} under resource instance {}. valueUniqueId = {}", propertyUniqueId, resourceInstanceId, valueUniqueUid);
 				if (propertyId.equals(propertyUniqueId) && valueUniqueUid != null) {
 					log.debug("The property {} already created under resource instance {}", propertyId, resourceInstanceId);
-					return new ImmutablePair<>(TitanOperationStatus.ALREADY_EXIST, valueUniqueUid);
+					return new ImmutablePair<>(JanusGraphOperationStatus.ALREADY_EXIST, valueUniqueUid);
 				}
 			}
 		}
 
-		return new ImmutablePair<>(TitanOperationStatus.NOT_FOUND, null);
+		return new ImmutablePair<>(JanusGraphOperationStatus.NOT_FOUND, null);
 	}
 
 
@@ -960,45 +970,49 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 	 * @param resourceInstanceUid
 	 * @return
 	 */
-	public Either<List<ComponentInstanceProperty>, TitanOperationStatus> getAllPropertiesOfResourceInstanceOnlyPropertyDefId(String resourceInstanceUid) {
+	public Either<List<ComponentInstanceProperty>, JanusGraphOperationStatus> getAllPropertiesOfResourceInstanceOnlyPropertyDefId(String resourceInstanceUid) {
 
 		return getAllPropertiesOfResourceInstanceOnlyPropertyDefId(resourceInstanceUid, NodeTypeEnum.ResourceInstance);
 
 	}
 
-	public Either<PropertyValueData, TitanOperationStatus> removePropertyOfResourceInstance(String propertyValueUid, String resourceInstanceId) {
+	public Either<PropertyValueData, JanusGraphOperationStatus> removePropertyOfResourceInstance(String propertyValueUid, String resourceInstanceId) {
 
-		Either<ComponentInstanceData, TitanOperationStatus> findResInstanceRes = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.ResourceInstance), resourceInstanceId, ComponentInstanceData.class);
+		Either<ComponentInstanceData, JanusGraphOperationStatus> findResInstanceRes = janusGraphGenericDao
+				.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.ResourceInstance), resourceInstanceId, ComponentInstanceData.class);
 
 		if (findResInstanceRes.isRight()) {
-			TitanOperationStatus status = findResInstanceRes.right().value();
-			if (status == TitanOperationStatus.NOT_FOUND) {
-				status = TitanOperationStatus.INVALID_ID;
+			JanusGraphOperationStatus status = findResInstanceRes.right().value();
+			if (status == JanusGraphOperationStatus.NOT_FOUND) {
+				status = JanusGraphOperationStatus.INVALID_ID;
 			}
 			return Either.right(status);
 		}
 
-		Either<PropertyValueData, TitanOperationStatus> findPropertyDefRes = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.PropertyValue), propertyValueUid, PropertyValueData.class);
+		Either<PropertyValueData, JanusGraphOperationStatus> findPropertyDefRes = janusGraphGenericDao
+				.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.PropertyValue), propertyValueUid, PropertyValueData.class);
 
 		if (findPropertyDefRes.isRight()) {
-			TitanOperationStatus status = findPropertyDefRes.right().value();
-			if (status == TitanOperationStatus.NOT_FOUND) {
-				status = TitanOperationStatus.INVALID_ID;
+			JanusGraphOperationStatus status = findPropertyDefRes.right().value();
+			if (status == JanusGraphOperationStatus.NOT_FOUND) {
+				status = JanusGraphOperationStatus.INVALID_ID;
 			}
 			return Either.right(status);
 		}
 
-		Either<GraphRelation, TitanOperationStatus> relation = titanGenericDao.getRelation(findResInstanceRes.left().value(), findPropertyDefRes.left().value(), GraphEdgeLabels.PROPERTY_VALUE);
+		Either<GraphRelation, JanusGraphOperationStatus> relation = janusGraphGenericDao
+				.getRelation(findResInstanceRes.left().value(), findPropertyDefRes.left().value(), GraphEdgeLabels.PROPERTY_VALUE);
 		if (relation.isRight()) {
 			// TODO: add error in case of error
-			TitanOperationStatus status = relation.right().value();
-			if (status == TitanOperationStatus.NOT_FOUND) {
-				status = TitanOperationStatus.INVALID_ID;
+			JanusGraphOperationStatus status = relation.right().value();
+			if (status == JanusGraphOperationStatus.NOT_FOUND) {
+				status = JanusGraphOperationStatus.INVALID_ID;
 			}
 			return Either.right(status);
 		}
 
-		Either<PropertyValueData, TitanOperationStatus> deleteNode = titanGenericDao.deleteNode(findPropertyDefRes.left().value(), PropertyValueData.class);
+		Either<PropertyValueData, JanusGraphOperationStatus> deleteNode = janusGraphGenericDao
+				.deleteNode(findPropertyDefRes.left().value(), PropertyValueData.class);
 		if (deleteNode.isRight()) {
 			return Either.right(deleteNode.right().value());
 		}
@@ -1013,11 +1027,11 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 
 		try {
 
-			Either<PropertyValueData, TitanOperationStatus> eitherStatus = this.removePropertyOfResourceInstance(propertyValueUid, resourceInstanceId);
+			Either<PropertyValueData, JanusGraphOperationStatus> eitherStatus = this.removePropertyOfResourceInstance(propertyValueUid, resourceInstanceId);
 
 			if (eitherStatus.isRight()) {
 				log.error("Failed to remove property value {} from resource instance {} in Graph. status is {}", propertyValueUid, resourceInstanceId, eitherStatus.right().value().name());
-				result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(eitherStatus.right().value()));
+				result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(eitherStatus.right().value()));
 				return result;
 			} else {
 				PropertyValueData propertyValueData = eitherStatus.left().value();
@@ -1036,10 +1050,10 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 			if (!inTransaction) {
 				if (result == null || result.isRight()) {
 					log.error(GOING_TO_EXECUTE_ROLLBACK_ON_GRAPH);
-					titanGenericDao.rollback();
+					janusGraphGenericDao.rollback();
 				} else {
 					log.debug(GOING_TO_EXECUTE_COMMIT_ON_GRAPH);
-					titanGenericDao.commit();
+					janusGraphGenericDao.commit();
 				}
 			}
 		}
@@ -1111,7 +1125,7 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 
 		if (ToscaPropertyType.isValidType(property.getType()) == null) {
 
-			Either<Boolean, TitanOperationStatus> definedInDataTypes = isDefinedInDataTypes(property.getType());
+			Either<Boolean, JanusGraphOperationStatus> definedInDataTypes = isDefinedInDataTypes(property.getType());
 
 			if (definedInDataTypes.isRight()) {
 				return false;
@@ -1164,44 +1178,50 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 
 	}
 
-	public Either<List<ComponentInstanceProperty>, TitanOperationStatus> getAllPropertiesOfResourceInstanceOnlyPropertyDefId(String resourceInstanceUid, NodeTypeEnum instanceNodeType) {
+	public Either<List<ComponentInstanceProperty>, JanusGraphOperationStatus> getAllPropertiesOfResourceInstanceOnlyPropertyDefId(String resourceInstanceUid, NodeTypeEnum instanceNodeType) {
 
-		Either<TitanVertex, TitanOperationStatus> findResInstanceRes = titanGenericDao.getVertexByProperty(UniqueIdBuilder.getKeyByNodeType(instanceNodeType), resourceInstanceUid);
+		Either<JanusGraphVertex, JanusGraphOperationStatus> findResInstanceRes = janusGraphGenericDao
+				.getVertexByProperty(UniqueIdBuilder.getKeyByNodeType(instanceNodeType), resourceInstanceUid);
 
 		if (findResInstanceRes.isRight()) {
-			TitanOperationStatus status = findResInstanceRes.right().value();
-			if (status == TitanOperationStatus.NOT_FOUND) {
-				status = TitanOperationStatus.INVALID_ID;
+			JanusGraphOperationStatus status = findResInstanceRes.right().value();
+			if (status == JanusGraphOperationStatus.NOT_FOUND) {
+				status = JanusGraphOperationStatus.INVALID_ID;
 			}
 			return Either.right(status);
 		}
 
-		Either<List<ImmutablePair<TitanVertex, Edge>>, TitanOperationStatus> propertyImplNodes = titanGenericDao.getChildrenVertecies(UniqueIdBuilder.getKeyByNodeType(instanceNodeType), resourceInstanceUid, GraphEdgeLabels.PROPERTY_VALUE);
+		Either<List<ImmutablePair<JanusGraphVertex, Edge>>, JanusGraphOperationStatus> propertyImplNodes = janusGraphGenericDao
+				.getChildrenVertecies(UniqueIdBuilder.getKeyByNodeType(instanceNodeType), resourceInstanceUid, GraphEdgeLabels.PROPERTY_VALUE);
 
 		if (propertyImplNodes.isRight()) {
-			TitanOperationStatus status = propertyImplNodes.right().value();
+			JanusGraphOperationStatus status = propertyImplNodes.right().value();
 			return Either.right(status);
 		}
 
-		List<ImmutablePair<TitanVertex, Edge>> list = propertyImplNodes.left().value();
+		List<ImmutablePair<JanusGraphVertex, Edge>> list = propertyImplNodes.left().value();
 		if (list == null || list.isEmpty()) {
-			return Either.right(TitanOperationStatus.NOT_FOUND);
+			return Either.right(JanusGraphOperationStatus.NOT_FOUND);
 		}
 
 		List<ComponentInstanceProperty> result = new ArrayList<>();
-		for (ImmutablePair<TitanVertex, Edge> propertyValue : list) {
-			TitanVertex propertyValueDataVertex = propertyValue.getLeft();
-			String propertyValueUid = (String) titanGenericDao.getProperty(propertyValueDataVertex, GraphPropertiesDictionary.UNIQUE_ID.getProperty());
-			String value = (String) titanGenericDao.getProperty(propertyValueDataVertex, GraphPropertiesDictionary.VALUE.getProperty());
-
-			ImmutablePair<TitanVertex, Edge> propertyDefPair = titanGenericDao.getChildVertex(propertyValueDataVertex, GraphEdgeLabels.PROPERTY_IMPL);
+		for (ImmutablePair<JanusGraphVertex, Edge> propertyValue : list) {
+			JanusGraphVertex propertyValueDataVertex = propertyValue.getLeft();
+			String propertyValueUid = (String) janusGraphGenericDao
+					.getProperty(propertyValueDataVertex, GraphPropertiesDictionary.UNIQUE_ID.getProperty());
+			String value = (String) janusGraphGenericDao
+					.getProperty(propertyValueDataVertex, GraphPropertiesDictionary.VALUE.getProperty());
+
+			ImmutablePair<JanusGraphVertex, Edge> propertyDefPair = janusGraphGenericDao
+					.getChildVertex(propertyValueDataVertex, GraphEdgeLabels.PROPERTY_IMPL);
 			if (propertyDefPair == null) {
-				return Either.right(TitanOperationStatus.NOT_FOUND);
+				return Either.right(JanusGraphOperationStatus.NOT_FOUND);
 			}
 
-			Map<String, Object> properties = titanGenericDao.getProperties(propertyValueDataVertex);
+			Map<String, Object> properties = janusGraphGenericDao.getProperties(propertyValueDataVertex);
 			PropertyValueData propertyValueData = GraphElementFactory.createElement(NodeTypeEnum.PropertyValue.getName(), GraphElementTypeEnum.Node, properties, PropertyValueData.class);
-			String propertyUniqueId = (String) titanGenericDao.getProperty(propertyDefPair.left, GraphPropertiesDictionary.UNIQUE_ID.getProperty());
+			String propertyUniqueId = (String) janusGraphGenericDao
+					.getProperty(propertyDefPair.left, GraphPropertiesDictionary.UNIQUE_ID.getProperty());
 
 			ComponentInstanceProperty resourceInstanceProperty = new ComponentInstanceProperty();
 			// set property original unique id
@@ -1230,7 +1250,7 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 	 * @param defaultValue
 	 * @return
 	 */
-	public Either<String, TitanOperationStatus> findDefaultValueFromSecondPosition(List<String> pathOfComponentInstances, String propertyUniqueId, String defaultValue) {
+	public Either<String, JanusGraphOperationStatus> findDefaultValueFromSecondPosition(List<String> pathOfComponentInstances, String propertyUniqueId, String defaultValue) {
 
 		log.trace("In find default value: path= {} propertyUniqId={} defaultValue= {}", pathOfComponentInstances, propertyUniqueId, defaultValue);
 
@@ -1243,13 +1263,13 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 		for (int i = 1; i < pathOfComponentInstances.size(); i++) {
 			String compInstanceId = pathOfComponentInstances.get(i);
 
-			Either<List<ComponentInstanceProperty>, TitanOperationStatus> propertyValuesResult = this.getAllPropertiesOfResourceInstanceOnlyPropertyDefId(compInstanceId, NodeTypeEnum.ResourceInstance);
+			Either<List<ComponentInstanceProperty>, JanusGraphOperationStatus> propertyValuesResult = this.getAllPropertiesOfResourceInstanceOnlyPropertyDefId(compInstanceId, NodeTypeEnum.ResourceInstance);
 
 			log.trace("After fetching properties values of component instance {}. {}", compInstanceId, propertyValuesResult);
 
 			if (propertyValuesResult.isRight()) {
-				TitanOperationStatus status = propertyValuesResult.right().value();
-				if (status != TitanOperationStatus.NOT_FOUND) {
+				JanusGraphOperationStatus status = propertyValuesResult.right().value();
+				if (status != JanusGraphOperationStatus.NOT_FOUND) {
 					return Either.right(status);
 				} else {
 					continue;
@@ -1459,7 +1479,7 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 	 * @param dataTypeDefinition
 	 * @return
 	 */
-	private Either<DataTypeData, TitanOperationStatus> addDataTypeToGraph(DataTypeDefinition dataTypeDefinition) {
+	private Either<DataTypeData, JanusGraphOperationStatus> addDataTypeToGraph(DataTypeDefinition dataTypeDefinition) {
 
 		log.debug("Got data type {}", dataTypeDefinition);
 
@@ -1468,11 +1488,12 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 		DataTypeData dataTypeData = buildDataTypeData(dataTypeDefinition, dtUniqueId);
 
 		log.debug("Before adding data type to graph. dataTypeData = {}", dataTypeData);
-		Either<DataTypeData, TitanOperationStatus> createDataTypeResult = titanGenericDao.createNode(dataTypeData, DataTypeData.class);
+		Either<DataTypeData, JanusGraphOperationStatus> createDataTypeResult = janusGraphGenericDao
+				.createNode(dataTypeData, DataTypeData.class);
 		log.debug("After adding data type to graph. status is = {}", createDataTypeResult);
 
 		if (createDataTypeResult.isRight()) {
-			TitanOperationStatus operationStatus = createDataTypeResult.right().value();
+			JanusGraphOperationStatus operationStatus = createDataTypeResult.right().value();
 			log.debug("Failed to data type {} to graph. status is {}", dataTypeDefinition.getName(), operationStatus);
 			BeEcompErrorManager.getInstance().logBeFailedAddingNodeTypeError("AddDataType", NodeTypeEnum.DataType.getName());
 			return Either.right(operationStatus);
@@ -1480,7 +1501,7 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 
 		DataTypeData resultCTD = createDataTypeResult.left().value();
 		List<PropertyDefinition> properties = dataTypeDefinition.getProperties();
-		Either<Map<String, PropertyData>, TitanOperationStatus> addPropertiesToDataType = addPropertiesToDataType(resultCTD.getUniqueId(), properties);
+		Either<Map<String, PropertyData>, JanusGraphOperationStatus> addPropertiesToDataType = addPropertiesToDataType(resultCTD.getUniqueId(), properties);
 		if (addPropertiesToDataType.isRight()) {
 			log.debug("Failed add properties {} to data type {}", properties, dataTypeDefinition.getName());
 			return Either.right(addPropertiesToDataType.right().value());
@@ -1493,7 +1514,8 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 
 			String deriveFromUid = UniqueIdBuilder.buildDataTypeUid(derivedFrom);
 			UniqueIdData to = new UniqueIdData(NodeTypeEnum.DataType, deriveFromUid);
-			Either<GraphRelation, TitanOperationStatus> createRelation = titanGenericDao.createRelation(from, to, GraphEdgeLabels.DERIVED_FROM, null);
+			Either<GraphRelation, JanusGraphOperationStatus> createRelation = janusGraphGenericDao
+					.createRelation(from, to, GraphEdgeLabels.DERIVED_FROM, null);
 			log.debug("After create relation between capability type {} to its parent {}. status is {}", dtUniqueId, derivedFrom, createRelation);
 			if (createRelation.isRight()) {
 				return Either.right(createRelation.right().value());
@@ -1528,7 +1550,7 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 	 * @param properties
 	 * @return
 	 */
-	private Either<Map<String, PropertyData>, TitanOperationStatus> addPropertiesToDataType(String uniqueId, List<PropertyDefinition> properties) {
+	private Either<Map<String, PropertyData>, JanusGraphOperationStatus> addPropertiesToDataType(String uniqueId, List<PropertyDefinition> properties) {
 
 		Map<String, PropertyData> propertiesData = new HashMap<>();
 
@@ -1537,7 +1559,7 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 				String propertyName = propertyDefinition.getName();
 
 				String propertyType = propertyDefinition.getType();
-				Either<Boolean, TitanOperationStatus> validPropertyType = isValidPropertyType(propertyType);
+				Either<Boolean, JanusGraphOperationStatus> validPropertyType = isValidPropertyType(propertyType);
 				if (validPropertyType.isRight()) {
 					log.debug("Data type {} contains invalid property type {}", uniqueId, propertyType);
 					return Either.right(validPropertyType.right().value());
@@ -1545,12 +1567,12 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 				Boolean isValid = validPropertyType.left().value();
 				if (isValid == null || !isValid.booleanValue()) {
 					log.debug("Data type {} contains invalid property type {}", uniqueId, propertyType);
-					return Either.right(TitanOperationStatus.INVALID_TYPE);
+					return Either.right(JanusGraphOperationStatus.INVALID_TYPE);
 				}
 
-				Either<PropertyData, TitanOperationStatus> addPropertyToNodeType = this.addPropertyToNodeType(propertyName, propertyDefinition, NodeTypeEnum.DataType, uniqueId);
+				Either<PropertyData, JanusGraphOperationStatus> addPropertyToNodeType = this.addPropertyToNodeType(propertyName, propertyDefinition, NodeTypeEnum.DataType, uniqueId);
 				if (addPropertyToNodeType.isRight()) {
-					TitanOperationStatus operationStatus = addPropertyToNodeType.right().value();
+					JanusGraphOperationStatus operationStatus = addPropertyToNodeType.right().value();
 					log.debug("Failed to associate data type {} to property {} in graph. status is {}", uniqueId, propertyName, operationStatus);
 					BeEcompErrorManager.getInstance().logInternalFlowError("AddPropertyToDataType", "Failed to associate property to data type. Status is " + operationStatus, ErrorSeverity.ERROR);
 					return Either.right(operationStatus);
@@ -1563,9 +1585,10 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 			long modificationTime = System.currentTimeMillis();
 			dataTypeData.getDataTypeDataDefinition().setModificationTime(modificationTime);
 
-			Either<DataTypeData, TitanOperationStatus> updateNode = titanGenericDao.updateNode(dataTypeData, DataTypeData.class);
+			Either<DataTypeData, JanusGraphOperationStatus> updateNode = janusGraphGenericDao
+					.updateNode(dataTypeData, DataTypeData.class);
 			if (updateNode.isRight()) {
-				TitanOperationStatus operationStatus = updateNode.right().value();
+				JanusGraphOperationStatus operationStatus = updateNode.right().value();
 				log.debug("Failed to update modification time data type {} from graph. status is {}", uniqueId, operationStatus);
 				BeEcompErrorManager.getInstance().logInternalFlowError("AddPropertyToDataType", "Failed to fetch data type. Status is " + operationStatus, ErrorSeverity.ERROR);
 				return Either.right(operationStatus);
@@ -1585,14 +1608,15 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 	 * @param uniqueId
 	 * @return
 	 */
-	public Either<DataTypeDefinition, TitanOperationStatus> getDataTypeByUid(String uniqueId) {
+	public Either<DataTypeDefinition, JanusGraphOperationStatus> getDataTypeByUid(String uniqueId) {
 
-		Either<DataTypeDefinition, TitanOperationStatus> result = null;
+		Either<DataTypeDefinition, JanusGraphOperationStatus> result = null;
 
-		Either<DataTypeData, TitanOperationStatus> dataTypesRes = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.DataType), uniqueId, DataTypeData.class);
+		Either<DataTypeData, JanusGraphOperationStatus> dataTypesRes = janusGraphGenericDao
+				.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.DataType), uniqueId, DataTypeData.class);
 
 		if (dataTypesRes.isRight()) {
-			TitanOperationStatus status = dataTypesRes.right().value();
+			JanusGraphOperationStatus status = dataTypesRes.right().value();
 			log.debug(DATA_TYPE_CANNOT_BE_FOUND_IN_GRAPH_STATUS_IS, uniqueId, status);
 			return Either.right(status);
 		}
@@ -1600,20 +1624,22 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 		DataTypeData ctData = dataTypesRes.left().value();
 		DataTypeDefinition dataTypeDefinition = new DataTypeDefinition(ctData.getDataTypeDataDefinition());
 
-		TitanOperationStatus propertiesStatus = fillProperties(uniqueId, dataTypeDefinition);
-		if (propertiesStatus != TitanOperationStatus.OK) {
+		JanusGraphOperationStatus propertiesStatus = fillProperties(uniqueId, dataTypeDefinition);
+		if (propertiesStatus != JanusGraphOperationStatus.OK) {
 			log.error(FAILED_TO_FETCH_PROPERTIES_OF_DATA_TYPE, uniqueId);
 			return Either.right(propertiesStatus);
 		}
 
-		Either<ImmutablePair<DataTypeData, GraphEdge>, TitanOperationStatus> parentNode = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.DataType), uniqueId, GraphEdgeLabels.DERIVED_FROM, NodeTypeEnum.DataType,
+		Either<ImmutablePair<DataTypeData, GraphEdge>, JanusGraphOperationStatus> parentNode = janusGraphGenericDao
+				.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.DataType), uniqueId, GraphEdgeLabels.DERIVED_FROM, NodeTypeEnum.DataType,
 				DataTypeData.class);
 		log.debug("After retrieving DERIVED_FROM node of {}. status is {}", uniqueId, parentNode);
 		if (parentNode.isRight()) {
-			TitanOperationStatus titanOperationStatus = parentNode.right().value();
-			if (titanOperationStatus != TitanOperationStatus.NOT_FOUND) {
-				log.error("Failed to find the parent data type of data type {}. status is {}", uniqueId, titanOperationStatus);
-				result = Either.right(titanOperationStatus);
+			JanusGraphOperationStatus janusGraphOperationStatus = parentNode.right().value();
+			if (janusGraphOperationStatus != JanusGraphOperationStatus.NOT_FOUND) {
+				log.error("Failed to find the parent data type of data type {}. status is {}", uniqueId,
+						janusGraphOperationStatus);
+				result = Either.right(janusGraphOperationStatus);
 				return result;
 			}
 		} else {
@@ -1622,7 +1648,7 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 			DataTypeData parentCT = immutablePair.getKey();
 
 			String parentUniqueId = parentCT.getUniqueId();
-			Either<DataTypeDefinition, TitanOperationStatus> dataTypeByUid = getDataTypeByUid(parentUniqueId);
+			Either<DataTypeDefinition, JanusGraphOperationStatus> dataTypeByUid = getDataTypeByUid(parentUniqueId);
 
 			if (dataTypeByUid.isRight()) {
 				return Either.right(dataTypeByUid.right().value());
@@ -1638,16 +1664,17 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 		return result;
 	}
 
-	private TitanOperationStatus fillProperties(String uniqueId, DataTypeDefinition dataTypeDefinition) {
+	private JanusGraphOperationStatus fillProperties(String uniqueId, DataTypeDefinition dataTypeDefinition) {
 
-		Either<Map<String, PropertyDefinition>, TitanOperationStatus> findPropertiesOfNode = this.findPropertiesOfNode(NodeTypeEnum.DataType, uniqueId);
+		Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> findPropertiesOfNode = this.findPropertiesOfNode(NodeTypeEnum.DataType, uniqueId);
 		if (findPropertiesOfNode.isRight()) {
-			TitanOperationStatus titanOperationStatus = findPropertiesOfNode.right().value();
-			log.debug("After looking for properties of vertex {}. status is {}", uniqueId, titanOperationStatus);
-			if (TitanOperationStatus.NOT_FOUND.equals(titanOperationStatus)) {
-				return TitanOperationStatus.OK;
+			JanusGraphOperationStatus janusGraphOperationStatus = findPropertiesOfNode.right().value();
+			log.debug("After looking for properties of vertex {}. status is {}", uniqueId,
+					janusGraphOperationStatus);
+			if (JanusGraphOperationStatus.NOT_FOUND.equals(janusGraphOperationStatus)) {
+				return JanusGraphOperationStatus.OK;
 			} else {
-				return titanOperationStatus;
+				return janusGraphOperationStatus;
 			}
 		} else {
 			Map<String, PropertyDefinition> properties = findPropertiesOfNode.left().value();
@@ -1663,7 +1690,7 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 				}
 				dataTypeDefinition.setProperties(listOfProps);
 			}
-			return TitanOperationStatus.OK;
+			return JanusGraphOperationStatus.OK;
 		}
 	}
 
@@ -1673,12 +1700,12 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 
 		try {
 
-			Either<DataTypeData, TitanOperationStatus> eitherStatus = addDataTypeToGraph(dataTypeDefinition);
+			Either<DataTypeData, JanusGraphOperationStatus> eitherStatus = addDataTypeToGraph(dataTypeDefinition);
 
 			if (eitherStatus.isRight()) {
 				log.debug("Failed to add data type {} to Graph. status is {}", dataTypeDefinition, eitherStatus.right().value().name());
 				BeEcompErrorManager.getInstance().logBeFailedAddingNodeTypeError("AddDataType", "DataType");
-				result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(eitherStatus.right().value()));
+				result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(eitherStatus.right().value()));
 				return result;
 			} else {
 				DataTypeData capabilityTypeData = eitherStatus.left().value();
@@ -1692,10 +1719,10 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 			if (!inTransaction) {
 				if (result == null || result.isRight()) {
 					log.error(GOING_TO_EXECUTE_ROLLBACK_ON_GRAPH);
-					titanGenericDao.rollback();
+					janusGraphGenericDao.rollback();
 				} else {
 					log.debug(GOING_TO_EXECUTE_COMMIT_ON_GRAPH);
-					titanGenericDao.commit();
+					janusGraphGenericDao.commit();
 				}
 			}
 		}
@@ -1714,14 +1741,14 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 		try {
 
 			String dtUid = UniqueIdBuilder.buildDataTypeUid(name);
-			Either<DataTypeDefinition, TitanOperationStatus> ctResult = this.getDataTypeByUid(dtUid);
+			Either<DataTypeDefinition, JanusGraphOperationStatus> ctResult = this.getDataTypeByUid(dtUid);
 
 			if (ctResult.isRight()) {
-				TitanOperationStatus status = ctResult.right().value();
-				if (status != TitanOperationStatus.NOT_FOUND) {
+				JanusGraphOperationStatus status = ctResult.right().value();
+				if (status != JanusGraphOperationStatus.NOT_FOUND) {
 					log.error("Failed to retrieve information on capability type {} status is {}", name, status);
 				}
-				result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(ctResult.right().value()));
+				result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(ctResult.right().value()));
 				return result;
 			}
 
@@ -1732,10 +1759,10 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 			if (!inTransaction) {
 				if (result == null || result.isRight()) {
 					log.error(GOING_TO_EXECUTE_ROLLBACK_ON_GRAPH);
-					titanGenericDao.rollback();
+					janusGraphGenericDao.rollback();
 				} else {
 					log.debug(GOING_TO_EXECUTE_COMMIT_ON_GRAPH);
-					titanGenericDao.commit();
+					janusGraphGenericDao.commit();
 				}
 			}
 		}
@@ -1758,14 +1785,14 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 		try {
 
 			String uid = UniqueIdBuilder.buildDataTypeUid(name);
-			Either<DataTypeDefinition, TitanOperationStatus> ctResult = this.getDataTypeByUidWithoutDerivedDataTypes(uid);
+			Either<DataTypeDefinition, JanusGraphOperationStatus> ctResult = this.getDataTypeByUidWithoutDerivedDataTypes(uid);
 
 			if (ctResult.isRight()) {
-				TitanOperationStatus status = ctResult.right().value();
-				if (status != TitanOperationStatus.NOT_FOUND) {
+				JanusGraphOperationStatus status = ctResult.right().value();
+				if (status != JanusGraphOperationStatus.NOT_FOUND) {
 					log.error("Failed to retrieve information on capability type {} status is {}", name, status);
 				}
-				result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(ctResult.right().value()));
+				result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(ctResult.right().value()));
 				return result;
 			}
 
@@ -1776,22 +1803,23 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 			if (!inTransaction) {
 				if (result == null || result.isRight()) {
 					log.error(GOING_TO_EXECUTE_ROLLBACK_ON_GRAPH);
-					titanGenericDao.rollback();
+					janusGraphGenericDao.rollback();
 				} else {
 					log.debug(GOING_TO_EXECUTE_COMMIT_ON_GRAPH);
-					titanGenericDao.commit();
+					janusGraphGenericDao.commit();
 				}
 			}
 		}
 
 	}
 
-	public Either<DataTypeDefinition, TitanOperationStatus> getDataTypeByUidWithoutDerivedDataTypes(String uniqueId) {
+	public Either<DataTypeDefinition, JanusGraphOperationStatus> getDataTypeByUidWithoutDerivedDataTypes(String uniqueId) {
 
-		Either<DataTypeData, TitanOperationStatus> dataTypesRes = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.DataType), uniqueId, DataTypeData.class);
+		Either<DataTypeData, JanusGraphOperationStatus> dataTypesRes = janusGraphGenericDao
+				.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.DataType), uniqueId, DataTypeData.class);
 
 		if (dataTypesRes.isRight()) {
-			TitanOperationStatus status = dataTypesRes.right().value();
+			JanusGraphOperationStatus status = dataTypesRes.right().value();
 			log.debug(DATA_TYPE_CANNOT_BE_FOUND_IN_GRAPH_STATUS_IS, uniqueId, status);
 			return Either.right(status);
 		}
@@ -1799,8 +1827,8 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 		DataTypeData ctData = dataTypesRes.left().value();
 		DataTypeDefinition dataTypeDefinition = new DataTypeDefinition(ctData.getDataTypeDataDefinition());
 
-		TitanOperationStatus propertiesStatus = fillProperties(uniqueId, dataTypeDefinition);
-		if (propertiesStatus != TitanOperationStatus.OK) {
+		JanusGraphOperationStatus propertiesStatus = fillProperties(uniqueId, dataTypeDefinition);
+		if (propertiesStatus != JanusGraphOperationStatus.OK) {
 			log.error(FAILED_TO_FETCH_PROPERTIES_OF_DATA_TYPE, uniqueId);
 			return Either.right(propertiesStatus);
 		}
@@ -1821,7 +1849,7 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
         return new DataTypeDefinition(dataTypeData.getDataTypeDataDefinition());
 	}
 
-	private Either<Boolean, TitanOperationStatus> isValidPropertyType(String propertyType) {
+	private Either<Boolean, JanusGraphOperationStatus> isValidPropertyType(String propertyType) {
 
 		if (propertyType == null || propertyType.isEmpty()) {
 			return Either.left(false);
@@ -1835,13 +1863,13 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 		}
 	}
 
-	public Either<Boolean, TitanOperationStatus> isDefinedInDataTypes(String propertyType) {
+	public Either<Boolean, JanusGraphOperationStatus> isDefinedInDataTypes(String propertyType) {
 
 		String dataTypeUid = UniqueIdBuilder.buildDataTypeUid(propertyType);
-		Either<DataTypeDefinition, TitanOperationStatus> dataTypeByUid = getDataTypeByUid(dataTypeUid);
+		Either<DataTypeDefinition, JanusGraphOperationStatus> dataTypeByUid = getDataTypeByUid(dataTypeUid);
 		if (dataTypeByUid.isRight()) {
-			TitanOperationStatus status = dataTypeByUid.right().value();
-			if (status == TitanOperationStatus.NOT_FOUND) {
+			JanusGraphOperationStatus status = dataTypeByUid.right().value();
+			if (status == JanusGraphOperationStatus.NOT_FOUND) {
 				return Either.left(false);
 			}
 			return Either.right(status);
@@ -1851,15 +1879,16 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 
 	}
 
-	public Either<Map<String, DataTypeDefinition>, TitanOperationStatus> getAllDataTypes() {
+	public Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> getAllDataTypes() {
 
 		Map<String, DataTypeDefinition> dataTypes = new HashMap<>();
-		Either<Map<String, DataTypeDefinition>, TitanOperationStatus> result = Either.left(dataTypes);
+		Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> result = Either.left(dataTypes);
 
-		Either<List<DataTypeData>, TitanOperationStatus> getAllDataTypes = titanGenericDao.getByCriteria(NodeTypeEnum.DataType, null, DataTypeData.class);
+		Either<List<DataTypeData>, JanusGraphOperationStatus> getAllDataTypes = janusGraphGenericDao
+				.getByCriteria(NodeTypeEnum.DataType, null, DataTypeData.class);
 		if (getAllDataTypes.isRight()) {
-			TitanOperationStatus status = getAllDataTypes.right().value();
-			if (status != TitanOperationStatus.NOT_FOUND) {
+			JanusGraphOperationStatus status = getAllDataTypes.right().value();
+			if (status != JanusGraphOperationStatus.NOT_FOUND) {
 				return Either.right(status);
 			} else {
 				return result;
@@ -1877,11 +1906,11 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 			for (DataTypeData dataTypeData : list) {
 
 				log.trace("Going to fetch data type {}. uid is {}", dataTypeData.getDataTypeDataDefinition().getName(), dataTypeData.getUniqueId());
-				Either<DataTypeDefinition, TitanOperationStatus> dataTypeByUid = this.getAndAddDataTypeByUid(dataTypeData.getUniqueId(), dataTypes);
+				Either<DataTypeDefinition, JanusGraphOperationStatus> dataTypeByUid = this.getAndAddDataTypeByUid(dataTypeData.getUniqueId(), dataTypes);
 				if (dataTypeByUid.isRight()) {
-					TitanOperationStatus status = dataTypeByUid.right().value();
-					if (status == TitanOperationStatus.NOT_FOUND) {
-						status = TitanOperationStatus.INVALID_ID;
+					JanusGraphOperationStatus status = dataTypeByUid.right().value();
+					if (status == JanusGraphOperationStatus.NOT_FOUND) {
+						status = JanusGraphOperationStatus.INVALID_ID;
 					}
 					return Either.right(status);
 				}
@@ -1909,18 +1938,19 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 	 * @param uniqueId
 	 * @return
 	 */
-	private Either<DataTypeDefinition, TitanOperationStatus> getAndAddDataTypeByUid(String uniqueId, Map<String, DataTypeDefinition> allDataTypes) {
+	private Either<DataTypeDefinition, JanusGraphOperationStatus> getAndAddDataTypeByUid(String uniqueId, Map<String, DataTypeDefinition> allDataTypes) {
 
-		Either<DataTypeDefinition, TitanOperationStatus> result = null;
+		Either<DataTypeDefinition, JanusGraphOperationStatus> result = null;
 
 		if (allDataTypes.containsKey(uniqueId)) {
 			return Either.left(allDataTypes.get(uniqueId));
 		}
 
-		Either<DataTypeData, TitanOperationStatus> dataTypesRes = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.DataType), uniqueId, DataTypeData.class);
+		Either<DataTypeData, JanusGraphOperationStatus> dataTypesRes = janusGraphGenericDao
+				.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.DataType), uniqueId, DataTypeData.class);
 
 		if (dataTypesRes.isRight()) {
-			TitanOperationStatus status = dataTypesRes.right().value();
+			JanusGraphOperationStatus status = dataTypesRes.right().value();
 			log.debug(DATA_TYPE_CANNOT_BE_FOUND_IN_GRAPH_STATUS_IS, uniqueId, status);
 			return Either.right(status);
 		}
@@ -1928,8 +1958,8 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 		DataTypeData ctData = dataTypesRes.left().value();
 		DataTypeDefinition dataTypeDefinition = new DataTypeDefinition(ctData.getDataTypeDataDefinition());
 
-		TitanOperationStatus propertiesStatus = fillProperties(uniqueId, dataTypeDefinition);
-		if (propertiesStatus != TitanOperationStatus.OK) {
+		JanusGraphOperationStatus propertiesStatus = fillProperties(uniqueId, dataTypeDefinition);
+		if (propertiesStatus != JanusGraphOperationStatus.OK) {
 			log.error(FAILED_TO_FETCH_PROPERTIES_OF_DATA_TYPE, uniqueId);
 			return Either.right(propertiesStatus);
 		}
@@ -1945,14 +1975,16 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 			return Either.left(dataTypeDefinition);
 		}
 
-		Either<ImmutablePair<DataTypeData, GraphEdge>, TitanOperationStatus> parentNode = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.DataType), uniqueId, GraphEdgeLabels.DERIVED_FROM, NodeTypeEnum.DataType,
+		Either<ImmutablePair<DataTypeData, GraphEdge>, JanusGraphOperationStatus> parentNode = janusGraphGenericDao
+				.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.DataType), uniqueId, GraphEdgeLabels.DERIVED_FROM, NodeTypeEnum.DataType,
 				DataTypeData.class);
 		log.debug("After retrieving DERIVED_FROM node of {}. status is {}", uniqueId, parentNode);
 		if (parentNode.isRight()) {
-			TitanOperationStatus titanOperationStatus = parentNode.right().value();
-			if (titanOperationStatus != TitanOperationStatus.NOT_FOUND) {
-				log.error("Failed to find the parent data type of data type {}. status is {}", uniqueId, titanOperationStatus);
-				result = Either.right(titanOperationStatus);
+			JanusGraphOperationStatus janusGraphOperationStatus = parentNode.right().value();
+			if (janusGraphOperationStatus != JanusGraphOperationStatus.NOT_FOUND) {
+				log.error("Failed to find the parent data type of data type {}. status is {}", uniqueId,
+						janusGraphOperationStatus);
+				result = Either.right(janusGraphOperationStatus);
 				return result;
 			}
 		} else {
@@ -1961,7 +1993,7 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 			DataTypeData parentCT = immutablePair.getKey();
 
 			String parentUniqueId = parentCT.getUniqueId();
-			Either<DataTypeDefinition, TitanOperationStatus> dataTypeByUid = getDataTypeByUid(parentUniqueId);
+			Either<DataTypeDefinition, JanusGraphOperationStatus> dataTypeByUid = getDataTypeByUid(parentUniqueId);
 
 			if (dataTypeByUid.isRight()) {
 				return Either.right(dataTypeByUid.right().value());
@@ -1977,12 +2009,12 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 		return result;
 	}
 
-	private Either<DataTypeDefinition, TitanOperationStatus> getDataTypeUsingName(String name) {
+	private Either<DataTypeDefinition, JanusGraphOperationStatus> getDataTypeUsingName(String name) {
 		String uid = UniqueIdBuilder.buildDataTypeUid(name);
 		return getDataTypeByUid(uid);
 	}
 
-	public Either<String, TitanOperationStatus> checkInnerType(PropertyDataDefinition propDataDef) {
+	public Either<String, JanusGraphOperationStatus> checkInnerType(PropertyDataDefinition propDataDef) {
 
 		String propertyType = propDataDef.getType();
 
@@ -1991,12 +2023,13 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 		return getInnerType(type, propDataDef::getSchema);
 	}
 
-	public Either<List<DataTypeData>, TitanOperationStatus> getAllDataTypeNodes() {
-		Either<List<DataTypeData>, TitanOperationStatus> getAllDataTypes = titanGenericDao.getByCriteria(NodeTypeEnum.DataType, null, DataTypeData.class);
+	public Either<List<DataTypeData>, JanusGraphOperationStatus> getAllDataTypeNodes() {
+		Either<List<DataTypeData>, JanusGraphOperationStatus> getAllDataTypes = janusGraphGenericDao
+				.getByCriteria(NodeTypeEnum.DataType, null, DataTypeData.class);
 		if (getAllDataTypes.isRight()) {
-			TitanOperationStatus status = getAllDataTypes.right().value();
-			if (status == TitanOperationStatus.NOT_FOUND) {
-				status = TitanOperationStatus.OK;
+			JanusGraphOperationStatus status = getAllDataTypes.right().value();
+			if (status == JanusGraphOperationStatus.NOT_FOUND) {
+				status = JanusGraphOperationStatus.OK;
 				return Either.right(status);
 			}
 		}
@@ -2047,11 +2080,12 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 				.bind(props -> getAllDerivedFromChainProperties(uniqueId, nodeType, clazz, props.values()));
 	}
 
-	private Either<Map<String, PropertyDefinition>, StorageOperationStatus> handleNotFoundProperties(TitanOperationStatus titanOperationStatus) {
-		if (titanOperationStatus == TitanOperationStatus.NOT_FOUND) {
+	private Either<Map<String, PropertyDefinition>, StorageOperationStatus> handleNotFoundProperties(JanusGraphOperationStatus janusGraphOperationStatus) {
+		if (janusGraphOperationStatus == JanusGraphOperationStatus.NOT_FOUND) {
 			return Either.left(new HashMap<>());
 		}
-		return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(titanOperationStatus));
+		return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(
+				janusGraphOperationStatus));
 	}
 
 	private <T extends GraphNode> Either<List<PropertyDefinition>, StorageOperationStatus> getAllDerivedFromChainProperties(String uniqueId, NodeTypeEnum nodeType, Class<T> clazz, Collection<PropertyDefinition> nodeProps) {
@@ -2060,10 +2094,12 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 		Either<T, StorageOperationStatus> derivedFrom;
 		while ((derivedFrom = derivedFromOperation.getDerivedFromChild(currentNodeUid, nodeType, clazz)).isLeft()) {
 			currentNodeUid = derivedFrom.left().value().getUniqueId();
-			TitanOperationStatus titanOperationStatus = fillPropertiesList(currentNodeUid, nodeType, accumulatedProps::addAll);
-			if (titanOperationStatus != TitanOperationStatus.OK) {
+			JanusGraphOperationStatus
+					janusGraphOperationStatus = fillPropertiesList(currentNodeUid, nodeType, accumulatedProps::addAll);
+			if (janusGraphOperationStatus != JanusGraphOperationStatus.OK) {
 				log.debug("failed to fetch properties for type {} with id {}", nodeType, currentNodeUid);
-				return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(titanOperationStatus));
+				return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(
+						janusGraphOperationStatus));
 			}
 		}
 		StorageOperationStatus getDerivedResult = derivedFrom.right().value();
@@ -2077,8 +2113,8 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 	/*
 	 * @Override public PropertyOperation getPropertyOperation() { return this; }
 	 */
-    public TitanOperationStatus fillPropertiesList(String uniqueId, NodeTypeEnum nodeType, Consumer<List<PropertyDefinition>> propertySetter) {
-		Either<Map<String, PropertyDefinition>, TitanOperationStatus> findPropertiesRes = findPropertiesifExist(uniqueId, nodeType);
+    public JanusGraphOperationStatus fillPropertiesList(String uniqueId, NodeTypeEnum nodeType, Consumer<List<PropertyDefinition>> propertySetter) {
+		Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> findPropertiesRes = findPropertiesifExist(uniqueId, nodeType);
 		if (findPropertiesRes.isRight()) {
 			return findPropertiesRes.right().value();
 		}
@@ -2087,14 +2123,14 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 		List<PropertyDefinition> propertiesAsList = properties.entrySet().stream().map(Entry::getValue).collect(Collectors.toList());
 			propertySetter.accept(propertiesAsList);
 		}
-		return TitanOperationStatus.OK;
+		return JanusGraphOperationStatus.OK;
 	}
 
-	Either<Map<String, PropertyDefinition>, TitanOperationStatus> findPropertiesifExist(String uniqueId, NodeTypeEnum nodeType){
-		Either<Map<String, PropertyDefinition>, TitanOperationStatus> findPropertiesOfNode = this.findPropertiesOfNode(nodeType, uniqueId);
+	Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> findPropertiesifExist(String uniqueId, NodeTypeEnum nodeType){
+		Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> findPropertiesOfNode = this.findPropertiesOfNode(nodeType, uniqueId);
 		if (findPropertiesOfNode.isRight()) {
 			log.debug("After looking for properties of vertex {}. status is {}", uniqueId, findPropertiesOfNode.right().value());
-			if(findPropertiesOfNode.right().value() == TitanOperationStatus.NOT_FOUND)
+			if(findPropertiesOfNode.right().value() == JanusGraphOperationStatus.NOT_FOUND)
 				return Either.left(Maps.newHashMap());
 			return findPropertiesOfNode;
 		}
@@ -2111,7 +2147,7 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 	 *            
 	 * @return
 	 */
-	protected Either<Map<String, PropertyData>, TitanOperationStatus> addPropertiesToElementType(String uniqueId, NodeTypeEnum nodeType, Map<String, PropertyDefinition> propertiesMap) {
+	protected Either<Map<String, PropertyData>, JanusGraphOperationStatus> addPropertiesToElementType(String uniqueId, NodeTypeEnum nodeType, Map<String, PropertyDefinition> propertiesMap) {
 
 		Map<String, PropertyData> propertiesData = new HashMap<>();
 
@@ -2120,10 +2156,10 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 			for (Entry<String, PropertyDefinition> propertyDefinitionEntry : propertiesMap.entrySet()) {
 				String propertyName = propertyDefinitionEntry.getKey();
 
-				Either<PropertyData, TitanOperationStatus> addPropertyToNodeType = this.addPropertyToNodeType(propertyName, propertyDefinitionEntry.getValue(), nodeType, uniqueId);
+				Either<PropertyData, JanusGraphOperationStatus> addPropertyToNodeType = this.addPropertyToNodeType(propertyName, propertyDefinitionEntry.getValue(), nodeType, uniqueId);
 
 				if (addPropertyToNodeType.isRight()) {
-					TitanOperationStatus operationStatus = addPropertyToNodeType.right().value();
+					JanusGraphOperationStatus operationStatus = addPropertyToNodeType.right().value();
 					log.error("Failed to associate {} {} to property {} in graph. status is {}", nodeType.getName(), uniqueId, propertyName, operationStatus);
 					return Either.right(operationStatus);
 				}
@@ -2136,7 +2172,7 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 
 	}
 
-	public Either<Map<String, PropertyData>, TitanOperationStatus> addPropertiesToElementType(String uniqueId, NodeTypeEnum elementType, List<PropertyDefinition> properties) {
+	public Either<Map<String, PropertyData>, JanusGraphOperationStatus> addPropertiesToElementType(String uniqueId, NodeTypeEnum elementType, List<PropertyDefinition> properties) {
 
 		Map<String, PropertyDefinition> propMap;
 		if (properties == null) {
@@ -2186,30 +2222,30 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 
             if(MapUtils.isNotEmpty(newDescriptions)){
 
-                TitanOperationStatus updatePropertiesStatus = updateDataTypePropertyDescriptions(oldDataTypeDefinition.getUniqueId(), newDescriptions);
-                if (updatePropertiesStatus != TitanOperationStatus.OK) {
+                JanusGraphOperationStatus updatePropertiesStatus = updateDataTypePropertyDescriptions(oldDataTypeDefinition.getUniqueId(), newDescriptions);
+                if (updatePropertiesStatus != JanusGraphOperationStatus.OK) {
                     log.debug("#updateDataType - Failed to update the descriptions of the properties of the data type {}. Status is {}", oldDataTypeDefinition, updatePropertiesStatus);
                     BeEcompErrorManager.getInstance().logBeFailedAddingNodeTypeError(UPDATE_DATA_TYPE, PROPERTY);
-                    result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(updatePropertiesStatus));
+                    result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(updatePropertiesStatus));
                     return result;
                 }
             }
 
-			Either<Map<String, PropertyData>, TitanOperationStatus> addPropertiesToDataType = addPropertiesToDataType(oldDataTypeDefinition.getUniqueId(), propertiesToAdd);
+			Either<Map<String, PropertyData>, JanusGraphOperationStatus> addPropertiesToDataType = addPropertiesToDataType(oldDataTypeDefinition.getUniqueId(), propertiesToAdd);
 
 			if (addPropertiesToDataType.isRight()) {
 				log.debug("Failed to update data type {} to Graph. Status is {}", oldDataTypeDefinition, addPropertiesToDataType.right().value().name());
 				BeEcompErrorManager.getInstance().logBeFailedAddingNodeTypeError(UPDATE_DATA_TYPE, PROPERTY);
-				result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(addPropertiesToDataType.right().value()));
+				result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(addPropertiesToDataType.right().value()));
 				return result;
 			} else {
 
-				Either<DataTypeDefinition, TitanOperationStatus> dataTypeByUid = this.getDataTypeByUid(oldDataTypeDefinition.getUniqueId());
+				Either<DataTypeDefinition, JanusGraphOperationStatus> dataTypeByUid = this.getDataTypeByUid(oldDataTypeDefinition.getUniqueId());
 				if (dataTypeByUid.isRight()) {
-					TitanOperationStatus status = addPropertiesToDataType.right().value();
+					JanusGraphOperationStatus status = addPropertiesToDataType.right().value();
 					log.debug("Failed to get data type {} after update. Status is {}", oldDataTypeDefinition.getUniqueId(), status.name());
 					BeEcompErrorManager.getInstance().logBeFailedRetrieveNodeError(UPDATE_DATA_TYPE, PROPERTY, status.name());
-					result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(status));
+					result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(status));
 				} else {
 					result = Either.left(dataTypeByUid.left().value());
 				}
@@ -2221,10 +2257,10 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 			if (!inTransaction) {
 				if (result == null || result.isRight()) {
 					log.error(GOING_TO_EXECUTE_ROLLBACK_ON_GRAPH);
-					titanGenericDao.rollback();
+					janusGraphGenericDao.rollback();
 				} else {
 					log.debug(GOING_TO_EXECUTE_COMMIT_ON_GRAPH);
-					titanGenericDao.commit();
+					janusGraphGenericDao.commit();
 				}
 			}
 		}
@@ -2364,14 +2400,15 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 	 * @return
 	 */
 	public Either<Integer, StorageOperationStatus> increaseAndGetObjInstancePropertyCounter(String instanceId, NodeTypeEnum nodeType) {
-	    Either<TitanGraph, TitanOperationStatus> graphResult = titanGenericDao.getGraph();
+	    Either<JanusGraph, JanusGraphOperationStatus> graphResult = janusGraphGenericDao.getGraph();
 	    if (graphResult.isRight()) {
-	        return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(graphResult.right().value()));
+	        return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(graphResult.right().value()));
 	    }
-	    Either<TitanVertex, TitanOperationStatus> vertexService = titanGenericDao.getVertexByProperty(UniqueIdBuilder.getKeyByNodeType(nodeType), instanceId);
+	    Either<JanusGraphVertex, JanusGraphOperationStatus> vertexService = janusGraphGenericDao
+					.getVertexByProperty(UniqueIdBuilder.getKeyByNodeType(nodeType), instanceId);
 	    if (vertexService.isRight()) {
 	        log.debug("failed to fetch vertex of resource instance for id = {}", instanceId);
-	        return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(vertexService.right().value()));
+	        return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(vertexService.right().value()));
 	    }
 	    Vertex vertex = vertexService.left().value();
 	    
@@ -2388,12 +2425,13 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
 	}
 
 
-	public Either<List<PropertyDefinition>, TitanOperationStatus> validatePropertiesUniqueness(Map<String, PropertyDefinition> inheritedProperties, List<PropertyDefinition> properties) {
-        Either<List<PropertyDefinition>, TitanOperationStatus> result = Either.left(properties);
+	public Either<List<PropertyDefinition>, JanusGraphOperationStatus> validatePropertiesUniqueness(Map<String, PropertyDefinition> inheritedProperties, List<PropertyDefinition> properties) {
+        Either<List<PropertyDefinition>, JanusGraphOperationStatus> result = Either.left(properties);
 
         for (PropertyDefinition property : properties) {
-            TitanOperationStatus status = validatePropertyUniqueness(inheritedProperties, property);
-            if (status != TitanOperationStatus.OK) {
+            JanusGraphOperationStatus
+								status = validatePropertyUniqueness(inheritedProperties, property);
+            if (status != JanusGraphOperationStatus.OK) {
                 result = Either.right(status);
                 break;
             }
@@ -2406,16 +2444,16 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
      * Validates uniqueness of examined property by comparing it with properties in propertiesOfType
      * and updates if need type and inner type of the property.
      */
-    private TitanOperationStatus validatePropertyUniqueness(Map<String, PropertyDefinition> inheritedProperties, PropertyDefinition property) {
+    private JanusGraphOperationStatus validatePropertyUniqueness(Map<String, PropertyDefinition> inheritedProperties, PropertyDefinition property) {
         String propertyName = property.getName();
         String propertyType = property.getType();
 
-        TitanOperationStatus result = TitanOperationStatus.OK;
+        JanusGraphOperationStatus result = JanusGraphOperationStatus.OK;
         if (inheritedProperties.containsKey(propertyName)) {
             PropertyDefinition defaultProperty = inheritedProperties.get(propertyName);
             if (typesMismatch(propertyType, defaultProperty.getType())) {
                 log.error("#validatePropertyUniqueness - Property with name {} and different type already exists.", propertyName);
-                result = TitanOperationStatus.PROPERTY_NAME_ALREADY_EXISTS;
+                result = JanusGraphOperationStatus.PROPERTY_NAME_ALREADY_EXISTS;
             } else {
                 property.setType(defaultProperty.getType());
                 String innerType = defaultProperty.getSchemaType();
@@ -2435,22 +2473,23 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
     }
 
 
-    public <T extends GraphNode> Either<Map<String, PropertyDefinition>, TitanOperationStatus> getAllTypePropertiesFromAllDerivedFrom(String nextParentUid,
-                                                                                                                                     NodeTypeEnum nodeType,
-                                                                                                                                     Class<T> clazz) {
+    public <T extends GraphNode> Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> getAllTypePropertiesFromAllDerivedFrom(String nextParentUid,
+																																																																					 NodeTypeEnum nodeType,
+																																																																					 Class<T> clazz) {
         Map<String, PropertyDefinition> allProperies = new HashMap<>();
         return getTypePropertiesFromDerivedFromRecursively(nextParentUid, allProperies, nodeType, clazz);
     }
 
-    private <T extends GraphNode> Either<Map<String, PropertyDefinition>, TitanOperationStatus> getTypePropertiesFromDerivedFromRecursively(String nextParentUid, 
-                                                                                                                        Map<String, PropertyDefinition> allProperies,
-                                                                                                                        NodeTypeEnum nodeType,
-                                                                                                                        Class<T> clazz) {
-        TitanOperationStatus error;
-        Either<List<ImmutablePair<T, GraphEdge>>, TitanOperationStatus> childrenNodes = titanGenericDao.getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(nodeType),
+    private <T extends GraphNode> Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> getTypePropertiesFromDerivedFromRecursively(String nextParentUid,
+																																																																								 Map<String, PropertyDefinition> allProperies,
+																																																																								 NodeTypeEnum nodeType,
+																																																																								 Class<T> clazz) {
+        JanusGraphOperationStatus error;
+        Either<List<ImmutablePair<T, GraphEdge>>, JanusGraphOperationStatus> childrenNodes = janusGraphGenericDao
+						.getChildrenNodes(UniqueIdBuilder.getKeyByNodeType(nodeType),
                                                                                                 nextParentUid, GraphEdgeLabels.DERIVED_FROM, nodeType, clazz);
         if (childrenNodes.isRight()) {
-            if (childrenNodes.right().value() != TitanOperationStatus.NOT_FOUND) {
+            if (childrenNodes.right().value() != JanusGraphOperationStatus.NOT_FOUND) {
                 error = childrenNodes.right().value();
                 log.debug("#getTypePropertiesFromDerivedFromRecursively - Couldn't fetch derived from node with UID {}, error: {}", nextParentUid, error);
                 return Either.right(error);
@@ -2461,8 +2500,9 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
             }
         } else {
 
-            Either<Map<String, PropertyDefinition>, TitanOperationStatus> allPropertiesOfTypeRes = findPropertiesOfNode(nodeType, nextParentUid);
-            if (allPropertiesOfTypeRes.isRight() && !allPropertiesOfTypeRes.right().value().equals(TitanOperationStatus.NOT_FOUND)) {
+            Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> allPropertiesOfTypeRes = findPropertiesOfNode(nodeType, nextParentUid);
+            if (allPropertiesOfTypeRes.isRight() && !allPropertiesOfTypeRes.right().value().equals(
+								JanusGraphOperationStatus.NOT_FOUND)) {
                 error = allPropertiesOfTypeRes.right().value();
                 log.error("#getTypePropertiesFromDerivedFromRecursively - Failed to retrieve properties for node with UID {} from graph. status is {}", nextParentUid, error);
                 return Either.right(error);
@@ -2476,10 +2516,11 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
             return getTypePropertiesFromDerivedFromRecursively(childrenNodes.left().value().get(0).getLeft().getUniqueId(), allProperies, nodeType, clazz);
         }
     }
-    private TitanOperationStatus updateDataTypePropertyDescriptions(String uniqueId, Map<String, String> newDescriptions) {
+    private JanusGraphOperationStatus updateDataTypePropertyDescriptions(String uniqueId, Map<String, String> newDescriptions) {
 
         if (MapUtils.isNotEmpty(newDescriptions)) {
-            Either<List<ImmutablePair<TitanVertex, Edge>>, TitanOperationStatus> getDataTypePropertiesRes = titanGenericDao.getChildrenVertecies(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), uniqueId, GraphEdgeLabels.PROPERTY);
+            Either<List<ImmutablePair<JanusGraphVertex, Edge>>, JanusGraphOperationStatus> getDataTypePropertiesRes = janusGraphGenericDao
+								.getChildrenVertecies(GraphPropertiesDictionary.UNIQUE_ID.getProperty(), uniqueId, GraphEdgeLabels.PROPERTY);
 
             if(getDataTypePropertiesRes.isRight()){
                 log.debug("#updateDataTypePropertiesDescriptions - Failed to fetch the property verticies of the Data type {} ", uniqueId);
@@ -2490,14 +2531,14 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe
                     .forEach(pair -> setNewDescriptionToVertex(newDescriptions.get(getPropertyNameFromEdge(pair)), pair));
 
         }
-        return TitanOperationStatus.OK;
+        return JanusGraphOperationStatus.OK;
     }
 
-    private TitanVertexProperty<String> setNewDescriptionToVertex(String newDescription, ImmutablePair<TitanVertex, Edge> pair) {
+    private JanusGraphVertexProperty<String> setNewDescriptionToVertex(String newDescription, ImmutablePair<JanusGraphVertex, Edge> pair) {
         return pair.getLeft().property(GraphPropertiesDictionary.DESCRIPTION.getProperty(), newDescription);
     }
 
-    private String getPropertyNameFromEdge(ImmutablePair<TitanVertex, Edge> pair) {
+    private String getPropertyNameFromEdge(ImmutablePair<JanusGraphVertex, Edge> pair) {
         return (String) pair.getRight().property(GraphPropertiesDictionary.NAME.getProperty()).value();
     }
 
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/RelationshipTypeOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/RelationshipTypeOperation.java
index 13ad7a798c..0eaec1b805 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/RelationshipTypeOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/RelationshipTypeOperation.java
@@ -10,8 +10,8 @@ import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.openecomp.sdc.be.model.RelationshipTypeDefinition;
@@ -39,12 +39,12 @@ public class RelationshipTypeOperation extends AbstractOperation {
     private static final String FAILED_TO_FETCH_PROPERTIES_OF_RELATIONSHIP_TYPE = "Failed to fetch properties of "
             + "relationship type {}";
 
-    public Either<RelationshipTypeDefinition, TitanOperationStatus> getRelationshipTypeByName(String name) {
+    public Either<RelationshipTypeDefinition, JanusGraphOperationStatus> getRelationshipTypeByName(String name) {
         String uid = UniqueIdBuilder.buildRelationshipTypeUid(name);
-        Either<RelationshipTypeDefinition, TitanOperationStatus> result = getRelationshipTypeByUid(uid);
+        Either<RelationshipTypeDefinition, JanusGraphOperationStatus> result = getRelationshipTypeByUid(uid);
         if (result.isRight()) {
-            TitanOperationStatus status = result.right().value();
-            if (status != TitanOperationStatus.NOT_FOUND) {
+            JanusGraphOperationStatus status = result.right().value();
+            if (status != JanusGraphOperationStatus.NOT_FOUND) {
                 logger.error("Failed to get information on relationship type {} status is {}", name, status);
             }
             return Either.right(status);
@@ -52,16 +52,16 @@ public class RelationshipTypeOperation extends AbstractOperation {
         return Either.left(result.left().value());
     }
 
-    public Either<RelationshipTypeDefinition, TitanOperationStatus> getRelationshipTypeByUid(String uniqueId) {
+    public Either<RelationshipTypeDefinition, JanusGraphOperationStatus> getRelationshipTypeByUid(String uniqueId) {
 
-        Either<RelationshipTypeDefinition, TitanOperationStatus> result;
+        Either<RelationshipTypeDefinition, JanusGraphOperationStatus> result;
 
-        Either<RelationshipTypeData, TitanOperationStatus> relationshipTypesRes =
-                titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(
+        Either<RelationshipTypeData, JanusGraphOperationStatus> relationshipTypesRes =
+                janusGraphGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(
                         NodeTypeEnum.RelationshipType), uniqueId, RelationshipTypeData.class);
 
         if (relationshipTypesRes.isRight()) {
-            TitanOperationStatus status = relationshipTypesRes.right().value();
+            JanusGraphOperationStatus status = relationshipTypesRes.right().value();
             logger.debug("Relationship type {} cannot be found in graph. status is {}", uniqueId, status);
             return Either.right(status);
         }
@@ -70,9 +70,9 @@ public class RelationshipTypeOperation extends AbstractOperation {
         RelationshipTypeDefinition relationshipTypeDefinition =
                 new RelationshipTypeDefinition(relationshipTypeData.getRelationshipTypeDataDefinition());
 
-        Either<Map<String, PropertyDefinition>, TitanOperationStatus> propertiesStatus =
+        Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> propertiesStatus =
                 OperationUtils.fillProperties(uniqueId, propertyOperation, NodeTypeEnum.RelationshipType);
-        if (propertiesStatus.isRight() && propertiesStatus.right().value() != TitanOperationStatus.OK) {
+        if (propertiesStatus.isRight() && propertiesStatus.right().value() != JanusGraphOperationStatus.OK) {
             logger.error("Failed to fetch properties of relationship type {}", uniqueId);
             return Either.right(propertiesStatus.right().value());
         }
@@ -81,17 +81,17 @@ public class RelationshipTypeOperation extends AbstractOperation {
             relationshipTypeDefinition.setProperties(propertiesStatus.left().value());
         }
 
-        Either<ImmutablePair<RelationshipTypeData, GraphEdge>, TitanOperationStatus> parentNode = titanGenericDao
+        Either<ImmutablePair<RelationshipTypeData, GraphEdge>, JanusGraphOperationStatus> parentNode = janusGraphGenericDao
                 .getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.RelationshipType), uniqueId,
                         GraphEdgeLabels.DERIVED_FROM,
                         NodeTypeEnum.RelationshipType, RelationshipTypeData.class);
         logger.debug("After retrieving DERIVED_FROM node of {}. status is {}", uniqueId, parentNode);
         if (parentNode.isRight()) {
-            TitanOperationStatus titanOperationStatus = parentNode.right().value();
-            if (titanOperationStatus != TitanOperationStatus.NOT_FOUND) {
+            JanusGraphOperationStatus janusGraphOperationStatus = parentNode.right().value();
+            if (janusGraphOperationStatus != JanusGraphOperationStatus.NOT_FOUND) {
                 logger.error("Failed to find the parent relationship of relationship type {}. status is {}", uniqueId,
-                        titanOperationStatus);
-                result = Either.right(titanOperationStatus);
+                    janusGraphOperationStatus);
+                result = Either.right(janusGraphOperationStatus);
                 return result;
             }
         } else {
@@ -107,27 +107,27 @@ public class RelationshipTypeOperation extends AbstractOperation {
 
     private Either<RelationshipTypeDefinition, StorageOperationStatus> validateUpdateProperties(
             RelationshipTypeDefinition relationshipTypeDefinition) {
-        TitanOperationStatus error = null;
+        JanusGraphOperationStatus error = null;
         if (MapUtils.isNotEmpty(relationshipTypeDefinition.getProperties())
                 && relationshipTypeDefinition.getDerivedFrom() != null) {
-            Either<Map<String, PropertyDefinition>, TitanOperationStatus> allPropertiesRes =
+            Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> allPropertiesRes =
                     getAllRelationshipTypePropertiesFromAllDerivedFrom(relationshipTypeDefinition.getDerivedFrom());
-            if (allPropertiesRes.isRight() && !TitanOperationStatus.NOT_FOUND.equals(allPropertiesRes.right().value())) {
+            if (allPropertiesRes.isRight() && !JanusGraphOperationStatus.NOT_FOUND.equals(allPropertiesRes.right().value())) {
                 error = allPropertiesRes.right().value();
                 logger.debug("Couldn't fetch derived from property nodes for relationship type {}, error: {}",
                         relationshipTypeDefinition.getType(), error);
             }
-            error = getTitanOperationStatus(relationshipTypeDefinition, error, allPropertiesRes);
+            error = getJanusGraphOperationStatus(relationshipTypeDefinition, error, allPropertiesRes);
         }
         if (error == null) {
             return Either.left(relationshipTypeDefinition);
         }
-        return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(error));
+        return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(error));
     }
 
-    private TitanOperationStatus getTitanOperationStatus(RelationshipTypeDefinition relationshipTypeDefinition,
-                                                         TitanOperationStatus error,
-                                                         Either<Map<String, PropertyDefinition>, TitanOperationStatus> allPropertiesRes) {
+    private JanusGraphOperationStatus getJanusGraphOperationStatus(RelationshipTypeDefinition relationshipTypeDefinition,
+                                                              JanusGraphOperationStatus error,
+                                                              Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> allPropertiesRes) {
         if (error == null && !allPropertiesRes.left().value().isEmpty()) {
             Map<String, PropertyDefinition> derivedFromProperties = allPropertiesRes.left().value();
             relationshipTypeDefinition.getProperties().entrySet().stream()
@@ -136,7 +136,7 @@ public class RelationshipTypeOperation extends AbstractOperation {
 
             List<PropertyDefinition>
                     properties = new ArrayList<>(relationshipTypeDefinition.getProperties().values());
-            Either<List<PropertyDefinition>, TitanOperationStatus> validatePropertiesRes =
+            Either<List<PropertyDefinition>, JanusGraphOperationStatus> validatePropertiesRes =
                     propertyOperation.validatePropertiesUniqueness(allPropertiesRes.left().value(), properties);
             if (validatePropertiesRes.isRight()) {
                 error = validatePropertiesRes.right().value();
@@ -145,7 +145,7 @@ public class RelationshipTypeOperation extends AbstractOperation {
         return error;
     }
 
-    private Either<Map<String, PropertyDefinition>, TitanOperationStatus> getAllRelationshipTypePropertiesFromAllDerivedFrom(
+    private Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> getAllRelationshipTypePropertiesFromAllDerivedFrom(
             String firstParentType) {
         return propertyOperation.getAllTypePropertiesFromAllDerivedFrom(firstParentType, NodeTypeEnum.RelationshipType,
                 RelationshipTypeData.class);
@@ -185,10 +185,10 @@ public class RelationshipTypeOperation extends AbstractOperation {
             if (!inTransaction) {
                 if (result == null || result.isRight()) {
                     logger.error("#addRelationshipType - Going to execute rollback on graph.");
-                    titanGenericDao.rollback();
+                    janusGraphGenericDao.rollback();
                 } else {
                     logger.debug("#addRelationshipType - Going to execute commit on graph.");
-                    titanGenericDao.commit();
+                    janusGraphGenericDao.commit();
                 }
             }
         }
@@ -200,15 +200,15 @@ public class RelationshipTypeOperation extends AbstractOperation {
         Either<RelationshipTypeDefinition, StorageOperationStatus> result;
         try {
 
-            Either<RelationshipTypeDefinition, TitanOperationStatus> ctResult = this.getRelationshipTypeByUid(uniqueId);
+            Either<RelationshipTypeDefinition, JanusGraphOperationStatus> ctResult = this.getRelationshipTypeByUid(uniqueId);
 
             if (ctResult.isRight()) {
-                TitanOperationStatus status = ctResult.right().value();
-                if (status != TitanOperationStatus.NOT_FOUND) {
+                JanusGraphOperationStatus status = ctResult.right().value();
+                if (status != JanusGraphOperationStatus.NOT_FOUND) {
                     logger.error("Failed to retrieve information on relationship type {}. status is {}", uniqueId,
                             status);
                 }
-                result = Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(ctResult.right().value()));
+                result = Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(ctResult.right().value()));
                 return result;
             }
 
@@ -218,7 +218,7 @@ public class RelationshipTypeOperation extends AbstractOperation {
         } finally {
             if (!inTransaction) {
                 logger.debug("Going to execute commit on graph.");
-                titanGenericDao.commit();
+                janusGraphGenericDao.commit();
             }
         }
     }
@@ -232,26 +232,26 @@ public class RelationshipTypeOperation extends AbstractOperation {
         RelationshipTypeData relationshipTypeData = buildRelationshipTypeData(relationshipTypeDefinition, ctUniqueId);
 
         logger.debug("Before adding relationship type to graph. relationshipTypeData = {}", relationshipTypeData);
-        Either<RelationshipTypeData, TitanOperationStatus> createCTResult =
-                titanGenericDao.createNode(relationshipTypeData, RelationshipTypeData.class);
+        Either<RelationshipTypeData, JanusGraphOperationStatus> createCTResult =
+                janusGraphGenericDao.createNode(relationshipTypeData, RelationshipTypeData.class);
         logger.debug("After adding relationship type to graph. status is = {}", createCTResult);
 
         if (createCTResult.isRight()) {
-            TitanOperationStatus operationStatus = createCTResult.right().value();
+            JanusGraphOperationStatus operationStatus = createCTResult.right().value();
             logger.error("Failed to relationship type {} to graph. status is {}", relationshipTypeDefinition.getType(),
                     operationStatus);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(operationStatus));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(operationStatus));
         }
 
         RelationshipTypeData resultCTD = createCTResult.left().value();
         Map<String, PropertyDefinition> propertiesMap = relationshipTypeDefinition.getProperties();
-        Either<Map<String, PropertyData>, TitanOperationStatus> addPropertiesToRelationshipType = propertyOperation
+        Either<Map<String, PropertyData>, JanusGraphOperationStatus> addPropertiesToRelationshipType = propertyOperation
                 .addPropertiesToElementType(resultCTD.getUniqueId(), NodeTypeEnum.RelationshipType, propertiesMap);
         if (addPropertiesToRelationshipType.isRight()) {
             logger.error("Failed add properties {} to relationship {}", propertiesMap,
                     relationshipTypeDefinition.getType());
             return Either.right(DaoStatusConverter
-                    .convertTitanStatusToStorageStatus(addPropertiesToRelationshipType.right().value()));
+                    .convertJanusGraphStatusToStorageStatus(addPropertiesToRelationshipType.right().value()));
         }
 
         return addDerivedFromRelation(relationshipTypeDefinition, ctUniqueId)
@@ -288,13 +288,13 @@ public class RelationshipTypeOperation extends AbstractOperation {
                         + "{}", relationshipTypeDefinition.getType(), derivedFrom);
         return getRelationshipTypeByType(derivedFrom)
                 .right()
-                .map(DaoStatusConverter::convertTitanStatusToStorageStatus)
+                .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus)
                 .left()
                 .bind(derivedFromRelationship -> derivedFromOperation.addDerivedFromRelation(relationshipTypeUniqueId,
                         derivedFromRelationship.getUniqueId(), NodeTypeEnum.RelationshipType));
     }
 
-    private Either<RelationshipTypeDefinition, TitanOperationStatus> getRelationshipTypeByType(
+    private Either<RelationshipTypeDefinition, JanusGraphOperationStatus> getRelationshipTypeByType(
             String relationshipType) {
         // Optimization: In case of Relationship Type its unique ID is the same as type
         return getRelationshipTypeByUid(relationshipType);
@@ -312,9 +312,9 @@ public class RelationshipTypeOperation extends AbstractOperation {
         } finally {
             if (!inTransaction) {
                 if (updateRelationshipEither == null || updateRelationshipEither.isRight()) {
-                    titanGenericDao.rollback();
+                    janusGraphGenericDao.rollback();
                 } else {
-                    titanGenericDao.commit();
+                    janusGraphGenericDao.commit();
                 }
             }
         }
@@ -325,10 +325,10 @@ public class RelationshipTypeOperation extends AbstractOperation {
             RelationshipTypeDefinition newRelationshipTypeDefinition,
             RelationshipTypeDefinition oldRelationshipTypeDefinition) {
         updateRelationshipTypeData(newRelationshipTypeDefinition, oldRelationshipTypeDefinition);
-        return titanGenericDao
+        return janusGraphGenericDao
                 .updateNode(new RelationshipTypeData(newRelationshipTypeDefinition), RelationshipTypeData.class)
                 .right()
-                .map(DaoStatusConverter::convertTitanStatusToStorageStatus)
+                .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus)
                 .left()
                 .bind(updatedNode -> updateRelationshipTypeProperties(newRelationshipTypeDefinition.getUniqueId(),
                         newRelationshipTypeDefinition.getProperties()))
@@ -379,7 +379,7 @@ public class RelationshipTypeOperation extends AbstractOperation {
         return propertyOperation
                 .addPropertiesToElementType(relationshipTypeId, NodeTypeEnum.RelationshipType, properties)
                 .right()
-                .map(DaoStatusConverter::convertTitanStatusToStorageStatus);
+                .map(DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
     }
 
     private StorageOperationStatus deleteDerivedFromRelationshipType(String relationshipTypeId,
@@ -393,19 +393,20 @@ public class RelationshipTypeOperation extends AbstractOperation {
                 .either(derivedFromNode -> derivedFromOperation
                                 .removeDerivedFromRelation(relationshipTypeId, derivedFromNode.getUniqueId(),
                                         NodeTypeEnum.RelationshipType),
-                        DaoStatusConverter::convertTitanStatusToStorageStatus);
+                        DaoStatusConverter::convertJanusGraphStatusToStorageStatus);
     }
 
-    public Either<Map<String, RelationshipTypeDefinition>, TitanOperationStatus> getAllRelationshipTypes() {
+    public Either<Map<String, RelationshipTypeDefinition>, JanusGraphOperationStatus> getAllRelationshipTypes() {
 
         Map<String, RelationshipTypeDefinition> relationshipTypeDefinitionMap = new HashMap<>();
-        Either<Map<String, RelationshipTypeDefinition>, TitanOperationStatus> result = Either.left(relationshipTypeDefinitionMap);
+        Either<Map<String, RelationshipTypeDefinition>, JanusGraphOperationStatus> result = Either.left(relationshipTypeDefinitionMap);
 
-        Either<List<RelationshipTypeData>, TitanOperationStatus> getAllRelationshipTypes =
-                titanGenericDao.getByCriteria(NodeTypeEnum.RelationshipType, null, RelationshipTypeData.class);
+        Either<List<RelationshipTypeData>, JanusGraphOperationStatus> getAllRelationshipTypes =
+                janusGraphGenericDao
+                    .getByCriteria(NodeTypeEnum.RelationshipType, null, RelationshipTypeData.class);
         if (getAllRelationshipTypes.isRight()) {
-            TitanOperationStatus status = getAllRelationshipTypes.right().value();
-            if (status != TitanOperationStatus.NOT_FOUND) {
+            JanusGraphOperationStatus status = getAllRelationshipTypes.right().value();
+            if (status != JanusGraphOperationStatus.NOT_FOUND) {
                 return Either.right(status);
             } else {
                 return result;
@@ -417,8 +418,8 @@ public class RelationshipTypeOperation extends AbstractOperation {
 
             logger.trace("Number of relationship types to load is {}", list.size());
             //Set properties
-            Either<Map<String, RelationshipTypeDefinition>, TitanOperationStatus> status =
-                    getMapTitanOperationStatusEither(relationshipTypeDefinitionMap, list);
+            Either<Map<String, RelationshipTypeDefinition>, JanusGraphOperationStatus> status =
+                    getMapJanusGraphOperationStatusEither(relationshipTypeDefinitionMap, list);
             if (status != null) {
                 return status;
             }
@@ -427,7 +428,7 @@ public class RelationshipTypeOperation extends AbstractOperation {
         return result;
     }
 
-    private Either<Map<String, RelationshipTypeDefinition>, TitanOperationStatus> getMapTitanOperationStatusEither(
+    private Either<Map<String, RelationshipTypeDefinition>, JanusGraphOperationStatus> getMapJanusGraphOperationStatusEither(
             Map<String, RelationshipTypeDefinition> relationshipTypeDefinitionMap,
             List<RelationshipTypeData> list) {
         for (RelationshipTypeData relationshipTypeData : list) {
@@ -435,12 +436,12 @@ public class RelationshipTypeOperation extends AbstractOperation {
             logger.trace("Going to fetch relationship type {}. uid is {}",
                     relationshipTypeData.getRelationshipTypeDataDefinition().getType(),
                     relationshipTypeData.getUniqueId());
-            Either<RelationshipTypeDefinition, TitanOperationStatus> relationshipTypesByUid =
+            Either<RelationshipTypeDefinition, JanusGraphOperationStatus> relationshipTypesByUid =
                     getAndAddPropertiesANdDerivedFrom(relationshipTypeData.getUniqueId(), relationshipTypeDefinitionMap);
             if (relationshipTypesByUid.isRight()) {
-                TitanOperationStatus status = relationshipTypesByUid.right().value();
-                if (status == TitanOperationStatus.NOT_FOUND) {
-                    status = TitanOperationStatus.INVALID_ID;
+                JanusGraphOperationStatus status = relationshipTypesByUid.right().value();
+                if (status == JanusGraphOperationStatus.NOT_FOUND) {
+                    status = JanusGraphOperationStatus.INVALID_ID;
                 }
                 return Either.right(status);
             }
@@ -448,18 +449,18 @@ public class RelationshipTypeOperation extends AbstractOperation {
         return null;
     }
 
-    private Either<RelationshipTypeDefinition, TitanOperationStatus> getAndAddPropertiesANdDerivedFrom(
+    private Either<RelationshipTypeDefinition, JanusGraphOperationStatus> getAndAddPropertiesANdDerivedFrom(
             String uniqueId, Map<String, RelationshipTypeDefinition> relationshipTypeDefinitionMap) {
         if (relationshipTypeDefinitionMap.containsKey(uniqueId)) {
             return Either.left(relationshipTypeDefinitionMap.get(uniqueId));
         }
 
-        Either<RelationshipTypeData, TitanOperationStatus> relationshipTypesRes =
-                titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.RelationshipType), uniqueId,
+        Either<RelationshipTypeData, JanusGraphOperationStatus> relationshipTypesRes =
+                janusGraphGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.RelationshipType), uniqueId,
                         RelationshipTypeData.class);
 
         if (relationshipTypesRes.isRight()) {
-            TitanOperationStatus status = relationshipTypesRes.right().value();
+            JanusGraphOperationStatus status = relationshipTypesRes.right().value();
             logger.debug(RELATIONSHIP_TYPE_CANNOT_BE_FOUND_IN_GRAPH_STATUS_IS, uniqueId, status);
             return Either.right(status);
         }
@@ -468,9 +469,9 @@ public class RelationshipTypeOperation extends AbstractOperation {
         RelationshipTypeDefinition relationshipTypeDefinition =
                 new RelationshipTypeDefinition(ctData.getRelationshipTypeDataDefinition());
 
-        Either<Map<String, PropertyDefinition>, TitanOperationStatus> propertiesStatus =
+        Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> propertiesStatus =
                 OperationUtils.fillProperties(uniqueId, propertyOperation, NodeTypeEnum.RelationshipType);
-        if (propertiesStatus.isRight() && propertiesStatus.right().value() != TitanOperationStatus.OK) {
+        if (propertiesStatus.isRight() && propertiesStatus.right().value() != JanusGraphOperationStatus.OK) {
             logger.error(FAILED_TO_FETCH_PROPERTIES_OF_RELATIONSHIP_TYPE, uniqueId);
             return Either.right(propertiesStatus.right().value());
         }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/UserAdminOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/UserAdminOperation.java
index 72c370ffe6..bea9df9639 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/UserAdminOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/UserAdminOperation.java
@@ -20,7 +20,7 @@
 
 package org.openecomp.sdc.be.model.operations.impl;
 
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.tinkerpop.gremlin.structure.Direction;
@@ -28,10 +28,10 @@ import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
 import org.openecomp.sdc.be.dao.utils.UserStatusEnum;
 import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
@@ -52,11 +52,12 @@ import static org.apache.commons.collections.CollectionUtils.isEmpty;
 @Component("user-operation")
 public class UserAdminOperation implements IUserAdminOperation {
 
-    private TitanGenericDao titanGenericDao;
+    private JanusGraphGenericDao janusGraphGenericDao;
 
-    public UserAdminOperation(@Qualifier("titan-generic-dao") TitanGenericDao titanGenericDao) {
+    public UserAdminOperation(@Qualifier("janusgraph-generic-dao")
+                                  JanusGraphGenericDao janusGraphGenericDao) {
         super();
-        this.titanGenericDao = titanGenericDao;
+        this.janusGraphGenericDao = janusGraphGenericDao;
 
     }
 
@@ -93,7 +94,7 @@ public class UserAdminOperation implements IUserAdminOperation {
             return resultWrapper.getInnerElement();
         } finally {
             if (!inTransaction) {
-                titanGenericDao.commit();
+                janusGraphGenericDao.commit();
             }
             log.debug("getUserData - end");
         }
@@ -127,7 +128,8 @@ public class UserAdminOperation implements IUserAdminOperation {
             return;
         }
         id = id.toLowerCase();
-        Either<UserData, TitanOperationStatus> either = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.User), id, UserData.class);
+        Either<UserData, JanusGraphOperationStatus> either = janusGraphGenericDao
+            .getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.User), id, UserData.class);
 
         if (either.isRight()) {
             resultWrapper.setInnerElement(getUserNotFoundError(id, either.right().value()));
@@ -138,10 +140,10 @@ public class UserAdminOperation implements IUserAdminOperation {
 
     @Override
     public Either<User, StorageOperationStatus> saveUserData(User user) {
-        Either<UserData, TitanOperationStatus> result = null;
+        Either<UserData, JanusGraphOperationStatus> result = null;
         try {
             UserData userData = convertToUserData(user);
-            result = titanGenericDao.createNode(userData, UserData.class);
+            result = janusGraphGenericDao.createNode(userData, UserData.class);
             if (result.isRight()) {
                 log.debug("Problem while saving User  {}. Reason - {}", userData.getUserId(), result.right().value());
                 return Either.right(StorageOperationStatus.GENERAL_ERROR);
@@ -153,21 +155,21 @@ public class UserAdminOperation implements IUserAdminOperation {
 
             if (result == null || result.isRight()) {
                 log.error("saveUserData - Failed");
-                titanGenericDao.rollback();
+                janusGraphGenericDao.rollback();
             } else {
                 log.debug("saveUserData - end");
-                titanGenericDao.commit();
+                janusGraphGenericDao.commit();
             }
         }
     }
 
     @Override
     public Either<User, StorageOperationStatus> updateUserData(User user) {
-        Either<UserData, TitanOperationStatus> result = null;
+        Either<UserData, JanusGraphOperationStatus> result = null;
         try {
             log.debug("updateUserData - start");
             UserData userData = convertToUserData(user);
-            result = titanGenericDao.updateNode(userData, UserData.class);
+            result = janusGraphGenericDao.updateNode(userData, UserData.class);
             if (result.isRight()) {
                 if (log.isDebugEnabled()) {
                     log.debug("Problem while updating User {}. Reason - {}", userData.toString(), result.right().value());
@@ -181,10 +183,10 @@ public class UserAdminOperation implements IUserAdminOperation {
 
             if (result == null || result.isRight()) {
                 log.error("updateUserData - Failed");
-                titanGenericDao.rollback();
+                janusGraphGenericDao.rollback();
             } else {
                 log.debug("updateUserData - end");
-                titanGenericDao.commit();
+                janusGraphGenericDao.commit();
             }
 
         }
@@ -206,10 +208,11 @@ public class UserAdminOperation implements IUserAdminOperation {
     @Override
     public Either<User, ActionStatus> deleteUserData(String id) {
         Either<User, ActionStatus> result;
-        Either<UserData, TitanOperationStatus> eitherGet = titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.User), id, UserData.class);
+        Either<UserData, JanusGraphOperationStatus> eitherGet = janusGraphGenericDao
+            .getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.User), id, UserData.class);
         if (eitherGet.isRight()) {
             log.debug("Problem while retriving user with userId {}",id);
-            if (eitherGet.right().value() == TitanOperationStatus.NOT_FOUND) {
+            if (eitherGet.right().value() == JanusGraphOperationStatus.NOT_FOUND) {
                 result = Either.right(ActionStatus.USER_NOT_FOUND);
             } else {
                 result = Either.right(ActionStatus.GENERAL_ERROR);
@@ -228,13 +231,14 @@ public class UserAdminOperation implements IUserAdminOperation {
                 deleteUser(resultWrapper, userData);
             }
         } finally {
-            titanGenericDao.commit();
+            janusGraphGenericDao.commit();
         }
         return resultWrapper.getInnerElement();
     }
 
     private void deleteUser(Wrapper<Either<User, ActionStatus>> resultWrapper, UserData userData) {
-        Either<UserData, TitanOperationStatus> eitherDelete = titanGenericDao.deleteNode(userData, UserData.class);
+        Either<UserData, JanusGraphOperationStatus> eitherDelete = janusGraphGenericDao
+            .deleteNode(userData, UserData.class);
         if (eitherDelete.isRight()) {
             if (log.isDebugEnabled()) {
                 log.debug("Problem while deleting User {}. Reason - {}", userData.toString(), eitherDelete.right().value());
@@ -249,7 +253,8 @@ public class UserAdminOperation implements IUserAdminOperation {
     private void validateUserHasNoConnections(Wrapper<Either<User, ActionStatus>> resultWrapper, UserData userData) {
         if (resultWrapper.isEmpty()) {
 
-            Either<List<Edge>, TitanOperationStatus> edgesForNode = titanGenericDao.getEdgesForNode(userData, Direction.BOTH);
+            Either<List<Edge>, JanusGraphOperationStatus> edgesForNode = janusGraphGenericDao
+                .getEdgesForNode(userData, Direction.BOTH);
             if (edgesForNode.isRight()) {
                 if (log.isDebugEnabled()) {
                     log.debug("Problem while deleting User {}. Reason - {}", userData.getUserId(), edgesForNode.right().value());
@@ -266,21 +271,23 @@ public class UserAdminOperation implements IUserAdminOperation {
 
     public Either<List<Edge>, StorageOperationStatus> getUserPendingTasksList(User user, Map<String, Object> properties) {
 
-        Either<TitanVertex, TitanOperationStatus> vertexUser = titanGenericDao.getVertexByProperty(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.User), user.getUserId());
+        Either<JanusGraphVertex, JanusGraphOperationStatus> vertexUser = janusGraphGenericDao
+            .getVertexByProperty(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.User), user.getUserId());
         if (vertexUser.isRight()) {
-            TitanOperationStatus tos = vertexUser.right().value();
+            JanusGraphOperationStatus tos = vertexUser.right().value();
             log.debug("Failed to get User {} from graph while retrieving pending tasks. Reason - {}", user.getUserId(), tos);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(tos));
+            return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(tos));
         }
         List<Edge> pendingTasks = new ArrayList<>();
-        Either<List<Edge>, TitanOperationStatus> edges = titanGenericDao.getOutgoingEdgesByCriteria(vertexUser.left().value(), GraphEdgeLabels.STATE, properties);
+        Either<List<Edge>, JanusGraphOperationStatus> edges = janusGraphGenericDao
+            .getOutgoingEdgesByCriteria(vertexUser.left().value(), GraphEdgeLabels.STATE, properties);
         if (edges.isRight() || edges.left().value() == null) {
-            TitanOperationStatus tos = edges.right().value();
-            if (tos == TitanOperationStatus.NOT_FOUND) {
+            JanusGraphOperationStatus tos = edges.right().value();
+            if (tos == JanusGraphOperationStatus.NOT_FOUND) {
                 return Either.left(pendingTasks);
             } else {
                 log.debug("Failed while retrieving pending tasks for user {} . Reason - {}", user.getUserId(), tos);
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(tos));
+                return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(tos));
             }
         }
         for (Edge edge : edges.left().value()) {
@@ -322,21 +329,22 @@ public class UserAdminOperation implements IUserAdminOperation {
                 propertiesToMatch.put(GraphPropertiesDictionary.USER_STATUS.getProperty(), status);
             }
 
-            Either<List<UserData>, TitanOperationStatus> userNodes = titanGenericDao.getByCriteria(NodeTypeEnum.User, propertiesToMatch, UserData.class);
+            Either<List<UserData>, JanusGraphOperationStatus> userNodes = janusGraphGenericDao
+                .getByCriteria(NodeTypeEnum.User, propertiesToMatch, UserData.class);
 
-            titanGenericDao.commit();
+            janusGraphGenericDao.commit();
             return convertToUsers(role, userNodes);
         } finally {
-            titanGenericDao.commit();
+            janusGraphGenericDao.commit();
         }
     }
 
-    private Either<List<User>, ActionStatus> convertToUsers(String role, Either<List<UserData>, TitanOperationStatus> userNodes) {
+    private Either<List<User>, ActionStatus> convertToUsers(String role, Either<List<UserData>, JanusGraphOperationStatus> userNodes) {
 
         if (userNodes.isRight()) {
-            // in case of NOT_FOUND from Titan return empty list
-            TitanOperationStatus tos = userNodes.right().value();
-            if (tos.equals(TitanOperationStatus.NOT_FOUND)) {
+            // in case of NOT_FOUND from JanusGraph return empty list
+            JanusGraphOperationStatus tos = userNodes.right().value();
+            if (tos.equals(JanusGraphOperationStatus.NOT_FOUND)) {
                 return Either.left(Collections.emptyList());
             } else {
                 log.error("Problem while getting all users with role {}. Reason - {}", role, tos);
@@ -361,8 +369,8 @@ public class UserAdminOperation implements IUserAdminOperation {
         return result;
     }
 
-    private Either<User, ActionStatus> getUserNotFoundError(String uid, TitanOperationStatus status) {
-        if (status == TitanOperationStatus.NOT_FOUND) {
+    private Either<User, ActionStatus> getUserNotFoundError(String uid, JanusGraphOperationStatus status) {
+        if (status == JanusGraphOperationStatus.NOT_FOUND) {
             log.debug("User with userId {} not found", uid);
             return Either.right(ActionStatus.USER_NOT_FOUND);
         } else {
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/utils/ComponentValidationUtils.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/utils/ComponentValidationUtils.java
index d4cbc8d977..5c2212072c 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/utils/ComponentValidationUtils.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/utils/ComponentValidationUtils.java
@@ -25,7 +25,7 @@ import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ModelTestBase.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ModelTestBase.java
index 9efdc95bce..046161ab40 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ModelTestBase.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ModelTestBase.java
@@ -20,14 +20,14 @@
 
 package org.openecomp.sdc.be.model;
 
-import com.thinkaurelius.titan.core.TitanGraph;
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraph;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import org.openecomp.sdc.be.config.Configuration;
 import org.openecomp.sdc.be.config.ConfigurationManager;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum;
@@ -54,7 +54,7 @@ public class ModelTestBase {
 
         Configuration configuration = new Configuration();
 
-        configuration.setTitanInMemoryGraph(true);
+        configuration.setJanusGraphInMemoryGraph(true);
 
         Map<String, Object> deploymentRIArtifacts = new HashMap<>();
         ArtifactDataDefinition artifactInfo = new ArtifactDataDefinition();
@@ -66,13 +66,13 @@ public class ModelTestBase {
         configurationManager.getConfiguration().setDeploymentResourceInstanceArtifacts(deploymentRIArtifacts);
 	}
 
-    protected void removeGraphVertices(Either<TitanGraph, TitanOperationStatus> graphResult) {
-        TitanGraph graph = graphResult.left().value();
-        Iterable<TitanVertex> vertices = graph.query().vertices();
+    protected void removeGraphVertices(Either<JanusGraph, JanusGraphOperationStatus> graphResult) {
+        JanusGraph graph = graphResult.left().value();
+        Iterable<JanusGraphVertex> vertices = graph.query().vertices();
         if (vertices != null) {
-            Iterator<TitanVertex> iterator = vertices.iterator();
+            Iterator<JanusGraphVertex> iterator = vertices.iterator();
             while (iterator.hasNext()) {
-                TitanVertex vertex = iterator.next();
+                JanusGraphVertex vertex = iterator.next();
                 vertex.remove();
             }
 
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/cache/ApplicationDataTypeCacheTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/cache/ApplicationDataTypeCacheTest.java
index 48681867f9..82c8ae603d 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/cache/ApplicationDataTypeCacheTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/cache/ApplicationDataTypeCacheTest.java
@@ -9,7 +9,7 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.model.DataTypeDefinition;
 import org.openecomp.sdc.be.model.operations.impl.PropertyOperation;
 import org.openecomp.sdc.be.resources.data.DataTypeData;
@@ -54,7 +54,7 @@ public class ApplicationDataTypeCacheTest extends ModelConfDependentTest{
 
 	@Test
 	public void testGetAllDataTypesFromGraph() throws Exception {
-		Either<Map<String, DataTypeDefinition>, TitanOperationStatus> result;
+		Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> result;
 
 		// default test
 		result = Deencapsulation.invoke(testSubject, "getAllDataTypesFromGraph");
@@ -62,7 +62,7 @@ public class ApplicationDataTypeCacheTest extends ModelConfDependentTest{
 
 	@Test
 	public void testGetAll() throws Exception {
-		Either<Map<String, DataTypeDefinition>, TitanOperationStatus> result;
+		Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> result;
 
 		// default test
 		result = testSubject.getAll();
@@ -71,7 +71,7 @@ public class ApplicationDataTypeCacheTest extends ModelConfDependentTest{
 	@Test
 	public void testGet() throws Exception {
 		String uniqueId = "";
-		Either<DataTypeDefinition, TitanOperationStatus> result;
+		Either<DataTypeDefinition, JanusGraphOperationStatus> result;
 
 		// default test
 		result = testSubject.get(uniqueId);
@@ -80,13 +80,13 @@ public class ApplicationDataTypeCacheTest extends ModelConfDependentTest{
 	@Test
 	public void testGet2() throws Exception {
 		String uniqueId = "";
-		Either<DataTypeDefinition, TitanOperationStatus> result;
+		Either<DataTypeDefinition, JanusGraphOperationStatus> result;
 
 		HashMap<String, DataTypeDefinition> a = new HashMap<>();
 		DataTypeDefinition value1 = new DataTypeDefinition();
 		value1.setUniqueId("mock");
 		a.put("mock", value1);
-		Either<Map<String, DataTypeDefinition>, TitanOperationStatus> value = Either.left(a);
+		Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> value = Either.left(a);
 		Mockito.when(propertyOperation.getAllDataTypes()).thenReturn(value);
 		// default test
 		Deencapsulation.invoke(testSubject, "replaceAllData");
@@ -100,7 +100,8 @@ public class ApplicationDataTypeCacheTest extends ModelConfDependentTest{
 
 	@Test
 	public void testRun2() throws Exception {
-		Either<List<DataTypeData>, TitanOperationStatus> value = Either.right(TitanOperationStatus.GENERAL_ERROR);
+		Either<List<DataTypeData>, JanusGraphOperationStatus> value = Either.right(
+        JanusGraphOperationStatus.GENERAL_ERROR);
 		Mockito.when(propertyOperation.getAllDataTypeNodes()).thenReturn(value);
 		testSubject.run();
 	}
@@ -109,14 +110,14 @@ public class ApplicationDataTypeCacheTest extends ModelConfDependentTest{
 	public void testRun3() throws Exception {
 		LinkedList<DataTypeData> a = new LinkedList<>();
 		a.add(new DataTypeData());
-		Either<List<DataTypeData>, TitanOperationStatus> value = Either.left(a);
+		Either<List<DataTypeData>, JanusGraphOperationStatus> value = Either.left(a);
 		Mockito.when(propertyOperation.getAllDataTypeNodes()).thenReturn(value);
 		
 		HashMap<String, DataTypeDefinition> a1 = new HashMap<>();
 		DataTypeDefinition value1 = new DataTypeDefinition();
 		value1.setUniqueId("mock");
 		a1.put("mock", value1);
-		Either<Map<String, DataTypeDefinition>, TitanOperationStatus> value2 = Either.left(a1);
+		Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> value2 = Either.left(a1);
 		Mockito.when(propertyOperation.getAllDataTypes()).thenReturn(value2);
 		
 		Deencapsulation.invoke(testSubject, "replaceAllData");
@@ -152,7 +153,7 @@ public class ApplicationDataTypeCacheTest extends ModelConfDependentTest{
 		DataTypeDefinition value1 = new DataTypeDefinition();
 		value1.setUniqueId("mock");
 		a.put("mock", value1);
-		Either<Map<String, DataTypeDefinition>, TitanOperationStatus> value = Either.left(a);
+		Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> value = Either.left(a);
 		Mockito.when(propertyOperation.getAllDataTypes()).thenReturn(value);
 		// default test
 		Deencapsulation.invoke(testSubject, "replaceAllData");
@@ -160,7 +161,8 @@ public class ApplicationDataTypeCacheTest extends ModelConfDependentTest{
 	
 	@Test
 	public void testReplaceAllData2() throws Exception {
-		Either<Map<String, DataTypeDefinition>, TitanOperationStatus> value = Either.right(TitanOperationStatus.GENERAL_ERROR);
+		Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> value = Either.right(
+        JanusGraphOperationStatus.GENERAL_ERROR);
 		Mockito.when(propertyOperation.getAllDataTypes()).thenReturn(value);
 		// default test
 		Deencapsulation.invoke(testSubject, "replaceAllData");
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/cache/ComponentCacheTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/cache/ComponentCacheTest.java
index 49e847acf6..62155e2be5 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/cache/ComponentCacheTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/cache/ComponentCacheTest.java
@@ -22,7 +22,7 @@ import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.Product;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.Service;
-import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.resources.data.ComponentCacheData;
 import org.openecomp.sdc.be.unittests.utils.ModelConfDependentTest;
 
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/cache/DaoInfoTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/cache/DaoInfoTest.java
index 2e2f36b9c7..8c4d9d5378 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/cache/DaoInfoTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/cache/DaoInfoTest.java
@@ -1,7 +1,7 @@
 package org.openecomp.sdc.be.model.cache;
 
 import org.junit.Test;
-import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
 
 
 public class DaoInfoTest {
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/cache/jobs/CheckAndUpdateJobTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/cache/jobs/CheckAndUpdateJobTest.java
index 5347bc0d76..4e54ba7a29 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/cache/jobs/CheckAndUpdateJobTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/cache/jobs/CheckAndUpdateJobTest.java
@@ -14,7 +14,7 @@ import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.cache.ComponentCache;
 import org.openecomp.sdc.be.model.cache.DaoInfo;
-import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.resources.data.ComponentMetadataData;
 import org.openecomp.sdc.be.resources.data.ResourceMetadataData;
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/config/ModelOperationsSpringConfig.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/config/ModelOperationsSpringConfig.java
index d6b2dd61e7..7e0a72e474 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/config/ModelOperationsSpringConfig.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/config/ModelOperationsSpringConfig.java
@@ -6,7 +6,8 @@ import org.springframework.context.annotation.PropertySource;
 
 @Configuration
 @ComponentScan({"org.openecomp.sdc.be.dao.cassandra", "org.openecomp.sdc.be.model.cache",
-        "org.openecomp.sdc.be.model.jsontitan.operations", "org.openecomp.sdc.be.model.jsontitan.utils",
+    "org.openecomp.sdc.be.model.jsonjanusgraph.operations",
+    "org.openecomp.sdc.be.model.jsonjanusgraph.utils",
         "org.openecomp.sdc.be.model.operations.impl"})
 @PropertySource("classpath:dao.properties")
 public class ModelOperationsSpringConfig { }
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/NodeTypeTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/datamodel/NodeTypeTest.java
index 493cb74a25..e4e377ff78 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/NodeTypeTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/datamodel/NodeTypeTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.be.model.jsontitan.datamodel;
+package org.openecomp.sdc.be.model.jsonjanusgraph.datamodel;
 
 import java.util.List;
 import java.util.Map;
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/TopologyTemplateTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/datamodel/TopologyTemplateTest.java
index c13ddd3970..4875ca69f7 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/TopologyTemplateTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/datamodel/TopologyTemplateTest.java
@@ -1,11 +1,10 @@
-package org.openecomp.sdc.be.model.jsontitan.datamodel;
+package org.openecomp.sdc.be.model.jsonjanusgraph.datamodel;
 
 import java.util.Map;
 
 import org.junit.Test;
 import org.openecomp.sdc.be.datatypes.elements.*;
 import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
-import org.openecomp.sdc.be.model.DataTypeDefinition;
 
 
 public class TopologyTemplateTest {
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/ToscaElementTypeEnumTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/datamodel/ToscaElementTypeEnumTest.java
index 918b0328a9..f175aa3d51 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/datamodel/ToscaElementTypeEnumTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/datamodel/ToscaElementTypeEnumTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.be.model.jsontitan.datamodel;
+package org.openecomp.sdc.be.model.jsonjanusgraph.datamodel;
 
 import org.junit.Test;
 
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/enums/JsonConstantKeysEnumTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/enums/JsonConstantKeysEnumTest.java
index b00b13e162..a37a157428 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/enums/JsonConstantKeysEnumTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/enums/JsonConstantKeysEnumTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.be.model.jsontitan.enums;
+package org.openecomp.sdc.be.model.jsonjanusgraph.enums;
 
 import org.junit.Test;
 
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/ArchiveOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ArchiveOperationTest.java
index b906604037..ce208d9b3a 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/ArchiveOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ArchiveOperationTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
 import org.junit.Before;
@@ -6,11 +6,11 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.ComponentInstanceDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.CompositionDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum;
@@ -18,8 +18,8 @@ import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.ModelTestBase;
-import org.openecomp.sdc.be.model.jsontitan.enums.JsonConstantKeysEnum;
-import org.openecomp.sdc.be.model.jsontitan.utils.GraphTestUtils;
+import org.openecomp.sdc.be.model.jsonjanusgraph.enums.JsonConstantKeysEnum;
+import org.openecomp.sdc.be.model.jsonjanusgraph.utils.GraphTestUtils;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -45,7 +45,7 @@ public class ArchiveOperationTest extends ModelTestBase {
     private ArchiveOperation archiveOperation;
 
     @Resource
-    private TitanDao titanDao;
+    private JanusGraphDao janusGraphDao;
 
     private boolean isInitialized;
 
@@ -88,7 +88,7 @@ public class ArchiveOperationTest extends ModelTestBase {
     @Before
     public void beforeTest() {
         if (!isInitialized) {
-            GraphTestUtils.clearGraph(titanDao);
+            GraphTestUtils.clearGraph(janusGraphDao);
             initGraphForTest();
             isInitialized = true;
         }
@@ -247,13 +247,13 @@ public class ArchiveOperationTest extends ModelTestBase {
     }
 
     private void assertOnVspArchived(boolean expectedValue) {
-        GraphVertex v = titanDao.getVertexById(vfResource0_1.getUniqueId()).left().value();
+        GraphVertex v = janusGraphDao.getVertexById(vfResource0_1.getUniqueId()).left().value();
         assertThat(v.getMetadataProperty(GraphPropertyEnum.IS_VSP_ARCHIVED)).isEqualTo(expectedValue);
 
-        v = titanDao.getVertexById(vfResource0_2.getUniqueId()).left().value();
+        v = janusGraphDao.getVertexById(vfResource0_2.getUniqueId()).left().value();
         assertThat(v.getMetadataProperty(GraphPropertyEnum.IS_VSP_ARCHIVED)).isEqualTo(expectedValue);
 
-        v = titanDao.getVertexById(vfResource1_0.getUniqueId()).left().value();
+        v = janusGraphDao.getVertexById(vfResource1_0.getUniqueId()).left().value();
         assertThat(v.getMetadataProperty(GraphPropertyEnum.IS_VSP_ARCHIVED)).isEqualTo(expectedValue);
     }
 
@@ -262,17 +262,17 @@ public class ArchiveOperationTest extends ModelTestBase {
      *************************/
 
     private void checkoutComponent(GraphVertex serviceVertex0_5) {
-        Either<GraphVertex, TitanOperationStatus> vE = titanDao.getVertexById(serviceVertex0_5.getUniqueId());
+        Either<GraphVertex, JanusGraphOperationStatus> vE = janusGraphDao.getVertexById(serviceVertex0_5.getUniqueId());
         GraphVertex v = vE.left().value();
         v.addMetadataProperty(GraphPropertyEnum.STATE, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT);
         v.setJsonMetadataField(JsonPresentationFields.LIFECYCLE_STATE, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT);
-        titanDao.updateVertex(v);
+        janusGraphDao.updateVertex(v);
         assertOnCommit();
     }
 
     private void assertOnCommit(){
-        final TitanOperationStatus commit = this.titanDao.commit();
-        assertThat(commit).isEqualTo(TitanOperationStatus.OK);
+        final JanusGraphOperationStatus commit = this.janusGraphDao.commit();
+        assertThat(commit).isEqualTo(JanusGraphOperationStatus.OK);
     }
 
     private void assertArchived(String componentUniqueId) {
@@ -284,18 +284,18 @@ public class ArchiveOperationTest extends ModelTestBase {
     }
 
     private void assertArchivedOrRestored(ArchiveOperation.Action action,  String componentUniqueId) {
-        GraphVertex v = titanDao.getVertexById(componentUniqueId).left().value();
+        GraphVertex v = janusGraphDao.getVertexById(componentUniqueId).left().value();
 
         EdgeLabelEnum requiredEdge = action == ArchiveOperation.Action.ARCHIVE ? EdgeLabelEnum.ARCHIVE_ELEMENT : EdgeLabelEnum.CATALOG_ELEMENT;
         EdgeLabelEnum otherEdge = action == ArchiveOperation.Action.ARCHIVE ? EdgeLabelEnum.CATALOG_ELEMENT : EdgeLabelEnum.ARCHIVE_ELEMENT;
 
         GraphVertex parent = null;
-        Either<GraphVertex, TitanOperationStatus> otherLookup = null;
+        Either<GraphVertex, JanusGraphOperationStatus> otherLookup = null;
         Boolean isHighest = (Boolean) v.getMetadataProperty(GraphPropertyEnum.IS_HIGHEST_VERSION);
         if (isHighest != null && isHighest) {
             //Highest version are linked to Archive/Catalog Root
-            parent = titanDao.getParentVertex(v, requiredEdge, JsonParseFlagEnum.NoParse).left().value();
-            otherLookup = titanDao.getParentVertex(v, otherEdge, JsonParseFlagEnum.NoParse);
+            parent = janusGraphDao.getParentVertex(v, requiredEdge, JsonParseFlagEnum.NoParse).left().value();
+            otherLookup = janusGraphDao.getParentVertex(v, otherEdge, JsonParseFlagEnum.NoParse);
             assertThat(otherLookup.isRight()).isTrue();           //Verify that component is not linked to Catalog/Archive Root
             assertThat(parent.getUniqueId()).isEqualTo(action == ArchiveOperation.Action.ARCHIVE ? this.archiveVertex.getUniqueId() : this.catalogVertex.getUniqueId()); //Verify that parent is indeed Archive Root
         }
@@ -305,13 +305,13 @@ public class ArchiveOperationTest extends ModelTestBase {
 
     private void assertArchivedProps(String uniqueId) {
         GraphVertex v =
-                titanDao.getVertexById(uniqueId).left().value();
+                janusGraphDao.getVertexById(uniqueId).left().value();
         assertArchivedOrRestoredProps(ArchiveOperation.Action.ARCHIVE, v);
     }
 
     private void assertRestoredProps(String uniqueId) {
         GraphVertex v =
-                titanDao.getVertexById(uniqueId).left().value();
+                janusGraphDao.getVertexById(uniqueId).left().value();
         assertArchivedOrRestoredProps(ArchiveOperation.Action.RESTORE, v);
     }
 
@@ -327,9 +327,9 @@ public class ArchiveOperationTest extends ModelTestBase {
      *******************************/
     private void initGraphForTest() {
         //Create Catalog Root
-        this.catalogVertex = GraphTestUtils.createRootCatalogVertex(titanDao);
+        this.catalogVertex = GraphTestUtils.createRootCatalogVertex(janusGraphDao);
         //Create Archive Root
-        this.archiveVertex = GraphTestUtils.createRootArchiveVertex(titanDao);
+        this.archiveVertex = GraphTestUtils.createRootArchiveVertex(janusGraphDao);
 
         createScenario1_SingleVersionNode();
         createScenario2_TwoHighestVersions();
@@ -344,53 +344,58 @@ public class ArchiveOperationTest extends ModelTestBase {
 
     private void createScenario1_SingleVersionNode() {
         //Create Service for Scenario 1 Tests (1 Service)
-        this.serviceVertex1 = GraphTestUtils.createServiceVertex(titanDao, propsForHighestVersion());
+        this.serviceVertex1 = GraphTestUtils.createServiceVertex(janusGraphDao, propsForHighestVersion());
 
         //Connect Service to Catalog Root
-        titanDao.createEdge(catalogVertex, serviceVertex1, EdgeLabelEnum.CATALOG_ELEMENT, null);
+        janusGraphDao.createEdge(catalogVertex, serviceVertex1, EdgeLabelEnum.CATALOG_ELEMENT, null);
     }
 
     private void createScenario2_TwoHighestVersions() {
         //Create Service for Scenario 2 Tests (1 Service)
-        this.serviceVertex1_0 = GraphTestUtils.createServiceVertex(titanDao, propsForHighestVersion());
-        this.serviceVertex1_1 = GraphTestUtils.createServiceVertex(titanDao, propsForHighestVersion());
+        this.serviceVertex1_0 = GraphTestUtils.createServiceVertex(janusGraphDao, propsForHighestVersion());
+        this.serviceVertex1_1 = GraphTestUtils.createServiceVertex(janusGraphDao, propsForHighestVersion());
 
-        titanDao.createEdge(serviceVertex1_0, serviceVertex1_1, EdgeLabelEnum.VERSION, null);
+        janusGraphDao.createEdge(serviceVertex1_0, serviceVertex1_1, EdgeLabelEnum.VERSION, null);
 
         //Connect 1.0 and 1.1 to Catalog Root
-        titanDao.createEdge(catalogVertex, serviceVertex1_0, EdgeLabelEnum.CATALOG_ELEMENT, null);
-        titanDao.createEdge(catalogVertex, serviceVertex1_1, EdgeLabelEnum.CATALOG_ELEMENT, null);
+        janusGraphDao
+            .createEdge(catalogVertex, serviceVertex1_0, EdgeLabelEnum.CATALOG_ELEMENT, null);
+        janusGraphDao
+            .createEdge(catalogVertex, serviceVertex1_1, EdgeLabelEnum.CATALOG_ELEMENT, null);
     }
 
     private void createScenario3_TwoHighestVersionsOneLowest() {
         //Create Service for Scenario 1 Tests (1 Service)
-        this.serviceVertex2_0 = GraphTestUtils.createServiceVertex(titanDao, propsForNonHighestVersion()); //NonHighestVersion
-        this.serviceVertex3_0 = GraphTestUtils.createServiceVertex(titanDao, propsForHighestVersion());
-        this.serviceVertex3_1 = GraphTestUtils.createServiceVertex(titanDao, propsForHighestVersion());
+        this.serviceVertex2_0 = GraphTestUtils.createServiceVertex(janusGraphDao, propsForNonHighestVersion()); //NonHighestVersion
+        this.serviceVertex3_0 = GraphTestUtils.createServiceVertex(janusGraphDao, propsForHighestVersion());
+        this.serviceVertex3_1 = GraphTestUtils.createServiceVertex(janusGraphDao, propsForHighestVersion());
 
         //Connect version edges
-        titanDao.createEdge(serviceVertex2_0, serviceVertex3_0, EdgeLabelEnum.VERSION, null);
-        titanDao.createEdge(serviceVertex3_0, serviceVertex3_1, EdgeLabelEnum.VERSION, null);
+        janusGraphDao.createEdge(serviceVertex2_0, serviceVertex3_0, EdgeLabelEnum.VERSION, null);
+        janusGraphDao.createEdge(serviceVertex3_0, serviceVertex3_1, EdgeLabelEnum.VERSION, null);
 
         //Connect 3.0 and 3.1 to Catalog Root
-        titanDao.createEdge(catalogVertex, serviceVertex3_0, EdgeLabelEnum.CATALOG_ELEMENT, null);
-        titanDao.createEdge(catalogVertex, serviceVertex3_1, EdgeLabelEnum.CATALOG_ELEMENT, null);
+        janusGraphDao
+            .createEdge(catalogVertex, serviceVertex3_0, EdgeLabelEnum.CATALOG_ELEMENT, null);
+        janusGraphDao
+            .createEdge(catalogVertex, serviceVertex3_1, EdgeLabelEnum.CATALOG_ELEMENT, null);
     }
 
     private void createScenario4_1Highest4LowestVersions() {
         //2 Lowest version only
-        this.serviceVertex0_1 = GraphTestUtils.createServiceVertex(titanDao, propsForNonHighestVersion());
-        this.serviceVertex0_2 = GraphTestUtils.createServiceVertex(titanDao, propsForNonHighestVersion());
-        this.serviceVertex0_3 = GraphTestUtils.createServiceVertex(titanDao, propsForNonHighestVersion());
-        this.serviceVertex0_4 = GraphTestUtils.createServiceVertex(titanDao, propsForNonHighestVersion());
-        this.serviceVertex0_5 = GraphTestUtils.createServiceVertex(titanDao, propsForHighestVersion());
+        this.serviceVertex0_1 = GraphTestUtils.createServiceVertex(janusGraphDao, propsForNonHighestVersion());
+        this.serviceVertex0_2 = GraphTestUtils.createServiceVertex(janusGraphDao, propsForNonHighestVersion());
+        this.serviceVertex0_3 = GraphTestUtils.createServiceVertex(janusGraphDao, propsForNonHighestVersion());
+        this.serviceVertex0_4 = GraphTestUtils.createServiceVertex(janusGraphDao, propsForNonHighestVersion());
+        this.serviceVertex0_5 = GraphTestUtils.createServiceVertex(janusGraphDao, propsForHighestVersion());
 
-        titanDao.createEdge(serviceVertex0_1, serviceVertex0_2, EdgeLabelEnum.VERSION, null);
-        titanDao.createEdge(serviceVertex0_2, serviceVertex0_3, EdgeLabelEnum.VERSION, null);
-        titanDao.createEdge(serviceVertex0_3, serviceVertex0_4, EdgeLabelEnum.VERSION, null);
-        titanDao.createEdge(serviceVertex0_4, serviceVertex0_5, EdgeLabelEnum.VERSION, null);
+        janusGraphDao.createEdge(serviceVertex0_1, serviceVertex0_2, EdgeLabelEnum.VERSION, null);
+        janusGraphDao.createEdge(serviceVertex0_2, serviceVertex0_3, EdgeLabelEnum.VERSION, null);
+        janusGraphDao.createEdge(serviceVertex0_3, serviceVertex0_4, EdgeLabelEnum.VERSION, null);
+        janusGraphDao.createEdge(serviceVertex0_4, serviceVertex0_5, EdgeLabelEnum.VERSION, null);
 
-        titanDao.createEdge(catalogVertex, serviceVertex0_5, EdgeLabelEnum.CATALOG_ELEMENT, null);
+        janusGraphDao
+            .createEdge(catalogVertex, serviceVertex0_5, EdgeLabelEnum.CATALOG_ELEMENT, null);
     }
 
     private void createResourcesForArchivedVsp(){
@@ -402,35 +407,39 @@ public class ArchiveOperationTest extends ModelTestBase {
         vfPropsHighest.put(GraphPropertyEnum.CSAR_UUID, csarUuid);
         vfPropsHighest.put(GraphPropertyEnum.IS_VSP_ARCHIVED, false);
 
-        this.vfResource0_1 = GraphTestUtils.createResourceVertex(titanDao, vfPropsNonHighest, ResourceTypeEnum.VF);
-        this.vfResource0_2 = GraphTestUtils.createResourceVertex(titanDao, vfPropsNonHighest, ResourceTypeEnum.VF);
-        this.vfResource1_0 = GraphTestUtils.createResourceVertex(titanDao, vfPropsHighest, ResourceTypeEnum.VF);
+        this.vfResource0_1 = GraphTestUtils.createResourceVertex(janusGraphDao, vfPropsNonHighest, ResourceTypeEnum.VF);
+        this.vfResource0_2 = GraphTestUtils.createResourceVertex(janusGraphDao, vfPropsNonHighest, ResourceTypeEnum.VF);
+        this.vfResource1_0 = GraphTestUtils.createResourceVertex(janusGraphDao, vfPropsHighest, ResourceTypeEnum.VF);
 
-        titanDao.createEdge(vfResource0_1, vfResource0_2, EdgeLabelEnum.VERSION, null);
-        titanDao.createEdge(vfResource0_2, vfResource1_0, EdgeLabelEnum.VERSION, null);
+        janusGraphDao.createEdge(vfResource0_1, vfResource0_2, EdgeLabelEnum.VERSION, null);
+        janusGraphDao.createEdge(vfResource0_2, vfResource1_0, EdgeLabelEnum.VERSION, null);
     }
 
     private void createMiscServices() {
         //Create Service for Scenario 1 Tests (1 Service)
-        this.archivedVertex1 = GraphTestUtils.createServiceVertex(titanDao, new HashMap<>());
+        this.archivedVertex1 = GraphTestUtils.createServiceVertex(janusGraphDao, new HashMap<>());
 
         //Connect Service to Catalog Root
-        titanDao.createEdge(archiveVertex, archivedVertex1, EdgeLabelEnum.ARCHIVE_ELEMENT, null);
+        janusGraphDao.createEdge(archiveVertex, archivedVertex1, EdgeLabelEnum.ARCHIVE_ELEMENT, null);
     }
 
     private void createServiceCompositionForCalculatingArchivedOrigins(){
         //Service that point to another service in composition
-        this.compositionService = GraphTestUtils.createServiceVertex(titanDao, propsForHighestVersion());
-        this.compositionAnotherService = GraphTestUtils.createServiceVertex(titanDao, propsForHighestVersion());
-
-        this.compositionResource1 = GraphTestUtils.createResourceVertex(titanDao, propsForHighestVersion(), ResourceTypeEnum.CP);
-        this.compositionResource2 = GraphTestUtils.createResourceVertex(titanDao, propsForHighestVersion(), ResourceTypeEnum.VL);
-        this.compositionServiceProxy = GraphTestUtils.createResourceVertex(titanDao, propsForHighestVersion(), ResourceTypeEnum.ServiceProxy);
-
-        titanDao.createEdge(compositionService, compositionResource1, EdgeLabelEnum.INSTANCE_OF, null);
-        titanDao.createEdge(compositionService, compositionResource2, EdgeLabelEnum.INSTANCE_OF, null);
-        titanDao.createEdge(compositionService, compositionServiceProxy, EdgeLabelEnum.INSTANCE_OF, null);
-        titanDao.createEdge(compositionService, compositionAnotherService, EdgeLabelEnum.PROXY_OF, null);
+        this.compositionService = GraphTestUtils.createServiceVertex(janusGraphDao, propsForHighestVersion());
+        this.compositionAnotherService = GraphTestUtils.createServiceVertex(janusGraphDao, propsForHighestVersion());
+
+        this.compositionResource1 = GraphTestUtils.createResourceVertex(janusGraphDao, propsForHighestVersion(), ResourceTypeEnum.CP);
+        this.compositionResource2 = GraphTestUtils.createResourceVertex(janusGraphDao, propsForHighestVersion(), ResourceTypeEnum.VL);
+        this.compositionServiceProxy = GraphTestUtils.createResourceVertex(janusGraphDao, propsForHighestVersion(), ResourceTypeEnum.ServiceProxy);
+
+        janusGraphDao
+            .createEdge(compositionService, compositionResource1, EdgeLabelEnum.INSTANCE_OF, null);
+        janusGraphDao
+            .createEdge(compositionService, compositionResource2, EdgeLabelEnum.INSTANCE_OF, null);
+        janusGraphDao
+            .createEdge(compositionService, compositionServiceProxy, EdgeLabelEnum.INSTANCE_OF, null);
+        janusGraphDao
+            .createEdge(compositionService, compositionAnotherService, EdgeLabelEnum.PROXY_OF, null);
 
         createAndAttachCompositionJson(compositionService);
     }
@@ -466,7 +475,7 @@ public class ArchiveOperationTest extends ModelTestBase {
         //Add Full Json to vertex
         compositionService.setJson(compositions);
         //System.out.println(JsonParserUtils.toJson(compositions));
-        titanDao.updateVertex(compositionService);
+        janusGraphDao.updateVertex(compositionService);
     }
 
     private Map<GraphPropertyEnum, Object> propsForHighestVersion(){
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/ArtifactsOperationsTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ArtifactsOperationsTest.java
index 410cef9ae8..160957d1f6 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/ArtifactsOperationsTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ArtifactsOperationsTest.java
@@ -1,9 +1,9 @@
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
 import org.junit.Test;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.MapArtifactDataDefinition;
 import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
@@ -57,7 +57,7 @@ public class ArtifactsOperationsTest {
 
     @Test
     public void getInstanceArtifacts_errorGettingInstanceArtifacts() throws Exception {
-        doReturn(Either.right(TitanOperationStatus.GENERAL_ERROR)).when(testInstance).getDataFromGraph(SERVICE_ID, EdgeLabelEnum.INSTANCE_ARTIFACTS);
+        doReturn(Either.right(JanusGraphOperationStatus.GENERAL_ERROR)).when(testInstance).getDataFromGraph(SERVICE_ID, EdgeLabelEnum.INSTANCE_ARTIFACTS);
         Either<Map<String, ArtifactDefinition>, StorageOperationStatus> allInstArtifacts = testInstance.getAllInstanceArtifacts(SERVICE_ID, INSTANCE_ID);
         verify(testInstance, times(0)).getDataFromGraph(SERVICE_ID, EdgeLabelEnum.INST_DEPLOYMENT_ARTIFACTS);
         assertTrue(allInstArtifacts.isRight());
@@ -66,7 +66,7 @@ public class ArtifactsOperationsTest {
     @Test
     public void getAllInstanceArtifacts_errorGettingDeploymentArtifacts() throws Exception {
         doReturn(Either.left(new HashMap<>())).when(testInstance).getDataFromGraph(SERVICE_ID, EdgeLabelEnum.INSTANCE_ARTIFACTS);
-        doReturn(Either.right(TitanOperationStatus.GENERAL_ERROR)).when(testInstance).getDataFromGraph(SERVICE_ID, EdgeLabelEnum.INST_DEPLOYMENT_ARTIFACTS);
+        doReturn(Either.right(JanusGraphOperationStatus.GENERAL_ERROR)).when(testInstance).getDataFromGraph(SERVICE_ID, EdgeLabelEnum.INST_DEPLOYMENT_ARTIFACTS);
         Either<Map<String, ArtifactDefinition>, StorageOperationStatus> allInstArtifacts = testInstance.getAllInstanceArtifacts(SERVICE_ID, INSTANCE_ID);
         assertTrue(allInstArtifacts.isRight());
     }
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/CapabilitiesOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/CapabilitiesOperationTest.java
index 0c9c35b62a..5fc2ef2cae 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/CapabilitiesOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/CapabilitiesOperationTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
 import org.junit.Assert;
@@ -24,12 +24,12 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.MapPropertiesDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.TopologyTemplate;
-import org.openecomp.sdc.be.model.jsontitan.utils.CapabilityTestUtils;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate;
+import org.openecomp.sdc.be.model.jsonjanusgraph.utils.CapabilityTestUtils;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 
 import java.util.HashMap;
@@ -45,7 +45,7 @@ public class CapabilitiesOperationTest {
     @InjectMocks
     CapabilitiesOperation operation = new CapabilitiesOperation();
     @Mock
-    private  TitanDao mockTitanDao;
+    private  JanusGraphDao mockJanusGraphDao;
     @Mock
     private TopologyTemplateOperation topologyTemplateOperation;
 
@@ -53,8 +53,8 @@ public class CapabilitiesOperationTest {
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        when(mockTitanDao.commit()).thenReturn(TitanOperationStatus.OK);
-        when(mockTitanDao.getVertexById(anyString(), any())).thenReturn(Either.left(new GraphVertex()));
+        when(mockJanusGraphDao.commit()).thenReturn(JanusGraphOperationStatus.OK);
+        when(mockJanusGraphDao.getVertexById(anyString(), any())).thenReturn(Either.left(new GraphVertex()));
 
         when(topologyTemplateOperation.updateFullToscaData(any(), any(), any(), anyMap())).thenReturn(StorageOperationStatus.OK);
         TopologyTemplate topologyTemplate = new TopologyTemplate();
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/ExternalReferencesOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ExternalReferencesOperationTest.java
index e580fd51bb..8900377bb2 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/ExternalReferencesOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ExternalReferencesOperationTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
 import org.junit.Before;
@@ -7,15 +7,15 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.MapComponentInstanceExternalRefs;
 import org.openecomp.sdc.be.model.ModelTestBase;
-import org.openecomp.sdc.be.model.jsontitan.utils.GraphTestUtils;
-import org.openecomp.sdc.be.model.jsontitan.utils.IdMapper;
+import org.openecomp.sdc.be.model.jsonjanusgraph.utils.GraphTestUtils;
+import org.openecomp.sdc.be.model.jsonjanusgraph.utils.IdMapper;
 import org.openecomp.sdc.be.model.operations.StorageException;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -49,7 +49,7 @@ public class ExternalReferencesOperationTest extends ModelTestBase {
     private ExternalReferencesOperation externalReferenceOperation;
 
     @Resource
-    private TitanDao titanDao;
+    private JanusGraphDao janusGraphDao;
 
     private boolean isInitialized;
 
@@ -74,7 +74,7 @@ public class ExternalReferencesOperationTest extends ModelTestBase {
         this.externalReferenceOperation.setIdMapper(idMapper);
         when(idMapper.mapComponentNameToUniqueId(Mockito.anyString(), Mockito.any(GraphVertex.class))).thenReturn(COMPONENT_ID);
         if (!isInitialized) {
-            GraphTestUtils.clearGraph(titanDao);
+            GraphTestUtils.clearGraph(janusGraphDao);
             initGraphForTest();
             isInitialized = true;
         }
@@ -85,9 +85,9 @@ public class ExternalReferencesOperationTest extends ModelTestBase {
         Either<String, ActionStatus> addResult = externalReferenceOperation.addExternalReference(this.serviceVertexUuid, COMPONENT_ID, MONITORING_OBJECT_TYPE, REF_4);
         assertThat(addResult.isLeft()).isEqualTo(true);
 
-        //commit changes to titan
-        final TitanOperationStatus commit = this.titanDao.commit();
-        assertThat(commit).isEqualTo(TitanOperationStatus.OK);
+        //commit changes to janusgraph
+        final JanusGraphOperationStatus commit = this.janusGraphDao.commit();
+        assertThat(commit).isEqualTo(JanusGraphOperationStatus.OK);
 
         assertThat(getServiceExternalRefs()).contains(REF_1, REF_2, REF_3, REF_4);
     }
@@ -152,9 +152,9 @@ public class ExternalReferencesOperationTest extends ModelTestBase {
         Either<String, ActionStatus> deleteStatus = externalReferenceOperation.deleteExternalReference(this.serviceVertexUuid, COMPONENT_ID, MONITORING_OBJECT_TYPE, REF_5);
         assertThat(deleteStatus.isLeft()).isEqualTo(true);
 
-        //commit changes to titan
-        final TitanOperationStatus commit = this.titanDao.commit();
-        assertThat(commit).isEqualTo(TitanOperationStatus.OK);
+        //commit changes to janusgraph
+        final JanusGraphOperationStatus commit = this.janusGraphDao.commit();
+        assertThat(commit).isEqualTo(JanusGraphOperationStatus.OK);
 
         //Check that ref does not exist anymore
         assertThat(getServiceExternalRefs()).doesNotContain(REF_5).contains(REF_1, REF_2, REF_3);
@@ -170,9 +170,9 @@ public class ExternalReferencesOperationTest extends ModelTestBase {
 
         assertThat(updateResult.isLeft()).isEqualTo(true);
 
-        //commit changes to titan
-        final TitanOperationStatus commit = this.titanDao.commit();
-        assertThat(commit).isEqualTo(TitanOperationStatus.OK);
+        //commit changes to janusgraph
+        final JanusGraphOperationStatus commit = this.janusGraphDao.commit();
+        assertThat(commit).isEqualTo(JanusGraphOperationStatus.OK);
 
         //Check that ref does not exist anymore
         assertThat(getServiceExternalRefs()).doesNotContain(REF_5).contains(REF_1, REF_2, REF_3, REF_4);
@@ -180,7 +180,8 @@ public class ExternalReferencesOperationTest extends ModelTestBase {
 
     private List<String> getServiceExternalRefs(){
         //Get service vertex
-        final Either<GraphVertex, TitanOperationStatus> externalRefsVertexResult = this.titanDao.getChildVertex(this.serviceVertex, EdgeLabelEnum.EXTERNAL_REFS, JsonParseFlagEnum.ParseJson);
+        final Either<GraphVertex, JanusGraphOperationStatus> externalRefsVertexResult = this.janusGraphDao
+            .getChildVertex(this.serviceVertex, EdgeLabelEnum.EXTERNAL_REFS, JsonParseFlagEnum.ParseJson);
         assertThat(externalRefsVertexResult.isLeft()).isEqualTo(true);
 
         GraphVertex externalRefVertex = externalRefsVertexResult.left().value();
@@ -200,7 +201,7 @@ public class ExternalReferencesOperationTest extends ModelTestBase {
 
     private void initGraphForTest() {
         //create a service
-        this.serviceVertex = GraphTestUtils.createServiceVertex(titanDao, new HashMap<>());
+        this.serviceVertex = GraphTestUtils.createServiceVertex(janusGraphDao, new HashMap<>());
         this.serviceVertexUuid = this.serviceVertex.getUniqueId();
 
         //monitoring references
@@ -213,14 +214,14 @@ public class ExternalReferencesOperationTest extends ModelTestBase {
         externalReferenceOperation.addExternalReference(serviceVertexUuid, COMPONENT_ID, WORKFLOW_OBJECT_TYPE, REF_6);
 
         //create a service without refs
-        serviceVertex2 = GraphTestUtils.createServiceVertex(titanDao, new HashMap<>());
+        serviceVertex2 = GraphTestUtils.createServiceVertex(janusGraphDao, new HashMap<>());
         serviceVertex2Uuid = serviceVertex2.getUniqueId();
 
         //create a service for adding all references
-        serviceVertex3 = GraphTestUtils.createServiceVertex(titanDao, new HashMap<>());
+        serviceVertex3 = GraphTestUtils.createServiceVertex(janusGraphDao, new HashMap<>());
         serviceVertex3Uuid = serviceVertex3.getUniqueId();
 
-        final TitanOperationStatus commit = this.titanDao.commit();
-        assertThat(commit).isEqualTo(TitanOperationStatus.OK);
+        final JanusGraphOperationStatus commit = this.janusGraphDao.commit();
+        assertThat(commit).isEqualTo(JanusGraphOperationStatus.OK);
     }
 }
\ No newline at end of file
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/GroupsOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/GroupsOperationTest.java
index 575fbbca59..e93ec3c616 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/GroupsOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/GroupsOperationTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -10,10 +10,10 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.openecomp.sdc.be.dao.config.TitanSpringConfig;
+import org.openecomp.sdc.be.dao.config.JanusGraphSpringConfig;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.HealingTitanDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.jsongraph.HealingJanusGraphDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.ComponentParametersView;
 import org.openecomp.sdc.be.model.GroupDefinition;
@@ -27,14 +27,14 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {TitanSpringConfig.class, ModelOperationsSpringConfig.class})
+@ContextConfiguration(classes = {JanusGraphSpringConfig.class, ModelOperationsSpringConfig.class})
 public class GroupsOperationTest extends ModelTestBase {
 
     @Autowired
     private GroupsOperation groupsOperation;
 
     @Autowired
-    HealingTitanDao titanDao;
+    HealingJanusGraphDao janusGraphDao;
 
     @Autowired
     private ToscaOperationFacade toscaOperationFacade;
@@ -49,14 +49,14 @@ public class GroupsOperationTest extends ModelTestBase {
     public void setUp() throws Exception {
         container = new Resource();
         container.setUniqueId(CONTAINER_ID);
-        Either<GraphVertex, TitanOperationStatus> createdCmpt = titanDao.createVertex(createBasicContainerGraphVertex());
+        Either<GraphVertex, JanusGraphOperationStatus> createdCmpt = janusGraphDao.createVertex(createBasicContainerGraphVertex());
         assertThat(createdCmpt.isLeft()).isTrue();
 
     }
 
     @After
     public void tearDown() throws Exception {
-        titanDao.rollback();
+        janusGraphDao.rollback();
     }
 
     @Test
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/InterfaceOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/InterfaceOperationTest.java
index fe2ea209f9..31d3f86967 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/InterfaceOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/InterfaceOperationTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
@@ -17,11 +17,11 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.MapDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.MapPropertiesDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
@@ -38,9 +38,9 @@ import org.openecomp.sdc.be.model.Operation;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.NodeType;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.TopologyTemplate;
-import org.openecomp.sdc.be.model.jsontitan.utils.GraphTestUtils;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.NodeType;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate;
+import org.openecomp.sdc.be.model.jsonjanusgraph.utils.GraphTestUtils;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
 import org.openecomp.sdc.common.util.ValidationUtils;
@@ -60,7 +60,7 @@ public class InterfaceOperationTest extends ModelTestBase {
     private final Service service = createService();
     private final org.openecomp.sdc.be.model.Resource resource = createResource();
     @Resource
-    protected TitanDao titanDao;
+    protected JanusGraphDao janusGraphDao;
     @Resource
     protected NodeTypeOperation nodeTypeOperation;
     @Resource
@@ -78,11 +78,11 @@ public class InterfaceOperationTest extends ModelTestBase {
 
     @Before
     public void setupBefore() {
-        GraphTestUtils.clearGraph(titanDao);
+        GraphTestUtils.clearGraph(janusGraphDao);
         createUsers();
         createResourceCategory();
         createServiceCategory();
-        GraphTestUtils.createRootCatalogVertex(titanDao);
+        GraphTestUtils.createRootCatalogVertex(janusGraphDao);
         createRootNodeType();
         createNodeType("resource", RESOURCE_ID);
         createNodeType("service", SERVICE_ID);
@@ -100,7 +100,7 @@ public class InterfaceOperationTest extends ModelTestBase {
         ownerV.setMetadataProperties(metadataProperties);
         ownerV.updateMetadataJsonWithCurrentMetadataProperties();
         ownerV.setJson(new HashMap<>());
-        Either<GraphVertex, TitanOperationStatus> createUserRes = titanDao.createVertex(ownerV);
+        Either<GraphVertex, JanusGraphOperationStatus> createUserRes = janusGraphDao.createVertex(ownerV);
 
         ownerVertex = createUserRes.left().value();
 
@@ -114,7 +114,7 @@ public class InterfaceOperationTest extends ModelTestBase {
         modifierV.setMetadataProperties(metadataProperties);
         modifierV.updateMetadataJsonWithCurrentMetadataProperties();
         modifierV.setJson(new HashMap<>());
-        createUserRes = titanDao.createVertex(modifierV);
+        createUserRes = janusGraphDao.createVertex(modifierV);
         createUserRes.left().value();
 
         lifecycleOperation.findUser(ownerVertex.getUniqueId());
@@ -145,9 +145,9 @@ public class InterfaceOperationTest extends ModelTestBase {
         subCat.setMetadataProperties(metadataProperties);
         subCat.updateMetadataJsonWithCurrentMetadataProperties();
 
-        Either<GraphVertex, TitanOperationStatus> catRes = titanDao.createVertex(cat);
-        Either<GraphVertex, TitanOperationStatus> subCatRes = titanDao.createVertex(subCat);
-        titanDao.createEdge(catRes.left().value().getVertex(), subCatRes.left().value().getVertex(),
+        Either<GraphVertex, JanusGraphOperationStatus> catRes = janusGraphDao.createVertex(cat);
+        Either<GraphVertex, JanusGraphOperationStatus> subCatRes = janusGraphDao.createVertex(subCat);
+        janusGraphDao.createEdge(catRes.left().value().getVertex(), subCatRes.left().value().getVertex(),
                 EdgeLabelEnum.SUB_CATEGORY, new HashMap<>());
     }
 
@@ -163,7 +163,7 @@ public class InterfaceOperationTest extends ModelTestBase {
                 .put(GraphPropertyEnum.NORMALIZED_NAME, ValidationUtils.normalizeCategoryName4Uniqueness(categoryName));
         cat.setMetadataProperties(metadataProperties);
         cat.updateMetadataJsonWithCurrentMetadataProperties();
-        titanDao.createVertex(cat);
+        janusGraphDao.createVertex(cat);
     }
 
     private void createRootNodeType() {
@@ -215,8 +215,8 @@ public class InterfaceOperationTest extends ModelTestBase {
         vf.setComponentType(ComponentTypeEnum.RESOURCE);
         Either<NodeType, StorageOperationStatus> createVFRes = nodeTypeOperation.createNodeType(vf);
 
-        Either<GraphVertex, TitanOperationStatus> getNodeTyeRes =
-                titanDao.getVertexById(createVFRes.left().value().getUniqueId());
+        Either<GraphVertex, JanusGraphOperationStatus> getNodeTyeRes =
+                janusGraphDao.getVertexById(createVFRes.left().value().getUniqueId());
         getNodeTyeRes.left().value();
     }
 
@@ -259,8 +259,8 @@ public class InterfaceOperationTest extends ModelTestBase {
         addProperties.add(prop22);
 
         Either<NodeType, StorageOperationStatus> createVFRes = nodeTypeOperation.createNodeType(vf);
-        Either<GraphVertex, TitanOperationStatus> getNodeTyeRes =
-                titanDao.getVertexById(createVFRes.left().value().getUniqueId());
+        Either<GraphVertex, JanusGraphOperationStatus> getNodeTyeRes =
+                janusGraphDao.getVertexById(createVFRes.left().value().getUniqueId());
         GraphVertex vfVertex = getNodeTyeRes.left().value();
         StorageOperationStatus status = nodeTypeOperation.addToscaDataToToscaElement(vfVertex, EdgeLabelEnum.PROPERTIES,
                 VertexTypeEnum.PROPERTIES, addProperties, JsonPresentationFields.NAME);
@@ -322,15 +322,15 @@ public class InterfaceOperationTest extends ModelTestBase {
         service.setComponentType(ComponentTypeEnum.SERVICE);
         Either<TopologyTemplate, StorageOperationStatus> createRes =
                 topologyTemplateOperation.createTopologyTemplate(service);
-        Either<GraphVertex, TitanOperationStatus> getNodeTyeRes =
-                titanDao.getVertexById(createRes.left().value().getUniqueId());
+        Either<GraphVertex, JanusGraphOperationStatus> getNodeTyeRes =
+                janusGraphDao.getVertexById(createRes.left().value().getUniqueId());
 
         getNodeTyeRes.left().value();
     }
 
     @After
     public void cleanAfter() {
-        GraphTestUtils.clearGraph(titanDao);
+        GraphTestUtils.clearGraph(janusGraphDao);
     }
 
     @Test
@@ -491,7 +491,7 @@ public class InterfaceOperationTest extends ModelTestBase {
 
     @After
     public void teardown() {
-        GraphTestUtils.clearGraph(titanDao);
+        GraphTestUtils.clearGraph(janusGraphDao);
     }
 
 }
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTemplateOperationGraphTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeTemplateOperationGraphTest.java
index 1887891f2b..0131783bea 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTemplateOperationGraphTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeTemplateOperationGraphTest.java
@@ -1,12 +1,12 @@
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import com.thinkaurelius.titan.core.TitanGraph;
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraph;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -27,13 +27,13 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.openecomp.sdc.be.dao.config.TitanSpringConfig;
+import org.openecomp.sdc.be.dao.config.JanusGraphSpringConfig;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.HealingTitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.HealingJanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgePropertyEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.ComponentInstanceDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum;
 import org.openecomp.sdc.be.model.ModelTestBase;
@@ -43,14 +43,14 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {TitanSpringConfig.class, ModelOperationsSpringConfig.class})
+@ContextConfiguration(classes = {JanusGraphSpringConfig.class, ModelOperationsSpringConfig.class})
 public class NodeTemplateOperationGraphTest extends ModelTestBase{
     @Resource
-    private HealingTitanDao titanDao;
+    private HealingJanusGraphDao janusGraphDao;
     @Resource
     private NodeTemplateOperation nodeTemplateOperation;
     
-    private TitanGraph graphT;
+    private JanusGraph graphT;
     private GraphVertex containerVertex; 
     private String containeId;
   
@@ -62,19 +62,19 @@ public class NodeTemplateOperationGraphTest extends ModelTestBase{
     @Before
     public void before(){
        
-        Either<TitanGraph, TitanOperationStatus> graph = titanDao.getGraph();
+        Either<JanusGraph, JanusGraphOperationStatus> graph = janusGraphDao.getGraph();
         graphT = graph.left().value();
         
         containerVertex = new GraphVertex(VertexTypeEnum.TOPOLOGY_TEMPLATE);
         containeId = "containerId";
         containerVertex.setUniqueId(containeId);
-        Either<GraphVertex, TitanOperationStatus> createVertex = titanDao.createVertex(containerVertex);
+        Either<GraphVertex, JanusGraphOperationStatus> createVertex = janusGraphDao.createVertex(containerVertex);
         assertTrue(createVertex.isLeft());
     }
     
     @After
     public void after(){
-        titanDao.rollback();
+        janusGraphDao.rollback();
         
     }
     
@@ -136,7 +136,7 @@ public class NodeTemplateOperationGraphTest extends ModelTestBase{
     private void validateOnGraph(Map<String, List<String>> mapOriginToInstId, int expectedEdgeCount, boolean validateProxy) {
         Iterable vertices = graphT.query().has(GraphPropertyEnum.UNIQUE_ID.getProperty(), containeId).vertices();
         assertNotNull(vertices);
-        Iterator<TitanVertex> iterator = vertices.iterator();
+        Iterator<JanusGraphVertex> iterator = vertices.iterator();
         assertTrue(iterator.hasNext());
         Vertex containerV = iterator.next();
         validatePerEdgeType(mapOriginToInstId, expectedEdgeCount, containerV, EdgeLabelEnum.INSTANCE_OF);
@@ -207,11 +207,11 @@ public class NodeTemplateOperationGraphTest extends ModelTestBase{
     
     
     private String createOrigin(int index) {
-        Either<GraphVertex, TitanOperationStatus> createVertex;
+        Either<GraphVertex, JanusGraphOperationStatus> createVertex;
         GraphVertex originVertex = new GraphVertex(VertexTypeEnum.NODE_TYPE);
         String originId = "originId_" + index;
         originVertex.setUniqueId(originId);
-        createVertex = titanDao.createVertex(originVertex);
+        createVertex = janusGraphDao.createVertex(originVertex);
         assertTrue(createVertex.isLeft());
         return originId;
     }
@@ -219,15 +219,15 @@ public class NodeTemplateOperationGraphTest extends ModelTestBase{
         List<String> expextedInList;
         
         Vertex originV = edge.inVertex();
-        String id = (String) titanDao.getProperty((TitanVertex)originV, GraphPropertyEnum.UNIQUE_ID.getProperty());
+        String id = (String) janusGraphDao.getProperty((JanusGraphVertex)originV, GraphPropertyEnum.UNIQUE_ID.getProperty());
         expextedInList = mapOriginToInstId.get(id);
         
-        List<String> list = (List<String>) titanDao.getProperty(edge, EdgePropertyEnum.INSTANCES);
+        List<String> list = (List<String>) janusGraphDao.getProperty(edge, EdgePropertyEnum.INSTANCES);
         assertThat(list).hasSameSizeAs(expextedInList);
         assertThat(list).containsOnlyElementsOf(expextedInList);
     }
     
-    private String exportGraphMl(TitanGraph graph) {
+    private String exportGraphMl(JanusGraph graph) {
         String result = null;
         String outputFile = outputDirectory + File.separator + "exportGraph." + System.currentTimeMillis() + ".graphml";
         try {
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTemplateOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeTemplateOperationTest.java
index bddebea630..1455d1e984 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTemplateOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeTemplateOperationTest.java
@@ -27,7 +27,7 @@
  * limitations under the License.
 
  */
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import com.google.common.collect.Lists;
 import fj.data.Either;
@@ -40,17 +40,17 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.*;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.datatypes.elements.MapListCapabilityDataDefinition;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.TopologyTemplate;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElement;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
 
@@ -91,7 +91,7 @@ public class NodeTemplateOperationTest extends ModelTestBase {
     private static NodeTemplateOperation operation;
 
     @Mock
-    private static TitanDao titanDao;
+    private static JanusGraphDao janusGraphDao;
 
     @Mock
     private static TopologyTemplateOperation topologyTemplateOperation;
@@ -99,9 +99,9 @@ public class NodeTemplateOperationTest extends ModelTestBase {
     @BeforeClass
     public static void setup() {
         init();
-        titanDao = Mockito.mock(TitanDao.class);
+        janusGraphDao = Mockito.mock(JanusGraphDao.class);
         operation = new NodeTemplateOperation();
-        operation.setTitanDao(titanDao);
+        operation.setJanusGraphDao(janusGraphDao);
         buildDataDefinition();
     }
 
@@ -114,13 +114,13 @@ public class NodeTemplateOperationTest extends ModelTestBase {
     @Test
     public void testGetFulfilledCapabilityByRelationSuccess(){
         GraphVertex vertex = Mockito.mock(GraphVertex.class);
-        Either<GraphVertex, TitanOperationStatus> vertexRes = Either.left(vertex);
-        when(titanDao.getVertexById(eq(COMPONENT_ID), eq(JsonParseFlagEnum.ParseAll))).thenReturn(vertexRes);
+        Either<GraphVertex, JanusGraphOperationStatus> vertexRes = Either.left(vertex);
+        when(janusGraphDao.getVertexById(eq(COMPONENT_ID), eq(JsonParseFlagEnum.ParseAll))).thenReturn(vertexRes);
 
         GraphVertex dataVertex = new GraphVertex();
         dataVertex.setJson(fulfilledCapability);
-        Either<GraphVertex, TitanOperationStatus> childVertexRes = Either.left(dataVertex);
-        when(titanDao.getChildVertex(eq(vertex), eq(EdgeLabelEnum.FULLFILLED_CAPABILITIES), eq(JsonParseFlagEnum.ParseJson))).thenReturn(childVertexRes);
+        Either<GraphVertex, JanusGraphOperationStatus> childVertexRes = Either.left(dataVertex);
+        when(janusGraphDao.getChildVertex(eq(vertex), eq(EdgeLabelEnum.FULLFILLED_CAPABILITIES), eq(JsonParseFlagEnum.ParseJson))).thenReturn(childVertexRes);
         Either<CapabilityDataDefinition, StorageOperationStatus> result = operation.getFulfilledCapabilityByRelation(COMPONENT_ID, TO_INSTANCE_ID, relation, this::isBelongingCapability);
         assertTrue(result.isLeft());
         assertEquals(result.left().value(), capability);
@@ -129,13 +129,13 @@ public class NodeTemplateOperationTest extends ModelTestBase {
     @Test
     public void testGetFulfilledRequirementByRelationSuccess(){
         GraphVertex vertex = Mockito.mock(GraphVertex.class);
-        Either<GraphVertex, TitanOperationStatus> vertexRes = Either.left(vertex);
-        when(titanDao.getVertexById(eq(COMPONENT_ID), eq(JsonParseFlagEnum.ParseAll))).thenReturn(vertexRes);
+        Either<GraphVertex, JanusGraphOperationStatus> vertexRes = Either.left(vertex);
+        when(janusGraphDao.getVertexById(eq(COMPONENT_ID), eq(JsonParseFlagEnum.ParseAll))).thenReturn(vertexRes);
 
         GraphVertex dataVertex = new GraphVertex();
         dataVertex.setJson(fulfilledRequirement);
-        Either<GraphVertex, TitanOperationStatus> childVertexRes = Either.left(dataVertex);
-        when(titanDao.getChildVertex(eq(vertex), eq(EdgeLabelEnum.FULLFILLED_REQUIREMENTS), eq(JsonParseFlagEnum.ParseJson))).thenReturn(childVertexRes);
+        Either<GraphVertex, JanusGraphOperationStatus> childVertexRes = Either.left(dataVertex);
+        when(janusGraphDao.getChildVertex(eq(vertex), eq(EdgeLabelEnum.FULLFILLED_REQUIREMENTS), eq(JsonParseFlagEnum.ParseJson))).thenReturn(childVertexRes);
         Either<RequirementDataDefinition, StorageOperationStatus> result = operation.getFulfilledRequirementByRelation(COMPONENT_ID, FROM_INSTANCE_ID, relation, this::isBelongingRequirement);
         assertTrue(result.isLeft());
         assertEquals(result.left().value(), requirement);
@@ -144,11 +144,12 @@ public class NodeTemplateOperationTest extends ModelTestBase {
     @Test
     public void testGetFulfilledCapabilityByRelationNotFoundFailure(){
         GraphVertex vertex = Mockito.mock(GraphVertex.class);
-        Either<GraphVertex, TitanOperationStatus> vertexRes = Either.left(vertex);
-        when(titanDao.getVertexById(eq(COMPONENT_ID), eq(JsonParseFlagEnum.ParseAll))).thenReturn(vertexRes);
+        Either<GraphVertex, JanusGraphOperationStatus> vertexRes = Either.left(vertex);
+        when(janusGraphDao.getVertexById(eq(COMPONENT_ID), eq(JsonParseFlagEnum.ParseAll))).thenReturn(vertexRes);
 
-        Either<GraphVertex, TitanOperationStatus> childVertexRes = Either.right(TitanOperationStatus.NOT_FOUND);
-        when(titanDao.getChildVertex(eq(vertex), eq(EdgeLabelEnum.FULLFILLED_CAPABILITIES), eq(JsonParseFlagEnum.ParseJson))).thenReturn(childVertexRes);
+        Either<GraphVertex, JanusGraphOperationStatus> childVertexRes = Either.right(
+            JanusGraphOperationStatus.NOT_FOUND);
+        when(janusGraphDao.getChildVertex(eq(vertex), eq(EdgeLabelEnum.FULLFILLED_CAPABILITIES), eq(JsonParseFlagEnum.ParseJson))).thenReturn(childVertexRes);
         Either<CapabilityDataDefinition, StorageOperationStatus> result = operation.getFulfilledCapabilityByRelation(COMPONENT_ID, TO_INSTANCE_ID, relation, this::isBelongingCapability);
         assertTrue(result.isRight());
         assertSame(result.right().value(), StorageOperationStatus.NOT_FOUND);
@@ -157,11 +158,12 @@ public class NodeTemplateOperationTest extends ModelTestBase {
     @Test
     public void testGetFulfilledRequirementByRelationNotFoundFailure(){
         GraphVertex vertex = Mockito.mock(GraphVertex.class);
-        Either<GraphVertex, TitanOperationStatus> vertexRes = Either.left(vertex);
-        when(titanDao.getVertexById(eq(COMPONENT_ID), eq(JsonParseFlagEnum.ParseAll))).thenReturn(vertexRes);
+        Either<GraphVertex, JanusGraphOperationStatus> vertexRes = Either.left(vertex);
+        when(janusGraphDao.getVertexById(eq(COMPONENT_ID), eq(JsonParseFlagEnum.ParseAll))).thenReturn(vertexRes);
 
-        Either<GraphVertex, TitanOperationStatus> childVertexRes = Either.right(TitanOperationStatus.NOT_FOUND);
-        when(titanDao.getChildVertex(eq(vertex), eq(EdgeLabelEnum.FULLFILLED_REQUIREMENTS), eq(JsonParseFlagEnum.ParseJson))).thenReturn(childVertexRes);
+        Either<GraphVertex, JanusGraphOperationStatus> childVertexRes = Either.right(
+            JanusGraphOperationStatus.NOT_FOUND);
+        when(janusGraphDao.getChildVertex(eq(vertex), eq(EdgeLabelEnum.FULLFILLED_REQUIREMENTS), eq(JsonParseFlagEnum.ParseJson))).thenReturn(childVertexRes);
         Either<RequirementDataDefinition, StorageOperationStatus> result = operation.getFulfilledRequirementByRelation(COMPONENT_ID, FROM_INSTANCE_ID, relation, this::isBelongingRequirement);
         assertTrue(result.isRight());
         assertSame(result.right().value(), StorageOperationStatus.NOT_FOUND);
@@ -179,8 +181,8 @@ public class NodeTemplateOperationTest extends ModelTestBase {
         componentInstance.setComponentUid(id);
         container.setUniqueId(id);
         GraphVertex graphVertex = new GraphVertex();
-        when(titanDao.getVertexById(container.getUniqueId(), JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.left(graphVertex));
-        when(titanDao.updateVertex(graphVertex)).thenReturn(Either.left(graphVertex));
+        when(janusGraphDao.getVertexById(container.getUniqueId(), JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.left(graphVertex));
+        when(janusGraphDao.updateVertex(graphVertex)).thenReturn(Either.left(graphVertex));
         when(topologyTemplateOperation.getToscaElement(anyString())).thenReturn(Either.left(toscaElement));
 
         result = operation.updateComponentInstanceMetadataOfTopologyTemplate(container, toscaElement, componentInstance);
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/PolicyOperationIntegrationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/PolicyOperationIntegrationTest.java
index ca8713fdf3..2740551b5c 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/PolicyOperationIntegrationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/PolicyOperationIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
 import org.junit.After;
@@ -6,10 +6,9 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.openecomp.sdc.be.dao.config.TitanSpringConfig;
+import org.openecomp.sdc.be.dao.config.JanusGraphSpringConfig;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.HealingTitanDao;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.HealingJanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
 import org.openecomp.sdc.be.datatypes.elements.PolicyDataDefinition;
@@ -21,8 +20,8 @@ import org.openecomp.sdc.be.model.ComponentParametersView;
 import org.openecomp.sdc.be.model.ModelTestBase;
 import org.openecomp.sdc.be.model.PolicyDefinition;
 import org.openecomp.sdc.be.model.config.ModelOperationsSpringConfig;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.TopologyTemplate;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElement;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -37,7 +36,7 @@ import static org.apache.commons.collections.ListUtils.union;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {TitanSpringConfig.class, ModelOperationsSpringConfig.class})
+@ContextConfiguration(classes = {JanusGraphSpringConfig.class, ModelOperationsSpringConfig.class})
 public class PolicyOperationIntegrationTest extends ModelTestBase {
 
     private static final String CONTAINER_ID = "container";
@@ -45,7 +44,7 @@ public class PolicyOperationIntegrationTest extends ModelTestBase {
     @Resource
     private TopologyTemplateOperation topologyTemplateOperation;
     @Resource
-    private HealingTitanDao titanDao;
+    private HealingJanusGraphDao janusGraphDao;
     @Resource
     private PolicyOperation policyOperation;
     private PropertyDataDefinition prop1, prop2;
@@ -76,15 +75,15 @@ public class PolicyOperationIntegrationTest extends ModelTestBase {
 
         GraphVertex resource = new GraphVertex(VertexTypeEnum.TOPOLOGY_TEMPLATE);
         resource.addMetadataProperty(GraphPropertyEnum.UNIQUE_ID, CONTAINER_ID);
-        titanDao.createVertex(resource);
-        GraphVertex loadedResource = titanDao.getVertexById(CONTAINER_ID).left().value();
+        janusGraphDao.createVertex(resource);
+        GraphVertex loadedResource = janusGraphDao.getVertexById(CONTAINER_ID).left().value();
         topologyTemplateOperation.addToscaDataToToscaElement(loadedResource, EdgeLabelEnum.POLICIES, VertexTypeEnum.POLICIES, policy, JsonPresentationFields.UNIQUE_ID);
-//        titanDao.commit();
+//        janusGraphDao.commit();
     }
 
     @After
     public void tearDown() {
-        titanDao.rollback();
+        janusGraphDao.rollback();
     }
 
     @Test
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/PolicyOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/PolicyOperationTest.java
index 136f95b987..1df6721612 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/PolicyOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/PolicyOperationTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
 import org.junit.Before;
@@ -9,10 +9,10 @@ import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.PolicyDefinition;
@@ -35,7 +35,7 @@ public class PolicyOperationTest {
     @InjectMocks
     private PolicyOperation testInstance;
     @Mock
-    private TitanDao titanDao;
+    private JanusGraphDao janusGraphDao;
     @Mock
     private TopologyTemplateOperation topologyTemplateOperation;
     @Captor
@@ -63,7 +63,8 @@ public class PolicyOperationTest {
 
     @Test
     public void updatePolicyProperties_failedToFetchContainer() {
-        when(titanDao.getVertexById(CONTAINER_ID, JsonParseFlagEnum.NoParse)).thenReturn(Either.right(TitanOperationStatus.NOT_FOUND));
+        when(janusGraphDao.getVertexById(CONTAINER_ID, JsonParseFlagEnum.NoParse)).thenReturn(Either.right(
+            JanusGraphOperationStatus.NOT_FOUND));
         StorageOperationStatus storageOperationStatus = testInstance.updatePolicyProperties(component, POLICY_ID, Collections.emptyList());
         assertThat(storageOperationStatus).isEqualTo(StorageOperationStatus.NOT_FOUND);
         verifyZeroInteractions(topologyTemplateOperation);
@@ -72,7 +73,7 @@ public class PolicyOperationTest {
     @Test
     public void updatePolicyProperties_updateFailed() {
         GraphVertex cmptVertex = new GraphVertex();
-        when(titanDao.getVertexById(CONTAINER_ID, JsonParseFlagEnum.NoParse)).thenReturn(Either.left(cmptVertex));
+        when(janusGraphDao.getVertexById(CONTAINER_ID, JsonParseFlagEnum.NoParse)).thenReturn(Either.left(cmptVertex));
         when(topologyTemplateOperation.updatePolicyOfToscaElement(cmptVertex, policyDefinition)).thenReturn(StorageOperationStatus.GENERAL_ERROR);
         StorageOperationStatus storageOperationStatus = testInstance.updatePolicyProperties(component, POLICY_ID, Collections.emptyList());
         assertThat(storageOperationStatus).isEqualTo(StorageOperationStatus.GENERAL_ERROR);
@@ -81,7 +82,7 @@ public class PolicyOperationTest {
     @Test
     public void updatePolicyProperties() {
         GraphVertex cmptVertex = new GraphVertex();
-        when(titanDao.getVertexById(CONTAINER_ID, JsonParseFlagEnum.NoParse)).thenReturn(Either.left(cmptVertex));
+        when(janusGraphDao.getVertexById(CONTAINER_ID, JsonParseFlagEnum.NoParse)).thenReturn(Either.left(cmptVertex));
         when(topologyTemplateOperation.updatePolicyOfToscaElement(eq(cmptVertex), policyDefCaptor.capture())).thenReturn(StorageOperationStatus.OK);
         PropertyDataDefinition prop1Copy = new PropertyDataDefinition(prop1);
         prop1Copy.setValue("prop1Copy");
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/TopologyTemplateOperationCapabilityIntegrationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/TopologyTemplateOperationCapabilityIntegrationTest.java
index 9936d45f62..f5dd3a0346 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/TopologyTemplateOperationCapabilityIntegrationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/TopologyTemplateOperationCapabilityIntegrationTest.java
@@ -1,14 +1,13 @@
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.openecomp.sdc.be.dao.config.TitanSpringConfig;
+import org.openecomp.sdc.be.dao.config.JanusGraphSpringConfig;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.HealingTitanDao;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.HealingJanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
 import org.openecomp.sdc.be.datatypes.elements.MapCapabilityProperty;
@@ -19,7 +18,7 @@ import org.openecomp.sdc.be.model.ComponentParametersView;
 import org.openecomp.sdc.be.model.ModelTestBase;
 import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.openecomp.sdc.be.model.config.ModelOperationsSpringConfig;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.TopologyTemplate;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -33,7 +32,7 @@ import java.util.Map;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {TitanSpringConfig.class, ModelOperationsSpringConfig.class})
+@ContextConfiguration(classes = {JanusGraphSpringConfig.class, ModelOperationsSpringConfig.class})
 public class TopologyTemplateOperationCapabilityIntegrationTest extends ModelTestBase {
 
     private static final String CONTAINER_ID = "id";
@@ -44,7 +43,7 @@ public class TopologyTemplateOperationCapabilityIntegrationTest extends ModelTes
     private TopologyTemplateOperation topologyTemplateOperation;
 
     @Resource
-    private HealingTitanDao titanDao;
+    private HealingJanusGraphDao janusGraphDao;
     private CapabilityPropertyDataObject capabilityProperty1;
     private CapabilityPropertyDataObject capabilityProperty2;
     private CapabilityPropertyDataObject capabilityProperty3;
@@ -74,14 +73,14 @@ public class TopologyTemplateOperationCapabilityIntegrationTest extends ModelTes
 
         GraphVertex resource = new GraphVertex(VertexTypeEnum.TOPOLOGY_TEMPLATE);
         resource.addMetadataProperty(GraphPropertyEnum.UNIQUE_ID, CONTAINER_ID);
-        titanDao.createVertex(resource);
-        GraphVertex loadedResource = titanDao.getVertexById(CONTAINER_ID).left().value();
+        janusGraphDao.createVertex(resource);
+        GraphVertex loadedResource = janusGraphDao.getVertexById(CONTAINER_ID).left().value();
         topologyTemplateOperation.associateElementToData(loadedResource, VertexTypeEnum.CALCULATED_CAP_PROPERTIES, EdgeLabelEnum.CALCULATED_CAP_PROPERTIES, capabilitiesPropsMap).left().value();
     }
 
     @After
     public void tearDown() {
-        titanDao.rollback();
+        janusGraphDao.rollback();
     }
 
     @Test
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/TopologyTemplateOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/TopologyTemplateOperationTest.java
index 4ace70b34f..bc3c7cc8bd 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/TopologyTemplateOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/TopologyTemplateOperationTest.java
@@ -1,6 +1,6 @@
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.apache.tinkerpop.gremlin.structure.Edge;
@@ -10,12 +10,12 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.MapCapabilityProperty;
 import org.openecomp.sdc.be.datatypes.elements.MapListCapabilityDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.MapListRequirementDataDefinition;
@@ -27,7 +27,7 @@ import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
 import org.openecomp.sdc.be.model.ComponentParametersView;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElement;
 
 import java.util.*;
 
@@ -45,11 +45,12 @@ public class TopologyTemplateOperationTest {
     @InjectMocks
     private TopologyTemplateOperation topologyTemplateOperation;
     @Mock
-    private TitanDao titanDao;
+    private JanusGraphDao janusGraphDao;
 
     @Test
     public void overrideToscaDataOfToscaElement_failedToFetchContainerVertex() {
-        when(titanDao.getVertexById(CONTAINER_ID, JsonParseFlagEnum.NoParse)).thenReturn(Either.right(TitanOperationStatus.INVALID_ID));
+        when(janusGraphDao.getVertexById(CONTAINER_ID, JsonParseFlagEnum.NoParse)).thenReturn(Either.right(
+            JanusGraphOperationStatus.INVALID_ID));
         StorageOperationStatus storageOperationStatus = topologyTemplateOperation.overrideToscaDataOfToscaElement(CONTAINER_ID, EdgeLabelEnum.CALCULATED_CAP_PROPERTIES, Collections.emptyMap());
         assertThat(storageOperationStatus).isEqualTo(StorageOperationStatus.INVALID_ID);
     }
@@ -57,15 +58,17 @@ public class TopologyTemplateOperationTest {
     @Test
     public void overrideToscaDataOfToscaElement_failedToFetchDataVertex() {
         GraphVertex containerVertex = new GraphVertex();
-        when(titanDao.getVertexById(CONTAINER_ID, JsonParseFlagEnum.NoParse)).thenReturn(Either.left(containerVertex));
-        when(titanDao.getChildVertex(containerVertex, EdgeLabelEnum.CALCULATED_CAP_PROPERTIES, JsonParseFlagEnum.ParseJson)).thenReturn(Either.right(TitanOperationStatus.NOT_FOUND));
+        when(janusGraphDao.getVertexById(CONTAINER_ID, JsonParseFlagEnum.NoParse)).thenReturn(Either.left(containerVertex));
+        when(janusGraphDao.getChildVertex(containerVertex, EdgeLabelEnum.CALCULATED_CAP_PROPERTIES, JsonParseFlagEnum.ParseJson)).thenReturn(Either.right(
+            JanusGraphOperationStatus.NOT_FOUND));
         StorageOperationStatus storageOperationStatus = topologyTemplateOperation.overrideToscaDataOfToscaElement(CONTAINER_ID, EdgeLabelEnum.CALCULATED_CAP_PROPERTIES, Collections.emptyMap());
         assertThat(storageOperationStatus).isEqualTo(StorageOperationStatus.NOT_FOUND);
     }
 
     @Test
     public void updateToscaDataDeepElements_failedToFetchContainerVertex() {
-        when(titanDao.getVertexById(CONTAINER_ID, JsonParseFlagEnum.NoParse)).thenReturn(Either.right(TitanOperationStatus.INVALID_ID));
+        when(janusGraphDao.getVertexById(CONTAINER_ID, JsonParseFlagEnum.NoParse)).thenReturn(Either.right(
+            JanusGraphOperationStatus.INVALID_ID));
         StorageOperationStatus storageOperationStatus = topologyTemplateOperation.updateToscaDataDeepElementsBlockToToscaElement(CONTAINER_ID, EdgeLabelEnum.CALCULATED_CAP_PROPERTIES, new MapCapabilityProperty(), "");
         assertThat(storageOperationStatus).isEqualTo(StorageOperationStatus.INVALID_ID);
     }
@@ -73,22 +76,23 @@ public class TopologyTemplateOperationTest {
     @Test
     public void updateToscaDataDeepElements_failedToFetchDataVertex() {
         GraphVertex containerVertex = new GraphVertex();
-        when(titanDao.getVertexById(CONTAINER_ID, JsonParseFlagEnum.NoParse)).thenReturn(Either.left(containerVertex));
-        when(titanDao.getChildVertex(containerVertex, EdgeLabelEnum.CALCULATED_CAP_PROPERTIES, JsonParseFlagEnum.ParseJson)).thenReturn(Either.right(TitanOperationStatus.NOT_FOUND));
+        when(janusGraphDao.getVertexById(CONTAINER_ID, JsonParseFlagEnum.NoParse)).thenReturn(Either.left(containerVertex));
+        when(janusGraphDao.getChildVertex(containerVertex, EdgeLabelEnum.CALCULATED_CAP_PROPERTIES, JsonParseFlagEnum.ParseJson)).thenReturn(Either.right(
+            JanusGraphOperationStatus.NOT_FOUND));
         StorageOperationStatus storageOperationStatus = topologyTemplateOperation.updateToscaDataDeepElementsBlockToToscaElement(CONTAINER_ID, EdgeLabelEnum.CALCULATED_CAP_PROPERTIES, new MapCapabilityProperty(), "");
         assertThat(storageOperationStatus).isEqualTo(StorageOperationStatus.NOT_FOUND);
     }
 
     @Test
     public void addPolicyToToscaElementSuccessTest(){
-        TitanOperationStatus status = TitanOperationStatus.OK;
+        JanusGraphOperationStatus status = JanusGraphOperationStatus.OK;
         StorageOperationStatus result = addPolicyToToscaElementWithStatus(status);
         assertThat(result).isEqualTo(StorageOperationStatus.OK);
     }
 
     @Test
     public void addPolicyToToscaElementFailureTest(){
-        TitanOperationStatus status = TitanOperationStatus.ALREADY_EXIST;
+        JanusGraphOperationStatus status = JanusGraphOperationStatus.ALREADY_EXIST;
         StorageOperationStatus result = addPolicyToToscaElementWithStatus(status);
         assertThat(result).isEqualTo(StorageOperationStatus.ENTITY_ALREADY_EXISTS);
     }
@@ -100,7 +104,7 @@ public class TopologyTemplateOperationTest {
         Map<String, MapListRequirementDataDefinition> calcRequirements = new HashMap<>();
         Map<String, MapListCapabilityDataDefinition> calcCapabilty = new HashMap<>();
         Map<String, MapCapabilityProperty> calCapabilitiesProps = new HashMap<>();
-        addPolicyToToscaElementWithStatus(TitanOperationStatus.OK);
+        addPolicyToToscaElementWithStatus(JanusGraphOperationStatus.OK);
         result = topologyTemplateOperation.associateOrAddCalcCapReqToComponent(graphVertex, calcRequirements, calcCapabilty, calCapabilitiesProps);
         assertEquals(StorageOperationStatus.OK, result);
     }
@@ -113,11 +117,12 @@ public class TopologyTemplateOperationTest {
         filter.setIgnoreDataType(false);
         String componentName = "componentName";
         String componentId = UniqueIdBuilder.buildResourceUniqueId();
-        containerVertex.setVertex(Mockito.mock(TitanVertex.class));
+        containerVertex.setVertex(Mockito.mock(JanusGraphVertex.class));
         containerVertex.setJsonMetadataField(JsonPresentationFields.NAME, componentName);
         containerVertex.setUniqueId(componentId);
         containerVertex.setLabel(VertexTypeEnum.TOPOLOGY_TEMPLATE);
-        when(titanDao.getChildVertex(any(GraphVertex.class), any(EdgeLabelEnum.class), any(JsonParseFlagEnum.class))).thenReturn(Either.right(TitanOperationStatus.GENERAL_ERROR));
+        when(janusGraphDao.getChildVertex(any(GraphVertex.class), any(EdgeLabelEnum.class), any(JsonParseFlagEnum.class))).thenReturn(Either.right(
+            JanusGraphOperationStatus.GENERAL_ERROR));
         Either<ToscaElement, StorageOperationStatus> storageOperationStatus = topologyTemplateOperation.getToscaElement(containerVertex, filter);
         assertThat(storageOperationStatus).isEqualTo(Either.right(StorageOperationStatus.GENERAL_ERROR));
     }
@@ -141,23 +146,25 @@ public class TopologyTemplateOperationTest {
             }
         };
         GraphVertex graphVertex = Mockito.mock(GraphVertex.class);
-        TitanVertex titanVertex = Mockito.mock(TitanVertex.class);
-        when(graphVertex.getVertex()).thenReturn(titanVertex);
-        when(titanVertex.edges(Direction.IN, EdgeLabelEnum.LAST_DISTRIBUTION_STATE_MODIFIER.name())).thenReturn(edgeIterator);
-        when(titanDao.getVertexByPropertyAndLabel(GraphPropertyEnum.USERID, userId, VertexTypeEnum.USER, JsonParseFlagEnum.NoParse)).thenReturn(Either.left(graphVertex));
-        when(titanDao.getVertexById(uniqueId, JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.left(graphVertex));
-        when(titanDao.createEdge(graphVertex, graphVertex, EdgeLabelEnum.LAST_DISTRIBUTION_STATE_MODIFIER, null)).thenReturn(TitanOperationStatus.OK);
-        when(titanDao.updateVertex(graphVertex)).thenReturn(Either.left(graphVertex));
+        JanusGraphVertex janusGraphVertex = Mockito.mock(JanusGraphVertex.class);
+        when(graphVertex.getVertex()).thenReturn(janusGraphVertex);
+        when(janusGraphVertex.edges(Direction.IN, EdgeLabelEnum.LAST_DISTRIBUTION_STATE_MODIFIER.name())).thenReturn(edgeIterator);
+        when(janusGraphDao
+            .getVertexByPropertyAndLabel(GraphPropertyEnum.USERID, userId, VertexTypeEnum.USER, JsonParseFlagEnum.NoParse)).thenReturn(Either.left(graphVertex));
+        when(janusGraphDao.getVertexById(uniqueId, JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.left(graphVertex));
+        when(janusGraphDao.createEdge(graphVertex, graphVertex, EdgeLabelEnum.LAST_DISTRIBUTION_STATE_MODIFIER, null)).thenReturn(
+            JanusGraphOperationStatus.OK);
+        when(janusGraphDao.updateVertex(graphVertex)).thenReturn(Either.left(graphVertex));
         result = topologyTemplateOperation.updateDistributionStatus(uniqueId, user, DistributionStatusEnum.DISTRIBUTED);
         assertThat(result.isLeft());
     }
 
     @SuppressWarnings("unchecked")
-    private StorageOperationStatus addPolicyToToscaElementWithStatus(TitanOperationStatus status) {
+    private StorageOperationStatus addPolicyToToscaElementWithStatus(JanusGraphOperationStatus status) {
         GraphVertex componentV = new GraphVertex();
-        componentV.setVertex(Mockito.mock(TitanVertex.class));
+        componentV.setVertex(Mockito.mock(JanusGraphVertex.class));
         GraphVertex dataV = new GraphVertex();
-        dataV.setVertex(Mockito.mock(TitanVertex.class));
+        dataV.setVertex(Mockito.mock(JanusGraphVertex.class));
         String componentName = "componentName";
         String componentId = UniqueIdBuilder.buildResourceUniqueId();
         String policyTypeName = "org.openecomp.policies.placement.valet.Affinity";
@@ -166,11 +173,12 @@ public class TopologyTemplateOperationTest {
         PolicyDefinition policy = new PolicyDefinition();
         policy.setPolicyTypeName(policyTypeName);
         int counter = 0;
-        Either<GraphVertex, TitanOperationStatus> toscaDataVertexRes = Either.right(TitanOperationStatus.NOT_FOUND);
-        when(titanDao.getChildVertex(eq(componentV), eq(EdgeLabelEnum.POLICIES), eq(JsonParseFlagEnum.ParseJson))).thenReturn(toscaDataVertexRes);
-        Either<GraphVertex, TitanOperationStatus> createVertex = Either.left(dataV);
-        when(titanDao.createVertex(any(GraphVertex.class))).thenReturn(createVertex);
-        when(titanDao.createEdge(any(TitanVertex.class), any(TitanVertex.class), any(EdgeLabelEnum.class), any(HashMap.class))).thenReturn(status);
+        Either<GraphVertex, JanusGraphOperationStatus> toscaDataVertexRes = Either.right(
+            JanusGraphOperationStatus.NOT_FOUND);
+        when(janusGraphDao.getChildVertex(eq(componentV), eq(EdgeLabelEnum.POLICIES), eq(JsonParseFlagEnum.ParseJson))).thenReturn(toscaDataVertexRes);
+        Either<GraphVertex, JanusGraphOperationStatus> createVertex = Either.left(dataV);
+        when(janusGraphDao.createVertex(any(GraphVertex.class))).thenReturn(createVertex);
+        when(janusGraphDao.createEdge(any(JanusGraphVertex.class), any(JanusGraphVertex.class), any(EdgeLabelEnum.class), any(HashMap.class))).thenReturn(status);
         return topologyTemplateOperation.addPolicyToToscaElement(componentV, policy, counter);
     }
 
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementOperationCatalogTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementOperationCatalogTest.java
index bffefd86cd..eeb7e17323 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementOperationCatalogTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementOperationCatalogTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
@@ -9,11 +9,11 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.model.catalog.CatalogComponent;
 
 import java.util.ArrayList;
@@ -31,7 +31,7 @@ public class ToscaElementOperationCatalogTest {
     @Mock
     Vertex vertex;
     @Mock
-    TitanDao titanDao;
+    JanusGraphDao janusGraphDao;
     @Mock
     VertexProperty<Object> property;
 
@@ -41,9 +41,9 @@ public class ToscaElementOperationCatalogTest {
     @Before
     public void setUp() {
         vertexList.add(vertex);
-        when(titanDao.getCatalogOrArchiveVerticies(true)).thenReturn(Either.left(vertexList.iterator()));
-        when(titanDao.getChildVertex(vertex, EdgeLabelEnum.CATEGORY, JsonParseFlagEnum.NoParse))
-                .thenReturn(Either.right(TitanOperationStatus.NOT_FOUND));
+        when(janusGraphDao.getCatalogOrArchiveVerticies(true)).thenReturn(Either.left(vertexList.iterator()));
+        when(janusGraphDao.getChildVertex(vertex, EdgeLabelEnum.CATEGORY, JsonParseFlagEnum.NoParse))
+                .thenReturn(Either.right(JanusGraphOperationStatus.NOT_FOUND));
         when(vertex.property(GraphPropertiesDictionary.METADATA.getProperty())).thenReturn(property);
     }
 
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementOperationTest.java
index e77f8e108c..205899d52f 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementOperationTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
 import org.junit.Before;
@@ -8,16 +8,16 @@ import org.junit.Test;
 import org.junit.rules.TestName;
 import org.junit.runner.RunWith;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.ComponentParametersView;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.ModelTestBase;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.TopologyTemplate;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
-import org.openecomp.sdc.be.model.jsontitan.utils.GraphTestUtils;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsonjanusgraph.utils.GraphTestUtils;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -42,7 +42,7 @@ public class ToscaElementOperationTest extends ModelTestBase{
     private ToscaElementOperationTestImpl toscaElementOperation;
 
     @javax.annotation.Resource
-    private TitanDao titanDao;
+    private JanusGraphDao janusGraphDao;
 
     @BeforeClass
     public static void initTest(){
@@ -56,8 +56,8 @@ public class ToscaElementOperationTest extends ModelTestBase{
     @Before
     public void beforeTest() {
         if (!isInitialized) {
-            GraphTestUtils.clearGraph(titanDao);
-            //exportGraphMl(titanDao.getGraph().left().value(),"");
+            GraphTestUtils.clearGraph(janusGraphDao);
+            //exportGraphMl(janusGraphDao.getGraph().left().value(),"");
             initGraphForTest();
             isInitialized = true;
         }
@@ -281,7 +281,7 @@ public class ToscaElementOperationTest extends ModelTestBase{
     }
 
     private void initGraphForTest() {
-        GraphTestUtils.createRootCatalogVertex(titanDao);
+        GraphTestUtils.createRootCatalogVertex(janusGraphDao);
 
         Map<GraphPropertyEnum, Object> highstVerticesProps = new HashMap<GraphPropertyEnum, Object>() {
             {
@@ -297,34 +297,34 @@ public class ToscaElementOperationTest extends ModelTestBase{
         };
 
         // add vertices with higestVersion = true
-        allVertices.add(GraphTestUtils.createResourceVertex(titanDao, highstVerticesProps, ResourceTypeEnum.VF));
-        allVertices.add(GraphTestUtils.createResourceVertex(titanDao, highstVerticesProps, ResourceTypeEnum.VFC));
-        allVertices.add(GraphTestUtils.createResourceVertex(titanDao, highstVerticesProps, ResourceTypeEnum.VFCMT));
-        allVertices.add(GraphTestUtils.createResourceVertex(titanDao, highstVerticesProps, ResourceTypeEnum.VL));
-        allVertices.add(GraphTestUtils.createResourceVertex(titanDao, highstVerticesProps, ResourceTypeEnum.CP));
-        allVertices.add(GraphTestUtils.createServiceVertex(titanDao, highstVerticesProps));
+        allVertices.add(GraphTestUtils.createResourceVertex(janusGraphDao, highstVerticesProps, ResourceTypeEnum.VF));
+        allVertices.add(GraphTestUtils.createResourceVertex(janusGraphDao, highstVerticesProps, ResourceTypeEnum.VFC));
+        allVertices.add(GraphTestUtils.createResourceVertex(janusGraphDao, highstVerticesProps, ResourceTypeEnum.VFCMT));
+        allVertices.add(GraphTestUtils.createResourceVertex(janusGraphDao, highstVerticesProps, ResourceTypeEnum.VL));
+        allVertices.add(GraphTestUtils.createResourceVertex(janusGraphDao, highstVerticesProps, ResourceTypeEnum.CP));
+        allVertices.add(GraphTestUtils.createServiceVertex(janusGraphDao, highstVerticesProps));
 
         // add vertices with non-additional properties
         for (int i=0 ; i<2 ; i++) {
-            allVertices.add(GraphTestUtils.createResourceVertex(titanDao, new HashMap<>(), ResourceTypeEnum.VF));
-            allVertices.add(GraphTestUtils.createResourceVertex(titanDao, new HashMap<>(), ResourceTypeEnum.VFC));
-            allVertices.add(GraphTestUtils.createResourceVertex(titanDao, new HashMap<>(), ResourceTypeEnum.VFCMT));
-            allVertices.add(GraphTestUtils.createResourceVertex(titanDao, new HashMap<>(), ResourceTypeEnum.VL));
-            allVertices.add(GraphTestUtils.createResourceVertex(titanDao, new HashMap<>(), ResourceTypeEnum.CP));
-            allVertices.add(GraphTestUtils.createServiceVertex(titanDao, new HashMap<>()));
+            allVertices.add(GraphTestUtils.createResourceVertex(janusGraphDao, new HashMap<>(), ResourceTypeEnum.VF));
+            allVertices.add(GraphTestUtils.createResourceVertex(janusGraphDao, new HashMap<>(), ResourceTypeEnum.VFC));
+            allVertices.add(GraphTestUtils.createResourceVertex(janusGraphDao, new HashMap<>(), ResourceTypeEnum.VFCMT));
+            allVertices.add(GraphTestUtils.createResourceVertex(janusGraphDao, new HashMap<>(), ResourceTypeEnum.VL));
+            allVertices.add(GraphTestUtils.createResourceVertex(janusGraphDao, new HashMap<>(), ResourceTypeEnum.CP));
+            allVertices.add(GraphTestUtils.createServiceVertex(janusGraphDao, new HashMap<>()));
         }
 
         // add certified vertices
         for (int i=0; i<3; i++) {
-            allVertices.add(GraphTestUtils.createResourceVertex(titanDao, certifiedVerticesProps, ResourceTypeEnum.VF));
-            allVertices.add(GraphTestUtils.createResourceVertex(titanDao, certifiedVerticesProps, ResourceTypeEnum.VFC));
-            allVertices.add(GraphTestUtils.createResourceVertex(titanDao, certifiedVerticesProps, ResourceTypeEnum.VFCMT));
-            allVertices.add(GraphTestUtils.createResourceVertex(titanDao, certifiedVerticesProps, ResourceTypeEnum.VL));
-            allVertices.add(GraphTestUtils.createResourceVertex(titanDao, certifiedVerticesProps, ResourceTypeEnum.CP));
-            allVertices.add(GraphTestUtils.createServiceVertex(titanDao, certifiedVerticesProps));
+            allVertices.add(GraphTestUtils.createResourceVertex(janusGraphDao, certifiedVerticesProps, ResourceTypeEnum.VF));
+            allVertices.add(GraphTestUtils.createResourceVertex(janusGraphDao, certifiedVerticesProps, ResourceTypeEnum.VFC));
+            allVertices.add(GraphTestUtils.createResourceVertex(janusGraphDao, certifiedVerticesProps, ResourceTypeEnum.VFCMT));
+            allVertices.add(GraphTestUtils.createResourceVertex(janusGraphDao, certifiedVerticesProps, ResourceTypeEnum.VL));
+            allVertices.add(GraphTestUtils.createResourceVertex(janusGraphDao, certifiedVerticesProps, ResourceTypeEnum.CP));
+            allVertices.add(GraphTestUtils.createServiceVertex(janusGraphDao, certifiedVerticesProps));
         }
         //allVertices.stream().forEach( v -> System.out.println("type: "+v.getMetadataProperty(GraphPropertyEnum.COMPONENT_TYPE)));
-        //String result = GraphTestUtils.exportGraphMl(titanDao.getGraph().left().value(), "");
+        //String result = GraphTestUtils.exportGraphMl(janusGraphDao.getGraph().left().value(), "");
         //System.out.println("graph is: " + result);
     }
 
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementOperationTestImpl.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementOperationTestImpl.java
index 27fbce4776..01e14cd588 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementOperationTestImpl.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementOperationTestImpl.java
@@ -1,12 +1,12 @@
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.model.ComponentParametersView;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElement;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 
 /**
@@ -17,7 +17,7 @@ public class ToscaElementOperationTestImpl extends ToscaElementOperation {
 
     @Override
     protected <T extends ToscaElement> Either<T, StorageOperationStatus> getLightComponent(GraphVertex vertexComponent, ComponentTypeEnum nodeType, ComponentParametersView parametersFilter) {
-        titanDao.parseVertexProperties(vertexComponent, JsonParseFlagEnum.ParseMetadata);
+        janusGraphDao.parseVertexProperties(vertexComponent, JsonParseFlagEnum.ParseMetadata);
         T toscaElement = convertToComponent(vertexComponent);
         return Either.left(toscaElement);
     }
@@ -43,17 +43,17 @@ public class ToscaElementOperationTestImpl extends ToscaElementOperation {
     }
 
     @Override
-    protected <T extends ToscaElement> TitanOperationStatus setCategoriesFromGraph(GraphVertex vertexComponent, T toscaElement) {
+    protected <T extends ToscaElement> JanusGraphOperationStatus setCategoriesFromGraph(GraphVertex vertexComponent, T toscaElement) {
         return null;
     }
 
     @Override
-    protected <T extends ToscaElement> TitanOperationStatus setCapabilitiesFromGraph(GraphVertex componentV, T toscaElement) {
+    protected <T extends ToscaElement> JanusGraphOperationStatus setCapabilitiesFromGraph(GraphVertex componentV, T toscaElement) {
         return null;
     }
 
     @Override
-    protected <T extends ToscaElement> TitanOperationStatus setRequirementsFromGraph(GraphVertex componentV, T toscaElement) {
+    protected <T extends ToscaElement> JanusGraphOperationStatus setRequirementsFromGraph(GraphVertex componentV, T toscaElement) {
         return null;
     }
 
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaOperationFacadePoliciesTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaOperationFacadePoliciesTest.java
index 95dca7f920..88d3db68c6 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaOperationFacadePoliciesTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaOperationFacadePoliciesTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
 import org.junit.After;
@@ -6,11 +6,10 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.openecomp.sdc.be.dao.config.TitanSpringConfig;
+import org.openecomp.sdc.be.dao.config.JanusGraphSpringConfig;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.HealingTitanDao;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.jsongraph.HealingJanusGraphDao;
 import org.openecomp.sdc.be.datatypes.elements.PolicyTargetType;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.ComponentParametersView;
@@ -34,13 +33,13 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertTrue;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {TitanSpringConfig.class, ModelOperationsSpringConfig.class})
+@ContextConfiguration(classes = {JanusGraphSpringConfig.class, ModelOperationsSpringConfig.class})
 public class ToscaOperationFacadePoliciesTest extends ModelTestBase {
 
     @Autowired
     private ToscaOperationFacade toscaOperationFacade;
     @Autowired
-    private HealingTitanDao titanDao;
+    private HealingJanusGraphDao janusGraphDao;
 
     private PolicyDefinition policy1, policy2;
 
@@ -67,7 +66,7 @@ public class ToscaOperationFacadePoliciesTest extends ModelTestBase {
 
     @After
     public void tearDown() {
-        titanDao.rollback();
+        janusGraphDao.rollback();
     }
 
     @Test
@@ -121,7 +120,7 @@ public class ToscaOperationFacadePoliciesTest extends ModelTestBase {
 
     private void createContainerVertexInDB() {
         GraphVertex resource = createBasicContainerGraphVertex();
-        Either<GraphVertex, TitanOperationStatus> container = titanDao.createVertex(resource);
+        Either<GraphVertex, JanusGraphOperationStatus> container = janusGraphDao.createVertex(resource);
         assertTrue(container.isLeft());
     }
 
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaOperationFacadeTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaOperationFacadeTest.java
index b43b632ad1..1bbbd1c087 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaOperationFacadeTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaOperationFacadeTest.java
@@ -27,7 +27,7 @@
  * limitations under the License.
 
  */
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
 import org.junit.Before;
@@ -39,13 +39,12 @@ import org.mockito.Mock;
 import org.mockito.ArgumentMatchers;
 import org.mockito.MockitoAnnotations;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.HealingTitanDao;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.HealingJanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum;
 import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
@@ -56,11 +55,11 @@ import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.ComponentParametersView;
 import org.openecomp.sdc.be.model.PolicyDefinition;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.NodeType;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.TopologyTemplate;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElementTypeEnum;
-import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.NodeType;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElementTypeEnum;
+import org.openecomp.sdc.be.model.jsonjanusgraph.utils.ModelConverter;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.DataTypeDefinition;
 import org.openecomp.sdc.be.model.PropertyDefinition;
@@ -89,7 +88,6 @@ import static org.mockito.Mockito.when;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyMap;
 import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -104,7 +102,7 @@ public class ToscaOperationFacadeTest {
     private ToscaOperationFacade testInstance;
 
     @Mock
-    private HealingTitanDao titanDaoMock;
+    private HealingJanusGraphDao janusGraphDaoMock;
 
     @Mock
     private TopologyTemplateOperation topologyTemplateOperationMock;
@@ -128,9 +126,9 @@ public class ToscaOperationFacadeTest {
         ArgumentCaptor<Map> criteriaNotCapture = ArgumentCaptor.forClass(Map.class);
         ComponentParametersView dataFilter = new ComponentParametersView();
         List<GraphVertex> mockVertices = getMockVertices(2);
-        Either<List<GraphVertex>, TitanOperationStatus> returnedVertices = Either.left(mockVertices);
+        Either<List<GraphVertex>, JanusGraphOperationStatus> returnedVertices = Either.left(mockVertices);
 
-        when(titanDaoMock.getByCriteria(eq(null), criteriaCapture.capture(), criteriaNotCapture.capture(), eq(JsonParseFlagEnum.ParseMetadata))).thenReturn(returnedVertices);
+        when(janusGraphDaoMock.getByCriteria(eq(null), criteriaCapture.capture(), criteriaNotCapture.capture(), eq(JsonParseFlagEnum.ParseMetadata))).thenReturn(returnedVertices);
         when(topologyTemplateOperationMock.getToscaElement(mockVertices.get(0), dataFilter)).thenReturn(Either.left(getResourceToscaElement("0")));
         when(topologyTemplateOperationMock.getToscaElement(mockVertices.get(1), dataFilter)).thenReturn(Either.left(getResourceToscaElement("1")));
         Either<List<Component>, StorageOperationStatus> fetchedComponents = testInstance.fetchMetaDataByResourceType(ResourceTypeEnum.VF.getValue(), dataFilter);
@@ -161,7 +159,8 @@ public class ToscaOperationFacadeTest {
     @SuppressWarnings("unchecked")
     @Test
     public void fetchMetaDataByResourceType_failedToGetData() throws Exception {
-        when(titanDaoMock.getByCriteria(eq(null), anyMap(), anyMap(), eq(JsonParseFlagEnum.ParseMetadata))).thenReturn(Either.right(TitanOperationStatus.GENERAL_ERROR));
+        when(janusGraphDaoMock.getByCriteria(eq(null), anyMap(), anyMap(), eq(JsonParseFlagEnum.ParseMetadata))).thenReturn(Either.right(
+            JanusGraphOperationStatus.GENERAL_ERROR));
         Either<List<Component>, StorageOperationStatus> fetchedComponents = testInstance.fetchMetaDataByResourceType(ResourceTypeEnum.VF.getValue(), new ComponentParametersView());
         assertTrue(fetchedComponents.isRight());
         assertEquals(StorageOperationStatus.GENERAL_ERROR, fetchedComponents.right().value());
@@ -214,7 +213,7 @@ public class ToscaOperationFacadeTest {
         props.put(GraphPropertyEnum.IS_HIGHEST_VERSION, true);
         ToscaElement toscaElement = getToscaElementForTest();
         when(topologyTemplateOperationMock.getToscaElement(ArgumentMatchers.eq(graphVertex),any(ComponentParametersView.class))).thenReturn(Either.left(toscaElement));
-        when(titanDaoMock.getByCriteria(ModelConverter.getVertexType(component), props)).thenReturn(Either.left(list));
+        when(janusGraphDaoMock.getByCriteria(ModelConverter.getVertexType(component), props)).thenReturn(Either.left(list));
         result = testInstance.findLastCertifiedToscaElementByUUID(component);
         Component resultComp = result.left().value();
         assertEquals(resultComp.getToscaType(),ToscaElementTypeEnum.TOPOLOGY_TEMPLATE.getValue());
@@ -238,7 +237,7 @@ public class ToscaOperationFacadeTest {
         propertiesToMatch.put(GraphPropertyEnum.IS_HIGHEST_VERSION, true);
         propertiesNotToMatch.put(GraphPropertyEnum.IS_DELETED, true);
 
-        when(titanDaoMock.getByCriteria(null, propertiesToMatch, propertiesNotToMatch, JsonParseFlagEnum.ParseAll)).thenReturn(Either.left(list));
+        when(janusGraphDaoMock.getByCriteria(null, propertiesToMatch, propertiesNotToMatch, JsonParseFlagEnum.ParseAll)).thenReturn(Either.left(list));
         when(topologyTemplateOperationMock.getToscaElement(ArgumentMatchers.eq(graphVertex),any(ComponentParametersView.class))).thenReturn(Either.left(toscaElement));
 
         result = testInstance.getFullLatestComponentByToscaResourceName("toscaResourceName");
@@ -252,7 +251,7 @@ public class ToscaOperationFacadeTest {
         Map<GraphPropertyEnum, Object> properties = new EnumMap<>(GraphPropertyEnum.class);
         properties.put(GraphPropertyEnum.CSAR_UUID, csarUUID);
         List<GraphVertex> vertexList = new ArrayList<>();
-        when(titanDaoMock.getByCriteria(null, properties, JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.left(vertexList));
+        when(janusGraphDaoMock.getByCriteria(null, properties, JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.left(vertexList));
         result = testInstance.validateCsarUuidUniqueness(csarUUID);
         assertEquals(StorageOperationStatus.ENTITY_ALREADY_EXISTS, result);
     }
@@ -263,7 +262,8 @@ public class ToscaOperationFacadeTest {
         String csarUUID = "csarUUID";
         Map<GraphPropertyEnum, Object> properties = new EnumMap<>(GraphPropertyEnum.class);
         properties.put(GraphPropertyEnum.CSAR_UUID, csarUUID);
-        when(titanDaoMock.getByCriteria(null, properties, JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.right(TitanOperationStatus.NOT_FOUND));
+        when(janusGraphDaoMock.getByCriteria(null, properties, JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.right(
+            JanusGraphOperationStatus.NOT_FOUND));
         result = testInstance.validateCsarUuidUniqueness(csarUUID);
         assertEquals(StorageOperationStatus.OK, result);
     }
@@ -284,8 +284,8 @@ public class ToscaOperationFacadeTest {
         props.put(GraphPropertyEnum.STATE, LifecycleStateEnum.CERTIFIED.name());
         ToscaElement topologyTemplate = new TopologyTemplate();
         topologyTemplate.setComponentType(ComponentTypeEnum.SERVICE);
-        when(titanDaoMock.getByCriteria(VertexTypeEnum.NODE_TYPE, props, JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.left(vertexList));
-        when(titanDaoMock.getVertexById(uniqueId, JsonParseFlagEnum.ParseAll)).thenReturn(Either.left(graphVertex));
+        when(janusGraphDaoMock.getByCriteria(VertexTypeEnum.NODE_TYPE, props, JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.left(vertexList));
+        when(janusGraphDaoMock.getVertexById(uniqueId, JsonParseFlagEnum.ParseAll)).thenReturn(Either.left(graphVertex));
         when(topologyTemplateOperationMock.getToscaElement(any(GraphVertex.class), any(ComponentParametersView.class))).thenReturn(Either.left(topologyTemplate));
         result = testInstance.getLatestCertifiedNodeTypeByToscaResourceName(toscaResourceName);
         assertThat(result.isLeft());
@@ -296,7 +296,7 @@ public class ToscaOperationFacadeTest {
         Either<Boolean, StorageOperationStatus> result;
         String componentId = "componentId";
         GraphVertex graphVertex = getTopologyTemplateVertex();
-        when(titanDaoMock.getVertexById(componentId, JsonParseFlagEnum.NoParse)).thenReturn(Either.left(graphVertex));
+        when(janusGraphDaoMock.getVertexById(componentId, JsonParseFlagEnum.NoParse)).thenReturn(Either.left(graphVertex));
         result = testInstance.validateComponentExists(componentId);
         assertEquals(true, result.left().value());
     }
@@ -305,7 +305,8 @@ public class ToscaOperationFacadeTest {
     public void testValidateCompExists_NotFound() {
         Either<Boolean, StorageOperationStatus> result;
         String componentId = "componentId";
-        when(titanDaoMock.getVertexById(componentId, JsonParseFlagEnum.NoParse)).thenReturn(Either.right(TitanOperationStatus.NOT_FOUND));
+        when(janusGraphDaoMock.getVertexById(componentId, JsonParseFlagEnum.NoParse)).thenReturn(Either.right(
+            JanusGraphOperationStatus.NOT_FOUND));
         result = testInstance.validateComponentExists(componentId);
         assertEquals(false, result.left().value());
     }
@@ -319,7 +320,7 @@ public class ToscaOperationFacadeTest {
         List<GraphVertex> graphVertexList = new ArrayList<>();
         GraphVertex graphVertex = getTopologyTemplateVertex();
         graphVertexList.add(graphVertex);
-        when(titanDaoMock.getByCriteria(null, properties, JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.left(graphVertexList));
+        when(janusGraphDaoMock.getByCriteria(null, properties, JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.left(graphVertexList));
         result = testInstance.validateToscaResourceNameExists(templateName);
         assertEquals(true, result.left().value());
     }
@@ -333,7 +334,8 @@ public class ToscaOperationFacadeTest {
         List<GraphVertex> graphVertexList = new ArrayList<>();
         GraphVertex graphVertex = getTopologyTemplateVertex();
         graphVertexList.add(graphVertex);
-        when(titanDaoMock.getByCriteria(null, properties, JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.right(TitanOperationStatus.NOT_FOUND));
+        when(janusGraphDaoMock.getByCriteria(null, properties, JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.right(
+            JanusGraphOperationStatus.NOT_FOUND));
         result = testInstance.validateToscaResourceNameExists(templateName);
         assertEquals(false, result.left().value());
     }
@@ -350,12 +352,13 @@ public class ToscaOperationFacadeTest {
         nodeType.setComponentType(ComponentTypeEnum.RESOURCE);
         ToscaElement toscaElement = new TopologyTemplate();
         toscaElement.setComponentType(ComponentTypeEnum.SERVICE);
-        when(titanDaoMock.getVertexById(id, JsonParseFlagEnum.NoParse)).thenReturn(Either.left(graphVertex));
-        when(titanDaoMock.getParentVertex(graphVertex, EdgeLabelEnum.VERSION, JsonParseFlagEnum.NoParse)).thenReturn(Either.left(graphVertex));
+        when(janusGraphDaoMock.getVertexById(id, JsonParseFlagEnum.NoParse)).thenReturn(Either.left(graphVertex));
+        when(janusGraphDaoMock.getParentVertex(graphVertex, EdgeLabelEnum.VERSION, JsonParseFlagEnum.NoParse)).thenReturn(Either.left(graphVertex));
         when(topologyTemplateOperationMock.deleteToscaElement(graphVertex)).thenReturn(Either.left(toscaElement));
         when(nodeTypeOperation.createToscaElement(any(ToscaElement.class))).thenReturn(Either.left(nodeType));
-        when(titanDaoMock.getVertexById(null, JsonParseFlagEnum.NoParse)).thenReturn(Either.left(graphVertex));
-        when(titanDaoMock.createEdge(graphVertex, graphVertex, EdgeLabelEnum.VERSION, null)).thenReturn(TitanOperationStatus.OK);
+        when(janusGraphDaoMock.getVertexById(null, JsonParseFlagEnum.NoParse)).thenReturn(Either.left(graphVertex));
+        when(janusGraphDaoMock.createEdge(graphVertex, graphVertex, EdgeLabelEnum.VERSION, null)).thenReturn(
+            JanusGraphOperationStatus.OK);
         result = testInstance.overrideComponent(resource, resource);
         assertTrue(result.isLeft());
     }
@@ -366,7 +369,7 @@ public class ToscaOperationFacadeTest {
         String id = "id";
         GraphVertex graphVertex = getTopologyTemplateVertex();
         ToscaElement toscaElement = getToscaElementForTest();
-        when(titanDaoMock.getVertexById(id, JsonParseFlagEnum.ParseAll)).thenReturn(Either.left(graphVertex));
+        when(janusGraphDaoMock.getVertexById(id, JsonParseFlagEnum.ParseAll)).thenReturn(Either.left(graphVertex));
         when(topologyTemplateOperationMock.getToscaElement(any(GraphVertex.class), any(ComponentParametersView.class))).thenReturn(Either.left(toscaElement));
         result = testInstance.getToscaElement(id, JsonParseFlagEnum.ParseAll);
         assertTrue(result.isLeft());
@@ -379,7 +382,7 @@ public class ToscaOperationFacadeTest {
         String id = "id";
         component.setUniqueId(id);
         GraphVertex graphVertex = getTopologyTemplateVertex();
-        when(titanDaoMock.getVertexById(id, JsonParseFlagEnum.ParseAll)).thenReturn(Either.left(graphVertex));
+        when(janusGraphDaoMock.getVertexById(id, JsonParseFlagEnum.ParseAll)).thenReturn(Either.left(graphVertex));
         when(nodeTypeOperation.markComponentToDelete(graphVertex)).thenReturn(Either.left(graphVertex));
         result = testInstance.markComponentToDelete(component);
         assertEquals(result, StorageOperationStatus.OK);
@@ -391,7 +394,7 @@ public class ToscaOperationFacadeTest {
         String componentId = "compId";
         GraphVertex graphVertex = getTopologyTemplateVertex();
         ToscaElement toscaElement = getToscaElementForTest();
-        when(titanDaoMock.getVertexById(componentId, JsonParseFlagEnum.ParseAll)).thenReturn(Either.left(graphVertex));
+        when(janusGraphDaoMock.getVertexById(componentId, JsonParseFlagEnum.ParseAll)).thenReturn(Either.left(graphVertex));
         when(topologyTemplateOperationMock.deleteToscaElement(graphVertex)).thenReturn(Either.left(toscaElement));
         result = testInstance.deleteToscaComponent(componentId);
         assertTrue(result.isLeft());
@@ -417,7 +420,7 @@ public class ToscaOperationFacadeTest {
         graphVertex.setMetadataProperties(props);
         graphVertexList.add(graphVertex);
 
-        when(titanDaoMock.getByCriteria(null, propertiesToMatch, propertiesNotToMatch, JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.left(graphVertexList));
+        when(janusGraphDaoMock.getByCriteria(null, propertiesToMatch, propertiesNotToMatch, JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.left(graphVertexList));
         when(topologyTemplateOperationMock.getToscaElement(any(GraphVertex.class), any(ComponentParametersView.class))).thenReturn(Either.left(toscaElement));
         result = testInstance.getLatestByToscaResourceName(toscaResourceName);
         assertTrue(result.isLeft());
@@ -462,7 +465,7 @@ public class ToscaOperationFacadeTest {
 
         propertiesNotToMatch.put(GraphPropertyEnum.IS_DELETED, true);
 
-        when(titanDaoMock.getByCriteria(null, propertiesToMatch, propertiesNotToMatch, JsonParseFlagEnum.ParseAll)).thenReturn(Either.left(componentVertices));
+        when(janusGraphDaoMock.getByCriteria(null, propertiesToMatch, propertiesNotToMatch, JsonParseFlagEnum.ParseAll)).thenReturn(Either.left(componentVertices));
         when(topologyTemplateOperationMock.getToscaElement(any(GraphVertex.class), any(ComponentParametersView.class))).thenReturn(Either.left(toscaElement));
         result = testInstance.getBySystemName(componentTypeEnum, sysName);
         assertTrue(result.isLeft());
@@ -487,7 +490,7 @@ public class ToscaOperationFacadeTest {
         hasProperties.put(GraphPropertyEnum.VERSION, version);
         hasNotProperties.put(GraphPropertyEnum.IS_DELETED, true);
         hasProperties.put(GraphPropertyEnum.COMPONENT_TYPE, componentType.name());
-        when(titanDaoMock.getByCriteria(null, hasProperties, hasNotProperties, parseFlag)).thenReturn(Either.left(graphVertexList));
+        when(janusGraphDaoMock.getByCriteria(null, hasProperties, hasNotProperties, parseFlag)).thenReturn(Either.left(graphVertexList));
         when(topologyTemplateOperationMock.getToscaElement(any(GraphVertex.class), any(ComponentParametersView.class))).thenReturn(Either.left(toscaElement));
         result = testInstance.getComponentByNameAndVersion(componentType, name, version, parseFlag);
         assertTrue(result.isLeft());
@@ -559,8 +562,8 @@ public class ToscaOperationFacadeTest {
         } else {
             vertex = getNodeTypeVertex();
         }
-        Either<GraphVertex, TitanOperationStatus> getVertexEither = Either.left(vertex);
-        when(titanDaoMock.getVertexById(componentId, JsonParseFlagEnum.NoParse)).thenReturn(getVertexEither);
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexEither = Either.left(vertex);
+        when(janusGraphDaoMock.getVertexById(componentId, JsonParseFlagEnum.NoParse)).thenReturn(getVertexEither);
         when(topologyTemplateOperationMock.addToscaDataToToscaElement(eq(vertex),
                 eq(EdgeLabelEnum.DATA_TYPES), eq(VertexTypeEnum.DATA_TYPES), anyMap(), eq(JsonPresentationFields.NAME))).thenReturn(status);
         return testInstance.addDataTypesToComponent(dataTypes, componentId);
@@ -572,7 +575,8 @@ public class ToscaOperationFacadeTest {
         String componentId = "componentId";
         GraphVertex vertex = getNodeTypeVertex();
         Map<String, DataTypeDefinition> dataTypes = new HashMap<>();
-        when(titanDaoMock.getVertexById(componentId, JsonParseFlagEnum.NoParse)).thenReturn(Either.right(TitanOperationStatus.NOT_FOUND));
+        when(janusGraphDaoMock.getVertexById(componentId, JsonParseFlagEnum.NoParse)).thenReturn(Either.right(
+            JanusGraphOperationStatus.NOT_FOUND));
         result = testInstance.addDataTypesToComponent(dataTypes, componentId);
         assertTrue(result.isRight() && result.right().value() == StorageOperationStatus.NOT_FOUND);
     }
@@ -636,8 +640,8 @@ public class ToscaOperationFacadeTest {
         } else {
             vertex = getNodeTypeVertex();
         }
-        Either<GraphVertex, TitanOperationStatus> getVertexEither = Either.left(vertex);
-        when(titanDaoMock.getVertexById(eq(componentId), eq(JsonParseFlagEnum.ParseMetadata))).thenReturn(getVertexEither);
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexEither = Either.left(vertex);
+        when(janusGraphDaoMock.getVertexById(eq(componentId), eq(JsonParseFlagEnum.ParseMetadata))).thenReturn(getVertexEither);
         when(topologyTemplateOperationMock.addPolicyToToscaElement(eq(vertex), any(PolicyDefinition.class), anyInt())).thenReturn(status);
         return testInstance.associatePolicyToComponent(componentId, policy, counter);
     }
@@ -646,7 +650,7 @@ public class ToscaOperationFacadeTest {
         PolicyDefinition policy = new PolicyDefinition();
         String componentId = "componentId";
         GraphVertex vertex = getTopologyTemplateVertex();
-        when(titanDaoMock.getVertexById(eq(componentId), eq(JsonParseFlagEnum.NoParse))).thenReturn(Either.left(vertex));
+        when(janusGraphDaoMock.getVertexById(eq(componentId), eq(JsonParseFlagEnum.NoParse))).thenReturn(Either.left(vertex));
         when(topologyTemplateOperationMock.updatePolicyOfToscaElement(eq(vertex), any(PolicyDefinition.class))).thenReturn(status);
         return testInstance.updatePolicyOfComponent(componentId, policy);
     }
@@ -655,8 +659,8 @@ public class ToscaOperationFacadeTest {
         String componentId = "componentId";
         String policyId = "policyId";
         GraphVertex vertex = getTopologyTemplateVertex();
-        Either<GraphVertex, TitanOperationStatus> getVertexEither = Either.left(vertex);
-        when(titanDaoMock.getVertexById(eq(componentId), eq(JsonParseFlagEnum.NoParse))).thenReturn(getVertexEither);
+        Either<GraphVertex, JanusGraphOperationStatus> getVertexEither = Either.left(vertex);
+        when(janusGraphDaoMock.getVertexById(eq(componentId), eq(JsonParseFlagEnum.NoParse))).thenReturn(getVertexEither);
         when(topologyTemplateOperationMock.removePolicyFromToscaElement(eq(vertex), eq(policyId))).thenReturn(status);
         StorageOperationStatus result = testInstance.removePolicyFromComponent(componentId, policyId);
         assertSame(result, status);
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/UpgradeOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/UpgradeOperationTest.java
index acb9af6a33..68c87bb7e8 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/UpgradeOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/UpgradeOperationTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import fj.data.Either;
 import org.apache.commons.lang3.tuple.ImmutablePair;
@@ -7,7 +7,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.utils.IdBuilderUtils;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
@@ -16,8 +16,8 @@ import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.TopologyTemplate;
-import org.openecomp.sdc.be.model.jsontitan.utils.GraphTestUtils;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate;
+import org.openecomp.sdc.be.model.jsonjanusgraph.utils.GraphTestUtils;
 import org.openecomp.sdc.be.model.operations.api.IElementOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.UserAdminOperation;
@@ -36,7 +36,7 @@ public class UpgradeOperationTest extends ModelTestBase {
 
     private boolean isInitialized;
     @Resource
-    private TitanDao titanDao;
+    private JanusGraphDao janusGraphDao;
     @Resource
     private UpgradeOperation upgradeOperation;
     @Resource
@@ -62,7 +62,7 @@ public class UpgradeOperationTest extends ModelTestBase {
     @Before
     public void beforeTest() {
         if (!isInitialized) {
-            GraphTestUtils.clearGraph(titanDao);
+            GraphTestUtils.clearGraph(janusGraphDao);
             initGraphForTest();
             isInitialized = true;
         }
@@ -102,7 +102,7 @@ public class UpgradeOperationTest extends ModelTestBase {
         Either<User, StorageOperationStatus> saveUserData = userAdminOperation.saveUserData(user);
         assertThat(saveUserData.isLeft()).isTrue();
         
-        GraphTestUtils.createRootCatalogVertex(titanDao);
+        GraphTestUtils.createRootCatalogVertex(janusGraphDao);
         resourceCategory = createResourceCategories();
         serviceCategory = createServiceCategory(); 
         
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/utils/CapabilityTestUtils.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/CapabilityTestUtils.java
index 6f6b7eacad..8a17de4054 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/utils/CapabilityTestUtils.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/CapabilityTestUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openecomp.sdc.be.model.jsontitan.utils;
+package org.openecomp.sdc.be.model.jsonjanusgraph.utils;
 
 import org.openecomp.sdc.be.datatypes.elements.CapabilityDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.ListCapabilityDataDefinition;
@@ -23,7 +23,7 @@ import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition;
 import org.openecomp.sdc.be.model.CapabilityDefinition;
 import org.openecomp.sdc.be.model.ComponentInstanceProperty;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.TopologyTemplate;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/utils/GraphTestUtils.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/GraphTestUtils.java
index 71dd472a1c..06e0b428b9 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/utils/GraphTestUtils.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/GraphTestUtils.java
@@ -18,17 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.be.model.jsontitan.utils;
+package org.openecomp.sdc.be.model.jsonjanusgraph.utils;
 
-import com.thinkaurelius.titan.core.TitanGraph;
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraph;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import org.apache.tinkerpop.gremlin.structure.io.IoCore;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
 import org.openecomp.sdc.be.dao.jsongraph.utils.IdBuilderUtils;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
@@ -43,21 +43,21 @@ import java.util.UUID;
 
 public final class GraphTestUtils {
 
-    public static GraphVertex createRootCatalogVertex(TitanDao titanDao) {
+    public static GraphVertex createRootCatalogVertex(JanusGraphDao janusGraphDao) {
         GraphVertex catalogRootVertex = new GraphVertex(VertexTypeEnum.CATALOG_ROOT);
         catalogRootVertex.setUniqueId(IdBuilderUtils.generateUniqueId());
-        return titanDao.createVertex(catalogRootVertex)
+        return janusGraphDao.createVertex(catalogRootVertex)
                 .either(v -> v, s -> null);
     }
 
-    public static GraphVertex createRootArchiveVertex(TitanDao titanDao) {
+    public static GraphVertex createRootArchiveVertex(JanusGraphDao janusGraphDao) {
         GraphVertex archiveRootVertex = new GraphVertex(VertexTypeEnum.ARCHIVE_ROOT);
         archiveRootVertex.setUniqueId(IdBuilderUtils.generateUniqueId());
-        return titanDao.createVertex(archiveRootVertex)
+        return janusGraphDao.createVertex(archiveRootVertex)
                 .either(v -> v, s -> null);
     }
 
-    public static GraphVertex createResourceVertex(TitanDao titanDao, Map<GraphPropertyEnum,Object> metadataProps, ResourceTypeEnum type) {
+    public static GraphVertex createResourceVertex(JanusGraphDao janusGraphDao, Map<GraphPropertyEnum,Object> metadataProps, ResourceTypeEnum type) {
         GraphVertex vertex = new GraphVertex();
         if (type == ResourceTypeEnum.VF) {
             vertex.setLabel(VertexTypeEnum.TOPOLOGY_TEMPLATE);
@@ -76,12 +76,12 @@ public final class GraphTestUtils {
         for (Map.Entry<GraphPropertyEnum, Object> prop : metadataProps.entrySet()) {
             vertex.addMetadataProperty(prop.getKey(), prop.getValue());
         }
-        titanDao.createVertex(vertex);
-        titanDao.commit();
+        janusGraphDao.createVertex(vertex);
+        janusGraphDao.commit();
         return vertex;
     }
 
-    public static GraphVertex createServiceVertex(TitanDao titanDao, Map<GraphPropertyEnum, Object> metadataProps){
+    public static GraphVertex createServiceVertex(JanusGraphDao janusGraphDao, Map<GraphPropertyEnum, Object> metadataProps){
         GraphVertex vertex = new GraphVertex(VertexTypeEnum.TOPOLOGY_TEMPLATE);
         String uuid = UUID.randomUUID().toString();
         vertex.setUniqueId(uuid);
@@ -91,27 +91,27 @@ public final class GraphTestUtils {
         for (Map.Entry<GraphPropertyEnum, Object> prop : metadataProps.entrySet()) {
             vertex.addMetadataProperty(prop.getKey(), prop.getValue());
         }
-        titanDao.createVertex(vertex);
-        titanDao.commit();
+        janusGraphDao.createVertex(vertex);
+        janusGraphDao.commit();
         return vertex;
     }
 
-    public static void clearGraph(TitanDao titanDao) {
-        Either<TitanGraph, TitanOperationStatus> graphResult = titanDao.getGraph();
-        TitanGraph graph = graphResult.left().value();
+    public static void clearGraph(JanusGraphDao janusGraphDao) {
+        Either<JanusGraph, JanusGraphOperationStatus> graphResult = janusGraphDao.getGraph();
+        JanusGraph graph = graphResult.left().value();
 
-        Iterable<TitanVertex> vertices = graph.query().vertices();
+        Iterable<JanusGraphVertex> vertices = graph.query().vertices();
         if (vertices != null) {
-            Iterator<TitanVertex> iterator = vertices.iterator();
+            Iterator<JanusGraphVertex> iterator = vertices.iterator();
             while (iterator.hasNext()) {
-                TitanVertex vertex = iterator.next();
+                JanusGraphVertex vertex = iterator.next();
                 vertex.remove();
             }
         }
-        titanDao.commit();
+        janusGraphDao.commit();
     }
 
-    public static String exportGraphMl(TitanGraph graph, String outputDirectory) {
+    public static String exportGraphMl(JanusGraph graph, String outputDirectory) {
         String result = null;
         String outputFile = outputDirectory + File.separator + "exportGraph." + System.currentTimeMillis() + ".graphml";
         try {
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/utils/IdMapperTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/IdMapperTest.java
index 39ea68c3fe..dca79c6041 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/utils/IdMapperTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/IdMapperTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.be.model.jsontitan.utils;
+package org.openecomp.sdc.be.model.jsonjanusgraph.utils;
 
 import org.junit.Test;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/utils/ModelConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/ModelConverterTest.java
index a927f5a461..740d148a79 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/utils/ModelConverterTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/ModelConverterTest.java
@@ -27,7 +27,7 @@
  * limitations under the License.
 
  */
-package org.openecomp.sdc.be.model.jsontitan.utils;
+package org.openecomp.sdc.be.model.jsonjanusgraph.utils;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -40,9 +40,9 @@ import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.TopologyTemplate;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.NodeType;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElementTypeEnum;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.NodeType;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElementTypeEnum;
 
 import java.util.Map;
 
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/AdditionalInformationOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/AdditionalInformationOperationTest.java
index 6fd04c18bb..dedf84cd76 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/AdditionalInformationOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/AdditionalInformationOperationTest.java
@@ -20,9 +20,9 @@
 
 package org.openecomp.sdc.be.model.operations.impl;
 
-import com.thinkaurelius.titan.core.TitanEdge;
-import com.thinkaurelius.titan.core.TitanGraph;
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraphEdge;
+import org.janusgraph.core.JanusGraph;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -31,10 +31,10 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.AdditionalInformationDefinition;
 import org.openecomp.sdc.be.model.ModelTestBase;
@@ -55,14 +55,14 @@ import static org.mockito.Mockito.when;
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration("classpath:application-context-test.xml")
 public class AdditionalInformationOperationTest extends ModelTestBase {
-    private static final TitanGenericDao titanGenericDao = mock(TitanGenericDao.class);
+    private static final JanusGraphGenericDao JANUS_GRAPH_GENERIC_DAO = mock(JanusGraphGenericDao.class);
     private static String USER_ID = "muUserId";
     private static String CATEGORY_NAME = "category/mycategory";
     @Mock
-    private TitanVertex titanVertex;
+    private JanusGraphVertex janusGraphVertex;
 
-    @javax.annotation.Resource(name = "titan-generic-dao")
-    private TitanGenericDao titanDao;
+    @javax.annotation.Resource(name = "janusgraph-generic-dao")
+    private JanusGraphGenericDao janusGraphDao;
 
     @javax.annotation.Resource(name = "additional-information-operation")
     private IAdditionalInformationOperation additionalInformationOperation;
@@ -90,10 +90,10 @@ public class AdditionalInformationOperationTest extends ModelTestBase {
 
     @Test
     public void testAddInfoParameter_InvalidId(){
-        Either<AdditionalInformationDefinition, TitanOperationStatus> result;
+        Either<AdditionalInformationDefinition, JanusGraphOperationStatus> result;
         String uid = "uid";
         String componentId = "componentId";
-        when(titanGenericDao.getVertexByProperty(eq(uid),eq(componentId))).thenReturn(Either.left(titanVertex));
+        when(JANUS_GRAPH_GENERIC_DAO.getVertexByProperty(eq(uid),eq(componentId))).thenReturn(Either.left(janusGraphVertex));
         result = additionalInformationOperation.addAdditionalInformationParameter
                 (NodeTypeEnum.Resource,componentId,"key","value");
         assertThat(result.isRight());
@@ -101,10 +101,10 @@ public class AdditionalInformationOperationTest extends ModelTestBase {
 
     @Test
     public void testUpdateInfoParameter_InvalidId(){
-        Either<AdditionalInformationDefinition, TitanOperationStatus> result;
+        Either<AdditionalInformationDefinition, JanusGraphOperationStatus> result;
         String uid = "uid";
         String componentId = "componentId";
-        when(titanGenericDao.getVertexByProperty(eq(uid),eq(componentId))).thenReturn(Either.left(titanVertex));
+        when(JANUS_GRAPH_GENERIC_DAO.getVertexByProperty(eq(uid),eq(componentId))).thenReturn(Either.left(janusGraphVertex));
         result = additionalInformationOperation.updateAdditionalInformationParameter
                 (NodeTypeEnum.Resource,componentId,"id","key","value");
         assertTrue(result.isRight());
@@ -112,17 +112,17 @@ public class AdditionalInformationOperationTest extends ModelTestBase {
 
     @Test
     public void testDelAdditionalInfoParam_InvalidId() {
-        Either<AdditionalInformationDefinition, TitanOperationStatus> result;
+        Either<AdditionalInformationDefinition, JanusGraphOperationStatus> result;
         String id = "uid";
         String componentId = "componentId";
-        TitanGraph graph = titanDao.getGraph().left().value();
-        TitanVertex v1 = graph.addVertex();
+        JanusGraph graph = janusGraphDao.getGraph().left().value();
+        JanusGraphVertex v1 = graph.addVertex();
         v1.property("uid", componentId);
         v1.property(GraphPropertiesDictionary.LABEL.getProperty(), "resource");
-        TitanVertex v2 = graph.addVertex();
+        JanusGraphVertex v2 = graph.addVertex();
         v2.property(id,id);
 
-        TitanEdge addEdge = v1.addEdge(GraphEdgeLabels.ADDITIONAL_INFORMATION.getProperty(), v2);
+        JanusGraphEdge addEdge = v1.addEdge(GraphEdgeLabels.ADDITIONAL_INFORMATION.getProperty(), v2);
         addEdge.property("edgeProp", "resource");
         graph.tx().commit();
 
@@ -132,18 +132,18 @@ public class AdditionalInformationOperationTest extends ModelTestBase {
     }
 
     private void clearGraph() {
-        Either<TitanGraph, TitanOperationStatus> graphResult = titanDao.getGraph();
-        TitanGraph graph = graphResult.left().value();
+        Either<JanusGraph, JanusGraphOperationStatus> graphResult = janusGraphDao.getGraph();
+        JanusGraph graph = graphResult.left().value();
 
-        Iterable<TitanVertex> vertices = graph.query().vertices();
+        Iterable<JanusGraphVertex> vertices = graph.query().vertices();
         if (vertices != null) {
-            Iterator<TitanVertex> iterator = vertices.iterator();
+            Iterator<JanusGraphVertex> iterator = vertices.iterator();
             while (iterator.hasNext()) {
-                TitanVertex vertex = iterator.next();
+                JanusGraphVertex vertex = iterator.next();
                 vertex.remove();
             }
         }
-        titanDao.commit();
+        janusGraphDao.commit();
     }
 
     private UserData deleteAndCreateUser(String userId, String firstName, String lastName) {
@@ -152,16 +152,16 @@ public class AdditionalInformationOperationTest extends ModelTestBase {
         userData.setFirstName(firstName);
         userData.setLastName(lastName);
 
-        titanDao.deleteNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.User), userId, UserData.class);
-        titanDao.createNode(userData, UserData.class);
-        titanDao.commit();
+        janusGraphDao.deleteNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.User), userId, UserData.class);
+        janusGraphDao.createNode(userData, UserData.class);
+        janusGraphDao.commit();
 
         return userData;
     }
 
     private void deleteAndCreateCategory(String category) {
         String[] names = category.split("/");
-        OperationTestsUtil.deleteAndCreateResourceCategory(names[0], names[1], titanDao);
+        OperationTestsUtil.deleteAndCreateResourceCategory(names[0], names[1], janusGraphDao);
     }
 
 }
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/AnnotationTypeOperationsTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/AnnotationTypeOperationsTest.java
index 9a3c66689e..24a263a89b 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/AnnotationTypeOperationsTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/AnnotationTypeOperationsTest.java
@@ -5,7 +5,7 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
 import org.openecomp.sdc.be.model.AnnotationTypeDefinition;
 import org.openecomp.sdc.be.model.ModelTestBase;
 import org.openecomp.sdc.be.model.PropertyDefinition;
@@ -29,7 +29,7 @@ public class AnnotationTypeOperationsTest extends ModelTestBase {
     static final String NEW_DESCRIPTION = "new description";
 
     @Resource
-    private TitanGenericDao titanGenericDao;
+    private JanusGraphGenericDao janusGraphGenericDao;
 
     @Resource
     private CommonTypeOperations commonTypeOperations;
@@ -47,13 +47,13 @@ public class AnnotationTypeOperationsTest extends ModelTestBase {
 
     @Before
     public void initTestData() {
-        removeGraphVertices(titanGenericDao.getGraph());
+        removeGraphVertices(janusGraphGenericDao.getGraph());
         prop1 = createSimpleProperty("val1", "prop1", "string");
     }
 
     @After
     public void tearDown() {
-        titanGenericDao.rollback();
+        janusGraphGenericDao.rollback();
     }
 
     @SuppressWarnings("unchecked")
@@ -86,7 +86,7 @@ public class AnnotationTypeOperationsTest extends ModelTestBase {
     public void addAnnotationType() {
         prepareInitialType();
         annotationTypeOperations.addType(initialAnnotationDefinition);
-        titanGenericDao.commit();
+        janusGraphGenericDao.commit();
     }
 
     @Test
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ArtifactOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ArtifactOperationTest.java
index 8e92549f4f..10553a0f89 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ArtifactOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ArtifactOperationTest.java
@@ -23,18 +23,17 @@ package org.openecomp.sdc.be.model.operations.impl;
 import fj.data.Either;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgePropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
-import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.util.OperationTestsUtil;
 import org.openecomp.sdc.be.resources.data.*;
@@ -60,8 +59,8 @@ public class ArtifactOperationTest extends ModelTestBase {
 
     private static final String ARTIFACT_NAME = "myHeatArtifact";
 
-    @javax.annotation.Resource(name = "titan-generic-dao")
-    private TitanGenericDao titanDao;
+    @javax.annotation.Resource(name = "janusgraph-generic-dao")
+    private JanusGraphGenericDao janusGraphDao;
 
     @javax.annotation.Resource(name = "tosca-operation-facade")
     private ToscaOperationFacade toscaOperationFacade;
@@ -99,20 +98,20 @@ public class ArtifactOperationTest extends ModelTestBase {
         assertEquals(1, heatParameters.size());
         HeatParameterDefinition parameter = heatParameters.get(0);
         HeatParameterData parameterData = new HeatParameterData(parameter);
-        Either<HeatParameterData, TitanOperationStatus> parameterNode = titanDao.getNode(parameterData.getUniqueIdKey(), parameterData.getUniqueId(), HeatParameterData.class);
+        Either<HeatParameterData, JanusGraphOperationStatus> parameterNode = janusGraphDao.getNode(parameterData.getUniqueIdKey(), parameterData.getUniqueId(), HeatParameterData.class);
         assertTrue(parameterNode.isLeft());
 
         Either<ArtifactDefinition, StorageOperationStatus> removeArifact = artifactOperation.removeArifactFromResource(RESOURCE_ID, artifactWithHeat.getUniqueId(), NodeTypeEnum.Resource, true, false);
         assertTrue(removeArifact.isLeft());
 
         ArtifactData artifactData = new ArtifactData(artifactWithHeat);
-        Either<ArtifactData, TitanOperationStatus> artifactAfterDelete = titanDao.getNode(artifactData.getUniqueIdKey(), artifactData.getUniqueId(), ArtifactData.class);
+        Either<ArtifactData, JanusGraphOperationStatus> artifactAfterDelete = janusGraphDao.getNode(artifactData.getUniqueIdKey(), artifactData.getUniqueId(), ArtifactData.class);
         assertTrue(artifactAfterDelete.isRight());
 
-        Either<HeatParameterData, TitanOperationStatus> parameterNodeAfterDelete = titanDao.getNode(parameterData.getUniqueIdKey(), parameterData.getUniqueId(), HeatParameterData.class);
+        Either<HeatParameterData, JanusGraphOperationStatus> parameterNodeAfterDelete = janusGraphDao.getNode(parameterData.getUniqueIdKey(), parameterData.getUniqueId(), HeatParameterData.class);
         assertTrue(parameterNodeAfterDelete.isRight());
 
-        titanDao.deleteNode(new UniqueIdData(NodeTypeEnum.Resource, RESOURCE_ID), ResourceMetadataData.class);
+        janusGraphDao.deleteNode(new UniqueIdData(NodeTypeEnum.Resource, RESOURCE_ID), ResourceMetadataData.class);
     }
 
     @Test
@@ -125,7 +124,7 @@ public class ArtifactOperationTest extends ModelTestBase {
         assertEquals(1, heatParameters.size());
         HeatParameterDefinition parameter = heatParameters.get(0);
         HeatParameterData parameterData = new HeatParameterData(parameter);
-        Either<HeatParameterData, TitanOperationStatus> parameterNode = titanDao.getNode(parameterData.getUniqueIdKey(), parameterData.getUniqueId(), HeatParameterData.class);
+        Either<HeatParameterData, JanusGraphOperationStatus> parameterNode = janusGraphDao.getNode(parameterData.getUniqueIdKey(), parameterData.getUniqueId(), HeatParameterData.class);
         assertTrue(parameterNode.isLeft());
 
         // update to artifact without params
@@ -139,18 +138,18 @@ public class ArtifactOperationTest extends ModelTestBase {
         assertTrue(updateArifact.isLeft());
 
         ArtifactData artifactData = new ArtifactData(artifactWithHeat);
-        Either<ArtifactData, TitanOperationStatus> artifactAfterUpdate = titanDao.getNode(artifactData.getUniqueIdKey(), artifactData.getUniqueId(), ArtifactData.class);
+        Either<ArtifactData, JanusGraphOperationStatus> artifactAfterUpdate = janusGraphDao.getNode(artifactData.getUniqueIdKey(), artifactData.getUniqueId(), ArtifactData.class);
         assertTrue(artifactAfterUpdate.isLeft());
         ArtifactData artifactAfterUpdateValue = artifactAfterUpdate.left().value();
         assertEquals(artifactNoParams.getArtifactVersion(), artifactAfterUpdateValue.getArtifactDataDefinition()
                                                                                     .getArtifactVersion());
 
-        Either<HeatParameterData, TitanOperationStatus> parameterNodeAfterDelete = titanDao.getNode(parameterData.getUniqueIdKey(), parameterData.getUniqueId(), HeatParameterData.class);
+        Either<HeatParameterData, JanusGraphOperationStatus> parameterNodeAfterDelete = janusGraphDao.getNode(parameterData.getUniqueIdKey(), parameterData.getUniqueId(), HeatParameterData.class);
         assertTrue(parameterNodeAfterDelete.isRight());
 
         artifactOperation.removeArifactFromResource(RESOURCE_ID, artifactWithHeat.getUniqueId(), NodeTypeEnum.Resource, true, false);
-        titanDao.deleteNode(new UniqueIdData(NodeTypeEnum.Resource, RESOURCE_ID), ResourceMetadataData.class);
-        titanDao.deleteNode(new UniqueIdData(NodeTypeEnum.Resource, RESOURCE_ID_2), ResourceMetadataData.class);
+        janusGraphDao.deleteNode(new UniqueIdData(NodeTypeEnum.Resource, RESOURCE_ID), ResourceMetadataData.class);
+        janusGraphDao.deleteNode(new UniqueIdData(NodeTypeEnum.Resource, RESOURCE_ID_2), ResourceMetadataData.class);
     }
 
     @Test
@@ -163,7 +162,7 @@ public class ArtifactOperationTest extends ModelTestBase {
         assertEquals(1, heatParameters.size());
         HeatParameterDefinition parameter = heatParameters.get(0);
         HeatParameterData parameterData = new HeatParameterData(parameter);
-        Either<HeatParameterData, TitanOperationStatus> parameterNode = titanDao.getNode(parameterData.getUniqueIdKey(), parameterData.getUniqueId(), HeatParameterData.class);
+        Either<HeatParameterData, JanusGraphOperationStatus> parameterNode = janusGraphDao.getNode(parameterData.getUniqueIdKey(), parameterData.getUniqueId(), HeatParameterData.class);
         assertTrue(parameterNode.isLeft());
 
         // update to artifact without params
@@ -175,19 +174,19 @@ public class ArtifactOperationTest extends ModelTestBase {
         assertTrue(updateArifact.isLeft());
 
         ArtifactData artifactData = new ArtifactData(artifactWithHeat);
-        Either<ArtifactData, TitanOperationStatus> artifactAfterUpdate = titanDao.getNode(artifactData.getUniqueIdKey(), artifactData.getUniqueId(), ArtifactData.class);
+        Either<ArtifactData, JanusGraphOperationStatus> artifactAfterUpdate = janusGraphDao.getNode(artifactData.getUniqueIdKey(), artifactData.getUniqueId(), ArtifactData.class);
         assertTrue(artifactAfterUpdate.isLeft());
         ArtifactData artifactAfterUpdateValue = artifactAfterUpdate.left().value();
         assertEquals(artifactWithHeat.getArtifactVersion(), artifactAfterUpdateValue.getArtifactDataDefinition()
                                                                                     .getArtifactVersion());
 
-        Either<HeatParameterData, TitanOperationStatus> parameterNodeAfterDelete = titanDao.getNode(parameterData.getUniqueIdKey(), parameterData.getUniqueId(), HeatParameterData.class);
+        Either<HeatParameterData, JanusGraphOperationStatus> parameterNodeAfterDelete = janusGraphDao.getNode(parameterData.getUniqueIdKey(), parameterData.getUniqueId(), HeatParameterData.class);
         assertTrue(parameterNodeAfterDelete.isLeft());
 
         Either<ArtifactDefinition, StorageOperationStatus> removeArifact = artifactOperation.removeArifactFromResource(RESOURCE_ID_2, (String) artifactAfterUpdateValue.getUniqueId(), NodeTypeEnum.Resource, true, false);
         removeArifact = artifactOperation.removeArifactFromResource(RESOURCE_ID, artifactWithHeat.getUniqueId(), NodeTypeEnum.Resource, true, false);
-        titanDao.deleteNode(new UniqueIdData(NodeTypeEnum.Resource, RESOURCE_ID), ResourceMetadataData.class);
-        titanDao.deleteNode(new UniqueIdData(NodeTypeEnum.Resource, RESOURCE_ID_2), ResourceMetadataData.class);
+        janusGraphDao.deleteNode(new UniqueIdData(NodeTypeEnum.Resource, RESOURCE_ID), ResourceMetadataData.class);
+        janusGraphDao.deleteNode(new UniqueIdData(NodeTypeEnum.Resource, RESOURCE_ID_2), ResourceMetadataData.class);
 
     }
 
@@ -198,7 +197,7 @@ public class ArtifactOperationTest extends ModelTestBase {
         ResourceMetadataData resource2 = createResource(RESOURCE_ID_2);
         Map<String, Object> props = new HashMap<>();
         props.put(GraphEdgePropertiesDictionary.NAME.getProperty(), ArtifactGroupTypeEnum.DEPLOYMENT.name());
-        Either<GraphRelation, TitanOperationStatus> createRelation = titanDao.createRelation(resource2, new ArtifactData(artifactWithHeat), GraphEdgeLabels.ARTIFACT_REF, props);
+        Either<GraphRelation, JanusGraphOperationStatus> createRelation = janusGraphDao.createRelation(resource2, new ArtifactData(artifactWithHeat), GraphEdgeLabels.ARTIFACT_REF, props);
         assertTrue(createRelation.isLeft());
 
         List<HeatParameterDefinition> heatParameters = artifactWithHeat.getListHeatParameters();
@@ -206,7 +205,7 @@ public class ArtifactOperationTest extends ModelTestBase {
         assertEquals(1, heatParameters.size());
         HeatParameterDefinition parameter = heatParameters.get(0);
         HeatParameterData parameterData = new HeatParameterData(parameter);
-        Either<HeatParameterData, TitanOperationStatus> parameterNode = titanDao.getNode(parameterData.getUniqueIdKey(), parameterData.getUniqueId(), HeatParameterData.class);
+        Either<HeatParameterData, JanusGraphOperationStatus> parameterNode = janusGraphDao.getNode(parameterData.getUniqueIdKey(), parameterData.getUniqueId(), HeatParameterData.class);
         assertTrue(parameterNode.isLeft());
 
         ArtifactDefinition atifactToUpdate = new ArtifactDefinition(artifactWithHeat);
@@ -227,19 +226,19 @@ public class ArtifactOperationTest extends ModelTestBase {
 
         // verify old artifact and parameter still exist
         ArtifactData artifactData = new ArtifactData(artifactWithHeat);
-        Either<ArtifactData, TitanOperationStatus> origArtifact = titanDao.getNode(artifactData.getUniqueIdKey(), artifactData.getUniqueId(), ArtifactData.class);
+        Either<ArtifactData, JanusGraphOperationStatus> origArtifact = janusGraphDao.getNode(artifactData.getUniqueIdKey(), artifactData.getUniqueId(), ArtifactData.class);
         assertTrue(origArtifact.isLeft());
         ArtifactData origArtifactData = origArtifact.left().value();
         assertEquals(artifactWithHeat.getArtifactVersion(), origArtifactData.getArtifactDataDefinition()
                                                                             .getArtifactVersion());
 
-        Either<HeatParameterData, TitanOperationStatus> parameterNodeAfterDelete = titanDao.getNode(parameterData.getUniqueIdKey(), parameterData.getUniqueId(), HeatParameterData.class);
+        Either<HeatParameterData, JanusGraphOperationStatus> parameterNodeAfterDelete = janusGraphDao.getNode(parameterData.getUniqueIdKey(), parameterData.getUniqueId(), HeatParameterData.class);
         assertTrue(parameterNodeAfterDelete.isLeft());
 
         // verify new artifact and new parameter
         ArtifactDefinition artifactDefinitionUpdated = updateArifact.left().value();
         ArtifactData artifactDataUpdated = new ArtifactData(artifactDefinitionUpdated);
-        Either<ArtifactData, TitanOperationStatus> updatedArtifact = titanDao.getNode(artifactDataUpdated.getUniqueIdKey(), artifactDataUpdated.getUniqueId(), ArtifactData.class);
+        Either<ArtifactData, JanusGraphOperationStatus> updatedArtifact = janusGraphDao.getNode(artifactDataUpdated.getUniqueIdKey(), artifactDataUpdated.getUniqueId(), ArtifactData.class);
         assertTrue(updatedArtifact.isLeft());
         ArtifactData updatedArtifactData = updatedArtifact.left().value();
         assertEquals(atifactToUpdate.getArtifactVersion(), updatedArtifactData.getArtifactDataDefinition()
@@ -251,7 +250,7 @@ public class ArtifactOperationTest extends ModelTestBase {
         assertEquals(1, heatParametersAfterUpdate.size());
         HeatParameterDefinition UpdatedHeatParameter = heatParametersAfterUpdate.get(0);
         assertFalse(UpdatedHeatParameter.getUniqueId().equalsIgnoreCase((String) parameterData.getUniqueId()));
-        Either<HeatParameterData, TitanOperationStatus> parameterNodeAfterUpdate = titanDao.getNode(new HeatParameterData(UpdatedHeatParameter).getUniqueIdKey(), UpdatedHeatParameter.getUniqueId(), HeatParameterData.class);
+        Either<HeatParameterData, JanusGraphOperationStatus> parameterNodeAfterUpdate = janusGraphDao.getNode(new HeatParameterData(UpdatedHeatParameter).getUniqueIdKey(), UpdatedHeatParameter.getUniqueId(), HeatParameterData.class);
         assertTrue(parameterNodeAfterUpdate.isLeft());
 
         // delete new artifact
@@ -259,25 +258,25 @@ public class ArtifactOperationTest extends ModelTestBase {
         assertTrue(removeArifact.isLeft());
 
         // verify old artifact and parameter still exist
-        origArtifact = titanDao.getNode(artifactData.getUniqueIdKey(), artifactData.getUniqueId(), ArtifactData.class);
+        origArtifact = janusGraphDao.getNode(artifactData.getUniqueIdKey(), artifactData.getUniqueId(), ArtifactData.class);
         assertTrue(origArtifact.isLeft());
         origArtifactData = origArtifact.left().value();
         assertEquals(artifactWithHeat.getArtifactVersion(), origArtifactData.getArtifactDataDefinition()
                                                                             .getArtifactVersion());
 
-        parameterNodeAfterDelete = titanDao.getNode(parameterData.getUniqueIdKey(), parameterData.getUniqueId(), HeatParameterData.class);
+        parameterNodeAfterDelete = janusGraphDao.getNode(parameterData.getUniqueIdKey(), parameterData.getUniqueId(), HeatParameterData.class);
         assertTrue(parameterNodeAfterDelete.isLeft());
 
         // verify new artifact is deleted
-        Either<ArtifactData, TitanOperationStatus> artifactAfterDelete = titanDao.getNode(artifactDataUpdated.getUniqueIdKey(), artifactDataUpdated.getUniqueId(), ArtifactData.class);
+        Either<ArtifactData, JanusGraphOperationStatus> artifactAfterDelete = janusGraphDao.getNode(artifactDataUpdated.getUniqueIdKey(), artifactDataUpdated.getUniqueId(), ArtifactData.class);
         assertTrue(artifactAfterDelete.isRight());
 
-        parameterNodeAfterDelete = titanDao.getNode(new HeatParameterData(UpdatedHeatParameter).getUniqueIdKey(), new HeatParameterData(UpdatedHeatParameter).getUniqueId(), HeatParameterData.class);
+        parameterNodeAfterDelete = janusGraphDao.getNode(new HeatParameterData(UpdatedHeatParameter).getUniqueIdKey(), new HeatParameterData(UpdatedHeatParameter).getUniqueId(), HeatParameterData.class);
         assertTrue(parameterNodeAfterDelete.isRight());
 
         artifactOperation.removeArifactFromResource(RESOURCE_ID, artifactWithHeat.getUniqueId(), NodeTypeEnum.Resource, true, false);
-        titanDao.deleteNode(new UniqueIdData(NodeTypeEnum.Resource, RESOURCE_ID), ResourceMetadataData.class);
-        titanDao.deleteNode(new UniqueIdData(NodeTypeEnum.Resource, RESOURCE_ID_2), ResourceMetadataData.class);
+        janusGraphDao.deleteNode(new UniqueIdData(NodeTypeEnum.Resource, RESOURCE_ID), ResourceMetadataData.class);
+        janusGraphDao.deleteNode(new UniqueIdData(NodeTypeEnum.Resource, RESOURCE_ID_2), ResourceMetadataData.class);
     }
 
     private ArtifactDefinition createResourceWithHeat() {
@@ -369,8 +368,8 @@ public class ArtifactOperationTest extends ModelTestBase {
 
     private void deleteAndCreateCategory(String category) {
         String[] names = category.split("/");
-        OperationTestsUtil.deleteAndCreateServiceCategory(category, titanDao);
-        OperationTestsUtil.deleteAndCreateResourceCategory(names[0], names[1], titanDao);
+        OperationTestsUtil.deleteAndCreateServiceCategory(category, janusGraphDao);
+        OperationTestsUtil.deleteAndCreateResourceCategory(names[0], names[1], janusGraphDao);
     }
 
     private UserData deleteAndCreateUser(String userId, String firstName, String lastName, String role) {
@@ -384,9 +383,9 @@ public class ArtifactOperationTest extends ModelTestBase {
             userData.setRole("ADMIN");
         }
 
-        titanDao.deleteNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.User), userId, UserData.class);
-        titanDao.createNode(userData, UserData.class);
-        titanDao.commit();
+        janusGraphDao.deleteNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.User), userId, UserData.class);
+        janusGraphDao.createNode(userData, UserData.class);
+        janusGraphDao.commit();
 
         return userData;
     }
@@ -395,7 +394,7 @@ public class ArtifactOperationTest extends ModelTestBase {
 
         ResourceMetadataData serviceData1 = new ResourceMetadataData();
         serviceData1.getMetadataDataDefinition().setUniqueId(resourceName);
-        Either<ResourceMetadataData, TitanOperationStatus> createNode = titanDao.createNode(serviceData1, ResourceMetadataData.class);
+        Either<ResourceMetadataData, JanusGraphOperationStatus> createNode = janusGraphDao.createNode(serviceData1, ResourceMetadataData.class);
 
         assertTrue("check resource created", createNode.isLeft());
         return createNode.left().value();
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/CapabilityTypeOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/CapabilityTypeOperationTest.java
index f853553911..b003c93fc1 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/CapabilityTypeOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/CapabilityTypeOperationTest.java
@@ -25,8 +25,8 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import com.thinkaurelius.titan.core.TitanGraph;
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraph;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -44,10 +44,9 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge;
+import org.openecomp.sdc.be.dao.janusgraph.HealingJanusGraphGenericDao;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
-import org.openecomp.sdc.be.dao.titan.HealingTitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.CapabilityTypeDefinition;
 import org.openecomp.sdc.be.model.ModelTestBase;
@@ -62,23 +61,15 @@ import org.openecomp.sdc.be.resources.data.CapabilityTypeData;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
 import static org.junit.Assert.assertTrue;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration("classpath:application-context-test.xml")
 public class CapabilityTypeOperationTest extends ModelTestBase {
 
-    @Resource(name = "titan-generic-dao")
-    private HealingTitanGenericDao titanDao;
+    @Resource(name = "janusgraph-generic-dao")
+    private HealingJanusGraphGenericDao janusGraphDao;
 
     @Resource(name = "capability-type-operation")
     private CapabilityTypeOperation capabilityTypeOperation;
@@ -90,20 +81,20 @@ public class CapabilityTypeOperationTest extends ModelTestBase {
     
     @Before
     public void cleanUp() {
-        HealingTitanGenericDao titanGenericDao = capabilityTypeOperation.titanGenericDao;
-        Either<TitanGraph, TitanOperationStatus> graphResult = titanGenericDao.getGraph();
-        TitanGraph graph = graphResult.left().value();
+        HealingJanusGraphGenericDao janusGraphGenericDao = capabilityTypeOperation.janusGraphGenericDao;
+        Either<JanusGraph, JanusGraphOperationStatus> graphResult = janusGraphGenericDao.getGraph();
+        JanusGraph graph = graphResult.left().value();
 
-        Iterable<TitanVertex> vertices = graph.query().vertices();
+        Iterable<JanusGraphVertex> vertices = graph.query().vertices();
         if (vertices != null) {
-            Iterator<TitanVertex> iterator = vertices.iterator();
+            Iterator<JanusGraphVertex> iterator = vertices.iterator();
             while (iterator.hasNext()) {
-                TitanVertex vertex = iterator.next();
+                JanusGraphVertex vertex = iterator.next();
                 vertex.remove();
             }
 
         }
-        titanGenericDao.commit();
+        janusGraphGenericDao.commit();
     }
 
     @Test
@@ -124,7 +115,7 @@ public class CapabilityTypeOperationTest extends ModelTestBase {
         CapabilityTypeDefinition capabilityTypeAdded = addCapabilityType1.left().value();
         compareBetweenCreatedToSent(capabilityTypeDefinition, capabilityTypeAdded);
 
-        Either<CapabilityTypeDefinition, TitanOperationStatus> capabilityTypeByUid = capabilityTypeOperation.getCapabilityTypeByUid(capabilityTypeAdded.getUniqueId());
+        Either<CapabilityTypeDefinition, JanusGraphOperationStatus> capabilityTypeByUid = capabilityTypeOperation.getCapabilityTypeByUid(capabilityTypeAdded.getUniqueId());
         compareBetweenCreatedToSent(capabilityTypeByUid.left().value(), capabilityTypeDefinition);
 
         Either<CapabilityTypeDefinition, StorageOperationStatus> addCapabilityType2 = capabilityTypeOperation.addCapabilityType(capabilityTypeDefinition, true);
@@ -441,7 +432,7 @@ public class CapabilityTypeOperationTest extends ModelTestBase {
     }
 
     private void verifyDerivedFromNodeEqualsToRootCapabilityType(CapabilityTypeDefinition rootCapabilityType, String parentCapabilityId) {
-        Either<ImmutablePair<CapabilityTypeData, GraphEdge>, TitanOperationStatus> derivedFromRelation = titanDao.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.CapabilityType), parentCapabilityId, GraphEdgeLabels.DERIVED_FROM,
+        Either<ImmutablePair<CapabilityTypeData, GraphEdge>, JanusGraphOperationStatus> derivedFromRelation = janusGraphDao.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.CapabilityType), parentCapabilityId, GraphEdgeLabels.DERIVED_FROM,
                 NodeTypeEnum.CapabilityType, CapabilityTypeData.class);
         assertThat(derivedFromRelation.left().value().getLeft().getCapabilityTypeDataDefinition())
                 .isEqualToComparingFieldByField(rootCapabilityType);
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ComponentInstanceOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ComponentInstanceOperationTest.java
index 849a442542..029c638711 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ComponentInstanceOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ComponentInstanceOperationTest.java
@@ -29,7 +29,7 @@
  */
 package org.openecomp.sdc.be.model.operations.impl;
 
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -37,10 +37,9 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.openecomp.sdc.be.dao.janusgraph.HealingJanusGraphGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.HealingTitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.ComponentInstance;
 import org.openecomp.sdc.be.model.ComponentInstanceInput;
@@ -64,12 +63,12 @@ public class ComponentInstanceOperationTest {
 	private ComponentInstanceOperation componentInstanceOperation;
 
 	@Mock
-	protected HealingTitanGenericDao titanGenericDao;
+	protected HealingJanusGraphGenericDao janusGraphGenericDao;
 
 
 	@Test
-	public void testSetTitanGenericDao() {
-		componentInstanceOperation.setTitanGenericDao(titanGenericDao);
+	public void testSetJanusGraphGenericDao() {
+		componentInstanceOperation.setJanusGraphGenericDao(janusGraphGenericDao);
 	}
 
 	@Test
@@ -87,8 +86,8 @@ public class ComponentInstanceOperationTest {
 	public void testUpdateCustomizationUUID() {
 		StorageOperationStatus result;
 		String componentInstanceId = "instanceId";
-		TitanVertex titanVertex = Mockito.mock(TitanVertex.class);
-		when(titanGenericDao.getVertexByProperty(GraphPropertiesDictionary.UNIQUE_ID.getProperty(),componentInstanceId)).thenReturn(Either.left(titanVertex));
+		JanusGraphVertex janusGraphVertex = Mockito.mock(JanusGraphVertex.class);
+		when(janusGraphGenericDao.getVertexByProperty(GraphPropertiesDictionary.UNIQUE_ID.getProperty(),componentInstanceId)).thenReturn(Either.left(janusGraphVertex));
 		result = componentInstanceOperation.updateCustomizationUUID(componentInstanceId);
 		assertEquals(StorageOperationStatus.OK, result);
 	}
@@ -125,7 +124,8 @@ public class ComponentInstanceOperationTest {
         componentInstance.setUniqueId("INST0.1");
         componentInstance.setComponentUid("RES0.1");
         componentInstance.setGroupInstances(gilist);
-        when(titanGenericDao.updateNode(anyObject(),eq(ComponentInstanceData.class))).thenReturn(Either.right(TitanOperationStatus.GENERAL_ERROR));
+        when(janusGraphGenericDao.updateNode(anyObject(),eq(ComponentInstanceData.class))).thenReturn(Either.right(
+            JanusGraphOperationStatus.GENERAL_ERROR));
         Either<ComponentInstanceData, StorageOperationStatus> result = componentInstanceOperation.updateComponentInstanceModificationTimeAndCustomizationUuidOnGraph(componentInstance, NodeTypeEnum.Component,234234545L,false);
         assertEquals(StorageOperationStatus.GENERAL_ERROR, result.right().value());
     }
@@ -145,7 +145,7 @@ public class ComponentInstanceOperationTest {
         componentInstance.setComponentUid("RES0.1");
         componentInstance.setGroupInstances(gilist);
         ComponentInstanceData componentInstanceData = new ComponentInstanceData();
-        when(titanGenericDao.updateNode(anyObject(),eq(ComponentInstanceData.class))).thenReturn(Either.left(componentInstanceData));
+        when(janusGraphGenericDao.updateNode(anyObject(),eq(ComponentInstanceData.class))).thenReturn(Either.left(componentInstanceData));
         Either<ComponentInstanceData, StorageOperationStatus> result = componentInstanceOperation.updateComponentInstanceModificationTimeAndCustomizationUuidOnGraph(componentInstance, NodeTypeEnum.Component,234234545L,false);
         assertEquals(componentInstanceData, result.left().value());
     }
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ElementOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ElementOperationTest.java
index 9b2a5d93c9..2c00d3d952 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ElementOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ElementOperationTest.java
@@ -26,8 +26,8 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanGraphClient;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphClient;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.ArtifactType;
 import org.openecomp.sdc.be.model.ModelTestBase;
@@ -56,8 +56,8 @@ public class ElementOperationTest extends ModelTestBase {
     @javax.annotation.Resource(name = "element-operation")
     private ElementOperation elementOperation;
 
-    @javax.annotation.Resource(name = "titan-generic-dao")
-    private TitanGenericDao titanDao;
+    @javax.annotation.Resource(name = "janusgraph-generic-dao")
+    private JanusGraphGenericDao janusGraphDao;
 
     private static String CATEGORY = "category";
     private static String SUBCATEGORY = "subcategory";
@@ -112,7 +112,7 @@ public class ElementOperationTest extends ModelTestBase {
 
     // @Test
     public void testGetResourceAndServiceCategoty() {
-        String id = OperationTestsUtil.deleteAndCreateResourceCategory(CATEGORY, SUBCATEGORY, titanDao);
+        String id = OperationTestsUtil.deleteAndCreateResourceCategory(CATEGORY, SUBCATEGORY, janusGraphDao);
 
         Either<CategoryDefinition, ActionStatus> res = elementOperation.getCategory(NodeTypeEnum.ResourceNewCategory, id);
         assertTrue(res.isLeft());
@@ -120,7 +120,7 @@ public class ElementOperationTest extends ModelTestBase {
         assertEquals(CATEGORY, categoryDefinition.getName());
         assertEquals(SUBCATEGORY, categoryDefinition.getSubcategories().get(0).getName());
 
-        id = OperationTestsUtil.deleteAndCreateServiceCategory(CATEGORY, titanDao);
+        id = OperationTestsUtil.deleteAndCreateServiceCategory(CATEGORY, janusGraphDao);
 
         res = elementOperation.getCategory(NodeTypeEnum.ServiceNewCategory, id);
         assertTrue(res.isLeft());
@@ -129,7 +129,7 @@ public class ElementOperationTest extends ModelTestBase {
 	}
 
 	private ElementOperation createTestSubject() {
-		return new ElementOperation(new TitanGenericDao(new TitanGraphClient()));
+		return new ElementOperation(new JanusGraphGenericDao(new JanusGraphClient()));
 	}
 
 	
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/GroupTypeOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/GroupTypeOperationTest.java
index 0f8e294459..8e1e5d3d04 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/GroupTypeOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/GroupTypeOperationTest.java
@@ -1,7 +1,7 @@
 package org.openecomp.sdc.be.model.operations.impl;
 
-import com.thinkaurelius.titan.core.TitanGraph;
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraph;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.tinkerpop.gremlin.structure.Edge;
@@ -10,11 +10,10 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge;
+import org.openecomp.sdc.be.dao.janusgraph.HealingJanusGraphGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.HealingTitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.GroupTypeDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.*;
@@ -44,8 +43,8 @@ public class GroupTypeOperationTest extends ModelTestBase {
     private static final String TOSCA_GROUPS_ROOT = "tosca.groups.Root";
     private static final String NULL_STRING = null;
 
-    @Resource(name = "titan-generic-dao")
-    private HealingTitanGenericDao titanDao;
+    @Resource(name = "janusgraph-generic-dao")
+    private HealingJanusGraphGenericDao janusGraphDao;
     
     @Resource(name = "capability-type-operation")
     private CapabilityTypeOperation capabilityTypeOperation;
@@ -60,7 +59,7 @@ public class GroupTypeOperationTest extends ModelTestBase {
 
     @After
     public void tearDown() {
-        titanDao.rollback();
+        janusGraphDao.rollback();
         cleanUp();
     }
 
@@ -120,10 +119,12 @@ public class GroupTypeOperationTest extends ModelTestBase {
         assertTrue("check group type added", addGroupTypeResult.isLeft());
         compareBetweenCreatedToSent(groupTypeDefinition, addGroupTypeResult.left().value());
         
-        Either<GroupTypeData, TitanOperationStatus> groupTypeResult = titanDao.getNode(GraphPropertiesDictionary.TYPE.getProperty(), groupTypeDefinition.getType(), GroupTypeData.class);
+        Either<GroupTypeData, JanusGraphOperationStatus> groupTypeResult = janusGraphDao
+            .getNode(GraphPropertiesDictionary.TYPE.getProperty(), groupTypeDefinition.getType(), GroupTypeData.class);
         GroupTypeData groupTypeNode = extractVal(groupTypeResult);
         
-        Either<Edge, TitanOperationStatus> edgeResult = titanDao.getEdgeByNodes(groupTypeNode, rootNode, GraphEdgeLabels.DERIVED_FROM);
+        Either<Edge, JanusGraphOperationStatus> edgeResult = janusGraphDao
+            .getEdgeByNodes(groupTypeNode, rootNode, GraphEdgeLabels.DERIVED_FROM);
         validate(edgeResult);
     }
     
@@ -132,7 +133,8 @@ public class GroupTypeOperationTest extends ModelTestBase {
         getOrCreateRootGroupTypeNode();
 
         CapabilityTypeDefinition capabilityTypeDef = createCapabilityType(null);
-        Either<CapabilityTypeData, TitanOperationStatus> capabilityTypeResult = titanDao.getNode(GraphPropertiesDictionary.TYPE.getProperty(), capabilityTypeDef.getType(), CapabilityTypeData.class);
+        Either<CapabilityTypeData, JanusGraphOperationStatus> capabilityTypeResult = janusGraphDao
+            .getNode(GraphPropertiesDictionary.TYPE.getProperty(), capabilityTypeDef.getType(), CapabilityTypeData.class);
         extractVal(capabilityTypeResult);
 
         GroupTypeDefinition groupTypeDefinition = new GroupTypeDefinition();
@@ -171,7 +173,8 @@ public class GroupTypeOperationTest extends ModelTestBase {
                 buildProperty("vfc_instance_group_reference", null, "Ability to recognize capability per vfc instance group on vnf instance"));
 
         CapabilityTypeDefinition capabilityTypeDef = createCapabilityType(capTypeProperties);
-        Either<CapabilityTypeData, TitanOperationStatus> capabilityTypeResult = titanDao.getNode(GraphPropertiesDictionary.TYPE.getProperty(), capabilityTypeDef.getType(), CapabilityTypeData.class);
+        Either<CapabilityTypeData, JanusGraphOperationStatus> capabilityTypeResult = janusGraphDao
+            .getNode(GraphPropertiesDictionary.TYPE.getProperty(), capabilityTypeDef.getType(), CapabilityTypeData.class);
         extractVal(capabilityTypeResult);
         
         GroupTypeDefinition groupTypeDefinition = new GroupTypeDefinition();
@@ -199,7 +202,8 @@ public class GroupTypeOperationTest extends ModelTestBase {
         assertTrue("check group type added", addGroupTypeResult.isLeft());
         compareBetweenCreatedToSent(groupTypeDefinition, addGroupTypeResult.left().value());
         
-        Either<GroupTypeData, TitanOperationStatus> groupTypeResult = titanDao.getNode(GraphPropertiesDictionary.TYPE.getProperty(), groupTypeDefinition.getType(), GroupTypeData.class);
+        Either<GroupTypeData, JanusGraphOperationStatus> groupTypeResult = janusGraphDao
+            .getNode(GraphPropertiesDictionary.TYPE.getProperty(), groupTypeDefinition.getType(), GroupTypeData.class);
         GroupTypeData groupTypeNode = extractVal(groupTypeResult);
         
         Either<GroupTypeDefinition, StorageOperationStatus> groupTypeDefResult = groupTypeOperation.getGroupTypeByUid(groupTypeNode.getUniqueId());
@@ -213,7 +217,8 @@ public class GroupTypeOperationTest extends ModelTestBase {
         CapabilityDefinition updatedCapabilityDef = capabilityDefs.get("vlan_assignment");
         assertEquals(2, updatedCapabilityDef.getProperties().size());
         
-        Either<Edge, TitanOperationStatus> edgeDerivedFromResult = titanDao.getEdgeByNodes(groupTypeNode, rootNode, GraphEdgeLabels.DERIVED_FROM);
+        Either<Edge, JanusGraphOperationStatus> edgeDerivedFromResult = janusGraphDao
+            .getEdgeByNodes(groupTypeNode, rootNode, GraphEdgeLabels.DERIVED_FROM);
         validate(edgeDerivedFromResult);
     }
     
@@ -226,7 +231,8 @@ public class GroupTypeOperationTest extends ModelTestBase {
         Map<String, PropertyDefinition> capTypeProperties = new HashMap<>();
         capTypeProperties.put("vfc_instance_group_reference", property);
         CapabilityTypeDefinition capabilityTypeDef = createCapabilityType(capTypeProperties);
-        Either<CapabilityTypeData, TitanOperationStatus> capabilityTypeResult = titanDao.getNode(GraphPropertiesDictionary.TYPE.getProperty(), capabilityTypeDef.getType(), CapabilityTypeData.class);
+        Either<CapabilityTypeData, JanusGraphOperationStatus> capabilityTypeResult = janusGraphDao
+            .getNode(GraphPropertiesDictionary.TYPE.getProperty(), capabilityTypeDef.getType(), CapabilityTypeData.class);
         extractVal(capabilityTypeResult);
 
         GroupTypeDefinition groupTypeDefinition = new GroupTypeDefinition();
@@ -254,7 +260,8 @@ public class GroupTypeOperationTest extends ModelTestBase {
         assertTrue("check group type added", addGroupTypeResult.isLeft());
         compareBetweenCreatedToSent(groupTypeDefinition, addGroupTypeResult.left().value());
 
-        Either<GroupTypeData, TitanOperationStatus> groupTypeResult = titanDao.getNode(GraphPropertiesDictionary.TYPE.getProperty(), groupTypeDefinition.getType(), GroupTypeData.class);
+        Either<GroupTypeData, JanusGraphOperationStatus> groupTypeResult = janusGraphDao
+            .getNode(GraphPropertiesDictionary.TYPE.getProperty(), groupTypeDefinition.getType(), GroupTypeData.class);
         GroupTypeData groupTypeNode = extractVal(groupTypeResult);
 
         Either<GroupTypeDefinition, StorageOperationStatus> groupTypeDefResult = groupTypeOperation.getGroupTypeByUid(groupTypeNode.getUniqueId());
@@ -281,7 +288,8 @@ public class GroupTypeOperationTest extends ModelTestBase {
         Map<String, PropertyDefinition> capTypeProperties = new HashMap<>();
         capTypeProperties.put("vfc_instance_group_reference", property);
         CapabilityTypeDefinition capabilityTypeDef = createCapabilityType(capTypeProperties);
-        Either<CapabilityTypeData, TitanOperationStatus> capabilityTypeResult = titanDao.getNode(GraphPropertiesDictionary.TYPE.getProperty(), capabilityTypeDef.getType(), CapabilityTypeData.class);
+        Either<CapabilityTypeData, JanusGraphOperationStatus> capabilityTypeResult = janusGraphDao
+            .getNode(GraphPropertiesDictionary.TYPE.getProperty(), capabilityTypeDef.getType(), CapabilityTypeData.class);
         extractVal(capabilityTypeResult);
 
         GroupTypeDefinition groupTypeDefinition = new GroupTypeDefinition();
@@ -317,7 +325,8 @@ public class GroupTypeOperationTest extends ModelTestBase {
         Map<String, PropertyDefinition> capTypeProperties = new HashMap<>();
         capTypeProperties.put("vfc_instance_group_reference", property);
         CapabilityTypeDefinition capabilityTypeDef = createCapabilityType(capTypeProperties);
-        Either<CapabilityTypeData, TitanOperationStatus> capabilityTypeResult = titanDao.getNode(GraphPropertiesDictionary.TYPE.getProperty(), capabilityTypeDef.getType(), CapabilityTypeData.class);
+        Either<CapabilityTypeData, JanusGraphOperationStatus> capabilityTypeResult = janusGraphDao
+            .getNode(GraphPropertiesDictionary.TYPE.getProperty(), capabilityTypeDef.getType(), CapabilityTypeData.class);
         extractVal(capabilityTypeResult);
 
         GroupTypeDefinition groupTypeDefinition = new GroupTypeDefinition();
@@ -362,7 +371,8 @@ public class GroupTypeOperationTest extends ModelTestBase {
         Map<String, PropertyDefinition> capTypeProperties = new HashMap<>();
         capTypeProperties.put("vfc_instance_group_reference", property);
         CapabilityTypeDefinition capabilityTypeDef = createCapabilityType(capTypeProperties);
-        Either<CapabilityTypeData, TitanOperationStatus> capabilityTypeResult = titanDao.getNode(GraphPropertiesDictionary.TYPE.getProperty(), capabilityTypeDef.getType(), CapabilityTypeData.class);
+        Either<CapabilityTypeData, JanusGraphOperationStatus> capabilityTypeResult = janusGraphDao
+            .getNode(GraphPropertiesDictionary.TYPE.getProperty(), capabilityTypeDef.getType(), CapabilityTypeData.class);
         extractVal(capabilityTypeResult);
 
         GroupTypeDefinition groupTypeDefinition = new GroupTypeDefinition();
@@ -501,7 +511,8 @@ public class GroupTypeOperationTest extends ModelTestBase {
     
     
     private GroupTypeData getOrCreateRootGroupTypeNode() {
-        Either<GroupTypeData, TitanOperationStatus> groupTypeResult = titanDao.getNode(GraphPropertiesDictionary.TYPE.getProperty(), TOSCA_GROUPS_ROOT, GroupTypeData.class);
+        Either<GroupTypeData, JanusGraphOperationStatus> groupTypeResult = janusGraphDao
+            .getNode(GraphPropertiesDictionary.TYPE.getProperty(), TOSCA_GROUPS_ROOT, GroupTypeData.class);
         if(groupTypeResult.isLeft()) {
             return groupTypeResult.left().value();
         }
@@ -514,7 +525,8 @@ public class GroupTypeOperationTest extends ModelTestBase {
         Either<GroupTypeDefinition, StorageOperationStatus> addGroupTypeResult =  groupTypeOperation.addGroupType(rootGroupDefinition, false);
         assertTrue("check group type added", addGroupTypeResult.isLeft());
         
-        Either<GroupTypeData, TitanOperationStatus> groupTypeResult = titanDao.getNode(GraphPropertiesDictionary.TYPE.getProperty(), rootGroupDefinition.getType(), GroupTypeData.class);
+        Either<GroupTypeData, JanusGraphOperationStatus> groupTypeResult = janusGraphDao
+            .getNode(GraphPropertiesDictionary.TYPE.getProperty(), rootGroupDefinition.getType(), GroupTypeData.class);
         return extractVal(groupTypeResult);        
     }
     
@@ -603,11 +615,11 @@ public class GroupTypeOperationTest extends ModelTestBase {
         assertEquals(expected.getDescription(), actual.getDescription());
     }
     
-    private <T> void validate(Either<T, TitanOperationStatus> result) {
+    private <T> void validate(Either<T, JanusGraphOperationStatus> result) {
         extractVal(result);
     }
     
-    private <T> T extractVal(Either<T, TitanOperationStatus> result) {
+    private <T> T extractVal(Either<T, JanusGraphOperationStatus> result) {
         assertTrue(result.isLeft());
         T t = result.left().value();
         assertNotNull(t);
@@ -616,19 +628,19 @@ public class GroupTypeOperationTest extends ModelTestBase {
     }
 
     private void cleanUp() {
-        Either<TitanGraph, TitanOperationStatus> graphResult = titanDao.getGraph();
-        TitanGraph graph = graphResult.left().value();
+        Either<JanusGraph, JanusGraphOperationStatus> graphResult = janusGraphDao.getGraph();
+        JanusGraph graph = graphResult.left().value();
 
-        Iterable<TitanVertex> vertices = graph.query().vertices();
+        Iterable<JanusGraphVertex> vertices = graph.query().vertices();
         if (vertices != null) {
-            Iterator<TitanVertex> iterator = vertices.iterator();
+            Iterator<JanusGraphVertex> iterator = vertices.iterator();
             while (iterator.hasNext()) {
-                TitanVertex vertex = iterator.next();
+                JanusGraphVertex vertex = iterator.next();
                 vertex.remove();
             }
 
         }
-        titanDao.commit();
+        janusGraphDao.commit();
     }
 
 
@@ -764,17 +776,19 @@ public class GroupTypeOperationTest extends ModelTestBase {
     }
 
     private void verifyDerivedFromNodeEqualsToRootGroupType(GroupTypeDefinition rootGroupType, String parentGroupId) {
-        Either<ImmutablePair<GroupTypeData, GraphEdge>, TitanOperationStatus> derivedFromRelation = titanDao.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.GroupType), parentGroupId, GraphEdgeLabels.DERIVED_FROM,
+        Either<ImmutablePair<GroupTypeData, GraphEdge>, JanusGraphOperationStatus> derivedFromRelation = janusGraphDao
+            .getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.GroupType), parentGroupId, GraphEdgeLabels.DERIVED_FROM,
                 NodeTypeEnum.GroupType, GroupTypeData.class);
         assertThat(derivedFromRelation.left().value().getLeft().getGroupTypeDataDefinition())
                 .isEqualToComparingFieldByField(rootGroupType);
     }
 
     private void verifyDerivedFromRelationDoesntExist(String parentGroupId) {
-        Either<ImmutablePair<GroupTypeData, GraphEdge>, TitanOperationStatus> derivedFromRelation = titanDao.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.GroupType), parentGroupId, GraphEdgeLabels.DERIVED_FROM,
+        Either<ImmutablePair<GroupTypeData, GraphEdge>, JanusGraphOperationStatus> derivedFromRelation = janusGraphDao
+            .getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.GroupType), parentGroupId, GraphEdgeLabels.DERIVED_FROM,
                 NodeTypeEnum.GroupType, GroupTypeData.class);
         assertThat(derivedFromRelation.right().value())
-                .isEqualTo(TitanOperationStatus.NOT_FOUND);
+                .isEqualTo(JanusGraphOperationStatus.NOT_FOUND);
     }
 
     private GroupTypeDefinition createGroupTypeDef() {
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/HeatParametersOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/HeatParametersOperationTest.java
index 61504db727..958f7c878b 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/HeatParametersOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/HeatParametersOperationTest.java
@@ -26,9 +26,9 @@ import org.junit.Test;
 import org.mockito.Mockito;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphNode;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.HeatParameterDefinition;
 import org.openecomp.sdc.be.model.ModelTestBase;
@@ -48,11 +48,11 @@ public class HeatParametersOperationTest extends ModelTestBase {
 
     HeatParametersOperation heatParametersOperation = new HeatParametersOperation();
 
-    TitanGenericDao titanGenericDao = Mockito.mock(TitanGenericDao.class);
+    JanusGraphGenericDao janusGraphGenericDao = Mockito.mock(JanusGraphGenericDao.class);
 
     @Before
     public void setup() {
-        heatParametersOperation.setTitanGenericDao(titanGenericDao);
+        heatParametersOperation.setJanusGraphGenericDao(janusGraphGenericDao);
 
     }
 
@@ -64,15 +64,15 @@ public class HeatParametersOperationTest extends ModelTestBase {
 
         HeatParameterData propertyData = new HeatParameterData(property);
 
-        Either<HeatParameterData, TitanOperationStatus> either = Either.left(propertyData);
+        Either<HeatParameterData, JanusGraphOperationStatus> either = Either.left(propertyData);
 
         GraphRelation graphRelation = new GraphRelation();
-        Either<GraphRelation, TitanOperationStatus> relationResult = Either.left(graphRelation);
+        Either<GraphRelation, JanusGraphOperationStatus> relationResult = Either.left(graphRelation);
 
-        when(titanGenericDao.createNode(any(HeatParameterData.class), eq(HeatParameterData.class))).thenReturn(either);
-        when(titanGenericDao.createRelation(any(GraphNode.class), any(GraphNode.class), eq(GraphEdgeLabels.HEAT_PARAMETER), anyMap())).thenReturn(relationResult);
+        when(janusGraphGenericDao.createNode(any(HeatParameterData.class), eq(HeatParameterData.class))).thenReturn(either);
+        when(janusGraphGenericDao.createRelation(any(GraphNode.class), any(GraphNode.class), eq(GraphEdgeLabels.HEAT_PARAMETER), anyMap())).thenReturn(relationResult);
 
-        Either<HeatParameterData, TitanOperationStatus> result = heatParametersOperation.addPropertyToGraph(propName, property, "resourceId.artifactId", NodeTypeEnum.ArtifactRef);
+        Either<HeatParameterData, JanusGraphOperationStatus> result = heatParametersOperation.addPropertyToGraph(propName, property, "resourceId.artifactId", NodeTypeEnum.ArtifactRef);
 
         assertTrue(result.isLeft());
 
@@ -91,13 +91,13 @@ public class HeatParametersOperationTest extends ModelTestBase {
 
         HeatParameterData propertyData = new HeatParameterData(property);
 
-        Either<HeatParameterData, TitanOperationStatus> either = Either.left(propertyData);
+        Either<HeatParameterData, JanusGraphOperationStatus> either = Either.left(propertyData);
 
         GraphRelation graphRelation = new GraphRelation();
-        Either<GraphRelation, TitanOperationStatus> relationResult = Either.left(graphRelation);
+        Either<GraphRelation, JanusGraphOperationStatus> relationResult = Either.left(graphRelation);
 
-        when(titanGenericDao.createNode(any(HeatParameterData.class), eq(HeatParameterData.class))).thenReturn(either);
-        when(titanGenericDao.createRelation(any(GraphNode.class), any(GraphNode.class), eq(GraphEdgeLabels.HEAT_PARAMETER), anyMap())).thenReturn(relationResult);
+        when(janusGraphGenericDao.createNode(any(HeatParameterData.class), eq(HeatParameterData.class))).thenReturn(either);
+        when(janusGraphGenericDao.createRelation(any(GraphNode.class), any(GraphNode.class), eq(GraphEdgeLabels.HEAT_PARAMETER), anyMap())).thenReturn(relationResult);
 
         StorageOperationStatus result = heatParametersOperation.addPropertiesToGraph(parameters, "resourceId.artifactId", NodeTypeEnum.ArtifactRef);
 
@@ -222,16 +222,16 @@ public class HeatParametersOperationTest extends ModelTestBase {
         propertyData.setUniqueId("bla");
         propertyData.setValue("value1");
 
-        Either<HeatParameterValueData, TitanOperationStatus> either = Either.left(propertyData);
+        Either<HeatParameterValueData, JanusGraphOperationStatus> either = Either.left(propertyData);
 
         GraphRelation graphRelation = new GraphRelation();
-        Either<GraphRelation, TitanOperationStatus> relationResult = Either.left(graphRelation);
+        Either<GraphRelation, JanusGraphOperationStatus> relationResult = Either.left(graphRelation);
 
-        when(titanGenericDao.createNode(any(HeatParameterValueData.class), eq(HeatParameterValueData.class))).thenReturn(either);
-        when(titanGenericDao.createRelation(any(GraphNode.class), any(GraphNode.class), eq(GraphEdgeLabels.PARAMETER_VALUE), anyMap())).thenReturn(relationResult);
-        when(titanGenericDao.createRelation(any(GraphNode.class), any(GraphNode.class), eq(GraphEdgeLabels.PARAMETER_IMPL), isNull())).thenReturn(relationResult);
+        when(janusGraphGenericDao.createNode(any(HeatParameterValueData.class), eq(HeatParameterValueData.class))).thenReturn(either);
+        when(janusGraphGenericDao.createRelation(any(GraphNode.class), any(GraphNode.class), eq(GraphEdgeLabels.PARAMETER_VALUE), anyMap())).thenReturn(relationResult);
+        when(janusGraphGenericDao.createRelation(any(GraphNode.class), any(GraphNode.class), eq(GraphEdgeLabels.PARAMETER_IMPL), isNull())).thenReturn(relationResult);
 
-        Either<HeatParameterValueData, TitanOperationStatus> result = heatParametersOperation.addHeatValueToGraph(property, "artifactLabel", "resourceInstanceId.artifactId", "resourceInstanceId");
+        Either<HeatParameterValueData, JanusGraphOperationStatus> result = heatParametersOperation.addHeatValueToGraph(property, "artifactLabel", "resourceInstanceId.artifactId", "resourceInstanceId");
 
         assertTrue(result.isLeft());
 
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/InterfaceLifecycleOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/InterfaceLifecycleOperationTest.java
index 3e8b087fb2..532e76bba8 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/InterfaceLifecycleOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/InterfaceLifecycleOperationTest.java
@@ -33,8 +33,8 @@ import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.ArtifactDefinition;
@@ -72,7 +72,7 @@ public class InterfaceLifecycleOperationTest {
     private static String USER_ID = "muUserId";
     private static String CATEGORY_NAME = "category/mycategory";
 
-    TitanGenericDao titanGenericDao = Mockito.mock(TitanGenericDao.class);
+    JanusGraphGenericDao janusGraphGenericDao = Mockito.mock(JanusGraphGenericDao.class);
     @InjectMocks
     private InterfaceLifecycleOperation interfaceLifecycleOperation = new InterfaceLifecycleOperation();
 
@@ -87,7 +87,7 @@ public class InterfaceLifecycleOperationTest {
         MockitoAnnotations.initMocks(this);
         final String UNIQUE_ID = "UNIQUE_ID";
         CategoryData categoryData = new CategoryData(NodeTypeEnum.ResourceCategory);
-        when(titanGenericDao.createNode(any(),any())).thenReturn(Either.left(categoryData));
+        when(janusGraphGenericDao.createNode(any(),any())).thenReturn(Either.left(categoryData));
         deleteAndCreateCategory(CATEGORY_NAME);
         deleteAndCreateUser(USER_ID, "first_" + USER_ID, "last_" + USER_ID);
     }
@@ -124,7 +124,7 @@ public class InterfaceLifecycleOperationTest {
         String reqRelationship = "myrelationship";
 
         ResourceOperationTest resourceOperationTest = new ResourceOperationTest();
-        resourceOperationTest.setOperations(titanDao, resourceOperation, propertyOperation);
+        resourceOperationTest.setOperations(janusGraphDao, resourceOperation, propertyOperation);
 
         Resource rootResource = resourceOperationTest.createResource(USER_ID, CATEGORY_NAME, rootName, "100.0", null, true, true);
 
@@ -161,7 +161,7 @@ public class InterfaceLifecycleOperationTest {
         String softwareCompName = "tosca.nodes.SoftwareComponent";
 
         ResourceOperationTest resourceOperationTest = new ResourceOperationTest();
-        resourceOperationTest.setOperations(titanDao, resourceOperation, propertyOperation);
+        resourceOperationTest.setOperations(janusGraphDao, resourceOperation, propertyOperation);
 
         Resource rootResource = resourceOperationTest.createResource(USER_ID, CATEGORY_NAME, rootName, "200.0", null, true, true);
 
@@ -178,7 +178,7 @@ public class InterfaceLifecycleOperationTest {
         ResourceMetadataData resourceData = new ResourceMetadataData();
         resourceData.getMetadataDataDefinition().setUniqueId(rootResource.getUniqueId());
         resourceData.getMetadataDataDefinition().setState(LifecycleStateEnum.CERTIFIED.name());
-        Either<ResourceMetadataData, TitanOperationStatus> updateNode = titanDao.updateNode(resourceData, ResourceMetadataData.class);
+        Either<ResourceMetadataData, JanusGraphOperationStatus> updateNode = janusGraphDao.updateNode(resourceData, ResourceMetadataData.class);
         assertTrue(updateNode.isLeft());
 
         Either<Resource, StorageOperationStatus> fetchRootResource = resourceOperation.getResource(rootResource.getUniqueId());
@@ -198,7 +198,7 @@ public class InterfaceLifecycleOperationTest {
 
         Either<Operation, StorageOperationStatus> opResult = interfaceOperation.updateInterfaceOperation(softwareComponent.getUniqueId(), "standard", "create", op);
         // PrintGraph pg = new PrintGraph();
-        // System.out.println(pg.buildGraphForWebgraphWiz(titanDao.getGraph().left().value()));
+        // System.out.println(pg.buildGraphForWebgraphWiz(janusGraphDao.getGraph().left().value()));
         assertTrue(opResult.isLeft());
         log.debug("{}", opResult.left().value());
 
@@ -247,12 +247,12 @@ public class InterfaceLifecycleOperationTest {
 
     private void deleteAndCreateCategory(String category) {
         String[] names = category.split("/");
-        OperationTestsUtil.deleteAndCreateResourceCategory(names[0], names[1], titanGenericDao);
+        OperationTestsUtil.deleteAndCreateResourceCategory(names[0], names[1], janusGraphGenericDao);
 
         /*
          * CategoryData categoryData = new CategoryData(); categoryData.setName(category);
          *
-         * titanDao.deleteNode(categoryData, CategoryData.class); Either<CategoryData, TitanOperationStatus> createNode = titanDao .createNode(categoryData, CategoryData.class); System.out.println("after creating caetgory " + createNode);
+         * janusGraphDao.deleteNode(categoryData, CategoryData.class); Either<CategoryData, JanusGraphOperationStatus> createNode = janusGraphDao .createNode(categoryData, CategoryData.class); System.out.println("after creating caetgory " + createNode);
          */
 
     }
@@ -263,18 +263,18 @@ public class InterfaceLifecycleOperationTest {
         userData.setFirstName(firstName);
         userData.setLastName(lastName);
 
-        titanGenericDao.deleteNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.User), userId,
+        janusGraphGenericDao.deleteNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.User), userId,
             UserData.class);
-        titanGenericDao.createNode(userData, UserData.class);
-        titanGenericDao.commit();
+        janusGraphGenericDao.createNode(userData, UserData.class);
+        janusGraphGenericDao.commit();
 
         return userData;
     }
 
     @Test
     public void testGetAllInterfaceLifecycleTypes_TypesNotFound() {
-        when(titanGenericDao.getByCriteria(NodeTypeEnum.Interface, Collections.emptyMap(),
-            InterfaceData.class)).thenReturn(Either.right(TitanOperationStatus.NOT_FOUND));
+        when(janusGraphGenericDao.getByCriteria(NodeTypeEnum.Interface, Collections.emptyMap(),
+            InterfaceData.class)).thenReturn(Either.right(JanusGraphOperationStatus.NOT_FOUND));
         Either<Map<String, InterfaceDefinition>, StorageOperationStatus> types = interfaceLifecycleOperation.getAllInterfaceLifecycleTypes();
         Assert.assertEquals(types.isRight(), Boolean.TRUE);
     }
@@ -288,12 +288,13 @@ public class InterfaceLifecycleOperationTest {
         interfaceData.getInterfaceDataDefinition().setType(TYPE);
         List<InterfaceData> interfaceDataList = new ArrayList<>();
         interfaceDataList.add(interfaceData);
-        Either<List<InterfaceData>, TitanOperationStatus> allInterfaceTypes = Either.left(interfaceDataList);
-        when(titanGenericDao.getByCriteria(NodeTypeEnum.Interface, Collections.emptyMap(), InterfaceData.class)).thenReturn(allInterfaceTypes);
+        Either<List<InterfaceData>, JanusGraphOperationStatus> allInterfaceTypes = Either.left(interfaceDataList);
+        when(janusGraphGenericDao
+            .getByCriteria(NodeTypeEnum.Interface, Collections.emptyMap(), InterfaceData.class)).thenReturn(allInterfaceTypes);
 
         List<ImmutablePair<OperationData, GraphEdge>> list = new ArrayList<>();
-        Either<List<ImmutablePair<OperationData, GraphEdge>>, TitanOperationStatus> childrenNodes = Either.left(list);
-        when(titanGenericDao.getChildrenNodes(interfaceData.getUniqueIdKey(), interfaceData.getUniqueId(), GraphEdgeLabels.INTERFACE_OPERATION, NodeTypeEnum.InterfaceOperation, OperationData.class)).thenReturn(childrenNodes);
+        Either<List<ImmutablePair<OperationData, GraphEdge>>, JanusGraphOperationStatus> childrenNodes = Either.left(list);
+        when(janusGraphGenericDao.getChildrenNodes(interfaceData.getUniqueIdKey(), interfaceData.getUniqueId(), GraphEdgeLabels.INTERFACE_OPERATION, NodeTypeEnum.InterfaceOperation, OperationData.class)).thenReturn(childrenNodes);
 
         Either<Map<String, InterfaceDefinition>, StorageOperationStatus> types = interfaceLifecycleOperation.getAllInterfaceLifecycleTypes();
         Assert.assertEquals(types.left().value().size(),1);
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/PolicyTypeOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/PolicyTypeOperationTest.java
index ef1025f77e..f5197f05c5 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/PolicyTypeOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/PolicyTypeOperationTest.java
@@ -26,8 +26,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import com.thinkaurelius.titan.core.TitanGraph;
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraph;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import java.util.Iterator;
 import java.util.List;
@@ -39,10 +39,10 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
-import org.openecomp.sdc.be.dao.titan.HealingTitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.HealingJanusGraphGenericDao;
 import org.openecomp.sdc.be.datatypes.elements.PolicyTypeDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.ModelTestBase;
@@ -64,7 +64,7 @@ public class PolicyTypeOperationTest extends ModelTestBase {
     private PolicyTypeOperation policyTypeOperation;
 
     @Autowired
-    private HealingTitanGenericDao titanGenericDao;
+    private HealingJanusGraphGenericDao janusGraphGenericDao;
 
     @BeforeClass
     public static void setupBeforeClass() {
@@ -74,20 +74,20 @@ public class PolicyTypeOperationTest extends ModelTestBase {
 
     @Before
     public void cleanUp() {
-        TitanGenericDao titanGenericDao = policyTypeOperation.titanGenericDao;
-        Either<TitanGraph, TitanOperationStatus> graphResult = titanGenericDao.getGraph();
-        TitanGraph graph = graphResult.left().value();
+        JanusGraphGenericDao janusGraphGenericDao = policyTypeOperation.janusGraphGenericDao;
+        Either<JanusGraph, JanusGraphOperationStatus> graphResult = janusGraphGenericDao.getGraph();
+        JanusGraph graph = graphResult.left().value();
 
-        Iterable<TitanVertex> vertices = graph.query().vertices();
+        Iterable<JanusGraphVertex> vertices = graph.query().vertices();
         if (vertices != null) {
-            Iterator<TitanVertex> iterator = vertices.iterator();
+            Iterator<JanusGraphVertex> iterator = vertices.iterator();
             while (iterator.hasNext()) {
-                TitanVertex vertex = iterator.next();
+                JanusGraphVertex vertex = iterator.next();
                 vertex.remove();
             }
 
         }
-        titanGenericDao.commit();
+        janusGraphGenericDao.commit();
     }
 
     @Test
@@ -310,17 +310,17 @@ public class PolicyTypeOperationTest extends ModelTestBase {
     }
 
     private void verifyDerivedFromNodeEqualsToRootPolicyType(PolicyTypeDefinition rootPolicyType, String parentPolicyId) {
-        Either<ImmutablePair<PolicyTypeData, GraphEdge>, TitanOperationStatus> derivedFromRelation = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.PolicyType), parentPolicyId, GraphEdgeLabels.DERIVED_FROM,
+        Either<ImmutablePair<PolicyTypeData, GraphEdge>, JanusGraphOperationStatus> derivedFromRelation = janusGraphGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.PolicyType), parentPolicyId, GraphEdgeLabels.DERIVED_FROM,
                 NodeTypeEnum.PolicyType, PolicyTypeData.class);
         assertThat(derivedFromRelation.left().value().getLeft().getPolicyTypeDataDefinition())
                 .isEqualToComparingFieldByField(rootPolicyType);
     }
 
     private void verifyDerivedFromRelationDoesntExist(String parentPolicyId) {
-        Either<ImmutablePair<PolicyTypeData, GraphEdge>, TitanOperationStatus> derivedFromRelation = titanGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.PolicyType), parentPolicyId, GraphEdgeLabels.DERIVED_FROM,
+        Either<ImmutablePair<PolicyTypeData, GraphEdge>, JanusGraphOperationStatus> derivedFromRelation = janusGraphGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.PolicyType), parentPolicyId, GraphEdgeLabels.DERIVED_FROM,
                 NodeTypeEnum.PolicyType, PolicyTypeData.class);
         assertThat(derivedFromRelation.right().value())
-                .isEqualTo(TitanOperationStatus.NOT_FOUND);
+                .isEqualTo(JanusGraphOperationStatus.NOT_FOUND);
     }
 
     private PolicyTypeDefinition createRootPolicyTypeOnGraph() {
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperationTest.java
index ae428bdaff..8535c3a9f3 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperationTest.java
@@ -20,17 +20,17 @@
 
 package org.openecomp.sdc.be.model.operations.impl;
 
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.sdc.be.dao.titan.HealingTitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanGraphClient;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.HealingJanusGraphGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphClient;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.PropertyRule;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
@@ -51,13 +51,13 @@ import static org.junit.Assert.*;
 
 public class PropertyOperationTest extends ModelTestBase {
 
-    HealingTitanGenericDao titanGenericDao = Mockito.mock(HealingTitanGenericDao.class);
+    HealingJanusGraphGenericDao janusGraphGenericDao = Mockito.mock(HealingJanusGraphGenericDao.class);
 
-    PropertyOperation propertyOperation = new PropertyOperation(titanGenericDao, null);
+    PropertyOperation propertyOperation = new PropertyOperation(janusGraphGenericDao, null);
 
     @Before
     public void setup() {
-        propertyOperation.setTitanGenericDao(titanGenericDao);
+        propertyOperation.setJanusGraphGenericDao(janusGraphGenericDao);
 
     }
 
@@ -68,10 +68,10 @@ public class PropertyOperationTest extends ModelTestBase {
      *
      * PropertyData propertyData = new PropertyData(property, propertyOperation.convertConstraintsToString(constraints));
      *
-     * Either<PropertyData, TitanOperationStatus> either = Either.left(propertyData); //when(propertyDao.create((GraphNeighbourTable)anyObject(), eq(PropertyData.class), eq(NodeTypeEnum.Property))).thenReturn(either); GraphRelation graphRelation =
-     * new GraphRelation(); Either<GraphRelation, TitanOperationStatus> relationResult = Either.left(graphRelation);
+     * Either<PropertyData, JanusGraphOperationStatus> either = Either.left(propertyData); //when(propertyDao.create((GraphNeighbourTable)anyObject(), eq(PropertyData.class), eq(NodeTypeEnum.Property))).thenReturn(either); GraphRelation graphRelation =
+     * new GraphRelation(); Either<GraphRelation, JanusGraphOperationStatus> relationResult = Either.left(graphRelation);
      *
-     * when(titanGenericDao.createNode((PropertyData)anyObject(), eq(PropertyData.class))).thenReturn(either); when(titanGenericDao.createRelation((GraphNode)anyObject(), (GraphNode)anyObject(), eq(GraphEdgeLabels.PROPERTY),
+     * when(janusGraphGenericDao.createNode((PropertyData)anyObject(), eq(PropertyData.class))).thenReturn(either); when(janusGraphGenericDao.createRelation((GraphNode)anyObject(), (GraphNode)anyObject(), eq(GraphEdgeLabels.PROPERTY),
      * anyMap())).thenReturn(relationResult);
      *
      * Either<PropertyDefinition, StorageOperationStatus> result = propertyOperation.addPropertyToResource(propName, property, NodeTypeEnum.Resource, "my-resource.1.0");
@@ -512,7 +512,7 @@ public class PropertyOperationTest extends ModelTestBase {
 	}
 
 	private PropertyOperation createTestSubject() {
-		return new PropertyOperation(new HealingTitanGenericDao(new TitanGraphClient()), null);
+		return new PropertyOperation(new HealingJanusGraphGenericDao(new JanusGraphClient()), null);
 	}
 
 	
@@ -572,7 +572,7 @@ public class PropertyOperationTest extends ModelTestBase {
 		String propertyName = "";
 		PropertyDefinition propertyDefinition = new PropertyDefinition();
 		String resourceId = "";
-		Either<PropertyData, TitanOperationStatus> result;
+		Either<PropertyData, JanusGraphOperationStatus> result;
 
 		// default test
 		testSubject = createTestSubject();
@@ -583,11 +583,11 @@ public class PropertyOperationTest extends ModelTestBase {
 	@Test
 	public void testAddPropertyToGraphByVertex() throws Exception {
 		PropertyOperation testSubject;
-		TitanVertex metadataVertex = null;
+		JanusGraphVertex metadataVertex = null;
 		String propertyName = "";
 		PropertyDefinition propertyDefinition = new PropertyDefinition();
 		String resourceId = "";
-		TitanOperationStatus result;
+		JanusGraphOperationStatus result;
 
 		// default test
 		testSubject = createTestSubject();
@@ -596,20 +596,20 @@ public class PropertyOperationTest extends ModelTestBase {
 
 	
 	@Test
-	public void testGetTitanGenericDao() throws Exception {
+	public void testGetJanusGraphGenericDao() throws Exception {
 		PropertyOperation testSubject;
-		TitanGenericDao result;
+		JanusGraphGenericDao result;
 
 		// default test
 		testSubject = createTestSubject();
-		result = testSubject.getTitanGenericDao();
+		result = testSubject.getJanusGraphGenericDao();
 	}
 
 	@Test
 	public void testDeletePropertyFromGraph() throws Exception {
 		PropertyOperation testSubject;
 		String propertyId = "";
-		Either<PropertyData, TitanOperationStatus> result;
+		Either<PropertyData, JanusGraphOperationStatus> result;
 
 		// default test
 		testSubject = createTestSubject();
@@ -636,7 +636,7 @@ public class PropertyOperationTest extends ModelTestBase {
 		PropertyOperation testSubject;
 		String propertyId = "";
 		PropertyDefinition propertyDefinition = null;
-		Either<PropertyData, TitanOperationStatus> result;
+		Either<PropertyData, JanusGraphOperationStatus> result;
 
 		// default test
 		testSubject = createTestSubject();
@@ -645,14 +645,14 @@ public class PropertyOperationTest extends ModelTestBase {
 
 
 	@Test
-	public void testSetTitanGenericDao()  {
+	public void testSetJanusGraphGenericDao()  {
 
 		PropertyOperation testSubject;
-        HealingTitanGenericDao titanGenericDao = null;
+        HealingJanusGraphGenericDao janusGraphGenericDao = null;
 
 		// default test
 		testSubject = createTestSubject();
-		testSubject.setTitanGenericDao(titanGenericDao);
+		testSubject.setJanusGraphGenericDao(janusGraphGenericDao);
 	}
 
 	
@@ -663,7 +663,7 @@ public class PropertyOperationTest extends ModelTestBase {
 		PropertyDefinition propertyDefinition = new PropertyDefinition();
 		NodeTypeEnum nodeType = NodeTypeEnum.Attribute;
 		String uniqueId = "";
-		Either<PropertyData, TitanOperationStatus> result;
+		Either<PropertyData, JanusGraphOperationStatus> result;
 
 		// default test
 		testSubject = createTestSubject();
@@ -676,7 +676,7 @@ public class PropertyOperationTest extends ModelTestBase {
 		PropertyOperation testSubject;
 		NodeTypeEnum nodeType = null;
 		String uniqueId = "";
-		Either<Map<String, PropertyDefinition>, TitanOperationStatus> result;
+		Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> result;
 
 		// default test
 		testSubject = createTestSubject();
@@ -760,7 +760,7 @@ public class PropertyOperationTest extends ModelTestBase {
 		PropertyOperation testSubject;
 		String resourceInstanceId = "";
 		String propertyId = "";
-		ImmutablePair<TitanOperationStatus, String> result;
+		ImmutablePair<JanusGraphOperationStatus, String> result;
 
 		// default test
 		testSubject = createTestSubject();
@@ -785,7 +785,7 @@ public class PropertyOperationTest extends ModelTestBase {
 	public void testGetAllPropertiesOfResourceInstanceOnlyPropertyDefId() throws Exception {
 		PropertyOperation testSubject;
 		String resourceInstanceUid = "";
-		Either<List<ComponentInstanceProperty>, TitanOperationStatus> result;
+		Either<List<ComponentInstanceProperty>, JanusGraphOperationStatus> result;
 
 		// default test
 		testSubject = createTestSubject();
@@ -798,7 +798,7 @@ public class PropertyOperationTest extends ModelTestBase {
 		PropertyOperation testSubject;
 		String propertyValueUid = "";
 		String resourceInstanceId = "";
-		Either<PropertyValueData, TitanOperationStatus> result;
+		Either<PropertyValueData, JanusGraphOperationStatus> result;
 
 		// default test
 		testSubject = createTestSubject();
@@ -882,7 +882,7 @@ public class PropertyOperationTest extends ModelTestBase {
 		PropertyOperation testSubject;
 		String resourceInstanceUid = "";
 		NodeTypeEnum instanceNodeType = null;
-		Either<List<ComponentInstanceProperty>, TitanOperationStatus> result;
+		Either<List<ComponentInstanceProperty>, JanusGraphOperationStatus> result;
 
 		// default test
 		testSubject = createTestSubject();
@@ -896,7 +896,7 @@ public class PropertyOperationTest extends ModelTestBase {
 		List<String> pathOfComponentInstances = null;
 		String propertyUniqueId = "";
 		String defaultValue = "";
-		Either<String, TitanOperationStatus> result;
+		Either<String, JanusGraphOperationStatus> result;
 
 		// test 1
 		testSubject = createTestSubject();
@@ -927,7 +927,7 @@ public class PropertyOperationTest extends ModelTestBase {
 	public void testGetDataTypeByUid() throws Exception {
 		PropertyOperation testSubject;
 		String uniqueId = "";
-		Either<DataTypeDefinition, TitanOperationStatus> result;
+		Either<DataTypeDefinition, JanusGraphOperationStatus> result;
 
 		// default test
 		testSubject = createTestSubject();
@@ -988,7 +988,7 @@ public class PropertyOperationTest extends ModelTestBase {
 	public void testGetDataTypeByUidWithoutDerivedDataTypes() throws Exception {
 		PropertyOperation testSubject;
 		String uniqueId = "";
-		Either<DataTypeDefinition, TitanOperationStatus> result;
+		Either<DataTypeDefinition, JanusGraphOperationStatus> result;
 
 		// default test
 		testSubject = createTestSubject();
@@ -1000,7 +1000,7 @@ public class PropertyOperationTest extends ModelTestBase {
 	public void testIsDefinedInDataTypes() throws Exception {
 		PropertyOperation testSubject;
 		String propertyType = "";
-		Either<Boolean, TitanOperationStatus> result;
+		Either<Boolean, JanusGraphOperationStatus> result;
 
 		// default test
 		testSubject = createTestSubject();
@@ -1011,7 +1011,7 @@ public class PropertyOperationTest extends ModelTestBase {
 	@Test
 	public void testGetAllDataTypes() throws Exception {
 		PropertyOperation testSubject;
-		Either<Map<String, DataTypeDefinition>, TitanOperationStatus> result;
+		Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> result;
 
 		// default test
 		testSubject = createTestSubject();
@@ -1023,7 +1023,7 @@ public class PropertyOperationTest extends ModelTestBase {
 	public void testCheckInnerType() throws Exception {
 		PropertyOperation testSubject;
 		PropertyDataDefinition propDataDef = new PropertyDataDefinition();
-		Either<String, TitanOperationStatus> result;
+		Either<String, JanusGraphOperationStatus> result;
 
 		// default test
 		testSubject = createTestSubject();
@@ -1034,7 +1034,7 @@ public class PropertyOperationTest extends ModelTestBase {
 	@Test
 	public void testGetAllDataTypeNodes() throws Exception {
 		PropertyOperation testSubject;
-		Either<List<DataTypeData>, TitanOperationStatus> result;
+		Either<List<DataTypeData>, JanusGraphOperationStatus> result;
 
 		// default test
 		testSubject = createTestSubject();
@@ -1083,7 +1083,7 @@ public class PropertyOperationTest extends ModelTestBase {
 		String uniqueId = "";
 		NodeTypeEnum elementType = null;
 		List<PropertyDefinition> properties = null;
-		Either<Map<String, PropertyData>, TitanOperationStatus> result;
+		Either<Map<String, PropertyData>, JanusGraphOperationStatus> result;
 
 		// test 1
 		testSubject = createTestSubject();
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/RelationshipTypeOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/RelationshipTypeOperationTest.java
index 3d60a650f3..30463e9982 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/RelationshipTypeOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/RelationshipTypeOperationTest.java
@@ -44,9 +44,8 @@ import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.mockito.Spy;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation;
-import org.openecomp.sdc.be.dao.titan.HealingTitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.HealingJanusGraphGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.RelationshipInstDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.ModelTestBase;
@@ -70,7 +69,7 @@ public class RelationshipTypeOperationTest extends ModelTestBase {
     private static final String PROP = "prop";
 
     @Mock
-    HealingTitanGenericDao titanGenericDao;
+    HealingJanusGraphGenericDao janusGraphGenericDao;
 
     @Mock
     PropertyOperation propertyOperation;
@@ -101,16 +100,16 @@ public class RelationshipTypeOperationTest extends ModelTestBase {
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
 
-        Mockito.doReturn(TitanOperationStatus.OK).when(titanGenericDao).commit();
-        Mockito.doReturn(TitanOperationStatus.OK).when(titanGenericDao).rollback();
+        Mockito.doReturn(JanusGraphOperationStatus.OK).when(janusGraphGenericDao).commit();
+        Mockito.doReturn(JanusGraphOperationStatus.OK).when(janusGraphGenericDao).rollback();
     }
 
     @Test
     public void getRelationshipTypeByNameNotCreated() {
-        Mockito.doReturn(Either.right(TitanOperationStatus.NOT_CREATED))
+        Mockito.doReturn(Either.right(JanusGraphOperationStatus.NOT_CREATED))
                 .when(relationshipTypeOperation).getRelationshipTypeByUid(Mockito.anyString());
 
-        Either<RelationshipTypeDefinition, TitanOperationStatus> either =
+        Either<RelationshipTypeDefinition, JanusGraphOperationStatus> either =
                 relationshipTypeOperation.getRelationshipTypeByName("name");
         assertTrue(either.isRight());
     }
@@ -122,7 +121,7 @@ public class RelationshipTypeOperationTest extends ModelTestBase {
 
     @Test
     public void testAddRelationshipTypeValidationFailStatusNullInTransactionFalse() {
-        Mockito.doReturn(Either.right(TitanOperationStatus.NOT_CONNECTED))
+        Mockito.doReturn(Either.right(JanusGraphOperationStatus.NOT_CONNECTED))
                 .when(propertyOperation)
                 .getAllTypePropertiesFromAllDerivedFrom(Mockito.anyString(), Mockito.any(), Mockito.any());
 
@@ -137,7 +136,7 @@ public class RelationshipTypeOperationTest extends ModelTestBase {
     public void testAddRelationshipTypeValidationFailStatusPropertiesReturnedInTransactionFalse() {
         Mockito.doReturn(Either.left(Collections.singletonMap("prop1", new PropertyDefinition()))).when(propertyOperation)
                 .getAllTypePropertiesFromAllDerivedFrom(Mockito.anyString(), Mockito.any(), Mockito.any());
-        Mockito.doReturn(Either.right(TitanOperationStatus.NOT_FOUND)).when(propertyOperation)
+        Mockito.doReturn(Either.right(JanusGraphOperationStatus.NOT_FOUND)).when(propertyOperation)
                 .validatePropertiesUniqueness(Mockito.any(), Mockito.any());
 
         Either<RelationshipTypeDefinition, StorageOperationStatus> addRelationshipType =
@@ -148,20 +147,22 @@ public class RelationshipTypeOperationTest extends ModelTestBase {
 
     @Test
     public void testGetAllRelationshipTypesNotFound() {
-        Mockito.doReturn(Either.right(TitanOperationStatus.NOT_FOUND)).when(titanGenericDao).getByCriteria(NodeTypeEnum.RelationshipType, null,
+        Mockito.doReturn(Either.right(JanusGraphOperationStatus.NOT_FOUND)).when(
+            janusGraphGenericDao).getByCriteria(NodeTypeEnum.RelationshipType, null,
                 RelationshipTypeData.class);
-        Either<Map<String, RelationshipTypeDefinition>, TitanOperationStatus> either = relationshipTypeOperation.getAllRelationshipTypes();
+        Either<Map<String, RelationshipTypeDefinition>, JanusGraphOperationStatus> either = relationshipTypeOperation.getAllRelationshipTypes();
 
         assertTrue(either.isLeft() && MapUtils.isEmpty(either.left().value()));
     }
 
     @Test
     public void testGetAllRelationshipTypesNotConnnected() {
-        Mockito.doReturn(Either.right(TitanOperationStatus.NOT_CONNECTED)).when(titanGenericDao).getByCriteria(NodeTypeEnum.RelationshipType, null,
+        Mockito.doReturn(Either.right(JanusGraphOperationStatus.NOT_CONNECTED)).when(
+            janusGraphGenericDao).getByCriteria(NodeTypeEnum.RelationshipType, null,
                 RelationshipTypeData.class);
-        Either<Map<String, RelationshipTypeDefinition>, TitanOperationStatus> either = relationshipTypeOperation.getAllRelationshipTypes();
+        Either<Map<String, RelationshipTypeDefinition>, JanusGraphOperationStatus> either = relationshipTypeOperation.getAllRelationshipTypes();
 
-        assertTrue(either.isRight() && TitanOperationStatus.NOT_CONNECTED == either.right().value());
+        assertTrue(either.isRight() && JanusGraphOperationStatus.NOT_CONNECTED == either.right().value());
     }
 
     @Test
@@ -177,10 +178,10 @@ public class RelationshipTypeOperationTest extends ModelTestBase {
         relationshipTypeDataList.add(relationshipTypeData1);
 
         Mockito.doReturn(Either.left(relationshipTypeDataList))
-                .when(titanGenericDao).getByCriteria(NodeTypeEnum.RelationshipType, null,
+                .when(janusGraphGenericDao).getByCriteria(NodeTypeEnum.RelationshipType, null,
                 RelationshipTypeData.class);
 
-        Mockito.doReturn(Either.left(relationshipTypeData1)).when(titanGenericDao)
+        Mockito.doReturn(Either.left(relationshipTypeData1)).when(janusGraphGenericDao)
                 .getNode(Mockito.anyString(), Mockito.anyString(), Mockito.eq(RelationshipTypeData.class));
 
         Mockito.doReturn(Either.left(createPropertyData("prop1"))).when(propertyOperation)
@@ -194,7 +195,7 @@ public class RelationshipTypeOperationTest extends ModelTestBase {
                 .when(derivedFromOperation)
                 .getDerivedFromChild("tosca.relationships.Root1", NodeTypeEnum.RelationshipType, RelationshipTypeData.class);
 
-        Either<Map<String, RelationshipTypeDefinition>, TitanOperationStatus> either =
+        Either<Map<String, RelationshipTypeDefinition>, JanusGraphOperationStatus> either =
                                             relationshipTypeOperation.getAllRelationshipTypes();
 
         assertTrue(either.isLeft());
@@ -352,7 +353,7 @@ public class RelationshipTypeOperationTest extends ModelTestBase {
         Mockito.doReturn(Either.left(new ArrayList<>(relationshipTypeDefinition.getProperties().values()))).when(propertyOperation)
                 .validatePropertiesUniqueness(Mockito.any(), Mockito.any());
 
-        Mockito.doReturn(Either.left(relationshipTypeData)).when(titanGenericDao)
+        Mockito.doReturn(Either.left(relationshipTypeData)).when(janusGraphGenericDao)
                 .createNode(Mockito.any(), Mockito.eq(RelationshipTypeData.class));
 
         Mockito.doReturn(Either.left(new HashMap())).when(propertyOperation)
@@ -376,7 +377,7 @@ public class RelationshipTypeOperationTest extends ModelTestBase {
 
     @Test
     public void testGetRelationshipTypeNotConnected() {
-        Mockito.doReturn(Either.right(TitanOperationStatus.NOT_CONNECTED))
+        Mockito.doReturn(Either.right(JanusGraphOperationStatus.NOT_CONNECTED))
                 .when(relationshipTypeOperation).getRelationshipTypeByUid(Mockito.anyString());
 
         Either<RelationshipTypeDefinition, StorageOperationStatus> either =
@@ -405,7 +406,8 @@ public class RelationshipTypeOperationTest extends ModelTestBase {
         newRelationshipTypeDefinition.setDerivedFrom("tosca.relationships.Root");
         newRelationshipTypeDefinition.setProperties(createPropertyData("prop1"));
 
-        Mockito.doReturn(Either.left(new RelationshipTypeData(newRelationshipTypeDefinition))).when(titanGenericDao)
+        Mockito.doReturn(Either.left(new RelationshipTypeData(newRelationshipTypeDefinition))).when(
+            janusGraphGenericDao)
                 .updateNode(Mockito.any(), Mockito.eq(RelationshipTypeData.class));
 
         Mockito.doReturn(Either.left(newRelationshipTypeDefinition.getProperties()))
@@ -435,7 +437,7 @@ public class RelationshipTypeOperationTest extends ModelTestBase {
     public void testGetRelationshipTypeByUid() {
         RelationshipTypeData relationshipTypeData = new RelationshipTypeData(relationshipTypeDefinition);
 
-        Mockito.doReturn(Either.left(relationshipTypeData)).when(titanGenericDao)
+        Mockito.doReturn(Either.left(relationshipTypeData)).when(janusGraphGenericDao)
                 .getNode(Mockito.anyString(), Mockito.any(), Mockito.eq(RelationshipTypeData.class));
 
         Mockito.doReturn(Either.left(relationshipTypeDefinition.getProperties()))
@@ -444,11 +446,12 @@ public class RelationshipTypeOperationTest extends ModelTestBase {
         RelationshipTypeDefinition childRelationshipTypeDefinition = new RelationshipTypeDefinition();
         childRelationshipTypeDefinition.setType("tosca.relationships.ContainerChild");
 
-        Mockito.doReturn(Either.left(new ImmutablePair(new RelationshipTypeData(childRelationshipTypeDefinition), null))).when(titanGenericDao)
+        Mockito.doReturn(Either.left(new ImmutablePair(new RelationshipTypeData(childRelationshipTypeDefinition), null))).when(
+            janusGraphGenericDao)
                 .getChild(Mockito.anyString(), Mockito.anyString(), Mockito.any(), Mockito.any(),
                         Mockito.eq(RelationshipTypeData.class));
 
-        Either<RelationshipTypeDefinition, TitanOperationStatus> either =
+        Either<RelationshipTypeDefinition, JanusGraphOperationStatus> either =
                 relationshipTypeOperation.getRelationshipTypeByUid("tosca.relationships.Container1");
 
         assertTrue(either.isLeft()
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ToscaElementLifecycleOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ToscaElementLifecycleOperationTest.java
index c70e41b2f1..aef1642e3f 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ToscaElementLifecycleOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ToscaElementLifecycleOperationTest.java
@@ -20,18 +20,18 @@
 
 package org.openecomp.sdc.be.model.operations.impl;
 
-import com.thinkaurelius.titan.core.TitanGraph;
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraph;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import org.junit.*;
 import org.junit.rules.TestName;
 import org.junit.runner.RunWith;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.CapabilityDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.MapDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.MapPropertiesDataDefinition;
@@ -47,13 +47,13 @@ import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.catalog.CatalogComponent;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.NodeType;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.TopologyTemplate;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
-import org.openecomp.sdc.be.model.jsontitan.operations.NodeTypeOperation;
-import org.openecomp.sdc.be.model.jsontitan.operations.TopologyTemplateOperation;
-import org.openecomp.sdc.be.model.jsontitan.operations.ToscaElementLifecycleOperation;
-import org.openecomp.sdc.be.model.jsontitan.utils.GraphTestUtils;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.NodeType;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.NodeTypeOperation;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.TopologyTemplateOperation;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaElementLifecycleOperation;
+import org.openecomp.sdc.be.model.jsonjanusgraph.utils.GraphTestUtils;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.springframework.test.context.ContextConfiguration;
@@ -70,7 +70,7 @@ import static org.junit.Assert.assertTrue;
 public class ToscaElementLifecycleOperationTest extends ModelTestBase {
 
     @javax.annotation.Resource
-    protected TitanDao titanDao;
+    protected JanusGraphDao janusGraphDao;
 
     @javax.annotation.Resource
     private NodeTypeOperation nodeTypeOperation;
@@ -105,7 +105,7 @@ public class ToscaElementLifecycleOperationTest extends ModelTestBase {
         createUsers();
         createResourceCategory();
         createServiceCategory();
-        GraphTestUtils.createRootCatalogVertex(titanDao);
+        GraphTestUtils.createRootCatalogVertex(janusGraphDao);
         rootVertex = createRootNodeType();
         createNodeType("firstVf");
         serviceVertex = createTopologyTemplate("firstService");
@@ -263,7 +263,7 @@ public class ToscaElementLifecycleOperationTest extends ModelTestBase {
         assertTrue(res.isLeft());
         id = res.left().value().getUniqueId();
         verifyInCatalogData(4, null);
-        // exportGraphMl(titanDao.getGraph().left().value());
+        // exportGraphMl(janusGraphDao.getGraph().left().value());
 
     }
 
@@ -322,7 +322,7 @@ public class ToscaElementLifecycleOperationTest extends ModelTestBase {
     public void testGetToscaElOwner_Fail(){
         Either<User, StorageOperationStatus> result;
         String toscaEleId = "toscaElementId";
-        titanDao.getVertexById(toscaEleId, JsonParseFlagEnum.NoParse);
+        janusGraphDao.getVertexById(toscaEleId, JsonParseFlagEnum.NoParse);
         result = lifecycleOperation.getToscaElementOwner(toscaEleId);
         assertEquals(StorageOperationStatus.NOT_FOUND, result.right().value());
     }
@@ -351,12 +351,14 @@ public class ToscaElementLifecycleOperationTest extends ModelTestBase {
         subCat.setMetadataProperties(metadataProperties);
         subCat.updateMetadataJsonWithCurrentMetadataProperties();
 
-        Either<GraphVertex, TitanOperationStatus> catRes = titanDao.createVertex(cat);
+        Either<GraphVertex, JanusGraphOperationStatus> catRes = janusGraphDao.createVertex(cat);
 
-        Either<GraphVertex, TitanOperationStatus> subCatRes = titanDao.createVertex(subCat);
+        Either<GraphVertex, JanusGraphOperationStatus> subCatRes = janusGraphDao.createVertex(subCat);
 
-        TitanOperationStatus status = titanDao.createEdge(catRes.left().value().getVertex(), subCatRes.left().value().getVertex(), EdgeLabelEnum.SUB_CATEGORY, new HashMap<>());
-        assertEquals(TitanOperationStatus.OK, status);
+        JanusGraphOperationStatus
+            status = janusGraphDao
+            .createEdge(catRes.left().value().getVertex(), subCatRes.left().value().getVertex(), EdgeLabelEnum.SUB_CATEGORY, new HashMap<>());
+        assertEquals(JanusGraphOperationStatus.OK, status);
     }
 
     private void createServiceCategory() {
@@ -372,7 +374,7 @@ public class ToscaElementLifecycleOperationTest extends ModelTestBase {
         cat.setMetadataProperties(metadataProperties);
         cat.updateMetadataJsonWithCurrentMetadataProperties();
 
-        Either<GraphVertex, TitanOperationStatus> catRes = titanDao.createVertex(cat);
+        Either<GraphVertex, JanusGraphOperationStatus> catRes = janusGraphDao.createVertex(cat);
 
         assertTrue(catRes.isLeft());
     }
@@ -398,7 +400,8 @@ public class ToscaElementLifecycleOperationTest extends ModelTestBase {
         Either<TopologyTemplate, StorageOperationStatus> createRes = topologyTemplateOperation.createTopologyTemplate(service);
         assertTrue(createRes.isLeft());
 
-        Either<GraphVertex, TitanOperationStatus> getNodeTyeRes = titanDao.getVertexById(createRes.left().value().getUniqueId());
+        Either<GraphVertex, JanusGraphOperationStatus> getNodeTyeRes = janusGraphDao
+            .getVertexById(createRes.left().value().getUniqueId());
         assertTrue(getNodeTyeRes.isLeft());
 
         // serviceVertex = getNodeTyeRes.left().value();
@@ -436,7 +439,8 @@ public class ToscaElementLifecycleOperationTest extends ModelTestBase {
         Either<NodeType, StorageOperationStatus> createVFRes = nodeTypeOperation.createNodeType(vf);
         assertTrue(createVFRes.isLeft());
 
-        Either<GraphVertex, TitanOperationStatus> getNodeTyeRes = titanDao.getVertexById(createVFRes.left().value().getUniqueId());
+        Either<GraphVertex, JanusGraphOperationStatus> getNodeTyeRes = janusGraphDao
+            .getVertexById(createVFRes.left().value().getUniqueId());
         assertTrue(getNodeTyeRes.isLeft());
 
         vfVertex = getNodeTyeRes.left().value();
@@ -482,7 +486,7 @@ public class ToscaElementLifecycleOperationTest extends ModelTestBase {
 
         Either<GraphVertex, StorageOperationStatus> res = nodeTypeOperation.associateElementToData(vfVertex, VertexTypeEnum.CAPABILITIES_PROPERTIES, EdgeLabelEnum.CAPABILITIES_PROPERTIES, capProps);
 
-        // exportGraphMl(titanDao.getGraph().left().value());
+        // exportGraphMl(janusGraphDao.getGraph().left().value());
 
         List<String> pathKeys = new ArrayList<>();
         pathKeys.add("capName");
@@ -542,7 +546,8 @@ public class ToscaElementLifecycleOperationTest extends ModelTestBase {
         Either<NodeType, StorageOperationStatus> createVFRes = nodeTypeOperation.createNodeType(vf);
         assertTrue(createVFRes.isLeft());
 
-        Either<GraphVertex, TitanOperationStatus> getNodeTyeRes = titanDao.getVertexById(createVFRes.left().value().getUniqueId());
+        Either<GraphVertex, JanusGraphOperationStatus> getNodeTyeRes = janusGraphDao
+            .getVertexById(createVFRes.left().value().getUniqueId());
         assertTrue(getNodeTyeRes.isLeft());
         return getNodeTyeRes.left().value();
     }
@@ -559,7 +564,7 @@ public class ToscaElementLifecycleOperationTest extends ModelTestBase {
         ownerV.setMetadataProperties(metadataProperties);
         ownerV.updateMetadataJsonWithCurrentMetadataProperties();
         ownerV.setJson(new HashMap<>());
-        Either<GraphVertex, TitanOperationStatus> createUserRes = titanDao.createVertex(ownerV);
+        Either<GraphVertex, JanusGraphOperationStatus> createUserRes = janusGraphDao.createVertex(ownerV);
         assertTrue(createUserRes.isLeft());
 
         ownerVertex = createUserRes.left().value();
@@ -574,12 +579,12 @@ public class ToscaElementLifecycleOperationTest extends ModelTestBase {
         modifierV.setMetadataProperties(metadataProperties);
         modifierV.updateMetadataJsonWithCurrentMetadataProperties();
         modifierV.setJson(new HashMap<>());
-        createUserRes = titanDao.createVertex(modifierV);
+        createUserRes = janusGraphDao.createVertex(modifierV);
         assertTrue(createUserRes.isLeft());
 
         modifierVertex = createUserRes.left().value();
 
-        Either<GraphVertex, TitanOperationStatus> getOwnerRes = lifecycleOperation.findUser(ownerVertex.getUniqueId());
+        Either<GraphVertex, JanusGraphOperationStatus> getOwnerRes = lifecycleOperation.findUser(ownerVertex.getUniqueId());
         assertTrue(getOwnerRes.isLeft());
 
     }
@@ -602,17 +607,17 @@ public class ToscaElementLifecycleOperationTest extends ModelTestBase {
     }
 
     private void clearGraph() {
-        Either<TitanGraph, TitanOperationStatus> graphResult = titanDao.getGraph();
-        TitanGraph graph = graphResult.left().value();
+        Either<JanusGraph, JanusGraphOperationStatus> graphResult = janusGraphDao.getGraph();
+        JanusGraph graph = graphResult.left().value();
 
-        Iterable<TitanVertex> vertices = graph.query().vertices();
+        Iterable<JanusGraphVertex> vertices = graph.query().vertices();
         if (vertices != null) {
-            Iterator<TitanVertex> iterator = vertices.iterator();
+            Iterator<JanusGraphVertex> iterator = vertices.iterator();
             while (iterator.hasNext()) {
-                TitanVertex vertex = iterator.next();
+                JanusGraphVertex vertex = iterator.next();
                 vertex.remove();
             }
         }
-        titanDao.commit();
+        janusGraphDao.commit();
     }
 }
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/UserAdminOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/UserAdminOperationTest.java
index 5226a468d7..c094999ebc 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/UserAdminOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/UserAdminOperationTest.java
@@ -20,10 +20,10 @@
 
 package org.openecomp.sdc.be.model.operations.impl;
 
-import com.thinkaurelius.titan.core.*;
-import com.thinkaurelius.titan.graphdb.relations.StandardVertexProperty;
-import com.thinkaurelius.titan.graphdb.types.system.EmptyVertex;
-import com.thinkaurelius.titan.graphdb.types.system.ImplicitKey;
+import org.janusgraph.core.*;
+import org.janusgraph.graphdb.relations.StandardVertexProperty;
+import org.janusgraph.graphdb.types.system.EmptyVertex;
+import org.janusgraph.graphdb.types.system.ImplicitKey;
 import fj.data.Either;
 import org.apache.tinkerpop.gremlin.structure.*;
 import org.junit.Before;
@@ -34,9 +34,9 @@ import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.mockito.stubbing.Answer;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.dao.utils.UserStatusEnum;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.ModelTestBase;
@@ -59,9 +59,10 @@ import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
 public class UserAdminOperationTest extends ModelTestBase {
-    private static final TitanGenericDao titanGenericDao = mock(TitanGenericDao.class);
+    private static final JanusGraphGenericDao JANUS_GRAPH_GENERIC_DAO = mock(JanusGraphGenericDao.class);
     @InjectMocks
-    private static final UserAdminOperation userAdminOperation = new UserAdminOperation(titanGenericDao);
+    private static final UserAdminOperation userAdminOperation = new UserAdminOperation(
+        JANUS_GRAPH_GENERIC_DAO);
     private static final String ADMIN = "admin";
 
     @BeforeClass
@@ -72,20 +73,20 @@ public class UserAdminOperationTest extends ModelTestBase {
     @Before
     public void initMocks() {
         MockitoAnnotations.initMocks(this);
-        Mockito.reset(titanGenericDao);
-        mockTitanUpdate();
-        mockTitanDelete();
+        Mockito.reset(JANUS_GRAPH_GENERIC_DAO);
+        mockJanusGraphUpdate();
+        mockJanusGraphDelete();
 
     }
 
     @Test
     public void testDeActivateUserDataSuccess() {
-        UserData userData = mockTitanGet(ADMIN, UserRoleEnum.ADMIN, true);
+        UserData userData = mockJanusGraphGet(ADMIN, UserRoleEnum.ADMIN, true);
 
         Either<User, StorageOperationStatus> eitherUser = userAdminOperation.deActivateUser(userAdminOperation.convertToUser(userData));
 
-        verify(titanGenericDao, times(1)).updateNode(eq(userData), eq(UserData.class));
-        verify(titanGenericDao, times(0)).deleteNode(any(UserData.class), eq(UserData.class));
+        verify(JANUS_GRAPH_GENERIC_DAO, times(1)).updateNode(eq(userData), eq(UserData.class));
+        verify(JANUS_GRAPH_GENERIC_DAO, times(0)).deleteNode(any(UserData.class), eq(UserData.class));
         assertTrue(eitherUser.isLeft());
         User user = eitherUser.left().value();
         assertSame(user.getStatus(), UserStatusEnum.INACTIVE);
@@ -93,33 +94,33 @@ public class UserAdminOperationTest extends ModelTestBase {
 
     @Test
     public void testDeleteUserWithoutResources() {
-        UserData userData = mockTitanGet(ADMIN, UserRoleEnum.ADMIN, true);
+        UserData userData = mockJanusGraphGet(ADMIN, UserRoleEnum.ADMIN, true);
 
         List<Edge> edgesList = new ArrayList<>();
 
-        Either<List<Edge>, TitanOperationStatus> eitherResult = Either.left(edgesList);
-        when(titanGenericDao.getEdgesForNode(userData, Direction.BOTH)).thenReturn(eitherResult);
+        Either<List<Edge>, JanusGraphOperationStatus> eitherResult = Either.left(edgesList);
+        when(JANUS_GRAPH_GENERIC_DAO.getEdgesForNode(userData, Direction.BOTH)).thenReturn(eitherResult);
 
         Either<User, ActionStatus> eitherUser = userAdminOperation.deleteUserData(ADMIN);
-        verify(titanGenericDao, times(0)).updateNode(any(UserData.class), eq(UserData.class));
-        verify(titanGenericDao, times(1)).deleteNode(userData, UserData.class);
+        verify(JANUS_GRAPH_GENERIC_DAO, times(0)).updateNode(any(UserData.class), eq(UserData.class));
+        verify(JANUS_GRAPH_GENERIC_DAO, times(1)).deleteNode(userData, UserData.class);
         assertTrue(eitherUser.isLeft());
 
     }
 
     @Test
     public void testDeleteUserWithResources() {
-        UserData userData = mockTitanGet(ADMIN, UserRoleEnum.ADMIN, true);
+        UserData userData = mockJanusGraphGet(ADMIN, UserRoleEnum.ADMIN, true);
 
         List<Edge> edgesList = new ArrayList<>();
         edgesList.add(getEmptyEdgeImpl());
 
-        Either<List<Edge>, TitanOperationStatus> eitherResult = Either.left(edgesList);
-        when(titanGenericDao.getEdgesForNode(userData, Direction.BOTH)).thenReturn(eitherResult);
+        Either<List<Edge>, JanusGraphOperationStatus> eitherResult = Either.left(edgesList);
+        when(JANUS_GRAPH_GENERIC_DAO.getEdgesForNode(userData, Direction.BOTH)).thenReturn(eitherResult);
 
         Either<User, ActionStatus> eitherUser = userAdminOperation.deleteUserData(ADMIN);
-        verify(titanGenericDao, times(0)).updateNode(any(UserData.class), eq(UserData.class));
-        verify(titanGenericDao, times(0)).deleteNode(any(UserData.class), eq(UserData.class));
+        verify(JANUS_GRAPH_GENERIC_DAO, times(0)).updateNode(any(UserData.class), eq(UserData.class));
+        verify(JANUS_GRAPH_GENERIC_DAO, times(0)).deleteNode(any(UserData.class), eq(UserData.class));
         assertTrue(eitherUser.isRight());
         assertSame(eitherUser.right().value(), ActionStatus.USER_HAS_ACTIVE_ELEMENTS);
 
@@ -131,7 +132,7 @@ public class UserAdminOperationTest extends ModelTestBase {
         String userKey = UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.User);
         User user = new User();
         user.setUserId(userId);
-        TitanVertex userVertex = null;
+        JanusGraphVertex userVertex = null;
         TestVertex component1 = new TestVertex(null);
         TestVertex component2 = new TestVertex(true);
         TestVertex component3 = new TestVertex(false);
@@ -142,8 +143,8 @@ public class UserAdminOperationTest extends ModelTestBase {
         edges.add(edge1);
         edges.add(edge2);
         edges.add(edge3);
-        when(titanGenericDao.getVertexByProperty(userKey, userId)).thenReturn(Either.left(userVertex));
-        when(titanGenericDao.getOutgoingEdgesByCriteria(any(), any(), any())).thenReturn(Either.left(edges));
+        when(JANUS_GRAPH_GENERIC_DAO.getVertexByProperty(userKey, userId)).thenReturn(Either.left(userVertex));
+        when(JANUS_GRAPH_GENERIC_DAO.getOutgoingEdgesByCriteria(any(), any(), any())).thenReturn(Either.left(edges));
         Either<List<Edge>, StorageOperationStatus> result = userAdminOperation.getUserPendingTasksList(user, new HashMap<>());
         assertThat(result.isLeft()).isTrue();
         List<Edge> pendingTasks = result.left().value();
@@ -152,7 +153,7 @@ public class UserAdminOperationTest extends ModelTestBase {
         assertThat(((TestEdge)pendingTasks.get(1)).getName()).isNotEqualTo("2");
     }
 
-    private class TestVertex implements TitanVertex {
+    private class TestVertex implements JanusGraphVertex {
 
         private final Boolean isDeleted;
 
@@ -161,12 +162,12 @@ public class UserAdminOperationTest extends ModelTestBase {
         }
 
         @Override
-        public TitanEdge addEdge(String s, Vertex vertex, Object... objects) {
+        public JanusGraphEdge addEdge(String s, Vertex vertex, Object... objects) {
             return null;
         }
 
         @Override
-        public <V> TitanVertexProperty<V> property(String s, V v, Object... objects) {
+        public <V> JanusGraphVertexProperty<V> property(String s, V v, Object... objects) {
             return null;
         }
 
@@ -181,7 +182,7 @@ public class UserAdminOperationTest extends ModelTestBase {
         }
 
         @Override
-        public <V> TitanVertexProperty<V> property(VertexProperty.Cardinality cardinality, String s, V v, Object... objects) {
+        public <V> JanusGraphVertexProperty<V> property(VertexProperty.Cardinality cardinality, String s, V v, Object... objects) {
             return null;
         }
 
@@ -221,7 +222,7 @@ public class UserAdminOperationTest extends ModelTestBase {
         }
 
         @Override
-        public TitanVertexQuery<? extends TitanVertexQuery> query() {
+        public JanusGraphVertexQuery<? extends JanusGraphVertexQuery> query() {
             return null;
         }
 
@@ -231,7 +232,7 @@ public class UserAdminOperationTest extends ModelTestBase {
         }
 
         @Override
-        public TitanTransaction graph() {
+        public JanusGraphTransaction graph() {
             return null;
         }
 
@@ -369,27 +370,28 @@ public class UserAdminOperationTest extends ModelTestBase {
         };
     }
 
-    private UserData mockTitanGet(String userId, UserRoleEnum role, boolean isActive) {
+    private UserData mockJanusGraphGet(String userId, UserRoleEnum role, boolean isActive) {
         UserData userData = buildUserData(userId, role, isActive);
-        Either<UserData, TitanOperationStatus> eitherUserData = Either.left(userData);
-        when(titanGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.User), userId, UserData.class)).thenReturn(eitherUserData);
+        Either<UserData, JanusGraphOperationStatus> eitherUserData = Either.left(userData);
+        when(JANUS_GRAPH_GENERIC_DAO
+            .getNode(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.User), userId, UserData.class)).thenReturn(eitherUserData);
         return userData;
     }
 
-    private static void mockTitanUpdate() {
-        doAnswer((Answer<Either<UserData, TitanOperationStatus>>) invocation -> {
+    private static void mockJanusGraphUpdate() {
+        doAnswer((Answer<Either<UserData, JanusGraphOperationStatus>>) invocation -> {
             Object[] args = invocation.getArguments();
             UserData retValue = (UserData) args[0];
             return Either.left(retValue);
-        }).when(titanGenericDao).updateNode(any(UserData.class), eq(UserData.class));
+        }).when(JANUS_GRAPH_GENERIC_DAO).updateNode(any(UserData.class), eq(UserData.class));
     }
 
-    private static void mockTitanDelete() {
-        doAnswer((Answer<Either<UserData, TitanOperationStatus>>) invocation -> {
+    private static void mockJanusGraphDelete() {
+        doAnswer((Answer<Either<UserData, JanusGraphOperationStatus>>) invocation -> {
             Object[] args = invocation.getArguments();
             UserData retValue = (UserData) args[0];
             return Either.left(retValue);
-        }).when(titanGenericDao).deleteNode(any(UserData.class), eq(UserData.class));
+        }).when(JANUS_GRAPH_GENERIC_DAO).deleteNode(any(UserData.class), eq(UserData.class));
     }
 
     private static UserData buildUserData(String userId, UserRoleEnum role, boolean isActive) {
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/util/OperationTestsUtil.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/util/OperationTestsUtil.java
index a0b6ea6fd3..71dc5d9517 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/util/OperationTestsUtil.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/util/OperationTestsUtil.java
@@ -21,9 +21,9 @@
 package org.openecomp.sdc.be.model.operations.impl.util;
 
 import fj.data.Either;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
-import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
@@ -36,20 +36,20 @@ import org.openecomp.sdc.common.util.ValidationUtils;
 
 public class OperationTestsUtil {
 
-    public static String deleteAndCreateServiceCategory(String category, TitanGenericDao titanDao) {
+    public static String deleteAndCreateServiceCategory(String category, JanusGraphGenericDao janusGraphDao) {
         CategoryData categoryData = new CategoryData(NodeTypeEnum.ServiceNewCategory);
         categoryData.getCategoryDataDefinition().setName(category);
         categoryData.getCategoryDataDefinition()
                 .setNormalizedName(ValidationUtils.normalizeCategoryName4Uniqueness(category));
         categoryData.getCategoryDataDefinition().setUniqueId(UniqueIdBuilder.buildCategoryUid(
                 ValidationUtils.normalizeCategoryName4Uniqueness(category), NodeTypeEnum.ServiceNewCategory));
-        titanDao.deleteNode(categoryData, CategoryData.class);
-        Either<CategoryData, TitanOperationStatus> createNode = titanDao.createNode(categoryData, CategoryData.class);
+        janusGraphDao.deleteNode(categoryData, CategoryData.class);
+        Either<CategoryData, JanusGraphOperationStatus> createNode = janusGraphDao.createNode(categoryData, CategoryData.class);
         return (String) createNode.left().value().getUniqueId();
     }
 
     public static String deleteAndCreateResourceCategory(String category, String subcategory,
-            TitanGenericDao titanDao) {
+            JanusGraphGenericDao janusGraphDao) {
 
         CategoryData categoryData = new CategoryData(NodeTypeEnum.ResourceNewCategory);
         categoryData.getCategoryDataDefinition().setName(category);
@@ -64,22 +64,22 @@ public class OperationTestsUtil {
                 .setNormalizedName(ValidationUtils.normalizeCategoryName4Uniqueness(subcategory));
         subcategoryData.getSubCategoryDataDefinition().setUniqueId(UniqueIdBuilder
                 .buildSubCategoryUid(categoryData.getCategoryDataDefinition().getUniqueId(), subcategory));
-        titanDao.deleteNode(categoryData, CategoryData.class);
-        titanDao.deleteNode(subcategoryData, SubCategoryData.class);
-        Either<CategoryData, TitanOperationStatus> createNode = titanDao.createNode(categoryData, CategoryData.class);
-        titanDao.createNode(subcategoryData, SubCategoryData.class);
-        titanDao.createRelation(categoryData, subcategoryData, GraphEdgeLabels.SUB_CATEGORY, null);
+        janusGraphDao.deleteNode(categoryData, CategoryData.class);
+        janusGraphDao.deleteNode(subcategoryData, SubCategoryData.class);
+        Either<CategoryData, JanusGraphOperationStatus> createNode = janusGraphDao.createNode(categoryData, CategoryData.class);
+        janusGraphDao.createNode(subcategoryData, SubCategoryData.class);
+        janusGraphDao.createRelation(categoryData, subcategoryData, GraphEdgeLabels.SUB_CATEGORY, null);
         return (String) createNode.left().value().getUniqueId();
     }
 
-    public static void deleteServiceCategory(String category, TitanGenericDao titanDao) {
+    public static void deleteServiceCategory(String category, JanusGraphGenericDao janusGraphDao) {
         ServiceCategoryData categoryData = new ServiceCategoryData(category);
-        titanDao.deleteNode(categoryData, ServiceCategoryData.class);
+        janusGraphDao.deleteNode(categoryData, ServiceCategoryData.class);
     }
 
-    public static void deleteResourceCategory(String category, String subcategory, TitanGenericDao titanDao) {
+    public static void deleteResourceCategory(String category, String subcategory, JanusGraphGenericDao janusGraphDao) {
         ResourceCategoryData categoryData = new ResourceCategoryData(category, subcategory);
-        titanDao.deleteNode(categoryData, ResourceCategoryData.class);
+        janusGraphDao.deleteNode(categoryData, ResourceCategoryData.class);
     }
 
     public static User convertUserDataToUser(UserData modifierData) {
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/util/PrintGraph.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/util/PrintGraph.java
index 7ba2e097c2..6bd206725b 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/util/PrintGraph.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/util/PrintGraph.java
@@ -20,9 +20,9 @@
 
 package org.openecomp.sdc.be.model.operations.impl.util;
 
-import com.thinkaurelius.titan.core.TitanEdge;
-import com.thinkaurelius.titan.core.TitanGraph;
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraphEdge;
+import org.janusgraph.core.JanusGraph;
+import org.janusgraph.core.JanusGraphVertex;
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Element;
 import org.apache.tinkerpop.gremlin.structure.Property;
@@ -40,12 +40,12 @@ import java.util.Set;
 
 public class PrintGraph {
 
-    public void printGraphVertices(TitanGraph graph) {
+    public void printGraphVertices(JanusGraph graph) {
 
-        Iterable<TitanVertex> vertices = graph.query().vertices();
+        Iterable<JanusGraphVertex> vertices = graph.query().vertices();
 
         if (vertices != null) {
-            Iterator<TitanVertex> iterator = vertices.iterator();
+            Iterator<JanusGraphVertex> iterator = vertices.iterator();
             while (iterator.hasNext()) {
                 Vertex vertex = iterator.next();
             }
@@ -55,11 +55,11 @@ public class PrintGraph {
         graph.tx().commit();
     }
 
-    public void printGraphEdges(TitanGraph graph) {
-        Iterable<TitanEdge> vertices = graph.query().edges();
+    public void printGraphEdges(JanusGraph graph) {
+        Iterable<JanusGraphEdge> vertices = graph.query().edges();
 
         if (vertices != null) {
-            Iterator<TitanEdge> iterator = vertices.iterator();
+            Iterator<JanusGraphEdge> iterator = vertices.iterator();
             while (iterator.hasNext()) {
                 Edge edge = iterator.next();
 
@@ -69,16 +69,16 @@ public class PrintGraph {
         graph.tx().commit();
     }
 
-    public String buildGraphForWebgraphWiz(TitanGraph graph) {
+    public String buildGraphForWebgraphWiz(JanusGraph graph) {
 
         StringBuilder builder = new StringBuilder();
         builder.append("digraph finite_state_machine {\n");
         builder.append("rankdir=LR;\n");
         builder.append("size=\"15,10\" \n");
-        Iterable<TitanVertex> vertices = graph.query().vertices();
+        Iterable<JanusGraphVertex> vertices = graph.query().vertices();
 
         if (vertices != null) {
-            Iterator<TitanVertex> iterator = vertices.iterator();
+            Iterator<JanusGraphVertex> iterator = vertices.iterator();
             while (iterator.hasNext()) {
                 Vertex vertex = iterator.next();
 
@@ -98,10 +98,10 @@ public class PrintGraph {
 
         }
 
-        Iterable<TitanEdge> edges = graph.query().edges();
+        Iterable<JanusGraphEdge> edges = graph.query().edges();
 
         if (edges != null) {
-            Iterator<TitanEdge> iterator = edges.iterator();
+            Iterator<JanusGraphEdge> iterator = edges.iterator();
             while (iterator.hasNext()) {
                 Edge edge = iterator.next();
 
@@ -309,12 +309,12 @@ public class PrintGraph {
         return key;
     }
 
-    public int getNumberOfVertices(TitanGraph graph) {
+    public int getNumberOfVertices(JanusGraph graph) {
         int counter = 0;
-        Iterable<TitanVertex> vertices = graph.query().vertices();
+        Iterable<JanusGraphVertex> vertices = graph.query().vertices();
 
         if (vertices != null) {
-            Iterator<TitanVertex> iterator = vertices.iterator();
+            Iterator<JanusGraphVertex> iterator = vertices.iterator();
             while (iterator.hasNext()) {
                 Vertex vertex = iterator.next();
                 counter++;
@@ -323,14 +323,14 @@ public class PrintGraph {
         return counter;
     }
 
-    public Set<String> getVerticesSet(TitanGraph titanGraph) {
+    public Set<String> getVerticesSet(JanusGraph janusGraph) {
 
         Set<String> set = new HashSet<>();
 
-        Iterable<TitanVertex> vertices = titanGraph.query().vertices();
+        Iterable<JanusGraphVertex> vertices = janusGraph.query().vertices();
 
         if (vertices != null) {
-            Iterator<TitanVertex> iterator = vertices.iterator();
+            Iterator<JanusGraphVertex> iterator = vertices.iterator();
             while (iterator.hasNext()) {
                 Vertex vertex = iterator.next();
 
diff --git a/catalog-model/src/test/resources/application-context-test.xml b/catalog-model/src/test/resources/application-context-test.xml
index a39a1ee199..475760f51a 100644
--- a/catalog-model/src/test/resources/application-context-test.xml
+++ b/catalog-model/src/test/resources/application-context-test.xml
@@ -7,12 +7,12 @@
 
   <context:component-scan
     base-package="org.openecomp.sdc.be.model.operations.impl,
-    	org.openecomp.sdc.be.model.jsontitan.operations,
+    	org.openecomp.sdc.be.model.jsonjanusgraph.operations,
     	org.openecomp.sdc.be.dao.jsongraph,
     	org.openecomp.sdc.be.model.cache,
-		org.openecomp.sdc.be.dao.titan,
+		org.openecomp.sdc.be.dao.janusgraph,
 		org.openecomp.sdc.be.dao.cassandra,
-		org.openecomp.sdc.be.model.jsontitan.utils
+		org.openecomp.sdc.be.model.jsonjanusgraph.utils
         ">
 
    
diff --git a/catalog-model/src/test/resources/config/catalog-model/configuration.yaml b/catalog-model/src/test/resources/config/catalog-model/configuration.yaml
index 0dbd73995d..96fb28b2f5 100644
--- a/catalog-model/src/test/resources/config/catalog-model/configuration.yaml
+++ b/catalog-model/src/test/resources/config/catalog-model/configuration.yaml
@@ -26,15 +26,15 @@ released: 2012-11-30
 toscaConformanceLevel: 8.0
 minToscaConformanceLevel: 3.0
 
-titanCfgFile: /home/vagrant/catalog-be/config/catalog-be/titan.properties
-titanInMemoryGraph: false
-titanLockTimeout: 1800
+janusGraphCfgFile: /home/vagrant/catalog-be/config/catalog-be/janusgraph.properties
+janusGraphInMemoryGraph: false
+janusGraphLockTimeout: 1800
 
-# The interval to try and reconnect to titan DB when it is down during ASDC startup:
-titanReconnectIntervalInSeconds: 3
+# The interval to try and reconnect to janus graph DB when it is down during ASDC startup:
+janusGraphReconnectIntervalInSeconds: 3
 
-# The read timeout towards Titan DB when health check is invoked:
-titanHealthCheckReadTimeout: 1
+# The read timeout towards JanusGraph DB when health check is invoked:
+janusGraphHealthCheckReadTimeout: 1
 
 # The interval to try and reconnect to Elasticsearch when it is down during ASDC startup:
 esReconnectIntervalInSeconds: 3
diff --git a/catalog-model/src/test/resources/config/configuration.yaml b/catalog-model/src/test/resources/config/configuration.yaml
index c95715dabd..3dc326e8a0 100644
--- a/catalog-model/src/test/resources/config/configuration.yaml
+++ b/catalog-model/src/test/resources/config/configuration.yaml
@@ -26,15 +26,15 @@ released: 2012-11-30
 toscaConformanceLevel: 8.0
 minToscaConformanceLevel: 3.0
 
-titanCfgFile: /home/vagrant/catalog-be/config/catalog-be/titan.properties
-titanInMemoryGraph: false
-titanLockTimeout: 1800
+janusGraphCfgFile: /home/vagrant/catalog-be/config/catalog-be/janusgraph.properties
+janusGraphInMemoryGraph: false
+janusGraphLockTimeout: 1800
 
-# The interval to try and reconnect to titan DB when it is down during ASDC startup:
-titanReconnectIntervalInSeconds: 3
+# The interval to try and reconnect to janus graph DB when it is down during ASDC startup:
+janusGraphReconnectIntervalInSeconds: 3
 
-# The read timeout towards Titan DB when health check is invoked:
-titanHealthCheckReadTimeout: 1
+# The read timeout towards JanusGraph DB when health check is invoked:
+janusGraphHealthCheckReadTimeout: 1
 
 # The interval to try and reconnect to Elasticsearch when it is down during ASDC startup:
 esReconnectIntervalInSeconds: 3