diff --git a/admin/tool/lp/tests/behat/course_competencies.feature b/admin/tool/lp/tests/behat/course_competencies.feature
index 44a15161c70..b0e443bc1ae 100644
--- a/admin/tool/lp/tests/behat/course_competencies.feature
+++ b/admin/tool/lp/tests/behat/course_competencies.feature
@@ -4,13 +4,13 @@ Feature: See the competencies for an activity on the course competencies page.
   In order to see only the competencies for an activity in the course competencies page.
 
   Background:
-    Given the following lp "frameworks" exist:
+    Given the following "core_competency > frameworks" exist:
       | shortname | idnumber |
       | Test-Framework | ID-FW1 |
-    And the following lp "competencies" exist:
-      | shortname | framework |
-      | Test-Comp1 | ID-FW1 |
-      | Test-Comp2 | ID-FW1 |
+    And the following "core_competency > competencies" exist:
+      | shortname  | competencyframework |
+      | Test-Comp1 | ID-FW1              |
+      | Test-Comp2 | ID-FW1              |
     Given the following "courses" exist:
       | shortname | fullname   | enablecompletion |
       | C1        | Course 1   | 1                |
diff --git a/admin/tool/lp/tests/behat/framework_crud.feature b/admin/tool/lp/tests/behat/framework_crud.feature
index 584b025a92f..c290a905a2f 100644
--- a/admin/tool/lp/tests/behat/framework_crud.feature
+++ b/admin/tool/lp/tests/behat/framework_crud.feature
@@ -29,7 +29,7 @@ Feature: Manage competency frameworks
     And I should see "Science Year-1"
 
   Scenario: Read a framework
-    Given the following lp "frameworks" exist:
+    Given the following "core_competency > frameworks" exist:
       | shortname | idnumber |
       | Science Year-2 | sc-y-2 |
     And I navigate to "Competencies > Competency frameworks" in site administration
@@ -38,7 +38,7 @@ Feature: Manage competency frameworks
     Then I should see "Science Year-2"
 
   Scenario: Edit a framework
-    Given the following lp "frameworks" exist:
+    Given the following "core_competency > frameworks" exist:
       | shortname | idnumber |
       | Science Year-3 | sc-y-3 |
     And I navigate to "Competencies > Competency frameworks" in site administration
@@ -52,7 +52,7 @@ Feature: Manage competency frameworks
     And I should see "sc-y-3"
 
   Scenario: Delete a framework
-    Given the following lp "frameworks" exist:
+    Given the following "core_competency > frameworks" exist:
       | shortname | idnumber |
       | Science Year-4 | sc-y-4 |
     And I navigate to "Competencies > Competency frameworks" in site administration
@@ -70,14 +70,14 @@ Feature: Manage competency frameworks
     And I should not see "sc-y-4"
 
   Scenario: Edit a framework with competencies in user competency
-    Given the following lp "frameworks" exist:
+    Given the following "core_competency > frameworks" exist:
       | shortname | idnumber |
       | Science Year-5 | sc-y-5 |
-    And the following lp "competencies" exist:
-      | shortname | framework |
-      | Comp1 | sc-y-5 |
-      | Comp2 | sc-y-5 |
-    And the following lp "plans" exist:
+    And the following "core_competency > competencies" exist:
+      | shortname | competencyframework |
+      | Comp1     | sc-y-5              |
+      | Comp2     | sc-y-5              |
+    And the following "core_competency > plans" exist:
       | name | user | description |
       | Plan Science-5 | admin | Plan description |
     And the following lp "plancompetencies" exist:
@@ -100,14 +100,14 @@ Feature: Manage competency frameworks
     And I should see "sc-y-5"
 
   Scenario: Edit a framework with competencies in user competency plan
-    Given the following lp "frameworks" exist:
+    Given the following "core_competency > frameworks" exist:
       | shortname | idnumber |
       | Science Year-6 | sc-y-6 |
