diff --git a/packages/bruno-app/src/components/RequestPane/WSRequestPane/index.js b/packages/bruno-app/src/components/RequestPane/WSRequestPane/index.js
index e5d182af3..6652c1c50 100644
--- a/packages/bruno-app/src/components/RequestPane/WSRequestPane/index.js
+++ b/packages/bruno-app/src/components/RequestPane/WSRequestPane/index.js
@@ -41,7 +41,7 @@ const WSRequestPane = ({ item, collection, handleRun }) => {
         );
       }
       case 'headers': {
-        return <RequestHeaders item={item} collection={collection} addHeaderText="Add Metadata" />;
+        return <RequestHeaders item={item} collection={collection} addHeaderText="Add Headers" />;
       }
       case 'settings': {
         return <WSSettingsPane item={item} collection={collection} />;
@@ -93,7 +93,7 @@ const WSRequestPane = ({ item, collection, handleRun }) => {
           Message
         </div>
         <div className={getTabClassname('headers')} role="tab" onClick={() => selectTab('headers')}>
-          Metadata
+          Headers
           {activeHeadersLength > 0 && <sup className="ml-[.125rem] font-medium">{activeHeadersLength}</sup>}
         </div>
         <div className={getTabClassname('auth')} role="tab" onClick={() => selectTab('auth')}>
diff --git a/packages/bruno-app/src/components/ResponsePane/WsResponsePane/WSResponseHeaders/index.js b/packages/bruno-app/src/components/ResponsePane/WsResponsePane/WSResponseHeaders/index.js
index 3a4f8fd39..01157d226 100644
--- a/packages/bruno-app/src/components/ResponsePane/WsResponsePane/WSResponseHeaders/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/WsResponsePane/WSResponseHeaders/index.js
@@ -8,7 +8,7 @@ const WSResponseHeaders = ({ response }) => {
     return Object.entries(headers).map(([key, value]) => ({ name: key, value }));
   };
 
-  const metadataArray = formatHeaders(response.headers);
+  const headersArray = formatHeaders(response.headers);
 
   return (
     <StyledWrapper className="pb-4 w-full">
@@ -20,17 +20,17 @@ const WSResponseHeaders = ({ response }) => {
           </tr>
         </thead>
         <tbody>
-          {metadataArray && metadataArray.length ? (
-            metadataArray.map((metadata, index) => (
+          {headersArray && headersArray.length ? (
+            headersArray.map((header, index) => (
               <tr key={index}>
-                <td className="key">{metadata.name}</td>
-                <td className="value">{metadata.value}</td>
+                <td className="key">{header.name}</td>
+                <td className="value">{header.value}</td>
               </tr>
             ))
           ) : (
             <tr>
               <td colSpan="2" className="text-center py-4 text-gray-500">
-                No metadata received
+                No headers received
               </td>
             </tr>
           )}
diff --git a/packages/bruno-app/src/components/ResponsePane/WsResponsePane/index.js b/packages/bruno-app/src/components/ResponsePane/WsResponsePane/index.js
index d8ef1490a..fde470ba4 100644
--- a/packages/bruno-app/src/components/ResponsePane/WsResponsePane/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/WsResponsePane/index.js
@@ -97,7 +97,7 @@ const WSResponsePane = ({ item, collection }) => {
     },
     {
       name: 'headers',
-      label: 'Metadata',
+      label: 'Headers',
       count: response.headers ? Object.keys(response.headers).length : 0
     },
     {
diff --git a/packages/bruno-filestore/src/formats/bru/index.ts b/packages/bruno-filestore/src/formats/bru/index.ts
index bdc8584b5..4776ca48a 100644
--- a/packages/bruno-filestore/src/formats/bru/index.ts
+++ b/packages/bruno-filestore/src/formats/bru/index.ts
@@ -50,7 +50,7 @@ export const bruRequestToJson = (data: string | any, parsed: boolean = false): a
             ? _.get(json, 'grpc.method', '')
             : String(_.get(json, 'http.method') ?? '').toUpperCase(),
         url: _.get(json, urlPath[requestType], _.get(json, urlPath.default)),
-        headers: ['grpc-request','ws-request'].includes(requestType) ? _.get(json, 'metadata', []) : _.get(json, 'headers', []),
+        headers: requestType === 'grpc-request' ? _.get(json, 'metadata', []) : _.get(json, 'headers', []),
         auth: _.get(json, 'auth', {}),
         body: _.get(json, 'body', {}),
         script: _.get(json, 'script', {}),
@@ -202,7 +202,7 @@ export const jsonRequestToBru = (json: any): string => {
     }
 
     // Common fields for all request types
-    if (type === 'grpc' || type === 'ws') {
+    if (type === 'grpc') {
       bruJson.metadata = _.get(json, 'request.headers', []); // Use metadata for gRPC
     } else {
       bruJson.headers = _.get(json, 'request.headers', []); // Use headers for HTTP/GraphQL
diff --git a/packages/bruno-lang/v2/src/jsonToBru.js b/packages/bruno-lang/v2/src/jsonToBru.js
index 59499c4a5..7d9522aea 100644
--- a/packages/bruno-lang/v2/src/jsonToBru.js
+++ b/packages/bruno-lang/v2/src/jsonToBru.js
@@ -17,23 +17,7 @@ const stripLastLine = (text) => {
 };
 
 const jsonToBru = (json) => {
-  const {
-    meta,
-    http,
-    grpc,
-    ws,
-    params,
-    headers,
-    metadata,
-    auth,
-    body,
-    script,
-    tests,
-    vars,
-    assertions,
-    settings,
-    docs
-  } = json;
+  const { meta, http, grpc, ws, params, headers, metadata, auth, body, script, tests, vars, assertions, settings, docs } = json;
 
   let bru = '';