diff --git a/admin/tool/lp/lang/en/tool_lp.php b/admin/tool/lp/lang/en/tool_lp.php
index d4269a7b3f8..10fca872bab 100644
--- a/admin/tool/lp/lang/en/tool_lp.php
+++ b/admin/tool/lp/lang/en/tool_lp.php
@@ -39,19 +39,19 @@ $string['addnewtemplate'] = 'Add new learning plan template';
 $string['addnewuserevidence'] = 'Add new evidence';
 $string['addtemplatecompetencies'] = 'Add competencies to learning plan template';
 $string['aisrequired'] = '\'{$a}\' is required';
-$string['aplanswerecreated'] = '{$a} plans were created.';
-$string['aplanswerecreatedmoremayrequiresync'] = '{$a} plans were created, more will be created during the next synchronization.';
+$string['aplanswerecreated'] = '{$a} learning plans were created.';
+$string['aplanswerecreatedmoremayrequiresync'] = '{$a} learning plans were created, more will be created during the next synchronization.';
 $string['assigncohorts'] = 'Assign cohorts';
-$string['averageproficiencyrate'] = 'The average proficiency rate for completed plans based on this template is {$a} %';
+$string['averageproficiencyrate'] = 'The average proficiency rate for completed learning plans based on this template is {$a} %';
 $string['cancelreviewrequest'] = 'Cancel review request';
 $string['cannotaddrules'] = 'This competency cannot be configured.';
-$string['cannotcreateuserplanswhentemplateduedateispassed'] = 'New user plans can not be created: this template\'s due date has, or is about to, expire.';
-$string['cannotcreateuserplanswhentemplatehidden'] = 'New user plans can not be created while this template is hidden.';
+$string['cannotcreateuserplanswhentemplateduedateispassed'] = 'New learning plans can not be created: this template\'s due date has, or is about to, expire.';
+$string['cannotcreateuserplanswhentemplatehidden'] = 'New learning plans can not be created while this template is hidden.';
 $string['category'] = 'Category';
 $string['chooserating'] = 'Choose a rating...';
-$string['cohortssyncedtotemplate'] = 'Cohorts synced to this template';
+$string['cohortssyncedtotemplate'] = 'Cohorts synced to this learning plan template';
 $string['competenciesforframework'] = 'Competencies for {$a}';
-$string['competenciesmostoftennotproficient'] = 'Competencies most often not proficient in completed plans';
+$string['competenciesmostoftennotproficient'] = 'Competencies most often not proficient in completed learning plans';
 $string['competenciesmostoftennotproficientincourse'] = 'Competencies most often not proficient in this course';
 $string['competencycannotbedeleted'] = 'The competency \'{$a}\' can not be deleted';
 $string['competencycreated'] = 'Competency created';
@@ -60,7 +60,7 @@ $string['competencyframework'] = 'Competency framework';
 $string['competencyframeworkcreated'] = 'Competency framework created.';
 $string['competencyframeworkname'] = 'Name';
 $string['competencyframeworkroot'] = 'No parent (Top level competency)';
-$string['competencyframeworks'] = 'Competency Frameworks';
+$string['competencyframeworks'] = 'Competency frameworks';
 $string['competencyframeworkupdated'] = 'Competency framework updated.';
 $string['competencyoutcome_complete'] = 'Mark as complete';
 $string['competencyoutcome_evidence'] = 'Attach an evidence';
@@ -70,26 +70,26 @@ $string['competencypicker'] = 'Competency picker';
 $string['competencyrule'] = 'Competency rule';
 $string['competencyupdated'] = 'Competency updated';
 $string['completeplan'] = 'Complete this learning plan';
-$string['completeplanconfirm'] = 'Set the plan \'{$a}\' to completed? The current status of all the users competencies in this plan will be recorded, and the plan will become read only.';
+$string['completeplanconfirm'] = 'Set the learning plan \'{$a}\' to completed? The current status of all the users competencies in this plan will be recorded, and the plan will become read only.';
 $string['configurecoursecompetencysettings'] = 'Configure course competencies';
 $string['configurescale'] = 'Configure scales';
 $string['coursecompetencies'] = 'Course competencies';
