diff --git a/src/templates/StagingTemplate.js b/src/templates/StagingTemplate.js
index 152dc73e..11b85b45 100644
--- a/src/templates/StagingTemplate.js
+++ b/src/templates/StagingTemplate.js
@@ -6,7 +6,6 @@ function getTypeSpecificData(type) {
     return {
       categoryCode: 'survey',
       code: '21908-9',
-      profileUrl: 'http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-clinical-stage-group',
     };
   }
 
@@ -14,7 +13,6 @@ function getTypeSpecificData(type) {
     return {
       categoryCode: 'laboratory',
       code: '21902-2',
-      profileUrl: 'http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-pathological-stage-group',
     };
   }
 
@@ -46,13 +44,13 @@ function stagingTemplate({
   }
 
   const typeSpecificData = getTypeSpecificData(type);
-  const { categoryCode, code, profileUrl } = typeSpecificData;
+  const { categoryCode, code } = typeSpecificData;
 
   return {
     resourceType: 'Observation',
     id,
     meta: {
-      profile: [profileUrl],
+      profile: ['http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-cancer-stage-group'],
     },
     status: 'final',
     category: [
diff --git a/src/templates/TNMCategoryTemplate.js b/src/templates/TNMCategoryTemplate.js
index c8ccf438..92cc1b05 100644
--- a/src/templates/TNMCategoryTemplate.js
+++ b/src/templates/TNMCategoryTemplate.js
@@ -7,21 +7,21 @@ function getCategorySpecificData(stageType, categoryType) {
     if (categoryType === 'Tumor') {
       return {
         categoryCode,
-        profileUrl: 'http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-clinical-primary-tumor-category',
+        profileUrl: 'http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-primary-tumor-category',
         code: '21905-5',
       };
     }
     if (categoryType === 'Metastases') {
       return {
         categoryCode,
-        profileUrl: 'http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-clinical-distant-metastases-category',
+        profileUrl: 'http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-distant-metastases-category',
         code: '21907-1',
       };
     }
     if (categoryType === 'Nodes') {
       return {
         categoryCode,
-        profileUrl: 'http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-clinical-regional-nodes-category',
+        profileUrl: 'http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-regional-nodes-category',
         code: '21906-3',
       };
     }
@@ -30,21 +30,21 @@ function getCategorySpecificData(stageType, categoryType) {
     if (categoryType === 'Tumor') {
       return {
         categoryCode,
-        profileUrl: 'http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-pathological-primary-tumor-category',
+        profileUrl: 'http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-primary-tumor-category',
         code: '21899-0',
       };
     }
     if (categoryType === 'Metastases') {
       return {
         categoryCode,
-        profileUrl: 'http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-pathological-distant-metastases-category',
+        profileUrl: 'http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-distant-metastases-category',
         code: '21901-4',
       };
     }
     if (categoryType === 'Nodes') {
       return {
         categoryCode,
-        profileUrl: 'http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-pathological-regional-nodes-category',
+        profileUrl: 'http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-regional-nodes-category',
         code: '21900-6',
       };
     }
diff --git a/test/extractors/fixtures/csv-staging-bundle.json b/test/extractors/fixtures/csv-staging-bundle.json
index 26328b3b..23c63898 100644
--- a/test/extractors/fixtures/csv-staging-bundle.json
+++ b/test/extractors/fixtures/csv-staging-bundle.json
@@ -9,7 +9,7 @@
         "id": "626b61fd700d8ddc5a6a576a2e47944191b5f608e03083d00c49614f0158bb65",
         "meta": {
           "profile": [
-            "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-clinical-primary-tumor-category"
+            "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-primary-tumor-category"
           ]
         },
         "status": "final",
@@ -67,7 +67,7 @@
         "id": "66e0e5f216bebeba287c3a3b0e220170bab88da95030e0c4bdba32f66628d00c",
         "meta": {
           "profile": [
-            "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-clinical-distant-metastases-category"
+            "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-distant-metastases-category"
           ]
         },
         "status": "final",
@@ -125,7 +125,7 @@
         "id": "4469acab85a889d722f5b8b1cb786df8adbfc5f0b50ac23393ec42b8ecfd49e9",
         "meta": {
           "profile": [
-            "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-clinical-regional-nodes-category"
+            "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-regional-nodes-category"
           ]
         },
         "status": "final",
@@ -183,7 +183,7 @@
         "id": "8fca0c2922335ea3c92022b4b2d4de17ba0645ce72d884b1e1c71a757c300a10",
         "meta": {
           "profile": [
-            "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-clinical-stage-group"
+            "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-cancer-stage-group"
           ]
         },
         "status": "final",
diff --git a/test/templates/fixtures/maximal-staging-resource.json b/test/templates/fixtures/maximal-staging-resource.json
index 41f93016..4722b467 100644
--- a/test/templates/fixtures/maximal-staging-resource.json
+++ b/test/templates/fixtures/maximal-staging-resource.json
@@ -3,7 +3,7 @@
   "id": "example-id",
   "meta": {
     "profile": [
-      "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-clinical-stage-group"
+      "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-cancer-stage-group"
     ]
   },
   "method": {
diff --git a/test/templates/fixtures/metastases-category-clinical-resource.json b/test/templates/fixtures/metastases-category-clinical-resource.json
index 3aa4f00b..143ffc0b 100644
--- a/test/templates/fixtures/metastases-category-clinical-resource.json
+++ b/test/templates/fixtures/metastases-category-clinical-resource.json
@@ -3,7 +3,7 @@
   "id": "example-id",
   "meta": {
     "profile": [
-      "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-clinical-distant-metastases-category"
+      "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-distant-metastases-category"
     ]
   },
   "status": "final",
diff --git a/test/templates/fixtures/metastases-category-pathologic-resource.json b/test/templates/fixtures/metastases-category-pathologic-resource.json
index a288c4b0..bf3e03b2 100644
--- a/test/templates/fixtures/metastases-category-pathologic-resource.json
+++ b/test/templates/fixtures/metastases-category-pathologic-resource.json
@@ -3,7 +3,7 @@
   "id": "example-id",
   "meta": {
     "profile": [
-      "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-pathological-distant-metastases-category"
+      "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-distant-metastases-category"
     ]
   },
   "status": "final",
diff --git a/test/templates/fixtures/minimal-staging-clinical-resource.json b/test/templates/fixtures/minimal-staging-clinical-resource.json
index 34c7885a..b88fecec 100644
--- a/test/templates/fixtures/minimal-staging-clinical-resource.json
+++ b/test/templates/fixtures/minimal-staging-clinical-resource.json
@@ -3,7 +3,7 @@
   "id": "example-id",
   "meta": {
     "profile": [
-      "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-clinical-stage-group"
+      "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-cancer-stage-group"
     ]
   },
   "status": "final",
diff --git a/test/templates/fixtures/minimal-staging-pathologic-resource.json b/test/templates/fixtures/minimal-staging-pathologic-resource.json
index 0581ad8a..a2f2aa26 100644
--- a/test/templates/fixtures/minimal-staging-pathologic-resource.json
+++ b/test/templates/fixtures/minimal-staging-pathologic-resource.json
@@ -3,7 +3,7 @@
   "id": "example-id",
   "meta": {
     "profile": [
-      "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-pathological-stage-group"
+      "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-cancer-stage-group"
     ]
   },
   "status": "final",
diff --git a/test/templates/fixtures/nodes-category-clinical-resource.json b/test/templates/fixtures/nodes-category-clinical-resource.json
index 97ced5f2..c458b94a 100644
--- a/test/templates/fixtures/nodes-category-clinical-resource.json
+++ b/test/templates/fixtures/nodes-category-clinical-resource.json
@@ -3,7 +3,7 @@
   "id": "example-id",
   "meta": {
     "profile": [
-      "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-clinical-regional-nodes-category"
+      "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-regional-nodes-category"
     ]
   },
   "status": "final",
diff --git a/test/templates/fixtures/nodes-category-pathologic-resource.json b/test/templates/fixtures/nodes-category-pathologic-resource.json
index df8f298b..2524e22f 100644
--- a/test/templates/fixtures/nodes-category-pathologic-resource.json
+++ b/test/templates/fixtures/nodes-category-pathologic-resource.json
@@ -3,7 +3,7 @@
   "id": "example-id",
   "meta": {
     "profile": [
-      "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-pathological-regional-nodes-category"
+      "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-regional-nodes-category"
     ]
   },
   "status": "final",
diff --git a/test/templates/fixtures/tumor-category-clinical-resource.json b/test/templates/fixtures/tumor-category-clinical-resource.json
index c061edab..3ea5995c 100644
--- a/test/templates/fixtures/tumor-category-clinical-resource.json
+++ b/test/templates/fixtures/tumor-category-clinical-resource.json
@@ -3,7 +3,7 @@
   "id": "example-id",
   "meta": {
     "profile": [
-      "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-clinical-primary-tumor-category"
+      "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-primary-tumor-category"
     ]
   },
   "status": "final",
diff --git a/test/templates/fixtures/tumor-category-pathologic-resource.json b/test/templates/fixtures/tumor-category-pathologic-resource.json
index 8dd132de..7f7b6931 100644
--- a/test/templates/fixtures/tumor-category-pathologic-resource.json
+++ b/test/templates/fixtures/tumor-category-pathologic-resource.json
@@ -3,7 +3,7 @@
   "id": "example-id",
   "meta": {
     "profile": [
-      "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-pathological-primary-tumor-category"
+      "http://hl7.org/fhir/us/mcode/StructureDefinition/mcode-tnm-primary-tumor-category"
     ]
   },
   "status": "final",