diff --git a/admin/tool/lp/tests/api_test.php b/admin/tool/lp/tests/api_test.php
index dcf6fb99aa..6209cb4a3e 100644
--- a/admin/tool/lp/tests/api_test.php
+++ b/admin/tool/lp/tests/api_test.php
@@ -194,7 +194,7 @@ public function test_update_template() {
     public function test_list_frameworks() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         // Create a list of frameworks.
         $framework1 = $lpg->create_framework(array(
@@ -281,7 +281,7 @@ public function test_list_frameworks() {
      * Test duplicate a framework.
      */
     public function test_duplicate_framework() {
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $this->resetAfterTest(true);
         $this->setAdminUser();
 
@@ -515,7 +515,7 @@ public function test_create_plan_from_template() {
         $this->setAdminUser();
 
         $u1 = $this->getDataGenerator()->create_user();
-        $tpl = $this->getDataGenerator()->get_plugin_generator('tool_lp')->create_template();
+        $tpl = $this->getDataGenerator()->get_plugin_generator('core_competency')->create_template();
 
         // Creating a new plan.
         $plan = api::create_plan_from_template($tpl, $u1->id);
@@ -539,7 +539,7 @@ public function test_create_plan_from_template() {
     public function test_update_plan_based_on_template() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $u1 = $dg->create_user();
         $u2 = $dg->create_user();
 
@@ -583,7 +583,7 @@ public function test_update_plan_based_on_template() {
     public function test_unlink_plan_from_template() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $u1 = $dg->create_user();
         $u2 = $dg->create_user();
 
@@ -668,7 +668,7 @@ public function test_update_template_updates_plans() {
         $dg = $this->getDataGenerator();
         $u1 = $dg->create_user();
         $u2 = $dg->create_user();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $tpl1 = $lpg->create_template();
         $tpl2 = $lpg->create_template();
 
@@ -760,7 +760,7 @@ public function test_complete_plan() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user = $dg->create_user();
 
         // Create a framework and assign competencies.
@@ -862,7 +862,7 @@ protected function setup_workflow_data() {
         $dg->role_assign($reviewerrole, $reviewer->id, $syscontext->id);
         accesslib_clear_all_caches_for_unit_testing();
 
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $tpl = $lpg->create_template();
         $plan = $lpg->create_plan(array('userid' => $user->id));
         $tplplan = $lpg->create_plan(array('userid' => $user->id, 'templateid' => $tpl->get_id()));
@@ -1486,7 +1486,7 @@ public function test_update_plan_manage_archived_competencies() {
 
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $syscontext = context_system::instance();
 
@@ -1595,7 +1595,7 @@ public function test_complete_plan_doesnot_change_order() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $syscontext = context_system::instance();
 
@@ -1682,7 +1682,7 @@ public function test_complete_plan_doesnot_change_order() {
     public function test_delete_plan_manage_archived_competencies() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $syscontext = context_system::instance();
 
@@ -1731,7 +1731,7 @@ public function test_delete_plan_manage_archived_competencies() {
     public function test_list_plan_competencies_manage_archived_competencies() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $syscontext = context_system::instance();
 
@@ -1812,7 +1812,7 @@ public function test_create_template_cohort() {
         $this->setAdminUser();
 
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $c1 = $dg->create_cohort();
         $c2 = $dg->create_cohort();
@@ -1837,7 +1837,7 @@ public function test_create_template_cohort_permissions() {
         $this->resetAfterTest(true);
 
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $cat = $dg->create_category();
         $catcontext = context_coursecat::instance($cat->id);
         $syscontext = context_system::instance();
@@ -1882,7 +1882,7 @@ public function test_delete_template() {
         $this->setAdminUser();
 
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $c1 = $dg->create_cohort();
         $c2 = $dg->create_cohort();
@@ -1912,7 +1912,7 @@ public function test_delete_template_cohort() {
         $this->setAdminUser();
 
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $c1 = $dg->create_cohort();
         $c2 = $dg->create_cohort();
@@ -1943,7 +1943,7 @@ public function test_delete_template_cohort() {
     public function test_add_evidence_log() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
 
         $u1 = $dg->create_user();
         $u1ctx = context_user::instance($u1->id);
@@ -2007,7 +2007,7 @@ public function test_add_evidence_log() {
     public function test_add_evidence_complete() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
 
         $u1 = $dg->create_user();
         $u1ctx = context_user::instance($u1->id);
@@ -2103,7 +2103,7 @@ public function test_add_evidence_complete() {
     public function test_add_evidence_override() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
 
         $u1 = $dg->create_user();
         $u1ctx = context_user::instance($u1->id);
@@ -2178,7 +2178,7 @@ public function test_add_evidence_override() {
     public function test_add_evidence_and_send_for_review() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
 
         $u1 = $dg->create_user();
         $u1ctx = context_user::instance($u1->id);
@@ -2212,7 +2212,7 @@ public function test_add_evidence_and_send_for_review() {
     public function test_add_evidence_existing_user_competency() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $syscontext = context_system::instance();
 
@@ -2254,7 +2254,7 @@ public function test_add_evidence_existing_user_competency() {
     public function test_add_evidence_no_existing_user_competency() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $syscontext = context_system::instance();
 
@@ -2291,7 +2291,7 @@ public function test_add_evidence_no_existing_user_competency() {
     public function test_add_evidence_applies_competency_rules() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $syscontext = context_system::instance();
         $ctxid = $syscontext->id;
 
@@ -2395,7 +2395,7 @@ public function test_add_evidence_for_user_competency_course_grade_outside_cours
         $student = $dg->create_user();
 
         // Create a competency for the course.
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $framework = $lpg->create_framework();
         $comp = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
 
@@ -2438,7 +2438,7 @@ public function test_add_evidence_user_competency_course_grade_in_course() {
         $dg->enrol_user($student->id, $course->id, $studentrole->id);
 
         // Create a competency for the course.
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $framework = $lpg->create_framework();
         // Do not push ratings from course to user plans.
         $comp = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
@@ -2478,7 +2478,7 @@ public function test_add_evidence_user_competency_course_grade_in_course() {
     public function test_observe_course_completed() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
 
         // Set-up users, framework, competencies and course competencies.
         $course = $dg->create_course();
@@ -2575,7 +2575,7 @@ public function test_list_course_modules_using_competency() {
 
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $u1 = $dg->create_user();
         $u2 = $dg->create_user();
         $course = $dg->create_course();
@@ -2642,7 +2642,7 @@ public function test_list_course_modules_using_competency() {
     public function test_set_ruleoutcome_course_competency() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $u1 = $dg->create_user();
         $u2 = $dg->create_user();
         $course = $dg->create_course();
@@ -2673,7 +2673,7 @@ public function test_validate_grade_in_user_competency() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user = $dg->create_user();
 
         $dg->create_scale(array("id" => "1", "scale" => "value1, value2"));
@@ -2746,7 +2746,7 @@ public function test_hidden_framework() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user = $dg->create_user();
 
         // Create a course.
@@ -2796,7 +2796,7 @@ public function test_hidden_template() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user = $dg->create_user();
 
         // Create a cohort.
@@ -2826,7 +2826,7 @@ public function test_completed_plan_doesnot_change() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user = $dg->create_user();
 
         // Create a framework and assign competencies.
@@ -2871,7 +2871,7 @@ public function test_completed_plan_doesnot_change() {
     protected function setup_framework_for_reset_rules_tests() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
 
         $this->setAdminUser();
         $f1 = $lpg->create_framework();
@@ -3110,7 +3110,7 @@ public function test_template_has_related_data() {
 
         $dg = $this->getDataGenerator();
         $user = $dg->create_user();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $tpl1 = $lpg->create_template();
         $tpl2 = $lpg->create_template();
 
@@ -3129,7 +3129,7 @@ public function test_delete_template_delete_plans() {
         $this->setAdminUser();
 
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $u1 = $dg->create_user();
         $f = $lpg->create_framework();
@@ -3168,7 +3168,7 @@ public function test_delete_template_unlink_plans() {
         $this->setAdminUser();
 
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $u1 = $dg->create_user();
         $f = $lpg->create_framework();
@@ -3208,7 +3208,7 @@ public function test_delete_template_unlink_plans() {
     public function test_delete_competency() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $this->setAdminUser();
 
         $u1 = $dg->create_user();
@@ -3268,7 +3268,7 @@ public function test_delete_competency() {
     public function test_delete_competency_used_in_plan() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $this->setAdminUser();
 
         $u1 = $dg->create_user();
@@ -3301,7 +3301,7 @@ public function test_delete_competency_used_in_plan() {
     public function test_delete_competency_used_in_usercompetency() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $this->setAdminUser();
 
         $u1 = $dg->create_user();
@@ -3333,7 +3333,7 @@ public function test_delete_competency_used_in_usercompetency() {
     public function test_delete_competency_used_in_usercompetencyplan() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $this->setAdminUser();
 
         $u1 = $dg->create_user();
@@ -3371,7 +3371,7 @@ public function test_delete_competency_used_in_usercompetencyplan() {
     public function test_delete_competency_used_in_template() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $this->setAdminUser();
 
         $template = $lpg->create_template();
@@ -3405,7 +3405,7 @@ public function test_delete_competency_used_in_template() {
     public function test_delete_competency_used_in_course() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $this->setAdminUser();
 
         $cat1 = $dg->create_category();
@@ -3442,7 +3442,7 @@ public function test_delete_competency_used_in_course() {
     public function test_delete_framework() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $this->setAdminUser();
 
         $u1 = $dg->create_user();
@@ -3496,7 +3496,7 @@ public function test_delete_framework() {
     public function test_delete_framework_competency_used_in_plan() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $this->setAdminUser();
 
         $u1 = $dg->create_user();
@@ -3554,7 +3554,7 @@ public function test_delete_framework_competency_used_in_plan() {
     public function test_delete_framework_competency_used_in_usercompetency() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $this->setAdminUser();
 
         $u1 = $dg->create_user();
@@ -3611,7 +3611,7 @@ public function test_delete_framework_competency_used_in_usercompetency() {
     public function test_delete_framework_competency_used_in_usercompetencyplan() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $this->setAdminUser();
 
         $u1 = $dg->create_user();
@@ -3674,7 +3674,7 @@ public function test_delete_framework_competency_used_in_usercompetencyplan() {
     public function test_delete_framework_competency_used_in_template() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $this->setAdminUser();
 
         $u1 = $dg->create_user();
@@ -3734,7 +3734,7 @@ public function test_delete_framework_competency_used_in_template() {
     public function test_delete_framework_competency_used_in_course() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $this->setAdminUser();
 
         $cat1 = $dg->create_category();
@@ -3809,7 +3809,7 @@ public function test_grade_competency_in_course_permissions() {
         $student2 = $dg->create_user();
         $notstudent1 = $dg->create_user();
 
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $framework = $lpg->create_framework();
         $comp1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
         $comp2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
@@ -3949,7 +3949,7 @@ public function test_list_evidence() {
 
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $currenttime = time();
         $syscontext = context_system::instance();
@@ -4009,7 +4009,7 @@ public function test_list_evidence() {
     public function test_get_user_competency_in_course() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $this->setAdminUser();
 
         $user = $dg->create_user();
@@ -4052,7 +4052,7 @@ public function test_get_user_competency_in_course() {
     public function test_course_statistics() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $this->setAdminUser();
 
         $u1 = $dg->create_user();
@@ -4142,7 +4142,7 @@ public function test_course_statistics() {
     public function test_template_statistics() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $this->setAdminUser();
 
         $u1 = $dg->create_user();
@@ -4168,7 +4168,7 @@ public function test_template_statistics() {
         $lpg->create_course_competency(array('competencyid' => $comp5->get_id(), 'courseid' => $c1->id));
 
         // Put all 6 in a template.
-        $tpl = $this->getDataGenerator()->get_plugin_generator('tool_lp')->create_template();
+        $tpl = $this->getDataGenerator()->get_plugin_generator('core_competency')->create_template();
         $tplc1 = $lpg->create_template_competency(array('templateid' => $tpl->get_id(), 'competencyid' => $comp1->get_id()));
         $tplc2 = $lpg->create_template_competency(array('templateid' => $tpl->get_id(), 'competencyid' => $comp2->get_id()));
         $tplc3 = $lpg->create_template_competency(array('templateid' => $tpl->get_id(), 'competencyid' => $comp3->get_id()));
@@ -4281,7 +4281,7 @@ public function test_template_statistics() {
     public function test_is_scale_used_anywhere() {
         $this->resetAfterTest();
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
 
         $scale1 = $dg->create_scale();
         $scale2 = $dg->create_scale();
diff --git a/admin/tool/lp/tests/behat/behat_tool_lp_data_generators.php b/admin/tool/lp/tests/behat/behat_tool_lp_data_generators.php
index 29fbcdb9cd..632864c97e 100644
--- a/admin/tool/lp/tests/behat/behat_tool_lp_data_generators.php
+++ b/admin/tool/lp/tests/behat/behat_tool_lp_data_generators.php
@@ -113,7 +113,7 @@ public function the_following_lp_exist($elementname, TableNode $data) {
         }
 
         $datagenerator = testing_util::get_data_generator();
-        $this->datageneratorlp = $datagenerator->get_plugin_generator('tool_lp');
+        $this->datageneratorlp = $datagenerator->get_plugin_generator('core_competency');
 
         $elementdatagenerator = self::$elements[$elementname]['datagenerator'];
         $requiredfields = self::$elements[$elementname]['required'];
diff --git a/admin/tool/lp/tests/competency_rule_test.php b/admin/tool/lp/tests/competency_rule_test.php
index acbb1217bd..4a85895630 100644
--- a/admin/tool/lp/tests/competency_rule_test.php
+++ b/admin/tool/lp/tests/competency_rule_test.php
@@ -45,7 +45,7 @@ public function test_rule_all_matching() {
         $this->resetAfterTest(true);
 
         $this->setAdminUser();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $u1 = $this->getDataGenerator()->create_user();
 
         // Set up the framework and competencies.
@@ -97,7 +97,7 @@ public function test_rule_points_validation() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
 
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $framework = $lpg->create_framework();
         $framework2 = $lpg->create_framework();
         $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
@@ -227,7 +227,7 @@ public function test_rule_points_matching() {
         $this->resetAfterTest(true);
 
         $this->setAdminUser();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $u1 = $this->getDataGenerator()->create_user();
 
         // Set up the framework and competencies.
diff --git a/admin/tool/lp/tests/course_competency_settings_test.php b/admin/tool/lp/tests/course_competency_settings_test.php
index 4b8a371f6a..2b890145cd 100644
--- a/admin/tool/lp/tests/course_competency_settings_test.php
+++ b/admin/tool/lp/tests/course_competency_settings_test.php
@@ -45,7 +45,7 @@ public function test_who_can_change_settings() {
 
         $syscontext = context_system::instance();
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $role = create_role('Settings changer role', 'settingschanger', 'Someone who can change course competency settings');
         assign_capability('moodle/competency:coursecompetencyconfigure', CAP_ALLOW, $role, $syscontext->id);
         assign_capability('moodle/competency:competencygrade', CAP_ALLOW, $role, $syscontext->id);
diff --git a/admin/tool/lp/tests/course_competency_test.php b/admin/tool/lp/tests/course_competency_test.php
index bf8dbade61..8d48d16946 100644
--- a/admin/tool/lp/tests/course_competency_test.php
+++ b/admin/tool/lp/tests/course_competency_test.php
@@ -41,7 +41,7 @@ public function test_get_courses_with_competency_and_user() {
 
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
 
         $c1 = $dg->create_course();
         $c2 = $dg->create_course();
diff --git a/admin/tool/lp/tests/event_test.php b/admin/tool/lp/tests/event_test.php
index 435b92301e..a39f00b313 100644
--- a/admin/tool/lp/tests/event_test.php
+++ b/admin/tool/lp/tests/event_test.php
@@ -44,7 +44,7 @@ class tool_lp_event_testcase extends advanced_testcase {
     public function test_competency_framework_created() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         // Use DataGenerator to have a record framework with the right format.
         $record = $lpg->create_framework()->to_record();
@@ -75,7 +75,7 @@ public function test_competency_framework_created() {
     public function test_competency_framework_deleted() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $framework = $lpg->create_framework();
 
@@ -102,7 +102,7 @@ public function test_competency_framework_deleted() {
     public function test_competency_framework_updated() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $framework = $lpg->create_framework();
 
@@ -130,7 +130,7 @@ public function test_competency_framework_updated() {
     public function test_competency_framework_viewed() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $framework = $lpg->create_framework();
 
@@ -157,7 +157,7 @@ public function test_competency_framework_viewed() {
     public function test_competency_viewed() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $framework = $lpg->create_framework();
         $competency = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
 
@@ -182,7 +182,7 @@ public function test_competency_viewed() {
     public function test_template_viewed() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $template = $lpg->create_template();
         // Trigger and capture the event.
         $sink = $this->redirectEvents();
@@ -205,7 +205,7 @@ public function test_template_viewed() {
     public function test_template_created() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         // Use DataGenerator to have a template record with the right format.
         $record = $lpg->create_template()->to_record();
@@ -234,7 +234,7 @@ public function test_template_created() {
     public function test_template_deleted() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $template = $lpg->create_template();
 
@@ -261,7 +261,7 @@ public function test_template_deleted() {
     public function test_template_updated() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $template = $lpg->create_template();
 
@@ -289,7 +289,7 @@ public function test_template_updated() {
     public function test_competency_updated() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $f1 = $lpg->create_framework();
         $competency = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id()));
@@ -322,7 +322,7 @@ public function test_competency_updated() {
     public function test_competency_created() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $f1 = $lpg->create_framework();
         $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id()));
@@ -353,7 +353,7 @@ public function test_competency_created() {
     public function test_competency_created_by_duplicateframework() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $f1 = $lpg->create_framework();
         $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id()));
@@ -389,7 +389,7 @@ public function test_competency_created_by_duplicateframework() {
     public function test_competency_deleted() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $f1 = $lpg->create_framework();
         $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id()));
@@ -419,7 +419,7 @@ public function test_competency_deleted() {
     public function test_competency_deleted_by_deleteframework() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $f1 = $lpg->create_framework();
         $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id()));
@@ -456,7 +456,7 @@ public function test_plan_created() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user = $dg->create_user();
         $plan = array (
             'name' => 'plan',
@@ -484,7 +484,7 @@ public function test_plan_created_using_templatecohort() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user1 = $dg->create_user();
         $user2 = $dg->create_user();
         $c1 = $dg->create_cohort();
@@ -527,7 +527,7 @@ public function test_plan_updated() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user1 = $dg->create_user();
         $plan = $lpg->create_plan(array('userid' => $user1->id));
         $record = $plan->to_record();
@@ -555,7 +555,7 @@ public function test_plan_deleted() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user1 = $dg->create_user();
         $plan = $lpg->create_plan(array('userid' => $user1->id));
         $planid = $plan->get_id();
@@ -582,7 +582,7 @@ public function test_plan_viewed() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user1 = $dg->create_user();
         $plan = $lpg->create_plan(array('userid' => $user1->id));
         // Trigger and capture the event.
@@ -607,7 +607,7 @@ public function test_user_evidence_created() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $user = $dg->create_user();
         // Use DataGenerator to have a user_evidence record with the right format.
@@ -638,7 +638,7 @@ public function test_user_evidence_deleted() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $user = $dg->create_user();
         $userevidence = $lpg->create_user_evidence(array('userid' => $user->id));
@@ -667,7 +667,7 @@ public function test_user_evidence_updated() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $user = $dg->create_user();
         $userevidence = $lpg->create_user_evidence(array('userid' => $user->id));
@@ -697,7 +697,7 @@ public function test_user_competency_viewed_in_plan() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user = $dg->create_user();
         $plan = $lpg->create_plan(array('userid' => $user->id));
         $fr = $lpg->create_framework();
@@ -779,7 +779,7 @@ public function test_user_competency_viewed_in_course() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user = $dg->create_user();
         $course = $dg->create_course();
         $fr = $lpg->create_framework();
@@ -841,7 +841,7 @@ public function test_user_competency_plan_viewed() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user = $dg->create_user();
         $plan = $lpg->create_plan(array('userid' => $user->id));
         $fr = $lpg->create_framework();
@@ -926,7 +926,7 @@ public function test_user_competency_viewed() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user = $dg->create_user();
         $fr = $lpg->create_framework();
         $c = $lpg->create_competency(array('competencyframeworkid' => $fr->get_id()));
@@ -976,7 +976,7 @@ public function test_plan_approved() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user1 = $dg->create_user();
         $plan = $lpg->create_plan(array('userid' => $user1->id));
         $planid = $plan->get_id();
@@ -1004,7 +1004,7 @@ public function test_plan_unapproved() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user1 = $dg->create_user();
         $plan = $lpg->create_plan(array('userid' => $user1->id, 'status' => \core_competency\plan::STATUS_ACTIVE));
         $planid = $plan->get_id();
@@ -1032,7 +1032,7 @@ public function test_plan_reopened() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user1 = $dg->create_user();
         $plan = $lpg->create_plan(array('userid' => $user1->id, 'status' => \core_competency\plan::STATUS_COMPLETE));
         $planid = $plan->get_id();
@@ -1060,7 +1060,7 @@ public function test_plan_completed() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user1 = $dg->create_user();
         $plan = $lpg->create_plan(array('userid' => $user1->id, 'status' => \core_competency\plan::STATUS_ACTIVE));
         $planid = $plan->get_id();
@@ -1088,7 +1088,7 @@ public function test_plan_unlinked() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user1 = $dg->create_user();
         $template = $lpg->create_template();
         $plan = $lpg->create_plan(array(
@@ -1121,7 +1121,7 @@ public function test_plan_review_requested() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user1 = $dg->create_user();
         $plan = $lpg->create_plan(array('userid' => $user1->id));
         $planid = $plan->get_id();
@@ -1149,7 +1149,7 @@ public function test_plan_review_request_cancelled() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user1 = $dg->create_user();
         $plan = $lpg->create_plan(array('userid' => $user1->id, 'status' => \core_competency\plan::STATUS_WAITING_FOR_REVIEW));
         $planid = $plan->get_id();
@@ -1177,7 +1177,7 @@ public function test_plan_review_started() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user1 = $dg->create_user();
         $plan = $lpg->create_plan(array('userid' => $user1->id, 'status' => \core_competency\plan::STATUS_WAITING_FOR_REVIEW));
         $planid = $plan->get_id();
@@ -1205,7 +1205,7 @@ public function test_plan_review_stopped() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user1 = $dg->create_user();
         $plan = $lpg->create_plan(array('userid' => $user1->id, 'status' => \core_competency\plan::STATUS_IN_REVIEW));
         $planid = $plan->get_id();
@@ -1231,7 +1231,7 @@ public function test_plan_review_stopped() {
     public function test_plan_comment_created() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user = $dg->create_user();
         $this->setUser($user);
         $plan = $lpg->create_plan(array('userid' => $user->id));
@@ -1269,7 +1269,7 @@ public function test_plan_comment_deleted() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user1 = $dg->create_user();
         $plan = $lpg->create_plan(array('userid' => $user1->id));
 
@@ -1312,7 +1312,7 @@ public function test_evidence_created() {
         $student = $dg->create_user();
 
         // Create a competency for the course.
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $framework = $lpg->create_framework();
         $comp = $lpg->create_competency(['competencyframeworkid' => $framework->get_id()]);
 
@@ -1370,7 +1370,7 @@ public function test_evidence_created_with_invalid_user_competency() {
         $student2 = $dg->create_user();
 
         // Create a competency for the course.
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
         $framework = $lpg->create_framework();
         $comp = $lpg->create_competency(['competencyframeworkid' => $framework->get_id()]);
 
@@ -1462,7 +1462,7 @@ public function test_user_competency_grade_rated() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $scale = $dg->create_scale(array('scale' => 'A,B,C,D'));
         $scaleconfig = array(array('scaleid' => $scale->id));
         $scaleconfig[] = array('name' => 'A', 'id' => 1, 'scaledefault' => 0, 'proficient' => 0);
@@ -1511,7 +1511,7 @@ public function test_user_competency_grade_rated_in_course() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $scale = $dg->create_scale(array('scale' => 'A,B,C,D'));
         $course = $dg->create_course();
         $user = $dg->create_user();
@@ -1568,7 +1568,7 @@ public function test_user_competency_grade_rated_in_plan() {
          $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $scale = $dg->create_scale(array('scale' => 'A,B,C,D'));
         $user = $dg->create_user();
         $scaleconfig = array(array('scaleid' => $scale->id));
@@ -1618,7 +1618,7 @@ public function test_user_competency_comment_created() {
         $this->resetAfterTest(true);
 
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user = $dg->create_user();
         $this->setUser($user);
         $fr = $lpg->create_framework();
@@ -1660,7 +1660,7 @@ public function test_user_competency_comment_deleted() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user = $dg->create_user();
         $fr = $lpg->create_framework();
         $c = $lpg->create_competency(array('competencyframeworkid' => $fr->get_id()));
diff --git a/admin/tool/lp/tests/externallib_test.php b/admin/tool/lp/tests/externallib_test.php
index 3f7c671bab..3df5ba8f8a 100644
--- a/admin/tool/lp/tests/externallib_test.php
+++ b/admin/tool/lp/tests/externallib_test.php
@@ -574,7 +574,7 @@ public function test_update_competency_frameworks_with_manage_permissions_in_cat
 
     public function test_update_framework_scale() {
         $this->setUser($this->creator);
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $s1 = $this->getDataGenerator()->create_scale();
 
@@ -651,7 +651,7 @@ public function test_list_and_count_competency_frameworks_with_manage_permission
 
     public function list_competency_frameworks_with_query() {
         $this->setUser($this->creator);
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $framework1 = $lpg->create_framework(array(
             'shortname' => 'shortname_beetroot',
             'idnumber' => 'idnumber_cinnamon',
@@ -1046,7 +1046,7 @@ public function test_update_competency_with_read_permissions() {
     public function test_count_competencies_with_filters() {
         $this->setUser($this->creator);
 
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $f1 = $lpg->create_framework();
         $f2 = $lpg->create_framework();
         $c1 = $lpg->create_competency(array('competencyframeworkid' => $f1->get_id()));
@@ -1465,7 +1465,7 @@ public function test_delete_plans() {
     public function test_delete_plan_removes_relations() {
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
 
         $user = $dg->create_user();
         $plan = $lpg->create_plan(array('userid' => $user->id));
@@ -1494,7 +1494,7 @@ public function test_list_plan_competencies() {
         $this->setUser($this->creator);
 
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
 
         $f1 = $lpg->create_framework();
         $f2 = $lpg->create_framework();
@@ -1602,7 +1602,7 @@ public function test_add_competency_to_template() {
     public function test_remove_competency_from_template() {
         $syscontext = context_system::instance();
         $this->setUser($this->creator);
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         // Create a template.
         $template = $this->create_template(1, true);
@@ -2195,7 +2195,7 @@ public function test_add_related_competency() {
         global $DB;
         $this->setUser($this->creator);
 
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $framework = $lpg->create_framework();
         $framework2 = $lpg->create_framework();
         $competency1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
@@ -2286,7 +2286,7 @@ public function test_add_related_competency() {
     public function test_remove_related_competency() {
         $this->setUser($this->creator);
 
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $framework = $lpg->create_framework();
         $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
         $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
@@ -2322,7 +2322,7 @@ public function test_remove_related_competency() {
     public function test_search_competencies_including_related() {
         $this->setUser($this->creator);
 
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $framework = $lpg->create_framework();
         $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
         $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
@@ -2350,7 +2350,7 @@ public function test_search_competencies_including_related() {
     public function test_add_competency_to_plan() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $usermanage = $dg->create_user();
         $user = $dg->create_user();
 
@@ -2412,7 +2412,7 @@ public function test_add_competency_to_plan() {
     public function test_remove_competency_from_plan() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $usermanage = $dg->create_user();
         $user = $dg->create_user();
 
@@ -2457,7 +2457,7 @@ public function test_remove_competency_from_plan() {
     public function test_reorder_plan_competency() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $usermanage = $dg->create_user();
         $user = $dg->create_user();
 
@@ -2528,7 +2528,7 @@ public function test_reorder_plan_competency() {
      */
     public function test_fix_sortorder_when_creating_competency() {
         $this->resetAfterTest(true);
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $framework = $lpg->create_framework();
 
         $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
@@ -2546,7 +2546,7 @@ public function test_fix_sortorder_when_creating_competency() {
     public function test_fix_sortorder_when_delete_competency() {
         $this->resetAfterTest(true);
         $this->setUser($this->creator);
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $framework = $lpg->create_framework();
 
@@ -2599,7 +2599,7 @@ public function test_fix_sortorder_when_delete_competency() {
     public function test_fix_sortorder_when_moving_competency() {
         $this->resetAfterTest(true);
         $this->setUser($this->creator);
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $framework = $lpg->create_framework();
 
@@ -2926,7 +2926,7 @@ public function test_grade_competency_in_plan() {
         $this->setUser($this->creator);
 
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
 
         $f1 = $lpg->create_framework();
 
@@ -2957,7 +2957,7 @@ public function test_data_for_user_competency_summary_in_plan() {
         $this->setUser($this->creator);
 
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
 
         $f1 = $lpg->create_framework();
 
@@ -3101,7 +3101,7 @@ public function test_list_course_modules_using_competency() {
         $this->setAdminUser();
 
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
 
         $course = $dg->create_course();
         $cm1 = $dg->create_module('assign', array('course' => $course->id));
diff --git a/admin/tool/lp/tests/lib_test.php b/admin/tool/lp/tests/lib_test.php
index 45235af9eb..dd7aa3a37a 100644
--- a/admin/tool/lp/tests/lib_test.php
+++ b/admin/tool/lp/tests/lib_test.php
@@ -42,7 +42,7 @@ public function test_comment_add_user_competency() {
         global $DB;
         $this->resetAfterTest();
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
 
         $u1 = $dg->create_user();
         $u2 = $dg->create_user();
@@ -189,7 +189,7 @@ public function test_comment_add_user_competency() {
     public function test_comment_add_plan() {
         $this->resetAfterTest();
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
 
         $u1 = $dg->create_user();
         $u2 = $dg->create_user();
diff --git a/admin/tool/lp/tests/plan_persistent_test.php b/admin/tool/lp/tests/plan_persistent_test.php
index 859ec117b3..96abc2cc91 100644
--- a/admin/tool/lp/tests/plan_persistent_test.php
+++ b/admin/tool/lp/tests/plan_persistent_test.php
@@ -42,7 +42,7 @@ public function test_get_by_user_and_competency() {
         $this->setAdminUser();
 
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
 
         $u1 = $dg->create_user();
         $u2 = $dg->create_user();
diff --git a/admin/tool/lp/tests/plan_test.php b/admin/tool/lp/tests/plan_test.php
index d51101deda..54ad1ed56e 100644
--- a/admin/tool/lp/tests/plan_test.php
+++ b/admin/tool/lp/tests/plan_test.php
@@ -258,7 +258,7 @@ public function test_validate_duedate() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $user = $dg->create_user();
 
         $record = array('userid' => $user->id,
diff --git a/admin/tool/lp/tests/task_test.php b/admin/tool/lp/tests/task_test.php
index 9377d1abfb..9e345f160f 100644
--- a/admin/tool/lp/tests/task_test.php
+++ b/admin/tool/lp/tests/task_test.php
@@ -42,7 +42,7 @@ public function test_sync_plans_from_cohorts_task() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
 
         // Sql to simulate the execution in time.
         $cmsql = "UPDATE {cohort_members} SET timeadded = :currenttime WHERE cohortid = :cohortid AND userid = :userid";
@@ -160,7 +160,7 @@ public function test_sync_plans_from_cohorts_with_templateduedate_task() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
 
         $user1 = $dg->create_user();
         $user2 = $dg->create_user();
@@ -241,7 +241,7 @@ public function test_sync_plans_from_cohorts_with_passed_duedate() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
 
         $user1 = $dg->create_user();
         $user2 = $dg->create_user();
@@ -278,7 +278,7 @@ public function test_complete_plans_task() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
 
         $user = $dg->create_user();
 
diff --git a/admin/tool/lp/tests/template_test.php b/admin/tool/lp/tests/template_test.php
index edd94d961d..bf8f421a9a 100644
--- a/admin/tool/lp/tests/template_test.php
+++ b/admin/tool/lp/tests/template_test.php
@@ -40,7 +40,7 @@ public function test_validate_duedate() {
         global $DB;
 
         $this->resetAfterTest();
-        $tpl = $this->getDataGenerator()->get_plugin_generator('tool_lp')->create_template();
+        $tpl = $this->getDataGenerator()->get_plugin_generator('core_competency')->create_template();
 
         // No due date -> pass.
         $tpl->set_duedate(0);
diff --git a/admin/tool/lp/tests/user_evidence_competency_test.php b/admin/tool/lp/tests/user_evidence_competency_test.php
index 309e152a0e..0b355f0abc 100644
--- a/admin/tool/lp/tests/user_evidence_competency_test.php
+++ b/admin/tool/lp/tests/user_evidence_competency_test.php
@@ -41,7 +41,7 @@ public function test_get_user_competencies_by_userevidenceid() {
 
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
 
         $u1 = $dg->create_user();
 
diff --git a/admin/tool/lp/tests/generator/lib.php b/competency/tests/generator/lib.php
similarity index 98%
rename from admin/tool/lp/tests/generator/lib.php
rename to competency/tests/generator/lib.php
index 494633e506..285c794f35 100644
--- a/admin/tool/lp/tests/generator/lib.php
+++ b/competency/tests/generator/lib.php
@@ -15,9 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Tool LP data generator.
+ * Competency data generator.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @category   test
  * @copyright  2015 Frédéric Massart - FMCorz.net
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -27,8 +27,9 @@
 use core_competency\competency_framework;
 use core_competency\course_competency;
 use core_competency\course_module_competency;
-use tool_lp\external;
+use core_competency\evidence;
 use core_competency\plan;
+use core_competency\plan_competency;
 use core_competency\related_competency;
 use core_competency\template;
 use core_competency\template_cohort;
@@ -36,22 +37,21 @@
 use core_competency\user_competency;
 use core_competency\user_competency_course;
 use core_competency\user_competency_plan;
-use core_competency\plan_competency;
-use core_competency\evidence;
 use core_competency\user_evidence;
 use core_competency\user_evidence_competency;
+use tool_lp\external;
 
 defined('MOODLE_INTERNAL') || die();
 
 /**
- * Tool LP data generator.
+ * Competency data generator class.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @category   test
  * @copyright  2015 Frédéric Massart - FMCorz.net
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class tool_lp_generator extends component_generator_base {
+class core_competency_generator extends component_generator_base {
 
     /** @var int Number of created competencies. */
     protected $competencycount = 0;
diff --git a/admin/tool/lp/tests/generator_test.php b/competency/tests/generator_test.php
similarity index 97%
rename from admin/tool/lp/tests/generator_test.php
rename to competency/tests/generator_test.php
index a49de24571..6f20314ec3 100644
--- a/admin/tool/lp/tests/generator_test.php
+++ b/competency/tests/generator_test.php
@@ -17,7 +17,7 @@
 /**
  * Tool LP data generator tests.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @category   test
  * @copyright  2015 Frédéric Massart - FMCorz.net
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -42,17 +42,17 @@
 /**
  * Tool LP data generator testcase.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @category   test
  * @copyright  2015 Frédéric Massart - FMCorz.net
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class tool_lp_generator_testcase extends advanced_testcase {
+class core_competency_generator_testcase extends advanced_testcase {
 
     public function test_create_framework() {
         $this->resetAfterTest(true);
 
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $this->assertEquals(0, competency_framework::count_records());
         $framework = $lpg->create_framework();
         $framework = $lpg->create_framework();
@@ -63,7 +63,7 @@ public function test_create_framework() {
     public function test_create_competency() {
         $this->resetAfterTest(true);
 
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $framework = $lpg->create_framework();
         $this->assertEquals(0, competency::count_records());
         $competency = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
@@ -75,7 +75,7 @@ public function test_create_competency() {
     public function test_create_related_competency() {
         $this->resetAfterTest(true);
 
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $framework = $lpg->create_framework();
         $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
         $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
@@ -91,7 +91,7 @@ public function test_create_plan() {
         $this->resetAfterTest(true);
 
         $user = $this->getDataGenerator()->create_user();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $this->assertEquals(0, plan::count_records());
         $plan = $lpg->create_plan(array('userid' => $user->id));
         $this->assertEquals(1, plan::count_records());
@@ -102,7 +102,7 @@ public function test_create_user_competency() {
         $this->resetAfterTest(true);
 
         $user = $this->getDataGenerator()->create_user();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $framework = $lpg->create_framework();
         $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
         $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
@@ -118,7 +118,7 @@ public function test_create_user_competency_plan() {
         $this->resetAfterTest(true);
 
         $user = $this->getDataGenerator()->create_user();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $framework = $lpg->create_framework();
         $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
         $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
@@ -141,7 +141,7 @@ public function test_create_user_competency_plan() {
     public function test_create_template() {
         $this->resetAfterTest(true);
 
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $this->assertEquals(0, template::count_records());
         $template = $lpg->create_template();
         $template = $lpg->create_template();
@@ -151,7 +151,7 @@ public function test_create_template() {
 
     public function test_create_template_competency() {
         $this->resetAfterTest(true);
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $this->assertEquals(0, template_competency::count_records());
         $framework = $lpg->create_framework();
@@ -167,7 +167,7 @@ public function test_create_template_competency() {
     public function test_create_plan_competency() {
         $this->resetAfterTest(true);
         $user = $this->getDataGenerator()->create_user();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         $framework = $lpg->create_framework();
         $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
@@ -187,7 +187,7 @@ public function test_create_plan_competency() {
     public function test_create_template_cohort() {
         $this->resetAfterTest(true);
 
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $c1 = $this->getDataGenerator()->create_cohort();
         $c2 = $this->getDataGenerator()->create_cohort();
         $t1 = $lpg->create_template();
@@ -203,7 +203,7 @@ public function test_create_evidence() {
         $this->resetAfterTest(true);
 
         $user = $this->getDataGenerator()->create_user();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $framework = $lpg->create_framework();
         $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
         $c2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
@@ -218,7 +218,7 @@ public function test_create_evidence() {
     public function test_create_course_competency() {
         $this->resetAfterTest(true);
 
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $course1 = $this->getDataGenerator()->create_course();
         $course2 = $this->getDataGenerator()->create_course();
         $framework = $lpg->create_framework();
@@ -238,7 +238,7 @@ public function test_create_course_competency() {
     public function test_create_course_module_competency() {
         $this->resetAfterTest(true);
 
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
         $course1 = $this->getDataGenerator()->create_course();
         $cm1 = $this->getDataGenerator()->create_module('forum', array('course' => $course1->id));
         $cm2 = $this->getDataGenerator()->create_module('forum', array('course' => $course1->id));
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index bd5149de85..9e305afadf 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -140,6 +140,9 @@
         <testsuite name="core_search_testsuite">
             <directory suffix="_test.php">search/tests</directory>
         </testsuite>
+        <testsuite name="core_competency_testsuite">
+            <directory suffix="_test.php">competency/tests</directory>
+        </testsuite>
 
         <!--Plugin suites: use admin/tool/phpunit/cli/util.php to build phpunit.xml from phpunit.xml.dist with up-to-date list of plugins in current install-->
 <!--@plugin_suites_start@-->