diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart
index f1926cd6..98ea4e33 100644
--- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart
+++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart
@@ -26,7 +26,7 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
 
   @override
   Widget build(BuildContext context) {
-    final activeId = ref.watch(activeIdStateProvider);
+    final selectedId = ref.watch(activeIdStateProvider);
     var formRows = ref.read(selectedRequestModelProvider)?.requestFormDataList;
     rows =
         formRows == null || formRows.isEmpty ? [kFormDataEmptyModel] : formRows;
@@ -43,14 +43,14 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
             return Theme(
               data: Theme.of(context),
               child: FormDataField(
-                keyId: "$activeId-$idx-form-v-$seed",
+                keyId: "$selectedId-$idx-form-v-$seed",
                 initialValue: rows[idx].name,
                 hintText: " Add Key",
                 onChanged: (value) {
                   rows[idx] = rows[idx].copyWith(
                     name: value,
                   );
-                  _onFieldChange(activeId!);
+                  _onFieldChange(selectedId!);
                 },
                 colorScheme: Theme.of(context).colorScheme,
                 formDataType: rows[idx].type,
@@ -60,7 +60,7 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
                   );
                   rows[idx] = rows[idx].copyWith(value: "");
                   setState(() {});
-                  _onFieldChange(activeId!);
+                  _onFieldChange(selectedId!);
                 },
               ),
             );
@@ -113,7 +113,7 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
                                     value: pickedResult.files.first.path!,
                                   );
                                   setState(() {});
-                                  _onFieldChange(activeId!);
+                                  _onFieldChange(selectedId!);
                                 }
                               },
                               label: Text(
@@ -132,12 +132,12 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
                     ),
                   )
                 : CellField(
-                    keyId: "$activeId-$idx-form-v-$seed",
+                    keyId: "$selectedId-$idx-form-v-$seed",
                     initialValue: rows[idx].value,
                     hintText: " Add Value",
                     onChanged: (value) {
                       rows[idx] = rows[idx].copyWith(value: value);
-                      _onFieldChange(activeId!);
+                      _onFieldChange(selectedId!);
                     },
                     colorScheme: Theme.of(context).colorScheme,
                   );
@@ -161,7 +161,7 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
                 } else {
                   rows.removeAt(row.index);
                 }
-                _onFieldChange(activeId!);
+                _onFieldChange(selectedId!);
                 setState(() {});
               },
             );
@@ -197,7 +197,7 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
                 setState(() {
                   rows.add(kFormDataEmptyModel);
                 });
-                _onFieldChange(activeId!);
+                _onFieldChange(selectedId!);
               },
               icon: const Icon(Icons.add),
               label: const Text(
@@ -211,9 +211,9 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
     );
   }
 
-  void _onFieldChange(String activeId) {
+  void _onFieldChange(String selectedId) {
     ref.read(collectionStateNotifierProvider.notifier).update(
-          activeId,
+          selectedId,
           requestFormDataList: rows,
         );
   }
diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart
index a88e6c7e..8637cbbc 100644
--- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart
+++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart
@@ -26,9 +26,9 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
     seed = random.nextInt(kRandMax);
   }
 
