diff --git a/plans/sdc/dcaed/setup.sh b/plans/sdc-dcae-d/dcaed/setup.sh
similarity index 91%
rename from plans/sdc/dcaed/setup.sh
rename to plans/sdc-dcae-d/dcaed/setup.sh
index 074b8c0..5a94a93 100644
--- a/plans/sdc/dcaed/setup.sh
+++ b/plans/sdc-dcae-d/dcaed/setup.sh
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-source ${WORKSPACE}/scripts/sdc/setup_sdc_dcaed.sh
+source ${WORKSPACE}/scripts/sdc-dcae-d/setup_sdc_dcaed.sh
diff --git a/plans/sdc/dcaed/setup.sh b/plans/sdc-dcae-d/dcaed/teardown.sh
similarity index 90%
copy from plans/sdc/dcaed/setup.sh
copy to plans/sdc-dcae-d/dcaed/teardown.sh
index 074b8c0..2467d1e 100644
--- a/plans/sdc/dcaed/setup.sh
+++ b/plans/sdc-dcae-d/dcaed/teardown.sh
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-source ${WORKSPACE}/scripts/sdc/setup_sdc_dcaed.sh
+source ${WORKSPACE}/scripts/sdc-dcae-d/cleanup_sdc_dcaed.sh
diff --git a/plans/sdc/dcaed/testplan.txt b/plans/sdc-dcae-d/dcaed/testplan.txt
similarity index 85%
rename from plans/sdc/dcaed/testplan.txt
rename to plans/sdc-dcae-d/dcaed/testplan.txt
index a1313f1..63a4cda 100644
--- a/plans/sdc/dcaed/testplan.txt
+++ b/plans/sdc-dcae-d/dcaed/testplan.txt
@@ -1,3 +1,3 @@
 # Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
-sdc/dcaed
+sdc-dcae-d/dcaed
diff --git a/plans/sdc/dcaed/teardown.sh b/plans/sdc/dcaed/teardown.sh
deleted file mode 100644
index 911273c..0000000
--- a/plans/sdc/dcaed/teardown.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2019 © Samsung Electronics Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-source ${WORKSPACE}/scripts/sdc/cleanup_sdc_dcaed.sh
diff --git a/scripts/sdc/cleanup_sdc_dcaed.sh b/scripts/sdc-dcae-d/cleanup_sdc_dcaed.sh
similarity index 100%
rename from scripts/sdc/cleanup_sdc_dcaed.sh
rename to scripts/sdc-dcae-d/cleanup_sdc_dcaed.sh
diff --git a/scripts/sdc/setup_sdc_dcaed.sh b/scripts/sdc-dcae-d/setup_sdc_dcaed.sh
similarity index 100%
rename from scripts/sdc/setup_sdc_dcaed.sh
rename to scripts/sdc-dcae-d/setup_sdc_dcaed.sh
diff --git a/tests/sdc/dcaed/__init__.robot b/tests/sdc-dcae-d/dcaed/__init__.robot
similarity index 100%
rename from tests/sdc/dcaed/__init__.robot
rename to tests/sdc-dcae-d/dcaed/__init__.robot
diff --git a/tests/sdc/dcaed/asdc_interface.robot b/tests/sdc-dcae-d/dcaed/asdc_interface.robot
similarity index 100%
rename from tests/sdc/dcaed/asdc_interface.robot
rename to tests/sdc-dcae-d/dcaed/asdc_interface.robot
diff --git a/tests/sdc/dcaed/assets/artifact_upload.template b/tests/sdc-dcae-d/dcaed/assets/artifact_upload.template
similarity index 100%
rename from tests/sdc/dcaed/assets/artifact_upload.template
rename to tests/sdc-dcae-d/dcaed/assets/artifact_upload.template
diff --git a/tests/sdc/dcaed/assets/catalog_service.template b/tests/sdc-dcae-d/dcaed/assets/catalog_service.template
similarity index 100%
rename from tests/sdc/dcaed/assets/catalog_service.template
rename to tests/sdc-dcae-d/dcaed/assets/catalog_service.template
diff --git a/tests/sdc/dcaed/assets/component_catalog_resource.template b/tests/sdc-dcae-d/dcaed/assets/component_catalog_resource.template
similarity index 100%
rename from tests/sdc/dcaed/assets/component_catalog_resource.template
rename to tests/sdc-dcae-d/dcaed/assets/component_catalog_resource.template
diff --git a/tests/sdc/dcaed/assets/create_vfcmt.template b/tests/sdc-dcae-d/dcaed/assets/create_vfcmt.template
similarity index 100%
rename from tests/sdc/dcaed/assets/create_vfcmt.template
rename to tests/sdc-dcae-d/dcaed/assets/create_vfcmt.template
diff --git a/tests/sdc/dcaed/assets/dcae_composition.template b/tests/sdc-dcae-d/dcaed/assets/dcae_composition.template
similarity index 100%
rename from tests/sdc/dcaed/assets/dcae_composition.template
rename to tests/sdc-dcae-d/dcaed/assets/dcae_composition.template
diff --git a/tests/sdc/dcaed/assets/dcae_monitoring_configuration.template b/tests/sdc-dcae-d/dcaed/assets/dcae_monitoring_configuration.template
similarity index 100%
rename from tests/sdc/dcaed/assets/dcae_monitoring_configuration.template
rename to tests/sdc-dcae-d/dcaed/assets/dcae_monitoring_configuration.template
diff --git a/tests/sdc/dcaed/assets/resource_instance.template b/tests/sdc-dcae-d/dcaed/assets/resource_instance.template
similarity index 100%
rename from tests/sdc/dcaed/assets/resource_instance.template
rename to tests/sdc-dcae-d/dcaed/assets/resource_instance.template
diff --git a/tests/sdc/dcaed/assets/schema.yaml b/tests/sdc-dcae-d/dcaed/assets/schema.yaml
similarity index 100%
rename from tests/sdc/dcaed/assets/schema.yaml
rename to tests/sdc-dcae-d/dcaed/assets/schema.yaml
diff --git a/tests/sdc/dcaed/assets/template.yaml b/tests/sdc-dcae-d/dcaed/assets/template.yaml
similarity index 100%
rename from tests/sdc/dcaed/assets/template.yaml
rename to tests/sdc-dcae-d/dcaed/assets/template.yaml
diff --git a/tests/sdc/dcaed/assets/translate.yaml b/tests/sdc-dcae-d/dcaed/assets/translate.yaml
similarity index 100%
rename from tests/sdc/dcaed/assets/translate.yaml
rename to tests/sdc-dcae-d/dcaed/assets/translate.yaml
diff --git a/tests/sdc/dcaed/assets/user_remarks.template b/tests/sdc-dcae-d/dcaed/assets/user_remarks.template
similarity index 100%
rename from tests/sdc/dcaed/assets/user_remarks.template
rename to tests/sdc-dcae-d/dcaed/assets/user_remarks.template
diff --git a/tests/sdc/dcaed/common.robot b/tests/sdc-dcae-d/dcaed/common.robot
similarity index 75%
rename from tests/sdc/dcaed/common.robot
rename to tests/sdc-dcae-d/dcaed/common.robot
index 3cb73ff..d1e8c74 100644
--- a/tests/sdc/dcaed/common.robot
+++ b/tests/sdc-dcae-d/dcaed/common.robot
@@ -7,5 +7,5 @@
 
 ${GLOBAL_APPLICATION_ID}    robot
 