-    And the following lp "competencies" exist:
-      | shortname | framework |
-      | Comp1 | sc-y-6 |
-      | Comp2 | sc-y-6 |
-    And the following lp "plans" exist:
+    And the following "core_competency > competencies" exist:
+      | shortname | competencyframework |
+      | Comp1     | sc-y-6              |
+      | Comp2     | sc-y-6              |
+    And the following "core_competency > plans" exist:
       | name | user | description |
       | Plan Science-6 | admin | Plan description |
     And the following lp "plancompetencies" exist:
@@ -130,12 +130,12 @@ Feature: Manage competency frameworks
     And I should see "sc-y-6"
 
   Scenario: Duplicate a competency framework
-    Given the following lp "frameworks" exist:
+    Given the following "core_competency > frameworks" exist:
       | shortname | idnumber |
       | CF1       | CF1      |
-    And the following lp "competencies" exist:
-      | shortname | framework |
-      | C1        | CF1       |
+    And the following "core_competency > competencies" exist:
+      | shortname | competencyframework |
+      | C1        | CF1                 |
     And I navigate to "Competencies > Competency frameworks" in site administration
     # Duplicate the selected competency framework
     When I click on "Duplicate" of edit menu in the "CF1" row
diff --git a/admin/tool/lp/tests/behat/plan_crud.feature b/admin/tool/lp/tests/behat/plan_crud.feature
index 4e7554e5ea2..ae6bb8d7a78 100644
--- a/admin/tool/lp/tests/behat/plan_crud.feature
+++ b/admin/tool/lp/tests/behat/plan_crud.feature
@@ -62,7 +62,7 @@ Feature: Manage plearning plan
     And I should see "Student 2"
 
   Scenario: Read a learning plan
-    Given the following lp "plans" exist:
+    Given the following "core_competency > plans" exist:
       | name | user | description |
       | Science plan Year-1 | admin | science plan description |
     And I follow "Learning plans"
@@ -72,16 +72,16 @@ Feature: Manage plearning plan
     And I should see "Learning plan competencies"
 
   Scenario: Manage a learning plan competencies
-    Given the following lp "plans" exist:
+    Given the following "core_competency > plans" exist:
       | name | user | description |
       | Science plan Year-manage | admin | science plan description |
-    And the following lp "frameworks" exist:
+    And the following "core_competency > frameworks" exist:
       | shortname | idnumber |
       | Framework 1 | sc-y-2 |
-    And the following lp "competencies" exist:
-      | shortname | framework |
-      | comp1 | sc-y-2 |
-      | comp2 | sc-y-2 |
+    And the following "core_competency > competencies" exist:
+      | shortname | competencyframework |
+      | comp1     | sc-y-2              |
+      | comp2     | sc-y-2              |
     And I follow "Learning plans"
     And I should see "Science plan Year-manage"
     And I follow "Science plan Year-manage"
@@ -98,7 +98,7 @@ Feature: Manage plearning plan
     And "comp1" "table_row" should not exist
 
   Scenario: Edit a learning plan
-    Given the following lp "plans" exist:
+    Given the following "core_competency > plans" exist:
       | name | user | description |
       | Science plan Year-2 | admin | science plan description |
       | Science plan Year-3 | admin | science plan description |
@@ -113,7 +113,7 @@ Feature: Manage plearning plan
     And I should see "Science plan Year-3 Edited"
 
   Scenario: Delete a learning plan
-    Given the following lp "plans" exist:
+    Given the following "core_competency > plans" exist:
       | name | user | description |
       | Science plan Year-4 | admin | science plan description |
     And I follow "Learning plans"
@@ -130,16 +130,16 @@ Feature: Manage plearning plan
     Then I should not see "Science plan Year-4"
 
   Scenario: See a learning plan from a course
-    Given the following lp "plans" exist:
+    Given the following "core_competency > plans" exist:
       | name | user | description |
       | Science plan Year-manage | admin | science plan description |
-    And the following lp "frameworks" exist:
+    And the following "core_competency > frameworks" exist:
       | shortname | idnumber |
       | Framework 1 | sc-y-2 |
