diff --git a/docs/openapi.json b/docs/openapi.json
index 3dabdd1ef..c7efdaf95 100644
--- a/docs/openapi.json
+++ b/docs/openapi.json
@@ -82,7 +82,7 @@
               "description": "Worker query information"
             },
             "required": true,
-            "name": "X-AC-Query",
+            "name": "X-RivetKit-Query",
             "in": "header"
           }
         ],
@@ -134,7 +134,7 @@
               "example": "json"
             },
             "required": true,
-            "name": "X-AC-Encoding",
+            "name": "X-RivetKit-Encoding",
             "in": "header"
           },
           {
@@ -143,7 +143,7 @@
               "description": "Worker query information"
             },
             "required": true,
-            "name": "X-AC-Query",
+            "name": "X-RivetKit-Query",
             "in": "header"
           },
           {
@@ -152,7 +152,7 @@
               "description": "Connection parameters"
             },
             "required": false,
-            "name": "X-AC-Conn-Params",
+            "name": "X-RivetKit-Conn-Params",
             "in": "header"
           }
         ],
@@ -189,7 +189,7 @@
               "example": "json"
             },
             "required": true,
-            "name": "X-AC-Encoding",
+            "name": "X-RivetKit-Encoding",
             "in": "header"
           },
           {
@@ -198,7 +198,7 @@
               "description": "Connection parameters"
             },
             "required": false,
-            "name": "X-AC-Conn-Params",
+            "name": "X-RivetKit-Conn-Params",
             "in": "header"
           }
         ],
@@ -241,7 +241,7 @@
               "example": "worker-123456"
             },
             "required": true,
-            "name": "X-AC-Worker",
+            "name": "X-RivetKit-Worker",
             "in": "header"
           },
           {
@@ -251,7 +251,7 @@
               "example": "conn-123456"
             },
             "required": true,
-            "name": "X-AC-Conn",
+            "name": "X-RivetKit-Conn",
             "in": "header"
           },
           {
@@ -261,7 +261,7 @@
               "example": "json"
             },
             "required": true,
-            "name": "X-AC-Encoding",
+            "name": "X-RivetKit-Encoding",
             "in": "header"
           },
           {
@@ -270,7 +270,7 @@
               "description": "Connection token"
             },
             "required": true,
-            "name": "X-AC-Conn-Token",
+            "name": "X-RivetKit-Conn-Token",
             "in": "header"
           }
         ],
diff --git a/packages/core/src/worker/router-endpoints.ts b/packages/core/src/worker/router-endpoints.ts
index c0e38a2d2..e0c1b7874 100644
--- a/packages/core/src/worker/router-endpoints.ts
+++ b/packages/core/src/worker/router-endpoints.ts
@@ -444,24 +444,24 @@ export function getRequestQuery(c: HonoContext): unknown {
 	}
 }
 
-export const HEADER_WORKER_QUERY = "X-AC-Query";
+export const HEADER_WORKER_QUERY = "X-RivetKit-Query";
 
-export const HEADER_ENCODING = "X-AC-Encoding";
+export const HEADER_ENCODING = "X-RivetKit-Encoding";
 
 // Internal header
-export const HEADER_EXPOSE_INTERNAL_ERROR = "X-AC-Expose-Internal-Error";
+export const HEADER_EXPOSE_INTERNAL_ERROR = "X-RivetKit-Expose-Internal-Error";
 
 // IMPORTANT: Params must be in headers or in an E2EE part of the request (i.e. NOT the URL or query string) in order to ensure that tokens can be securely passed in params.
-export const HEADER_CONN_PARAMS = "X-AC-Conn-Params";
+export const HEADER_CONN_PARAMS = "X-RivetKit-Conn-Params";
 
 // Internal header
-export const HEADER_AUTH_DATA = "X-AC-Auth-Data";
+export const HEADER_AUTH_DATA = "X-RivetKit-Auth-Data";
 
-export const HEADER_WORKER_ID = "X-AC-Worker";
+export const HEADER_WORKER_ID = "X-RivetKit-Worker";
 
-export const HEADER_CONN_ID = "X-AC-Conn";
+export const HEADER_CONN_ID = "X-RivetKit-Conn";
 
-export const HEADER_CONN_TOKEN = "X-AC-Conn-Token";
+export const HEADER_CONN_TOKEN = "X-RivetKit-Conn-Token";
 
 /**
  * Headers that publics can send from public clients.