diff --git a/admin/tool/lp/classes/url_resolver.php b/admin/tool/lp/classes/url_resolver.php
index 116c7a47629c9..89a117bec5453 100644
--- a/admin/tool/lp/classes/url_resolver.php
+++ b/admin/tool/lp/classes/url_resolver.php
@@ -36,6 +36,34 @@
  */
 class url_resolver {
 
+    /**
+     * The URL where the competency can be found.
+     *
+     * @param int $competencyid The competency ID.
+     * @param int $pagecontextid The ID of the context we are in.
+     * @return moodle_url
+     */
+    public function competency($competencyid, $pagecontextid) {
+        return new moodle_url('/admin/tool/lp/editcompetency.php', array(
+            'id' => $competencyid,
+            'pagecontextid' => $pagecontextid
+        ));
+    }
+
+    /**
+     * The URL where the framework can be found.
+     *
+     * @param int $frameworkid The framework ID.
+     * @param int $pagecontextid The ID of the context we are in.
+     * @return moodle_url
+     */
+    public function framework($frameworkid, $pagecontextid) {
+        return new moodle_url('/admin/tool/lp/competencies.php', array(
+            'competencyframeworkid' => $frameworkid,
+            'pagecontextid' => $pagecontextid
+        ));
+    }
+
     /**
      * The URL where the frameworks can be found.
      *
@@ -66,16 +94,56 @@ public function plans($userid) {
         return new moodle_url('/admin/tool/lp/plans.php', array('userid' => $userid));
     }
 
+    /**
+     * The URL where the template can be found.
+     *
+     * @param int $templateid The template ID.
+     * @param int $pagecontextid The ID of the context we are in.
+     * @return moodle_url
+     */
+    public function template($templateid, $pagecontextid) {
+        return new moodle_url('/admin/tool/lp/templatecompetencies.php', array(
+            'templateid' => $templateid,
+            'pagecontextid' => $pagecontextid
+        ));
+    }
+
+    /**
+     * The URL where the templates can be found.
+     *
+     * @param int $pagecontextid The ID of the context that we are browsing.
+     * @return moodle_url
+     */
+    public function templates($pagecontextid) {
+        return new moodle_url('/admin/tool/lp/learningplans.php', array('pagecontextid' => $pagecontextid));
+    }
+
     /**
      * The URL where the user competency can be found.
      *
-     * @param int $usercompetency The user competency ID
+     * @param int $usercompetencyid The user competency ID
      * @return moodle_url
      */
     public function user_competency($usercompetencyid) {
         return new moodle_url('/admin/tool/lp/user_competency.php', array('id' => $usercompetencyid));
     }
 
+    /**
+     * The URL where the user competency can be found in the context of a course.
+     *
+     * @param int $userid The user ID
+     * @param int $competencyid The competency ID.
+     * @param int $courseid The course ID.
+     * @return moodle_url
+     */
+    public function user_competency_in_course($userid, $competencyid, $courseid) {
+        return new moodle_url('/admin/tool/lp/user_competency_in_course.php', array(
+            'userid' => $userid,
+            'competencyid' => $competencyid,
+            'courseid' => $courseid
+        ));
+    }
+
     /**
      * The URL where the user competency can be found in the context of a plan.
      *
@@ -95,7 +163,7 @@ public function user_competency_in_plan($userid, $competencyid, $planid) {
     /**
      * The URL where the user evidence (of prior learning) can be found.
      *
-     * @param int $usercompetency The user evidence ID
+     * @param int $userevidenceid The user evidence ID
      * @return moodle_url
      */
     public function user_evidence($userevidenceid) {
diff --git a/competency/classes/url.php b/competency/classes/url.php
index ce4563946dde0..f9d87396f30ca 100644
--- a/competency/classes/url.php
+++ b/competency/classes/url.php
@@ -72,6 +72,28 @@ protected static function get($resource, $args) {
         return call_user_func_array([static::$resolver, $resource], $args);
     }
 
+    /**
+     * The URL where the competency can be found.
+     *
+     * @param int $competencyid The competency ID.
+     * @param int $pagecontextid The ID of the context we are in.
+     * @return moodle_url
+     */
+    public static function competency($competencyid, $pagecontextid) {
+        return static::get(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * The URL where the framework can be found.
+     *
+     * @param int $frameworkid The framework ID.
+     * @param int $pagecontextid The ID of the context we are in.
+     * @return moodle_url
+     */
+    public static function framework($frameworkid, $pagecontextid) {
+        return static::get(__FUNCTION__, func_get_args());
+    }
+
     /**
      * The URL where the frameworks can be found.
      *
@@ -102,16 +124,49 @@ public static function plans($userid) {
         return static::get(__FUNCTION__, func_get_args());
     }
 
+    /**
+     * The URL where the template can be found.
+     *
+     * @param int $templateid The template ID.
+     * @param int $pagecontextid The ID of the context we are in.
+     * @return moodle_url
+     */
+    public static function template($templateid, $pagecontextid) {
+        return static::get(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * The URL where the templates can be found.
+     *
+     * @param int $pagecontextid The ID of the context that we are browsing.
+     * @return moodle_url
+     */
+    public function templates($pagecontextid) {
+        return static::get(__FUNCTION__, func_get_args());
+    }
+
     /**
      * The URL where the user competency can be found.
      *
-     * @param int $usercompetency The user competency ID
+     * @param int $usercompetencyid The user competency ID
      * @return moodle_url
      */
     public static function user_competency($usercompetencyid) {
         return static::get(__FUNCTION__, func_get_args());
     }
 
+    /**
+     * The URL where the user competency can be found in the context of a course.
+     *
+     * @param int $userid The user ID
+     * @param int $competencyid The competency ID.
+     * @param int $courseid The course ID.
+     * @return moodle_url
+     */
+    public static function user_competency_in_course($userid, $competencyid, $courseid) {
+        return static::get(__FUNCTION__, func_get_args());
+    }
+
     /**
      * The URL where the user competency can be found in the context of a plan.
      *
@@ -127,7 +182,7 @@ public static function user_competency_in_plan($userid, $competencyid, $planid)
     /**
      * The URL where the user evidence (of prior learning) can be found.
      *
-     * @param int $usercompetency The user evidence ID
+     * @param int $userevidenceid The user evidence ID
      * @return moodle_url
      */
     public static function user_evidence($userevidenceid) {
diff --git a/lib/classes/event/competency_created.php b/lib/classes/event/competency_created.php
index badc99cb79ff1..0ada2d4225c05 100644
--- a/lib/classes/event/competency_created.php
+++ b/lib/classes/event/competency_created.php
@@ -82,10 +82,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/editcompetency.php', array(
-            'id' => $this->objectid,
-            'pagecontextid' => $this->contextid
-        ));
+        return \core_competency\url::competency($this->objectid, $this->contextid);
     }
 
     /**
diff --git a/lib/classes/event/competency_evidence_created.php b/lib/classes/event/competency_evidence_created.php
index 685e1e8240594..605754cb26b00 100644
--- a/lib/classes/event/competency_evidence_created.php
+++ b/lib/classes/event/competency_evidence_created.php
@@ -119,10 +119,7 @@ public function get_description() {
      * @return \moodle_url
      */
     public function get_url() {
-        $urlparams = [
-            'id' => $this->other['usercompetencyid']
-        ];
-        return new \moodle_url('/admin/tool/lp/user_competency.php', $urlparams);
+        return \core_competency\url::user_competency($this->other['usercompetencyid']);
     }
 
     /**
diff --git a/lib/classes/event/competency_framework_created.php b/lib/classes/event/competency_framework_created.php
index 5563bbe03b6ba..66ea6a8a0cb94 100644
--- a/lib/classes/event/competency_framework_created.php
+++ b/lib/classes/event/competency_framework_created.php
@@ -84,8 +84,7 @@ public function get_description() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/editcompetencyframework.php', array(
-            'id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::framework($this->objectid, $this->contextid);
     }
 
     /**
diff --git a/lib/classes/event/competency_framework_updated.php b/lib/classes/event/competency_framework_updated.php
index f6113cfee9f48..8b81ac1b50034 100644
--- a/lib/classes/event/competency_framework_updated.php
+++ b/lib/classes/event/competency_framework_updated.php
@@ -85,8 +85,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/editcompetencyframework.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::framework($this->objectid, $this->contextid);
     }
 
     /**
diff --git a/lib/classes/event/competency_framework_viewed.php b/lib/classes/event/competency_framework_viewed.php
index a70a415afd6a6..3034de163baf1 100644
--- a/lib/classes/event/competency_framework_viewed.php
+++ b/lib/classes/event/competency_framework_viewed.php
@@ -81,10 +81,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/competencies.php', array(
-                                                                        'competencyframeworkid' => $this->objectid,
-                                                                        'pagecontextid' => $this->contextid
-                ));
+        return \core_competency\url::framework($this->objectid, $this->contextid);
     }
 
     /**
diff --git a/lib/classes/event/competency_plan_approved.php b/lib/classes/event/competency_plan_approved.php
index 75d26f8b51934..1c7ab025d54e7 100644
--- a/lib/classes/event/competency_plan_approved.php
+++ b/lib/classes/event/competency_plan_approved.php
@@ -87,8 +87,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**
diff --git a/lib/classes/event/competency_plan_completed.php b/lib/classes/event/competency_plan_completed.php
index acf05fb54edfc..4de68a2760ea9 100644
--- a/lib/classes/event/competency_plan_completed.php
+++ b/lib/classes/event/competency_plan_completed.php
@@ -87,8 +87,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**
diff --git a/lib/classes/event/competency_plan_created.php b/lib/classes/event/competency_plan_created.php
index fb5408d028dd3..762bd158028ff 100644
--- a/lib/classes/event/competency_plan_created.php
+++ b/lib/classes/event/competency_plan_created.php
@@ -84,8 +84,7 @@ public function get_description() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**
diff --git a/lib/classes/event/competency_plan_reopened.php b/lib/classes/event/competency_plan_reopened.php
index dde07439537f0..016965ba9b516 100644
--- a/lib/classes/event/competency_plan_reopened.php
+++ b/lib/classes/event/competency_plan_reopened.php
@@ -87,8 +87,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**
diff --git a/lib/classes/event/competency_plan_review_request_cancelled.php b/lib/classes/event/competency_plan_review_request_cancelled.php
index 60be0c4d97685..212c447b6a12f 100644
--- a/lib/classes/event/competency_plan_review_request_cancelled.php
+++ b/lib/classes/event/competency_plan_review_request_cancelled.php
@@ -87,8 +87,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**
diff --git a/lib/classes/event/competency_plan_review_requested.php b/lib/classes/event/competency_plan_review_requested.php
index 50f8e43312c79..537d85dd23d22 100644
--- a/lib/classes/event/competency_plan_review_requested.php
+++ b/lib/classes/event/competency_plan_review_requested.php
@@ -87,8 +87,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**
diff --git a/lib/classes/event/competency_plan_review_started.php b/lib/classes/event/competency_plan_review_started.php
index cf32e60973c85..a0cee7a18c986 100644
--- a/lib/classes/event/competency_plan_review_started.php
+++ b/lib/classes/event/competency_plan_review_started.php
@@ -87,8 +87,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**
diff --git a/lib/classes/event/competency_plan_review_stopped.php b/lib/classes/event/competency_plan_review_stopped.php
index 2812db1d1eaac..da3f8740da83b 100644
--- a/lib/classes/event/competency_plan_review_stopped.php
+++ b/lib/classes/event/competency_plan_review_stopped.php
@@ -87,8 +87,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**
diff --git a/lib/classes/event/competency_plan_unapproved.php b/lib/classes/event/competency_plan_unapproved.php
index 2de04fd1dd206..51be01d1ea6f9 100644
--- a/lib/classes/event/competency_plan_unapproved.php
+++ b/lib/classes/event/competency_plan_unapproved.php
@@ -87,8 +87,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**
diff --git a/lib/classes/event/competency_plan_unlinked.php b/lib/classes/event/competency_plan_unlinked.php
index 5247c38db9dd3..58469cd5a8585 100644
--- a/lib/classes/event/competency_plan_unlinked.php
+++ b/lib/classes/event/competency_plan_unlinked.php
@@ -84,8 +84,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**
diff --git a/lib/classes/event/competency_plan_updated.php b/lib/classes/event/competency_plan_updated.php
index e782b564baed2..5844adb458798 100644
--- a/lib/classes/event/competency_plan_updated.php
+++ b/lib/classes/event/competency_plan_updated.php
@@ -87,8 +87,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**
diff --git a/lib/classes/event/competency_plan_viewed.php b/lib/classes/event/competency_plan_viewed.php
index adcaa3179145f..35d607744e2c9 100644
--- a/lib/classes/event/competency_plan_viewed.php
+++ b/lib/classes/event/competency_plan_viewed.php
@@ -84,8 +84,7 @@ public function get_description() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/plan.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::plan($this->objectid);
     }
 
     /**
diff --git a/lib/classes/event/competency_template_created.php b/lib/classes/event/competency_template_created.php
index f638522093ec9..471bcb64d57aa 100644
--- a/lib/classes/event/competency_template_created.php
+++ b/lib/classes/event/competency_template_created.php
@@ -84,8 +84,7 @@ public function get_description() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/edittemplate.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::template($this->objectid, $this->contextid);
     }
 
     /**
diff --git a/lib/classes/event/competency_template_updated.php b/lib/classes/event/competency_template_updated.php
index de0b89784cde4..209c0b0666898 100644
--- a/lib/classes/event/competency_template_updated.php
+++ b/lib/classes/event/competency_template_updated.php
@@ -87,8 +87,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/edittemplate.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::template($this->objectid, $this->contextid);
     }
 
     /**
diff --git a/lib/classes/event/competency_template_viewed.php b/lib/classes/event/competency_template_viewed.php
index c6b28b144ada0..f444d1c5bef31 100644
--- a/lib/classes/event/competency_template_viewed.php
+++ b/lib/classes/event/competency_template_viewed.php
@@ -84,8 +84,7 @@ public function get_description() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/templatecompetencies.php',
-                               array('templateid' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return \core_competency\url::template($this->objectid, $this->contextid);
     }
 
     /**
diff --git a/lib/classes/event/competency_updated.php b/lib/classes/event/competency_updated.php
index 2422f9ab3ea81..d147889240905 100644
--- a/lib/classes/event/competency_updated.php
+++ b/lib/classes/event/competency_updated.php
@@ -82,10 +82,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/editcompetency.php', array(
-            'id' => $this->objectid,
-            'pagecontextid' => $this->contextid
-        ));
+        return \core_competency\url::competency($this->objectid, $this->contextid);
     }
 
     /**
diff --git a/lib/classes/event/competency_user_competency_plan_viewed.php b/lib/classes/event/competency_user_competency_plan_viewed.php
index cbf829f999868..94fa341980405 100644
--- a/lib/classes/event/competency_user_competency_plan_viewed.php
+++ b/lib/classes/event/competency_user_competency_plan_viewed.php
@@ -93,11 +93,8 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/user_competency_in_plan.php', array(
-            'competencyid' => $this->other['competencyid'],
-            'userid' => $this->relateduserid,
-            'planid' => $this->other['planid']
-        ));
+        return \core_competency\url::user_competency_in_plan($this->relateduserid, $this->other['competencyid'],
+            $this->other['planid']);
     }
 
     /**
diff --git a/lib/classes/event/competency_user_competency_rated.php b/lib/classes/event/competency_user_competency_rated.php
index 8756c11cd7325..bb2793d1ec5a5 100644
--- a/lib/classes/event/competency_user_competency_rated.php
+++ b/lib/classes/event/competency_user_competency_rated.php
@@ -94,9 +94,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/user_competency.php', array(
-                'id' => $this->objectid
-        ));
+        return \core_competency\url::user_competency($this->objectid);
     }
 
     /**
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 0aedba0a1e54c..2051eaf529d6d 100644
--- a/lib/classes/event/competency_user_competency_rated_in_course.php
+++ b/lib/classes/event/competency_user_competency_rated_in_course.php
@@ -100,11 +100,8 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/user_competency_in_course.php', array(
-            'competencyid' => $this->other['competencyid'],
-            'userid' => $this->relateduserid,
-            'courseid' => $this->courseid
-        ));
+        return \core_competency\url::user_competency_in_course($this->relateduserid, $this->other['competencyid'],
+            $this->courseid);
     }
 
     /**
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 90663e2db88ce..41e0eed30796d 100644
--- a/lib/classes/event/competency_user_competency_rated_in_plan.php
+++ b/lib/classes/event/competency_user_competency_rated_in_plan.php
@@ -100,11 +100,8 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/user_competency_in_plan.php', array(
-            'competencyid' => $this->other['competencyid'],
-            'userid' => $this->relateduserid,
-            'planid' => $this->other['planid']
-        ));
+        return \core_competency\url::user_competency_in_plan($this->relateduserid, $this->other['competencyid'],
+            $this->other['planid']);
     }
 
     /**
diff --git a/lib/classes/event/competency_user_competency_review_request_cancelled.php b/lib/classes/event/competency_user_competency_review_request_cancelled.php
index 7116b5ce4feec..a35f962e9d192 100644
--- a/lib/classes/event/competency_user_competency_review_request_cancelled.php
+++ b/lib/classes/event/competency_user_competency_review_request_cancelled.php
@@ -84,9 +84,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/user_competency.php', array(
-                'id' => $this->objectid
-        ));
+        return \core_competency\url::user_competency($this->objectid);
     }
 
     /**
diff --git a/lib/classes/event/competency_user_competency_review_requested.php b/lib/classes/event/competency_user_competency_review_requested.php
index 690a6eb86052c..4271042698727 100644
--- a/lib/classes/event/competency_user_competency_review_requested.php
+++ b/lib/classes/event/competency_user_competency_review_requested.php
@@ -84,9 +84,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/user_competency.php', array(
-                'id' => $this->objectid
-        ));
+        return \core_competency\url::user_competency($this->objectid);
     }
 
     /**
diff --git a/lib/classes/event/competency_user_competency_review_started.php b/lib/classes/event/competency_user_competency_review_started.php
index a64f22b2a6884..b887d6ae8280c 100644
--- a/lib/classes/event/competency_user_competency_review_started.php
+++ b/lib/classes/event/competency_user_competency_review_started.php
@@ -84,9 +84,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/user_competency.php', array(
-                'id' => $this->objectid
-        ));
+        return \core_competency\url::user_competency($this->objectid);
     }
 
     /**
diff --git a/lib/classes/event/competency_user_competency_review_stopped.php b/lib/classes/event/competency_user_competency_review_stopped.php
index 64735683fcafa..560523facb6c2 100644
--- a/lib/classes/event/competency_user_competency_review_stopped.php
+++ b/lib/classes/event/competency_user_competency_review_stopped.php
@@ -84,9 +84,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/user_competency.php', array(
-                'id' => $this->objectid
-        ));
+        return \core_competency\url::user_competency($this->objectid);
     }
 
     /**
diff --git a/lib/classes/event/competency_user_competency_viewed.php b/lib/classes/event/competency_user_competency_viewed.php
index 981e2757144db..c285e759b99db 100644
--- a/lib/classes/event/competency_user_competency_viewed.php
+++ b/lib/classes/event/competency_user_competency_viewed.php
@@ -93,9 +93,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/user_competency.php', array(
-                'id' => $this->objectid
-        ));
+        return \core_competency\url::user_competency($this->objectid);
     }
 
     /**
diff --git a/lib/classes/event/competency_user_competency_viewed_in_course.php b/lib/classes/event/competency_user_competency_viewed_in_course.php
index 6d214f5148a27..1081ab16655ab 100644
--- a/lib/classes/event/competency_user_competency_viewed_in_course.php
+++ b/lib/classes/event/competency_user_competency_viewed_in_course.php
@@ -96,11 +96,8 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/user_competency_in_course.php', array(
-            'competencyid' => $this->other['competencyid'],
-            'userid' => $this->relateduserid,
-            'courseid' => $this->courseid
-        ));
+        return \core_competency\url::user_competency_in_course($this->relateduserid, $this->other['competencyid'],
+            $this->courseid);
     }
 
     /**
diff --git a/lib/classes/event/competency_user_competency_viewed_in_plan.php b/lib/classes/event/competency_user_competency_viewed_in_plan.php
index 0c6f24679fca7..de23838bd7850 100644
--- a/lib/classes/event/competency_user_competency_viewed_in_plan.php
+++ b/lib/classes/event/competency_user_competency_viewed_in_plan.php
@@ -97,11 +97,8 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/user_competency_in_plan.php', array(
-            'competencyid' => $this->other['competencyid'],
-            'userid' => $this->relateduserid,
-            'planid' => $this->other['planid']
-        ));
+        return \core_competency\url::user_competency_in_plan($this->relateduserid, $this->other['competencyid'],
+            $this->other['planid']);
     }
 
     /**
diff --git a/lib/classes/event/competency_user_evidence_created.php b/lib/classes/event/competency_user_evidence_created.php
index 59e18d4a1ad8e..e9f5f7d0c03d2 100644
--- a/lib/classes/event/competency_user_evidence_created.php
+++ b/lib/classes/event/competency_user_evidence_created.php
@@ -85,8 +85,7 @@ public function get_description() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/user_evidence.php',
-                               array('id' => $this->objectid));
+        return \core_competency\url::user_evidence($this->objectid);
     }
 
     /**
diff --git a/lib/classes/event/competency_user_evidence_updated.php b/lib/classes/event/competency_user_evidence_updated.php
index 69796bed6d9c6..d35f3fea64385 100644
--- a/lib/classes/event/competency_user_evidence_updated.php
+++ b/lib/classes/event/competency_user_evidence_updated.php
@@ -85,8 +85,7 @@ public function get_description() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/user_evidence.php',
-                               array('id' => $this->objectid));
+        return \core_competency\url::user_evidence($this->objectid);
     }
 
     /**
diff --git a/lib/classes/event/competency_viewed.php b/lib/classes/event/competency_viewed.php
index ce12b048f0203..da899a532159d 100644
--- a/lib/classes/event/competency_viewed.php
+++ b/lib/classes/event/competency_viewed.php
@@ -82,10 +82,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/editcompetency.php', array(
-            'id' => $this->objectid,
-            'pagecontextid' => $this->contextid
-        ));
+        return \core_competency\url::competency($this->objectid, $this->contextid);
     }
 
     /**