-    And the following lp "competencies" exist:
-      | shortname | framework |
-      | comp1 | sc-y-2 |
-      | comp2 | sc-y-2 |
+    And the following "core_competency > competencies" exist:
+      | shortname | competencyframework |
+      | comp1     | sc-y-2              |
+      | comp2     | sc-y-2              |
     And I follow "Learning plans"
     And I should see "Science plan Year-manage"
     And I follow "Science plan Year-manage"
diff --git a/admin/tool/lp/tests/behat/plan_workflow.feature b/admin/tool/lp/tests/behat/plan_workflow.feature
index c68a07cafff..7f350bb604c 100644
--- a/admin/tool/lp/tests/behat/plan_workflow.feature
+++ b/admin/tool/lp/tests/behat/plan_workflow.feature
@@ -31,14 +31,14 @@ Feature: Manage plan workflow
       | user1 | usermanageowndraftplan | System |  |
       | user2 | usermanageownplan | System |  |
       | manager1 | manageplan | System |  |
-    And the following lp "frameworks" exist:
+    And the following "core_competency > frameworks" exist:
       | shortname | idnumber |
       | Test-Framework | ID-FW1 |
-    And the following lp "competencies" exist:
-      | shortname | framework |
-      | Test-Comp1 | ID-FW1 |
-      | Test-Comp2 | ID-FW1 |
-    And the following lp "plans" exist:
+    And the following "core_competency > competencies" exist:
+      | shortname  | competencyframework |
+      | Test-Comp1 | ID-FW1              |
+      | Test-Comp2 | ID-FW1              |
+    And the following "core_competency > plans" exist:
       | name | user | description |
       | Test-Plan1 | user1 | Description of plan for user 1 |
       | Test-Plan2 | user2 | Description of plan for user 2 |
@@ -89,7 +89,7 @@ Feature: Manage plan workflow
     And I log out
 
   Scenario: Manager can see learning plan with status waiting for review
-    Given  the following lp "plans" exist:
+    Given  the following "core_competency > plans" exist:
       | name | user | description | status |
       | Test-Plan3 | user2 | Description of plan 3 for user 1 | waiting for review |
       | Test-Plan4 | user1 | Description of plan 3 for user 1 | draft |
@@ -99,7 +99,7 @@ Feature: Manage plan workflow
     And I log out
 
   Scenario: Manager can start review of learning plan with status waiting for review
-    Given  the following lp "plans" exist:
+    Given  the following "core_competency > plans" exist:
       | name | user | description | status |
       | Test-Plan3 | user1 | Description of plan 3 for user 1 | waiting for review |
     And I log in as "manager1"
@@ -111,7 +111,7 @@ Feature: Manage plan workflow
     And I log out
 
   Scenario: Manager can reject a learning plan with status in review
-    Given  the following lp "plans" exist:
+    Given  the following "core_competency > plans" exist:
       | name | user | description | status | reviewer |
       | Test-Plan3 | user1 | Description of plan 3 for user 1 | in review | manager1 |
     And I log in as "manager1"
@@ -124,7 +124,7 @@ Feature: Manage plan workflow
     And I log out
 
   Scenario: Manager can accept a learning plan with status in review
-    Given  the following lp "plans" exist:
+    Given  the following "core_competency > plans" exist:
       | name | user | description | status | reviewer |
       | Test-Plan3 | user1 | Description of plan 3 for user 1 | in review | manager1 |
     And I log in as "manager1"
@@ -137,7 +137,7 @@ Feature: Manage plan workflow
     And I log out
 
   Scenario: Manager send back to draft an active learning plan
-    Given  the following lp "plans" exist:
+    Given  the following "core_competency > plans" exist:
       | name | user | description | status | reviewer |
       | Test-Plan3 | user1 | Description of plan 3 for user 1 | active | manager1 |
       | Test-Plan4 | user1 | Description of plan 4 for user 1 | active | manager1 |
@@ -153,7 +153,7 @@ Feature: Manage plan workflow
     And I log out
 
   Scenario: Manager change an active learning plan to completed
