diff --git a/PocketSharp/Components/Retrieve.cs b/PocketSharp/Components/Retrieve.cs
index e1022ef..9baeabb 100644
--- a/PocketSharp/Components/Retrieve.cs
+++ b/PocketSharp/Components/Retrieve.cs
@@ -31,22 +31,22 @@ namespace PocketSharp
       switch(filter)
       {
         case RetrieveFilter.Article:
-          parameters.ContentType = ContentTypeEnum.article;
+          parameters.ContentType = ContentType.article;
           break;
         case RetrieveFilter.Image:
-          parameters.ContentType = ContentTypeEnum.image;
+          parameters.ContentType = ContentType.image;
           break;
         case RetrieveFilter.Video:
-          parameters.ContentType = ContentTypeEnum.video;
+          parameters.ContentType = ContentType.video;
           break;
         case RetrieveFilter.Favorite:
           parameters.Favorite = true;
           break;
         case RetrieveFilter.Unread:
-          parameters.State = StateEnum.unread;
+          parameters.State = State.unread;
           break;
         case RetrieveFilter.Archive:
-          parameters.State = StateEnum.archive;
+          parameters.State = State.archive;
           break;
       }
 
@@ -66,7 +66,7 @@ namespace PocketSharp
       RetrieveParameters parameters = new RetrieveParameters()
       {
         Tag = tag,
-        DetailType = DetailTypeEnum.complete
+        DetailType = DetailType.complete
       };
       return Get<Retrieve>("get", parameters.Convert(), true).Items;
     }
@@ -82,7 +82,7 @@ namespace PocketSharp
       RetrieveParameters parameters = new RetrieveParameters()
       {
         Search = searchString,
-        DetailType = DetailTypeEnum.complete
+        DetailType = DetailType.complete
       };
       return Get<Retrieve>("get", parameters.Convert(), true).Items;
     }
diff --git a/PocketSharp/Models/Parameters/RetrieveParameters.cs b/PocketSharp/Models/Parameters/RetrieveParameters.cs
index 3bdfe61..b34a075 100644
--- a/PocketSharp/Models/Parameters/RetrieveParameters.cs
+++ b/PocketSharp/Models/Parameters/RetrieveParameters.cs
@@ -15,7 +15,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The state.
     /// </value>
-    public StateEnum? State { get; set; }
+    public State? State { get; set; }
 
     /// <summary>
     /// Gets or sets the favorite.
@@ -39,7 +39,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The type of the content.
     /// </value>
-    public ContentTypeEnum? ContentType { get; set; }
+    public ContentType? ContentType { get; set; }
 
     /// <summary>
     /// Gets or sets the sort.
@@ -47,7 +47,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The sort.
     /// </value>
-    public SortEnum? Sort { get; set; }
+    public Sort? Sort { get; set; }
 
     /// <summary>
     /// Gets or sets the type of the detail.
@@ -55,7 +55,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The type of the detail.
     /// </value>
-    public DetailTypeEnum? DetailType { get; set; }
+    public DetailType? DetailType { get; set; }
 
     /// <summary>
     /// Gets or sets the search.
@@ -125,7 +125,7 @@ namespace PocketSharp.Models
   /// <summary>
   /// Item states
   /// </summary>
-  public enum StateEnum
+  public enum State
   {
     /// <summary>
     /// Only unread items
@@ -144,7 +144,7 @@ namespace PocketSharp.Models
   /// <summary>
   /// Sorting
   /// </summary>
-  public enum SortEnum
+  public enum Sort
   {
     /// <summary>
     /// Newest first
@@ -167,7 +167,7 @@ namespace PocketSharp.Models
   /// <summary>
   /// Item types
   /// </summary>
-  public enum ContentTypeEnum
+  public enum ContentType
   {
     /// <summary>
     /// Articles
@@ -186,7 +186,7 @@ namespace PocketSharp.Models
   /// <summary>
   /// Item data
   /// </summary>
-  public enum DetailTypeEnum
+  public enum DetailType
   {
     /// <summary>
     /// Necessary data
diff --git a/README.md b/README.md
index 03bac1b..37424f7 100644
--- a/README.md
+++ b/README.md
@@ -166,7 +166,7 @@ var parameters = new RetrieveParameters()
 {
 	Count = 50,
 	Offset = 100,
-	Sort = SortEnum.oldest
+	Sort = Sort.oldest
 	...
 };