diff --git a/.gencode_hash.txt b/.gencode_hash.txt
index 205c6b6b38..0451c797cd 100644
--- a/.gencode_hash.txt
+++ b/.gencode_hash.txt
@@ -1,4 +1,4 @@
-6e1a32e071eb2df1fa40908767277bd648a821772dfeb57c58d905e10323d238  gencode/docs/config.html
+bf79c2371745ef800d3434c9dd4155a9a4f10a3c5dd1b07246cbb0c641fd06bb  gencode/docs/config.html
 90679d3d866579501e7aa00b515af05d42fc9fe399eafacaacf297d1e4a22884  gencode/docs/envelope.html
 9362682fa830ce9d98b3c074cab05ba44fae96a82de316a3520df3956e9325dc  gencode/docs/event_discovery.html
 8133e380e40f27c56accbffc665b2eeb56ec84a4da3b52ba7aa5e439c9c40572  gencode/docs/event_pointset.html
@@ -14,7 +14,7 @@ d39d7fe37a41c74a40080af7b0a429d201ab1fdff7444428c4b98eb7b38c332b  gencode/java/u
 0825a5cec83003bb0a6488c4ed7010a04ae0d3848ef36fe01bb4e6718ba7b96d  gencode/java/udmi/schema/Aux.java
 d326a550d75ab7f558f165f1a5e8c24eee2b0b52290a7472f529bb1e15d79fb2  gencode/java/udmi/schema/BlobBlobsetConfig.java
 2c03651cb2ecda072b1418222eebb5560185669f8ffdd03021ad5ad8ff7ba3b0  gencode/java/udmi/schema/BlobBlobsetState.java
-3fccb6bc6714fdc3dd912c8b1155e7ce19b0ac8a7ec48a01be9eb27bdd034a75  gencode/java/udmi/schema/BlobsetConfig.java
+b9f903444ab08907e41eb123286434ff3207b1edd01397af3ddefb8475bbdadc  gencode/java/udmi/schema/BlobsetConfig.java
 fcbed49f1af8b791d8c52bcbe18f65521a79d9ac3eb33ec3afd9b342ab2bfc56  gencode/java/udmi/schema/BlobsetState.java
 0c908ea34ee54aa66f9ce472ad23ecaec3c091f2afbba7b509e1515b5557f82c  gencode/java/udmi/schema/Category.java
 d6875f63ce67d1b945a0b75a4a660bd083cc52492371a7350c4109f6bf54968b  gencode/java/udmi/schema/CloudIotConfig.java
diff --git a/bin/test_redirect b/bin/test_redirect
index e6e91e50ae..510682ff70 100755
--- a/bin/test_redirect
+++ b/bin/test_redirect
@@ -59,7 +59,7 @@ cat <<EOF > out/blobs.json
 {
   "blobset": {
     "blobs": {
-      "_iot_config": {
+      "_iot_endpoint_config": {
         "phase": "final",
         "base64": "$base64"
       }
diff --git a/gencode/docs/config.html b/gencode/docs/config.html
index 4d2a38bb50..c545725790 100644
--- a/gencode/docs/config.html
+++ b/gencode/docs/config.html
@@ -1320,7 +1320,7 @@ <h2 class="mb-0">
 
     <div class="enum-value" id="blobset_blobsets_enum">
                 <h4>Must be one of:</h4>
-                <ul class="list-group"><li class="list-group-item enum-item">"_iot_config"</li></ul>
+                <ul class="list-group"><li class="list-group-item enum-item">"_iot_endpoint_config"</li></ul>
                 </div>
             
 
diff --git a/gencode/java/udmi/schema/BlobsetConfig.java b/gencode/java/udmi/schema/BlobsetConfig.java
index 407ffbcde8..47ce485561 100644
--- a/gencode/java/udmi/schema/BlobsetConfig.java
+++ b/gencode/java/udmi/schema/BlobsetConfig.java
@@ -68,7 +68,7 @@ public boolean equals(Object other) {
     @Generated("jsonschema2pojo")
     public enum SystemBlobsets {
 
-        IOT_CONFIG("_iot_config");
+        IOT_ENDPOINT_CONFIG("_iot_endpoint_config");
         private final java.lang.String value;
         private final static Map<java.lang.String, BlobsetConfig.SystemBlobsets> CONSTANTS = new HashMap<java.lang.String, BlobsetConfig.SystemBlobsets>();
 
diff --git a/pubber/src/main/java/daq/pubber/Pubber.java b/pubber/src/main/java/daq/pubber/Pubber.java
index e06ba86e26..4b1be26723 100644
--- a/pubber/src/main/java/daq/pubber/Pubber.java
+++ b/pubber/src/main/java/daq/pubber/Pubber.java
@@ -725,7 +725,7 @@ private void processConfigUpdate(Config config) {
 
   private EndpointConfiguration extractEndpointBlobConfig() {
     try {
-      String iotConfig = extractConfigBlob(SystemBlobsets.IOT_CONFIG.value());
+      String iotConfig = extractConfigBlob(SystemBlobsets.IOT_ENDPOINT_CONFIG.value());
       if (iotConfig == null) {
         return null;
       }
diff --git a/schema/common.json b/schema/common.json
index 98909ceefd..9406e7cbe4 100644
--- a/schema/common.json
+++ b/schema/common.json
@@ -15,7 +15,7 @@
       "title": "System Blobsets",
       "description": "Predefined system blobsets",
       "enum": [
-        "_iot_config"
+        "_iot_endpoint_config"
       ]
     },
     "entry": {
diff --git a/tests/config.tests/blobset_final.json b/tests/config.tests/blobset_final.json
index 4d164ad8f5..7b7b0cd7c9 100644
--- a/tests/config.tests/blobset_final.json
+++ b/tests/config.tests/blobset_final.json
@@ -12,7 +12,7 @@
         "url": "https://manuf.com/path/file.zip",
         "sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
       },
-      "_endpoint_redirect": {
+      "_iot_endpoint_config": {
         "phase": "final",
         "content_type": "application/json",
         "base64": "e30="
diff --git a/tests/state.tests/blobset_received.json b/tests/state.tests/blobset_received.json
index 78cd420999..0f477aec19 100644
--- a/tests/state.tests/blobset_received.json
+++ b/tests/state.tests/blobset_received.json
@@ -31,9 +31,9 @@
           "level": 100 
         }
       },
-      "_endpoint_redirect": {
+      "_iot_endpoint_config": {
         "status": {
-          "message": "Received endpoint redirect",
+          "message": "Received endpoint config",
           "category": "blobset.blob.received",
           "timestamp": "2022-07-13T12:00:08.000Z",
           "level": 100