diff --git a/jupyter-openbis-extension/static/downloadDialog.js b/jupyter-openbis-extension/static/downloadDialog.js
index 20dc8dfa5e7465345eefc4ac254405129c0278f3..a78bb1362043d72712089c29e562f8fd52caebe2 100644
--- a/jupyter-openbis-extension/static/downloadDialog.js
+++ b/jupyter-openbis-extension/static/downloadDialog.js
@@ -68,16 +68,16 @@ define([
 
                 var showDataSets = document.createElement("DIV")
                 var title = document.createElement("STRONG")
-                title.textContent = "Sample identifier / permId: "
+                title.textContent = "Sample or Experiment identifier/permId: "
                 showDataSets.appendChild(title)
                 showDataSets.style.marginTop = '10px'
 
-                var sampleIdentifier = document.createElement("INPUT")
-                sampleIdentifier.type = "text"
-                sampleIdentifier.name = "sampleIdentifier"
-                sampleIdentifier.size = 40
-                sampleIdentifier.placeholder = "sample identifier or permId"
-                sampleIdentifier.value = ''
+                var entityIdentifier = document.createElement("INPUT")
+                entityIdentifier.type = "text"
+                entityIdentifier.name = "entityIdentifier"
+                entityIdentifier.size = 40
+                entityIdentifier.placeholder = "Sample or Experiment identifier/permId"
+                entityIdentifier.value = ''
 
                 var datasets_table = document.createElement("DIV")
                 datasets_table.id = "dataset_table"
@@ -97,12 +97,12 @@ define([
                     connection_name = state.connection.name
 
                     currentConnection = connection_name
-                    currentSampleIdentifier = sampleIdentifier.value
-                    if (!currentSampleIdentifier) {
-                        alert('Please specify a sample identifier/permId')
+                    currentEntityIdentifier = entityIdentifier.value
+                    if (!currentEntityIdentifier) {
+                        alert('Please specify a Sample or Experiment identifier/permId')
                         return false
                     }
-                    var url = env.notebook.base_url + 'openbis/sample/' + connection_name + '/' + encodeURIComponent(currentSampleIdentifier)
+                    var url = env.notebook.base_url + 'openbis/sample/' + connection_name + '/' + encodeURIComponent(currentEntityIdentifier)
 
                     fetch(url)
                         .then(function (response) {
@@ -124,7 +124,7 @@ define([
                         })
 
                 }
-                showDataSets.appendChild(sampleIdentifier)
+                showDataSets.appendChild(entityIdentifier)
                 showDataSets.appendChild(show_datasets_btn)
                 showDataSets.appendChild(datasets_table)
 
diff --git a/jupyter-openbis-extension/static/uploadDialog.js b/jupyter-openbis-extension/static/uploadDialog.js
index c32a1636876bdfd93ce6cbcc7ad7be897d1f10b1..fd84a4698cde6d8fe297b97b26a8950506654931 100644
--- a/jupyter-openbis-extension/static/uploadDialog.js
+++ b/jupyter-openbis-extension/static/uploadDialog.js
@@ -196,6 +196,7 @@ define([
                 dataset_types.id = "dataset_type"
                 dataset_types.className = "form-control select-xs"
                 dataset_types.style.marginLeft = 0
+                dataset_types.style.padding = 0
 
                 var input_fields = document.createElement("DIV")
                 input_fields.setAttribute("id", "upload-input-fields");
@@ -203,17 +204,17 @@ define([
                 getDatasetTypes(env, state.connection.name, dataset_types, input_fields)
 
                 var sample_title = document.createElement("STRONG")
-                sample_title.textContent = "Sample Identifier"
+                sample_title.textContent = "Sample or Experiment identifier/permId"
 
-                var sample_error = createErrorElement('sampleIdentifier')
+                var sample_error = createErrorElement('entityIdentifier')
 
-                var sampleIdentifier = document.createElement("INPUT")
-                sampleIdentifier.type = "text"
-                sampleIdentifier.name = 'sampleIdentifier'
-                sampleIdentifier.placeholder = "Sample Identifier or permId"
-                sampleIdentifier.value = state.uploadEntityIdentifier
-                sampleIdentifier.size = "90"
-                sampleIdentifier.style.width="100%"
+                var entityIdentifier = document.createElement("INPUT")
+                entityIdentifier.type = "text"
+                entityIdentifier.name = 'entityIdentifier'
+                entityIdentifier.placeholder = "Sample or Experiment identifier/permId"
+                entityIdentifier.value = state.uploadEntityIdentifier
+                entityIdentifier.size = "90"
+                entityIdentifier.style.width="100%"
 
                 var ds_title = document.createElement("STRONG")
                 ds_title.textContent = "DataSets"
@@ -239,7 +240,7 @@ define([
                 inputs.appendChild(input_fields)
                 inputs.appendChild(sample_title)
                 inputs.appendChild(sample_error)
-                inputs.appendChild(sampleIdentifier)
+                inputs.appendChild(entityIdentifier)
                 inputs.appendChild(ds_title)
                 inputs.appendChild(dataSetListContainer)
                 inputs.appendChild(files_title)
@@ -254,7 +255,7 @@ define([
                             state.uploadDataSetTypes[state.uploadDataSetType][element.name] = element.value
                         }
                     }
-                    state.uploadEntityIdentifier = sampleIdentifier.value
+                    state.uploadEntityIdentifier = entityIdentifier.value
                     state.unselectedDatasets = state.datasetCheckboxes.filter(cb => !cb.checked).map(cb => cb.value)
                     state.selectedFiles = state.fileCheckboxes.filter(cb => cb.checked).map(cb => cb.value)
                 }
@@ -284,7 +285,7 @@ define([
                         "type": dataset_types.value,
                         "files": files,
                         "parents": state.datasetCheckboxes.filter(cb => cb.checked).map(cb => cb.value),
-                        "sampleIdentifier": sampleIdentifier.value,
+                        "entityIdentifier": entityIdentifier.value,
                         "props": props
                     }