diff --git a/tag/coursetags_edit.php b/tag/coursetags_edit.php
index 6420614b933..6dc1e7bad28 100644
--- a/tag/coursetags_edit.php
+++ b/tag/coursetags_edit.php
@@ -63,7 +63,7 @@ print_header_simple($title, '', $nav, '', '', false);
 
     // Print personal tags for all courses
     $title = get_string('edittitle', $tagslang);
-    print_heading($title, 'center');
+    echo $OUTPUT->heading($title, 'center');
 
     $mytags = coursetag_print_cloud(coursetag_get_tags(0, $USER->id, 'default'), true);
     $outstr = '
@@ -87,7 +87,7 @@ print_header_simple($title, '', $nav, '', '', false);
     // Personal tag editing
     if ($canedit) {
         $title = get_string('editmytagsfor', $tagslang, '"'.$coursefullname.' ('.$courseshortname.')"');
-        print_heading($title);
+        echo $OUTPUT->heading($title);
 
         // Deletion here is open to the users own tags for this course only
         $selectoptions = '<option value="0">'.get_string('select', $tagslang).'</option>';
diff --git a/tag/coursetags_more.php b/tag/coursetags_more.php
index 0c34b131a9a..11ea6d97e4e 100644
--- a/tag/coursetags_more.php
+++ b/tag/coursetags_more.php
@@ -58,7 +58,7 @@ if ($courseid) {
 }
 $nav = build_navigation($navigation);
 print_header_simple($title, '', $nav, '', '', false);
-print_heading($title, 'centre');
+echo $OUTPUT->heading($title, 'centre');
 
 // Prepare data for tags
 $courselink = '';
diff --git a/tag/edit.php b/tag/edit.php
index e9e8e83b9f0..0a7fb4bcb2c 100644
--- a/tag/edit.php
+++ b/tag/edit.php
@@ -116,7 +116,7 @@ $navlinks[] = array('name' => $tagname, 'link' => '', 'type' => '');
 $navigation = build_navigation($navlinks);
 print_header_simple(get_string('tag', 'tag') . ' - '. $tagname, '', $navigation);
 
-print_heading($tagname, '', 2);
+echo $OUTPUT->heading($tagname, 2);
 
 if (!empty($errorstring)) {
     notify($errorstring);
diff --git a/tag/index.php b/tag/index.php
index 1dbe56fd328..f294645d94d 100644
--- a/tag/index.php
+++ b/tag/index.php
@@ -66,7 +66,7 @@ if ($tag->flag > 0 && has_capability('moodle/tag:manage', $systemcontext)) {
     $tagname =  '<span class="flagged-tag">' . $tagname . '</span>';
 }
 
-print_heading($tagname, '', 2, 'headingblock header tag-heading');
+echo $OUTPUT->heading($tagname, 2, 'headingblock header tag-heading');
 tag_print_management_box($tag);
 tag_print_description_box($tag);
 
@@ -83,7 +83,7 @@ if ($courses = coursetag_get_tagged_courses($tag->id)) {
 
     $heading = get_string('courses') . ' ' . get_string('taggedwith', 'tag', $tagname) .': '. $totalcount;
     echo "<a name='course'></a>";
-    print_heading($heading, '', 3);
+    echo $OUTPUT->heading($heading, 3);
 
     foreach ($courses as $course) {
         print_course($course);
@@ -105,7 +105,7 @@ if (has_capability('moodle/blog:view', $systemcontext)) {  // You have to see bl
         print_box_start('generalbox', 'tag-blogs');
         $heading = get_string('relatedblogs', 'tag', $tagname). ' ' . get_string('taggedwith', 'tag', $tagname);
         echo "<a name='blog'></a>";
-        print_heading($heading, '', 3);
+        echo $OUTPUT->heading($heading, 3);
 
         echo '<ul id="tagblogentries">';
         foreach ($blogs as $blog) {
@@ -141,7 +141,7 @@ if ($usercount > 0) {
 
     $heading = get_string('users'). ' ' . get_string('taggedwith', 'tag', $tagname) . ': ' . $usercount;
     echo "<a name='user'></a>";
-    print_heading($heading, '', 3);
+    echo $OUTPUT->heading($heading, 3);
 
     $baseurl = $CFG->wwwroot.'/tag/index.php?id=' . $tag->id;
 
diff --git a/tag/locallib.php b/tag/locallib.php
index aaa0283ba99..7011218a7c3 100644
--- a/tag/locallib.php
+++ b/tag/locallib.php
@@ -222,7 +222,7 @@ function tag_print_search_box($return=false) {
  */
 function tag_print_search_results($query,  $page, $perpage, $return=false) {
 
-    global $CFG, $USER;
+    global $CFG, $USER, $OUTPUT;
 
     $query = array_shift(tag_normalize($query, TAG_CASE_ORIGINAL));
 
@@ -244,7 +244,7 @@ function tag_print_search_results($query,  $page, $perpage, $return=false) {
     }
 
     if ( !empty($tags) ) { // there are results to display!!
-        $output .= print_heading(get_string('searchresultsfor', 'tag', htmlspecialchars($query)) ." : {$count}", '', 3, 'main', true);
+        $output .= $OUTPUT->heading(get_string('searchresultsfor', 'tag', htmlspecialchars($query)) ." : {$count}", 3, 'main');
 
         //print a link "Add $query to my interests"
         if (!empty($addtaglink)) {
@@ -269,7 +269,7 @@ function tag_print_search_results($query,  $page, $perpage, $return=false) {
         $output .= print_paging_bar($count, $page, $perpage, $baseurl .'&amp;', 'page', false, true);
     }
     else { //no results were found!!
-        $output .= print_heading(get_string('noresultsfor', 'tag', htmlspecialchars($query)), '', 3, 'main' , true);
+        $output .= $OUTPUT->heading(get_string('noresultsfor', 'tag', htmlspecialchars($query)), 3, 'main');
 
         //print a link "Add $query to my interests"
         if (!empty($addtaglink)) {
diff --git a/tag/search.php b/tag/search.php
index f08e07bc075..649e3f6a011 100644
--- a/tag/search.php
+++ b/tag/search.php
@@ -40,7 +40,7 @@ if ( has_capability('moodle/tag:manage',$systemcontext) ) {
     echo '<div class="managelink"><a href="'. $CFG->wwwroot .'/tag/manage.php">' . get_string('managetags', 'tag') . '</a></div>' ;
 }
 
-print_heading(get_string('searchtags', 'tag'), '', 2);
+echo $OUTPUT->heading(get_string('searchtags', 'tag'), 2);
 
 tag_print_search_box();