diff --git a/nodeblock.install b/nodeblock.install
index ab6b1ed..d69f2f5 100644
--- a/nodeblock.install
+++ b/nodeblock.install
@@ -217,6 +217,7 @@ function nodeblock_uninstall() {
       variable_del('nodeblock_comment_link_' . $type_name);
       variable_del('nodeblock_node_link_' . $type_name);
       variable_del('nodeblock_view_mode_' . $type_name);
+      variable_del('nodeblock_block_prepend_' . $type_name);
     }
   }
   db_delete('block')
diff --git a/nodeblock.module b/nodeblock.module
index 716a7ec..95f8f56 100644
--- a/nodeblock.module
+++ b/nodeblock.module
@@ -54,6 +54,14 @@ function nodeblock_type_node_link($type) {
 }
 
 /**
+ * Utility function to retrieve default prepend block name setting.
+ */
+function nodeblock_type_block_prepend($type) {
+  $type = field_extract_bundle('node', $type);
+  return variable_get('nodeblock_block_prepend_' . $type, 0);
+}
+
+/**
  * Utility function to retrieve default comment link setting.
  */
 function nodeblock_type_comment_link($type) {
@@ -134,6 +142,13 @@ function nodeblock_form_node_type_form_alter(&$form, &$form_state) {
       '#options' => $options,
       '#description' => t("Select the default Node('Read More') link display for Node Blocks of this Content Type."),
     ),
+    'nodeblock_block_prepend' => array(
+      '#type' => 'radios',
+      '#title' => t('Prepend content type to block name'),
+      '#default_value' => nodeblock_type_node_link($form['#node_type']),
+      '#options' => array(0 => t('Disabled'), 1 => t('Enabled')),
+      '#description' => t("Whether or not to include the node's Content Type at the beginning of the Node Block name."),
+    ),
   );
 
   if (module_exists('comment')) {
@@ -489,17 +504,25 @@ function nodeblock_block_info() {
     if ($types) {
       // Fetch all nodes of the selected types, excluding translations.
       $request = db_select('node', 'n')
-        ->fields('n', array('title', 'nid'))
+        ->fields('n', array('title', 'nid', 'type'))
         ->condition('n.type', array_keys($types), 'IN')
         ->condition(db_or()->where('n.nid = n.tnid')->condition('n.tnid', 0));
 
       $request->addJoin('INNER', 'nodeblock', 'nb', 'nb.nid = n.nid');
+      $request->addJoin('INNER', 'node_type', 'nt', 'nt.type = n.type');
+      
       $request->fields('nb', array('machine_name'))
         ->condition('nb.enabled', 1);
+        
+      $request->addField('nt', 'name', 'type_name');
 
       $results = $request->execute();
       foreach ($results as $node) {
-        $blocks[$node->machine_name] = array('info' => $node->title, 'nid' => $node->nid);
+        $title = $node->title;
+        if(nodeblock_type_block_prepend($node->type) == 1) {
+          $title = $node->type_name . ': ' . $node->title;
+        }
+        $blocks[$node->machine_name] = array('info' => $title, 'nid' => $node->nid);
       }
     }
   }