diff --git a/source/org/zfin/mutant/presentation/ChebiPhenotypeDisplay.java b/source/org/zfin/mutant/presentation/ChebiPhenotypeDisplay.java
index 8a8837551b..d0103e1b8e 100644
--- a/source/org/zfin/mutant/presentation/ChebiPhenotypeDisplay.java
+++ b/source/org/zfin/mutant/presentation/ChebiPhenotypeDisplay.java
@@ -47,7 +47,7 @@ public class ChebiPhenotypeDisplay {
     private Publication publication;
     @JsonView(View.API.class)
     @ManyToMany(fetch = FetchType.EAGER)
-    @JoinTable(name = "UI.CHEBI_PHENOTYPE_WAREHOUSE_ASSOCIATION",
+    @JoinTable(schema = "ui", name = "chebi_phenotype_warehouse_association",
         joinColumns = {@JoinColumn(name = "cpwa_phenotype_id", nullable = false, updatable = false, insertable = false)},
         inverseJoinColumns = {@JoinColumn(name = "cpwa_phenotype_warehouse_id", nullable = false, updatable = false, insertable = false)})
     private List<PhenotypeStatementWarehouse> phenotypeStatements;
diff --git a/source/org/zfin/mutant/presentation/FishModelDisplay.java b/source/org/zfin/mutant/presentation/FishModelDisplay.java
index aecc7ebfa1..4402890b5d 100644
--- a/source/org/zfin/mutant/presentation/FishModelDisplay.java
+++ b/source/org/zfin/mutant/presentation/FishModelDisplay.java
@@ -81,7 +81,7 @@ public class FishModelDisplay implements Comparable<FishModelDisplay> {
 
 	@JsonView(View.API.class)
 	@ManyToMany(fetch = FetchType.LAZY)
-	@JoinTable(name = "UI.ZEBRAFISH_MODELS_EVIDENCE_ASSOCIATION",
+	@JoinTable(schema = "ui", name = "zebrafish_models_evidence_association",
 		joinColumns = {@JoinColumn(name = "omea_zebfrafish_model_id", nullable = false, updatable = false, insertable = false)},
 		inverseJoinColumns = {@JoinColumn(name = "omea_term_zdb_id", nullable = false, updatable = false, insertable = false)})
 	private Set<GenericTerm> evidenceCodes;
diff --git a/source/org/zfin/mutant/presentation/FishStatistics.java b/source/org/zfin/mutant/presentation/FishStatistics.java
index f35a6e637b..7b4af7dcc2 100644
--- a/source/org/zfin/mutant/presentation/FishStatistics.java
+++ b/source/org/zfin/mutant/presentation/FishStatistics.java
@@ -52,13 +52,13 @@ public class FishStatistics extends EntityStatistics {
     private Publication publication;
     @JsonView(View.ExpressedGeneAPI.class)
     @ManyToMany(fetch = FetchType.LAZY)
-    @JoinTable(name = "UI.PHENOTYPE_ZFIN_ASSOCIATION",
+    @JoinTable(schema = "ui", name = "phenotype_zfin_association",
         joinColumns = {@JoinColumn(name = "pza_phenotype_id", nullable = false, updatable = false, insertable = false)},
         inverseJoinColumns = {@JoinColumn(name = "pza_gene_zdb_id", nullable = false, updatable = false, insertable = false)})
     private Set<Marker> affectedGenes;
     @JsonView(View.ExpressedGeneAPI.class)
     @ManyToMany(fetch=FetchType.LAZY)
-    @JoinTable(name = "UI.PHENOTYPE_WAREHOUSE_ASSOCIATION",
+    @JoinTable(schema = "ui", name = "phenotype_warehouse_association",
         joinColumns = {@JoinColumn(name = "pwa_phenotype_id", nullable = false, updatable = false, insertable = false)},
         inverseJoinColumns = {@JoinColumn(name = "pwa_phenotype_warehouse_id", nullable = false, updatable = false, insertable = false)})
     private Set<PhenotypeStatementWarehouse> phenotypeStatements;
diff --git a/source/org/zfin/ontology/OmimPhenotypeDisplay.java b/source/org/zfin/ontology/OmimPhenotypeDisplay.java
index 48717d4d3b..21fd6fa939 100644
--- a/source/org/zfin/ontology/OmimPhenotypeDisplay.java
+++ b/source/org/zfin/ontology/OmimPhenotypeDisplay.java
@@ -64,7 +64,7 @@ public DBLink getHumanAccession() {
 
 	@JsonView(View.API.class)
 	@ManyToMany(fetch = FetchType.LAZY)
-	@JoinTable(name = "UI.OMIM_ZFIN_ASSOCIATION",
+	@JoinTable(schema = "ui", name = "omim_zfin_association",
 		joinColumns = {@JoinColumn(name = "oza_human_phenotype_id", nullable = false, updatable = false, insertable = false)},
 		inverseJoinColumns = {@JoinColumn(name = "oza_zfin_gene_zdb_id", nullable = false, updatable = false, insertable = false)})
 	private List<Marker> zfinGene;