diff --git a/input/fsh/examples/IPS-4.fsh b/input/fsh/examples/IPS-4.fsh
index 92cde79a..018a33fb 100644
--- a/input/fsh/examples/IPS-4.fsh
+++ b/input/fsh/examples/IPS-4.fsh
@@ -53,8 +53,8 @@ Description: "Example of International Patient Summary for Gravitate"
 * entry[=].resource = bh
 
 
-* entry[+].fullUrl = "https://myserver.org/Observation/bp" // BP (Observation)
-* entry[=].resource = bp
+* entry[+].fullUrl = "https://myserver.org/Observation/ips4-bp" // BP (Observation)
+* entry[=].resource = ips4-bp
 
 * entry[+].fullUrl = "https://myserver.org/Observation/glucose" // Glucose (Observation)
 * entry[=].resource = glucose
@@ -101,7 +101,7 @@ Usage: #inline
 * section[=].code = $loinc#8716-3 "Vital Signs"
 * section[=].entry[+] = Reference(bw) "Body weight"
 * section[=].entry[+] = Reference(bh) "Body height"
-* section[=].entry[+] = Reference(bp) "Blood pressure"
+* section[=].entry[+] = Reference(ips4-bp) "Blood pressure"
 
 
 // ======== Results
@@ -343,7 +343,7 @@ Usage: #inline
 
 * valueQuantity = 170 'cm'
 
-Instance: bp
+Instance: ips4-bp
 InstanceOf: Observation
 Usage: #inline
 
diff --git a/input/fsh/examples/himss.fsh b/input/fsh/examples/himss.fsh
index 9f55d984..d170aef5 100644
--- a/input/fsh/examples/himss.fsh
+++ b/input/fsh/examples/himss.fsh
@@ -39,6 +39,8 @@ Will the baby born in the journey? - Stay until the end
 
 */
 
+//      "diagnostic": "HAPI-1094: Resource Observation/alicia-observation-16 not found, specified in path: Composition.section.entry"
+//      "diagnostic": "HAPI-1094: Resource Observation/bp not found, specified in path: Composition.section.entry"
 
 
 * identifier.system = "https://www.gravitatehealth.eu/sid/doc"
@@ -86,18 +88,25 @@ Will the baby born in the journey? - Stay until the end
 
 * entry[+].fullUrl = "https://myserver.org/Observation/alicia-observation-1"
 * entry[=].resource = alicia-observation-1
+
 * entry[+].fullUrl = "https://myserver.org/Observation/alicia-observation-11"
 * entry[=].resource = alicia-observation-11
+
 * entry[+].fullUrl = "https://myserver.org/Observation/alicia-observation-12"
 * entry[=].resource = alicia-observation-12
+
 * entry[+].fullUrl = "https://myserver.org/Observation/alicia-observation-13"
 * entry[=].resource = alicia-observation-13
+
 * entry[+].fullUrl = "https://myserver.org/Observation/alicia-observation-14"
 * entry[=].resource = alicia-observation-14
+
 * entry[+].fullUrl = "https://myserver.org/Observation/alicia-observation-15"
 * entry[=].resource = alicia-observation-15
+
 * entry[+].fullUrl = "https://myserver.org/Observation/alicia-observation-16"
 * entry[=].resource = alicia-observation-16
+
 * entry[+].fullUrl = "https://myserver.org/Observation/alicia-observation-17"
 * entry[=].resource = alicia-observation-17
 * entry[+].fullUrl = "https://myserver.org/Observation/alicia-observation-18"