diff --git a/SOL005/NSDManagement-API/NSDescriptors.robot b/SOL005/NSDManagement-API/NSDescriptors.robot
index b6a32f1849b32383415b400614521df39c06580a..cb5f51acfb3fe2009235dbbd6ee1011571747965 100644
--- a/SOL005/NSDManagement-API/NSDescriptors.robot
+++ b/SOL005/NSDManagement-API/NSDescriptors.robot
@@ -142,7 +142,7 @@ GET all Network Service Descriptors - exclude_fields
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use exclude_fields option
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages?exlude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors?exlude_fields=${fields}
     Integer    response status    200
     ${contentType}=    Output    response headers Content-Type
     Should Contain    ${contentType}    application/json
diff --git a/SOL005/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL005/NSPerformanceManagement-API/IndividualPmJob.robot
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/IndividualPmJob.robot
rename to SOL005/NSPerformanceManagement-API/IndividualPmJob.robot
diff --git a/SOL005/VNFPerformanceManagement-API/IndividualReport.robot b/SOL005/NSPerformanceManagement-API/IndividualReport.robot
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/IndividualReport.robot
rename to SOL005/NSPerformanceManagement-API/IndividualReport.robot
diff --git a/SOL005/VNFPerformanceManagement-API/IndividualSubscription.robot b/SOL005/NSPerformanceManagement-API/IndividualSubscription.robot
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/IndividualSubscription.robot
rename to SOL005/NSPerformanceManagement-API/IndividualSubscription.robot
diff --git a/SOL005/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL005/NSPerformanceManagement-API/IndividualThreshold.robot
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/IndividualThreshold.robot
rename to SOL005/NSPerformanceManagement-API/IndividualThreshold.robot
diff --git a/SOL005/VNFPerformanceManagement-API/Notifications.robot b/SOL005/NSPerformanceManagement-API/Notifications.robot
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/Notifications.robot
rename to SOL005/NSPerformanceManagement-API/Notifications.robot
diff --git a/SOL005/VNFPerformanceManagement-API/PMJobs.robot b/SOL005/NSPerformanceManagement-API/PMJobs.robot
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/PMJobs.robot
rename to SOL005/NSPerformanceManagement-API/PMJobs.robot
diff --git a/SOL005/VNFPerformanceManagement-API/Subscriptions.robot b/SOL005/NSPerformanceManagement-API/Subscriptions.robot
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/Subscriptions.robot
rename to SOL005/NSPerformanceManagement-API/Subscriptions.robot
diff --git a/SOL005/VNFPerformanceManagement-API/Thresholds.robot b/SOL005/NSPerformanceManagement-API/Thresholds.robot
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/Thresholds.robot
rename to SOL005/NSPerformanceManagement-API/Thresholds.robot
diff --git a/SOL005/VNFPerformanceManagement-API/environment/IndividualPmJob.txt b/SOL005/NSPerformanceManagement-API/environment/IndividualPmJob.txt
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/environment/IndividualPmJob.txt
rename to SOL005/NSPerformanceManagement-API/environment/IndividualPmJob.txt
diff --git a/SOL005/VNFPerformanceManagement-API/environment/individualSubscription.txt b/SOL005/NSPerformanceManagement-API/environment/individualSubscription.txt
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/environment/individualSubscription.txt
rename to SOL005/NSPerformanceManagement-API/environment/individualSubscription.txt
diff --git a/SOL005/VNFPerformanceManagement-API/environment/individualThresholds.txt b/SOL005/NSPerformanceManagement-API/environment/individualThresholds.txt
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/environment/individualThresholds.txt
rename to SOL005/NSPerformanceManagement-API/environment/individualThresholds.txt
diff --git a/SOL005/VNFPerformanceManagement-API/environment/notifications.txt b/SOL005/NSPerformanceManagement-API/environment/notifications.txt
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/environment/notifications.txt
rename to SOL005/NSPerformanceManagement-API/environment/notifications.txt
diff --git a/SOL005/VNFPerformanceManagement-API/environment/pmJobs.txt b/SOL005/NSPerformanceManagement-API/environment/pmJobs.txt
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/environment/pmJobs.txt
rename to SOL005/NSPerformanceManagement-API/environment/pmJobs.txt
diff --git a/SOL005/VNFPerformanceManagement-API/environment/reports.txt b/SOL005/NSPerformanceManagement-API/environment/reports.txt
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/environment/reports.txt
rename to SOL005/NSPerformanceManagement-API/environment/reports.txt
diff --git a/SOL005/VNFPerformanceManagement-API/environment/subscriptions.txt b/SOL005/NSPerformanceManagement-API/environment/subscriptions.txt
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/environment/subscriptions.txt
rename to SOL005/NSPerformanceManagement-API/environment/subscriptions.txt
diff --git a/SOL005/VNFPerformanceManagement-API/environment/thresholds.txt b/SOL005/NSPerformanceManagement-API/environment/thresholds.txt
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/environment/thresholds.txt
rename to SOL005/NSPerformanceManagement-API/environment/thresholds.txt
diff --git a/SOL005/VNFPerformanceManagement-API/environment/variables.txt b/SOL005/NSPerformanceManagement-API/environment/variables.txt
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/environment/variables.txt
rename to SOL005/NSPerformanceManagement-API/environment/variables.txt
diff --git a/SOL005/VNFPerformanceManagement-API/jsons/CreatePmJobRequest.json b/SOL005/NSPerformanceManagement-API/jsons/CreatePmJobRequest.json
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/jsons/CreatePmJobRequest.json
rename to SOL005/NSPerformanceManagement-API/jsons/CreatePmJobRequest.json
diff --git a/SOL005/VNFPerformanceManagement-API/jsons/CreateThresholdRequest.json b/SOL005/NSPerformanceManagement-API/jsons/CreateThresholdRequest.json
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/jsons/CreateThresholdRequest.json
rename to SOL005/NSPerformanceManagement-API/jsons/CreateThresholdRequest.json
diff --git a/SOL005/VNFPerformanceManagement-API/jsons/PerformanceInformationAvailableNotification.json b/SOL005/NSPerformanceManagement-API/jsons/PerformanceInformationAvailableNotification.json
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/jsons/PerformanceInformationAvailableNotification.json
rename to SOL005/NSPerformanceManagement-API/jsons/PerformanceInformationAvailableNotification.json
diff --git a/SOL005/VNFPerformanceManagement-API/jsons/ThresholdCrossedNotification.json b/SOL005/NSPerformanceManagement-API/jsons/ThresholdCrossedNotification.json
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/jsons/ThresholdCrossedNotification.json
rename to SOL005/NSPerformanceManagement-API/jsons/ThresholdCrossedNotification.json
diff --git a/SOL005/VNFPerformanceManagement-API/jsons/subscriptions.json b/SOL005/NSPerformanceManagement-API/jsons/subscriptions.json
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/jsons/subscriptions.json
rename to SOL005/NSPerformanceManagement-API/jsons/subscriptions.json
diff --git a/SOL005/VNFPerformanceManagement-API/schemas/PerformanceInformationAvailableNotification.schema.json b/SOL005/NSPerformanceManagement-API/schemas/PerformanceInformationAvailableNotification.schema.json
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/schemas/PerformanceInformationAvailableNotification.schema.json
rename to SOL005/NSPerformanceManagement-API/schemas/PerformanceInformationAvailableNotification.schema.json
diff --git a/SOL005/VNFPerformanceManagement-API/schemas/PerformanceReport.schema.json b/SOL005/NSPerformanceManagement-API/schemas/PerformanceReport.schema.json
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/schemas/PerformanceReport.schema.json
rename to SOL005/NSPerformanceManagement-API/schemas/PerformanceReport.schema.json
diff --git a/SOL005/VNFPerformanceManagement-API/schemas/PmJob.schema.json b/SOL005/NSPerformanceManagement-API/schemas/PmJob.schema.json
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/schemas/PmJob.schema.json
rename to SOL005/NSPerformanceManagement-API/schemas/PmJob.schema.json
diff --git a/SOL005/VNFPerformanceManagement-API/schemas/PmJobs.schema.json b/SOL005/NSPerformanceManagement-API/schemas/PmJobs.schema.json
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/schemas/PmJobs.schema.json
rename to SOL005/NSPerformanceManagement-API/schemas/PmJobs.schema.json
diff --git a/SOL005/VNFPerformanceManagement-API/schemas/PmSubscription.schema.json b/SOL005/NSPerformanceManagement-API/schemas/PmSubscription.schema.json
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/schemas/PmSubscription.schema.json
rename to SOL005/NSPerformanceManagement-API/schemas/PmSubscription.schema.json
diff --git a/SOL005/VNFPerformanceManagement-API/schemas/PmSubscriptions.schema.json b/SOL005/NSPerformanceManagement-API/schemas/PmSubscriptions.schema.json
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/schemas/PmSubscriptions.schema.json
rename to SOL005/NSPerformanceManagement-API/schemas/PmSubscriptions.schema.json
diff --git a/SOL005/VNFPerformanceManagement-API/schemas/ProblemDetails.schema.json b/SOL005/NSPerformanceManagement-API/schemas/ProblemDetails.schema.json
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/schemas/ProblemDetails.schema.json
rename to SOL005/NSPerformanceManagement-API/schemas/ProblemDetails.schema.json
diff --git a/SOL005/VNFPerformanceManagement-API/schemas/Subscriptions.schema.json b/SOL005/NSPerformanceManagement-API/schemas/Subscriptions.schema.json
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/schemas/Subscriptions.schema.json
rename to SOL005/NSPerformanceManagement-API/schemas/Subscriptions.schema.json
diff --git a/SOL005/VNFPerformanceManagement-API/schemas/Threshold.schema.json b/SOL005/NSPerformanceManagement-API/schemas/Threshold.schema.json
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/schemas/Threshold.schema.json
rename to SOL005/NSPerformanceManagement-API/schemas/Threshold.schema.json
diff --git a/SOL005/VNFPerformanceManagement-API/schemas/ThresholdCrossedNotification.schema.json b/SOL005/NSPerformanceManagement-API/schemas/ThresholdCrossedNotification.schema.json
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/schemas/ThresholdCrossedNotification.schema.json
rename to SOL005/NSPerformanceManagement-API/schemas/ThresholdCrossedNotification.schema.json
diff --git a/SOL005/VNFPerformanceManagement-API/schemas/Thresholds.schema.json b/SOL005/NSPerformanceManagement-API/schemas/Thresholds.schema.json
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/schemas/Thresholds.schema.json
rename to SOL005/NSPerformanceManagement-API/schemas/Thresholds.schema.json
diff --git a/SOL005/VNFPerformanceManagement-API/schemas/criteria.schema.json b/SOL005/NSPerformanceManagement-API/schemas/criteria.schema.json
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/schemas/criteria.schema.json
rename to SOL005/NSPerformanceManagement-API/schemas/criteria.schema.json
diff --git a/SOL005/VNFPerformanceManagement-API/schemas/links.schema.json b/SOL005/NSPerformanceManagement-API/schemas/links.schema.json
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/schemas/links.schema.json
rename to SOL005/NSPerformanceManagement-API/schemas/links.schema.json
diff --git a/SOL005/VNFPerformanceManagement-API/schemas/reports.schema.json b/SOL005/NSPerformanceManagement-API/schemas/reports.schema.json
similarity index 100%
rename from SOL005/VNFPerformanceManagement-API/schemas/reports.schema.json
rename to SOL005/NSPerformanceManagement-API/schemas/reports.schema.json