diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObject.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObject.java
index eaa56325e..c5bdc13e5 100644
--- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObject.java
+++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObject.java
@@ -31,7 +31,7 @@ import java.util.Objects;
  * @author <a href="mailto:tosmers@uni-bremen.de">Tobias Osmers</a>
  */
 @Entity
-@Table(schema = "ccm-docrepo", name = "blob_objects")
+@Table(schema = "CCM_DOCREPO", name = "BLOB_OBJECTS")
 public class BlobObject implements Serializable {
     private static final long serialVersionUID = -7468014879548796218L;
 
@@ -40,14 +40,14 @@ public class BlobObject implements Serializable {
      * necessary to define an additional ID on classes which extend this class.
      */
     @Id
-    @Column(name = "blob_object_id")
+    @Column(name = "BLOB_OBJECT_ID")
     @GeneratedValue(strategy = GenerationType.AUTO)
     private long blobObjectId;
 
     /**
      * The Content of the blob-object.
      */
-    @Column(name = "content")
+    @Column(name = "CONTENT")
     @NotEmpty
     private Blob content;
 
diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/File.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/File.java
index bfc411772..fe4c9809d 100644
--- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/File.java
+++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/File.java
@@ -19,8 +19,6 @@
 package org.libreccm.docrepo;
 
 import javax.persistence.Entity;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
 /**
@@ -28,11 +26,7 @@ import javax.persistence.Table;
  * @author <a href="mailto:tosmers@uni-bremen.de">Tobias Osmers</a>
  */
 @Entity
-@Table(schema = "ccm-docrepo", name = "files")
-@NamedQueries({
-        @NamedQuery(name = "getFileRevisionBlob",
-                    query = "")
-})
+@Table(schema = "CCM_DOCREPO", name = "FILES")
 public class File extends ResourceImpl {
     private static final long serialVersionUID = -504220783419811504L;
 
diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/Folder.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/Folder.java
index 9d5125213..8bb7db09e 100644
--- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/Folder.java
+++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/Folder.java
@@ -26,7 +26,7 @@ import javax.persistence.Table;
  * @author <a href="mailto:tosmers@uni-bremen.de">Tobias Osmers</a>
  */
 @Entity
-@Table(schema = "ccm-docrepo", name = "folders")
+@Table(schema = "CCM_DOCREPO", name = "FOLDERS")
 public class Folder extends ResourceImpl {
     private static final long serialVersionUID = 1561466556458872622L;
 
diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/RecentUpdatedDocsPortlet.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/RecentUpdatedDocsPortlet.java
index ca36c2a56..727fce5b3 100644
--- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/RecentUpdatedDocsPortlet.java
+++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/RecentUpdatedDocsPortlet.java
@@ -28,7 +28,7 @@ import javax.persistence.Table;
  * @author <a href="mailto:tosmers@uni-bremen.de">Tobias Osmers</a>
  */
 @Entity
-@Table(schema = "ccm-docrepo", name = "recent_updated_docs_portlets")
+@Table(schema = "CCM_DOCREPO", name = "RECENT_UPDATED_DOCS_PORTLETS")
 public class RecentUpdatedDocsPortlet extends Portlet {
     private static final long serialVersionUID = -4091024367070127101L;
 
diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/Repository.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/Repository.java
index db2546ec2..b6e54c935 100644
--- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/Repository.java
+++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/Repository.java
@@ -22,8 +22,6 @@ import org.libreccm.web.Application;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
 /**
@@ -31,18 +29,14 @@ import javax.persistence.Table;
  * @author <a href="mailto:tosmers@uni-bremen.de">Tobias Osmers</a>
  */
 @Entity
-@Table(schema = "ccm-docrepo", name = "repositories")
-@NamedQueries({
-        @NamedQuery(name = "getRepositoryRoots",
-                    query = "")
-})
+@Table(schema = "CCM_DOCREPO", name = "REPOSITORIES")
 public class Repository extends Application {
     private static final long serialVersionUID = 6673243021462798036L;
 
-    @Column(name = "root_id")
+    @Column(name = "ROOT_ID")
     private long rootId;
 
-    @Column(name = "owner_id")
+    @Column(name = "OWNER_ID")
     private long ownerId;
 
     public Repository() {
diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/ResourceImpl.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/ResourceImpl.java
index be16c6925..ff02d1f67 100644
--- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/ResourceImpl.java
+++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/ResourceImpl.java
@@ -18,12 +18,63 @@
  */
 package org.libreccm.docrepo;
 
-import java.io.Serializable;
+import org.hibernate.validator.constraints.NotBlank;
+import org.libreccm.core.CcmObject;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import java.sql.Date;
 
 /**
  *
  * @author <a href="mailto:tosmers@uni-bremen.de">Tobias Osmers</a>
  */
-public class ResourceImpl implements Serializable{
+@Entity
+@Table(schema = "CCM_DOCREPO", name = "RESOURCE_IMPL")
+public class ResourceImpl extends CcmObject {
     private static final long serialVersionUID = -910317798106611214L;
+
+    @Column(name = "NAME")
+    @NotBlank
+    private String name;
+
+    @Column(name = "DESCRIPTION")
+    private String description;
+
+    @Column(name = "IS_FOLDER")
+    @NotBlank
+    private boolean isFolder;
+
+    @Column(name = "PATH")
+    @NotBlank
+    private String path;
+
+    @Column(name = "MIME_TYPE")
+    private String mimeType;
+
+    @Column(name = "SIZE")
+    private long size;
+
+    @Column(name = "CREATION_DATE")
+    @NotBlank
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date creationDate;
+
+    @Column(name = "CREATION_IP")
+    private String creationIp;
+
+    @Column(name = "LAST_MODIFIED_DATE")
+    @NotBlank
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date lastModifiedDate;
+
+    @Column(name = "LAST_MODIFIED_IP")
+    private String lastModifiedIp;
+
+    public ResourceImpl() {
+        super();
+    }
 }