diff --git a/openid-connect-common/src/main/java/org/mitre/oauth2/model/AuthenticationHolderEntity.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/AuthenticationHolderEntity.java
index e312ed94f..1f55b5acb 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/AuthenticationHolderEntity.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/AuthenticationHolderEntity.java
@@ -31,7 +31,7 @@ import javax.persistence.Table;
 import org.springframework.security.oauth2.provider.OAuth2Authentication;
 
 @Entity
-@Table(name="authentication_holder")
+@Table(name = "authentication_holder")
 @NamedQueries ({
 	@NamedQuery(name = "AuthenticationHolderEntity.getByAuthentication", query = "select a from AuthenticationHolderEntity a where a.authentication = :authentication")
 })
@@ -49,6 +49,7 @@ public class AuthenticationHolderEntity {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
 	public Long getId() {
 		return id;
 	}
@@ -58,7 +59,7 @@ public class AuthenticationHolderEntity {
 	}
 
 	@Basic
-	@Column(name="owner_id")
+	@Column(name = "owner_id")
 	public Long getOwnerId() {
 		return ownerId;
 	}
@@ -69,6 +70,7 @@ public class AuthenticationHolderEntity {
 
 	@Lob
 	@Basic(fetch=FetchType.LAZY)
+	@Column(name = "authentication")
 	public OAuth2Authentication getAuthentication() {
 		return authentication;
 	}
diff --git a/openid-connect-common/src/main/java/org/mitre/oauth2/model/AuthorizationCodeEntity.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/AuthorizationCodeEntity.java
index 2b7a6051b..de68c26ae 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/AuthorizationCodeEntity.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/AuthorizationCodeEntity.java
@@ -37,7 +37,7 @@ import org.springframework.security.oauth2.provider.code.AuthorizationRequestHol
  *
  */
 @Entity
-@Table(name="authorization_code")
+@Table(name = "authorization_code")
 @NamedQueries({
 	@NamedQuery(name = "AuthorizationCodeEntity.getByValue", query = "select a from AuthorizationCodeEntity a where a.code = :code")
 })
@@ -72,6 +72,7 @@ public class AuthorizationCodeEntity {
 	 */
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
 	public Long getId() {
 		return id;
 	}
@@ -87,6 +88,7 @@ public class AuthorizationCodeEntity {
 	 * @return the code
 	 */
 	@Basic
+	@Column(name = "code")
 	public String getCode() {
 		return code;
 	}
diff --git a/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java
index 3e5c99ed2..d11c4f48d 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java
@@ -58,7 +58,7 @@ import org.springframework.security.oauth2.provider.ClientDetails;
  * 
  */
 @Entity
-@Table(name="client_details")
+@Table(name = "client_details")
 @NamedQueries({
 	@NamedQuery(name = "ClientDetailsEntity.findAll", query = "SELECT c FROM ClientDetailsEntity c"),
 	@NamedQuery(name = "ClientDetailsEntity.getByClientId", query = "select c from ClientDetailsEntity c where c.clientId = :clientId")
@@ -218,6 +218,7 @@ public class ClientDetailsEntity implements ClientDetails {
 	 */
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
 	public Long getId() {
 		return id;
 	}
diff --git a/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java
index fc5336ce7..168985198 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java
@@ -55,7 +55,7 @@ import com.nimbusds.jwt.JWTParser;
  *
  */
 @Entity
-@Table(name="access_token")
+@Table(name = "access_token")
 @NamedQueries({
 	@NamedQuery(name = "OAuth2AccessTokenEntity.getByRefreshToken", query = "select a from OAuth2AccessTokenEntity a where a.refreshToken = :refreshToken"),
 	@NamedQuery(name = "OAuth2AccessTokenEntity.getByClient", query = "select a from OAuth2AccessTokenEntity a where a.client = :client"),
@@ -103,6 +103,7 @@ public class OAuth2AccessTokenEntity implements OAuth2AccessToken {
 	 */
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
 	public Long getId() {
 		return id;
 	}
@@ -183,6 +184,7 @@ public class OAuth2AccessTokenEntity implements OAuth2AccessToken {
 	@Override
 	@Basic
 	@Temporal(javax.persistence.TemporalType.TIMESTAMP)
+	@Column(name = "expiration")
 	public Date getExpiration() {
 		return expiration;
 	}
diff --git a/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2RefreshTokenEntity.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2RefreshTokenEntity.java
index 3829843c1..488e48930 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2RefreshTokenEntity.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2RefreshTokenEntity.java
@@ -47,7 +47,7 @@ import com.nimbusds.jwt.JWTParser;
  *
  */
 @Entity
-@Table(name="refresh_token")
+@Table(name = "refresh_token")
 @NamedQueries({
 	@NamedQuery(name = "OAuth2RefreshTokenEntity.getByClient", query = "select r from OAuth2RefreshTokenEntity r where r.client = :client"),
 	@NamedQuery(name = "OAuth2RefreshTokenEntity.getExpired", query = "select r from OAuth2RefreshTokenEntity r where r.expiration is not null and r.expiration < current_timestamp"),
@@ -80,6 +80,7 @@ public class OAuth2RefreshTokenEntity implements OAuth2RefreshToken {
 	 */
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
 	public Long getId() {
 		return id;
 	}
@@ -131,6 +132,7 @@ public class OAuth2RefreshTokenEntity implements OAuth2RefreshToken {
 
 	@Basic
 	@Temporal(javax.persistence.TemporalType.TIMESTAMP)
+	@Column(name = "expiration")
 	public Date getExpiration() {
 		return expiration;
 	}