diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtClob.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtClob.java
index a2f7438bfa9..b71a7fc2f99 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtClob.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtClob.java
@@ -16,7 +16,7 @@
 
 package com.evolveum.midpoint.repo.sql.data.common.any;
 
-import com.evolveum.midpoint.repo.sql.data.common.id.RAClobId;
+import com.evolveum.midpoint.repo.sql.data.common.id.RAExtClobId;
 import com.evolveum.midpoint.repo.sql.data.common.type.RAssignmentExtensionType;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -29,7 +29,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RAClobId.class)
+@IdClass(RAExtClobId.class)
 @Table(name = "m_assignment_ext_clob")
 public class RAExtClob implements RAExtValue {
 
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtDate.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtDate.java
index c3ea6aee36a..cf1d0a43670 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtDate.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtDate.java
@@ -16,7 +16,7 @@
 
 package com.evolveum.midpoint.repo.sql.data.common.any;
 
-import com.evolveum.midpoint.repo.sql.data.common.id.RADateId;
+import com.evolveum.midpoint.repo.sql.data.common.id.RAExtDateId;
 import com.evolveum.midpoint.repo.sql.data.common.type.RAssignmentExtensionType;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
 import org.hibernate.annotations.ForeignKey;
@@ -29,7 +29,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RADateId.class)
+@IdClass(RAExtDateId.class)
 @Table(name = "m_assignment_ext_date")
 @org.hibernate.annotations.Table(appliesTo = "m_assignment_ext_date",
         indexes = {@Index(name = "iAExtensionDate", columnNames = {"extensionType", "dateValue", "eName", "eType"})})
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtLong.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtLong.java
index 3e166acd15d..240935ec5b6 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtLong.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtLong.java
@@ -16,7 +16,7 @@
 
 package com.evolveum.midpoint.repo.sql.data.common.any;
 
-import com.evolveum.midpoint.repo.sql.data.common.id.RALongId;
+import com.evolveum.midpoint.repo.sql.data.common.id.RAExtLongId;
 import com.evolveum.midpoint.repo.sql.data.common.type.RAssignmentExtensionType;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
 import org.hibernate.annotations.ForeignKey;
@@ -28,7 +28,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RALongId.class)
+@IdClass(RAExtLongId.class)
 @Table(name = "m_assignment_ext_long")
 @org.hibernate.annotations.Table(appliesTo = "m_assignment_ext_long",
         indexes = {@Index(name = "iAExtensionLong", columnNames = {"extensionType", "longValue", "eName", "eType"})})
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtPolyString.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtPolyString.java
index a5d20a275e0..a27ba7857c8 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtPolyString.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtPolyString.java
@@ -17,7 +17,7 @@
 package com.evolveum.midpoint.repo.sql.data.common.any;
 
 import com.evolveum.midpoint.prism.polystring.PolyString;
-import com.evolveum.midpoint.repo.sql.data.common.id.RAPolyStringId;
+import com.evolveum.midpoint.repo.sql.data.common.id.RAExtPolyStringId;
 import com.evolveum.midpoint.repo.sql.data.common.type.RAssignmentExtensionType;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
 import org.hibernate.annotations.ForeignKey;
@@ -29,7 +29,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RAPolyStringId.class)
+@IdClass(RAExtPolyStringId.class)
 @Table(name = "m_assignment_ext_poly")
 @org.hibernate.annotations.Table(appliesTo = "m_assignment_ext_poly",
         indexes = {@Index(name = "iAExtensionPolyString", columnNames = {"extensionType", "orig", "eName", "eType"})})
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtReference.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtReference.java
index 45a8d27ab60..74173606b54 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtReference.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtReference.java
@@ -17,7 +17,7 @@
 package com.evolveum.midpoint.repo.sql.data.common.any;
 
 import com.evolveum.midpoint.prism.PrismReferenceValue;
-import com.evolveum.midpoint.repo.sql.data.common.id.RAReferenceId;
+import com.evolveum.midpoint.repo.sql.data.common.id.RAExtReferenceId;
 import com.evolveum.midpoint.repo.sql.data.common.other.RObjectType;
 import com.evolveum.midpoint.repo.sql.data.common.type.RAssignmentExtensionType;
 import com.evolveum.midpoint.repo.sql.util.ClassMapper;
