Renamed Dto objects

Updated Fody
Renamed Dto objects

MediaBrowser.Api/HttpHandlers/PlaybackCheckInHandler.cs

@@ -3,7 +3,7 @@ using MediaBrowser.Controller;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Connectivity;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using System;
 using System.ComponentModel.Composition;
 using System.Threading.Tasks;
@@ -14,13 +14,13 @@ namespace MediaBrowser.Api.HttpHandlers
     /// Provides a handler to set played status for an item
     /// </summary>
     [Export(typeof(IHttpServerHandler))]
-    public class PlaybackCheckInHandler : BaseSerializationHandler<Kernel, DtoUserItemData>
+    public class PlaybackCheckInHandler : BaseSerializationHandler<Kernel, UserItemDataDto>
     {
         /// <summary>
         /// Gets the object to serialize.
         /// </summary>
         /// <returns>Task{DtoUserItemData}.</returns>
-        protected override async Task<DtoUserItemData> GetObjectToSerialize()
+        protected override async Task<UserItemDataDto> GetObjectToSerialize()
         {
             // Get the user
             var user = await this.GetCurrentUser().ConfigureAwait(false);

MediaBrowser.Api/LibraryService.cs

@@ -3,7 +3,7 @@ using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using ServiceStack.ServiceHost;
 using System;
@@ -38,7 +38,7 @@ namespace MediaBrowser.Api
     /// Class GetPerson
     /// </summary>
     [Route("/Library/Persons/{Name}", "GET")]
-    public class GetPerson : IReturn<DtoBaseItem>
+    public class GetPerson : IReturn<BaseItemDto>
     {
         /// <summary>
         /// Gets or sets the name.
@@ -51,7 +51,7 @@ namespace MediaBrowser.Api
     /// Class GetStudio
     /// </summary>
     [Route("/Library/Studios/{Name}", "GET")]
-    public class GetStudio : IReturn<DtoBaseItem>
+    public class GetStudio : IReturn<BaseItemDto>
     {
         /// <summary>
         /// Gets or sets the name.
@@ -64,7 +64,7 @@ namespace MediaBrowser.Api
     /// Class GetGenre
     /// </summary>
     [Route("/Library/Genres/{Name}", "GET")]
-    public class GetGenre : IReturn<DtoBaseItem>
+    public class GetGenre : IReturn<BaseItemDto>
     {
         /// <summary>
         /// Gets or sets the name.
@@ -77,7 +77,7 @@ namespace MediaBrowser.Api
     /// Class GetYear
     /// </summary>
     [Route("/Library/Years/{Year}", "GET")]
-    public class GetYear : IReturn<DtoBaseItem>
+    public class GetYear : IReturn<BaseItemDto>
     {
         /// <summary>
         /// Gets or sets the year.

MediaBrowser.Api/Streaming/AudioHandler.cs

@@ -2,7 +2,7 @@
 using MediaBrowser.Common.Net.Handlers;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Resolvers;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;

MediaBrowser.Api/Streaming/BaseStreamingHandler.cs

@@ -7,7 +7,7 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Drawing;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using System;
 using System.ComponentModel;

MediaBrowser.Api/Streaming/HlsAudioPlaylistHandler.cs

@@ -1,6 +1,6 @@
 using MediaBrowser.Common.Net.Handlers;
 using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using System;
 using System.ComponentModel.Composition;
 using System.Net;

MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs

@@ -2,7 +2,7 @@
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using ServiceStack.ServiceHost;
 using System;
@@ -100,7 +100,7 @@ namespace MediaBrowser.Api.UserLibrary
         /// <param name="user">The user.</param>
         /// <param name="fields">The fields.</param>
         /// <returns>Task{DtoBaseItem}.</returns>
-        private async Task<DtoBaseItem> GetDto(Tuple<string, Func<int>> stub, User user, List<ItemFields> fields)
+        private async Task<BaseItemDto> GetDto(Tuple<string, Func<int>> stub, User user, List<ItemFields> fields)
         {
             BaseItem item;
 

MediaBrowser.Api/UserLibrary/ItemsService.cs

@@ -3,7 +3,7 @@ using MediaBrowser.Controller;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using ServiceStack.ServiceHost;
 using System;

MediaBrowser.Api/UserLibrary/UserLibraryService.cs

@@ -4,7 +4,7 @@ using MediaBrowser.Controller;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using ServiceStack.ServiceHost;
 using System;
@@ -22,7 +22,7 @@ namespace MediaBrowser.Api.UserLibrary
     /// </summary>
     [Route("/Users/{UserId}/Items/{Id}", "GET")]
     [Route("/Users/{UserId}/Items/Root", "GET")]
-    public class GetItem : IReturn<DtoBaseItem>
+    public class GetItem : IReturn<BaseItemDto>
     {
         /// <summary>
         /// Gets or sets the user id.
@@ -217,7 +217,7 @@ namespace MediaBrowser.Api.UserLibrary
     }
 
     [Route("/Users/{UserId}/Items/{Id}/LocalTrailers", "GET")]
-    public class GetLocalTrailers : IReturn<List<DtoBaseItem>>
+    public class GetLocalTrailers : IReturn<List<BaseItemDto>>
     {
         /// <summary>
         /// Gets or sets the user id.
@@ -233,7 +233,7 @@ namespace MediaBrowser.Api.UserLibrary
     }
 
     [Route("/Users/{UserId}/Items/{Id}/SpecialFeatures", "GET")]
-    public class GetSpecialFeatures : IReturn<List<DtoBaseItem>>
+    public class GetSpecialFeatures : IReturn<List<BaseItemDto>>
     {
         /// <summary>
         /// Gets or sets the user id.

MediaBrowser.Api/UserService.cs

@@ -3,7 +3,7 @@ using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Serialization;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using ServiceStack.ServiceHost;
 using System;
 using System.Collections.Generic;
@@ -19,7 +19,7 @@ namespace MediaBrowser.Api
     /// Class GetUsers
     /// </summary>
     [Route("/Users", "GET")]
-    public class GetUsers : IReturn<List<DtoUser>>
+    public class GetUsers : IReturn<List<UserDto>>
     {
     }
 
@@ -27,7 +27,7 @@ namespace MediaBrowser.Api
     /// Class GetUser
     /// </summary>
     [Route("/Users/{Id}", "GET")]
-    public class GetUser : IReturn<DtoUser>
+    public class GetUser : IReturn<UserDto>
     {
         /// <summary>
         /// Gets or sets the id.
@@ -122,7 +122,7 @@ namespace MediaBrowser.Api
     /// Class CreateUser
     /// </summary>
     [Route("/Users", "POST")]
-    public class CreateUser : IRequiresRequestStream, IReturn<DtoUser>
+    public class CreateUser : IRequiresRequestStream, IReturn<UserDto>
     {
         /// <summary>
         /// The raw Http Request Input Stream
@@ -265,7 +265,7 @@ namespace MediaBrowser.Api
             
             var kernel = (Kernel)Kernel;
 
-            var dtoUser = JsonSerializer.DeserializeFromStream<DtoUser>(request.RequestStream);
+            var dtoUser = JsonSerializer.DeserializeFromStream<UserDto>(request.RequestStream);
 
             var user = kernel.GetUserById(id);
 
@@ -285,7 +285,7 @@ namespace MediaBrowser.Api
         {
             var kernel = (Kernel)Kernel;
 
-            var dtoUser = JsonSerializer.DeserializeFromStream<DtoUser>(request.RequestStream);
+            var dtoUser = JsonSerializer.DeserializeFromStream<UserDto>(request.RequestStream);
 
             var newUser = kernel.UserManager.CreateUser(dtoUser.Name).Result;
 

MediaBrowser.ApiInteraction/ApiClient.cs

@@ -1,5 +1,5 @@
 using MediaBrowser.Model.Configuration;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Logging;
@@ -75,9 +75,9 @@ namespace MediaBrowser.ApiInteraction
         /// </summary>
         /// <param name="id">The id.</param>
         /// <param name="userId">The user id.</param>
-        /// <returns>Task{DtoBaseItem}.</returns>
+        /// <returns>Task{BaseItemDto}.</returns>
         /// <exception cref="System.ArgumentNullException">id</exception>
-        public async Task<DtoBaseItem> GetItemAsync(string id, Guid userId)
+        public async Task<BaseItemDto> GetItemAsync(string id, Guid userId)
         {
             if (string.IsNullOrEmpty(id))
             {
@@ -93,7 +93,7 @@ namespace MediaBrowser.ApiInteraction
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
-                return DeserializeFromStream<DtoBaseItem>(stream);
+                return DeserializeFromStream<BaseItemDto>(stream);
             }
         }
 
@@ -128,9 +128,9 @@ namespace MediaBrowser.ApiInteraction
         /// Gets a BaseItem
         /// </summary>
         /// <param name="userId">The user id.</param>
-        /// <returns>Task{DtoBaseItem}.</returns>
+        /// <returns>Task{BaseItemDto}.</returns>
         /// <exception cref="System.ArgumentNullException">userId</exception>
-        public async Task<DtoBaseItem> GetRootFolderAsync(Guid userId)
+        public async Task<BaseItemDto> GetRootFolderAsync(Guid userId)
         {
             if (userId == Guid.Empty)
             {
@@ -141,21 +141,21 @@ namespace MediaBrowser.ApiInteraction
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
-                return DeserializeFromStream<DtoBaseItem>(stream);
+                return DeserializeFromStream<BaseItemDto>(stream);
             }
         }
 
         /// <summary>
         /// Gets all Users
         /// </summary>
-        /// <returns>Task{DtoUser[]}.</returns>
-        public async Task<DtoUser[]> GetAllUsersAsync()
+        /// <returns>Task{UserDto[]}.</returns>
+        public async Task<UserDto[]> GetAllUsersAsync()
         {
             var url = GetApiUrl("Users");
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
-                return DeserializeFromStream<DtoUser[]>(stream);
+                return DeserializeFromStream<UserDto[]>(stream);
             }
         }
 
@@ -233,9 +233,9 @@ namespace MediaBrowser.ApiInteraction
         /// Gets a studio
         /// </summary>
         /// <param name="name">The name.</param>
-        /// <returns>Task{DtoBaseItem}.</returns>
+        /// <returns>Task{BaseItemDto}.</returns>
         /// <exception cref="System.ArgumentNullException">userId</exception>
-        public async Task<DtoBaseItem> GetStudioAsync(string name)
+        public async Task<BaseItemDto> GetStudioAsync(string name)
         {
             if (string.IsNullOrEmpty(name))
             {
@@ -246,7 +246,7 @@ namespace MediaBrowser.ApiInteraction
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
-                return DeserializeFromStream<DtoBaseItem>(stream);
+                return DeserializeFromStream<BaseItemDto>(stream);
             }
         }
 
@@ -254,9 +254,9 @@ namespace MediaBrowser.ApiInteraction
         /// Gets a genre
         /// </summary>
         /// <param name="name">The name.</param>
-        /// <returns>Task{DtoBaseItem}.</returns>
+        /// <returns>Task{BaseItemDto}.</returns>
         /// <exception cref="System.ArgumentNullException">userId</exception>
-        public async Task<DtoBaseItem> GetGenreAsync(string name)
+        public async Task<BaseItemDto> GetGenreAsync(string name)
         {
             if (string.IsNullOrEmpty(name))
             {
@@ -267,7 +267,7 @@ namespace MediaBrowser.ApiInteraction
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
-                return DeserializeFromStream<DtoBaseItem>(stream);
+                return DeserializeFromStream<BaseItemDto>(stream);
             }
         }
 
@@ -302,9 +302,9 @@ namespace MediaBrowser.ApiInteraction
         /// Gets a person
         /// </summary>
         /// <param name="name">The name.</param>
-        /// <returns>Task{DtoBaseItem}.</returns>
+        /// <returns>Task{BaseItemDto}.</returns>
         /// <exception cref="System.ArgumentNullException">userId</exception>
-        public async Task<DtoBaseItem> GetPersonAsync(string name)
+        public async Task<BaseItemDto> GetPersonAsync(string name)
         {
             if (string.IsNullOrEmpty(name))
             {
@@ -315,7 +315,7 @@ namespace MediaBrowser.ApiInteraction
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
-                return DeserializeFromStream<DtoBaseItem>(stream);
+                return DeserializeFromStream<BaseItemDto>(stream);
             }
         }
 
@@ -323,15 +323,15 @@ namespace MediaBrowser.ApiInteraction
         /// Gets a year
         /// </summary>
         /// <param name="year">The year.</param>
-        /// <returns>Task{DtoBaseItem}.</returns>
+        /// <returns>Task{BaseItemDto}.</returns>
         /// <exception cref="System.ArgumentNullException">userId</exception>
-        public async Task<DtoBaseItem> GetYearAsync(int year)
+        public async Task<BaseItemDto> GetYearAsync(int year)
         {
             var url = GetApiUrl("Library/Years/" + year);
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
-                return DeserializeFromStream<DtoBaseItem>(stream);
+                return DeserializeFromStream<BaseItemDto>(stream);
             }
         }
 
@@ -438,9 +438,9 @@ namespace MediaBrowser.ApiInteraction
         /// Gets a user by id
         /// </summary>
         /// <param name="id">The id.</param>
-        /// <returns>Task{DtoUser}.</returns>
+        /// <returns>Task{UserDto}.</returns>
         /// <exception cref="System.ArgumentNullException">id</exception>
-        public async Task<DtoUser> GetUserAsync(Guid id)
+        public async Task<UserDto> GetUserAsync(Guid id)
         {
             if (id == Guid.Empty)
             {
@@ -451,7 +451,7 @@ namespace MediaBrowser.ApiInteraction
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
-                return DeserializeFromStream<DtoUser>(stream);
+                return DeserializeFromStream<UserDto>(stream);
             }
         }
 
@@ -517,7 +517,7 @@ namespace MediaBrowser.ApiInteraction
         /// <param name="itemId">The item id.</param>
         /// <returns>Task{ItemsResult}.</returns>
         /// <exception cref="System.ArgumentNullException">query</exception>
-        public async Task<DtoBaseItem[]> GetLocalTrailersAsync(Guid userId, string itemId)
+        public async Task<BaseItemDto[]> GetLocalTrailersAsync(Guid userId, string itemId)
         {
             if (userId == Guid.Empty)
             {
@@ -532,7 +532,7 @@ namespace MediaBrowser.ApiInteraction
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
-                return DeserializeFromStream<DtoBaseItem[]>(stream);
+                return DeserializeFromStream<BaseItemDto[]>(stream);
             }
         }
 
@@ -541,9 +541,9 @@ namespace MediaBrowser.ApiInteraction
         /// </summary>
         /// <param name="userId">The user id.</param>
         /// <param name="itemId">The item id.</param>
-        /// <returns>Task{DtoBaseItem[]}.</returns>
+        /// <returns>Task{BaseItemDto[]}.</returns>
         /// <exception cref="System.ArgumentNullException">userId</exception>
-        public async Task<DtoBaseItem[]> GetSpecialFeaturesAsync(Guid userId, string itemId)
+        public async Task<BaseItemDto[]> GetSpecialFeaturesAsync(Guid userId, string itemId)
         {
             if (userId == Guid.Empty)
             {
@@ -558,7 +558,7 @@ namespace MediaBrowser.ApiInteraction
 
             using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
             {
-                return DeserializeFromStream<DtoBaseItem[]>(stream);
+                return DeserializeFromStream<BaseItemDto[]>(stream);
             }
         }
 
@@ -658,7 +658,7 @@ namespace MediaBrowser.ApiInteraction
         /// <param name="userId">The user id.</param>
         /// <returns>Task{DtoUserItemData}.</returns>
         /// <exception cref="System.ArgumentNullException">itemId</exception>
-        public Task<DtoUserItemData> ReportPlaybackStartAsync(string itemId, Guid userId)
+        public Task<UserItemDataDto> ReportPlaybackStartAsync(string itemId, Guid userId)
         {
             if (string.IsNullOrEmpty(itemId))
             {
@@ -677,7 +677,7 @@ namespace MediaBrowser.ApiInteraction
 
             var url = GetApiUrl("playbackcheckin", dict);
 
-            return PostAsync<DtoUserItemData>(url, new Dictionary<string, string>());
+            return PostAsync<UserItemDataDto>(url, new Dictionary<string, string>());
         }
 
         /// <summary>
@@ -688,7 +688,7 @@ namespace MediaBrowser.ApiInteraction
         /// <param name="positionTicks">The position ticks.</param>
         /// <returns>Task{DtoUserItemData}.</returns>
         /// <exception cref="System.ArgumentNullException">itemId</exception>
-        public Task<DtoUserItemData> ReportPlaybackProgressAsync(string itemId, Guid userId, long? positionTicks)
+        public Task<UserItemDataDto> ReportPlaybackProgressAsync(string itemId, Guid userId, long? positionTicks)
         {
             if (string.IsNullOrEmpty(itemId))
             {
@@ -709,7 +709,7 @@ namespace MediaBrowser.ApiInteraction
 
             var url = GetApiUrl("playbackcheckin", dict);
 
-            return PostAsync<DtoUserItemData>(url, new Dictionary<string, string>());
+            return PostAsync<UserItemDataDto>(url, new Dictionary<string, string>());
         }
 
         /// <summary>
@@ -720,7 +720,7 @@ namespace MediaBrowser.ApiInteraction
         /// <param name="positionTicks">The position ticks.</param>
         /// <returns>Task{DtoUserItemData}.</returns>
         /// <exception cref="System.ArgumentNullException">itemId</exception>
-        public Task<DtoUserItemData> ReportPlaybackStoppedAsync(string itemId, Guid userId, long? positionTicks)
+        public Task<UserItemDataDto> ReportPlaybackStoppedAsync(string itemId, Guid userId, long? positionTicks)
         {
             if (string.IsNullOrEmpty(itemId))
             {
@@ -741,7 +741,7 @@ namespace MediaBrowser.ApiInteraction
 
             var url = GetApiUrl("playbackcheckin", dict);
 
-            return PostAsync<DtoUserItemData>(url, new Dictionary<string, string>());
+            return PostAsync<UserItemDataDto>(url, new Dictionary<string, string>());
         }
 
         /// <summary>
@@ -776,7 +776,7 @@ namespace MediaBrowser.ApiInteraction
         /// <param name="likes">if set to <c>true</c> [likes].</param>
         /// <returns>Task{DtoUserItemData}.</returns>
         /// <exception cref="System.ArgumentNullException">itemId</exception>
-        public Task<DtoUserItemData> UpdateUserItemRatingAsync(string itemId, Guid userId, bool likes)
+        public Task<UserItemDataDto> UpdateUserItemRatingAsync(string itemId, Guid userId, bool likes)
         {
             if (string.IsNullOrEmpty(itemId))
             {
@@ -794,7 +794,7 @@ namespace MediaBrowser.ApiInteraction
 
             var url = GetApiUrl("Users/" + userId + "/Items/" + itemId + "/Rating", dict);
 
-            return PostAsync<DtoUserItemData>(url, new Dictionary<string, string>());
+            return PostAsync<UserItemDataDto>(url, new Dictionary<string, string>());
         }
 
         /// <summary>

MediaBrowser.ApiInteraction/BaseApiClient.cs

@@ -1,5 +1,5 @@
 using MediaBrowser.Model.Connectivity;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Web;
@@ -275,7 +275,7 @@ namespace MediaBrowser.ApiInteraction
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="System.ArgumentNullException">item</exception>
-        public string GetImageUrl(DtoBaseItem item, ImageOptions options)
+        public string GetImageUrl(BaseItemDto item, ImageOptions options)
         {
             if (item == null)
             {
@@ -331,7 +331,7 @@ namespace MediaBrowser.ApiInteraction
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="System.ArgumentNullException">user</exception>
-        public string GetUserImageUrl(DtoUser user, ImageOptions options)
+        public string GetUserImageUrl(UserDto user, ImageOptions options)
         {
             if (user == null)
             {
@@ -398,7 +398,7 @@ namespace MediaBrowser.ApiInteraction
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="System.ArgumentNullException">item</exception>
-        public string GetPersonImageUrl(DtoBaseItem item, ImageOptions options)
+        public string GetPersonImageUrl(BaseItemDto item, ImageOptions options)
         {
             if (item == null)
             {
@@ -441,7 +441,7 @@ namespace MediaBrowser.ApiInteraction
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="System.ArgumentNullException">item</exception>
-        public string GetYearImageUrl(DtoBaseItem item, ImageOptions options)
+        public string GetYearImageUrl(BaseItemDto item, ImageOptions options)
         {
             if (item == null)
             {
@@ -478,7 +478,7 @@ namespace MediaBrowser.ApiInteraction
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="System.ArgumentNullException">item</exception>
-        public string GetGenreImageUrl(DtoBaseItem item, ImageOptions options)
+        public string GetGenreImageUrl(BaseItemDto item, ImageOptions options)
         {
             if (item == null)
             {
@@ -521,7 +521,7 @@ namespace MediaBrowser.ApiInteraction
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="System.ArgumentNullException">item</exception>
-        public string GetStudioImageUrl(DtoBaseItem item, ImageOptions options)
+        public string GetStudioImageUrl(BaseItemDto item, ImageOptions options)
         {
             if (item == null)
             {
@@ -564,7 +564,7 @@ namespace MediaBrowser.ApiInteraction
         /// <param name="options">The options.</param>
         /// <returns>System.String[][].</returns>
         /// <exception cref="System.ArgumentNullException">item</exception>
-        public string[] GetBackdropImageUrls(DtoBaseItem item, ImageOptions options)
+        public string[] GetBackdropImageUrls(BaseItemDto item, ImageOptions options)
         {
             if (item == null)
             {
@@ -617,7 +617,7 @@ namespace MediaBrowser.ApiInteraction
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
         /// <exception cref="System.ArgumentNullException">item</exception>
-        public string GetLogoImageUrl(DtoBaseItem item, ImageOptions options)
+        public string GetLogoImageUrl(BaseItemDto item, ImageOptions options)
         {
             if (item == null)
             {

MediaBrowser.Controller/Library/DtoBuilder.cs

@@ -4,7 +4,7 @@ using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Model.Drawing;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 using System;
@@ -34,7 +34,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="fields">The fields.</param>
         /// <returns>Task{DtoBaseItem}.</returns>
         /// <exception cref="System.ArgumentNullException">item</exception>
-        public async static Task<DtoBaseItem> GetDtoBaseItem(BaseItem item, List<ItemFields> fields)
+        public async static Task<BaseItemDto> GetDtoBaseItem(BaseItem item, List<ItemFields> fields)
         {
             if (item == null)
             {
@@ -45,7 +45,7 @@ namespace MediaBrowser.Controller.Library
                 throw new ArgumentNullException("fields");
             }
 
-            var dto = new DtoBaseItem();
+            var dto = new BaseItemDto();
 
             var tasks = new List<Task>();
 
@@ -91,7 +91,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="fields">The fields.</param>
         /// <returns>Task{DtoBaseItem}.</returns>
         /// <exception cref="System.ArgumentNullException"></exception>
-        public async static Task<DtoBaseItem> GetDtoBaseItem(BaseItem item, User user, List<ItemFields> fields)
+        public async static Task<BaseItemDto> GetDtoBaseItem(BaseItem item, User user, List<ItemFields> fields)
         {
             if (item == null)
             {
@@ -106,7 +106,7 @@ namespace MediaBrowser.Controller.Library
                 throw new ArgumentNullException("fields");
             }
 
-            var dto = new DtoBaseItem();
+            var dto = new BaseItemDto();
 
             var tasks = new List<Task>();
 
@@ -153,7 +153,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="item">The item.</param>
         /// <param name="user">The user.</param>
         /// <param name="fields">The fields.</param>
-        private static void AttachUserSpecificInfo(DtoBaseItem dto, BaseItem item, User user, List<ItemFields> fields)
+        private static void AttachUserSpecificInfo(BaseItemDto dto, BaseItem item, User user, List<ItemFields> fields)
         {
             dto.IsNew = item.IsRecentlyAdded(user);
 
@@ -192,7 +192,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="dto">The dto.</param>
         /// <param name="item">The item.</param>
         /// <returns>Task.</returns>
-        private static async Task AttachPrimaryImageAspectRatio(DtoBaseItem dto, BaseItem item)
+        private static async Task AttachPrimaryImageAspectRatio(BaseItemDto dto, BaseItem item)
         {
             var path = item.PrimaryImagePath;
 
@@ -234,7 +234,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="dto">The dto.</param>
         /// <param name="item">The item.</param>
         /// <param name="fields">The fields.</param>
-        private static void AttachBasicFields(DtoBaseItem dto, BaseItem item, List<ItemFields> fields)
+        private static void AttachBasicFields(BaseItemDto dto, BaseItem item, List<ItemFields> fields)
         {
             if (fields.Contains(ItemFields.DateCreated))
             {
@@ -467,7 +467,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="folder">The folder.</param>
         /// <param name="user">The user.</param>
         /// <param name="dto">The dto.</param>
-        private static void SetSpecialCounts(Folder folder, User user, DtoBaseItem dto)
+        private static void SetSpecialCounts(Folder folder, User user, BaseItemDto dto)
         {
             var utcNow = DateTime.UtcNow;
 
@@ -555,7 +555,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="dto">The dto.</param>
         /// <param name="item">The item.</param>
         /// <returns>Task.</returns>
-        private static async Task AttachPeople(DtoBaseItem dto, BaseItem item)
+        private static async Task AttachPeople(BaseItemDto dto, BaseItem item)
         {
             if (item.People == null)
             {
@@ -675,14 +675,14 @@ namespace MediaBrowser.Controller.Library
         /// <param name="data">The data.</param>
         /// <returns>DtoUserItemData.</returns>
         /// <exception cref="System.ArgumentNullException"></exception>
-        public static DtoUserItemData GetDtoUserItemData(UserItemData data)
+        public static UserItemDataDto GetDtoUserItemData(UserItemData data)
         {
             if (data == null)
             {
                 throw new ArgumentNullException();
             }
 
-            return new DtoUserItemData
+            return new UserItemDataDto
             {
                 IsFavorite = data.IsFavorite,
                 Likes = data.Likes,
@@ -786,14 +786,14 @@ namespace MediaBrowser.Controller.Library
         /// <param name="user">The user.</param>
         /// <returns>DtoUser.</returns>
         /// <exception cref="System.ArgumentNullException">user</exception>
-        public static DtoUser GetDtoUser(User user)
+        public static UserDto GetDtoUser(User user)
         {
             if (user == null)
             {
                 throw new ArgumentNullException("user");
             }
 
-            var dto = new DtoUser
+            var dto = new UserDto
             {
                 Id = user.Id,
                 Name = user.Name,

MediaBrowser.Model/DTO/DTOBaseItem.cs → MediaBrowser.Model/DTO/BaseItemDto.cs

@@ -5,14 +5,14 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 
-namespace MediaBrowser.Model.DTO
+namespace MediaBrowser.Model.Dto
 {
     /// <summary>
     /// This is strictly used as a data transfer object from the api layer.
     /// This holds information about a BaseItem in a format that is convenient for the client.
     /// </summary>
     [ProtoContract]
-    public class DtoBaseItem : IHasProviderIds, INotifyPropertyChanged
+    public class BaseItemDto : IHasProviderIds, INotifyPropertyChanged
     {
         /// <summary>
         /// Gets or sets the name.
@@ -229,7 +229,7 @@ namespace MediaBrowser.Model.DTO
         /// </summary>
         /// <value>The user data.</value>
         [ProtoMember(36)]
-        public DtoUserItemData UserData { get; set; }
+        public UserItemDataDto UserData { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether this instance is new.

MediaBrowser.Model/DTO/BaseItemPerson.cs

@@ -3,7 +3,7 @@ using System;
 using System.ComponentModel;
 using System.Runtime.Serialization;
 
-namespace MediaBrowser.Model.DTO
+namespace MediaBrowser.Model.Dto
 {
     /// <summary>
     /// This is used by the api to get information about a Person within a BaseItem

MediaBrowser.Model/DTO/ChapterInfoDto.cs

@@ -3,7 +3,7 @@ using System;
 using System.ComponentModel;
 using System.Runtime.Serialization;
 
-namespace MediaBrowser.Model.DTO
+namespace MediaBrowser.Model.Dto
 {
     /// <summary>
     /// Class ChapterInfo

MediaBrowser.Model/DTO/ImageOptions.cs

@@ -2,7 +2,7 @@
 using System;
 using MediaBrowser.Model.Entities;
 
-namespace MediaBrowser.Model.DTO
+namespace MediaBrowser.Model.Dto
 {
     /// <summary>
     /// Class ImageOptions

MediaBrowser.Model/DTO/ItemFields.cs

@@ -1,5 +1,5 @@
 
-namespace MediaBrowser.Model.DTO
+namespace MediaBrowser.Model.Dto
 {
     /// <summary>
     /// Used to control the data that gets attached to DtoBaseItems

MediaBrowser.Model/DTO/ItemFilter.cs

@@ -1,5 +1,5 @@
 
-namespace MediaBrowser.Model.DTO
+namespace MediaBrowser.Model.Dto
 {
     /// <summary>
     /// Enum ItemFilter

MediaBrowser.Model/DTO/ItemQuery.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Entities;
 using System;
 
-namespace MediaBrowser.Model.DTO
+namespace MediaBrowser.Model.Dto
 {
     /// <summary>
     /// Contains all the possible parameters that can be used to query for items

MediaBrowser.Model/DTO/ItemSortBy.cs

@@ -1,5 +1,5 @@
 
-namespace MediaBrowser.Model.DTO
+namespace MediaBrowser.Model.Dto
 {
     /// <summary>
     /// Enum ItemSortBy

MediaBrowser.Model/DTO/ItemsResult.cs

@@ -1,6 +1,6 @@
 using ProtoBuf;
 
-namespace MediaBrowser.Model.DTO
+namespace MediaBrowser.Model.Dto
 {
     /// <summary>
     /// Represents the result of a query for items
@@ -13,7 +13,7 @@ namespace MediaBrowser.Model.DTO
         /// </summary>
         /// <value>The items.</value>
         [ProtoMember(1)]
-        public DtoBaseItem[] Items { get; set; }
+        public BaseItemDto[] Items { get; set; }
 
         /// <summary>
         /// The total number of records available

MediaBrowser.Model/DTO/MediaType.cs

@@ -1,5 +1,5 @@
 
-namespace MediaBrowser.Model.DTO
+namespace MediaBrowser.Model.Dto
 {
     /// <summary>
     /// Enum MediaType

MediaBrowser.Model/DTO/StreamOptions.cs

@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.DTO
+namespace MediaBrowser.Model.Dto
 {
     /// <summary>
     /// Class VideoStreamOptions

MediaBrowser.Model/DTO/DTOUser.cs → MediaBrowser.Model/DTO/UserDto.cs

@@ -4,13 +4,13 @@ using ProtoBuf;
 using System;
 using System.Runtime.Serialization;
 
-namespace MediaBrowser.Model.DTO
+namespace MediaBrowser.Model.Dto
 {
     /// <summary>
-    /// Class DtoUser
+    /// Class UserDto
     /// </summary>
     [ProtoContract]
-    public class DtoUser : INotifyPropertyChanged
+    public class UserDto : INotifyPropertyChanged
     {
         /// <summary>
         /// Gets or sets the name.

MediaBrowser.Model/DTO/DTOUserItemData.cs → MediaBrowser.Model/DTO/UserItemDataDto.cs

@@ -1,13 +1,13 @@
 using System.ComponentModel;
 using ProtoBuf;
 
-namespace MediaBrowser.Model.DTO
+namespace MediaBrowser.Model.Dto
 {
     /// <summary>
     /// Class DtoUserItemData
     /// </summary>
     [ProtoContract]
-    public class DtoUserItemData : INotifyPropertyChanged
+    public class UserItemDataDto : INotifyPropertyChanged
     {
         /// <summary>
         /// Gets or sets the rating.
@@ -38,14 +38,14 @@ namespace MediaBrowser.Model.DTO
         public bool IsFavorite { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether this <see cref="DtoUserItemData" /> is likes.
+        /// Gets or sets a value indicating whether this <see cref="UserItemDataDto" /> is likes.
         /// </summary>
         /// <value><c>null</c> if [likes] contains no value, <c>true</c> if [likes]; otherwise, <c>false</c>.</value>
         [ProtoMember(5)]
         public bool? Likes { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether this <see cref="DtoUserItemData" /> is played.
+        /// Gets or sets a value indicating whether this <see cref="UserItemDataDto" /> is played.
         /// </summary>
         /// <value><c>true</c> if played; otherwise, <c>false</c>.</value>
         [ProtoMember(6)]

MediaBrowser.Model/MediaBrowser.Model.csproj

@@ -76,11 +76,11 @@
     <Compile Include="Entities\RequestResult.cs" />
     <Compile Include="Configuration\UserConfiguration.cs" />
     <Compile Include="Drawing\DrawingUtils.cs" />
-    <Compile Include="DTO\DtoUserItemData.cs" />
+    <Compile Include="DTO\UserItemDataDto.cs" />
     <Compile Include="DTO\ItemFields.cs" />
     <Compile Include="DTO\ItemSortBy.cs" />
-    <Compile Include="DTO\DtoBaseItem.cs" />
-    <Compile Include="DTO\DtoUser.cs" />
+    <Compile Include="DTO\BaseItemDto.cs" />
+    <Compile Include="DTO\UserDto.cs" />
     <Compile Include="DTO\ItemsResult.cs" />
     <Compile Include="Entities\DisplayPreferences.cs" />
     <Compile Include="Entities\ImageType.cs" />

MediaBrowser.Plugins.DefaultTheme/Controls/BaseItemTile.xaml.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Net;
 using MediaBrowser.UI;
 using MediaBrowser.UI.Controls;
@@ -28,7 +28,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls
         /// Gets the item.
         /// </summary>
         /// <value>The item.</value>
-        private DtoBaseItem Item
+        private BaseItemDto Item
         {
             get { return ViewModel.Item; }
         }

MediaBrowser.Plugins.DefaultTheme/Controls/Details/BaseDetailsControl.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.UI.Controls;
 
 namespace MediaBrowser.Plugins.DefaultTheme.Controls.Details
@@ -19,12 +19,12 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls.Details
         /// <summary>
         /// The _item
         /// </summary>
-        private DtoBaseItem _item;
+        private BaseItemDto _item;
         /// <summary>
         /// Gets or sets the item.
         /// </summary>
         /// <value>The item.</value>
-        public DtoBaseItem Item
+        public BaseItemDto Item
         {
             get { return _item; }
 

MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemChapters.xaml.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.UI.Controller;
 using MediaBrowser.UI.Controls;
 using MediaBrowser.UI.Playback;
@@ -35,7 +35,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls.Details
 
             UIKernel.Instance.PlaybackManager.Play(new PlayOptions
             {
-                Items = new List<DtoBaseItem> { Item },
+                Items = new List<BaseItemDto> { Item },
                 StartPositionTicks = chapterViewModel.Chapter.StartPositionTicks
             });
         }

MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemGallery.xaml.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Net;
 using MediaBrowser.UI;
@@ -101,7 +101,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls.Details
         /// </summary>
         /// <param name="item">The item.</param>
         /// <returns>List{System.String}.</returns>
-        internal static List<string> GetImages(DtoBaseItem item)
+        internal static List<string> GetImages(BaseItemDto item)
         {
             var images = new List<string> { };
 

MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemOverview.xaml.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using System;
 using System.Linq;
 using System.Windows;

MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemPerformers.xaml.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.UI;
 using MediaBrowser.UI.Controller;
 using MediaBrowser.UI.ViewModels;

MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemSpecialFeatures.xaml.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Net;
 using MediaBrowser.UI;
 using MediaBrowser.UI.Controller;
@@ -36,7 +36,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls.Details
 
             UIKernel.Instance.PlaybackManager.Play(new PlayOptions
             {
-                Items = new List<DtoBaseItem> { viewModel.Item }
+                Items = new List<BaseItemDto> { viewModel.Item }
             });
         }
 
@@ -45,7 +45,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls.Details
         /// </summary>
         protected override async void OnItemChanged()
         {
-            DtoBaseItem[] result;
+            BaseItemDto[] result;
 
             try
             {
@@ -58,7 +58,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls.Details
                 return;
             }
 
-            var resultItems = result ?? new DtoBaseItem[] { };
+            var resultItems = result ?? new BaseItemDto[] { };
 
             const int height = 297;
             var aspectRatio = DtoBaseItemViewModel.GetAveragePrimaryImageAspectRatio(resultItems);

MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemTrailers.xaml.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Net;
 using MediaBrowser.UI;
 using MediaBrowser.UI.Controller;
@@ -36,7 +36,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls.Details
 
             UIKernel.Instance.PlaybackManager.Play(new PlayOptions
             {
-                Items = new List<DtoBaseItem> { viewModel.Item }
+                Items = new List<BaseItemDto> { viewModel.Item }
             });
         }
 
@@ -45,7 +45,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls.Details
         /// </summary>
         protected override async void OnItemChanged()
         {
-            DtoBaseItem[] result;
+            BaseItemDto[] result;
 
             try
             {
@@ -58,7 +58,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls.Details
                 return;
             }
 
-            var resultItems = result ?? new DtoBaseItem[] { };
+            var resultItems = result ?? new BaseItemDto[] { };
 
             const int height = 297;
             var aspectRatio = DtoBaseItemViewModel.GetAveragePrimaryImageAspectRatio(resultItems);

MediaBrowser.Plugins.DefaultTheme/Controls/HomePageTile.xaml.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Net;
 using MediaBrowser.UI;
@@ -27,7 +27,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls
         /// Gets the item.
         /// </summary>
         /// <value>The item.</value>
-        private DtoBaseItem Item
+        private BaseItemDto Item
         {
             get { return ViewModel.Item; }
         }

MediaBrowser.Plugins.DefaultTheme/Controls/MultiItemTile.xaml.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Net;
 using MediaBrowser.UI;
@@ -179,7 +179,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls
         /// </summary>
         /// <param name="item">The item.</param>
         /// <returns>Uri.</returns>
-        private string GetImageSource(DtoBaseItem item)
+        private string GetImageSource(BaseItemDto item)
         {
             if (item != null)
             {

MediaBrowser.Plugins.DefaultTheme/Pages/DetailPage.xaml.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Plugins.DefaultTheme.Controls.Details;

MediaBrowser.Plugins.DefaultTheme/Pages/HomePage.xaml.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Plugins.DefaultTheme.Resources;
@@ -192,7 +192,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Pages
             }
             else
             {
-                SetResumableItems(new DtoBaseItem[] { });
+                SetResumableItems(new BaseItemDto[] { });
             }
 
             // Recently Added Items
@@ -202,7 +202,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Pages
             }
             else
             {
-                SetRecentlyAddedItems(new DtoBaseItem[] { });
+                SetRecentlyAddedItems(new BaseItemDto[] { });
             }
 
             // Recently Played Items
@@ -212,7 +212,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Pages
             }
             else
             {
-                SetRecentlyPlayedItems(new DtoBaseItem[] { });
+                SetRecentlyPlayedItems(new BaseItemDto[] { });
             }
 
             tasks.Add(RefreshTopPicksAsync());
@@ -407,7 +407,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Pages
         /// Sets the favorite items.
         /// </summary>
         /// <param name="items">The items.</param>
-        private void SetFavoriteItems(DtoBaseItem[] items)
+        private void SetFavoriteItems(BaseItemDto[] items)
         {
             FavoriteItems = new ItemCollectionViewModel { Items = items, Name = "Favorites" };
         }
@@ -416,7 +416,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Pages
         /// Sets the resumable items.
         /// </summary>
         /// <param name="items">The items.</param>
-        private void SetResumableItems(DtoBaseItem[] items)
+        private void SetResumableItems(BaseItemDto[] items)
         {
             ResumableItems = new ItemCollectionViewModel { Items = items, Name = "Resume" };
         }
@@ -425,7 +425,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Pages
         /// Sets the recently played items.
         /// </summary>
         /// <param name="items">The items.</param>
-        private void SetRecentlyPlayedItems(DtoBaseItem[] items)
+        private void SetRecentlyPlayedItems(BaseItemDto[] items)
         {
             RecentlyPlayedItems = new ItemCollectionViewModel { Items = items, Name = "Recently Played" };
         }
@@ -434,7 +434,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Pages
         /// Sets the recently added items.
         /// </summary>
         /// <param name="items">The items.</param>
-        private void SetRecentlyAddedItems(DtoBaseItem[] items)
+        private void SetRecentlyAddedItems(BaseItemDto[] items)
         {
             RecentlyAddedItems = new ItemCollectionViewModel { Items = items, Name = "Recently Added" };
         }

MediaBrowser.Plugins.DefaultTheme/Resources/AppResources.cs

@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Net;
 using MediaBrowser.UI;
 using MediaBrowser.UI.Controller;
@@ -162,7 +162,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Resources
         /// Sets the page title.
         /// </summary>
         /// <param name="item">The item.</param>
-        public async Task SetPageTitle(DtoBaseItem item)
+        public async Task SetPageTitle(BaseItemDto item)
         {
             if (item.HasLogo || !string.IsNullOrEmpty(item.ParentLogoItemId))
             {
@@ -193,7 +193,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Resources
         /// Sets the page title text.
         /// </summary>
         /// <param name="item">The item.</param>
-        private void SetPageTitleText(DtoBaseItem item)
+        private void SetPageTitleText(BaseItemDto item)
         {
             SetPageTitle(item.SeriesName ?? item.Album ?? item.Name);
         }

MediaBrowser.Plugins.DefaultTheme/Resources/AppResources.xaml

@@ -1,11 +1,11 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:themeconverters="clr-namespace:MediaBrowser.Plugins.DefaultTheme.Converters"
-                    xmlns:DTO="clr-namespace:MediaBrowser.Model.DTO;assembly=MediaBrowser.Model"
                     xmlns:themecontrols="clr-namespace:MediaBrowser.Plugins.DefaultTheme.Controls"
                     xmlns:ee="http://schemas.microsoft.com/expression/2010/effects"
                     xmlns:ViewModels="clr-namespace:MediaBrowser.UI.ViewModels;assembly=MediaBrowser.UI"
                     xmlns:controls="clr-namespace:MediaBrowser.UI.Controls;assembly=MediaBrowser.UI.Controls"
+                    xmlns:dto="clr-namespace:MediaBrowser.Model.Dto;assembly=MediaBrowser.Model"
                     x:Class="MediaBrowser.Plugins.DefaultTheme.Resources.AppResources">
 
     <themeconverters:WeatherImageConverter x:Key="WeatherImageConverter"></themeconverters:WeatherImageConverter>
@@ -45,7 +45,7 @@
     <!--Default font for h2 headers. Themes should override these as needed-->
     <Brush x:Key="Heading2Foreground">#ffffff</Brush>
 
-    <DataTemplate DataType="{x:Type DTO:DtoUser}">
+    <DataTemplate DataType="{x:Type dto:UserDto}">
         <Grid HorizontalAlignment="Left">
             <Border Background="{Binding Converter={StaticResource MetroTileBackgroundConverter},Mode=OneWay}">
                 <Image Stretch="Uniform" Width="330" Height="330">

MediaBrowser.Plugins.DefaultTheme/Theme.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Plugins.DefaultTheme.Pages;
 using MediaBrowser.Plugins.DefaultTheme.Resources;
 using MediaBrowser.UI;
@@ -21,7 +21,7 @@ namespace MediaBrowser.Plugins.DefaultTheme
         /// </summary>
         /// <param name="item">The item.</param>
         /// <returns>Page.</returns>
-        public override Page GetDetailPage(DtoBaseItem item)
+        public override Page GetDetailPage(BaseItemDto item)
         {
             return new DetailPage(item.Id);
         }
@@ -31,7 +31,7 @@ namespace MediaBrowser.Plugins.DefaultTheme
         /// </summary>
         /// <param name="item">The item.</param>
         /// <returns>Page.</returns>
-        public override Page GetListPage(DtoBaseItem item)
+        public override Page GetListPage(BaseItemDto item)
         {
             return new ListPage(item.Id);
         }

MediaBrowser.Plugins.MpcHc/MpcHcMediaPlayer.cs

@@ -1,5 +1,5 @@
 using MediaBrowser.Common.Logging;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.UI.Configuration;
 using MediaBrowser.UI.Controller;
@@ -122,7 +122,7 @@ namespace MediaBrowser.Plugins.MpcHc
         /// </summary>
         /// <param name="item">The item.</param>
         /// <returns><c>true</c> if this instance can play the specified item; otherwise, <c>false</c>.</returns>
-        public override bool CanPlay(DtoBaseItem item)
+        public override bool CanPlay(BaseItemDto item)
         {
             return item.IsVideo || item.IsAudio;
         }
@@ -134,7 +134,7 @@ namespace MediaBrowser.Plugins.MpcHc
         /// <param name="options">The options.</param>
         /// <param name="playerConfiguration">The player configuration.</param>
         /// <returns>System.String.</returns>
-        protected override string GetCommandArguments(List<DtoBaseItem> items, PlayOptions options, PlayerConfiguration playerConfiguration)
+        protected override string GetCommandArguments(List<BaseItemDto> items, PlayOptions options, PlayerConfiguration playerConfiguration)
         {
             var formatString = "{0} /play /fullscreen /close";
 
@@ -160,7 +160,7 @@ namespace MediaBrowser.Plugins.MpcHc
         /// </summary>
         /// <param name="item">The item.</param>
         /// <returns>System.String.</returns>
-        protected override string GetPathForCommandLine(DtoBaseItem item)
+        protected override string GetPathForCommandLine(BaseItemDto item)
         {
             var path = base.GetPathForCommandLine(item);
 

MediaBrowser.Plugins.Tmt5/Tmt5MediaPlayer.cs

@@ -1,6 +1,6 @@
 using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Logging;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.UI.Configuration;
 using MediaBrowser.UI.Playback;
 using MediaBrowser.UI.Playback.ExternalPlayer;
@@ -124,7 +124,7 @@ namespace MediaBrowser.Plugins.Tmt5
         /// </summary>
         /// <param name="item">The item.</param>
         /// <returns><c>true</c> if this instance can play the specified item; otherwise, <c>false</c>.</returns>
-        public override bool CanPlay(DtoBaseItem item)
+        public override bool CanPlay(BaseItemDto item)
         {
             return item.IsVideo || item.IsAudio;
         }
@@ -150,7 +150,7 @@ namespace MediaBrowser.Plugins.Tmt5
         /// <param name="options">The options.</param>
         /// <param name="playerConfiguration">The player configuration.</param>
         /// <returns>System.String.</returns>
-        protected override string GetCommandArguments(List<DtoBaseItem> items, PlayOptions options, PlayerConfiguration playerConfiguration)
+        protected override string GetCommandArguments(List<BaseItemDto> items, PlayOptions options, PlayerConfiguration playerConfiguration)
         {
             return "\"" + items[0].Path + "\"";
         }

MediaBrowser.UI/App.xaml.cs

@@ -6,7 +6,7 @@ using MediaBrowser.Common.Logging;
 using MediaBrowser.Common.UI;
 using MediaBrowser.IsoMounter;
 using MediaBrowser.Model.Configuration;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Weather;
 using MediaBrowser.UI.Controller;
@@ -114,12 +114,12 @@ namespace MediaBrowser.UI
         /// <summary>
         /// The _current user
         /// </summary>
-        private DtoUser _currentUser;
+        private UserDto _currentUser;
         /// <summary>
         /// Gets or sets the current user.
         /// </summary>
         /// <value>The current user.</value>
-        public DtoUser CurrentUser
+        public UserDto CurrentUser
         {
             get
             {
@@ -545,7 +545,7 @@ namespace MediaBrowser.UI
         /// Navigates to item.
         /// </summary>
         /// <param name="item">The item.</param>
-        public void NavigateToItem(DtoBaseItem item)
+        public void NavigateToItem(BaseItemDto item)
         {
             if (item.IsRoot.HasValue && item.IsRoot.Value)
             {

MediaBrowser.UI/Controller/BaseTheme.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using System;
 using System.Collections.Generic;
 using System.Windows;
@@ -22,13 +22,13 @@ namespace MediaBrowser.UI.Controller
         /// </summary>
         /// <param name="item">The item.</param>
         /// <returns>Page.</returns>
-        public abstract Page GetListPage(DtoBaseItem item);
+        public abstract Page GetListPage(BaseItemDto item);
         /// <summary>
         /// Gets the detail page.
         /// </summary>
         /// <param name="item">The item.</param>
         /// <returns>Page.</returns>
-        public abstract Page GetDetailPage(DtoBaseItem item);
+        public abstract Page GetDetailPage(BaseItemDto item);
         /// <summary>
         /// Gets the home page.
         /// </summary>

MediaBrowser.UI/Converters/BaseItemImageVisibilityConverter.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using System;
 using System.Windows;
@@ -21,7 +21,7 @@ namespace MediaBrowser.UI.Converters
         /// <returns>A converted value. If the method returns null, the valid null value is used.</returns>
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
-            var item = value as DtoBaseItem;
+            var item = value as BaseItemDto;
 
             if (item != null)
             {
@@ -45,7 +45,7 @@ namespace MediaBrowser.UI.Converters
         /// <param name="type">The type.</param>
         /// <param name="reverse">if set to <c>true</c> [reverse].</param>
         /// <returns>Visibility.</returns>
-        private Visibility GetVisibility(DtoBaseItem item, ImageType type, bool reverse)
+        private Visibility GetVisibility(BaseItemDto item, ImageType type, bool reverse)
         {
             var hasImageVisibility = reverse ? Visibility.Collapsed : Visibility.Visible;
             var hasNoImageVisibility = reverse ? Visibility.Visible : Visibility.Collapsed;

MediaBrowser.UI/Converters/LastSeenTextConverter.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using System;
 using System.Globalization;
 using System.Windows.Data;
@@ -9,7 +9,7 @@ namespace MediaBrowser.UI.Converters
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            var user = value as DtoUser;
+            var user = value as UserDto;
 
             if (user != null)
             {

MediaBrowser.UI/Converters/UserImageConverter.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Net;
 using System;
 using System.Globalization;
@@ -21,7 +21,7 @@ namespace MediaBrowser.UI.Converters
         /// <returns>A converted value. If the method returns null, the valid null value is used.</returns>
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            var user = value as DtoUser;
+            var user = value as UserDto;
 
             if (user != null && user.HasPrimaryImage)
             {

MediaBrowser.UI/Converters/WatchedVisibilityConverter.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using System;
 using System.Globalization;
 using System.Windows;
@@ -10,7 +10,7 @@ namespace MediaBrowser.UI.Converters
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            var item = value as DtoBaseItem;
+            var item = value as BaseItemDto;
 
             if (item == null)
             {
@@ -40,7 +40,7 @@ namespace MediaBrowser.UI.Converters
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            var item = value as DtoBaseItem;
+            var item = value as BaseItemDto;
 
             if (item == null)
             {
@@ -65,7 +65,7 @@ namespace MediaBrowser.UI.Converters
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            var item = value as DtoBaseItem;
+            var item = value as BaseItemDto;
 
             if (item == null)
             {
@@ -92,7 +92,7 @@ namespace MediaBrowser.UI.Converters
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            var item = value as DtoBaseItem;
+            var item = value as BaseItemDto;
 
             if (item == null)
             {

MediaBrowser.UI/MainWindow.xaml.cs

@@ -1,6 +1,6 @@
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Logging;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Net;
 using MediaBrowser.UI.Controller;
 using MediaBrowser.UI.Controls;
@@ -197,10 +197,10 @@ namespace MediaBrowser.UI
         }
 
         /// <summary>
-        /// Sets the backdrop based on a DtoBaseItem
+        /// Sets the backdrop based on a BaseItemDto
         /// </summary>
         /// <param name="item">The item.</param>
-        public void SetBackdrops(DtoBaseItem item)
+        public void SetBackdrops(BaseItemDto item)
         {
             var urls = App.Instance.ApiClient.GetBackdropImageUrls(item, new ImageOptions
             {

MediaBrowser.UI/Pages/BaseDetailPage.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Net;
 using MediaBrowser.UI.Controller;
 using MediaBrowser.UI.Playback;
@@ -33,12 +33,12 @@ namespace MediaBrowser.UI.Pages
         /// <summary>
         /// The _item
         /// </summary>
-        private DtoBaseItem _item;
+        private BaseItemDto _item;
         /// <summary>
         /// Gets or sets the item.
         /// </summary>
         /// <value>The item.</value>
-        public DtoBaseItem Item
+        public BaseItemDto Item
         {
             get { return _item; }
 
@@ -133,7 +133,7 @@ namespace MediaBrowser.UI.Pages
         {
             await UIKernel.Instance.PlaybackManager.Play(new PlayOptions
             {
-                Items = new List<DtoBaseItem> { Item }
+                Items = new List<BaseItemDto> { Item }
             });
         }
 
@@ -144,7 +144,7 @@ namespace MediaBrowser.UI.Pages
         {
             await UIKernel.Instance.PlaybackManager.Play(new PlayOptions
             {
-                Items = new List<DtoBaseItem> { Item },
+                Items = new List<BaseItemDto> { Item },
                 Resume = true
             });
         }

MediaBrowser.UI/Pages/BaseFolderPage.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Net;
 using MediaBrowser.UI.ViewModels;
@@ -83,12 +83,12 @@ namespace MediaBrowser.UI.Pages
         /// <summary>
         /// The _folder
         /// </summary>
-        private DtoBaseItem _folder;
+        private BaseItemDto _folder;
         /// <summary>
         /// Gets or sets the Folder being displayed
         /// </summary>
         /// <value>The folder.</value>
-        public DtoBaseItem Folder
+        public BaseItemDto Folder
         {
             get { return _folder; }
 

MediaBrowser.UI/Pages/BaseListPage.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.UI.Controls;
 using MediaBrowser.UI.ViewModels;
@@ -49,12 +49,12 @@ namespace MediaBrowser.UI.Pages
         /// <summary>
         /// The _current item
         /// </summary>
-        private DtoBaseItem _currentItem;
+        private BaseItemDto _currentItem;
         /// <summary>
         /// Gets or sets the current selected item
         /// </summary>
         /// <value>The current item.</value>
-        public DtoBaseItem CurrentItem
+        public BaseItemDto CurrentItem
         {
             get { return _currentItem; }
 
@@ -102,7 +102,7 @@ namespace MediaBrowser.UI.Pages
         /// Updates the current item index based on the current selection
         /// </summary>
         /// <param name="value">The value.</param>
-        private void UpdateCurrentItemIndex(DtoBaseItem value)
+        private void UpdateCurrentItemIndex(BaseItemDto value)
         {
             if (value == null)
             {

MediaBrowser.UI/Pages/BaseLoginPage.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Net;
 using MediaBrowser.UI.Controls;
 using System;
@@ -14,12 +14,12 @@ namespace MediaBrowser.UI.Pages
         /// <summary>
         /// The _users
         /// </summary>
-        private DtoUser[] _users;
+        private UserDto[] _users;
         /// <summary>
         /// Gets or sets the users.
         /// </summary>
         /// <value>The users.</value>
-        public DtoUser[] Users
+        public UserDto[] Users
         {
             get { return _users; }
 
@@ -72,7 +72,7 @@ namespace MediaBrowser.UI.Pages
         /// <param name="e">The e.</param>
         async void ItemsList_ItemInvoked(object sender, ItemEventArgs<object> e)
         {
-            var user = (DtoUser)e.Argument;
+            var user = (UserDto)e.Argument;
 
             try
             {
@@ -97,7 +97,7 @@ namespace MediaBrowser.UI.Pages
         /// <param name="user">The user.</param>
         /// <param name="password">The password.</param>
         /// <returns>Task{AuthenticationResult}.</returns>
-        protected async Task LoginUser(DtoUser user, string password)
+        protected async Task LoginUser(UserDto user, string password)
         {
             await App.Instance.ApiClient.AuthenticateUserAsync(user.Id, password);
 
@@ -111,7 +111,7 @@ namespace MediaBrowser.UI.Pages
         /// </summary>
         /// <param name="user">The user.</param>
         /// <returns>Task{AuthenticationResult}.</returns>
-        protected Task LoginUser(DtoUser user)
+        protected Task LoginUser(UserDto user)
         {
             return LoginUser(user, null);
         }

MediaBrowser.UI/Pages/BasePage.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using System;
 using System.ComponentModel;
 using System.Windows;
@@ -53,9 +53,9 @@ namespace MediaBrowser.UI.Pages
         }
 
         /// <summary>
-        /// Sets the backdrop based on a DtoBaseItem
+        /// Sets the backdrop based on a BaseItemDto
         /// </summary>
-        public void SetBackdrops(DtoBaseItem item)
+        public void SetBackdrops(BaseItemDto item)
         {
             App.Instance.ApplicationWindow.SetBackdrops(item);
         }

MediaBrowser.UI/Playback/BaseMediaPlayer.cs

@@ -1,6 +1,6 @@
 using MediaBrowser.Common.Events;
 using MediaBrowser.Common.Logging;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Net;
 using MediaBrowser.UI.Configuration;
@@ -60,7 +60,7 @@ namespace MediaBrowser.UI.Playback
         /// <summary>
         /// The currently playing items
         /// </summary>
-        public List<DtoBaseItem> Playlist = new List<DtoBaseItem>();
+        public List<BaseItemDto> Playlist = new List<BaseItemDto>();
 
         /// <summary>
         /// The _play state
@@ -135,7 +135,7 @@ namespace MediaBrowser.UI.Playback
         /// </summary>
         /// <param name="item">The item.</param>
         /// <returns><c>true</c> if this instance can play the specified item; otherwise, <c>false</c>.</returns>
-        public abstract bool CanPlay(DtoBaseItem item);
+        public abstract bool CanPlay(BaseItemDto item);
 
         /// <summary>
         /// Gets a value indicating whether this instance can change volume.
@@ -180,7 +180,7 @@ namespace MediaBrowser.UI.Playback
         /// Gets the current media.
         /// </summary>
         /// <value>The current media.</value>
-        public DtoBaseItem CurrentMedia
+        public BaseItemDto CurrentMedia
         {
             get
             {
@@ -248,13 +248,13 @@ namespace MediaBrowser.UI.Playback
         /// <param name="items">The items.</param>
         /// <param name="options">The options.</param>
         /// <param name="playerConfiguration">The player configuration.</param>
-        protected abstract void PlayInternal(List<DtoBaseItem> items, PlayOptions options, PlayerConfiguration playerConfiguration);
+        protected abstract void PlayInternal(List<BaseItemDto> items, PlayOptions options, PlayerConfiguration playerConfiguration);
 
         /// <summary>
         /// Queues the internal.
         /// </summary>
         /// <param name="items">The items.</param>
-        protected virtual void QueueInternal(List<DtoBaseItem> items)
+        protected virtual void QueueInternal(List<BaseItemDto> items)
         {
         }
 
@@ -393,7 +393,7 @@ namespace MediaBrowser.UI.Playback
         /// <param name="items">The items.</param>
         /// <exception cref="System.ArgumentNullException">items</exception>
         /// <exception cref="System.InvalidOperationException"></exception>
-        internal void Queue(List<DtoBaseItem> items)
+        internal void Queue(List<BaseItemDto> items)
         {
             if (items == null)
             {
@@ -632,7 +632,7 @@ namespace MediaBrowser.UI.Playback
         /// Sends the playback start check in.
         /// </summary>
         /// <param name="item">The item.</param>
-        protected async void SendPlaybackStartCheckIn(DtoBaseItem item)
+        protected async void SendPlaybackStartCheckIn(BaseItemDto item)
         {
             if (string.IsNullOrEmpty(item.Id))
             {
@@ -656,7 +656,7 @@ namespace MediaBrowser.UI.Playback
         /// </summary>
         /// <param name="item">The item.</param>
         /// <param name="positionTicks">The position ticks.</param>
-        protected async void SendPlaybackProgressCheckIn(DtoBaseItem item, long? positionTicks)
+        protected async void SendPlaybackProgressCheckIn(BaseItemDto item, long? positionTicks)
         {
             if (string.IsNullOrEmpty(item.Id))
             {
@@ -681,7 +681,7 @@ namespace MediaBrowser.UI.Playback
         /// </summary>
         /// <param name="item">The item.</param>
         /// <param name="positionTicks">The position ticks.</param>
-        protected async void SendPlaybackStopCheckIn(DtoBaseItem item, long? positionTicks)
+        protected async void SendPlaybackStopCheckIn(BaseItemDto item, long? positionTicks)
         {
             if (string.IsNullOrEmpty(item.Id))
             {
@@ -705,7 +705,7 @@ namespace MediaBrowser.UI.Playback
         /// Marks the watched.
         /// </summary>
         /// <param name="items">The items.</param>
-        protected async void MarkWatched(IEnumerable<DtoBaseItem> items)
+        protected async void MarkWatched(IEnumerable<BaseItemDto> items)
         {
             var idList = items.Where(i => !string.IsNullOrEmpty(i.Id)).Select(i => i.Id);
 

MediaBrowser.UI/Playback/ExternalPlayer/BaseExternalPlayer.cs

@@ -1,5 +1,5 @@
 using MediaBrowser.Common.Logging;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.UI.Configuration;
 using MediaBrowser.UI.UserInput;
 using System;
@@ -71,7 +71,7 @@ namespace MediaBrowser.UI.Playback.ExternalPlayer
         /// <param name="options">The options.</param>
         /// <param name="playerConfiguration">The player configuration.</param>
         /// <returns>ProcessStartInfo.</returns>
-        protected virtual ProcessStartInfo GetProcessStartInfo(List<DtoBaseItem> items, PlayOptions options, PlayerConfiguration playerConfiguration)
+        protected virtual ProcessStartInfo GetProcessStartInfo(List<BaseItemDto> items, PlayOptions options, PlayerConfiguration playerConfiguration)
         {
             return new ProcessStartInfo
             {
@@ -87,7 +87,7 @@ namespace MediaBrowser.UI.Playback.ExternalPlayer
         /// <param name="options">The options.</param>
         /// <param name="playerConfiguration">The player configuration.</param>
         /// <returns>System.String.</returns>
-        protected virtual string GetCommandArguments(List<DtoBaseItem> items, PlayOptions options, PlayerConfiguration playerConfiguration)
+        protected virtual string GetCommandArguments(List<BaseItemDto> items, PlayOptions options, PlayerConfiguration playerConfiguration)
         {
             var args = playerConfiguration.Args;
 
@@ -105,7 +105,7 @@ namespace MediaBrowser.UI.Playback.ExternalPlayer
         /// <param name="items">The items.</param>
         /// <param name="formatString">The format string.</param>
         /// <returns>System.String.</returns>
-        protected string GetCommandArguments(List<DtoBaseItem> items, string formatString)
+        protected string GetCommandArguments(List<BaseItemDto> items, string formatString)
         {
             var paths = items.Select(i => "\"" + GetPathForCommandLine(i) + "\"");
 
@@ -117,7 +117,7 @@ namespace MediaBrowser.UI.Playback.ExternalPlayer
         /// </summary>
         /// <param name="item">The item.</param>
         /// <returns>System.String.</returns>
-        protected virtual string GetPathForCommandLine(DtoBaseItem item)
+        protected virtual string GetPathForCommandLine(BaseItemDto item)
         {
             return item.Path;
         }
@@ -155,7 +155,7 @@ namespace MediaBrowser.UI.Playback.ExternalPlayer
         /// <param name="items">The items.</param>
         /// <param name="options">The options.</param>
         /// <param name="playerConfiguration">The player configuration.</param>
-        protected override void PlayInternal(List<DtoBaseItem> items, PlayOptions options, PlayerConfiguration playerConfiguration)
+        protected override void PlayInternal(List<BaseItemDto> items, PlayOptions options, PlayerConfiguration playerConfiguration)
         {
             CurrentProcess = new Process
             {

MediaBrowser.UI/Playback/ExternalPlayer/GenericExternalPlayer.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using System.ComponentModel.Composition;
 
 namespace MediaBrowser.UI.Playback.ExternalPlayer
@@ -23,7 +23,7 @@ namespace MediaBrowser.UI.Playback.ExternalPlayer
         /// </summary>
         /// <param name="item">The item.</param>
         /// <returns><c>true</c> if this instance can play the specified item; otherwise, <c>false</c>.</returns>
-        public override bool CanPlay(DtoBaseItem item)
+        public override bool CanPlay(BaseItemDto item)
         {
             return false;
         }

MediaBrowser.UI/Playback/InternalPlayer/BaseInternalMediaPlayer.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.UI.Configuration;
 using System.Collections.Generic;
 using System.Windows;
@@ -21,7 +21,7 @@ namespace MediaBrowser.UI.Playback.InternalPlayer
         /// <param name="items">The items.</param>
         /// <param name="options">The options.</param>
         /// <param name="playerConfiguration">The player configuration.</param>
-        protected override void PlayInternal(List<DtoBaseItem> items, PlayOptions options, PlayerConfiguration playerConfiguration)
+        protected override void PlayInternal(List<BaseItemDto> items, PlayOptions options, PlayerConfiguration playerConfiguration)
         {
             App.Instance.ApplicationWindow.Dispatcher.Invoke(() =>
             {

MediaBrowser.UI/Playback/NVlc/InternalMediaPlayerNVlc.cs

@@ -3,7 +3,7 @@ using Declarations.Events;
 using Declarations.Media;
 using Declarations.Players;
 using Implementation;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.UI.Configuration;
 using MediaBrowser.UI.Playback.InternalPlayer;
@@ -183,7 +183,7 @@ namespace MediaBrowser.UI.Playback.NVlc
         /// </summary>
         /// <param name="item">The item.</param>
         /// <returns><c>true</c> if this instance can play the specified item; otherwise, <c>false</c>.</returns>
-        public override bool CanPlay(DtoBaseItem item)
+        public override bool CanPlay(BaseItemDto item)
         {
             return item.IsVideo || item.IsAudio;
         }
@@ -203,7 +203,7 @@ namespace MediaBrowser.UI.Playback.NVlc
         /// <param name="items">The items.</param>
         /// <param name="options">The options.</param>
         /// <param name="playerConfiguration">The player configuration.</param>
-        protected override void PlayInternal(List<DtoBaseItem> items, PlayOptions options, PlayerConfiguration playerConfiguration)
+        protected override void PlayInternal(List<BaseItemDto> items, PlayOptions options, PlayerConfiguration playerConfiguration)
         {
             EnsureMediaPlayerCreated();
 
@@ -234,7 +234,7 @@ namespace MediaBrowser.UI.Playback.NVlc
         /// </summary>
         /// <param name="item">The item.</param>
         /// <returns>System.String.</returns>
-        private string GetPlayablePath(DtoBaseItem item)
+        private string GetPlayablePath(BaseItemDto item)
         {
             if (item.VideoType.HasValue && item.VideoType.Value == VideoType.BluRay)
             {
@@ -289,7 +289,7 @@ namespace MediaBrowser.UI.Playback.NVlc
         /// Queues the internal.
         /// </summary>
         /// <param name="items">The items.</param>
-        protected override void QueueInternal(List<DtoBaseItem> items)
+        protected override void QueueInternal(List<BaseItemDto> items)
         {
         }
 

MediaBrowser.UI/Playback/PlayOptions.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using System;
 using System.Collections.Generic;
 
@@ -13,7 +13,7 @@ namespace MediaBrowser.UI.Playback
         /// Gets or sets the items.
         /// </summary>
         /// <value>The items.</value>
-        public List<DtoBaseItem> Items { get; set; }
+        public List<BaseItemDto> Items { get; set; }
 
         /// <summary>
         /// If true, the PlayableItems will be shuffled before playback

MediaBrowser.UI/Playback/PlaybackEventArgs.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.UI.Configuration;
 using System;
 
@@ -44,6 +44,6 @@ namespace MediaBrowser.UI.Playback
         /// Gets or sets the items.
         /// </summary>
         /// <value>The items.</value>
-        public List<DtoBaseItem> Items { get; set; }
+        public List<BaseItemDto> Items { get; set; }
     }
 }

MediaBrowser.UI/Playback/PlaybackManager.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Common.Events;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Kernel;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Net;
 using MediaBrowser.UI.Configuration;
@@ -64,7 +64,7 @@ namespace MediaBrowser.UI.Playback
         /// </summary>
         /// <param name="player">The player.</param>
         /// <param name="items">The items.</param>
-        internal void OnPlaybackCompleted(BaseMediaPlayer player, List<DtoBaseItem> items)
+        internal void OnPlaybackCompleted(BaseMediaPlayer player, List<BaseItemDto> items)
         {
             EventHelper.QueueEventIfNotNull(PlaybackCompleted, this, new PlaybackStopEventArgs
             {
@@ -167,10 +167,10 @@ namespace MediaBrowser.UI.Playback
         /// Gets the playable item.
         /// </summary>
         /// <param name="path">The path.</param>
-        /// <returns>DtoBaseItem.</returns>
-        public DtoBaseItem GetPlayableItem(string path)
+        /// <returns>BaseItemDto.</returns>
+        public BaseItemDto GetPlayableItem(string path)
         {
-            return new DtoBaseItem
+            return new BaseItemDto
             {
                 Path = path,
                 Name = Path.GetFileName(path),
@@ -185,10 +185,10 @@ namespace MediaBrowser.UI.Playback
         /// </summary>
         /// <param name="uri">The URI.</param>
         /// <param name="name">The name.</param>
-        /// <returns>DtoBaseItem.</returns>
-        public DtoBaseItem GetPlayableItem(Uri uri, string name)
+        /// <returns>BaseItemDto.</returns>
+        public BaseItemDto GetPlayableItem(Uri uri, string name)
         {
-            return new DtoBaseItem
+            return new BaseItemDto
             {
                 Path = uri.ToString(),
                 Name = name,
@@ -215,7 +215,7 @@ namespace MediaBrowser.UI.Playback
         /// </summary>
         /// <param name="items">The items.</param>
         /// <returns>BaseMediaPlayer.</returns>
-        private Tuple<BaseMediaPlayer, PlayerConfiguration> GetPlayer(List<DtoBaseItem> items)
+        private Tuple<BaseMediaPlayer, PlayerConfiguration> GetPlayer(List<BaseItemDto> items)
         {
             var player = GetConfiguredPlayer(items);
 
@@ -240,7 +240,7 @@ namespace MediaBrowser.UI.Playback
         /// </summary>
         /// <param name="items">The items.</param>
         /// <returns>BaseMediaPlayer.</returns>
-        private Tuple<BaseMediaPlayer, PlayerConfiguration> GetConfiguredPlayer(List<DtoBaseItem> items)
+        private Tuple<BaseMediaPlayer, PlayerConfiguration> GetConfiguredPlayer(List<BaseItemDto> items)
         {
             if (UIKernel.Instance.Configuration.MediaPlayers == null)
             {
@@ -258,7 +258,7 @@ namespace MediaBrowser.UI.Playback
         /// <param name="configuration">The configuration.</param>
         /// <param name="items">The items.</param>
         /// <returns><c>true</c> if [is configured to play] [the specified configuration]; otherwise, <c>false</c>.</returns>
-        private bool IsConfiguredToPlay(PlayerConfiguration configuration, List<DtoBaseItem> items)
+        private bool IsConfiguredToPlay(PlayerConfiguration configuration, List<BaseItemDto> items)
         {
             if (configuration.ItemTypes != null && configuration.ItemTypes.Length > 0)
             {

MediaBrowser.UI/ViewModels/BaseItemPersonViewModel.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 
 namespace MediaBrowser.UI.ViewModels
 {

MediaBrowser.UI/ViewModels/ChapterInfoDtoViewModel.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Net;
 using System;
@@ -80,12 +80,12 @@ namespace MediaBrowser.UI.ViewModels
         /// <summary>
         /// The _item
         /// </summary>
-        private DtoBaseItem _item;
+        private BaseItemDto _item;
         /// <summary>
         /// Gets or sets the item.
         /// </summary>
         /// <value>The item.</value>
-        public DtoBaseItem Item
+        public BaseItemDto Item
         {
             get { return _item; }
 
@@ -154,7 +154,7 @@ namespace MediaBrowser.UI.ViewModels
         /// <param name="height">The height.</param>
         /// <param name="defaultWidth">The default width.</param>
         /// <returns>System.Double.</returns>
-        public static double GetChapterImageWidth(DtoBaseItem item, double height, double defaultWidth)
+        public static double GetChapterImageWidth(BaseItemDto item, double height, double defaultWidth)
         {
             var width = defaultWidth;
 

MediaBrowser.UI/ViewModels/DtoBaseItemViewModel.cs

@@ -1,5 +1,5 @@
 using MediaBrowser.Common.Logging;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.UI.Pages;
 using System;
@@ -55,12 +55,12 @@ namespace MediaBrowser.UI.ViewModels
         /// <summary>
         /// The _item
         /// </summary>
-        private DtoBaseItem _item;
+        private BaseItemDto _item;
         /// <summary>
         /// Gets or sets the item.
         /// </summary>
         /// <value>The item.</value>
-        public DtoBaseItem Item
+        public BaseItemDto Item
         {
             get { return _item; }
 
@@ -122,7 +122,7 @@ namespace MediaBrowser.UI.ViewModels
         /// <param name="items">The items.</param>
         /// <returns>System.Double.</returns>
         /// <exception cref="System.ArgumentNullException">items</exception>
-        public static double GetAveragePrimaryImageAspectRatio(IEnumerable<DtoBaseItem> items)
+        public static double GetAveragePrimaryImageAspectRatio(IEnumerable<BaseItemDto> items)
         {
             if (items == null)
             {
@@ -153,7 +153,7 @@ namespace MediaBrowser.UI.ViewModels
         /// </summary>
         /// <param name="items">The items.</param>
         /// <returns>ObservableCollection{DtoBaseItemViewModel}.</returns>
-        public static ObservableCollection<DtoBaseItemViewModel> GetObservableItems(DtoBaseItem[] items)
+        public static ObservableCollection<DtoBaseItemViewModel> GetObservableItems(BaseItemDto[] items)
         {
             return GetObservableItems(items, GetAveragePrimaryImageAspectRatio(items));
         }
@@ -166,7 +166,7 @@ namespace MediaBrowser.UI.ViewModels
         /// <param name="parentDisplayPreferences">The parent display preferences.</param>
         /// <returns>ObservableCollection{DtoBaseItemViewModel}.</returns>
         /// <exception cref="System.ArgumentNullException">items</exception>
-        public static ObservableCollection<DtoBaseItemViewModel> GetObservableItems(IEnumerable<DtoBaseItem> items, double averagePrimaryImageAspectRatio, DisplayPreferences parentDisplayPreferences = null)
+        public static ObservableCollection<DtoBaseItemViewModel> GetObservableItems(IEnumerable<BaseItemDto> items, double averagePrimaryImageAspectRatio, DisplayPreferences parentDisplayPreferences = null)
         {
             if (items == null)
             {

MediaBrowser.UI/ViewModels/ItemCollectionViewModel.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using System;
 using System.Threading;
 using System.Windows;
@@ -44,16 +44,16 @@ namespace MediaBrowser.UI.ViewModels
             }
         }
 
-        private DtoBaseItem[] _items;
+        private BaseItemDto[] _items;
         /// <summary>
         /// Gets or sets the list of items
         /// </summary>
-        public DtoBaseItem[] Items
+        public BaseItemDto[] Items
         {
             get { return _items; }
             set
             {
-                _items = value ?? new DtoBaseItem[] { };
+                _items = value ?? new BaseItemDto[] { };
                 OnPropertyChanged("Items");
                 CurrentItemIndex = Items.Length == 0 ? -1 : 0;
 
@@ -80,7 +80,7 @@ namespace MediaBrowser.UI.ViewModels
         /// <summary>
         /// Gets the current item
         /// </summary>
-        public DtoBaseItem CurrentItem
+        public BaseItemDto CurrentItem
         {
             get { return CurrentItemIndex == -1 ? null : Items[CurrentItemIndex]; }
         }
@@ -88,7 +88,7 @@ namespace MediaBrowser.UI.ViewModels
         /// <summary>
         /// Gets the next item
         /// </summary>
-        public DtoBaseItem NextItem
+        public BaseItemDto NextItem
         {
             get
             {

MediaBrowser.UI/ViewModels/SpecialFeatureViewModel.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Net;
 using System;
@@ -58,12 +58,12 @@ namespace MediaBrowser.UI.ViewModels
         /// <summary>
         /// The _item
         /// </summary>
-        private DtoBaseItem _item;
+        private BaseItemDto _item;
         /// <summary>
         /// Gets or sets the item.
         /// </summary>
         /// <value>The item.</value>
-        public DtoBaseItem Item
+        public BaseItemDto Item
         {
             get { return _item; }
 

MediaBrowser.WebDashboard/Api/DashboardInfo.cs

@@ -1,5 +1,5 @@
 using MediaBrowser.Model.Connectivity;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.System;
 using MediaBrowser.Model.Tasks;
 using System;
@@ -39,7 +39,7 @@ namespace MediaBrowser.WebDashboard.Api
         /// Gets or sets the users.
         /// </summary>
         /// <value>The users.</value>
-        public DtoUser[] Users { get; set; }
+        public UserDto[] Users { get; set; }
     }
 
 }