diff --git a/question/type/ddmarker/README.txt b/question/type/ddmarker/README.txt
index 15c5b81bb8f..f096c4f1606 100644
--- a/question/type/ddmarker/README.txt
+++ b/question/type/ddmarker/README.txt
@@ -1,6 +1,7 @@
-A drag-and-drop question type.
-You can use markers with text labels as drag items onto rectangular, and in Moodle 2.2+ version
-circular and polygon defined drop zones on a background image.
+Drag-and-drop markers question type
+
+You can use markers with text labels as drag items onto rectangular, and in
+Moodle 2.2+ version circular and polygon defined drop zones on a background image.
 
 This question type requires that gapselect question type
 https://github.com/moodleou/moodle-qtype_ddimageortext/ and
@@ -9,20 +10,22 @@ to be installed in order to work.
 
 This question type was written by Jamie Pratt (http://jamiep.org/).
 
-This question type is compatible with Moodle 2.1+ (MOODLE_21_STABLE branch) or 2.2+ (master branch).
+This question type is compatible with Moodle 2.1+ (MOODLE_21_STABLE branch) or
+2.2+ (master branch).
 
-To install using git for a 2.2+ Moodle installation, type this command in the root of your Moodle
-install :
+To install using git for a 2.2+ Moodle installation, type this command in the
+root of your Moodle install:
 
 git clone git://github.com/moodleou/moodle-qtype_ddmarker.git question/type/ddmarker
 
-To install using git for a 2.1+ Moodle installation, type this command in the root of your Moodle
-install :
+To install using git for a 2.1+ Moodle installation, type this command in the
+root of your Moodle install:
 
-git clone  -b MOODLE_21_STABLE git://github.com/moodleou/moodle-qtype_ddmarker.git question/type/ddmarker
+git clone -b MOODLE_21_STABLE git://github.com/moodleou/moodle-qtype_ddmarker.git question/type/ddmarker
 
 Then add question/type/ddmarker to your git ignore.
 
 Alternatively, download the zip from
-    https://github.com/moodleou/moodle-qtype_ddmarker/zipball/master
+    Moodle 2.2+ - https://github.com/moodleou/moodle-qtype_ddmarker/zipball/master
+    Moodle 2.1+ - https://github.com/moodleou/moodle-qtype_ddmarker/zipball/MOODLE_21_STABLE
 unzip it into the question/type folder, and then rename the new folder to ddmarker.
diff --git a/question/type/ddmarker/question.php b/question/type/ddmarker/question.php
index 3e051986887..22cb99e408d 100644
--- a/question/type/ddmarker/question.php
+++ b/question/type/ddmarker/question.php
@@ -15,10 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Drag-and-drop words into sentences question definition class.
+ * Drag-and-drop markers question definition class.
  *
- * @package    qtype
- * @subpackage ddmarker
+ * @package    qtype_ddmarker
  * @copyright  2009 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -31,7 +30,7 @@ require_once($CFG->dirroot . '/question/type/ddmarker/shapes.php');
 
 
 /**
- * Represents a drag-and-drop images to image question.
+ * Represents a drag-and-drop markers question.
  *
  * @copyright  2009 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/question/type/ddmarker/questiontype.php b/question/type/ddmarker/questiontype.php
index 6646195bf9d..66ffaf7cf61 100644
--- a/question/type/ddmarker/questiontype.php
+++ b/question/type/ddmarker/questiontype.php
@@ -76,7 +76,7 @@ class question_hint_ddmarker extends question_hint_with_parts {
 
 
 /**
- * The drag-and-drop words into sentences question type class.
+ * The drag-and-drop markers question type class.
  *
  * @copyright  2009 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/question/type/ddmarker/renderer.php b/question/type/ddmarker/renderer.php
index 458f640ea64..0c047631d22 100644
--- a/question/type/ddmarker/renderer.php
+++ b/question/type/ddmarker/renderer.php
@@ -15,10 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Drag-and-drop words into sentences question renderer class.
+ * Drag-and-drop markers question renderer class.
  *
- * @package    qtype
- * @subpackage ddmarker
+ * @package    qtype_ddmarker
  * @copyright  2010 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -30,7 +29,7 @@ require_once($CFG->dirroot . '/question/type/ddimageortext/rendererbase.php');
 
 
 /**
- * Generates the output for drag-and-drop words into sentences questions.
+ * Generates the output for drag-and-drop markers questions.
  *
  * @copyright  2010 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/question/type/ddmarker/shapes.php b/question/type/ddmarker/shapes.php
index 36cfb5f36cf..eae350ced22 100644
--- a/question/type/ddmarker/shapes.php
+++ b/question/type/ddmarker/shapes.php
@@ -15,10 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Drag-and-drop words into sentences classes for dealing with shapes on the server side.
+ * Drag-and-drop markers classes for dealing with shapes on the server side.
  *
- * @package    qtype
- * @subpackage ddmarker
+ * @package    qtype_ddmarker
  * @copyright  2009 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/question/type/ddmarker/simpletest/helper.php b/question/type/ddmarker/simpletest/helper.php
index b52c82fb108..1c773da62d3 100644
--- a/question/type/ddmarker/simpletest/helper.php
+++ b/question/type/ddmarker/simpletest/helper.php
@@ -15,10 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Test helpers for the drag-and-drop words into sentences question type.
+ * Test helpers for the drag-and-drop markers question type.
  *
- * @package    qtype
- * @subpackage ddmarker
+ * @package    qtype_ddmarker
  * @copyright  2010 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -28,7 +27,7 @@ defined('MOODLE_INTERNAL') || die();
 
 
 /**
- * Test helper class for the drag-and-drop words into sentences question type.
+ * Test helper class for the drag-and-drop markers question type.
  *
  * @copyright  2010 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -47,7 +46,7 @@ class qtype_ddmarker_test_helper extends question_test_helper {
 
         test_question_maker::initialise_a_question($dd);
 
-        $dd->name = 'Drag-and-drop words into sentences question';
+        $dd->name = 'Drag-and-drop markers question';
         $dd->questiontext = 'The quick brown fox jumped over the lazy dog.';
         $dd->generalfeedback = 'This sentence uses each letter of the alphabet.';
         $dd->qtype = question_bank::get_qtype('ddmarker');
@@ -102,7 +101,7 @@ class qtype_ddmarker_test_helper extends question_test_helper {
 
         test_question_maker::initialise_a_question($dd);
 
-        $dd->name = 'Drag-and-drop words into sentences question';
+        $dd->name = 'Drag-and-drop markers question';
         $dd->questiontext = 'Fill in the operators to make this equation work: ';
         $dd->generalfeedback = 'Hmmmm...';
         $dd->qtype = question_bank::get_qtype('ddmarker');
diff --git a/question/type/ddmarker/simpletest/testquestion.php b/question/type/ddmarker/simpletest/testquestion.php
index 4616e14f9b3..705f95a49d0 100644
--- a/question/type/ddmarker/simpletest/testquestion.php
+++ b/question/type/ddmarker/simpletest/testquestion.php
@@ -15,10 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Unit tests for the drag-and-drop words into sentences question definition class.
+ * Unit tests for the drag-and-drop markers question definition class.
  *
- * @package    qtype
- * @subpackage ddmarker
+ * @package    qtype_ddmarker
  * @copyright  2010 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -31,7 +30,7 @@ require_once($CFG->dirroot . '/question/type/ddmarker/simpletest/helper.php');
 
 
 /**
- * Unit tests for the matching question definition class.
+ * Unit tests for the drag-and-drop markers question definition class.
  *
  * @copyright  2009 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/question/type/ddmarker/simpletest/testquestiontype.php b/question/type/ddmarker/simpletest/testquestiontype.php
index 4e2a35a84a0..63d0cdd1e7d 100644
--- a/question/type/ddmarker/simpletest/testquestiontype.php
+++ b/question/type/ddmarker/simpletest/testquestiontype.php
@@ -15,10 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Unit tests for the drag-and-drop words into sentences question definition class.
+ * Unit tests for the drag-and-drop markers question definition class.
  *
- * @package    qtype
- * @subpackage ddmarker
+ * @package    qtype_ddmarker
  * @copyright  2010 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -31,7 +30,7 @@ require_once($CFG->dirroot . '/question/type/ddmarker/simpletest/helper.php');
 
 
 /**
- * Unit tests for the drag-and-drop words into sentences question definition class.
+ * Unit tests for the drag-and-drop markers question definition class.
  *
  * @copyright  2010 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/question/type/ddmarker/simpletest/testwalkthrough.php b/question/type/ddmarker/simpletest/testwalkthrough.php
index eb6d493f083..62411531aa9 100644
--- a/question/type/ddmarker/simpletest/testwalkthrough.php
+++ b/question/type/ddmarker/simpletest/testwalkthrough.php
@@ -15,10 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Unit tests for the drag-and-drop words into sentences question type.
+ * Unit tests for the drag-and-drop markers question type.
  *
- * @package    qtype
- * @subpackage ddmarker
+ * @package    qtype_ddmarker
  * @copyright  2010 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -31,7 +30,7 @@ require_once($CFG->dirroot . '/question/type/ddmarker/simpletest/helper.php');
 
 
 /**
- * Unit tests for the drag-and-drop words into sentences question type.
+ * Unit tests for the drag-and-drop markers question type.
  *
  * @copyright  2010 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/question/type/ddmarker/version.php b/question/type/ddmarker/version.php
index fc9ce78417d..d62ee1c6466 100644
--- a/question/type/ddmarker/version.php
+++ b/question/type/ddmarker/version.php
@@ -15,15 +15,18 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Version information for the drag-and-drop words into sentences question type.
+ * Version information for the drag-and-drop markers question type.
  *
- * @package    qtype
- * @subpackage ddmarker
+ * @package    qtype_ddmarker
  * @copyright  2011 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version  = 2011051200;
-$plugin->requires = 2011051212;
+$plugin->version   = 2011051200;
+$plugin->requires  = 2011070100;
+$plugin->cron      = 0;
+$plugin->component = 'qtype_ddmarker';
+$plugin->maturity  = MATURITY_STABLE;
+$plugin->release   = '1.0';