diff --git a/mod/resource/lib.php b/mod/resource/lib.php
index 6d3c299d374..b14e78411e7 100644
--- a/mod/resource/lib.php
+++ b/mod/resource/lib.php
@@ -526,7 +526,7 @@ function resource_get_types() {
             $type->modclass = MOD_CLASS_RESOURCE;
             $type->name = $resourcetype;
             $type->type = "resource&type=$resourcetype";
-            $type->typestr = get_string("resourcetype$resourcetype", 'resource');
+            $type->typestr = resource_get_name($resourcetype);
             $types[] = $type;
         }
     }
@@ -763,4 +763,19 @@ function resource_supports($feature) {
     }
 }
 
+/**
+ * Returns the full name of the given resource type.  The name can
+ * either be set at the resource type level or at the resource module
+ * level.
+ *
+ * @param string $type shortname (or directory name) of the resource type
+ */
+function resource_get_name($type) {
+    $name = get_string("resourcetype$type", "resource_$type");
+    if (substr($name, 0, 2) === '[[') {
+        $name = get_string("resourcetype$type", 'resource');
+    }
+    return $name;
+}
+
 ?>
diff --git a/mod/resource/mod_form.php b/mod/resource/mod_form.php
index 633ce29359c..7df033326af 100644
--- a/mod/resource/mod_form.php
+++ b/mod/resource/mod_form.php
@@ -44,7 +44,7 @@ class mod_resource_mod_form extends moodleform_mod {
         // summary should be optional again MDL-9485
         //$mform->addRule('summary', get_string('required'), 'required', null, 'client');
 
-        $mform->addElement('header', 'typedesc', get_string('resourcetype'.$type,'resource'));
+        $mform->addElement('header', 'typedesc', resource_get_name($type));
         $this->_resinstance->setup_elements($mform);
 
         $this->standard_coursemodule_elements(array('groups'=>false, 'groupmembersonly'=>true, 'gradecat'=>false));