diff --git a/transitclock/src/main/java/org/transitclock/db/structs/Agency.java b/transitclock/src/main/java/org/transitclock/db/structs/Agency.java
index aab61664c..121f41b50 100644
--- a/transitclock/src/main/java/org/transitclock/db/structs/Agency.java
+++ b/transitclock/src/main/java/org/transitclock/db/structs/Agency.java
@@ -55,7 +55,8 @@ public class Agency implements Serializable {
 	
 	// Note: this is the GTFS agency_id, not the usual
 	// Transitime agencyId.
-	@Column(length=HibernateUtils.DEFAULT_ID_SIZE) 
+	@Column(length=HibernateUtils.DEFAULT_ID_SIZE)
+	@Id
 	private final String agencyId;
 	
 	@Column
diff --git a/transitclock/src/main/resources/ddl_mysql_org_transitime_db_structs.sql b/transitclock/src/main/resources/ddl_mysql_org_transitclock_db_structs.sql
similarity index 99%
rename from transitclock/src/main/resources/ddl_mysql_org_transitime_db_structs.sql
rename to transitclock/src/main/resources/ddl_mysql_org_transitclock_db_structs.sql
index 819223bd1..2476abca0 100644
--- a/transitclock/src/main/resources/ddl_mysql_org_transitime_db_structs.sql
+++ b/transitclock/src/main/resources/ddl_mysql_org_transitclock_db_structs.sql
@@ -9,8 +9,8 @@
     create table Agencies (
         configRev integer not null,
         agencyName varchar(60) not null,
+        agencyId varchar(60) not null,
         agencyFareUrl varchar(255),
-        agencyId varchar(60),
         agencyLang varchar(15),
         agencyPhone varchar(15),
         agencyTimezone varchar(40),
@@ -19,7 +19,7 @@
         maxLon double precision,
         minLat double precision,
         minLon double precision,
-        primary key (configRev, agencyName)
+        primary key (configRev, agencyName, agencyId)
     );
 
     create table ArrivalsDepartures (
diff --git a/transitclock/src/main/resources/ddl_mysql_org_transitime_db_webstructs.sql b/transitclock/src/main/resources/ddl_mysql_org_transitclock_db_webstructs.sql
similarity index 100%
rename from transitclock/src/main/resources/ddl_mysql_org_transitime_db_webstructs.sql
rename to transitclock/src/main/resources/ddl_mysql_org_transitclock_db_webstructs.sql
diff --git a/transitclock/src/main/resources/ddl_oracle_org_transitime_db_structs.sql b/transitclock/src/main/resources/ddl_oracle_org_transitclock_db_structs.sql
similarity index 99%
rename from transitclock/src/main/resources/ddl_oracle_org_transitime_db_structs.sql
rename to transitclock/src/main/resources/ddl_oracle_org_transitclock_db_structs.sql
index 6f0c49cc4..fb7af706d 100644
--- a/transitclock/src/main/resources/ddl_oracle_org_transitime_db_structs.sql
+++ b/transitclock/src/main/resources/ddl_oracle_org_transitclock_db_structs.sql
@@ -9,8 +9,8 @@
     create table Agencies (
         configRev number(10,0) not null,
         agencyName varchar2(60 char) not null,
+        agencyId varchar2(60 char) not null,
         agencyFareUrl varchar2(255 char),
-        agencyId varchar2(60 char),
         agencyLang varchar2(15 char),
         agencyPhone varchar2(15 char),
         agencyTimezone varchar2(40 char),
@@ -19,7 +19,7 @@
         maxLon double precision,
         minLat double precision,
         minLon double precision,
-        primary key (configRev, agencyName)
+        primary key (configRev, agencyName, agencyId)
     );
 
     create table ArrivalsDepartures (
diff --git a/transitclock/src/main/resources/ddl_oracle_org_transitime_db_webstructs.sql b/transitclock/src/main/resources/ddl_oracle_org_transitclock_db_webstructs.sql
similarity index 100%
rename from transitclock/src/main/resources/ddl_oracle_org_transitime_db_webstructs.sql
rename to transitclock/src/main/resources/ddl_oracle_org_transitclock_db_webstructs.sql
diff --git a/transitclock/src/main/resources/ddl_postgres_org_transitime_db_structs.sql b/transitclock/src/main/resources/ddl_postgres_org_transitclock_db_structs.sql
similarity index 99%
rename from transitclock/src/main/resources/ddl_postgres_org_transitime_db_structs.sql
rename to transitclock/src/main/resources/ddl_postgres_org_transitclock_db_structs.sql
index 33cce163c..838c52147 100644
--- a/transitclock/src/main/resources/ddl_postgres_org_transitime_db_structs.sql
+++ b/transitclock/src/main/resources/ddl_postgres_org_transitclock_db_structs.sql
@@ -9,8 +9,8 @@
     create table Agencies (
         configRev int4 not null,
         agencyName varchar(60) not null,
+        agencyId varchar(60) not null,
         agencyFareUrl varchar(255),
-        agencyId varchar(60),
         agencyLang varchar(15),
         agencyPhone varchar(15),
         agencyTimezone varchar(40),
@@ -19,7 +19,7 @@
         maxLon float8,
         minLat float8,
         minLon float8,
-        primary key (configRev, agencyName)
+        primary key (configRev, agencyName, agencyId)
     );
 
     create table ArrivalsDepartures (
diff --git a/transitclock/src/main/resources/ddl_postgres_org_transitime_db_webstructs.sql b/transitclock/src/main/resources/ddl_postgres_org_transitclock_db_webstructs.sql
similarity index 100%
rename from transitclock/src/main/resources/ddl_postgres_org_transitime_db_webstructs.sql
rename to transitclock/src/main/resources/ddl_postgres_org_transitclock_db_webstructs.sql