diff --git a/robot-systest/testsuite/basic_23-delete_vnf_package_SOL004_SOL007.robot b/robot-systest/testsuite/basic_23-sol004_sol007_packages.robot
similarity index 86%
rename from robot-systest/testsuite/basic_23-delete_vnf_package_SOL004_SOL007.robot
rename to robot-systest/testsuite/basic_23-sol004_sol007_packages.robot
index 5e58bab..1d870bb 100644
--- a/robot-systest/testsuite/basic_23-delete_vnf_package_SOL004_SOL007.robot
+++ b/robot-systest/testsuite/basic_23-sol004_sol007_packages.robot
@@ -11,7 +11,7 @@
 #   limitations under the License.
 
 *** Settings ***
-Documentation     [BASIC-23] Delete VNF SOL004 Package Before SOL007 NS Package.
+Documentation     [BASIC-23] Creation and deletion of SOL004 and SOL007 packages.
 
 Library   OperatingSystem
 Library   String
@@ -29,10 +29,10 @@
 
 *** Variables ***
 # NS and VNF descriptor package folder and ids
-${vnfd_pkg}   SOL004_hackfest_basic_vnf
-${vnfd_name}   SOL004_hackfest_basic-vnf
-${nsd_pkg}   SOL007_hackfest_basic_ns
-${nsd_name}   SOL007_hackfest_basic-ns
+${vnfd_pkg}   sol004_hackfest_basic_vnf
+${vnfd_name}   sol004_hackfest_basic-vnf
+${nsd_pkg}   sol007_hackfest_basic_ns
+${nsd_name}   sol007_hackfest_basic-ns
 
 
 *** Test Cases ***
diff --git a/robot-systest/testsuite/k8s_10-k8s_proxy_charms_SOL004_SOL007.robot b/robot-systest/testsuite/k8s_10-sol004_sol007_with_k8s_proxy_charms.robot
similarity index 95%
rename from robot-systest/testsuite/k8s_10-k8s_proxy_charms_SOL004_SOL007.robot
rename to robot-systest/testsuite/k8s_10-sol004_sol007_with_k8s_proxy_charms.robot
index efd5f32..4718eb1 100644
--- a/robot-systest/testsuite/k8s_10-k8s_proxy_charms_SOL004_SOL007.robot
+++ b/robot-systest/testsuite/k8s_10-sol004_sol007_with_k8s_proxy_charms.robot
@@ -28,10 +28,10 @@
 
 *** Variables ***
 # NS and VNF descriptor package folder and ids
-${vnfd_pkg}   charm-packages/SOL004_k8s_proxy_charm_vnf
-${vnfd_name}   SOL004_k8s_proxy_charm-vnf
-${nsd_pkg}   charm-packages/SOL007_k8s_proxy_charm_ns
-${nsd_name}   SOL007_k8s_proxy_charm-ns
+${vnfd_pkg}   charm-packages/sol004_k8s_proxy_charm_vnf
+${vnfd_name}   sol004_k8s_proxy_charm-vnf
+${nsd_pkg}   charm-packages/sol007_k8s_proxy_charm_ns
+${nsd_name}   sol007_k8s_proxy_charm-ns
 
 # NS instance name and configuration
 ${ns_name}   k8s_10-k8s_proxy_charm