diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilder.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilder.java
index 54d7a47eb8c404967611ffe3e456c715cf73695c..3ad1eb5922c4cbd3c8de4cbb070fe21e4ad6abaf 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilder.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilder.java
@@ -134,7 +134,10 @@ public class TypedTableModelBuilder<T extends ISerializable>
             {
                 PropertyType propertyType = property.getPropertyType();
                 String label = propertyType.getLabel();
-                String code = idPrefix + propertyType.getCode();
+                boolean internalNamespace = propertyType.isInternalNamespace();
+                String code =
+                        idPrefix + (internalNamespace ? "INTERN" : "USER") + "-"
+                                + propertyType.getSimpleCode();
                 IColumn column = column(code).withTitle(label);
                 DataTypeCode dataType = propertyType.getDataType().getCode();
                 ISerializableComparable value;
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilderTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilderTest.java
index 20767058fe79cd9491242ce150a52e3ed9139424..ec7d5de2ce7b7fa7be667f1bc48b072c829825c5 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilderTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilderTest.java
@@ -109,18 +109,19 @@ public class TypedTableModelBuilderTest extends AssertJUnit
     {
         TypedTableModelBuilder<ISerializable> builder = new TypedTableModelBuilder<ISerializable>();
         builder.addRow(new MockSerializable());
-        IEntityProperty p1 = property("beta", "3.25", DataTypeCode.REAL);
-        IEntityProperty p2 = property("alpha", "hello\nworld", DataTypeCode.MULTILINE_VARCHAR);
-        IEntityProperty p3 = property("gamma", "hello", DataTypeCode.VARCHAR);
+        IEntityProperty p1 = property("beta", "3.25", true, DataTypeCode.REAL);
+        IEntityProperty p2 = property("alpha", "hello\nworld", false, DataTypeCode.MULTILINE_VARCHAR);
+        IEntityProperty p3 = property("gamma", "hello", false, DataTypeCode.VARCHAR);
         builder.columnGroup("g").addProperties("MY-", Arrays.asList(p1, p2, p3));
         builder.addRow(new MockSerializable());
-        IEntityProperty p4 = property("gamma", "hi", DataTypeCode.VARCHAR);
-        IEntityProperty p5 = property("kappa", "42", DataTypeCode.INTEGER);
+        IEntityProperty p4 = property("gamma", "hi", false, DataTypeCode.VARCHAR);
+        IEntityProperty p5 = property("kappa", "42", false, DataTypeCode.INTEGER);
         builder.columnGroup("g").addProperties("MY-", Arrays.asList(p4, p5));
 
         TypedTableModel<ISerializable> model = builder.getModel();
         List<TableModelColumnHeader> headers = model.getHeader();
-        assertHeadersOrder(headers, "MY-ALPHA", "MY-BETA", "MY-GAMMA", "MY-KAPPA");
+        System.out.println("HEADERS:"+headers);
+        assertHeadersOrder(headers, "MY-USER-ALPHA", "MY-INTERN-BETA", "MY-USER-GAMMA", "MY-USER-KAPPA");
         assertEquals("alpha", headers.get(0).getTitle());
         assertEquals(DataTypeCode.MULTILINE_VARCHAR, headers.get(0).getDataType());
         assertEquals("beta", headers.get(1).getTitle());
@@ -142,11 +143,14 @@ public class TypedTableModelBuilderTest extends AssertJUnit
         assertEquals(2, rows.size());
     }
 
-    private IEntityProperty property(String key, String value, DataTypeCode type)
+    private IEntityProperty property(String key, String value, boolean internalNamespace, DataTypeCode type)
     {
         EntityProperty property = new EntityProperty();
         PropertyType propertyType = new PropertyType();
-        propertyType.setCode(key.toUpperCase());
+        String normalizedKey = key.toUpperCase();
+        propertyType.setSimpleCode(normalizedKey);
+        propertyType.setInternalNamespace(internalNamespace);
+        propertyType.setCode((internalNamespace ? "$" : "") + normalizedKey);
         propertyType.setLabel(key);
         propertyType.setDataType(new DataType(type));
         property.setPropertyType(propertyType);