-$string['coursecompetencyratingsarenotpushedtouserplans'] = 'Competency ratings in this course do not affect individual learning plans.';
-$string['coursecompetencyratingsarepushedtouserplans'] = 'Competency ratings in this course are updated immediately in individual learning plans.';
-$string['coursecompetencyratingsquestion'] = 'When a course competency is rated, does the rating update the competency in the users learning plans, or is it only applied to the course?';
+$string['coursecompetencyratingsarenotpushedtouserplans'] = 'Competency ratings in this course do not affect learning plans.';
+$string['coursecompetencyratingsarepushedtouserplans'] = 'Competency ratings in this course are updated immediately in learning plans.';
+$string['coursecompetencyratingsquestion'] = 'When a course competency is rated, does the rating update the competency in the learning plans, or is it only applied to the course?';
 $string['coursesusingthiscompetency'] = 'Courses linked to this competency';
 $string['coveragesummary'] = '{$a->competenciescoveredcount} of {$a->competenciescount} competencies are covered ( {$a->coveragepercentage} % )';
-$string['createplans'] = 'Create plans';
+$string['createplans'] = 'Create learning plans';
 $string['createlearningplans'] = 'Create learning plans';
 $string['crossreferencedcompetencies'] = 'Cross-referenced competencies';
 $string['default'] = 'Default';
 $string['deletecompetency'] = 'Delete competency \'{$a}\'?';
 $string['deletecompetencyframework'] = 'Delete competency framework \'{$a}\'?';
 $string['deletecompetencyparenthasrule'] = 'Delete competency \'{$a}\'? This will also remove the rule set on its parent.';
-$string['deleteplan'] = 'Delete plan \'{$a}\'?';
-$string['deleteplans'] = 'Delete the plans';
+$string['deleteplan'] = 'Delete learning plan \'{$a}\'?';
+$string['deleteplans'] = 'Delete the learning plans';
 $string['deletetemplate'] = 'Delete learning plan template \'{$a}\'?';
-$string['deletetemplatewithplans'] = 'This learning plan template has user plans associated. You have to indicate how to process those plans.';
+$string['deletetemplatewithplans'] = 'This template has learning plans associated. You have to indicate how to process those plans.';
 $string['deletethisplan'] = 'Delete this learning plan';
 $string['deletethisuserevidence'] = 'Delete this evidence';
 $string['deleteuserevidence'] = 'Delete the evidence of prior learning \'{$a}\'?';
@@ -110,7 +110,7 @@ $string['frameworkcannotbedeleted'] = 'The competency framework \'{$a}\' can not
 $string['hidden'] = 'Hidden';
 $string['hiddenhint'] = '(hidden)';
 $string['idnumber'] = 'Id number';
-$string['inheritfromframework'] = 'Inherit from framework (default)';
+$string['inheritfromframework'] = 'Inherit from competency framework (default)';
 $string['itemstoadd'] = 'Items to add';
 $string['jumptocompetency'] = 'Jump to competency';
 $string['jumptouser'] = 'Jump to user';
@@ -139,12 +139,12 @@ $string['movecompetencytochildofselfwillresetrules'] = 'Moving the competency wi
 $string['movecompetencywillresetrules'] = 'Moving the competency will remove the rules set on its parent and destination. Do you want to continune?';
 $string['moveframeworkafter'] = 'Move competency framework after \'{$a}\'';
 $string['movetonewparent'] = 'Relocate';
-$string['myplans'] = 'My plans';
+$string['myplans'] = 'My learning plans';
 $string['nfiles'] = '{$a} file(s)';
 $string['noactivities'] = 'No activities';
 $string['nocompetencies'] = 'No competencies have been created in this framework.';
 $string['nocompetenciesincourse'] = 'No competencies have been linked to this course.';
-$string['nocompetenciesintemplate'] = 'No competencies have been linked to this template.';
+$string['nocompetenciesintemplate'] = 'No competencies have been linked to this learning plan template.';
 $string['nocompetencyframeworks'] = 'No competency frameworks have been created yet.';
 $string['nocompetencyselected'] = 'No competency selected';
 $string['nocrossreferencedcompetencies'] = 'No other competencies have been cross-referenced to this competency.';
@@ -152,27 +152,27 @@ $string['noevidence'] = 'No evidence';
 $string['nofiles'] = 'No files';
 $string['nolinkedcourses'] = 'No courses are linked to this competency';
 $string['noparticipants'] = 'No participants found.';
-$string['noplanswerecreated'] = 'No plans were created.';
+$string['noplanswerecreated'] = 'No learning plans were created.';
 $string['notemplates'] = 'No learning plan templates have been created yet.';
 $string['nourl'] = 'No URL';
 $string['nouserevidence'] = 'No evidence of prior learning have been added yet.';
 $string['nouserplans'] = 'No learning plans have been created yet.';
