diff --git a/client/src/app/forms/variant-revise/variant-revise.form.ts b/client/src/app/forms/variant-revise/variant-revise.form.ts
index 4bfc5d42c..5f341a69a 100644
--- a/client/src/app/forms/variant-revise/variant-revise.form.ts
+++ b/client/src/app/forms/variant-revise/variant-revise.form.ts
@@ -70,8 +70,8 @@ interface FormModel {
     ensemblVersion?: number;
     hgvsDescriptions: string[];
     variantTypes: FormVariantType[];
-    fivePrimeCoordinates?: CoordinateFieldsFragment;
-    threePrimeCoordinates?: CoordinateFieldsFragment;
+    primaryCoordinates?: CoordinateFieldsFragment;
+    secondaryCoordinates?: CoordinateFieldsFragment;
     referenceBases: Maybe<string>;
     variantBases: Maybe<string>;
     comment?: string;
@@ -286,7 +286,7 @@ export class VariantReviseForm implements AfterViewInit, OnDestroy {
             type: 'cvc-ensembl-input',
           },
           {
-            key: 'threePrimeCoordinates.referenceBases',
+            key: 'referenceBases',
             type: 'input',
             defaultValue: undefined,
             templateOptions: {
@@ -299,7 +299,7 @@ export class VariantReviseForm implements AfterViewInit, OnDestroy {
             }
           },
           {
-            key: 'threePrimeCoordinates.variantBases',
+            key: 'variantBases',
             type: 'input',
             defaultValue: undefined,
             templateOptions: {
@@ -312,7 +312,7 @@ export class VariantReviseForm implements AfterViewInit, OnDestroy {
             }
           },
           {
-            key: 'threePrimeCoordinates.chromosome',
+            key: 'primaryCoordinates.chromosome',
             type: 'select',
             defaultValue: undefined,
             templateOptions: {
@@ -323,7 +323,7 @@ export class VariantReviseForm implements AfterViewInit, OnDestroy {
             },
           },
           {
-            key: 'threePrimeCoordinates.start',
+            key: 'primaryCoordinates.start',
             type: 'input',
             templateOptions: {
               label: 'Start',
@@ -335,7 +335,7 @@ export class VariantReviseForm implements AfterViewInit, OnDestroy {
             }
           },
           {
-            key: 'threePrimeCoordinates.stop',
+            key: 'primaryCoordinates.stop',
             type: 'input',
             templateOptions: {
               label: 'Stop',
@@ -347,7 +347,7 @@ export class VariantReviseForm implements AfterViewInit, OnDestroy {
             }
           },
           {
-            key: 'threePrimeCoordinates.representativeTranscript',
+            key: 'primaryCoordinates.representativeTranscript',
             type: 'input',
             templateOptions: {
               label: 'Representative Transcript',
@@ -358,7 +358,7 @@ export class VariantReviseForm implements AfterViewInit, OnDestroy {
             template: '<h3>Secondary Coordinates</h3>',
           },
           {
-            key: 'fivePrimeCoordinates.chromosome',
+            key: 'secondaryCoordinates.chromosome',
             type: 'select',
             defaultValue: undefined,
             templateOptions: {
@@ -370,7 +370,7 @@ export class VariantReviseForm implements AfterViewInit, OnDestroy {
             },
           },
           {
-            key: 'fivePrimeCoordinates.start',
+            key: 'secondaryCoordinates.start',
             type: 'input',
             templateOptions: {
               label: 'Start',
@@ -381,7 +381,7 @@ export class VariantReviseForm implements AfterViewInit, OnDestroy {
             }
           },
           {
-            key: 'fivePrimeCoordinates.stop',
+            key: 'secondaryCoordinates.stop',
             type: 'input',
             templateOptions: {
               label: 'Stop',
@@ -392,7 +392,7 @@ export class VariantReviseForm implements AfterViewInit, OnDestroy {
             }
           },
           {
-            key: 'fivePrimeCoordinates.representativeTranscript',
+            key: 'secondaryCoordinates.representativeTranscript',
             type: 'input',
             templateOptions: {
               label: 'Representative Transcript',
@@ -487,8 +487,8 @@ export class VariantReviseForm implements AfterViewInit, OnDestroy {
         ...variant,
         clinvarStatus: this.getClinvarStatus(variant.clinvarIds),
         clinvarIds: this.getClinvarIds(variant.clinvarIds),
-        referenceBases: variant.fivePrimeCoordinates?.referenceBases,
-        variantBases: variant.fivePrimeCoordinates?.variantBases,
+        referenceBases: variant.referenceBases,
+        variantBases: variant.variantBases,
         comment: this.formModel?.fields.comment,
         organization: this.formModel?.fields.organization,
       },
@@ -534,8 +534,8 @@ export class VariantReviseForm implements AfterViewInit, OnDestroy {
           ensemblVersion: fmt.toNullableInput(fields.ensemblVersion),
           description: fmt.toNullableString(fields.description),
           clinvarIds: fmt.toClinvarInput(fields.clinvarIds, fields.clinvarStatus),
-          primaryCoordinates: fmt.toCoordinateInput(fields.threePrimeCoordinates),
-          secondaryCoordinates: fmt.toCoordinateInput(fields.fivePrimeCoordinates),
+          primaryCoordinates: fmt.toCoordinateInput(fields.primaryCoordinates),
+          secondaryCoordinates: fmt.toCoordinateInput(fields.secondaryCoordinates),
           referenceBases: fmt.toNullableString(fields.referenceBases),
           variantBases: fmt.toNullableString(fields.variantBases),
           referenceBuild: fmt.toNullableReferenceBuildInput(fields.referenceBuild),
diff --git a/client/src/app/forms/variant-revise/variant-revise.query.gql b/client/src/app/forms/variant-revise/variant-revise.query.gql
index 4336bda83..1bbf65f4a 100644
--- a/client/src/app/forms/variant-revise/variant-revise.query.gql
+++ b/client/src/app/forms/variant-revise/variant-revise.query.gql
@@ -29,21 +29,21 @@ fragment RevisableVariantFields on Variant {
     name
     soid
   }
-  fivePrimeCoordinates {
+  primaryCoordinates {
     ... CoordinateFields
   }
-  threePrimeCoordinates {
+  secondaryCoordinates {
     ... CoordinateFields
   }
+  referenceBases
+  variantBases
 }
 
 fragment CoordinateFields on Coordinate {
   chromosome
-  referenceBases
   representativeTranscript
   start
   stop
-  variantBases
 }
 
 mutation SuggestVariantRevision($input: SuggestVariantRevisionInput!) {
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index bff784a47..35674d1bd 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -963,11 +963,9 @@ export type Contribution = {
 export type Coordinate = {
   __typename: 'Coordinate';
   chromosome?: Maybe<Scalars['String']>;
-  referenceBases?: Maybe<Scalars['String']>;
   representativeTranscript?: Maybe<Scalars['String']>;
   start?: Maybe<Scalars['Int']>;
   stop?: Maybe<Scalars['Int']>;
-  variantBases?: Maybe<Scalars['String']>;
 };
 
 export type CoordinateInput = {
@@ -4096,7 +4094,6 @@ export type Variant = Commentable & EventOriginObject & EventSubject & Flaggable
   events: EventConnection;
   evidenceItems: EvidenceItemConnection;
   evidenceScore: Scalars['Float'];
-  fivePrimeCoordinates?: Maybe<Coordinate>;
   flagged: Scalars['Boolean'];
   /** List and filter flags. */
   flags: FlagConnection;
@@ -4109,12 +4106,15 @@ export type Variant = Commentable & EventOriginObject & EventSubject & Flaggable
   link: Scalars['String'];
   myVariantInfo?: Maybe<MyVariantInfo>;
   name: Scalars['String'];
+  primaryCoordinates?: Maybe<Coordinate>;
+  referenceBases: Scalars['String'];
   referenceBuild?: Maybe<ReferenceBuild>;
   /** List and filter revisions. */
   revisions: RevisionConnection;
+  secondaryCoordinates?: Maybe<Coordinate>;
   sources: Array<Source>;
-  threePrimeCoordinates?: Maybe<Coordinate>;
   variantAliases: Array<Scalars['String']>;
+  variantBases: Scalars['String'];
   variantTypes: Array<VariantType>;
 };
 
@@ -6961,7 +6961,7 @@ export type VariantRevisableFieldsQuery = (
 
 export type RevisableVariantFieldsFragment = (
   { __typename: 'Variant' }
-  & Pick<Variant, 'id' | 'name' | 'description' | 'variantAliases' | 'alleleRegistryId' | 'clinvarIds' | 'ensemblVersion' | 'hgvsDescriptions' | 'referenceBuild'>
+  & Pick<Variant, 'id' | 'name' | 'description' | 'variantAliases' | 'alleleRegistryId' | 'clinvarIds' | 'ensemblVersion' | 'hgvsDescriptions' | 'referenceBuild' | 'referenceBases' | 'variantBases'>
   & { sources: Array<(
     { __typename: 'Source' }
     & Pick<Source, 'id' | 'sourceType' | 'citation' | 'citationId'>
@@ -6971,10 +6971,10 @@ export type RevisableVariantFieldsFragment = (
   ), variantTypes: Array<(
     { __typename: 'VariantType' }
     & Pick<VariantType, 'id' | 'name' | 'soid'>
-  )>, fivePrimeCoordinates?: Maybe<(
+  )>, primaryCoordinates?: Maybe<(
     { __typename: 'Coordinate' }
     & CoordinateFieldsFragment
-  )>, threePrimeCoordinates?: Maybe<(
+  )>, secondaryCoordinates?: Maybe<(
     { __typename: 'Coordinate' }
     & CoordinateFieldsFragment
   )> }
@@ -6982,7 +6982,7 @@ export type RevisableVariantFieldsFragment = (
 
 export type CoordinateFieldsFragment = (
   { __typename: 'Coordinate' }
-  & Pick<Coordinate, 'chromosome' | 'referenceBases' | 'representativeTranscript' | 'start' | 'stop' | 'variantBases'>
+  & Pick<Coordinate, 'chromosome' | 'representativeTranscript' | 'start' | 'stop'>
 );
 
 export type SuggestVariantRevisionMutationVariables = Exact<{
@@ -7936,7 +7936,7 @@ export type VariantSummaryQuery = (
 
 export type VariantSummaryFieldsFragment = (
   { __typename: 'Variant' }
-  & Pick<Variant, 'id' | 'name' | 'description' | 'variantAliases' | 'alleleRegistryId' | 'hgvsDescriptions' | 'clinvarIds' | 'evidenceScore' | 'referenceBuild' | 'ensemblVersion'>
+  & Pick<Variant, 'id' | 'name' | 'description' | 'variantAliases' | 'alleleRegistryId' | 'hgvsDescriptions' | 'clinvarIds' | 'evidenceScore' | 'referenceBuild' | 'ensemblVersion' | 'referenceBases' | 'variantBases'>
   & { gene: (
     { __typename: 'Gene' }
     & Pick<Gene, 'id' | 'name'>
@@ -7946,12 +7946,12 @@ export type VariantSummaryFieldsFragment = (
   )>, variantTypes: Array<(
     { __typename: 'VariantType' }
     & Pick<VariantType, 'id' | 'link' | 'soid' | 'name'>
-  )>, fivePrimeCoordinates?: Maybe<(
+  )>, primaryCoordinates?: Maybe<(
     { __typename: 'Coordinate' }
-    & Pick<Coordinate, 'representativeTranscript' | 'chromosome' | 'start' | 'stop' | 'referenceBases' | 'variantBases'>
-  )>, threePrimeCoordinates?: Maybe<(
+    & Pick<Coordinate, 'representativeTranscript' | 'chromosome' | 'start' | 'stop'>
+  )>, secondaryCoordinates?: Maybe<(
     { __typename: 'Coordinate' }
-    & Pick<Coordinate, 'representativeTranscript' | 'chromosome' | 'start' | 'stop' | 'referenceBases' | 'variantBases'>
+    & Pick<Coordinate, 'representativeTranscript' | 'chromosome' | 'start' | 'stop'>
   )>, flags: (
     { __typename: 'FlagConnection' }
     & Pick<FlagConnection, 'totalCount'>
@@ -9146,11 +9146,9 @@ export const SubmittableVariantGroupFieldsFragmentDoc = gql`
 export const CoordinateFieldsFragmentDoc = gql`
     fragment CoordinateFields on Coordinate {
   chromosome
-  referenceBases
   representativeTranscript
   start
   stop
-  variantBases
 }
     `;
 export const RevisableVariantFieldsFragmentDoc = gql`
@@ -9179,12 +9177,14 @@ export const RevisableVariantFieldsFragmentDoc = gql`
     name
     soid
   }
-  fivePrimeCoordinates {
+  primaryCoordinates {
     ...CoordinateFields
   }
-  threePrimeCoordinates {
+  secondaryCoordinates {
     ...CoordinateFields
   }
+  referenceBases
+  variantBases
 }
     ${CoordinateFieldsFragmentDoc}`;
 export const AssertionDetailFieldsFragmentDoc = gql`
@@ -9878,22 +9878,20 @@ export const VariantSummaryFieldsFragmentDoc = gql`
   evidenceScore
   referenceBuild
   ensemblVersion
-  fivePrimeCoordinates {
+  primaryCoordinates {
     representativeTranscript
     chromosome
     start
     stop
-    referenceBases
-    variantBases
   }
-  threePrimeCoordinates {
+  secondaryCoordinates {
     representativeTranscript
     chromosome
     start
     stop
-    referenceBases
-    variantBases
   }
+  referenceBases
+  variantBases
   flags(state: OPEN) {
     totalCount
   }
diff --git a/client/src/app/generated/server.field-policies.ts b/client/src/app/generated/server.field-policies.ts
index 140ac18c5..b0f1fe699 100644
--- a/client/src/app/generated/server.field-policies.ts
+++ b/client/src/app/generated/server.field-policies.ts
@@ -431,14 +431,12 @@ export type ContributionFieldPolicy = {
 	action?: FieldPolicy<any> | FieldReadFunction<any>,
 	count?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type CoordinateKeySpecifier = ('chromosome' | 'referenceBases' | 'representativeTranscript' | 'start' | 'stop' | 'variantBases' | CoordinateKeySpecifier)[];
+export type CoordinateKeySpecifier = ('chromosome' | 'representativeTranscript' | 'start' | 'stop' | CoordinateKeySpecifier)[];
 export type CoordinateFieldPolicy = {
 	chromosome?: FieldPolicy<any> | FieldReadFunction<any>,
-	referenceBases?: FieldPolicy<any> | FieldReadFunction<any>,
 	representativeTranscript?: FieldPolicy<any> | FieldReadFunction<any>,
 	start?: FieldPolicy<any> | FieldReadFunction<any>,
-	stop?: FieldPolicy<any> | FieldReadFunction<any>,
-	variantBases?: FieldPolicy<any> | FieldReadFunction<any>
+	stop?: FieldPolicy<any> | FieldReadFunction<any>
 };
 export type CountryKeySpecifier = ('id' | 'iso' | 'name' | CountryKeySpecifier)[];
 export type CountryFieldPolicy = {
@@ -1274,7 +1272,7 @@ export type ValidationErrorsFieldPolicy = {
 	genericErrors?: FieldPolicy<any> | FieldReadFunction<any>,
 	validationErrors?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type VariantKeySpecifier = ('alleleRegistryId' | 'clinvarIds' | 'comments' | 'description' | 'ensemblVersion' | 'events' | 'evidenceItems' | 'evidenceScore' | 'fivePrimeCoordinates' | 'flagged' | 'flags' | 'gene' | 'hgvsDescriptions' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'myVariantInfo' | 'name' | 'referenceBuild' | 'revisions' | 'sources' | 'threePrimeCoordinates' | 'variantAliases' | 'variantTypes' | VariantKeySpecifier)[];
+export type VariantKeySpecifier = ('alleleRegistryId' | 'clinvarIds' | 'comments' | 'description' | 'ensemblVersion' | 'events' | 'evidenceItems' | 'evidenceScore' | 'flagged' | 'flags' | 'gene' | 'hgvsDescriptions' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'myVariantInfo' | 'name' | 'primaryCoordinates' | 'referenceBases' | 'referenceBuild' | 'revisions' | 'secondaryCoordinates' | 'sources' | 'variantAliases' | 'variantBases' | 'variantTypes' | VariantKeySpecifier)[];
 export type VariantFieldPolicy = {
 	alleleRegistryId?: FieldPolicy<any> | FieldReadFunction<any>,
 	clinvarIds?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1284,7 +1282,6 @@ export type VariantFieldPolicy = {
 	events?: FieldPolicy<any> | FieldReadFunction<any>,
 	evidenceItems?: FieldPolicy<any> | FieldReadFunction<any>,
 	evidenceScore?: FieldPolicy<any> | FieldReadFunction<any>,
-	fivePrimeCoordinates?: FieldPolicy<any> | FieldReadFunction<any>,
 	flagged?: FieldPolicy<any> | FieldReadFunction<any>,
 	flags?: FieldPolicy<any> | FieldReadFunction<any>,
 	gene?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1296,11 +1293,14 @@ export type VariantFieldPolicy = {
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
 	myVariantInfo?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>,
+	primaryCoordinates?: FieldPolicy<any> | FieldReadFunction<any>,
+	referenceBases?: FieldPolicy<any> | FieldReadFunction<any>,
 	referenceBuild?: FieldPolicy<any> | FieldReadFunction<any>,
 	revisions?: FieldPolicy<any> | FieldReadFunction<any>,
+	secondaryCoordinates?: FieldPolicy<any> | FieldReadFunction<any>,
 	sources?: FieldPolicy<any> | FieldReadFunction<any>,
-	threePrimeCoordinates?: FieldPolicy<any> | FieldReadFunction<any>,
 	variantAliases?: FieldPolicy<any> | FieldReadFunction<any>,
+	variantBases?: FieldPolicy<any> | FieldReadFunction<any>,
 	variantTypes?: FieldPolicy<any> | FieldReadFunction<any>
 };
 export type VariantAliasKeySpecifier = ('name' | VariantAliasKeySpecifier)[];
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 23231ec1f..4cc106503 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -1543,11 +1543,9 @@ type Contribution {
 
 type Coordinate {
   chromosome: String
-  referenceBases: String
   representativeTranscript: String
   start: Int
   stop: Int
-  variantBases: String
 }
 
 input CoordinateInput {
@@ -3094,7 +3092,7 @@ type Mutation {
   ): AddDrugPayload
 
   """
-  Add a stub record for an external source that is not yet in CiVIC.
+  Add a stub record for an external source that is not yet in CIViC.
   This is for adding a new Source inline while performing other curation activities
   such as adding new evidence items and is distinct from suggesting a source for curation.
   """
@@ -6760,7 +6758,6 @@ type Variant implements Commentable & EventOriginObject & EventSubject & Flaggab
     last: Int
   ): EvidenceItemConnection!
   evidenceScore: Float!
-  fivePrimeCoordinates: Coordinate
   flagged: Boolean!
 
   """
@@ -6816,6 +6813,8 @@ type Variant implements Commentable & EventOriginObject & EventSubject & Flaggab
   link: String!
   myVariantInfo: MyVariantInfo
   name: String!
+  primaryCoordinates: Coordinate
+  referenceBases: String!
   referenceBuild: ReferenceBuild
 
   """
@@ -6867,9 +6866,10 @@ type Variant implements Commentable & EventOriginObject & EventSubject & Flaggab
     """
     status: RevisionStatus
   ): RevisionConnection!
+  secondaryCoordinates: Coordinate
   sources: [Source!]!
-  threePrimeCoordinates: Coordinate
   variantAliases: [String!]!
+  variantBases: String!
   variantTypes: [VariantType!]!
 }
 
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index aec02762b..ee6f31853 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -7277,18 +7277,6 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
-            {
-              "name": "referenceBases",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "representativeTranscript",
               "description": null,
@@ -7324,18 +7312,6 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "variantBases",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "inputFields": null,
@@ -14116,7 +14092,7 @@
             },
             {
               "name": "addRemoteCitation",
-              "description": "Add a stub record for an external source that is not yet in CiVIC.\nThis is for adding a new Source inline while performing other curation activities\nsuch as adding new evidence items and is distinct from suggesting a source for curation.\n",
+              "description": "Add a stub record for an external source that is not yet in CIViC.\nThis is for adding a new Source inline while performing other curation activities\nsuch as adding new evidence items and is distinct from suggesting a source for curation.\n",
               "args": [
                 {
                   "name": "input",
@@ -28967,18 +28943,6 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
-            {
-              "name": "fivePrimeCoordinates",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "Coordinate",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "flagged",
               "description": null,
@@ -29244,6 +29208,34 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "primaryCoordinates",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Coordinate",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "referenceBases",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "referenceBuild",
               "description": null,
@@ -29381,6 +29373,18 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "secondaryCoordinates",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Coordinate",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "sources",
               "description": null,
@@ -29405,18 +29409,6 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
-            {
-              "name": "threePrimeCoordinates",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "Coordinate",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "variantAliases",
               "description": null,
@@ -29441,6 +29433,22 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "variantBases",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "variantTypes",
               "description": null,
diff --git a/client/src/app/views/pages/pages-help/pages-help.page.html b/client/src/app/views/pages/pages-help/pages-help.page.html
index 8d9c2405f..bc8c9dde4 100644
--- a/client/src/app/views/pages/pages-help/pages-help.page.html
+++ b/client/src/app/views/pages/pages-help/pages-help.page.html
@@ -56,8 +56,8 @@
                 <nz-card nzType="inner"
                   nzTitle="News and Updates"
                   style="width: 100%">
-                  Please follow our twitter account <a href="https://twitter.com/CIViCdb"
-                    target="_blank">@CIVICdb</a>.
+                  Please follow our Twitter account <a href="https://twitter.com/CIViCdb"
+                    target="_blank">@CIViCdb</a>.
                 </nz-card>
               </nz-col>
               <nz-col [nzSpan]="8">
diff --git a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.html b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.html
index 5562bad19..1837a4eaa 100644
--- a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.html
+++ b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.html
@@ -194,10 +194,10 @@
 
             </nz-descriptions>
 
-            <!-- 3' coordinates -->
-            <ng-container *ngIf="variant.threePrimeCoordinates?.chromosome">
-              <nz-descriptions *ngIf="variant.threePrimeCoordinates as coords"
-                nzTitle="3' Coordinates"
+            <!-- primary / 5' coordinates -->
+            <ng-container *ngIf="variant.primaryCoordinates?.chromosome">
+              <nz-descriptions *ngIf="variant.primaryCoordinates as coords"
+                nzTitle="{{variant.secondaryCoordinates ? '5\' Coordinates' : 'Coordinates'}}"
                 nzLayout="horizontal"
                 nzBordered="true"
                 nzSize="small"
@@ -221,22 +221,24 @@
                   {{ coords.stop }}
                 </nz-descriptions-item>
 
-                <!-- reference bases -->
-                <nz-descriptions-item nzTitle="Ref. Bases"
-                  nzColumn="1">
-                  {{ coords.referenceBases | ifEmpty: '--'}}
-                </nz-descriptions-item>
-
-                <!-- variant bases-->
-                <nz-descriptions-item nzTitle="Var. Bases"
-                  nzColumn="1">
-                  {{ coords.variantBases | ifEmpty: '--'}}
-                </nz-descriptions-item>
+                <ng-container *ngIf="!variant.secondaryCoordinates">
+                  <!-- reference bases -->
+                  <nz-descriptions-item nzTitle="Ref. Bases"
+                    nzColumn="1">
+                    {{ variant.referenceBases | ifEmpty: '--'}}
+                  </nz-descriptions-item>
+
+                  <!-- variant bases-->
+                  <nz-descriptions-item nzTitle="Var. Bases"
+                    nzColumn="1">
+                    {{ variant.variantBases | ifEmpty: '--'}}
+                  </nz-descriptions-item>
+                </ng-container>
 
                 <!-- representative transcript -->
                 <nz-descriptions-item nzTitle="Transcript"
                   nzColumn="5">
-                  <cvc-link-tag tooltip="View on Esembl"
+                  <cvc-link-tag tooltip="View on Ensembl"
                     [href]="'http://www.ensembl.org/Homo_sapiens/transview?transcript=' + coords.representativeTranscript">
                     {{ coords.representativeTranscript }}
                   </cvc-link-tag>
@@ -245,11 +247,10 @@
               </nz-descriptions>
             </ng-container>
             
-            <!-- 5' coordinates -->
-            <ng-container *ngIf="variant.fivePrimeCoordinates?.chromosome">
-              <!-- <ng-container *ngIf="variant.fivePrimeCoordinates?.chromosome; else noCoordinates"> -->
-              <nz-descriptions *ngIf="variant.fivePrimeCoordinates as coords"
-                nzTitle="5' Coordinates"
+            <!-- 3' (secondary) coordinates for fusions-->
+            <ng-container *ngIf="variant.secondaryCoordinates">
+              <nz-descriptions *ngIf="variant.secondaryCoordinates as coords"
+                nzTitle="3' Coordinates"
                 nzLayout="horizontal"
                 nzBordered="true"
                 nzSize="small"
@@ -273,22 +274,10 @@
                   {{ coords.stop }}
                 </nz-descriptions-item>
 
-                <!-- reference bases -->
-                <nz-descriptions-item nzTitle="Ref. Bases"
-                  nzColumn="1">
-                  {{ coords.referenceBases | ifEmpty: '--'}}
-                </nz-descriptions-item>
-
-                <!-- variant bases-->
-                <nz-descriptions-item nzTitle="Var. Bases"
-                  nzColumn="1">
-                  {{ coords.variantBases | ifEmpty: '--'}}
-                </nz-descriptions-item>
-
                 <!-- representative transcript -->
                 <nz-descriptions-item nzTitle="Transcript"
                   nzColumn="5">
-                  <cvc-link-tag tooltip="View on Esembl"
+                  <cvc-link-tag tooltip="View on Ensembl"
                     [href]="'http://www.ensembl.org/Homo_sapiens/transview?transcript=' + coords.representativeTranscript">
                     {{ coords.representativeTranscript }}
                   </cvc-link-tag>
diff --git a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.query.gql b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.query.gql
index e8b91fabd..f7876d963 100644
--- a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.query.gql
+++ b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.query.gql
@@ -35,22 +35,20 @@ fragment VariantSummaryFields on Variant {
   evidenceScore
   referenceBuild
   ensemblVersion
-  fivePrimeCoordinates {
+  primaryCoordinates {
       representativeTranscript
       chromosome
       start
       stop
-      referenceBases
-      variantBases
   }
-  threePrimeCoordinates {
+  secondaryCoordinates {
       representativeTranscript
       chromosome
       start
       stop
-      referenceBases
-      variantBases
   }
+  referenceBases
+  variantBases
   flags(state: OPEN) {
     totalCount
   }
diff --git a/docs/config.yml b/docs/config.yml
index 32f9cb818..16de6680c 100644
--- a/docs/config.yml
+++ b/docs/config.yml
@@ -4,7 +4,7 @@ introspection:
   schemaFile: ./client/src/app/generated/server.model.graphql
 
 info:
-  title: CiVIC 2 API Documentation
+  title: CIViC 2 API Documentation
   description: Documentation for the CIViC GraphQL API
   contact:
     name:  The CIViC Development Team
diff --git a/server/app/graphql/mutations/add_remote_citation.rb b/server/app/graphql/mutations/add_remote_citation.rb
index 291716511..56695d0b8 100644
--- a/server/app/graphql/mutations/add_remote_citation.rb
+++ b/server/app/graphql/mutations/add_remote_citation.rb
@@ -1,6 +1,6 @@
 class Mutations::AddRemoteCitation < Mutations::BaseMutation
   description <<~DOC
-    Add a stub record for an external source that is not yet in CiVIC.
+    Add a stub record for an external source that is not yet in CIViC.
     This is for adding a new Source inline while performing other curation activities
     such as adding new evidence items and is distinct from suggesting a source for curation.
   DOC
diff --git a/server/app/graphql/mutations/reject_revisions.rb b/server/app/graphql/mutations/reject_revisions.rb
index 911e7cf78..75b81e567 100644
--- a/server/app/graphql/mutations/reject_revisions.rb
+++ b/server/app/graphql/mutations/reject_revisions.rb
@@ -39,11 +39,10 @@ def ready?(organization_id: nil, ids: nil, revision_set_id: nil, **_)
       @revisions = Revision.where(revisionset_id: revision_set_id, status: 'new')
       if revisions.count == 0
         raise GraphQL::ExecutionError, "Revisions with status 'new' in revision_set_id #{revision_set_id} don't exist."
-      else
       end
-
-      return true
     end
+
+    return true
   end
 
   def authorized?(organization_id: nil, **_)
diff --git a/server/app/graphql/resolvers/validate_revisions_for_acceptance.rb b/server/app/graphql/resolvers/validate_revisions_for_acceptance.rb
index 0c04ba4bf..57df18533 100644
--- a/server/app/graphql/resolvers/validate_revisions_for_acceptance.rb
+++ b/server/app/graphql/resolvers/validate_revisions_for_acceptance.rb
@@ -69,6 +69,7 @@ def resolve(revision_ids:)
         end
         if !subject.valid?
           subject.errors.each do |attribute, message|
+            attribute = attribute.to_s
             if attribute.ends_with?("_ids")
               formatted_attribute = attribute.singularize.humanize.pluralize
             else
diff --git a/server/app/graphql/types/entities/coordinate_type.rb b/server/app/graphql/types/entities/coordinate_type.rb
index 9ecffccf1..969e3612f 100644
--- a/server/app/graphql/types/entities/coordinate_type.rb
+++ b/server/app/graphql/types/entities/coordinate_type.rb
@@ -4,7 +4,5 @@ class CoordinateType < Types::BaseObject
     field :chromosome, String, null: true
     field :start, Int, null: true
     field :stop, Int, null: true
-    field :reference_bases, String, null: true
-    field :variant_bases, String, null: true
   end
 end
diff --git a/server/app/graphql/types/entities/variant_type.rb b/server/app/graphql/types/entities/variant_type.rb
index fe906a261..3cfe492c5 100644
--- a/server/app/graphql/types/entities/variant_type.rb
+++ b/server/app/graphql/types/entities/variant_type.rb
@@ -16,8 +16,10 @@ class VariantType < Types::BaseObject
     field :sources, [Types::Entities::SourceType], null: false
     field :reference_build, Types::ReferenceBuildType, null: true
     field :ensembl_version, Int, null: true
-    field :five_prime_coordinates, Types::Entities::CoordinateType, null: true
-    field :three_prime_coordinates, Types::Entities::CoordinateType, null: true
+    field :primary_coordinates, Types::Entities::CoordinateType, null: true
+    field :secondary_coordinates, Types::Entities::CoordinateType, null: true
+    field :reference_bases, String, null: false
+    field :variant_bases, String, null: false
     field :allele_registry_id, String, null: true
     field :evidence_score, Float, null: false
     field :variant_aliases, [String], null: false
@@ -35,26 +37,30 @@ def evidence_items
       Loaders::AssociationLoader.for(Variant, :evidence_items).load(object)
     end
 
-    def three_prime_coordinates
-      {
-        representative_transcript: object.representative_transcript,
-        chromosome: object.chromosome,
-        start: object.start,
-        stop: object.stop,
-        reference_bases: object.reference_bases,
-        variant_bases: object.variant_bases
-      }
+    def primary_coordinates
+      if (object.representative_transcript.blank? && object.chromosome.blank? && object.start.blank? && object.stop.blank?)
+        return nil
+      else
+        return {
+          representative_transcript: object.representative_transcript,
+          chromosome: object.chromosome,
+          start: object.start,
+          stop: object.stop,
+        }
+      end
     end
 
-    def five_prime_coordinates
-      {
-        representative_transcript: object.representative_transcript2,
-        chromosome: object.chromosome2,
-        start: object.start2,
-        stop: object.stop2,
-        reference_bases: nil,
-        variant_bases: nil,
-      }
+    def secondary_coordinates
+      if (object.representative_transcript2.blank? && object.chromosome2.blank? && object.start2.blank? && object.stop2.blank?)
+        return nil
+      else
+        return {
+          representative_transcript: object.representative_transcript2,
+          chromosome: object.chromosome2,
+          start: object.start2,
+          stop: object.stop2,
+        }
+      end
     end
 
     def evidence_score