diff --git a/mod/wiki/backup/moodle2/backup_wiki_stepslib.php b/mod/wiki/backup/moodle2/backup_wiki_stepslib.php
index 39a8ad07400..828071a47e3 100644
--- a/mod/wiki/backup/moodle2/backup_wiki_stepslib.php
+++ b/mod/wiki/backup/moodle2/backup_wiki_stepslib.php
@@ -105,7 +105,7 @@ class backup_wiki_activity_structure_step extends backup_activity_structure_step
                                     JOIN {tag_instance} ti ON ti.tagid = t.id
                                    WHERE ti.itemtype = ?
                                      AND ti.itemid = ?', array(
-                                         backup_helper::is_sqlparam('wiki_page'),
+                                         backup_helper::is_sqlparam('wiki_pages'),
                                          backup::VAR_PARENTID));
         }
 
diff --git a/mod/wiki/backup/moodle2/restore_wiki_stepslib.php b/mod/wiki/backup/moodle2/restore_wiki_stepslib.php
index f1ddab153cd..e27abafebef 100644
--- a/mod/wiki/backup/moodle2/restore_wiki_stepslib.php
+++ b/mod/wiki/backup/moodle2/restore_wiki_stepslib.php
@@ -144,7 +144,7 @@ class restore_wiki_activity_structure_step extends restore_activity_structure_st
 
         $tag = $data->rawname;
         $itemid = $this->get_new_parentid('wiki_page');
-        tag_set_add('wiki_page', $itemid, $tag);
+        tag_set_add('wiki_pages', $itemid, $tag);
     }
 
     protected function after_execute() {
diff --git a/mod/wiki/db/upgrade.php b/mod/wiki/db/upgrade.php
index fcec3e3c4c9..2e0545679cd 100644
--- a/mod/wiki/db/upgrade.php
+++ b/mod/wiki/db/upgrade.php
@@ -350,7 +350,17 @@ function xmldb_wiki_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2010102500, 'wiki');
     }
 
+    if ($oldversion < 2010102800) {
 
+        $sql = "UPDATE {tag_instance}
+                SET itemtype = 'wiki_pages'
+                WHERE itemtype = 'wiki_page'";
+        $DB->execute($sql);
+
+        echo $OUTPUT->notification('Updating tags itemtype', 'notifysuccess');
+
+        upgrade_mod_savepoint(true, 2010102800, 'wiki');
+    }
 
     return true;
 }
diff --git a/mod/wiki/lib.php b/mod/wiki/lib.php
index fcaf6f5cd18..b0204652963 100644
--- a/mod/wiki/lib.php
+++ b/mod/wiki/lib.php
@@ -173,10 +173,10 @@ function wiki_reset_userdata($data) {
             foreach ($subwikis as $subwiki) {
                 if ($pages = $DB->get_records('wiki_pages', array('subwikiid' => $subwiki->id))) {
                     foreach ($pages as $page) {
-                        $tags = tag_get_tags_array('wiki_page', $page->id);
+                        $tags = tag_get_tags_array('wiki_pages', $page->id);
                         foreach ($tags as $tagid => $tagname) {
                             // Delete the related tag_instances related to the wiki page.
-                            $errors = tag_delete_instance('wiki_page', $page->id, $tagid);
+                            $errors = tag_delete_instance('wiki_pages', $page->id, $tagid);
                             $status[] = array('component' => $componentstr, 'item' => get_string('tagsdeleted', 'wiki'), 'error' => $errors);
                         }
                     }
diff --git a/mod/wiki/locallib.php b/mod/wiki/locallib.php
index dd316c96d33..399dc1ab45b 100644
--- a/mod/wiki/locallib.php
+++ b/mod/wiki/locallib.php
@@ -1194,7 +1194,7 @@ function wiki_print_page_content($page, $context, $subwikiid) {
     echo $OUTPUT->box($html);
 
     if (!empty($CFG->usetags)) {
-        $tags = tag_get_tags_array('wiki_page', $page->id);
+        $tags = tag_get_tags_array('wiki_pages', $page->id);
         echo '<p class="wiki-tags"><span>Tags: </span>' . join($tags, ", ") . '</p>';
     }
 
diff --git a/mod/wiki/pagelib.php b/mod/wiki/pagelib.php
index 05922e06003..9cc466742c9 100644
--- a/mod/wiki/pagelib.php
+++ b/mod/wiki/pagelib.php
@@ -553,7 +553,7 @@ class page_wiki_edit extends page_wiki {
         }
 
         if (!empty($CFG->usetags)) {
-            $params['tags'] = tag_get_tags_csv('wiki_page', $this->page->id, TAG_RETURN_TEXT);
+            $params['tags'] = tag_get_tags_csv('wiki_pages', $this->page->id, TAG_RETURN_TEXT);
         }
 
         $form = new mod_wiki_edit_form($url, $params);
@@ -1962,7 +1962,7 @@ class page_wiki_save extends page_wiki_edit {
                 $errors = $this->process_uploads($context);
             }
             if (!empty($CFG->usetags)) {
-                tag_set('wiki_page', $this->page->id, $data->tags);
+                tag_set('wiki_pages', $this->page->id, $data->tags);
             }
 
             $message = '<p>' . get_string('saving', 'wiki') . '</p>';
diff --git a/mod/wiki/version.php b/mod/wiki/version.php
index 1d270eb9b93..2257b2857e5 100644
--- a/mod/wiki/version.php
+++ b/mod/wiki/version.php
@@ -32,6 +32,6 @@
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$module->version  = 2010102500; // The current module version (Date: YYYYMMDDXX)
+$module->version  = 2010102800; // The current module version (Date: YYYYMMDDXX)
 $module->requires = 2010080300;
 $module->cron     = 0; // Period for cron to check this module (secs)