diff --git a/data/interfaces/default/history.html b/data/interfaces/default/history.html
index cf15c87f..327b99b7 100644
--- a/data/interfaces/default/history.html
+++ b/data/interfaces/default/history.html
@@ -84,7 +84,7 @@
                 <th align="left" id="started">Started</th>
                 <th align="left" id="paused_counter">Paused</th>
                 <th align="left" id="stopped">Stopped</th>
-                <th align="left" id="duration">Duration</th>
+                <th align="left" id="play_duration">Duration</th>
                 <th align="left" id="percent_complete"></th>
             </tr>
             </thead>
diff --git a/data/interfaces/default/history_table_modal.html b/data/interfaces/default/history_table_modal.html
index 8ed42bf5..b4066627 100644
--- a/data/interfaces/default/history_table_modal.html
+++ b/data/interfaces/default/history_table_modal.html
@@ -32,7 +32,7 @@
                     <th align="left" id="started">Started</th>
                     <th align="left" id="paused_counter">Paused</th>
                     <th align="left" id="stopped">Stopped</th>
-                    <th align="left" id="duration">Duration</th>
+                    <th align="left" id="play_duration">Duration</th>
                     <th align="left" id="percent_complete"></th>
                 </tr>
                 </thead>
diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html
index 43e57694..87c8f9d8 100644
--- a/data/interfaces/default/info.html
+++ b/data/interfaces/default/info.html
@@ -692,7 +692,7 @@ DOCUMENTATION :: END
                                                     <th align="left" id="started">Started</th>
                                                     <th align="left" id="paused_counter">Paused</th>
                                                     <th align="left" id="stopped">Stopped</th>
-                                                    <th align="left" id="duration">Duration</th>
+                                                    <th align="left" id="play_duration">Duration</th>
                                                     <th align="left" id="percent_complete"></th>
                                                 </tr>
                                             </thead>
diff --git a/data/interfaces/default/js/tables/history_table.js b/data/interfaces/default/js/tables/history_table.js
index deefa067..d209f90e 100644
--- a/data/interfaces/default/js/tables/history_table.js
+++ b/data/interfaces/default/js/tables/history_table.js
@@ -247,7 +247,7 @@ history_table_options = {
         },
         {
             "targets": [11],
-            "data": "duration",
+            "data": "play_duration",
             "render": function (data, type, full) {
                 if (data !== null) {
                     return Math.round(moment.duration(data, 'seconds').as('minutes')) + ' mins';
@@ -529,7 +529,7 @@ function childTableFormat(rowData) {
                 '<th align="left" id="started">Started</th>' +
                 '<th align="left" id="paused_counter">Paused</th>' +
                 '<th align="left" id="stopped">Stopped</th>' +
-                '<th align="left" id="duration">Duration</th>' +
+                '<th align="left" id="play_duration">Duration</th>' +
                 '<th align="left" id="percent_complete"></th>' +
             '</tr>' +
             '</thead>' +
diff --git a/data/interfaces/default/library.html b/data/interfaces/default/library.html
index 59de6497..b1fe8b6f 100644
--- a/data/interfaces/default/library.html
+++ b/data/interfaces/default/library.html
@@ -248,7 +248,7 @@ DOCUMENTATION :: END
                                                     <th align="left" id="started">Started</th>
                                                     <th align="left" id="paused_counter">Paused</th>
                                                     <th align="left" id="stopped">Stopped</th>
-                                                    <th align="left" id="duration">Duration</th>
+                                                    <th align="left" id="play_duration">Duration</th>
                                                     <th align="left" id="percent_complete"></th>
                                                 </tr>
                                             </thead>
diff --git a/data/interfaces/default/user.html b/data/interfaces/default/user.html
index 501c68ca..61dfdcb5 100644
--- a/data/interfaces/default/user.html
+++ b/data/interfaces/default/user.html
@@ -212,7 +212,7 @@ DOCUMENTATION :: END
                                                     <th align="left" id="started">Started</th>
                                                     <th align="left" id="paused_counter">Paused</th>
                                                     <th align="left" id="stopped">Stopped</th>
-                                                    <th align="left" id="duration">Duration</th>
+                                                    <th align="left" id="play_duration">Duration</th>
                                                     <th align="left" id="percent_complete"></th>
                                                 </tr>
                                             </thead>
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index 62a4d9de..e2ee0c2b 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -308,7 +308,8 @@ class DataFactory(object):
                    'date': item['date'],
                    'started': item['started'],
                    'stopped': item['stopped'],
-                   'duration': item['play_duration'],
+                   'duration': item['play_duration'],  # Keep for backwards compatibility
+                   'play_duration': item['play_duration'],
                    'paused_counter': item['paused_counter'],
                    'user_id': item['user_id'],
                    'user': item['user'],