diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service.properties
new file mode 100644
index 0000000000..c0aac38e01
--- /dev/null
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service.properties
@@ -0,0 +1 @@
+dataset.dod5015.label=DOD 5015 Example Data
\ No newline at end of file
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml
index 1dbf72b403..70903a3ec4 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml
@@ -84,6 +84,7 @@
             <value>alfresco.module.org_alfresco_module_rm.messages.action-service</value>
             <value>alfresco.module.org_alfresco_module_rm.messages.audit-service</value>
             <value>alfresco.module.org_alfresco_module_rm.messages.capability-service</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.dataset-service</value>
          </list>
       </property>
    </bean>
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
index 14e57b278d..1d871e0a1c 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
@@ -1306,7 +1306,6 @@
     </bean>
 
     <bean id="dataSetDOD5015" parent="dataSetBase">
-        <property name="label" value="DOD 5015 Example Data"/>
         <property name="id" value="dod5015"/>
         <property name="path" value="alfresco/module/org_alfresco_module_rm/dod5015/DODExampleFilePlan.xml" />
     </bean>
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetBase.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetBase.java
index 6ae54279b7..6324341f53 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetBase.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetBase.java
@@ -1,90 +1,98 @@
 package org.alfresco.module.org_alfresco_module_rm.dataset;
 
+import org.apache.commons.lang.StringUtils;
+import org.springframework.extensions.surf.util.I18NUtil;
+
 public class DataSetBase implements DataSet
 {
 
-   /** Data set service */
-   private DataSetService dataSetService;
+    /** Data set service */
+    private DataSetService dataSetService;
 
-   /** Data set label */
-   private String label;
+    /** Data set label */
+    private String label;
 
-   /** Data set id */
-   private String id;
+    /** Data set id */
+    private String id;
 
-   /** Data set path */
-   private String path;
+    /** Data set path */
+    private String path;
 
-   /**
-    * Sets the data set service
-    * 
-    * @param dataSetService the data set service
-    */
-   public void setDataSetService(DataSetService dataSetService)
-   {
-      this.dataSetService = dataSetService;
-   }
+    /**
+     * Sets the data set service
+     *
+     * @param dataSetService the data set service
+     */
+    public void setDataSetService(DataSetService dataSetService)
+    {
+        this.dataSetService = dataSetService;
+    }
 
-   /**
-    * @see org.alfresco.module.org_alfresco_module_rm.dataset.DataSet#getLabel()
-    */
-   public String getLabel()
-   {
-      return this.label;
-   }
+    /**
+     * @see org.alfresco.module.org_alfresco_module_rm.dataset.DataSet#getLabel()
+     */
+    public String getLabel()
+    {
+        String label = this.label;
+        if (StringUtils.isBlank(label))
+        {
+            label = I18NUtil.getMessage("dataset." + getId() + ".label");
+        }
+        return label;
+    }
 
-   /**
-    * Sets the label of the data set service
-    * 
-    * @param label the label
-    */
-   public void setLabel(String label)
-   {
-      this.label = label;
-   }
+    /**
+     * Sets the label of the data set service
+     *
+     * @param label the label
+     */
+    public void setLabel(String label)
+    {
+        this.label = label;
+    }
 
-   /**
-    * @see org.alfresco.module.org_alfresco_module_rm.dataset.DataSet#getId()
-    */
-   public String getId()
-   {
-      return this.id;
-   }
+    /**
+     * @see org.alfresco.module.org_alfresco_module_rm.dataset.DataSet#getId()
+     */
+    public String getId()
+    {
+        return this.id;
+    }
 
-   /**
-    * Sets the id of the data set service
-    * 
-    * @param id the id
-    */
-   public void setId(String id)
-   {
-      this.id = id;
-   }
+    /**
+     * Sets the id of the data set service
+     *
+     * @param id the id
+     */
+    public void setId(String id)
+    {
+        this.id = id;
+    }
 
-   /**
-    * @see org.alfresco.module.org_alfresco_module_rm.dataset.DataSet#getPath()
-    */
-   public String getPath()
-   {
-      return this.path;
-   }
+    /**
+     * @see org.alfresco.module.org_alfresco_module_rm.dataset.DataSet#getPath()
+     */
+    public String getPath()
+    {
+        return this.path;
+    }
 
-   /**
-    * Sets the path of the data set service
-    * 
-    * @param path the path
-    */
-   public void setPath(String path)
-   {
-      this.path = path;
-   }
+    /**
+     * Sets the path of the data set service
+     *
+     * @param path the path
+     */
+    public void setPath(String path)
+    {
+        this.path = path;
+    }
 
-   /**
-    * Registers the data set implementation with the data set service.
-    */
-   public void register()
-   {
-      this.dataSetService.register(this);
-   }
+    /**
+     * Registers the data set implementation with the data set service.
+     */
+    public void register()
+    {
+        this.dataSetService.register(this);
+    }
 
 }