@@ -31,7 +31,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RAReferenceId.class)
+@IdClass(RAExtReferenceId.class)
 @Table(name = "m_assignment_ext_reference")
 @org.hibernate.annotations.Table(appliesTo = "m_assignment_ext_reference",
         indexes = {@Index(name = "iAExtensionReference", columnNames = {"extensionType", "targetoid", "eName", "eType"})})
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtString.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtString.java
index 22dde42b2b0..371b4db7fb8 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtString.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtString.java
@@ -16,7 +16,7 @@
 
 package com.evolveum.midpoint.repo.sql.data.common.any;
 
-import com.evolveum.midpoint.repo.sql.data.common.id.RAStringId;
+import com.evolveum.midpoint.repo.sql.data.common.id.RAExtStringId;
 import com.evolveum.midpoint.repo.sql.data.common.type.RAssignmentExtensionType;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
 import org.hibernate.annotations.ForeignKey;
@@ -28,7 +28,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RAStringId.class)
+@IdClass(RAExtStringId.class)
 @Table(name = "m_assignment_ext_string")
 @org.hibernate.annotations.Table(appliesTo = "m_assignment_ext_string",
         indexes = {@Index(name = "iAExtensionString", columnNames = {"extensionType", "stringValue", "eName", "eType"})})
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtClob.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtClob.java
index 7984b4b67b0..9e896b356a5 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtClob.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtClob.java
@@ -17,7 +17,7 @@
 package com.evolveum.midpoint.repo.sql.data.common.any;
 
 import com.evolveum.midpoint.repo.sql.data.common.RObject;
-import com.evolveum.midpoint.repo.sql.data.common.id.RAnyClobId;
+import com.evolveum.midpoint.repo.sql.data.common.id.ROExtClobId;
 import com.evolveum.midpoint.repo.sql.data.common.other.RObjectType;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -30,7 +30,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RAnyClobId.class)
+@IdClass(ROExtClobId.class)
 @Table(name = "m_object_ext_clob")
 public class ROExtClob implements ROExtValue {
 
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtDate.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtDate.java
index 9bc54ea1c81..abccffaaa97 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtDate.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtDate.java
@@ -17,7 +17,7 @@
 package com.evolveum.midpoint.repo.sql.data.common.any;
 
 import com.evolveum.midpoint.repo.sql.data.common.RObject;
-import com.evolveum.midpoint.repo.sql.data.common.id.RAnyDateId;
+import com.evolveum.midpoint.repo.sql.data.common.id.ROExtDateId;
 import com.evolveum.midpoint.repo.sql.data.common.other.RObjectType;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
 import org.hibernate.annotations.ForeignKey;
@@ -30,7 +30,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RAnyDateId.class)
+@IdClass(ROExtDateId.class)
 @Table(name = "m_object_ext_date")
 @org.hibernate.annotations.Table(appliesTo = "m_object_ext_date",
         indexes = {@Index(name = "iExtensionDate", columnNames = {"ownerType", "dateValue", "eName", "eType"})})
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtLong.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtLong.java
index b813b36b590..6b8713bae05 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtLong.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtLong.java
@@ -17,7 +17,7 @@
 package com.evolveum.midpoint.repo.sql.data.common.any;
 
 import com.evolveum.midpoint.repo.sql.data.common.RObject;
-import com.evolveum.midpoint.repo.sql.data.common.id.RAnyLongId;
+import com.evolveum.midpoint.repo.sql.data.common.id.ROExtLongId;
 import com.evolveum.midpoint.repo.sql.data.common.other.RObjectType;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
 import org.hibernate.annotations.ForeignKey;
@@ -29,7 +29,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RAnyLongId.class)
+@IdClass(ROExtLongId.class)
 @Table(name = "m_object_ext_long")
 @org.hibernate.annotations.Table(appliesTo = "m_object_ext_long",
         indexes = {@Index(name = "iExtensionLong", columnNames = {"ownerType", "longValue", "eName", "eType"})})
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtPolyString.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtPolyString.java
index b65fc115aed..48773174462 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtPolyString.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtPolyString.java
@@ -18,7 +18,7 @@
 
 import com.evolveum.midpoint.prism.polystring.PolyString;
 import com.evolveum.midpoint.repo.sql.data.common.RObject;
-import com.evolveum.midpoint.repo.sql.data.common.id.RAnyPolyStringId;
+import com.evolveum.midpoint.repo.sql.data.common.id.ROExtPolyStringId;
 import com.evolveum.midpoint.repo.sql.data.common.other.RObjectType;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
 import org.hibernate.annotations.ForeignKey;