-${ASSETS_DIR}   %{WORKSPACE}/tests/sdc/dcaed/assets/
+${ASSETS_DIR}   %{WORKSPACE}/tests/sdc-dcae-d/dcaed/assets/
 
diff --git a/tests/sdc/dcaed/dcaed_interface.robot b/tests/sdc-dcae-d/dcaed/dcaed_interface.robot
similarity index 97%
rename from tests/sdc/dcaed/dcaed_interface.robot
rename to tests/sdc-dcae-d/dcaed/dcaed_interface.robot
index 76401a8..e3aa4b9 100644
--- a/tests/sdc/dcaed/dcaed_interface.robot
+++ b/tests/sdc-dcae-d/dcaed/dcaed_interface.robot
@@ -1,6 +1,5 @@
 *** Settings ***
 Library           json
-Library           eteutils/HTTPUtils.py
 Library           ONAPLibrary.Utilities
 
 Resource          json_templater.robot
@@ -70,7 +69,7 @@
 
 Submit Monitoring Configuration To DCAE-DS
     [Arguments]   ${mc_uuid}   ${cs_uuid}   ${vfi_name}
-    ${url_vfi_name}   HTTPUtils.url_encode_string  ${vfi_name}
+    ${url_vfi_name}   url_encode_string  ${vfi_name}
     ${resp}=    Run DCAE-DS Post Request    ${DCAE_PATH}${DCAE_CREATE_BLUEPRINT_PATH}/${mc_uuid}/${cs_uuid}/${url_vfi_name}     ${None}    ${ASDC_DESIGNER_USER_ID}
     Should Be Equal As Strings  ${resp.status_code}     200
 
diff --git a/tests/sdc/dcaed/json_templater.robot b/tests/sdc-dcae-d/dcaed/json_templater.robot
similarity index 94%
rename from tests/sdc/dcaed/json_templater.robot
rename to tests/sdc-dcae-d/dcaed/json_templater.robot
index 884c8f9..33e8baa 100644
--- a/tests/sdc/dcaed/json_templater.robot
+++ b/tests/sdc-dcae-d/dcaed/json_templater.robot
@@ -1,7 +1,7 @@
 *** Settings ***
 Documentation     This resource is filling out json string templates and returning the json back
 Library           RequestsLibrary
-Library           eteutils/StringTemplater.py
+Library           ONAPLibrary.TemplatingKeywords
 Library           OperatingSystem
 
 *** Keywords ***
diff --git a/tests/sdc/dcaed/monitoring_configuration_service_test.robot b/tests/sdc-dcae-d/dcaed/monitoring_configuration_service_test.robot
similarity index 100%
rename from tests/sdc/dcaed/monitoring_configuration_service_test.robot
rename to tests/sdc-dcae-d/dcaed/monitoring_configuration_service_test.robot