diff --git a/calendar/classes/external/event_subscription_exporter.php b/calendar/classes/external/event_subscription_exporter.php
index 5a8075bfc4f..65bba6f1ac3 100644
--- a/calendar/classes/external/event_subscription_exporter.php
+++ b/calendar/classes/external/event_subscription_exporter.php
@@ -53,9 +53,9 @@ class event_subscription_exporter extends exporter {
             if (!empty($subscription) && $CFG->calendar_showicalsource) {
                 $data->displayeventsource = true;
                 if (!empty($subscription->url)) {
-                    $data->url = $subscription->url;
+                    $data->subscriptionurl = $subscription->url;
                 }
-                $data->name = $subscription->name;
+                $data->subscriptionname = $subscription->name;
             }
         }
 
@@ -72,11 +72,11 @@ class event_subscription_exporter extends exporter {
             'displayeventsource' => [
                 'type' => PARAM_BOOL
             ],
-            'name' => [
+            'subscriptionname' => [
                 'type' => PARAM_RAW,
                 'optional' => true
             ],
-            'url' => [
+            'subscriptionurl' => [
                 'type' => PARAM_URL,
                 'optional' => true
             ],
diff --git a/calendar/templates/event_subscription.mustache b/calendar/templates/event_subscription.mustache
index 0a5792872ce..ccfd7beb2dc 100644
--- a/calendar/templates/event_subscription.mustache
+++ b/calendar/templates/event_subscription.mustache
@@ -35,12 +35,12 @@
 {{#subscription}}
     {{#displayeventsource}}
         <div>
-            {{#url}}
-                <p><a href="{{url}}">{{#str}}subscriptionsource, core_calendar, {{name}}{{/str}}</a></p>
-            {{/url}}
-            {{^url}}
-                <p>{{#str}}subscriptionsource, core_calendar, {{name}}{{/str}}</p>
-            {{/url}}
+            {{#subscriptionurl}}
+                <p><a href="{{subscriptionurl}}">{{#str}}subscriptionsource, core_calendar, {{{subscriptionname}}}{{/str}}</a></p>
+            {{/subscriptionurl}}
+            {{^subscriptionurl}}
+                <p>{{#str}}subscriptionsource, core_calendar, {{{subscriptionname}}}{{/str}}</p>
+            {{/subscriptionurl}}
         </div>
     {{/displayeventsource}}
 {{/subscription}}