-    Given  the following lp "plans" exist:
+    Given  the following "core_competency > plans" exist:
       | name | user | description | status | reviewer |
       | Test-Plan3 | user1 | Description of plan 3 for user 1 | active | manager1 |
       | Test-Plan4 | user1 | Description of plan 4 for user 1 | active | manager1 |
@@ -172,7 +172,7 @@ Feature: Manage plan workflow
     And I log out
 
   Scenario: Manager reopen a complete learning plan
-    Given  the following lp "plans" exist:
+    Given  the following "core_competency > plans" exist:
       | name | user | description | status | reviewer |
       | Test-Plan3 | user1 | Description of plan 3 for user 1 | complete | manager1 |
       | Test-Plan4 | user1 | Description of plan 4 for user 1 | complete | manager1 |
diff --git a/admin/tool/lp/tests/behat/user_evidence_comp_link.feature b/admin/tool/lp/tests/behat/user_evidence_comp_link.feature
index 8d8dd5f1c69..20db85cc54d 100644
--- a/admin/tool/lp/tests/behat/user_evidence_comp_link.feature
+++ b/admin/tool/lp/tests/behat/user_evidence_comp_link.feature
@@ -5,14 +5,14 @@ Feature: Manage competencies linked to evidence of prior learning
   I need to link and unlink competencies from evidence of prior learning
 
   Background:
-    Given the following lp "frameworks" exist:
+    Given the following "core_competency > frameworks" exist:
       | shortname | idnumber |
       | Test-Framework | ID-FW1 |
-    And the following lp "competencies" exist:
-      | shortname | framework |
-      | Test-Comp1 | ID-FW1 |
-      | Test-Comp2 | ID-FW1 |
-    And the following lp "plans" exist:
+    And the following "core_competency > competencies" exist:
+      | shortname  | competencyframework |
+      | Test-Comp1 | ID-FW1              |
+      | Test-Comp2 | ID-FW1              |
+    And the following "core_competency > plans" exist:
       | name | user | description |
       | Test-Plan | admin | Plan description |
     And the following lp "plancompetencies" exist:
diff --git a/badges/tests/behat/criteria_competency.feature b/badges/tests/behat/criteria_competency.feature
index 2404932b309..788917780c9 100644
--- a/badges/tests/behat/criteria_competency.feature
+++ b/badges/tests/behat/criteria_competency.feature
@@ -14,13 +14,13 @@ Feature: Award badges based on competency completion
     And the following "course enrolments" exist:
       | user | course | role |
       | user1 | C1 | student |
-    And the following lp "frameworks" exist:
+    And the following "core_competency > frameworks" exist:
       | shortname | idnumber |
       | Framework 1 | sc-y-2 |
-    And the following lp "competencies" exist:
-      | shortname | framework |
-      | comp1 | sc-y-2 |
-      | comp2 | sc-y-2 |
+    And the following "core_competency > competencies" exist:
+      | shortname | competencyframework |
+      | comp1     | sc-y-2              |
+      | comp2     | sc-y-2              |
     And I log in as "admin"
 
   @javascript
diff --git a/report/competency/tests/behat/breakdown_by_activity.feature b/report/competency/tests/behat/breakdown_by_activity.feature
index bc050c5d102..0cbc1bfce17 100644
--- a/report/competency/tests/behat/breakdown_by_activity.feature
+++ b/report/competency/tests/behat/breakdown_by_activity.feature
@@ -5,13 +5,13 @@ Feature: See the competencies for an activity
   I need to see the competencies linked to one activity in the breakdown report.
 
   Background:
-    Given the following lp "frameworks" exist:
+    Given the following "core_competency > frameworks" exist:
       | shortname | idnumber |
       | Test-Framework | ID-FW1 |
-    And the following lp "competencies" exist:
-      | shortname | framework |
-      | Test-Comp1 | ID-FW1 |
-      | Test-Comp2 | ID-FW1 |
+    And the following "core_competency > competencies" exist:
+      | shortname  | competencyframework |
+      | Test-Comp1 | ID-FW1              |
+      | Test-Comp2 | ID-FW1              |
     Given the following "courses" exist:
       | shortname | fullname   |
       | C1        | Course 1 |