diff --git a/www/DataStorePanel.js b/www/DataStorePanel.js
index 85790902..2739614d 100644
--- a/www/DataStorePanel.js
+++ b/www/DataStorePanel.js
@@ -40,7 +40,7 @@ Ext.define('PBS.DataStorePanel', {
 
     initComponent: function() {
 	let me = this;
-	me.title = `${gettext("Data Store")}: ${me.datastore}`;
+	me.title = `${gettext("Datastore")}: ${me.datastore}`;
 	me.callParent();
     },
 });
diff --git a/www/NavigationTree.js b/www/NavigationTree.js
index 8e75ea35..d36e25e8 100644
--- a/www/NavigationTree.js
+++ b/www/NavigationTree.js
@@ -80,7 +80,7 @@ Ext.define('PBS.store.NavigationStore', {
 		]
 	    },
 	    {
-		text: gettext('Data Store'),
+		text: gettext('Datastore'),
 		iconCls: 'fa fa-archive',
 		path: 'pbsDataStoreConfig',
 		expanded: true,
diff --git a/www/config/DataStoreConfig.js b/www/config/DataStoreConfig.js
index 3bb90f07..54d7a505 100644
--- a/www/config/DataStoreConfig.js
+++ b/www/config/DataStoreConfig.js
@@ -25,7 +25,7 @@ Ext.define('PBS.DataStoreConfig', {
     extend: 'Ext.grid.GridPanel',
     alias: 'widget.pbsDataStoreConfig',
 
-    title: gettext('Data Store Configuration'),
+    title: gettext('Datastore Configuration'),
 
     controller: {
 	xclass: 'Ext.app.ViewController',
diff --git a/www/form/DataStoreSelector.js b/www/form/DataStoreSelector.js
index 692ca6a5..a1471a84 100644
--- a/www/form/DataStoreSelector.js
+++ b/www/form/DataStoreSelector.js
@@ -16,7 +16,7 @@ Ext.define('PBS.form.DataStoreSelector', {
     listConfig: {
 	columns: [
 	    {
-		header: gettext('DataStore'),
+		header: gettext('Datastore'),
 		sortable: true,
 		dataIndex: 'store',
 		renderer: Ext.String.htmlEncode,