-$string['oneplanwascreated'] = 'A plan was created';
+$string['oneplanwascreated'] = 'A learning plan was created';
 $string['outcome'] = 'Outcome';
 $string['path'] = 'Path:';
 $string['parentcompetency'] = 'Parent';
 $string['parentcompetency_edit'] = 'Edit parent';
 $string['parentcompetency_help'] = 'Define the parent under which the competency will be added. It can either be another competency within the same framework, or the root of the competency framework for a top level competency.';
 $string['planapprove'] = 'Make active';
-$string['plancompleted'] = 'Plan completed';
+$string['plancompleted'] = 'Learning plan completed';
 $string['plancreated'] = 'Learning plan created';
 $string['plandescription'] = 'Description';
 $string['planname'] = 'Name';
-$string['plantemplate'] = 'Select template';
+$string['plantemplate'] = 'Select learning plan template';
 $string['plantemplate_help'] = 'A learning plan created from a template will contain a list of competencies that match the template. Updates to the template will be reflected in any plan created from that template.';
 $string['planunapprove'] = 'Send back to draft';
 $string['planupdated'] = 'Learning plan updated';
-$string['pluginname'] = 'Learning Plans';
+$string['pluginname'] = 'Learning plans';
 $string['points'] = 'Points';
 $string['pointsgivenfor'] = 'Points given for \'{$a}\'';
 $string['proficient'] = 'Proficient';
@@ -181,9 +181,9 @@ $string['rate'] = 'Rate';
 $string['ratecomment'] = 'Evidence notes';
 $string['rating'] = 'Rating';
 $string['ratingaffectsonlycourse'] = 'Rating a competency only updates the competency in this course';
-$string['ratingaffectsuserplans'] = 'Rating a competency also updates the competency in all of the users learning plans';
+$string['ratingaffectsuserplans'] = 'Rating a competency also updates the competency in all of the learning plans';
 $string['reopenplan'] = 'Reopen this learning plan';
-$string['reopenplanconfirm'] = 'Reopen the plan \'{$a}\'? The status of the users competencies that was recorded at the time the plan was previously completed will be deleted, and the plan will become active again.';
+$string['reopenplanconfirm'] = 'Reopen the learning plan \'{$a}\'? The status of the users competencies that was recorded at the time the plan was previously completed will be deleted, and the plan will become active again.';
 $string['requestreview'] = 'Request review';
 $string['reviewer'] = 'Reviewer';
 $string['reviewstatus'] = 'Review status';
@@ -195,7 +195,7 @@ $string['search'] = 'Search...';
 $string['selectcohortstosync'] = 'Select cohorts to sync';
 $string['selectcompetencymovetarget'] = 'Select a location to move this competency to:';
 $string['selectedcompetency'] = 'Selected competency';
-$string['selectuserstocreateplansfor'] = 'Select users to create plans for';
+$string['selectuserstocreateplansfor'] = 'Select users to create learning plans for';
 $string['sendallcompetenciestoreview'] = 'Send all competencies in review for evidence of prior learning \'{$a}\'';
 $string['sendcompetenciestoreview'] = 'Send competencies for review';
 $string['shortname'] = 'Name';
@@ -250,25 +250,25 @@ $string['taxonomy_selected_practice'] = 'Selected practice';
 $string['taxonomy_selected_proficiency'] = 'Selected proficiency';
 $string['taxonomy_selected_skill'] = 'Selected skill';
 $string['taxonomy_selected_value'] = 'Selected value';
-$string['template'] = 'Template';
+$string['template'] = 'Learning plan template';
 $string['templatebased'] = 'Template based';
 $string['templatecohortnotsyncedwhileduedateispassed'] = 'Cohorts will not be synchronized while the template\'s due date is passed.';
 $string['templatecohortnotsyncedwhilehidden'] = 'Cohorts will not be synchronized while this template is hidden.';
-$string['templatecompetencies'] = 'Template competencies';
+$string['templatecompetencies'] = 'Learning plan template competencies';
 $string['templatecreated'] = 'Learning plan template created';
 $string['templatename'] = 'Name';
 $string['templates'] = 'Learning plan templates';
 $string['templateupdated'] = 'Learning plan template updated';
 $string['totalrequiredtocomplete'] = 'Total required to complete';
 $string['unlinkcompetencycourse'] = 'Unlink the competency \'{$a}\' from the course?';
