diff --git a/adapter/adapter-service/src/main/resources/adapter.sql b/adapter/adapter-service/src/main/resources/adapter.sql
index 79af02d9a..e455f262d 100644
--- a/adapter/adapter-service/src/main/resources/adapter.sql
+++ b/adapter/adapter-service/src/main/resources/adapter.sql
@@ -1,73 +1,73 @@
 create table SHRINE_QUERY(
   id int not null auto_increment,
   local_id varchar(255) not null,
   network_id bigint not null,
   username varchar(255) not null,
   domain varchar(255) not null,
   query_name varchar(255) not null,
   query_expression text,
   date_created timestamp default current_timestamp,
   has_been_run boolean not null default 0,
   flagged boolean not null default 0,
   flag_message varchar(255) null,
   constraint query_id_pk primary key(id),
   index ix_SHRINE_QUERY_network_id (network_id),
   index ix_SHRINE_QUERY_local_id (local_id),
   index ix_SHRINE_QUERY_username_domain (username, domain),
   query_xml text
 ) engine=innodb default charset=latin1;
 
 create table QUERY_RESULT(
   id int not null auto_increment,
   local_id varchar(255) not null,
   query_id int not null,
   type enum('PATIENTSET','PATIENT_COUNT_XML','PATIENT_AGE_COUNT_XML','PATIENT_RACE_COUNT_XML','PATIENT_VITALSTATUS_COUNT_XML','PATIENT_GENDER_COUNT_XML','ERROR') not null,
   status enum('FINISHED', 'ERROR', 'PROCESSING', 'QUEUED') not null,
   time_elapsed int null,
   last_updated timestamp default current_timestamp,
   constraint QUERY_RESULT_id_pk primary key(id),
   constraint fk_QUERY_RESULT_query_id foreign key (query_id) references SHRINE_QUERY (id) on delete cascade
 ) engine=innodb default charset=latin1;
 
 create table ERROR_RESULT(
   id int not null auto_increment,
   result_id int not null,
   message varchar(255) not null,
   constraint ERROR_RESULT_id_pk primary key(id),
   constraint fk_ERROR_RESULT_QUERY_RESULT_id foreign key (result_id) references QUERY_RESULT (id) on delete cascade
 ) engine=innodb default charset=latin1;
 
-alter table ERROR_RESULT add column 'CODEC' varchar not null default "Pre-1.20 Error"
-alter table ERROR_RESULT add column 'SUMMARY' text not null default "Pre-1.20 Error"
-alter table ERROR_RESULT add column 'DESCRIPTION' text not null default "Pre-1.20 Error"
-alter table ERROR_RESULT add column 'DETAILS' text not null default "Pre-1.20 Error"
+alter table ERROR_RESULT add column CODEC varchar(256) not null default "Pre-1.20 Error"
+alter table ERROR_RESULT add column SUMMARY text not null
+alter table ERROR_RESULT add column PROBLEM_DESCRIPTION text not null
+alter table ERROR_RESULT add column DETAILS text not null
 
 create table COUNT_RESULT(
   id int not null auto_increment,
   result_id int not null,
   original_count int not null,
   obfuscated_count int not null,
   date_created timestamp default current_timestamp,
   constraint COUNT_RESULT_id_pk primary key(id),
   constraint fk_COUNT_RESULT_QUERY_RESULT_id foreign key (result_id) references QUERY_RESULT (id) on delete cascade
 ) engine=innodb default charset=latin1;
 
 create table BREAKDOWN_RESULT(
   id int not null auto_increment,
   result_id int not null,
   data_key varchar(255) not null,
   original_value int not null,
   obfuscated_value int not null,
   constraint BREAKDOWN_RESULT_id_pk primary key(id),
   constraint fk_BREAKDOWN_RESULT_QUERY_RESULT_id foreign key (result_id) references QUERY_RESULT (id) on delete cascade
 ) engine=innodb default charset=latin1;
 
 create table PRIVILEGED_USER(
   id int not null auto_increment,
   username varchar(255) not null,
   domain varchar(255) not null,
   threshold int not null,
   override_date timestamp null,
   constraint priviliged_user_pk primary key(id),
   constraint ix_PRIVILEGED_USER_username_domain unique (username, domain)
 ) engine=innodb default charset=latin1;
diff --git a/adapter/adapter-service/src/main/scala/net/shrine/adapter/dao/model/squeryl/SquerylShrineError.scala b/adapter/adapter-service/src/main/scala/net/shrine/adapter/dao/model/squeryl/SquerylShrineError.scala
index 8efc55d77..be06190a4 100644
--- a/adapter/adapter-service/src/main/scala/net/shrine/adapter/dao/model/squeryl/SquerylShrineError.scala
+++ b/adapter/adapter-service/src/main/scala/net/shrine/adapter/dao/model/squeryl/SquerylShrineError.scala
@@ -1,32 +1,32 @@
 package net.shrine.adapter.dao.model.squeryl
 
 import net.shrine.adapter.dao.model.ShrineError
 import org.squeryl.KeyedEntity
 import org.squeryl.annotations.Column
 
 /**
  * @author clint
  * @since May 28, 2013
  */
 case class SquerylShrineError(
     @Column(name = "ID")
     id: Int, 
     @Column(name = "RESULT_ID")
     resultId: Int, 
     @Column(name = "MESSAGE")
     message: String,
     @Column(name = "CODEC")
     codec:String,
     @Column(name = "SUMMARY")
     summary:String,
-    @Column(name = "DESCRIPTION")
+    @Column(name = "PROBLEM_DESCRIPTION")
     digestDescription:String,
     @Column(name = "DETAILS")
     details:String
   ) extends KeyedEntity[Int] {
   
   //NB: For Squeryl, ugh :(
   def this() = this(0, 0, "", "", "", "", "")
   
   def toShrineError = ShrineError(id, resultId, message, codec, summary, digestDescription, details)
 }
