diff --git a/lava-expect/README.md b/expect-lava/README.md
similarity index 91%
rename from lava-expect/README.md
rename to expect-lava/README.md
index 4c4a105..9fd5821 100644
--- a/lava-expect/README.md
+++ b/expect-lava/README.md
@@ -1,19 +1,19 @@
 # Expect Scripts
 
 The project tracks two set of expect scripts under two different folders, `expect` and
-`lava-expect`, the former required for local (non-LAVA) or Internal CI (Arm CI) and
+`expect-lava`, the former required for local (non-LAVA) or Internal CI (Arm CI) and
 the latter for Open CI (LAVA). Note that any contribution into the expect scripts
 **must be done in both folders**, otherwise expect test coverage will differ.
 
 ## LAVA Test Actions
 
-The `lava-expect` script does exactly the same as its counterpart under the `expect`
+The `expect-lava` script does exactly the same as its counterpart under the `expect`
 folder. However, LAVA would use either [Interactive Test Actions](https://validation.linaro.org/static/docs/v2/actions-test.html#interactive-test-action)
 or [Monitor Test Actions](https://validation.linaro.org/static/docs/v2/monitors.html) to
 support possible scenarios. In other words, expect scripts are transformed into either
 interactive or monitor test actions.
 
-In the `lava-expect` scripts, both types of actions, interactive and monitor, are defined
+In the `expect-lava` scripts, both types of actions, interactive and monitor, are defined
 using the same array variable, `expect_string` but each array element would contain either
 a leading `i` indicating interactive actions or `m` indicating monitor actions.
 
@@ -34,8 +34,8 @@
 
 ### Interactive Actions Strings
 
-To better understand how `expect` scripts translates into `lava-expect`, we can compare similar
-scripts, i.e. `expect/disable_dyn_auth_tftf.exp` versus `lava-expect/disable_dyn_auth_tftf.exp` which only requires interactive
+To better understand how `expect` scripts translates into `expect-lava`, we can compare similar
+scripts, i.e. `expect/disable_dyn_auth_tftf.exp` versus `expect-lava/disable_dyn_auth_tftf.exp` which only requires interactive
 actions. Let's compare these two:
 
 * `expect/disable_dyn_auth_tftf.exp`
@@ -67,10 +67,10 @@
 exit_uart -1
 ```
 
-* and its counterpart `lava-expect/disable_dyn_auth_tftf.exp` (note, the same filename but different folder)
+* and its counterpart `expect-lava/disable_dyn_auth_tftf.exp` (note, the same filename but different folder)
 
 ```
-source $ci_root/lava-expect/disable_dyn_auth.inc
+source $ci_root/expect-lava/disable_dyn_auth.inc
 
 prompt='Booting trusted firmware test framework'
 expect_string+=("i;${prompt}")
@@ -89,7 +89,7 @@
 The first thing to notice is that all strings are literal (no regex is required) and each are expected
 just once, so interactive actions are the choice.
 
-As seen, the same *expect strings* appears in both, but in case of `lava-expect/disable_dyn_auth_tftf.exp`,
+As seen, the same *expect strings* appears in both, but in case of `expect-lava/disable_dyn_auth_tftf.exp`,
 is it written in *bash* language and **appending** elements into `expect_string`, which is the variable
 that ultimately is transformed into interactive test actions by CI scripts.
 
@@ -192,7 +192,7 @@
 }
 ```
 
-which is translated into `lava-expect/linux-tpm.exp`
+which is translated into `expect-lava/linux-tpm.exp`
 
 ```
 non_zero_pcr='(?!(\s00){16})((\s([0-9a-f]){2}){16}\s)'
diff --git a/lava-expect/busybox.inc b/expect-lava/busybox.inc
similarity index 100%
rename from lava-expect/busybox.inc
rename to expect-lava/busybox.inc
diff --git a/lava-expect/cactus.exp b/expect-lava/cactus.exp
similarity index 83%
rename from lava-expect/cactus.exp
rename to expect-lava/cactus.exp
index 71ffe16..6400aac 100644
--- a/lava-expect/cactus.exp
+++ b/expect-lava/cactus.exp
@@ -8,4 +8,4 @@
 
 expect_string+=('i;Booting test Secure Partition Cactus')
 
-source $ci_root/lava-expect/uart-hold.inc
+source $ci_root/expect-lava/uart-hold.inc
diff --git a/lava-expect/crash_panic.exp b/expect-lava/crash_panic.exp
similarity index 100%
rename from lava-expect/crash_panic.exp
rename to expect-lava/crash_panic.exp
diff --git a/lava-expect/crash_roxlattables_unhandled_exception_at_el3.exp b/expect-lava/crash_roxlattables_unhandled_exception_at_el3.exp
similarity index 100%
rename from lava-expect/crash_roxlattables_unhandled_exception_at_el3.exp
rename to expect-lava/crash_roxlattables_unhandled_exception_at_el3.exp
diff --git a/lava-expect/crash_test.exp b/expect-lava/crash_test.exp
similarity index 100%
rename from lava-expect/crash_test.exp
rename to expect-lava/crash_test.exp
diff --git a/lava-expect/disable_dyn_auth.inc b/expect-lava/disable_dyn_auth.inc
similarity index 100%
rename from lava-expect/disable_dyn_auth.inc
rename to expect-lava/disable_dyn_auth.inc
diff --git a/lava-expect/tftf.exp b/expect-lava/disable_dyn_auth_tftf.exp
similarity index 89%
rename from lava-expect/tftf.exp
rename to expect-lava/disable_dyn_auth_tftf.exp
index 6c7e8fd..71f29c0 100644
--- a/lava-expect/tftf.exp
+++ b/expect-lava/disable_dyn_auth_tftf.exp
@@ -6,7 +6,7 @@
 # Expect script for Trusted Firmware Test Framework
 #
 
-source $ci_root/lava-expect/trusted-firmware.inc
+source $ci_root/expect-lava/disable_dyn_auth.inc
 
 prompt='Booting trusted firmware test framework'
 expect_string+=("i;${prompt}")
diff --git a/lava-expect/el3-test-payload.exp b/expect-lava/el3-test-payload.exp
similarity index 87%
rename from lava-expect/el3-test-payload.exp
rename to expect-lava/el3-test-payload.exp
index a5f46f5..3c0347b 100644
--- a/lava-expect/el3-test-payload.exp
+++ b/expect-lava/el3-test-payload.exp
@@ -9,7 +9,7 @@
 #
 
 # Trusted Firmware boot section
-source $ci_root/lava-expect/trusted-firmware.inc
+source $ci_root/expect-lava/trusted-firmware.inc
 
 expect_string+=('i;Booting the EL3 test payload')
 expect_string+=('i;All CPUs booted!')
diff --git a/lava-expect/fvp-r-yocto.exp b/expect-lava/fvp-r-yocto.exp
similarity index 100%
rename from lava-expect/fvp-r-yocto.exp
rename to expect-lava/fvp-r-yocto.exp
diff --git a/lava-expect/hold_uart.exp b/expect-lava/hold_uart.exp
similarity index 100%
rename from lava-expect/hold_uart.exp
rename to expect-lava/hold_uart.exp
diff --git a/lava-expect/ivy.exp b/expect-lava/ivy.exp
similarity index 83%
rename from lava-expect/ivy.exp
rename to expect-lava/ivy.exp
index facb929..c5e2b50 100644
--- a/lava-expect/ivy.exp
+++ b/expect-lava/ivy.exp
@@ -8,4 +8,4 @@
 
 expect_string+=('i;Booting test Secure Partition Ivy')
 
-source $ci_root/lava-expect/uart-hold.inc
+source $ci_root/expect-lava/uart-hold.inc
diff --git a/lava-expect/linux-bl33.exp b/expect-lava/linux-bl33.exp
similarity index 92%
rename from lava-expect/linux-bl33.exp
rename to expect-lava/linux-bl33.exp
index 5135a41..8224534 100644
--- a/lava-expect/linux-bl33.exp
+++ b/expect-lava/linux-bl33.exp
@@ -7,7 +7,7 @@
 #
 
 # Trusted Firmware boot section
-source $ci_root/lava-expect/trusted-firmware.inc
+source $ci_root/expect-lava/trusted-firmware.inc
 
 # Linux kernel boot section
 expect_string+=('i;Booting Linux on physical CPU')
diff --git a/lava-expect/linux-oe-rst-bl31.exp b/expect-lava/linux-oe-rst-bl31.exp
similarity index 69%
rename from lava-expect/linux-oe-rst-bl31.exp
rename to expect-lava/linux-oe-rst-bl31.exp
index 85457da..1c54d71 100644
--- a/lava-expect/linux-oe-rst-bl31.exp
+++ b/expect-lava/linux-oe-rst-bl31.exp
@@ -9,10 +9,10 @@
 #
 
 # Trusted Firmware boot section
-source $ci_root/lava-expect/trusted-firmware-rst-to-bl31.inc
+source $ci_root/expect-lava/trusted-firmware-rst-to-bl31.inc
 
 # Linux kernel boot section
-source $ci_root/lava-expect/linux.inc
+source $ci_root/expect-lava/linux.inc
 
 # OpenEmbedded filesystem section
-source $ci_root/lava-expect/openembedded.inc
+source $ci_root/expect-lava/openembedded.inc
diff --git a/lava-expect/linux-oe.exp b/expect-lava/linux-oe.exp
similarity index 69%
rename from lava-expect/linux-oe.exp
rename to expect-lava/linux-oe.exp
index 9da20c6..1dc8ae4 100644
--- a/lava-expect/linux-oe.exp
+++ b/expect-lava/linux-oe.exp
@@ -8,10 +8,10 @@
 #
 
 # Trusted Firmware boot section
-source $ci_root/lava-expect/trusted-firmware.inc
+source $ci_root/expect-lava/trusted-firmware.inc
 
 # Linux kernel boot section
-source $ci_root/lava-expect/linux.inc
+source $ci_root/expect-lava/linux.inc
 
 # OpenEmbedded filesystem section
-source $ci_root/lava-expect/openembedded.inc
+source $ci_root/expect-lava/openembedded.inc
diff --git a/lava-expect/linux-rd-busybox-aarch32.exp b/expect-lava/linux-rd-busybox-aarch32.exp
similarity index 74%
rename from lava-expect/linux-rd-busybox-aarch32.exp
rename to expect-lava/linux-rd-busybox-aarch32.exp
index 13af72f..3c9d660 100644
--- a/lava-expect/linux-rd-busybox-aarch32.exp
+++ b/expect-lava/linux-rd-busybox-aarch32.exp
@@ -10,10 +10,10 @@
 #
 
 # Trusted Firmware boot section
-source $ci_root/lava-expect/trusted-firmware-aarch32.inc
+source $ci_root/expect-lava/trusted-firmware-aarch32.inc
 
 # Linux kernel boot section
-source $ci_root/lava-expect/linux.inc
+source $ci_root/expect-lava/linux.inc
 
 # Busybox filesystem section
-source $ci_root/lava-expect/busybox.inc
+source $ci_root/expect-lava/busybox.inc
diff --git a/lava-expect/linux-rd-busybox.exp b/expect-lava/linux-rd-busybox.exp
similarity index 68%
rename from lava-expect/linux-rd-busybox.exp
rename to expect-lava/linux-rd-busybox.exp
index 4d6465f..ca389a9 100644
--- a/lava-expect/linux-rd-busybox.exp
+++ b/expect-lava/linux-rd-busybox.exp
@@ -7,10 +7,10 @@
 #
 
 # Trusted Firmware boot section
-source $ci_root/lava-expect/trusted-firmware.inc
+source $ci_root/expect-lava/trusted-firmware.inc
 
 # Linux kernel boot section
-source $ci_root/lava-expect/linux.inc
+source $ci_root/expect-lava/linux.inc
 
 # Busybox filesystem section
-source $ci_root/lava-expect/busybox.inc
+source $ci_root/expect-lava/busybox.inc
diff --git a/lava-expect/linux-tpm-384.exp b/expect-lava/linux-tpm-384.exp
similarity index 100%
rename from lava-expect/linux-tpm-384.exp
rename to expect-lava/linux-tpm-384.exp
diff --git a/lava-expect/linux-tpm.exp b/expect-lava/linux-tpm.exp
similarity index 100%
rename from lava-expect/linux-tpm.exp
rename to expect-lava/linux-tpm.exp
diff --git a/lava-expect/linux.inc b/expect-lava/linux.inc
similarity index 100%
rename from lava-expect/linux.inc
rename to expect-lava/linux.inc
diff --git a/lava-expect/openembedded.inc b/expect-lava/openembedded.inc
similarity index 100%
rename from lava-expect/openembedded.inc
rename to expect-lava/openembedded.inc
diff --git a/lava-expect/readonly_el1_xlat_tables.exp b/expect-lava/readonly_el1_xlat_tables.exp
similarity index 100%
rename from lava-expect/readonly_el1_xlat_tables.exp
rename to expect-lava/readonly_el1_xlat_tables.exp
diff --git a/lava-expect/spm-edk2-uart0.exp b/expect-lava/spm-edk2-uart0.exp
similarity index 91%
rename from lava-expect/spm-edk2-uart0.exp
rename to expect-lava/spm-edk2-uart0.exp
index 77fdb97..c914cc6 100644
--- a/lava-expect/spm-edk2-uart0.exp
+++ b/expect-lava/spm-edk2-uart0.exp
@@ -9,7 +9,7 @@
 #
 
 # Trusted Firmware boot section
-source $ci_root/lava-expect/trusted-firmware.inc
+source $ci_root/expect-lava/trusted-firmware.inc
 
 # EDK2 section
 expect_string+=('i;UEFI firmware')
diff --git a/lava-expect/spm-edk2-uart2.exp b/expect-lava/spm-edk2-uart2.exp
similarity index 100%
rename from lava-expect/spm-edk2-uart2.exp
rename to expect-lava/spm-edk2-uart2.exp
diff --git a/lava-expect/spm-linux-uart0.exp b/expect-lava/spm-linux-uart0.exp
similarity index 100%
rename from lava-expect/spm-linux-uart0.exp
rename to expect-lava/spm-linux-uart0.exp
diff --git a/lava-expect/spm-optee-sp-uart1.exp b/expect-lava/spm-optee-sp-uart1.exp
similarity index 100%
rename from lava-expect/spm-optee-sp-uart1.exp
rename to expect-lava/spm-optee-sp-uart1.exp
diff --git a/lava-expect/spm-uart2.exp b/expect-lava/spm-uart2.exp
similarity index 100%
rename from lava-expect/spm-uart2.exp
rename to expect-lava/spm-uart2.exp
diff --git a/lava-expect/tftf-aarch32.exp b/expect-lava/tftf-aarch32.exp
similarity index 88%
rename from lava-expect/tftf-aarch32.exp
rename to expect-lava/tftf-aarch32.exp
index 9d6f628..2f52c6c 100644
--- a/lava-expect/tftf-aarch32.exp
+++ b/expect-lava/tftf-aarch32.exp
@@ -6,7 +6,7 @@
 # Expect script for Trusted Firmware Test Framework
 #
 
-source $ci_root/lava-expect/trusted-firmware-aarch32.inc
+source $ci_root/expect-lava/trusted-firmware-aarch32.inc
 
 prompt='Booting trusted firmware test framework'
 expect_string+=("i;${prompt}")
diff --git a/lava-expect/tftf.exp b/expect-lava/tftf.exp
similarity index 89%
copy from lava-expect/tftf.exp
copy to expect-lava/tftf.exp
index 6c7e8fd..68b5b5c 100644
--- a/lava-expect/tftf.exp
+++ b/expect-lava/tftf.exp
@@ -6,7 +6,7 @@
 # Expect script for Trusted Firmware Test Framework
 #
 
-source $ci_root/lava-expect/trusted-firmware.inc
+source $ci_root/expect-lava/trusted-firmware.inc
 
 prompt='Booting trusted firmware test framework'
 expect_string+=("i;${prompt}")
diff --git a/lava-expect/tftf_fault.exp b/expect-lava/tftf_fault.exp
similarity index 100%
rename from lava-expect/tftf_fault.exp
rename to expect-lava/tftf_fault.exp
diff --git a/lava-expect/timeout.exp b/expect-lava/timeout.exp
similarity index 100%
rename from lava-expect/timeout.exp
rename to expect-lava/timeout.exp
diff --git a/lava-expect/timeout_spmin_roxlattables.exp b/expect-lava/timeout_spmin_roxlattables.exp
similarity index 100%
rename from lava-expect/timeout_spmin_roxlattables.exp
rename to expect-lava/timeout_spmin_roxlattables.exp
diff --git a/lava-expect/timeout_test.exp b/expect-lava/timeout_test.exp
similarity index 100%
rename from lava-expect/timeout_test.exp
rename to expect-lava/timeout_test.exp
diff --git a/lava-expect/tpm-logs.exp b/expect-lava/tpm-logs.exp
similarity index 100%
rename from lava-expect/tpm-logs.exp
rename to expect-lava/tpm-logs.exp
diff --git a/lava-expect/trusted-firmware-aarch32.inc b/expect-lava/trusted-firmware-aarch32.inc
similarity index 100%
rename from lava-expect/trusted-firmware-aarch32.inc
rename to expect-lava/trusted-firmware-aarch32.inc
diff --git a/lava-expect/trusted-firmware-load-error.exp b/expect-lava/trusted-firmware-load-error.exp
similarity index 100%
rename from lava-expect/trusted-firmware-load-error.exp
rename to expect-lava/trusted-firmware-load-error.exp
diff --git a/lava-expect/trusted-firmware-rst-to-bl31.inc b/expect-lava/trusted-firmware-rst-to-bl31.inc
similarity index 100%
rename from lava-expect/trusted-firmware-rst-to-bl31.inc
rename to expect-lava/trusted-firmware-rst-to-bl31.inc
diff --git a/lava-expect/trusted-firmware.inc b/expect-lava/trusted-firmware.inc
similarity index 100%
rename from lava-expect/trusted-firmware.inc
rename to expect-lava/trusted-firmware.inc
diff --git a/lava-expect/tsp.exp b/expect-lava/tsp.exp
similarity index 100%
rename from lava-expect/tsp.exp
rename to expect-lava/tsp.exp
diff --git a/lava-expect/uart-hold.inc b/expect-lava/uart-hold.inc
similarity index 100%
rename from lava-expect/uart-hold.inc
rename to expect-lava/uart-hold.inc
diff --git a/lava-expect/ubsan-test-trap.exp b/expect-lava/ubsan-test-trap.exp
similarity index 100%
rename from lava-expect/ubsan-test-trap.exp
rename to expect-lava/ubsan-test-trap.exp
diff --git a/lava-expect/unhandled_exception_at_el3.exp b/expect-lava/unhandled_exception_at_el3.exp
similarity index 100%
rename from lava-expect/unhandled_exception_at_el3.exp
rename to expect-lava/unhandled_exception_at_el3.exp
diff --git a/fvp_utils.sh b/fvp_utils.sh
index 5265c50..546bfba 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -689,7 +689,7 @@
         fi
 
         # Get all expect strings
-        expect_file=$ci_root/lava-expect/${expect_file}
+        expect_file=$ci_root/expect-lava/${expect_file}
         source $expect_file
 
 
diff --git a/lava-expect/disable_dyn_auth_tftf.exp b/lava-expect/disable_dyn_auth_tftf.exp
deleted file mode 100644
index 0b77f05..0000000
--- a/lava-expect/disable_dyn_auth_tftf.exp
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (c) 2021 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-# Expect script for Trusted Firmware Test Framework
-#
-
-source $ci_root/lava-expect/disable_dyn_auth.inc
-
-prompt='Booting trusted firmware test framework'
-expect_string+=("i;${prompt}")
-
-prompt='Running at NS-EL(1|2)'
-expect_string+=("i;${prompt}")
-
-prompt='Tests Failed  : 0'
-expect_string+=("i;${prompt}")
-
-prompt='Exiting tests.'
-failures='Tests Passed  : 0'
-expect_string+=("i;${prompt};;${failures}")