diff --git a/custom_components/alexa_media/media_player.py b/custom_components/alexa_media/media_player.py
index 25d3a82c..b4b75af2 100644
--- a/custom_components/alexa_media/media_player.py
+++ b/custom_components/alexa_media/media_player.py
@@ -612,12 +612,12 @@ async def async_set_shuffle(self, shuffle):
         self.shuffle_state = shuffle
 
     @property
-    def shuffle_state(self):
+    def shuffle(self):
         """Return the Shuffle state."""
         return self._shuffle
 
-    @shuffle_state.setter
-    def shuffle_state(self, state):
+    @shuffle.setter
+    def shuffle(self, state):
         """Set the Shuffle state."""
         self._shuffle = state
 
diff --git a/custom_components/alexa_media/switch.py b/custom_components/alexa_media/switch.py
index 875515b3..bfa85331 100644
--- a/custom_components/alexa_media/switch.py
+++ b/custom_components/alexa_media/switch.py
@@ -280,7 +280,7 @@ def __init__(self, client, account):
         # Class info
         super().__init__(
             client,
-            'shuffle_state',
+            'shuffle',
             client.alexa_api.shuffle,
             account,
             "shuffle")