diff --git a/models/json/beacon-v2-default-model/beaconMap.json b/models/json/beacon-v2-default-model/beaconMap.json
index 4c9a12a7..8aef1236 100644
--- a/models/json/beacon-v2-default-model/beaconMap.json
+++ b/models/json/beacon-v2-default-model/beaconMap.json
@@ -35,7 +35,7 @@
         },
         "cohort": {
             "endpoints": {
-                "analyses": {
+                "analysis": {
                     "returnedEntryType": "analysis",
                     "url": "https://exampleBeacons.org/cohorts/{id}/analyses"
                 },
@@ -51,7 +51,7 @@
                     "returnedEntryType": "individual",
                     "url": "https://exampleBeacons.org/cohorts/{id}/individuals"
                 },
-                "runs": {
+                "run": {
                     "returnedEntryType": "run",
                     "url": "https://exampleBeacons.org/cohorts/{id}/runs"
                 }
@@ -64,7 +64,7 @@
         },
         "dataset": {
             "endpoints": {
-                "analyses": {
+                "analysis": {
                     "returnedEntryType": "analysis",
                     "url": "https://exampleBeacons.org/datasets/{id}/analyses"
                 },
@@ -80,7 +80,7 @@
                     "returnedEntryType": "individual",
                     "url": "https://exampleBeacons.org/datasets/{id}/individuals"
                 },
-                "runs": {
+                "run": {
                     "returnedEntryType": "run",
                     "url": "https://exampleBeacons.org/datasets/{id}/runs"
                 }
@@ -93,7 +93,7 @@
         },
         "genomicVariant": {
             "endpoints": {
-                "analyses": {
+                "analysis": {
                     "returnedEntryType": "analysis",
                     "url": "https://exampleBeacons.org/g_variants/{id}/analyses"
                 },
@@ -105,7 +105,7 @@
                     "returnedEntryType": "individual",
                     "url": "https://exampleBeacons.org/g_variants/{id}/individuals"
                 },
-                "runs": {
+                "run": {
                     "returnedEntryType": "run",
                     "url": "https://exampleBeacons.org/g_variants/{id}/runs"
                 }
@@ -117,7 +117,7 @@
         },
         "individual": {
             "endpoints": {
-                "analyses": {
+                "analysis": {
                     "returnedEntryType": "analysis",
                     "url": "https://exampleBeacons.org/individuals/{id}/analyses"
                 },
@@ -129,7 +129,7 @@
                     "returnedEntryType": "genomicVariant",
                     "url": "https://exampleBeacons.org/individuals/{id}/g_variants"
                 },
-                "runs": {
+                "run": {
                     "returnedEntryType": "run",
                     "url": "https://exampleBeacons.org/individuals/{id}/runs"
                 }
diff --git a/models/src/beacon-v2-default-model/beaconMap.yaml b/models/src/beacon-v2-default-model/beaconMap.yaml
index 3da0cd2a..c920f798 100644
--- a/models/src/beacon-v2-default-model/beaconMap.yaml
+++ b/models/src/beacon-v2-default-model/beaconMap.yaml
@@ -16,10 +16,10 @@ endpointSets:
       individual:
         returnedEntryType: individual
         url: https://exampleBeacons.org/datasets/{id}/individuals
-      runs:
+      run:
         returnedEntryType: run
         url: https://exampleBeacons.org/datasets/{id}/runs
-      analyses:
+      analysis:
         returnedEntryType: analysis
         url: https://exampleBeacons.org/datasets/{id}/analyses
   cohort:
@@ -38,10 +38,10 @@ endpointSets:
       biosample:
         returnedEntryType: biosample
         url: https://exampleBeacons.org/cohorts/{id}/biosamples
-      runs:
+      run:
         returnedEntryType: run
         url: https://exampleBeacons.org/cohorts/{id}/runs
-      analyses:
+      analysis:
         returnedEntryType: analysis
         url: https://exampleBeacons.org/cohorts/{id}/analyses
   genomicVariant:
@@ -56,10 +56,10 @@ endpointSets:
       individual:
         returnedEntryType: individual
         url: https://exampleBeacons.org/g_variants/{id}/individuals
-      runs:
+      run:
         returnedEntryType: run
         url: https://exampleBeacons.org/g_variants/{id}/runs
-      analyses:
+      analysis:
         returnedEntryType: analysis
         url: https://exampleBeacons.org/g_variants/{id}/analyses
   individual:
@@ -75,10 +75,10 @@ endpointSets:
       biosample:
         returnedEntryType: biosample
         url: https://exampleBeacons.org/individuals/{id}/biosamples
-      runs:
+      run:
         returnedEntryType: run
         url: https://exampleBeacons.org/individuals/{id}/runs
-      analyses:
+      analysis:
         returnedEntryType: analysis
         url: https://exampleBeacons.org/individuals/{id}/analyses
   biosample: