diff --git a/ActivityDefinition/DGTS-ActivityDefinition-Example.json b/ActivityDefinition/DGTS-ActivityDefinition-Example.json
index 373d3ec..e99be91 100644
--- a/ActivityDefinition/DGTS-ActivityDefinition-Example.json
+++ b/ActivityDefinition/DGTS-ActivityDefinition-Example.json
@@ -31,7 +31,7 @@
     "coding": [
       {
         "code": "targeted-variant-analysis",
-        "system": "http://hl7.org/fhir/genomicstudy-methodtype"
+        "system": "http://hl7.org/fhir/uv/genomics-reporting/CodeSystem/genomic-study-method-type-cs"
       }
     ]
   },
diff --git a/CapabilityStatement/CapabilityStatement-DGTS-application.json b/CapabilityStatement/CapabilityStatement-DGTS-application.json
index fcaff16..0a48509 100644
--- a/CapabilityStatement/CapabilityStatement-DGTS-application.json
+++ b/CapabilityStatement/CapabilityStatement-DGTS-application.json
@@ -10,7 +10,7 @@
   "description": "Sample server capability for the Digital Genomic Test Services API",
   "kind": "instance",
   "implementationGuide":  [
-      "https://simplifier.net/guide/fhir-genomics-implementation-guide"
+      "https://fhir.nhs.uk/ImplementationGuide/FHIR-Genomics-Implementation-Guide"
   ],
   "fhirVersion": "4.0.1",
   "format":  [
@@ -99,7 +99,7 @@
           ],
           "operation": [
             {
-              "name": "$data-requirements"
+              "name": "$data-requirements",
               "definition": "http://hl7.org/fhir/OperationDefinition/ActivityDefinition-data-requirements"
             }
           ]
diff --git a/CapabilityStatement/CapabilityStatement-genomics-application.json b/CapabilityStatement/CapabilityStatement-genomics-application.json
index 93c5d51..67e7a09 100644
--- a/CapabilityStatement/CapabilityStatement-genomics-application.json
+++ b/CapabilityStatement/CapabilityStatement-genomics-application.json
@@ -10,8 +10,7 @@
   "description": "Sample server capability for the Genomic Medicine Service",
   "kind": "instance",
   "implementationGuide":  [
-      "https://simplifier.net/guide/fhir-genomics-implementation-guide",
-      "https://simplifier.net/guide/nhsdigital"
+      "https://fhir.nhs.uk/ImplementationGuide/FHIR-Genomics-Implementation-Guide"
   ],
   "fhirVersion": "4.0.1",
   "format":  [
diff --git a/Library/DGTS-Library-Example.json b/Library/DGTS-Library-Example.json
index 4e976b6..8a268b3 100644
--- a/Library/DGTS-Library-Example.json
+++ b/Library/DGTS-Library-Example.json
@@ -1,39 +1,40 @@
 {
-	"resourceType": "Library",
-	"id": "DGTS-Library-Example",
-	"url": "http://fhir.nhs.uk/Library/GT1",
-	"type": {
-		"coding": [
-			{
-				"code": "module-definition"
-			}
-		]
-	},
-	"status": "active",
-	"parameter": [
-		{
-			"name": "additional_panels_available",
-			"use": "in",
-			"max": "0"
-			"type": "Coding"
-		},
-		{
-			"name": "target_disease_required",
-			"use": "in",
-			"max": "0",
-			"type": "Coding"
-		},
-		{
-			"name": "target_gene_required",
-			"use": "in",
-			"max": "0",
-			"type": "Coding"
-		},
-		{
-			"name": "target_variant_required",
-			"use": "in",
-			"max": "0",
-			"type": "Coding"
-		}
-	]
+  "resourceType": "Library",
+  "id": "DGTS-Library-Example",
+  "url": "http://fhir.nhs.uk/Library/GT1",
+  "type": {
+    "coding": [
+      {
+        "system": "http://terminology.hl7.org/CodeSystem/library-type",
+        "code": "module-definition"
+      }
+    ]
+  },
+  "status": "active",
+  "parameter": [
+    {
+      "name": "additional_panels_available",
+      "use": "in",
+      "max": "0",
+      "type": "Coding"
+    },
+    {
+      "name": "target_disease_required",
+      "use": "in",
+      "max": "0",
+      "type": "Coding"
+    },
+    {
+      "name": "target_gene_required",
+      "use": "in",
+      "max": "0",
+      "type": "Coding"
+    },
+    {
+      "name": "target_variant_required",
+      "use": "in",
+      "max": "0",
+      "type": "Coding"
+    }
+  ]
 }
\ No newline at end of file
diff --git a/PlanDefinition/DGTS-PlanDefinition-Example.json b/PlanDefinition/DGTS-PlanDefinition-Example.json
index 8854b9d..a2d0189 100644
--- a/PlanDefinition/DGTS-PlanDefinition-Example.json
+++ b/PlanDefinition/DGTS-PlanDefinition-Example.json
@@ -23,13 +23,13 @@
           {
             "code": "400",
             "system": "https://fhir.hl7.org.uk/CodeSystem/UKCore-PracticeSettingCode",
-						"display": "Neurology"
-						
+            "display": "Neurology"
+            
           }
         ]
       }
     },
-		{
+    {
       "code": {
         "code": "user",
         "system": "http://terminology.hl7.org/CodeSystem/usage-context-type"
@@ -39,13 +39,13 @@
           {
             "code": "420",
             "system": "https://fhir.hl7.org.uk/CodeSystem/UKCore-PracticeSettingCode",
-						"display": "Paediatrics"
-						
+            "display": "Paediatrics"
+            
           }
         ]
       }
     },
-		{
+    {
       "code": {
         "code": "user",
         "system": "http://terminology.hl7.org/CodeSystem/usage-context-type"
@@ -55,26 +55,26 @@
           {
             "code": "311",
             "system": "https://fhir.hl7.org.uk/CodeSystem/UKCore-PracticeSettingCode",
-						"display": "Clinical Genetics"
-						
+            "display": "Clinical Genetics"
+            
           }
         ]
       }
     },
-		{
-			"code": {
-				"code": "focus",
-				"system": "http://terminology.hl7.org/CodeSystem/usage-context-type"
-			},
-			"valueCodeableConcept": {
-				"coding": [
-					{
-						"code": "diagnostic",
-						"system": "https://fhir.nhs.uk/CodeSystem/reasonfortesting-genomics"
-					}
-				]
-			}
-		}
+    {
+      "code": {
+        "code": "focus",
+        "system": "http://terminology.hl7.org/CodeSystem/usage-context-type"
+      },
+      "valueCodeableConcept": {
+        "coding": [
+          {
+            "code": "diagnostic",
+            "system": "https://fhir.nhs.uk/CodeSystem/reasonfortesting-genomics"
+          }
+        ]
+      }
+    }
   ],
   "goal": [
     {
@@ -93,25 +93,25 @@
     {
       "definitionCanonical": "http://fhir.nhs.uk/ActivityDefinition/GT1"
     },
-		{
+    {
       "definitionCanonical": "http://fhir.nhs.uk/ActivityDefinition/GT36"
     },
-		{
+    {
       "definitionCanonical": "http://fhir.nhs.uk/ActivityDefinition/GT103"
     },
-		{
+    {
       "definitionCanonical": "http://fhir.nhs.uk/ActivityDefinition/GT417"
     },
-		{
+    {
       "definitionCanonical": "http://fhir.nhs.uk/ActivityDefinition/GT732"
     },
-		{
+    {
       "definitionCanonical": "http://fhir.nhs.uk/ActivityDefinition/GT858"
     },
-		{
+    {
       "definitionCanonical": "http://fhir.nhs.uk/ActivityDefinition/GT897"
     },
-		{
+    {
       "definitionCanonical": "http://fhir.nhs.uk/ActivityDefinition/GT1124"
     }
   ]
diff --git a/SpecimenDefinition/DGTS-SpecimenDefinition-Example.json b/SpecimenDefinition/DGTS-SpecimenDefinition-Example.json
index 9548c0e..ce69893 100644
--- a/SpecimenDefinition/DGTS-SpecimenDefinition-Example.json
+++ b/SpecimenDefinition/DGTS-SpecimenDefinition-Example.json
@@ -1,39 +1,41 @@
 {
-	"resourceType": "SpecimenDefinition",
-	"id": "DGTS-SpecimenDefinition-Example",
-	"typeCollected": {
-		"coding": [
-			{
-				"code": "germline",
-				"system": "https://fhir.hl7.org.uk/CodeSystem/UKCore-SampleCategory"
-			}
-		]
-	},
-	"typeTested": [
-		{
-			"type": {
-				"coding": [
-					{
-						"code": "119297000",
-						"system": "http://snomed.info/sct",
-						"display": "Blood specimen"
-					}
-				]
-			},
-			"preference": "preferred",
-			"container": {
-				"additive": [
-					{
-						"additiveCodeableConcept" [
-							{
-								"system": "http://terminology.hl7.org/CodeSystem/v2-0371",
-								"code": "EDTK15",
-								"display": "Potassium/K EDTA 15%"
-							}
-						]
-					}
-				]
-			}
-		}
-	]
+  "resourceType": "SpecimenDefinition",
+  "id": "DGTS-SpecimenDefinition-Example",
+  "typeCollected": {
+    "coding": [
+      {
+        "code": "germline",
+        "system": "https://fhir.hl7.org.uk/CodeSystem/UKCore-SampleCategory"
+      }
+    ]
+  },
+  "typeTested": [
+    {
+      "type": {
+        "coding": [
+          {
+            "code": "119297000",
+            "system": "http://snomed.info/sct",
+            "display": "Blood specimen"
+          }
+        ]
+      },
+      "preference": "preferred",
+      "container": {
+        "additive": [
+          {
+            "additiveCodeableConcept": {
+              "coding": [
+                {
+                  "system": "http://terminology.hl7.org/CodeSystem/v2-0371",
+                  "code": "EDTK15",
+                  "display": "Potassium/K EDTA 15%"
+                }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  ]
 }
\ No newline at end of file