diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/Openids.java b/src/main/java/eu/mulk/mulkcms2/benki/users/OpenId.java
similarity index 86%
rename from src/main/java/eu/mulk/mulkcms2/benki/users/Openids.java
rename to src/main/java/eu/mulk/mulkcms2/benki/users/OpenId.java
index 52997c8..fe2c905 100644
--- a/src/main/java/eu/mulk/mulkcms2/benki/users/Openids.java
+++ b/src/main/java/eu/mulk/mulkcms2/benki/users/OpenId.java
@@ -8,8 +8,8 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 
-@Entity
-public class Openids extends PanacheEntityBase {
+@Entity(name = "BenkiOpenId")
+public class OpenId extends PanacheEntityBase {
 
   @Id
   @Column(name = "openid", nullable = false, length = -1)
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/User.java b/src/main/java/eu/mulk/mulkcms2/benki/users/User.java
index 6e16903..45e775c 100644
--- a/src/main/java/eu/mulk/mulkcms2/benki/users/User.java
+++ b/src/main/java/eu/mulk/mulkcms2/benki/users/User.java
@@ -53,7 +53,7 @@
   public Collection<LazychatMessage> lazychatMessages;
 
   @OneToMany(mappedBy = "user", fetch = FetchType.LAZY)
-  public Collection<Openids> openids;
+  public Collection<OpenId> openids;
 
   @OneToMany(mappedBy = "user", fetch = FetchType.LAZY)
   public Collection<PageKey> pageKeys;
diff --git a/src/main/java/eu/mulk/mulkcms2/cms/users/OpenId.java b/src/main/java/eu/mulk/mulkcms2/cms/users/OpenId.java
index 0cc7407..a7a391b 100644
--- a/src/main/java/eu/mulk/mulkcms2/cms/users/OpenId.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/users/OpenId.java
@@ -10,7 +10,7 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
-@Entity
+@Entity(name = "CmsOpenId")
 @Table(name = "openids", schema = "public", catalog = "mulkcms")
 @IdClass(OpenIdPK.class)
 public class OpenId extends PanacheEntityBase {