diff --git a/adapter/adapter-service/src/test/resources/adapter-h2.sql b/adapter/adapter-service/src/test/resources/adapter-h2.sql
index 8ec9bff0f..bb898ff9e 100644
--- a/adapter/adapter-service/src/test/resources/adapter-h2.sql
+++ b/adapter/adapter-service/src/test/resources/adapter-h2.sql
@@ -1,23 +1,23 @@
 CREATE TABLE "SHRINE_QUERY" ("ID" INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY,"LOCAL_ID" VARCHAR NOT NULL,"NETWORK_ID" BIGINT NOT NULL,"QUERY_NAME" VARCHAR NOT NULL,"USERNAME" VARCHAR NOT NULL,"DOMAIN" VARCHAR NOT NULL,"QUERY_EXPRESSION" VARCHAR NOT NULL,"DATE_CREATED" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP)
 
 CREATE TABLE "QUERY_RESULT" ("ID" INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY,"LOCAL_ID" VARCHAR NOT NULL,"QUERY_ID" INTEGER NOT NULL,"TYPE" VARCHAR NOT NULL,"STATUS" VARCHAR NOT NULL,"TIME_ELAPSED" BIGINT NULL,"LAST_UPDATED" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP)
 ALTER TABLE "QUERY_RESULT" ADD CONSTRAINT "QueryResultQueryId_FK" FOREIGN KEY("QUERY_ID") REFERENCES "SHRINE_QUERY"("ID") ON UPDATE NO ACTION ON DELETE CASCADE
 
 CREATE TABLE "COUNT_RESULT" ("ID" INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY,"RESULT_ID" INTEGER NOT NULL,"ORIGINAL_COUNT" BIGINT NOT NULL,"OBFUSCATED_COUNT" BIGINT NOT NULL,"DATE_CREATED" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP)
 ALTER TABLE "COUNT_RESULT" ADD CONSTRAINT "CountResultResultId_FK" FOREIGN KEY("RESULT_ID") REFERENCES "QUERY_RESULT"("ID") ON UPDATE NO ACTION ON DELETE CASCADE
 
 CREATE TABLE "BREAKDOWN_RESULT" ("ID" INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY,"RESULT_ID" INTEGER NOT NULL,"DATA_KEY" VARCHAR NOT NULL,"ORIGINAL_VALUE" BIGINT NOT NULL,"OBFUSCATED_VALUE" BIGINT NOT NULL)
 ALTER TABLE "BREAKDOWN_RESULT" ADD CONSTRAINT "BreakdownResultResultId_FK" FOREIGN KEY("RESULT_ID") REFERENCES "QUERY_RESULT"("ID") ON UPDATE NO ACTION ON DELETE CASCADE
 
 CREATE TABLE "ERROR_RESULT" ("ID" INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY,"RESULT_ID" INTEGER NOT NULL,"MESSAGE" VARCHAR NOT NULL)
 ALTER TABLE "ERROR_RESULT" ADD CONSTRAINT "ErrorResultResultId_FK" FOREIGN KEY("RESULT_ID") REFERENCES "QUERY_RESULT"("ID") ON UPDATE NO ACTION ON DELETE CASCADE
 ALTER TABLE "ERROR_RESULT" ADD COLUMN "CODEC" VARCHAR NOT NULL DEFAULT "Old Error"
 ALTER TABLE "ERROR_RESULT" ADD COLUMN "SUMMARY" TEXT NOT NULL DEFAULT "Old Error"
-ALTER TABLE "ERROR_RESULT" ADD COLUMN "DESCRIPTION" TEXT NOT NULL DEFAULT "Old Error"
+ALTER TABLE "ERROR_RESULT" ADD COLUMN "PROBLEM_DESCRIPTION" TEXT NOT NULL DEFAULT "Old Error"
 ALTER TABLE "ERROR_RESULT" ADD COLUMN "DETAILS" TEXT NOT NULL DEFAULT "Old Error"
 
 CREATE TABLE "PATIENT_SET" ("ID" INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY,"RESULT_ID" INTEGER NOT NULL,"PATIENT_NUM" VARCHAR NOT NULL)
 ALTER TABLE "PATIENT_SET" ADD CONSTRAINT "PatientSetResultId_FK" FOREIGN KEY("RESULT_ID") REFERENCES "QUERY_RESULT"("ID") ON UPDATE NO ACTION ON DELETE CASCADE
 
 CREATE TABLE "PRIVILEGED_USER" ("ID" INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY,"USERNAME" VARCHAR NOT NULL,"DOMAIN" VARCHAR NOT NULL,"THRESHOLD" INTEGER NOT NULL,"OVERRIDE_DATE" TIMESTAMP)
 CREATE UNIQUE INDEX "usernameAndDomainIndex" ON "PRIVILEGED_USER"("USERNAME","DOMAIN")