@@ -30,7 +30,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RAnyPolyStringId.class)
+@IdClass(ROExtPolyStringId.class)
 @Table(name = "m_object_ext_poly")
 @org.hibernate.annotations.Table(appliesTo = "m_object_ext_poly",
         indexes = {@Index(name = "iExtensionPolyString", columnNames = {"ownerType", "orig", "eName", "eType"})})
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtReference.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtReference.java
index 21c6bff6624..85f91df5cda 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtReference.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtReference.java
@@ -18,7 +18,7 @@
 
 import com.evolveum.midpoint.prism.PrismReferenceValue;
 import com.evolveum.midpoint.repo.sql.data.common.RObject;
-import com.evolveum.midpoint.repo.sql.data.common.id.RAnyReferenceId;
+import com.evolveum.midpoint.repo.sql.data.common.id.ROExtReferenceId;
 import com.evolveum.midpoint.repo.sql.data.common.other.RObjectType;
 import com.evolveum.midpoint.repo.sql.util.ClassMapper;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
@@ -31,7 +31,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RAnyReferenceId.class)
+@IdClass(ROExtReferenceId.class)
 @Table(name = "m_object_ext_reference")
 @org.hibernate.annotations.Table(appliesTo = "m_object_ext_reference",
         indexes = {@Index(name = "iExtensionReference", columnNames = {"ownerType", "targetoid", "eName", "eType"})})
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtString.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtString.java
index 8d5d4043d7f..38e7f5bd2aa 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtString.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtString.java
@@ -17,7 +17,7 @@
 package com.evolveum.midpoint.repo.sql.data.common.any;
 
 import com.evolveum.midpoint.repo.sql.data.common.RObject;
-import com.evolveum.midpoint.repo.sql.data.common.id.RAnyStringId;
+import com.evolveum.midpoint.repo.sql.data.common.id.ROExtStringId;
 import com.evolveum.midpoint.repo.sql.data.common.other.RObjectType;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
 import org.hibernate.annotations.ForeignKey;
@@ -29,7 +29,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RAnyStringId.class)
+@IdClass(ROExtStringId.class)
 @Table(name = "m_object_ext_string")
 @org.hibernate.annotations.Table(appliesTo = "m_object_ext_string",
         indexes = {@Index(name = "iExtensionString", columnNames = {"ownerType", "stringValue", "eName", "eType"})})
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAClobId.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtClobId.java
similarity index 94%
rename from repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAClobId.java
rename to repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtClobId.java
index 6aae565b529..e304d722396 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAClobId.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtClobId.java
@@ -16,14 +16,12 @@
 
 package com.evolveum.midpoint.repo.sql.data.common.id;
 
-import com.evolveum.midpoint.repo.sql.data.common.other.RObjectType;
-
 import java.io.Serializable;
 
 /**
  * @author lazyman
  */
