diff --git a/lib/src/presenting/src/widgets/future_presenter.widget.dart b/lib/src/presenting/src/widgets/future_presenter.widget.dart
index 2d4ccd7..f3d6d9e 100644
--- a/lib/src/presenting/src/widgets/future_presenter.widget.dart
+++ b/lib/src/presenting/src/widgets/future_presenter.widget.dart
@@ -17,8 +17,8 @@ import '../helpers/helpers.exports.dart';
 
 class AstromicFuturePresenter<T> extends StatefulWidget {
   //SECTION - Widget Arguments
-  final AstromicPresenterController futureController;
-  final String futureId;
+  final AstromicPresenterController controller;
+  final String id;
   //
   final Map<AstromicPresenterState, Widget Function(PresenterReturnModel<T?>? r)> stateBuilder;
   final AstromicPresenterConfiguration? configuration;
@@ -26,8 +26,8 @@ class AstromicFuturePresenter<T> extends StatefulWidget {
 
   const AstromicFuturePresenter({
     super.key,
-    required this.futureController,
-    required this.futureId,
+    required this.controller,
+    required this.id,
     required this.stateBuilder,
     this.configuration,
   });
@@ -60,7 +60,7 @@ class _AstromicFuturePresenterState<T> extends State<AstromicFuturePresenter<T>>
     //s1 --State
     //
     //s1 --Controllers & Listeners
-    widget.futureController.getRefreshStream(widget.futureId).listen((_) {
+    widget.controller.getRefreshStream(widget.id).listen((_) {
       _refreshFuture(); // Force future recreation on refresh
     });
     //s1 --Controllers & Listeners
@@ -75,7 +75,7 @@ class _AstromicFuturePresenterState<T> extends State<AstromicFuturePresenter<T>>
   void didUpdateWidget(covariant AstromicFuturePresenter<T> oldWidget) {
     super.didUpdateWidget(oldWidget);
     //
-    if (oldWidget.futureId != widget.futureId) {
+    if (oldWidget.id != widget.id) {
       _initializeFuture();
     }
     //
@@ -128,7 +128,7 @@ class _AstromicFuturePresenterState<T> extends State<AstromicFuturePresenter<T>>
 
   //S1 -- Method to reinitialize or update `_future` with a new instance
   void _initializeFuture() {
-    _future = widget.futureController.getFuture<T?>(widget.futureId)?.then((result) => result);
+    _future = widget.controller.getFuture<T?>(widget.id)?.then((result) => result);
   }
   //!SECTION
 
@@ -173,7 +173,7 @@ class _AstromicFuturePresenterState<T> extends State<AstromicFuturePresenter<T>>
   void dispose() async {
     super.dispose();
     //SECTION - Disposable variables
-    await widget.futureController.disposeFuture(widget.futureId);
+    await widget.controller.disposeFuture(widget.id);
     //!SECTION
   }
 }
diff --git a/lib/src/presenting/src/widgets/stream_presenter.widget.dart b/lib/src/presenting/src/widgets/stream_presenter.widget.dart
index d012484..60f3cec 100644
--- a/lib/src/presenting/src/widgets/stream_presenter.widget.dart
+++ b/lib/src/presenting/src/widgets/stream_presenter.widget.dart
@@ -18,7 +18,7 @@ import './presenter_controller.widget.dart';
 class AstromicStreamPresenter<T> extends StatefulWidget {
   //SECTION - Widget Arguments
   final AstromicPresenterController controller;
-  final String streamId;
+  final String id;
   //
   final Map<AstromicPresenterState, Widget Function(PresenterReturnModel<T?>? r)> stateBuilder;
   final AstromicPresenterConfiguration? configuration;
@@ -27,7 +27,7 @@ class AstromicStreamPresenter<T> extends StatefulWidget {
   const AstromicStreamPresenter({
     super.key,
     required this.controller,
-    required this.streamId,
+    required this.id,
     required this.stateBuilder,
     this.configuration,
   });
@@ -78,7 +78,7 @@ class _AstromicStreamPresenterState<T> extends State<AstromicStreamPresenter<T>>
   void didUpdateWidget(covariant AstromicStreamPresenter<T> oldWidget) {
     super.didUpdateWidget(oldWidget);
     //
-    if (oldWidget.streamId != widget.streamId) {
+    if (oldWidget.id != widget.id) {
       _initializeStream();
     }
     //
@@ -122,7 +122,7 @@ class _AstromicStreamPresenterState<T> extends State<AstromicStreamPresenter<T>>
 
   //S1 -- Method to reinitialize or update `_future` with a new instance
   void _initializeStream() {
-    _stream = widget.controller.getStream<T?>(widget.streamId)?.asyncMap((dynamic result) => result) as Stream<T?>?;
+    _stream = widget.controller.getStream<T?>(widget.id)?.asyncMap((dynamic result) => result) as Stream<T?>?;
   }
   //!SECTION