diff --git a/config/packages/juicenet.yaml b/config/packages/juicenet.yaml
index c060715f..b4a04a12 100755
--- a/config/packages/juicenet.yaml
+++ b/config/packages/juicenet.yaml
@@ -70,7 +70,7 @@ automation:
             {{ [
             "The #JuiceBox Pro had to be restarted. It was unable to connect back to @emotorwerks servers.",
             "Unfortunately, the Juicebox Pro sometimes can no longer connect to @emotorwerks servers.  Fortunately, #HomeAssistant can fix that with a restart!"
-            ] | random + " (https://www.vcloudinfo.com/2018/06/using-home-assistant-to-fix-my-juicebox.html) #SelfHeal #EV #BoltEV "}}
+            ] | random + " (https://www.vcloudinfo.com/2018/06/using-home-assistant-to-fix-my-juicebox.html) #SelfHeal #EV #Tesla #ModelY "}}
           image: >-
             {{ [
             "/config/www/custom_ui/floorplan/images/branding/car.png",
@@ -160,9 +160,9 @@ automation:
         data:
           tweet: >
             {{ [
-            "The #Chevy Bolt Charged for {{(states.sensor.carlojuice_charge_time.state  | int /60) | round() }} minutes and Juiced up {{states.sensor.carlojuice_energy_added.state |int /1000}} KwHs.",
+            "The #Tesla Model Y Charged for {{(states.sensor.carlojuice_charge_time.state  | int /60) | round() }} minutes and Juiced up {{states.sensor.carlojuice_energy_added.state |int /1000}} KwHs.",
             "The last charging session was {{(states.sensor.carlojuice_charge_time.state  | int /60) | round() }} minutes. Added {{states.sensor.carlojuice_energy_added.state |int /1000}} KwHs ",
-            "The Juice Box Pro added {{states.sensor.carlojuice_energy_added.state |int /1000}} KwHs to the #Chevy #BoltEV in {{(states.sensor.carlojuice_charge_time.state  | int /60) | round() }} minutes."
+            "The Juice Box Pro added {{states.sensor.carlojuice_energy_added.state |int /1000}} KwHs to the #Tesla #ModelY in {{(states.sensor.carlojuice_charge_time.state  | int /60) | round() }} minutes."
             ] | random + " (https://github.com/CCOSTAN/Home-AssistantConfig#garage) #Electric #Solar"}}
           image: >-
             {{ [
diff --git a/config/packages/twitter.yaml b/config/packages/twitter.yaml
index cf99c47a..9ebfbc64 100755
--- a/config/packages/twitter.yaml
+++ b/config/packages/twitter.yaml
@@ -75,7 +75,7 @@ sensor:
       hours: 24
 
   - platform: history_stats
-    name: Bolt Charging time
+    name: Tesla Charging time
     entity_id: sensor.carlojuice_charging_status
     state: 'charging'
     type: time
diff --git a/config/script/tweet.yaml b/config/script/tweet.yaml
index df89d654..77eb8725 100755
--- a/config/script/tweet.yaml
+++ b/config/script/tweet.yaml
@@ -70,7 +70,7 @@ tweet_engine_random:
               "solar": [
                 "I am keeping track of the current #Tesla stock price. It is ${{ states('yahoofinance.tsla')|round }}. #Solar Get your FREE stock here: https://join.robinhood.com/giancac82 ",
                 "Solar panels and #smarthome devices combine to save on your energy bill. (https://www.vcloudinfo.com/2018/01/going-green-to-save-some-green-in-2018.html)",
-                "The #ChevyBolt was charged for about {{ states.sensor.bolt_charging_time.attributes.value|replace('m', '') }} minutes in the last 7 days.",
+                "The #Tesla was charged for about {{ states.sensor.tesla_charging_time.attributes.value|replace('m', '') }} minutes in the last 7 days.",
                 "The Official Diecast P85 Model S Red (https://amzn.to/2Hkkl0S) link - Out of stock like the originals. :)",
                 "Solar power from #Tesla is the life blood of this whole operation. (https://www.vcloudinfo.com/2018/01/going-green-to-save-some-green-in-2018.html)",
                 "Solar Powered Backyard Lighting! (https://www.vcloudinfo.com/2020/06/solar-powered-motion-activated-palm-tree-lights.html)"