diff --git a/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart b/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart
index 596701b6..b4b8679a 100644
--- a/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart
+++ b/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart
@@ -5,7 +5,7 @@ import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app_window.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
@@ -29,7 +29,7 @@ class _PackageToolOneState extends State<PackageToolOne> {
       context: context,
       barrierDismissible: false,
       builder: (context) {
-        return MihAppWindow(
+        return MihPackageWindow(
           fullscreen: true,
           windowTitle: "Test Full",
           onWindowTapClose: () {
@@ -46,7 +46,7 @@ class _PackageToolOneState extends State<PackageToolOne> {
       context: context,
       barrierDismissible: false,
       builder: (context) {
-        return MihAppWindow(
+        return MihPackageWindow(
           fullscreen: false,
           windowTitle: "Test No Full",
           onWindowTapClose: () {
diff --git a/Frontend/lib/mih_components/mih_package_components/mih_package_tile.dart b/Frontend/lib/mih_components/mih_package_components/mih_package_tile.dart
index a1e4b5b8..5b7f9450 100644
--- a/Frontend/lib/mih_components/mih_package_components/mih_package_tile.dart
+++ b/Frontend/lib/mih_components/mih_package_components/mih_package_tile.dart
@@ -1,5 +1,5 @@
 import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app_window.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_yt_video_player.dart';
 import 'package:flutter/material.dart';
 
@@ -32,7 +32,7 @@ class _MihPackageTileState extends State<MihPackageTile> {
       showDialog(
         context: context,
         builder: (context) {
-          return MihAppWindow(
+          return MihPackageWindow(
             fullscreen: false,
             windowTitle: widget.appName,
             // windowTools: const [],
diff --git a/Frontend/lib/mih_components/mih_package_components/mih_app_window.dart b/Frontend/lib/mih_components/mih_package_components/mih_package_window.dart
similarity index 96%
rename from Frontend/lib/mih_components/mih_package_components/mih_app_window.dart
rename to Frontend/lib/mih_components/mih_package_components/mih_package_window.dart
index 09277548..e6083892 100644
--- a/Frontend/lib/mih_components/mih_package_components/mih_app_window.dart
+++ b/Frontend/lib/mih_components/mih_package_components/mih_package_window.dart
@@ -2,14 +2,14 @@ import 'package:flutter/material.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_single_child_scroll.dart';
 
-class MihAppWindow extends StatefulWidget {
+class MihPackageWindow extends StatefulWidget {
   final String windowTitle;
   final Widget windowBody;
   final Widget? windowTools;
   // final List<SpeedDialChild> menuOptions;
   final void Function() onWindowTapClose;
   final bool fullscreen;
-  const MihAppWindow({
+  const MihPackageWindow({
     super.key,
     required this.fullscreen,
     required this.windowTitle,
@@ -20,10 +20,10 @@ class MihAppWindow extends StatefulWidget {
   });
 
   @override
-  State<MihAppWindow> createState() => _MihAppWindowState();
+  State<MihPackageWindow> createState() => _MihPackageWindowState();
 }
 
-class _MihAppWindowState extends State<MihAppWindow> {
+class _MihPackageWindowState extends State<MihPackageWindow> {
   late double windowTitleSize;
   late double horizontralWindowPadding;
   late double vertticalWindowPadding;
diff --git a/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart b/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart
index 9c057947..22bf024d 100644
--- a/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart
+++ b/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart
@@ -87,7 +87,7 @@ class _MihInfoState extends State<MihInfo> {
   //     context: context,
   //     barrierDismissible: false,
   //     builder: (context) {
-  //       return MihAppWindow(
+  //       return MihPackageWindow(
   //         fullscreen: false,
   //         windowTitle: "MIH Installation Guide (iOS)",
   //         windowTools: const [],
diff --git a/Frontend/lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart b/Frontend/lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart
index a9d89c21..acf9146f 100644
--- a/Frontend/lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart
+++ b/Frontend/lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart
@@ -6,7 +6,7 @@ import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app_window.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
 import 'package:mzansi_innovation_hub/mih_env/env.dart';
@@ -169,7 +169,7 @@ class _AiChatState extends State<AiChat> {
           textStream = snapshot.requireData;
           // print("Text: $textStream");
           // _speakText(textStream!);
-          return MihAppWindow(
+          return MihPackageWindow(
             fullscreen: false,
             windowTitle: 'Mzansi AI Thoughts',
             windowTools: Row(
@@ -300,7 +300,7 @@ class _AiChatState extends State<AiChat> {
             ),
           );
         } else {
-          return MihAppWindow(
+          return MihPackageWindow(
             fullscreen: false,
             windowTitle: 'Mzansi AI Thoughts',
             // windowTools: [],
diff --git a/Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart b/Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart
index 6cde37b6..3b4a503e 100644
--- a/Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart
+++ b/Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart
@@ -6,7 +6,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_window.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app_window.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_delete_message.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
@@ -276,7 +276,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
     showDialog(
       context: context,
       barrierDismissible: false,
-      builder: (context) => MihAppWindow(
+      builder: (context) => MihPackageWindow(
         fullscreen: false,
         windowTitle: widget.cardList[index].shop_name.toUpperCase(),
         windowTools: Row(