diff --git a/billing/v1/billing.proto b/billing/v1/billing.proto
index b496033f..c01aefa6 100644
--- a/billing/v1/billing.proto
+++ b/billing/v1/billing.proto
@@ -469,14 +469,14 @@ service Billing {
   // Delete billing group free format item (miscellaneous)
   rpc DeleteFreeFormat(DeleteFreeFormatRequest) returns (google.protobuf.Empty) {
     option (google.api.http) = {
-      delete: "/v1/freeformat/{id}"
+      delete: "/v1/freeformat/{groupId}"
     };
   }
 
   // Get billing group free format item (miscellaneous)
   rpc GetFreeFormat(GetFreeFormatRequest) returns (stream GetFreeFormatResponse) {
     option (google.api.http) = {
-      get: "/v1/freeformat/{id}"
+      get: "/v1/freeformat/{groupId}"
     };
   }
 
@@ -1517,7 +1517,7 @@ message ListCustomFieldRequest {
 
 // BillingGroup FreeFormat: Also known as miscellaneous
 message CreateFreeFormatRequest {
-  string id = 1;
+  string groupId = 1;
   string vendor = 2;
   repeated FreeFormItem items = 3;
 }
@@ -1530,12 +1530,12 @@ message FreeFormItem {
 }
 
 message DeleteFreeFormatRequest {
-  string id = 1;
+  string groupId = 1;
   string vendor = 2;
 }
 
 message GetFreeFormatRequest {
-  string id = 1;
+  string groupId = 1;
 }
 
 message GetFreeFormatResponse {
diff --git a/openapiv2/apidocs.swagger.json b/openapiv2/apidocs.swagger.json
index b85b72c7..51965256 100644
--- a/openapiv2/apidocs.swagger.json
+++ b/openapiv2/apidocs.swagger.json
@@ -6673,7 +6673,7 @@
         },
         "parameters": [
           {
-            "name": "id",
+            "name": "groupId",
             "in": "query",
             "required": false,
             "type": "string"
@@ -6690,7 +6690,7 @@
         ]
       }
     },
-    "/v1/freeformat/{id}": {
+    "/v1/freeformat/{groupId}": {
       "get": {
         "summary": "Get billing group free format item (miscellaneous)",
         "operationId": "Billing_GetFreeFormat",
@@ -6719,7 +6719,7 @@
         },
         "parameters": [
           {
-            "name": "id",
+            "name": "groupId",
             "in": "path",
             "required": true,
             "type": "string"
@@ -6749,7 +6749,7 @@
         },
         "parameters": [
           {
-            "name": "id",
+            "name": "groupId",
             "in": "path",
             "required": true,
             "type": "string"