diff --git a/components/ItemGrid/ItemGrid.brs b/components/ItemGrid/ItemGrid.brs
index 22fc031b..38e9aea0 100644
--- a/components/ItemGrid/ItemGrid.brs
+++ b/components/ItemGrid/ItemGrid.brs
@@ -323,8 +323,8 @@ sub setPhotoAlbumOptions(options)
     options.views = [
         { "Title": tr("Slideshow Off"), "Name": "singlephoto" }
         { "Title": tr("Slideshow On"), "Name": "slideshowphoto" }
-        { "Title": tr("Shuffle Off"), "Name": "singlephoto" }
-        { "Title": tr("Shuffle On"), "Name": "shufflephoto" }
+        { "Title": tr("Random Off"), "Name": "singlephoto" }
+        { "Title": tr("Random On"), "Name": "randomphoto" }
     ]
     options.sort = []
     options.filter = []
@@ -576,15 +576,15 @@ sub optionsClosed()
     end if
 
     if m.top.parentItem.Type = "CollectionFolder" or m.top.parentItem.Type = "Folder" or m.top.parentItem.CollectionType = "CollectionFolder"
-        ' Did the user just request "Shuffle" on a PhotoAlbum?
+        ' Did the user just request "Random" on a PhotoAlbum?
         if m.options.view = "singlephoto"
             set_user_setting("photos.slideshow", "false")
-            set_user_setting("photos.shuffle", "false")
+            set_user_setting("photos.random", "false")
         else if m.options.view = "slideshowphoto"
             set_user_setting("photos.slideshow", "true")
-            set_user_setting("photos.shuffle", "false")
-        else if m.options.view = "shufflephoto"
-            set_user_setting("photos.shuffle", "true")
+            set_user_setting("photos.random", "false")
+        else if m.options.view = "randomphoto"
+            set_user_setting("photos.random", "true")
             set_user_setting("photos.slideshow", "false")
         end if
     end if
diff --git a/components/photos/PhotoDetails.brs b/components/photos/PhotoDetails.brs
index 7de2e8d6..4494022e 100644
--- a/components/photos/PhotoDetails.brs
+++ b/components/photos/PhotoDetails.brs
@@ -8,7 +8,7 @@ sub init()
     m.statusTimer = m.top.findNode("statusTimer")
     m.statusTimer.observeField("fire", "statusUpdate")
     m.slideshow = get_user_setting("photos.slideshow")
-    m.shuffle = get_user_setting("photos.shuffle")
+    m.random = get_user_setting("photos.random")
 
     m.showStatusAnimation = m.top.findNode("showStatusAnimation")
     m.hideStatusAnimation = m.top.findNode("hideStatusAnimation")
@@ -31,8 +31,8 @@ sub onPhotoLoaded()
         photo = m.top.findNode("photo")
         photo.uri = m.LoadLibrariesTask.results
 
-        if m.slideshow = "true" or m.shuffle = "true"
-            ' user has requested either a slideshow or a shuffle...
+        if m.slideshow = "true" or m.random = "true"
+            ' user has requested either a slideshow or random...
             m.slideshowTimer.control = "start"
         end if
     else
@@ -49,7 +49,7 @@ sub nextSlide()
             m.top.itemIndex++
             m.slideshowTimer.control = "start"
         end if
-    else if m.shuffle = "true"
+    else if m.random = "true"
         index = rnd(m.top.items.content.getChildCount() - 1)
         if isValidToContinue(index)
             m.top.itemIndex = index
@@ -105,7 +105,7 @@ function onKeyEvent(key as string, press as boolean) as boolean
     end if
 
     if key = "options"
-        ' Options (shuffle etc) is done on itemGrid
+        ' Options (random etc) is done on itemGrid
         return true
     end if
 
diff --git a/locale/en_US/translations.ts b/locale/en_US/translations.ts
index 2b91d901..42cf8770 100644
--- a/locale/en_US/translations.ts
+++ b/locale/en_US/translations.ts
@@ -838,12 +838,12 @@
             <translation>Slideshow Resumed</translation>
         </message>     
         <message>
-            <source>Shuffle Off</source>
-            <translation>Shuffle Off</translation>
+            <source>Random Off</source>
+            <translation>Random Off</translation>
         </message>
         <message>
-            <source>Shuffle On</source>
-            <translation>Shuffle On</translation>
+            <source>Random On</source>
+            <translation>Random On</translation>
         </message>
         <message>        
             <source>MPEG-4 Support</source>