-$string['unlinkcompetencyplan'] = 'Unlink the competency \'{$a}\' from the plan?';
-$string['unlinkcompetencytemplate'] = 'Unlink the competency \'{$a}\' from the template?';
-$string['unlinkplanstemplate'] = 'Unlink the plans from template';
-$string['unlinkplantemplate'] = 'Unlink from template';
-$string['unlinkplantemplateconfirm'] = 'Unlink the plan \'{$a}\' from its template? Any change made to the template will no longer be applied to the plan. This action can not be undone.';
+$string['unlinkcompetencyplan'] = 'Unlink the competency \'{$a}\' from the learning plan?';
+$string['unlinkcompetencytemplate'] = 'Unlink the competency \'{$a}\' from the learning plan template?';
+$string['unlinkplanstemplate'] = 'Unlink the learning plans from their template';
+$string['unlinkplantemplate'] = 'Unlink from learning plan template';
+$string['unlinkplantemplateconfirm'] = 'Unlink the learning plan \'{$a}\' from its template? Any change made to the template will no longer be applied to the plan. This action can not be undone.';
 $string['uponcoursecompletion'] = 'Upon course completion:';
 $string['uponcoursemodulecompletion'] = 'Upon activity completion:';
-$string['usercompetencyfrozen'] = 'This record is now frozen. It reflects the state of the user\'s competency when their plan was marked as complete.';
+$string['usercompetencyfrozen'] = 'This record is now frozen. It reflects the state of the user\'s competency when their learning plan was marked as complete.';
 $string['userevidence'] = 'Evidence of prior learning';
 $string['userevidencecreated'] = 'Evidence of prior learning created';
 $string['userevidencedescription'] = 'Description';
@@ -284,4 +284,4 @@ $string['when'] = 'When';
 $string['xcompetencieslinkedoutofy'] = '{$a->x} out of {$a->y} competencies linked to courses';
 $string['xcompetenciesproficientoutofy'] = '{$a->x} out of {$a->y} competencies are proficient';
 $string['xcompetenciesproficientoutofyincourse'] = 'You are proficient in {$a->x} out of {$a->y} competencies in this course.';
-$string['xplanscompletedoutofy'] = '{$a->x} out of {$a->y} plans completed for this template';
+$string['xplanscompletedoutofy'] = '{$a->x} out of {$a->y} learning plans completed for this template';
diff --git a/admin/tool/lp/lib.php b/admin/tool/lp/lib.php
index 1539e32617c..b2e894d6b78 100644
--- a/admin/tool/lp/lib.php
+++ b/admin/tool/lp/lib.php
@@ -36,8 +36,8 @@ function tool_lp_extend_navigation_course($navigation, $course, $coursecontext)
         return;
     }
 