-public class RAClobId implements Serializable {
+public class RAExtClobId implements Serializable {
 
     private String ownerOid;
     private Short ownerId;
@@ -76,7 +74,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        RAClobId raClobId = (RAClobId) o;
+        RAExtClobId raClobId = (RAExtClobId) o;
 
         if (checksum != null ? !checksum.equals(raClobId.checksum) : raClobId.checksum != null) return false;
         if (name != null ? !name.equals(raClobId.name) : raClobId.name != null) return false;
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RADateId.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtDateId.java
similarity index 94%
rename from repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RADateId.java
rename to repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtDateId.java
index fd2009af6be..44488c4fbc1 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RADateId.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtDateId.java
@@ -16,15 +16,13 @@
 
 package com.evolveum.midpoint.repo.sql.data.common.id;
 
-import com.evolveum.midpoint.repo.sql.data.common.other.RObjectType;
-
 import java.io.Serializable;
 import java.sql.Timestamp;
 
 /**
  * @author lazyman
  */
-public class RADateId implements Serializable {
+public class RAExtDateId implements Serializable {
 
     private String ownerOid;
     private Short ownerId;
@@ -77,7 +75,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        RADateId raDateId = (RADateId) o;
+        RAExtDateId raDateId = (RAExtDateId) o;
 
         if (name != null ? !name.equals(raDateId.name) : raDateId.name != null) return false;
         if (ownerId != null ? !ownerId.equals(raDateId.ownerId) : raDateId.ownerId != null) return false;
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RALongId.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtLongId.java
similarity index 96%
rename from repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RALongId.java
rename to repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtLongId.java
index 419056eb9d6..97b76ff6a66 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RALongId.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtLongId.java
@@ -21,7 +21,7 @@
 /**
  * @author lazyman
  */
-public class RALongId implements Serializable {
+public class RAExtLongId implements Serializable {
 
     private String ownerOid;
     private Short ownerId;
@@ -74,7 +74,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        RALongId raLongId = (RALongId) o;
+        RAExtLongId raLongId = (RAExtLongId) o;
 
         if (name != null ? !name.equals(raLongId.name) : raLongId.name != null) return false;
         if (ownerId != null ? !ownerId.equals(raLongId.ownerId) : raLongId.ownerId != null) return false;
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAPolyStringId.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtPolyStringId.java
similarity index 96%
rename from repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAPolyStringId.java
rename to repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtPolyStringId.java
index d096f8b53e2..f44a8efe640 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAPolyStringId.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtPolyStringId.java
@@ -21,7 +21,7 @@
 /**
  * @author lazyman
  */
-public class RAPolyStringId implements Serializable {
+public class RAExtPolyStringId implements Serializable {
 
     private String ownerOid;
     private Short ownerId;
@@ -74,7 +74,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        RAPolyStringId that = (RAPolyStringId) o;
+        RAExtPolyStringId that = (RAExtPolyStringId) o;
 
         if (name != null ? !name.equals(that.name) : that.name != null) return false;
         if (ownerId != null ? !ownerId.equals(that.ownerId) : that.ownerId != null) return false;
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAReferenceId.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtReferenceId.java
similarity index 96%
rename from repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAReferenceId.java
rename to repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtReferenceId.java
index b33ef741b2e..4657ae5e742 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAReferenceId.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtReferenceId.java
@@ -21,7 +21,7 @@
 /**
  * @author lazyman
  */
-public class RAReferenceId implements Serializable {
+public class RAExtReferenceId implements Serializable {
 
     private String ownerOid;
     private Short ownerId;
@@ -74,7 +74,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        RAReferenceId that = (RAReferenceId) o;
+        RAExtReferenceId that = (RAExtReferenceId) o;
 
         if (name != null ? !name.equals(that.name) : that.name != null) return false;
         if (ownerId != null ? !ownerId.equals(that.ownerId) : that.ownerId != null) return false;
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAStringId.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtStringId.java
similarity index 96%
rename from repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAStringId.java
rename to repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtStringId.java
index 065d9e2f051..70348cfb39c 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAStringId.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtStringId.java
@@ -21,7 +21,7 @@
 /**
  * @author lazyman
  */
-public class RAStringId implements Serializable {
+public class RAExtStringId implements Serializable {
 
     private String ownerOid;
     private Short ownerId;
@@ -74,7 +74,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        RAStringId that = (RAStringId) o;
+        RAExtStringId that = (RAExtStringId) o;
 
         if (name != null ? !name.equals(that.name) : that.name != null) return false;
         if (ownerId != null ? !ownerId.equals(that.ownerId) : that.ownerId != null) return false;
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyContainerId.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyContainerId.java
deleted file mode 100644
index d3fcd264544..00000000000
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyContainerId.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2010-2013 Evolveum
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.evolveum.midpoint.repo.sql.data.common.id;
-
-import com.evolveum.midpoint.repo.sql.data.common.other.RObjectType;
-
-import java.io.Serializable;
-
-/**
- * @author lazyman
- */
-public class RAnyContainerId implements Serializable {
-
-    private String ownerOid;
-    private RObjectType ownerType;
-
-    public String getOwnerOid() {
-        return ownerOid;
-    }
-
-    public void setOwnerOid(String ownerOid) {
-        this.ownerOid = ownerOid;
-    }
-
-    public RObjectType getOwnerType() {
-        return ownerType;
-    }
-
-    public void setOwnerType(RObjectType ownerType) {
-        this.ownerType = ownerType;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        RAnyContainerId that = (RAnyContainerId) o;
-
-        if (ownerOid != null ? !ownerOid.equals(that.ownerOid) : that.ownerOid != null) return false;
-        if (ownerType != that.ownerType) return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = ownerOid != null ? ownerOid.hashCode() : 0;
-        result = 31 * result + (ownerType != null ? ownerType.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "RAnyContainerId[" + ownerOid + "," + ownerType + "]";
-    }
-}
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyClobId.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtClobId.java
similarity index 96%
rename from repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyClobId.java
rename to repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtClobId.java
index bc7efb4e591..f76218e0d2f 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyClobId.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtClobId.java
@@ -23,7 +23,7 @@
 /**
  * @author lazyman
  */
-public class RAnyClobId implements Serializable {
+public class ROExtClobId implements Serializable {
 
     private String ownerOid;
     private RObjectType ownerType;
@@ -76,7 +76,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        RAnyClobId that = (RAnyClobId) o;
+        ROExtClobId that = (ROExtClobId) o;
 
         if (checksum != null ? !checksum.equals(that.checksum) : that.checksum != null) return false;
         if (name != null ? !name.equals(that.name) : that.name != null) return false;
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyDateId.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtDateId.java
similarity index 96%
rename from repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyDateId.java
rename to repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtDateId.java
index 07a0c8b1c4d..16e80591e89 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyDateId.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtDateId.java
@@ -24,7 +24,7 @@
 /**
  * @author lazyman
  */
-public class RAnyDateId implements Serializable {
+public class ROExtDateId implements Serializable {
 
     private String ownerOid;
     private RObjectType ownerType;
@@ -77,7 +77,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        RAnyDateId that = (RAnyDateId) o;
+        ROExtDateId that = (ROExtDateId) o;
 
         if (name != null ? !name.equals(that.name) : that.name != null) return false;
         if (ownerOid != null ? !ownerOid.equals(that.ownerOid) : that.ownerOid != null) return false;
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyLongId.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtLongId.java
similarity index 96%
rename from repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyLongId.java
rename to repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtLongId.java
index 4fe8c50aa83..248dbb3c65a 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyLongId.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtLongId.java
@@ -23,7 +23,7 @@
 /**
  * @author lazyman
  */
-public class RAnyLongId implements Serializable {
+public class ROExtLongId implements Serializable {
 
     private String ownerOid;
     private RObjectType ownerType;
@@ -76,7 +76,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        RAnyLongId that = (RAnyLongId) o;
+        ROExtLongId that = (ROExtLongId) o;
 
         if (name != null ? !name.equals(that.name) : that.name != null) return false;
         if (ownerOid != null ? !ownerOid.equals(that.ownerOid) : that.ownerOid != null) return false;
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyPolyStringId.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtPolyStringId.java
similarity index 96%
rename from repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyPolyStringId.java
rename to repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtPolyStringId.java
index a7054b7d191..46a8f519617 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyPolyStringId.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtPolyStringId.java
@@ -23,7 +23,7 @@
 /**
  * @author lazyman
  */
-public class RAnyPolyStringId implements Serializable {
+public class ROExtPolyStringId implements Serializable {
 
     private String ownerOid;
     private RObjectType ownerType;
@@ -76,7 +76,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        RAnyPolyStringId that = (RAnyPolyStringId) o;
+        ROExtPolyStringId that = (ROExtPolyStringId) o;
 
         if (name != null ? !name.equals(that.name) : that.name != null) return false;
         if (ownerOid != null ? !ownerOid.equals(that.ownerOid) : that.ownerOid != null) return false;
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyReferenceId.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtReferenceId.java
similarity index 96%
rename from repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyReferenceId.java
rename to repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtReferenceId.java
index dbf101bf886..8d83ee06156 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyReferenceId.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtReferenceId.java
@@ -23,7 +23,7 @@
 /**
  * @author lazyman
  */
-public class RAnyReferenceId implements Serializable {
+public class ROExtReferenceId implements Serializable {
 
     private String ownerOid;
     private RObjectType ownerType;
@@ -76,7 +76,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        RAnyReferenceId that = (RAnyReferenceId) o;
+        ROExtReferenceId that = (ROExtReferenceId) o;
 
         if (name != null ? !name.equals(that.name) : that.name != null) return false;
         if (ownerOid != null ? !ownerOid.equals(that.ownerOid) : that.ownerOid != null) return false;
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyStringId.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtStringId.java
similarity index 96%
rename from repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyStringId.java
rename to repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtStringId.java
index a34821dab6d..a3e845375e6 100644
--- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyStringId.java
+++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtStringId.java
@@ -23,7 +23,7 @@
 /**
  * @author lazyman
  */
-public class RAnyStringId implements Serializable {
+public class ROExtStringId implements Serializable {
 
     private String ownerOid;
     private RObjectType ownerType;
@@ -76,7 +76,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        RAnyStringId that = (RAnyStringId) o;
+        ROExtStringId that = (ROExtStringId) o;
 
         if (name != null ? !name.equals(that.name) : that.name != null) return false;
         if (ownerOid != null ? !ownerOid.equals(that.ownerOid) : that.ownerOid != null) return false;