updating names cont.

client/src/components/Canvas/views/Account.jsx

@@ -1,7 +1,7 @@
 import { Box, Flex, Field, Input, Stack, Heading, Button } from "@chakra-ui/react"
 import { useForm } from 'react-hook-form';
 
-export default function AccountCanvas()  {
+export default function Account()  {
   const { 
     register, 
     handleSubmit,

client/src/components/Canvas/views/Admin.jsx

@@ -1,6 +1,6 @@
 import { Box, Text } from '@chakra-ui/react';
 
-export default function AdminCanvas() {
+export default function Admin() {
   return (
     <Box p={8} mt={4} ml="auto" mr="auto" width="600px">
       <Box 

client/src/components/Canvas/views/GlobalMap.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { MapContainer, TileLayer, Marker, Popup } from "react-leaflet";
 
-export default function GlobalMapCanvas() {
+export default function GlobalMap() {
   const position = [45.61142478054226, -122.49630033167544]; // [latitude, longitude]
   return (
       <MapContainer center={position} zoom={3} style={{ height: "100%", width: "100%" }}>

client/src/components/Canvas/views/Home.jsx

@@ -1,6 +1,5 @@
 import { HStack, Flex, Tabs } from "@chakra-ui/react";
-import { useState } from "react";
-import WidgetCanvas from "./HomeTabs/MyDashboard";
+import MyDashboard from "./HomeTabs/MyDashboard";
 import { SearchBar } from "../CanvasComponents/SearchBar";
 import { SettingsButton } from "../CanvasComponents/SettingsButton";
 import { DailyActivity } from "./HomeTabs/DailyActivity";
@@ -11,7 +10,7 @@ import { CancelButton } from "../CanvasComponents/CancelButton";
 import { SaveButton } from "../CanvasComponents/SaveButton";
 import DeleteAllButton from "../CanvasComponents/DeleteAllButton";
 
-export function HomeCanvas({...props}) {
+export default function Home({...props}) {
   // deconstructing props
   const { width, height, view, layout, setLayout, setOriginalLayout, onLayoutChange, onChangeView, onCancel, 
     isDelete, setIsDelete, isEditable, setIsEditable, widgetArray, setWidgetArray } = props;
@@ -84,7 +83,7 @@ export function HomeCanvas({...props}) {
   }
 
   // Prop Forwarding
-  const widgetCanvasProps = { layout, onLayoutChange, isEditable, isDelete, DeleteWidget, widgetArray };
+  const MyDashboardProps = { layout, onLayoutChange, isEditable, isDelete, DeleteWidget, widgetArray };
   const settingsButtonProps = { onAddWidget, onEditWidgets, onDeleteWidgets, setWidgetArray, widgetArray };
   
   return (
@@ -113,7 +112,7 @@ export function HomeCanvas({...props}) {
 				justify="space-between"
       >
         <Tabs.List>
-          <Tabs.Trigger value="widget" fontSize="lg">
+          <Tabs.Trigger value="mydashboard" fontSize="lg">
             My Dashboard
           </Tabs.Trigger>
           <Tabs.Trigger value="gas" fontSize="lg">
@@ -150,8 +149,8 @@ export function HomeCanvas({...props}) {
       </Flex>
 
       {/* CANVAS */}
-      <Tabs.Content value="widget">
-        <WidgetCanvas {...widgetCanvasProps}/>
+      <Tabs.Content value="mydashboard">
+        <MyDashboard {...MyDashboardProps}/>
       </Tabs.Content>
       <Tabs.Content value="gas">
         <Gas />

client/src/components/Canvas/views/HomeTabs/MyDashboard.jsx

@@ -1,7 +1,7 @@
 import GridLayout, { WidthProvider } from 'react-grid-layout';
 import { useSlotRecipe, chakra, Flex } from '@chakra-ui/react';
 
-export default function WidgetCanvas({layout, onLayoutChange, isEditable, isDelete, DeleteWidget, widgetArray}) {
+export default function MyDashboard({layout, onLayoutChange, isEditable, isDelete, DeleteWidget, widgetArray}) {
   console.log("rendering MyDashboard");
   const recipe = useSlotRecipe({ key: "widget" });
   const styles = recipe(); // using root recipe for widget below

client/src/components/Canvas/views/RegionalMap.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { MapContainer, TileLayer, Marker, Popup } from "react-leaflet";
 
-export default function GlobalMapCanvas() {
+export default function RegionalMap() {
   const position = [45.61142478054226, -122.49630033167544]; // [latitude, longitude]
   return (
       <MapContainer center={position} zoom={13} style={{ height: "100%", width: "100%" }}>

client/src/components/Canvas/views/Settings.jsx

@@ -1,6 +1,6 @@
 import { Box, Text } from '@chakra-ui/react';
 
-export default function SettingsCanvas() {
+export default function Settings() {
   return (
     <Box p={8} mt={4} ml="auto" mr="auto" width="600px">
       <Box 

client/src/components/Canvas/views/Volcano.jsx

@@ -1,6 +1,6 @@
 import { Box, Text } from '@chakra-ui/react';
 
-export default function VolcanoCanvas() {
+export default function Volcano() {
     return (
         <Box p={8} mt={4} ml="auto" mr="auto" width="600px">
             <Box