-    // Just a link to course report.
-    $title = get_string('coursecompetencies', 'tool_lp');
+    // Just a link to course competency.
+    $title = get_string('competencies', 'core_competency');
     $path = new moodle_url("/admin/tool/lp/coursecompetencies.php", array('courseid' => $course->id));
     $settingsnode = navigation_node::create($title,
                                             $path,
diff --git a/admin/tool/lp/tests/behat/framework_crud.feature b/admin/tool/lp/tests/behat/framework_crud.feature
index a77dcd02ff8..75236ca260d 100644
--- a/admin/tool/lp/tests/behat/framework_crud.feature
+++ b/admin/tool/lp/tests/behat/framework_crud.feature
@@ -9,10 +9,10 @@ Feature: Manage competency frameworks
     And I am on site homepage
     And I expand "Site administration" node
     When I expand "Competencies" node
-    Then I should see "Competency Frameworks"
+    Then I should see "Competency frameworks"
 
   Scenario: Create a new framework
-    Given I follow "Competency Frameworks"
+    Given I follow "Competency frameworks"
     And I should see "List of competency frameworks"
     And I click on "Add new competency framework" "button"
     And I should see "General"
@@ -34,7 +34,7 @@ Feature: Manage competency frameworks
     Given the following lp "frameworks" exist:
       | shortname | idnumber |
       | Science Year-2 | sc-y-2 |
-    And I follow "Competency Frameworks"
+    And I follow "Competency frameworks"
     And I should see "Science Year-2"
     When I click on "Science Year-2" "link"
     Then I should see "Science Year-2"
@@ -43,7 +43,7 @@ Feature: Manage competency frameworks
     Given the following lp "frameworks" exist:
       | shortname | idnumber |
       | Science Year-3 | sc-y-3 |
-    And I follow "Competency Frameworks"
+    And I follow "Competency frameworks"
     And I should see "Science Year-3"
     And I click on "Edit" of edit menu in the "Science Year-3" row
     And the field "Name" matches value "Science Year-3 "
@@ -57,7 +57,7 @@ Feature: Manage competency frameworks
     Given the following lp "frameworks" exist:
       | shortname | idnumber |
       | Science Year-4 | sc-y-4 |
-    And I follow "Competency Frameworks"
+    And I follow "Competency frameworks"
     And I should see "Science Year-4"
     And I should see "sc-y-4"
     And I click on "Delete" of edit menu in the "Science Year-4" row
@@ -90,7 +90,7 @@ Scenario: Edit a framework with competencies in user competency
       | user | competency |
       | admin | Comp1 |
       | admin | Comp2 |
-    And I follow "Competency Frameworks"
+    And I follow "Competency frameworks"
     And I should see "Science Year-5"
     And I click on "Edit" of edit menu in the "Science Year-5" row
     And the field "Name" matches value "Science Year-5 "
@@ -120,7 +120,7 @@ Scenario: Edit a framework with competencies in user competency plan
       | user | competency | plan |
       | admin | Comp1 | Plan Science-6 |
       | admin | Comp2 | Plan Science-6 |
-    And I follow "Competency Frameworks"
+    And I follow "Competency frameworks"
     And I should see "Science Year-6"
     And I click on "Edit" of edit menu in the "Science Year-6" row
     And the field "Name" matches value "Science Year-6 "
diff --git a/admin/tool/lp/tests/behat/plan_crud.feature b/admin/tool/lp/tests/behat/plan_crud.feature
index 82c6bd65318..a03113dcc2c 100644
--- a/admin/tool/lp/tests/behat/plan_crud.feature
+++ b/admin/tool/lp/tests/behat/plan_crud.feature
@@ -32,8 +32,8 @@ Feature: Manage plearning plan
     And I click on ".template-userplans" "css_element" in the "Science template" "table_row"
     And I click on ".form-autocomplete-downarrow" "css_element"
     And I click on "Admin" item in the autocomplete list
-    When I click on "Create plans" "button"
-    Then I should see "A plan was created"
+    When I click on "Create learning plans" "button"
+    Then I should see "A learning plan was created"
     And I should see "Admin User" in the "Science template" "table_row"
 
   Scenario: Create a learning plan from template cohort
@@ -59,7 +59,7 @@ Feature: Manage plearning plan
     And I click on ".form-autocomplete-downarrow" "css_element"
     And I click on "cohort plan" item in the autocomplete list
     When I click on "Add cohorts" "button"
-    Then I should see "2 plans were created."
+    Then I should see "2 learning plans were created."
     And I follow "Learning plan templates"
     And I click on ".template-userplans" "css_element" in the "Science template cohort" "table_row"
     And I should see "Student 1"
diff --git a/admin/tool/lp/tests/behat/template_crud.feature b/admin/tool/lp/tests/behat/template_crud.feature
index a6a3f5dfe4d..268651701d0 100644
--- a/admin/tool/lp/tests/behat/template_crud.feature
+++ b/admin/tool/lp/tests/behat/template_crud.feature
@@ -30,7 +30,7 @@ Feature: Manage plearning plan templates
     And I should see "Science template Year-2"
     When I click on "Science template Year-2" "link"
     Then I should see "Science template Year-2"
-    And I should see "Template competencies"
+    And I should see "Learning plan template competencies"
 
   Scenario: Edit a learning plan template
     Given the following lp "templates" exist:
diff --git a/competency/tests/api_test.php b/competency/tests/api_test.php
index 9004d1fd633..d0f86ebd7a3 100644
--- a/competency/tests/api_test.php
+++ b/competency/tests/api_test.php
@@ -3866,7 +3866,7 @@ class core_competency_api_testcase extends advanced_testcase {
         // Give permission to view competencies.
         $dg->role_assign($canviewucrole, $teacher1->id, $c1ctx->id);
         accesslib_clear_all_caches_for_unit_testing();
-        $this->assertExceptionWithGradeCompetencyInCourse('required_capability_exception', 'Set competency grade',
+        $this->assertExceptionWithGradeCompetencyInCourse('required_capability_exception', 'Set competency rating',
             $c1->id, $student1->id, $comp1->get_id());
 
         // Give permission to rate.
diff --git a/competency/tests/external_test.php b/competency/tests/external_test.php
index 287ae50d566..f280e5f98fc 100644
--- a/competency/tests/external_test.php
+++ b/competency/tests/external_test.php
@@ -2670,7 +2670,7 @@ class core_competency_external_testcase extends externallib_advanced_testcase {
 
         $evidence = external::grade_competency_in_plan($plan->get_id(), $c1->get_id(), 1, 'Evil note');
 
-        $this->assertEquals('The competency grade was manually set in the plan \'Evil\'.', $evidence->description);
+        $this->assertEquals('The competency rating was manually set in the learning plan \'Evil\'.', $evidence->description);
         $this->assertEquals('A', $evidence->gradename);
         $this->assertEquals('Evil note', $evidence->note);
 
diff --git a/lang/en/competency.php b/lang/en/competency.php
index 56aaecd5d9f..427f046bcb9 100644
--- a/lang/en/competency.php
+++ b/lang/en/competency.php
@@ -28,7 +28,7 @@ $string['allchildrenarecomplete'] = 'All children are complete';
 $string['competencies'] = 'Competencies';
 $string['competenciesarenotenabled'] = 'The competencies module is not enabled.';
 $string['competenciessettings'] = 'Competencies settings';
-$string['completeplanstask'] = 'Complete plans which are due';
+$string['completeplanstask'] = 'Complete learning plans which are due';
 $string['coursecompetencyoutcome_complete'] = 'Complete the competency';
 $string['coursecompetencyoutcome_evidence'] = 'Attach an evidence';
 $string['coursecompetencyoutcome_none'] = 'Do nothing';
@@ -61,34 +61,34 @@ $string['eventcompetencyframeworkviewed'] = 'Competency framework viewed.';
 $string['eventcompetencyupdated'] = 'Competency updated.';
 $string['eventcompetencyviewed'] = 'Competency viewed.';
 $string['eventevidencecreated'] = 'Evidence created.';
-$string['eventplanapproved'] = 'Plan approved.';
-$string['eventplancompleted'] = 'Plan completed.';
-$string['eventplancreated'] = 'Plan created.';
-$string['eventplandeleted'] = 'Plan deleted.';
-$string['eventplanreopened'] = 'Plan reopened.';
-$string['eventplanreviewrequestcancelled'] = 'Plan review request cancelled.';
-$string['eventplanreviewrequested'] = 'Plan review requested.';
-$string['eventplanreviewstarted'] = 'Plan review started.';
-$string['eventplanreviewstopped'] = 'Plan review stopped.';
-$string['eventplanunapproved'] = 'Plan unapproved.';
-$string['eventplanunlinked'] = 'Plan unlinked.';
-$string['eventplanupdated'] = 'Plan updated.';
-$string['eventplanviewed'] = 'Plan viewed.';
-$string['eventtemplatecreated'] = 'Template created.';
-$string['eventtemplatedeleted'] = 'Template deleted.';
-$string['eventtemplateupdated'] = 'Template updated.';
-$string['eventtemplateviewed'] = 'Template viewed.';
-$string['eventusercompetencygraderated'] = 'User competency grade rated.';
-$string['eventusercompetencygraderatedincourse'] = 'User competency grade rated in course.';
-$string['eventusercompetencygraderatedinplan'] = 'User competency grade rated in plan.';
+$string['eventplanapproved'] = 'Learning plan approved.';
+$string['eventplancompleted'] = 'Learning plan completed.';
+$string['eventplancreated'] = 'Learning plan created.';
+$string['eventplandeleted'] = 'Learning plan deleted.';
+$string['eventplanreopened'] = 'Learning plan reopened.';
+$string['eventplanreviewrequestcancelled'] = 'Learning plan review request cancelled.';
+$string['eventplanreviewrequested'] = 'Learning plan review requested.';
+$string['eventplanreviewstarted'] = 'Learning plan review started.';
+$string['eventplanreviewstopped'] = 'Learning plan review stopped.';
+$string['eventplanunapproved'] = 'Learning plan unapproved.';
+$string['eventplanunlinked'] = 'Learning plan unlinked.';
+$string['eventplanupdated'] = 'Learning plan updated.';
+$string['eventplanviewed'] = 'Learning plan viewed.';
+$string['eventtemplatecreated'] = 'Learning plan template created.';
+$string['eventtemplatedeleted'] = 'Learning plan template deleted.';
+$string['eventtemplateupdated'] = 'Learning plan template updated.';
+$string['eventtemplateviewed'] = 'Learning plan template viewed.';
 $string['eventusercompetencyplanviewed'] = 'User competency plan viewed.';
+$string['eventusercompetencyrated'] = 'User competency rated.';
+$string['eventusercompetencyratedincourse'] = 'User competency rated in course.';
+$string['eventusercompetencyratedinplan'] = 'User competency rated in a learning plan.';
 $string['eventusercompetencyreviewrequestcancelled'] = 'User competency review request cancelled.';
 $string['eventusercompetencyreviewrequested'] = 'User competency review requested.';
 $string['eventusercompetencyreviewstarted'] = 'User competency review started.';
 $string['eventusercompetencyreviewstopped'] = 'User competency review stopped.';
 $string['eventusercompetencyviewed'] = 'User competency viewed.';
 $string['eventusercompetencyviewedincourse'] = 'User competency viewed in a course.';
-$string['eventusercompetencyviewedinplan'] = 'User competency viewed in a plan.';
+$string['eventusercompetencyviewedinplan'] = 'User competency viewed in a learning plan.';
 $string['eventuserevidencecreated'] = 'Evidence of prior learning created.';
 $string['eventuserevidencedeleted'] = 'Evidence of prior learning deleted.';
 $string['eventuserevidenceupdated'] = 'Evidence of prior learning updated.';
@@ -98,10 +98,10 @@ $string['evidence_coursemodulecompleted'] = 'The activity \'{$a}\' was completed
 $string['evidence_evidenceofpriorlearninglinked'] = 'The evidence of prior learning \'{$a}\' was linked.';
 $string['evidence_evidenceofpriorlearningunlinked'] = 'The evidence of prior learning \'{$a}\' was unlinked.';
 $string['evidence_manualoverride'] = 'The competency rating was manually set.';
-$string['evidence_manualoverrideincourse'] = 'The competency grade was manually set in the course \'{$a}\'.';
-$string['evidence_manualoverrideinplan'] = 'The competency grade was manually set in the plan \'{$a}\'.';
+$string['evidence_manualoverrideincourse'] = 'The competency rating was manually set in the course \'{$a}\'.';
+$string['evidence_manualoverrideinplan'] = 'The competency rating was manually set in the learning plan \'{$a}\'.';
 $string['invalidevidencedesc'] = 'Invalid evidence description';
-$string['invalidgrade'] = 'Invalid grade';
+$string['invalidgrade'] = 'Invalid rating';
 $string['invalidpersistent'] = 'Invalid persistent';
 $string['invalidplan'] = 'Invalid learning plan';
 $string['invalidtaxonomy'] = 'Invalid taxonomy: {$a}';
@@ -114,7 +114,7 @@ $string['planstatuswaitingforreview'] = 'Waiting for review';
 $string['pointsrequiredaremet'] = 'Points required are met';
 $string['pushcourseratingstouserplans'] = 'Push course ratings to individual learning plans';
 $string['pushcourseratingstouserplans_desc'] = 'Default value for the course setting to update individual learning plans when course competencies are rated.';
-$string['syncplanscohorts'] = 'Sync plans from template cohorts';
+$string['syncplanscohorts'] = 'Sync plans from learning plan template cohorts';
 $string['taxonomy_behaviour'] = 'Behaviour';
 $string['taxonomy_competency'] = 'Competency';
 $string['taxonomy_concept'] = 'Concept';
@@ -136,17 +136,17 @@ $string['usercommentedonacompetencyhtml'] = '<p>{$a->fullname} commented on the
 <p>See: <a href="{$a->url}">{$a->urlname}</a>.</p>';
 $string['usercommentedonacompetencysmall'] = '{$a->fullname} commented on the competency "{$a->competency}".';
 $string['usercommentedonacompetencysubject'] = '{$a} commented on a competency.';
-$string['usercommentedonaplan'] = '{$a->fullname} commented on the plan "{$a->plan}":
+$string['usercommentedonaplan'] = '{$a->fullname} commented on the learning plan "{$a->plan}":
 
 {$a->comment}
 
 See: {$a->url}';
-$string['usercommentedonaplanhtml'] = '<p>{$a->fullname} commented on the plan "{$a->plan}":</p>
+$string['usercommentedonaplanhtml'] = '<p>{$a->fullname} commented on the learning plan "{$a->plan}":</p>
 <div>{$a->comment}</div>
 <p>See: <a href="{$a->url}">{$a->urlname}</a>.</p>';
-$string['usercommentedonaplansmall'] = '{$a->fullname} commented on the plan "{$a->plan}".';
-$string['usercommentedonaplansubject'] = '{$a} commented on a plan.';
+$string['usercommentedonaplansmall'] = '{$a->fullname} commented on the learning plan "{$a->plan}".';
+$string['usercommentedonaplansubject'] = '{$a} commented on a learning plan.';
 $string['usercompetencystatus_idle'] = 'Idle';
 $string['usercompetencystatus_inreview'] = 'In review';
 $string['usercompetencystatus_waitingforreview'] = 'Waiting for review';
-$string['userplans'] = 'User plans';
+$string['userplans'] = 'Learning plans';
diff --git a/lang/en/role.php b/lang/en/role.php
index d42a3e0c3a2..f941566a1d2 100644
--- a/lang/en/role.php
+++ b/lang/en/role.php
@@ -107,7 +107,7 @@ $string['comment:view'] = 'View comments';
 $string['community:add'] = 'Use the community block to search hubs and find courses';
 $string['community:download'] = 'Download a course from the community block';
 $string['competency:competencymanage'] = 'Manage competency frameworks';
-$string['competency:competencygrade'] = 'Set competency grade';
+$string['competency:competencygrade'] = 'Set competency rating';
 $string['competency:competencyview'] = 'View competency frameworks';
 $string['competency:coursecompetencygradable'] = 'Receive competency marks';
 $string['competency:coursecompetencyconfigure'] = 'Configure course competency settings';
@@ -127,8 +127,8 @@ $string['competency:planview'] = 'View all learning plans';
 $string['competency:planviewdraft'] = 'View draft learning plans';
 $string['competency:planviewown'] = 'View own learning plans';
 $string['competency:planviewowndraft'] = 'View own draft learning plans';
-$string['competency:templatemanage'] = 'Manage templates';
-$string['competency:templateview'] = 'View template';
+$string['competency:templatemanage'] = 'Manage learning plan templates';
+$string['competency:templateview'] = 'View learning plan templates';
 $string['competency:usercompetencycomment'] = 'Comment on a user competency';
 $string['competency:usercompetencycommentown'] = 'Comment on own user competency';
 $string['competency:usercompetencyrequestreview'] = 'Request the review of a user competency';
diff --git a/lib/classes/event/competency_user_competency_rated.php b/lib/classes/event/competency_user_competency_rated.php
index bb2793d1ec5..1136d83cf1b 100644
--- a/lib/classes/event/competency_user_competency_rated.php
+++ b/lib/classes/event/competency_user_competency_rated.php
@@ -76,7 +76,7 @@ class competency_user_competency_rated extends base {
      */
     public function get_description() {
         return "The user with id '$this->userid' rated the user competency with id '$this->objectid' "
-                . "with '" . $this->other['grade'] . "' grade";
+                . "with '" . $this->other['grade'] . "' rating";
     }
 
     /**
@@ -85,7 +85,7 @@ class competency_user_competency_rated extends base {
      * @return string
      */
     public static function get_name() {
-        return get_string('eventusercompetencygraderated', 'core_competency');
+        return get_string('eventusercompetencyrated', 'core_competency');
     }
 
     /**
diff --git a/lib/classes/event/competency_user_competency_rated_in_course.php b/lib/classes/event/competency_user_competency_rated_in_course.php
index 2051eaf529d..7cdae3aa020 100644
--- a/lib/classes/event/competency_user_competency_rated_in_course.php
+++ b/lib/classes/event/competency_user_competency_rated_in_course.php
@@ -81,7 +81,7 @@ class competency_user_competency_rated_in_course extends base {
      */
     public function get_description() {
         return "The user with id '$this->userid' rated the user competency with id '$this->objectid' with "
-                . "'" . $this->other['grade'] . "' grade "
+                . "'" . $this->other['grade'] . "' rating "
                 . "in course with id '$this->courseid'";
     }
 
@@ -91,7 +91,7 @@ class competency_user_competency_rated_in_course extends base {
      * @return string
      */
     public static function get_name() {
-        return get_string('eventusercompetencygraderatedincourse', 'core_competency');
+        return get_string('eventusercompetencyratedincourse', 'core_competency');
     }
 
     /**
diff --git a/lib/classes/event/competency_user_competency_rated_in_plan.php b/lib/classes/event/competency_user_competency_rated_in_plan.php
index 41e0eed3079..1d75614ed6f 100644
--- a/lib/classes/event/competency_user_competency_rated_in_plan.php
+++ b/lib/classes/event/competency_user_competency_rated_in_plan.php
@@ -81,7 +81,7 @@ class competency_user_competency_rated_in_plan extends base {
      */
     public function get_description() {
         return "The user with id '$this->userid' rated the user competency with id '$this->objectid' with "
-                . "'" . $this->other['grade'] . "' grade "
+                . "'" . $this->other['grade'] . "' rating "
                 . "in plan with id '" . $this->other['grade'] . "'";
     }
 
@@ -91,7 +91,7 @@ class competency_user_competency_rated_in_plan extends base {
      * @return string
      */
     public static function get_name() {
-        return get_string('eventusercompetencygraderatedinplan', 'core_competency');
+        return get_string('eventusercompetencyratedinplan', 'core_competency');
     }
 
     /**