diff --git a/disperser/dataapi/docs/docs.go b/disperser/dataapi/docs/docs.go
index a0aec734c2..3dde847b7b 100644
--- a/disperser/dataapi/docs/docs.go
+++ b/disperser/dataapi/docs/docs.go
@@ -163,7 +163,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/metrics/non_signers": {
+        "/metrics/non-signers": {
             "get": {
                 "produces": [
                     "application/json"
@@ -211,7 +211,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/metrics/operator_nonsigning_percentage": {
+        "/metrics/operator-nonsigning-percentage": {
             "get": {
                 "produces": [
                     "application/json"
@@ -349,31 +349,6 @@ const docTemplate = `{
         }
     },
     "definitions": {
-        "encoding.BlobCommitments": {
-            "type": "object",
-            "properties": {
-                "commitment": {
-                    "$ref": "#/definitions/core.Commitment"
-                },
-                "length": {
-                    "type": "integer"
-                },
-                "length_proof": {
-                    "$ref": "#/definitions/core.Commitment"
-                }
-            }
-        },
-        "core.Commitment": {
-            "type": "object",
-            "properties": {
-                "x": {
-                    "type": "array",
-                    "items": {
-                        "type": "integer"
-                    }
-                }
-            }
-        },
         "core.SecurityParam": {
             "type": "object",
             "properties": {
@@ -575,6 +550,50 @@ const docTemplate = `{
                 }
             }
         },
+        "encoding.BlobCommitments": {
+            "type": "object",
+            "properties": {
+                "commitment": {
+                    "$ref": "#/definitions/encoding.G1Commitment"
+                },
+                "length": {
+                    "type": "integer"
+                },
+                "length_commitment": {
+                    "$ref": "#/definitions/encoding.G2Commitment"
+                },
+                "length_proof": {
+                    "$ref": "#/definitions/encoding.LengthProof"
+                }
+            }
+        },
+        "encoding.G1Commitment": {
+            "type": "object",
+            "properties": {
+                "x": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            }
+        },
+        "encoding.G2Commitment": {
+            "type": "object",
+            "properties": {
+                "x": {
+                    "$ref": "#/definitions/github_com_consensys_gnark-crypto_ecc_bn254_internal_fptower.E2"
+                }
+            }
+        },
+        "encoding.LengthProof": {
+            "type": "object",
+            "properties": {
+                "x": {
+                    "$ref": "#/definitions/github_com_consensys_gnark-crypto_ecc_bn254_internal_fptower.E2"
+                }
+            }
+        },
         "github_com_Layr-Labs_eigenda_disperser.BlobStatus": {
             "type": "integer",
             "enum": [
@@ -591,6 +610,17 @@ const docTemplate = `{
                 "Finalized",
                 "InsufficientSignatures"
             ]
+        },
+        "github_com_consensys_gnark-crypto_ecc_bn254_internal_fptower.E2": {
+            "type": "object",
+            "properties": {
+                "a0": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            }
         }
     }
 }`
diff --git a/disperser/dataapi/docs/swagger.json b/disperser/dataapi/docs/swagger.json
index 2c357b1d0a..6f04acba91 100644
--- a/disperser/dataapi/docs/swagger.json
+++ b/disperser/dataapi/docs/swagger.json
@@ -159,7 +159,7 @@
                 }
             }
         },
-        "/metrics/non_signers": {
+        "/metrics/non-signers": {
             "get": {
                 "produces": [
                     "application/json"
@@ -207,7 +207,7 @@
                 }
             }
         },
-        "/metrics/operator_nonsigning_percentage": {
+        "/metrics/operator-nonsigning-percentage": {
             "get": {
                 "produces": [
                     "application/json"
@@ -345,31 +345,6 @@
         }
     },
     "definitions": {
-        "encoding.BlobCommitments": {
-            "type": "object",
-            "properties": {
-                "commitment": {
-                    "$ref": "#/definitions/core.Commitment"
-                },
-                "length": {
-                    "type": "integer"
-                },
-                "length_proof": {
-                    "$ref": "#/definitions/core.Commitment"
-                }
-            }
-        },
-        "core.Commitment": {
-            "type": "object",
-            "properties": {
-                "x": {
-                    "type": "array",
-                    "items": {
-                        "type": "integer"
-                    }
-                }
-            }
-        },
         "core.SecurityParam": {
             "type": "object",
             "properties": {
@@ -571,6 +546,50 @@
                 }
             }
         },
+        "encoding.BlobCommitments": {
+            "type": "object",
+            "properties": {
+                "commitment": {
+                    "$ref": "#/definitions/encoding.G1Commitment"
+                },
+                "length": {
+                    "type": "integer"
+                },
+                "length_commitment": {
+                    "$ref": "#/definitions/encoding.G2Commitment"
+                },
+                "length_proof": {
+                    "$ref": "#/definitions/encoding.LengthProof"
+                }
+            }
+        },
+        "encoding.G1Commitment": {
+            "type": "object",
+            "properties": {
+                "x": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            }
+        },
+        "encoding.G2Commitment": {
+            "type": "object",
+            "properties": {
+                "x": {
+                    "$ref": "#/definitions/github_com_consensys_gnark-crypto_ecc_bn254_internal_fptower.E2"
+                }
+            }
+        },
+        "encoding.LengthProof": {
+            "type": "object",
+            "properties": {
+                "x": {
+                    "$ref": "#/definitions/github_com_consensys_gnark-crypto_ecc_bn254_internal_fptower.E2"
+                }
+            }
+        },
         "github_com_Layr-Labs_eigenda_disperser.BlobStatus": {
             "type": "integer",
             "enum": [
@@ -587,6 +606,17 @@
                 "Finalized",
                 "InsufficientSignatures"
             ]
+        },
+        "github_com_consensys_gnark-crypto_ecc_bn254_internal_fptower.E2": {
+            "type": "object",
+            "properties": {
+                "a0": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/disperser/dataapi/docs/swagger.yaml b/disperser/dataapi/docs/swagger.yaml
index b0a10ce7b7..7d94c3d898 100644
--- a/disperser/dataapi/docs/swagger.yaml
+++ b/disperser/dataapi/docs/swagger.yaml
@@ -1,20 +1,4 @@
 definitions:
-  encoding.BlobCommitments:
-    properties:
-      commitment:
-        $ref: '#/definitions/core.Commitment'
-      length:
-        type: integer
-      length_proof:
-        $ref: '#/definitions/core.Commitment'
-    type: object
-  core.Commitment:
-    properties:
-      x:
-        items:
-          type: integer
-        type: array
-    type: object
   core.SecurityParam:
     properties:
       adversary_threshold:
@@ -153,6 +137,34 @@ definitions:
       timestamp:
         type: integer
     type: object
+  encoding.BlobCommitments:
+    properties:
+      commitment:
+        $ref: '#/definitions/encoding.G1Commitment'
+      length:
+        type: integer
+      length_commitment:
+        $ref: '#/definitions/encoding.G2Commitment'
+      length_proof:
+        $ref: '#/definitions/encoding.LengthProof'
+    type: object
+  encoding.G1Commitment:
+    properties:
+      x:
+        items:
+          type: integer
+        type: array
+    type: object
+  encoding.G2Commitment:
+    properties:
+      x:
+        $ref: '#/definitions/github_com_consensys_gnark-crypto_ecc_bn254_internal_fptower.E2'
+    type: object
+  encoding.LengthProof:
+    properties:
+      x:
+        $ref: '#/definitions/github_com_consensys_gnark-crypto_ecc_bn254_internal_fptower.E2'
+    type: object
   github_com_Layr-Labs_eigenda_disperser.BlobStatus:
     enum:
     - 0
@@ -167,6 +179,13 @@ definitions:
     - Failed
     - Finalized
     - InsufficientSignatures
+  github_com_consensys_gnark-crypto_ecc_bn254_internal_fptower.E2:
+    properties:
+      a0:
+        items:
+          type: integer
+        type: array
+    type: object
 info:
   contact: {}
   description: This is the EigenDA Data Access API server.
@@ -269,7 +288,7 @@ paths:
       summary: Fetch metrics
       tags:
       - Metrics
-  /metrics/non_signers:
+  /metrics/non-signers:
     get:
       parameters:
       - description: 'Interval to query for non signers in seconds [default: 3600]'
@@ -300,7 +319,7 @@ paths:
       summary: Fetch non signers
       tags:
       - Metrics
-  /metrics/operator_nonsigning_percentage:
+  /metrics/operator-nonsigning-percentage:
     get:
       parameters:
       - description: 'Interval to query for operators nonsigning percentage [default:
diff --git a/disperser/dataapi/server.go b/disperser/dataapi/server.go
index 0f5d4daece..d48d5fe593 100644
--- a/disperser/dataapi/server.go
+++ b/disperser/dataapi/server.go
@@ -163,9 +163,9 @@ func (s *server) Start() error {
 		{
 			metrics.GET("/", s.FetchMetricsHandler)
 			metrics.GET("/throughput", s.FetchMetricsTroughputHandler)
-			metrics.GET("/non_signers", s.FetchNonSigners)
-			metrics.GET("/operator_nonsigning_percentage", s.FetchOperatorsNonsigningPercentageHandler)
-			metrics.GET("/deregistered_operators", s.FetchDeregisteredOperators)
+			metrics.GET("/non-signers", s.FetchNonSigners)
+			metrics.GET("/operator-nonsigning-percentage", s.FetchOperatorsNonsigningPercentageHandler)
+			metrics.GET("/deregistered-operators", s.FetchDeregisteredOperators)
 		}
 		swagger := v1.Group("/swagger")
 		{
@@ -367,7 +367,7 @@ func (s *server) FetchMetricsTroughputHandler(c *gin.Context) {
 //	@Failure	400			{object}	ErrorResponse	"error: Bad request"
 //	@Failure	404			{object}	ErrorResponse	"error: Not found"
 //	@Failure	500			{object}	ErrorResponse	"error: Server error"
-//	@Router		/metrics/non_signers  [get]
+//	@Router		/metrics/non-signers  [get]
 func (s *server) FetchNonSigners(c *gin.Context) {
 	timer := prometheus.NewTimer(prometheus.ObserverFunc(func(f float64) {
 		s.metrics.ObserveLatency("FetchNonSigners", f*1000) // make milliseconds
@@ -399,7 +399,7 @@ func (s *server) FetchNonSigners(c *gin.Context) {
 //	@Failure	400			{object}	ErrorResponse	"error: Bad request"
 //	@Failure	404			{object}	ErrorResponse	"error: Not found"
 //	@Failure	500			{object}	ErrorResponse	"error: Server error"
-//	@Router		/metrics/operator_nonsigning_percentage  [get]
+//	@Router		/metrics/operator-nonsigning-percentage  [get]
 func (s *server) FetchOperatorsNonsigningPercentageHandler(c *gin.Context) {
 	timer := prometheus.NewTimer(prometheus.ObserverFunc(func(f float64) {
 		s.metrics.ObserveLatency("FetchOperatorsNonsigningPercentageHandler", f*1000) // make milliseconds
diff --git a/disperser/dataapi/server_test.go b/disperser/dataapi/server_test.go
index 629a675c48..56fcb02c11 100644
--- a/disperser/dataapi/server_test.go
+++ b/disperser/dataapi/server_test.go
@@ -272,10 +272,10 @@ func TestFetchUnsignedBatchesHandler(t *testing.T) {
 	mockSubgraphApi.On("QueryDeregisteredOperatorsGreaterThanBlockTimestamp").Return(subgraphOperatorDeregistereds, nil)
 	mockSubgraphApi.On("QueryBatchesByBlockTimestampRange").Return(subgraphBatches, nil)
 
-	r.GET("/v1/metrics/operators_nonsigning_percentage", testDataApiServer.FetchOperatorsNonsigningPercentageHandler)
+	r.GET("/v1/metrics/operator-nonsigning-percentage", testDataApiServer.FetchOperatorsNonsigningPercentageHandler)
 
 	w := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodGet, "/v1/metrics/operators_nonsigning_percentage", nil)
+	req := httptest.NewRequest(http.MethodGet, "/v1/metrics/operator-nonsigning-percentage", nil)
 	ctxWithDeadline, cancel := context.WithTimeout(req.Context(), 500*time.Microsecond)
 	defer cancel()