-  void _onFieldChange(String activeId) {
+  void _onFieldChange(String selectedId) {
     ref.read(collectionStateNotifierProvider.notifier).update(
-          activeId,
+          selectedId,
           requestHeaders: rows,
           isHeaderEnabledList: isRowEnabledList,
         );
@@ -36,7 +36,7 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
 
   @override
   Widget build(BuildContext context) {
-    final activeId = ref.watch(activeIdStateProvider);
+    final selectedId = ref.watch(activeIdStateProvider);
     final length = ref.watch(selectedRequestModelProvider
         .select((value) => value?.requestHeaders?.length));
     var rH = ref.read(selectedRequestModelProvider)?.requestHeaders;
@@ -58,13 +58,13 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
           cellBuilder: (_, row) {
             int idx = row.index;
             return CheckBox(
-              keyId: "$activeId-$idx-headers-c-$seed",
+              keyId: "$selectedId-$idx-headers-c-$seed",
               value: isRowEnabledList[idx],
               onChanged: (value) {
                 setState(() {
                   isRowEnabledList[idx] = value!;
                 });
-                _onFieldChange(activeId!);
+                _onFieldChange(selectedId!);
               },
               colorScheme: Theme.of(context).colorScheme,
             );
@@ -77,12 +77,12 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
           cellBuilder: (_, row) {
             int idx = row.index;
             return HeaderField(
-              keyId: "$activeId-$idx-headers-k-$seed",
+              keyId: "$selectedId-$idx-headers-k-$seed",
               initialValue: rows[idx].name,
               hintText: "Add Header Name",
               onChanged: (value) {
                 rows[idx] = rows[idx].copyWith(name: value);
-                _onFieldChange(activeId!);
+                _onFieldChange(selectedId!);
               },
               colorScheme: Theme.of(context).colorScheme,
             );
@@ -104,12 +104,12 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
           cellBuilder: (_, row) {
             int idx = row.index;
             return CellField(
-              keyId: "$activeId-$idx-headers-v-$seed",
+              keyId: "$selectedId-$idx-headers-v-$seed",
               initialValue: rows[idx].value,
               hintText: " Add Header Value",
               onChanged: (value) {
                 rows[idx] = rows[idx].copyWith(value: value);
-                _onFieldChange(activeId!);
+                _onFieldChange(selectedId!);
               },
               colorScheme: Theme.of(context).colorScheme,
             );
@@ -137,7 +137,7 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
                   rows.removeAt(row.index);
                   isRowEnabledList.removeAt(row.index);
                 }
-                _onFieldChange(activeId!);
+                _onFieldChange(selectedId!);
               },
             );
           },
@@ -171,7 +171,7 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
               onPressed: () {
                 rows.add(kNameValueEmptyModel);
                 isRowEnabledList.add(true);
-                _onFieldChange(activeId!);
+                _onFieldChange(selectedId!);
               },
               icon: const Icon(Icons.add),
               label: const Text(
diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_pane.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_pane.dart
index 9ec73fd7..dae28689 100644
--- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_pane.dart
+++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_pane.dart
@@ -16,7 +16,7 @@ class EditRequestPane extends ConsumerStatefulWidget {
 class _EditRequestPaneState extends ConsumerState<EditRequestPane> {
   @override
   Widget build(BuildContext context) {
-    final activeId = ref.watch(activeIdStateProvider);
+    final selectedId = ref.watch(activeIdStateProvider);
     final codePaneVisible = ref.watch(codePaneVisibleStateProvider);
     final tabIndex = ref.watch(
         selectedRequestModelProvider.select((value) => value?.requestTabIndex));
@@ -29,7 +29,7 @@ class _EditRequestPaneState extends ConsumerState<EditRequestPane> {
         .select((value) => value?.requestBody?.length));
 
     return RequestPane(
-      activeId: activeId,
+      selectedId: selectedId,
       codePaneVisible: codePaneVisible,
       tabIndex: tabIndex,
       onPressedCodeButton: () {
@@ -39,7 +39,7 @@ class _EditRequestPaneState extends ConsumerState<EditRequestPane> {
       onTapTabBar: (index) {
         ref
             .read(collectionStateNotifierProvider.notifier)
-            .update(activeId!, requestTabIndex: index);
+            .update(selectedId!, requestTabIndex: index);
       },
       showIndicators: [
         paramLength != null && paramLength > 0,
diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart
index e348888b..0ea37a64 100644
--- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart
+++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart
@@ -27,9 +27,9 @@ class EditRequestURLParamsState extends ConsumerState<EditRequestURLParams> {
     seed = random.nextInt(kRandMax);
   }
 
-  void _onFieldChange(String activeId) {
+  void _onFieldChange(String selectedId) {
     ref.read(collectionStateNotifierProvider.notifier).update(
-          activeId,
+          selectedId,
           requestParams: rows,
           isParamEnabledList: isRowEnabledList,
         );
@@ -37,7 +37,7 @@ class EditRequestURLParamsState extends ConsumerState<EditRequestURLParams> {
 
   @override
   Widget build(BuildContext context) {
-    final activeId = ref.watch(activeIdStateProvider);
+    final selectedId = ref.watch(activeIdStateProvider);
     final length = ref.watch(selectedRequestModelProvider
         .select((value) => value?.requestParams?.length));
     var rP = ref.read(selectedRequestModelProvider)?.requestParams;
@@ -60,13 +60,13 @@ class EditRequestURLParamsState extends ConsumerState<EditRequestURLParams> {
             int idx = row.index;
 
             return CheckBox(
-              keyId: "$activeId-$idx-params-c-$seed",
+              keyId: "$selectedId-$idx-params-c-$seed",
               value: isRowEnabledList[idx],
               onChanged: (value) {
                 setState(() {
                   isRowEnabledList[idx] = value!;
                 });
-                _onFieldChange(activeId!);
+                _onFieldChange(selectedId!);
               },
               colorScheme: Theme.of(context).colorScheme,
             );
@@ -79,12 +79,12 @@ class EditRequestURLParamsState extends ConsumerState<EditRequestURLParams> {
           cellBuilder: (_, row) {
             int idx = row.index;
             return CellField(
-              keyId: "$activeId-$idx-params-k-$seed",
+              keyId: "$selectedId-$idx-params-k-$seed",
               initialValue: rows[idx].name,
               hintText: "Add URL Parameter",
               onChanged: (value) {
                 rows[idx] = rows[idx].copyWith(name: value);
-                _onFieldChange(activeId!);
+                _onFieldChange(selectedId!);
               },
               colorScheme: Theme.of(context).colorScheme,
             );
@@ -106,12 +106,12 @@ class EditRequestURLParamsState extends ConsumerState<EditRequestURLParams> {
           cellBuilder: (_, row) {
             int idx = row.index;
             return CellField(
-              keyId: "$activeId-$idx-params-v-$seed",
+              keyId: "$selectedId-$idx-params-v-$seed",
               initialValue: rows[idx].value,
               hintText: "Add Value",
               onChanged: (value) {
                 rows[idx] = rows[idx].copyWith(value: value);
-                _onFieldChange(activeId!);
+                _onFieldChange(selectedId!);
               },
               colorScheme: Theme.of(context).colorScheme,
             );
@@ -139,7 +139,7 @@ class EditRequestURLParamsState extends ConsumerState<EditRequestURLParams> {
                   rows.removeAt(row.index);
                   isRowEnabledList.removeAt(row.index);
                 }
-                _onFieldChange(activeId!);
+                _onFieldChange(selectedId!);
               },
             );
           },
@@ -173,7 +173,7 @@ class EditRequestURLParamsState extends ConsumerState<EditRequestURLParams> {
               onPressed: () {
                 rows.add(kNameValueEmptyModel);
                 isRowEnabledList.add(true);
-                _onFieldChange(activeId!);
+                _onFieldChange(selectedId!);
               },
               icon: const Icon(Icons.add),
               label: const Text(
diff --git a/lib/screens/home_page/editor_pane/editor_pane.dart b/lib/screens/home_page/editor_pane/editor_pane.dart
index ec7d87d0..e8e52d19 100644
--- a/lib/screens/home_page/editor_pane/editor_pane.dart
+++ b/lib/screens/home_page/editor_pane/editor_pane.dart
@@ -22,8 +22,8 @@ class _RequestEditorPaneState extends ConsumerState<RequestEditorPane> {
 
   @override
   Widget build(BuildContext context) {
-    final activeId = ref.watch(activeIdStateProvider);
-    if (activeId == null) {
+    final selectedId = ref.watch(activeIdStateProvider);
+    if (selectedId == null) {
       return const RequestEditorDefault();
     } else {
       return Padding(
diff --git a/lib/widgets/request_widgets.dart b/lib/widgets/request_widgets.dart
index 6ba74bce..ffac504e 100644
--- a/lib/widgets/request_widgets.dart
+++ b/lib/widgets/request_widgets.dart
@@ -5,7 +5,7 @@ import 'tabs.dart';
 class RequestPane extends StatefulWidget {
   const RequestPane({
     super.key,
-    required this.activeId,
+    required this.selectedId,
     required this.codePaneVisible,
     this.tabIndex,
     this.onPressedCodeButton,
@@ -14,7 +14,7 @@ class RequestPane extends StatefulWidget {
     this.showIndicators = const [false, false, false],
   });
 
-  final String? activeId;
+  final String? selectedId;
   final bool codePaneVisible;
   final int? tabIndex;
   final void Function()? onPressedCodeButton;
@@ -76,7 +76,7 @@ class _RequestPaneState extends State<RequestPane>
           ),
         ),
         TabBar(
-          key: Key(widget.activeId!),
+          key: Key(widget.selectedId!),
           controller: _controller,
           overlayColor: kColorTransparentState,
           onTap: widget.onTapTabBar,
diff --git a/test/widgets/request_widgets_test.dart b/test/widgets/request_widgets_test.dart
index 956e586f..b50a033f 100644
--- a/test/widgets/request_widgets_test.dart
+++ b/test/widgets/request_widgets_test.dart
@@ -11,7 +11,7 @@ void main() {
         theme: kThemeDataLight,
         home: Scaffold(
           body: RequestPane(
-            activeId: '1',
+            selectedId: '1',
             codePaneVisible: true,
             children: const [Text('abc'), Text('xyz'), Text('mno')],
             onPressedCodeButton: () {},
@@ -41,7 +41,7 @@ void main() {
         theme: kThemeDataLight,
         home: Scaffold(
           body: RequestPane(
-            activeId: '1',
+            selectedId: '1',
             codePaneVisible: true,
             onPressedCodeButton: () {},
             tabIndex: 1,
@@ -72,7 +72,7 @@ void main() {
         theme: kThemeDataLight,
         home: Scaffold(
           body: RequestPane(
-            activeId: '1',
+            selectedId: '1',
             codePaneVisible: false,
             onPressedCodeButton: () {},
             tabIndex: 2,
@@ -104,7 +104,7 @@ void main() {
         theme: kThemeDataLight,
         home: Scaffold(
           body: RequestPane(
-            activeId: '1',
+            selectedId: '1',
             codePaneVisible: false,
             onPressedCodeButton: () {},
             onTapTabBar: (value) {