diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index b556eced03ca3..875b28b4f24bc 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -1265,7 +1265,7 @@
 $string['outline'] = 'Outline';
 $string['outlinereport'] = 'Outline report';
 $string['page'] = 'Page';
-$string['pageheaderconfigablock'] = 'Configuring a block in %fullname%';
+$string['pageheaderconfigablock'] = 'Configuring a block in {$a->fullname}';
 $string['pagepath'] = 'Page path';
 $string['pageshouldredirect'] = 'This page should automatically redirect. If nothing is happening please use the continue link below.';
 $string['parentcategory'] = 'Parent category';
diff --git a/mod/data/edit.php b/mod/data/edit.php
index e90727d68ef8e..1ce3f5b579e73 100644
--- a/mod/data/edit.php
+++ b/mod/data/edit.php
@@ -121,9 +121,9 @@
 
 /// RSS and CSS and JS meta
 if (!empty($CFG->enablerssfeeds) && !empty($CFG->data_enablerssfeeds) && $data->rssarticles > 0) {
-    $rsspath = rss_get_url($context->id, $USER->id, 'mod_data', $data->id);
     $courseshortname = format_string($course->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id)));
-    $PAGE->add_alternate_version($courseshortname . ': %fullname%', $rsspath, 'application/rss+xml');
+    $rsstitle = $courseshortname . ': ' . format_string($data->name);
+    rss_add_http_header($context, 'mod_data', $data, $rsstitle);
 }
 if ($data->csstemplate) {
     $PAGE->requires->css('/mod/data/css.php?d='.$data->id);
diff --git a/mod/data/view.php b/mod/data/view.php
index 6dfaaa1c3794e..a31f13c12d945 100644
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -280,7 +280,7 @@
 /// RSS and CSS and JS meta
     $meta = '';
     if (!empty($CFG->enablerssfeeds) && !empty($CFG->data_enablerssfeeds) && $data->rssarticles > 0) {
-        $rsstitle = $courseshortname . ': %fullname%';
+        $rsstitle = $courseshortname . ': ' . format_string($data->name);
         rss_add_http_header($context, 'mod_data', $data, $rsstitle);
     }
     if ($data->csstemplate) {
diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index 43d58e3302535..89d9402429ab3 100644
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -60,7 +60,7 @@
     if (!empty($CFG->enablerssfeeds) && !empty($CFG->forum_enablerssfeeds) && $forum->rsstype && $forum->rssarticles) {
         require_once("$CFG->libdir/rsslib.php");
 
-        $rsstitle = format_string($course->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id))) . ': %fullname%';
+        $rsstitle = format_string($course->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id))) . ': ' . format_string($forum->name);
         rss_add_http_header($modcontext, 'mod_forum', $forum, $rsstitle);
     }
 
diff --git a/mod/forum/view.php b/mod/forum/view.php
index 8601fe1bf8a54..1b0fa94a2cfaf 100644
--- a/mod/forum/view.php
+++ b/mod/forum/view.php
@@ -96,7 +96,7 @@
     if (!empty($CFG->enablerssfeeds) && !empty($CFG->forum_enablerssfeeds) && $forum->rsstype && $forum->rssarticles) {
         require_once("$CFG->libdir/rsslib.php");
 
-        $rsstitle = format_string($course->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id))) . ': %fullname%';
+        $rsstitle = format_string($course->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id))) . ': ' . format_string($forum->name);
         rss_add_http_header($context, 'mod_forum', $forum, $rsstitle);
     }
 
diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index c580d6d22d256..e0a8b2be9038c 100644
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -251,7 +251,7 @@
 if (!empty($CFG->enablerssfeeds) && !empty($CFG->glossary_enablerssfeeds)
     && $glossary->rsstype && $glossary->rssarticles) {
 
-    $rsstitle = format_string($course->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id))) . ': %fullname%';
+    $rsstitle = format_string($course->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id))) . ': '. format_string($glossary->name);
     rss_add_http_header($context, 'mod_glossary', $glossary, $rsstitle);
 }