diff --git a/db/upgrade.php b/db/upgrade.php
index b4f0336e..8004177d 100644
--- a/db/upgrade.php
+++ b/db/upgrade.php
@@ -1,24 +1,66 @@
 <?php
-    
+
+defined('MOODLE_INTERNAL') || die();
+
 function xmldb_format_grid_upgrade($oldversion = 0) {
-    $result = true;
-    
-    if ($result && $oldversion < 2011041802) {
+    global $DB;
 
-    /// Define table course_grid_summary to be created
-        $table = new XMLDBTable('course_grid_summary');
+    $dbman = $DB->get_manager();
+        
+    if ($oldversion < 2011041802) {
+        if (!$dbman->table_exists('format_grid_summary')) {
+            /// Define table course_grid_summary to be created
+            $table = new xmldb_table('format_grid_summary');
 
-    /// Adding fields to table course_grid_summary
-        $table->addFieldInfo('id', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, XMLDB_SEQUENCE, null, null, null);
-        $table->addFieldInfo('show_summary', XMLDB_TYPE_INTEGER, '1', XMLDB_UNSIGNED, null, null, null, null, '0');
-        $table->addFieldInfo('course_id', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, null);
+            /// Adding fields to table course_grid_summary
+            $field = new xmldb_field('id', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, XMLDB_SEQUENCE, null, null, null);
+            if (!$dbman->field_exists($table, $field)) {
+                $dbman->add_field($table, $field);
+            }
+            $field = new xmldb_field('show_summary', XMLDB_TYPE_INTEGER, '1', XMLDB_UNSIGNED, null, null, null, null, '0');
+            if (!$dbman->field_exists($table, $field)) {
+                $dbman->add_field($table, $field);
+            }
+            $field = new xmldb_field('course_id', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, null);
+            if (!$dbman->field_exists($table, $field)) {
+                $dbman->add_field($table, $field);
+            }
 
-    /// Adding keys to table course_grid_summary
-        $table->addKeyInfo('primary', XMLDB_KEY_PRIMARY, array('id'));
+            /// Adding keys to table course_grid_summary
+            $key = new xmldb_key('primary', XMLDB_KEY_PRIMARY, array('id'));
+            // Launch add key primary.
+            $dbman->add_key($table, $key);
 
-    /// Launch create table for course_grid_summary
-        $result = $result && create_table($table);
+            /// Launch create table for course_grid_summary
+            $dbman->create_table($table);
+            upgrade_plugin_savepoint(true, '2011041802', 'format', 'grid');
+        }
     }
-    
-    return $result;    
+
+    if ($oldversion < 2012011701) {
+        // Rename the tables
+        if ($dbman->table_exists('course_grid_icon')) {
+            $table = new xmldb_table('course_grid_icon');
+            if (!$dbman->table_exists('format_grid_icon')) {
+                $dbman->rename_table($table, 'format_grid_icon');
+            } else {
+                // May as well tidy up the db
+                $dbman->drop_table($table);
+            }
+        }
+
+        if ($dbman->table_exists('course_grid_summary')) {
+            $table = new xmldb_table('course_grid_summary');
+            if (!$dbman->table_exists('format_grid_summary')) {
+                $dbman->rename_table($table, 'format_grid_summary');
+            } else {
+                // May as well tidy up the db
+                $dbman->drop_table($table);
+            }
+        }
+
+        upgrade_plugin_savepoint(true, '2012011701', 'format', 'grid');
+    }
+
+    return true;
 }