diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AbstractEntityTypeGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AbstractEntityTypeGrid.java
index 42de1ad77c2b79276f88afd03479471920299276..53c312224d42a7943edc9ea4d1e336f04dd6cc78 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AbstractEntityTypeGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AbstractEntityTypeGrid.java
@@ -92,7 +92,7 @@ abstract public class AbstractEntityTypeGrid<T extends EntityType> extends Typed
                             createRegisterEntityTypeDialog(entityKind).show();
                         }
                     });
-        button.setId("add-entity-type-" + this.getClass().getName());
+        button.setId("add-entity-type-" + getEntityKindOrNull());
         addButton(button);
 
         Button editButton =
@@ -110,10 +110,10 @@ abstract public class AbstractEntityTypeGrid<T extends EntityType> extends Typed
                                 }
 
                             });
-        editButton.setId("edit-entity-type-" + this.getClass().getName());
+        editButton.setId("edit-entity-type-" + getEntityKindOrNull());
         addButton(editButton);
         Button deleteButton = createDeleteButton(viewContext);
-        deleteButton.setId("delete-entity-type-" + this.getClass().getName());
+        deleteButton.setId("delete-entity-type-" + getEntityKindOrNull());
         enableButtonOnSelectedItems(deleteButton);
         addButton(deleteButton);
 
diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/tab/ExperimentTypeBrowser.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/tab/ExperimentTypeBrowser.java
index 86c07652ece5daa6ac3b60acf5a73f58120fe2d8..963c594573d18b972a6755447f313ddb6cc0f12a 100644
--- a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/tab/ExperimentTypeBrowser.java
+++ b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/tab/ExperimentTypeBrowser.java
@@ -28,13 +28,13 @@ import ch.systemsx.cisd.openbis.uitest.page.dialog.AddExperimentTypeDialog;
 public class ExperimentTypeBrowser extends BrowserPage
 {
 
-    @FindBy(id = "add-entity-type-ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.experiment.ExperimentTypeGrid")
+    @FindBy(id = "add-entity-type-EXPERIMENT")
     private WebElement addButton;
 
-    @FindBy(id = "edit-entity-type-ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.experiment.ExperimentTypeGrid")
+    @FindBy(id = "edit-entity-type-EXPERIMENT")
     private WebElement editButton;
 
-    @FindBy(id = "delete-entity-type-ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.experiment.ExperimentTypeGrid")
+    @FindBy(id = "delete-entity-type-EXPERIMENT")
     private WebElement deleteButton;
 
     @FindBys(
diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/tab/SampleTypeBrowser.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/tab/SampleTypeBrowser.java
index aaf1c864f1995142df8adeaaa8a0e729f50815d3..318aa7ace2730533e07bbd0b742e7772739e3092 100644
--- a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/tab/SampleTypeBrowser.java
+++ b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/tab/SampleTypeBrowser.java
@@ -29,13 +29,13 @@ import ch.systemsx.cisd.openbis.uitest.type.SampleType;
 
 public class SampleTypeBrowser extends BrowserPage
 {
-    @FindBy(id = "add-entity-type-ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample.SampleTypeGrid")
+    @FindBy(id = "add-entity-type-SAMPLE")
     private WebElement addSampleTypeButton;
 
-    @FindBy(id = "edit-entity-type-ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample.SampleTypeGrid")
+    @FindBy(id = "edit-entity-type-SAMPLE")
     private WebElement editSampleTypeButton;
 
-    @FindBy(id = "delete-entity-type-ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample.SampleTypeGrid")
+    @FindBy(id = "delete-entity-type-SAMPLE")
     private WebElement deleteSampleTypeButton;
 
     @FindBys(