diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
index 01e144f..2cfd5fd 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
@@ -14,7 +14,7 @@ import org.gcube.portlets.user.td.client.template.TemplateDeleteDialog;
 import org.gcube.portlets.user.td.client.template.TemplateOpenDialog;
 import org.gcube.portlets.user.td.codelistmappingimportwidget.client.CodelistMappingImportWizardTD;
 import org.gcube.portlets.user.td.columnwidget.client.batch.ReplaceBatchDialog;
-import org.gcube.portlets.user.td.columnwidget.client.replace.ReplaceDialog;
+import org.gcube.portlets.user.td.columnwidget.client.replace.ReplaceAllDialog;
 import org.gcube.portlets.user.td.csvexportwidget.client.CSVExportWizardTD;
 import org.gcube.portlets.user.td.csvimportwidget.client.CSVImportWizardTD;
 import org.gcube.portlets.user.td.expressionwidget.client.ColumnFilterDialog;
@@ -2188,7 +2188,7 @@ public class TabularDataController {
 		if (cellData == null) {
 			UtilsGXT3.alert("No cell selected", "No cell selected");
 		} else {
-			ReplaceDialog replaceDialog = new ReplaceDialog(cellData, trId,
+			ReplaceAllDialog replaceDialog = new ReplaceAllDialog(cellData, trId,
 					eventBus);
 			replaceDialog.show();
 		}
diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java
index e8e7383..e788c45 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java
@@ -108,7 +108,7 @@ public class ModifyToolBar {
 		toolsLayout.setWidget(0, 0, replaceButton);
 		toolsLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
 
-		deleteButton = new TextButton("Delete",
+		deleteButton = new TextButton("Delete Row",
 				TabularDataResources.INSTANCE.tableRowDelete32());
 		deleteButton.disable();
 		deleteButton.setScale(ButtonScale.LARGE);
@@ -126,7 +126,7 @@ public class ModifyToolBar {
 		addRowButton.disable();
 		addRowButton.setScale(ButtonScale.LARGE);
 		addRowButton.setIconAlign(IconAlign.TOP);
-		addRowButton.setToolTip("Add row");
+		addRowButton.setToolTip("Add Row");
 		addRowButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
 		addRowButton.addSelectHandler(new SelectHandler() {
 
@@ -382,7 +382,7 @@ public class ModifyToolBar {
 
 	private Menu createDeleteMenu() {
 		Menu menuDelete = new Menu();
-		deleteSelectedRowsItem = new MenuItem("Selected Rows",
+		deleteSelectedRowsItem = new MenuItem("Selected Row",
 				TabularDataResources.INSTANCE.tableRowDeleteSelected());
 		deleteDuplicateItem = new MenuItem("Duplicate",
 				TabularDataResources.INSTANCE.tableDuplicateRowsRemove());