diff --git a/ShareX.UploadersLib/BaseUploaders/Uploader.cs b/ShareX.UploadersLib/BaseUploaders/Uploader.cs
index 66b104992..9f99d4432 100644
--- a/ShareX.UploadersLib/BaseUploaders/Uploader.cs
+++ b/ShareX.UploadersLib/BaseUploaders/Uploader.cs
@@ -137,7 +137,7 @@ internal string SendRequestURLEncoded(HttpMethod method, string url, Dictionary<
         {
             string query = URLHelpers.CreateQueryString(args);
 
-            return SendRequest(method, url, query, UploadHelpers.ContentTypeURLEncoded, null, headers, cookies);
+            return SendRequest(method, url, query, RequestHelpers.ContentTypeURLEncoded, null, headers, cookies);
         }
 
         protected bool SendRequestDownload(HttpMethod method, string url, Stream downloadStream, Dictionary<string, string> args = null,
@@ -162,9 +162,9 @@ protected bool SendRequestDownload(HttpMethod method, string url, Stream downloa
         protected string SendRequestMultiPart(string url, Dictionary<string, string> args, NameValueCollection headers = null, CookieCollection cookies = null,
             HttpMethod method = HttpMethod.POST)
         {
-            string boundary = UploadHelpers.CreateBoundary();
-            string contentType = UploadHelpers.ContentTypeMultipartFormData + "; boundary=" + boundary;
-            byte[] data = UploadHelpers.MakeInputContent(boundary, args);
+            string boundary = RequestHelpers.CreateBoundary();
+            string contentType = RequestHelpers.ContentTypeMultipartFormData + "; boundary=" + boundary;
+            byte[] data = RequestHelpers.MakeInputContent(boundary, args);
 
             using (MemoryStream stream = new MemoryStream())
             {
@@ -178,7 +178,7 @@ protected string SendRequestMultiPart(string url, Dictionary<string, string> arg
         }
 
         protected UploadResult SendRequestFile(string url, Stream data, string fileName, string fileFormName, Dictionary<string, string> args = null,
-            NameValueCollection headers = null, CookieCollection cookies = null, HttpMethod method = HttpMethod.POST, string contentType = UploadHelpers.ContentTypeMultipartFormData,
+            NameValueCollection headers = null, CookieCollection cookies = null, HttpMethod method = HttpMethod.POST, string contentType = RequestHelpers.ContentTypeMultipartFormData,
             string relatedData = null)
         {
             UploadResult result = new UploadResult();
@@ -188,22 +188,22 @@ protected UploadResult SendRequestFile(string url, Stream data, string fileName,
 
             try
             {
-                string boundary = UploadHelpers.CreateBoundary();
+                string boundary = RequestHelpers.CreateBoundary();
                 contentType += "; boundary=" + boundary;
 
-                byte[] bytesArguments = UploadHelpers.MakeInputContent(boundary, args, false);
+                byte[] bytesArguments = RequestHelpers.MakeInputContent(boundary, args, false);
                 byte[] bytesDataOpen;
 
                 if (relatedData != null)
                 {
-                    bytesDataOpen = UploadHelpers.MakeRelatedFileInputContentOpen(boundary, "application/json; charset=UTF-8", relatedData, fileName);
+                    bytesDataOpen = RequestHelpers.MakeRelatedFileInputContentOpen(boundary, "application/json; charset=UTF-8", relatedData, fileName);
                 }
                 else
                 {
-                    bytesDataOpen = UploadHelpers.MakeFileInputContentOpen(boundary, fileFormName, fileName);
+                    bytesDataOpen = RequestHelpers.MakeFileInputContentOpen(boundary, fileFormName, fileName);
                 }
 
-                byte[] bytesDataClose = UploadHelpers.MakeFileInputContentClose(boundary);
+                byte[] bytesDataClose = RequestHelpers.MakeFileInputContentClose(boundary);
 
                 long contentLength = bytesArguments.Length + bytesDataOpen.Length + data.Length + bytesDataClose.Length;
 
@@ -263,7 +263,7 @@ protected UploadResult SendRequestFileRange(string url, Stream data, string file
                 }
                 contentLength = Math.Min(contentLength, data.Length - contentPosition);
 
-                string contentType = UploadHelpers.GetMimeType(fileName);
+                string contentType = RequestHelpers.GetMimeType(fileName);
 
                 if (headers == null)
                 {
@@ -486,7 +486,7 @@ private HttpWebRequest CreateWebRequest(HttpMethod method, string url, NameValue
         {
             LastResponseInfo = null;
 
-            HttpWebRequest request = UploadHelpers.CreateWebRequest(method, url, headers, cookies, contentType, contentLength);
+            HttpWebRequest request = RequestHelpers.CreateWebRequest(method, url, headers, cookies, contentType, contentLength);
             currentWebRequest = request;
             return request;
         }
diff --git a/ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs b/ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs
index 879275b5d..d1109f4c5 100644
--- a/ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs
+++ b/ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs
@@ -179,15 +179,15 @@ public string GetContentType()
             switch (Body)
             {
                 case CustomUploaderBody.MultipartFormData:
-                    return UploadHelpers.ContentTypeMultipartFormData;
+                    return RequestHelpers.ContentTypeMultipartFormData;
                 case CustomUploaderBody.FormURLEncoded:
-                    return UploadHelpers.ContentTypeURLEncoded;
+                    return RequestHelpers.ContentTypeURLEncoded;
                 case CustomUploaderBody.JSON:
-                    return UploadHelpers.ContentTypeJSON;
+                    return RequestHelpers.ContentTypeJSON;
                 case CustomUploaderBody.XML:
-                    return UploadHelpers.ContentTypeXML;
+                    return RequestHelpers.ContentTypeXML;
                 case CustomUploaderBody.Binary:
-                    return UploadHelpers.ContentTypeOctetStream;
+                    return RequestHelpers.ContentTypeOctetStream;
             }
 
             return null;
diff --git a/ShareX.UploadersLib/FileUploaders/AmazonS3.cs b/ShareX.UploadersLib/FileUploaders/AmazonS3.cs
index 689a8a9a4..0a53814d8 100644
--- a/ShareX.UploadersLib/FileUploaders/AmazonS3.cs
+++ b/ShareX.UploadersLib/FileUploaders/AmazonS3.cs
@@ -120,7 +120,7 @@ public override UploadResult Upload(Stream stream, string fileName)
             string scope = URLHelpers.CombineURL(credentialDate, region, "s3", "aws4_request");
             string credential = URLHelpers.CombineURL(Settings.AccessKeyID, scope);
             string timeStamp = DateTime.UtcNow.ToString("yyyyMMddTHHmmssZ", CultureInfo.InvariantCulture);
-            string contentType = UploadHelpers.GetMimeType(fileName);
+            string contentType = RequestHelpers.GetMimeType(fileName);
             string hashedPayload;
 
             if (Settings.SignedPayload)
diff --git a/ShareX.UploadersLib/FileUploaders/AzureStorage.cs b/ShareX.UploadersLib/FileUploaders/AzureStorage.cs
index e6db2350f..f9b7816a8 100644
--- a/ShareX.UploadersLib/FileUploaders/AzureStorage.cs
+++ b/ShareX.UploadersLib/FileUploaders/AzureStorage.cs
@@ -99,7 +99,7 @@ public override UploadResult Upload(Stream stream, string fileName)
 
             OnEarlyURLCopyRequested(resultURL);
 
-            string contentType = UploadHelpers.GetMimeType(fileName);
+            string contentType = RequestHelpers.GetMimeType(fileName);
 
             NameValueCollection requestHeaders = new NameValueCollection();
             requestHeaders["x-ms-date"] = date;
diff --git a/ShareX.UploadersLib/FileUploaders/BackblazeB2.cs b/ShareX.UploadersLib/FileUploaders/BackblazeB2.cs
index f83d4cd1f..d8ab82b6a 100644
--- a/ShareX.UploadersLib/FileUploaders/BackblazeB2.cs
+++ b/ShareX.UploadersLib/FileUploaders/BackblazeB2.cs
@@ -260,7 +260,7 @@ public override UploadResult Upload(Stream stream, string fileName)
         /// <returns>Null if an error occurs, and <c>error</c> will contain an error message. Otherwise, a <see cref="B2Authorization"/>.</returns>
         private B2Authorization B2ApiAuthorize(string keyId, string key, out string error)
         {
-            NameValueCollection headers = UploadHelpers.CreateAuthenticationHeader(keyId, key);
+            NameValueCollection headers = RequestHelpers.CreateAuthenticationHeader(keyId, key);
 
             using (HttpWebResponse res = GetResponse(HttpMethod.GET, B2AuthorizeAccountUrl, headers: headers, allowNon2xxResponses: true))
             {
@@ -270,7 +270,7 @@ private B2Authorization B2ApiAuthorize(string keyId, string key, out string erro
                     return null;
                 }
 
-                string body = UploadHelpers.ResponseToString(res);
+                string body = RequestHelpers.ResponseToString(res);
 
                 error = null;
                 return JsonConvert.DeserializeObject<B2Authorization>(body);
@@ -308,7 +308,7 @@ private string B2ApiGetBucketId(B2Authorization auth, string bucketName, out str
                         return null;
                     }
 
-                    string body = UploadHelpers.ResponseToString(res);
+                    string body = RequestHelpers.ResponseToString(res);
 
                     JObject json;
 
@@ -362,7 +362,7 @@ private B2UploadUrl B2ApiGetUploadUrl(B2Authorization auth, string bucketId, out
                         return null;
                     }
 
-                    string body = UploadHelpers.ResponseToString(res);
+                    string body = RequestHelpers.ResponseToString(res);
 
                     error = null;
                     return JsonConvert.DeserializeObject<B2UploadUrl>(body);
@@ -416,7 +416,7 @@ private B2UploadResult B2ApiUploadFile(B2UploadUrl b2UploadUrl, string destinati
                 ["X-Bz-Info-b2-content-disposition"] = URLHelpers.URLEncode(contentDisposition.ToString()),
             };
 
-            string contentType = UploadHelpers.GetMimeType(destinationPath);
+            string contentType = RequestHelpers.GetMimeType(destinationPath);
 
             using (HttpWebResponse res = GetResponse(HttpMethod.POST, b2UploadUrl.uploadUrl,
                 contentType: contentType, headers: headers, data: file, allowNon2xxResponses: true))
@@ -433,7 +433,7 @@ private B2UploadResult B2ApiUploadFile(B2UploadUrl b2UploadUrl, string destinati
                     return new B2UploadResult((int)res.StatusCode, ParseB2Error(res), null);
                 }
 
-                string body = UploadHelpers.ResponseToString(res);
+                string body = RequestHelpers.ResponseToString(res);
                 DebugHelper.WriteLine($"B2 uploader: B2ApiUploadFile() reports success! '{body}'");
 
                 return new B2UploadResult((int)res.StatusCode, null, JsonConvert.DeserializeObject<B2Upload>(body));
@@ -491,11 +491,11 @@ private static bool IsAuthorizedForUpload(B2Authorization auth, string bucketId,
         /// <exception cref="IOException">If the response body cannot be read.</exception>
         private static B2Error ParseB2Error(HttpWebResponse res)
         {
-            if (UploadHelpers.IsSuccessStatusCode(res.StatusCode)) return null;
+            if (RequestHelpers.IsSuccessStatusCode(res.StatusCode)) return null;
 
             try
             {
-                string body = UploadHelpers.ResponseToString(res);
+                string body = RequestHelpers.ResponseToString(res);
                 DebugHelper.WriteLine($"B2 uploader: ParseB2Error() got: {body}");
                 B2Error err = JsonConvert.DeserializeObject<B2Error>(body);
                 return err;
diff --git a/ShareX.UploadersLib/FileUploaders/CustomFileUploader.cs b/ShareX.UploadersLib/FileUploaders/CustomFileUploader.cs
index 0474ca16b..c8dbda932 100644
--- a/ShareX.UploadersLib/FileUploaders/CustomFileUploader.cs
+++ b/ShareX.UploadersLib/FileUploaders/CustomFileUploader.cs
@@ -87,7 +87,7 @@ public override UploadResult Upload(Stream stream, string fileName)
             }
             else if (uploader.Body == CustomUploaderBody.Binary)
             {
-                result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), stream, UploadHelpers.GetMimeType(fileName), null,
+                result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), stream, RequestHelpers.GetMimeType(fileName), null,
                     uploader.GetHeaders(input));
             }
             else
diff --git a/ShareX.UploadersLib/FileUploaders/Dropbox.cs b/ShareX.UploadersLib/FileUploaders/Dropbox.cs
index 6550492a2..9666bcc1b 100644
--- a/ShareX.UploadersLib/FileUploaders/Dropbox.cs
+++ b/ShareX.UploadersLib/FileUploaders/Dropbox.cs
@@ -176,7 +176,7 @@ public DropboxAccount GetCurrentAccount()
         {
             if (OAuth2Info.CheckOAuth(AuthInfo))
             {
-                string response = SendRequest(HttpMethod.POST, URLGetCurrentAccount, "null", UploadHelpers.ContentTypeJSON, null, GetAuthHeaders());
+                string response = SendRequest(HttpMethod.POST, URLGetCurrentAccount, "null", RequestHelpers.ContentTypeJSON, null, GetAuthHeaders());
 
                 if (!string.IsNullOrEmpty(response))
                 {
@@ -199,7 +199,7 @@ public bool DownloadFile(string path, Stream downloadStream)
                 Dictionary<string, string> args = new Dictionary<string, string>();
                 args.Add("arg", json);
 
-                return SendRequestDownload(HttpMethod.POST, URLDownload, downloadStream, args, GetAuthHeaders(), null, UploadHelpers.ContentTypeJSON);
+                return SendRequestDownload(HttpMethod.POST, URLDownload, downloadStream, args, GetAuthHeaders(), null, RequestHelpers.ContentTypeJSON);
             }
 
             return false;
@@ -224,7 +224,7 @@ public UploadResult UploadFile(Stream stream, string path, string filename, bool
             Dictionary<string, string> args = new Dictionary<string, string>();
             args.Add("arg", json);
 
-            string response = SendRequest(HttpMethod.POST, URLUpload, stream, UploadHelpers.ContentTypeOctetStream, args, GetAuthHeaders());
+            string response = SendRequest(HttpMethod.POST, URLUpload, stream, RequestHelpers.ContentTypeOctetStream, args, GetAuthHeaders());
 
             UploadResult ur = new UploadResult(response);
 
@@ -264,7 +264,7 @@ public DropboxMetadata GetMetadata(string path)
                     include_has_explicit_shared_members = false
                 });
 
-                string response = SendRequest(HttpMethod.POST, URLGetMetadata, json, UploadHelpers.ContentTypeJSON, null, GetAuthHeaders());
+                string response = SendRequest(HttpMethod.POST, URLGetMetadata, json, RequestHelpers.ContentTypeJSON, null, GetAuthHeaders());
 
                 if (!string.IsNullOrEmpty(response))
                 {
@@ -295,7 +295,7 @@ public string CreateShareableLink(string path, bool directLink)
                     }
                 });
 
-                string response = SendRequest(HttpMethod.POST, URLCreateSharedLink, json, UploadHelpers.ContentTypeJSON, null, GetAuthHeaders());
+                string response = SendRequest(HttpMethod.POST, URLCreateSharedLink, json, RequestHelpers.ContentTypeJSON, null, GetAuthHeaders());
 
                 DropboxLinkMetadata linkMetadata = null;
 
@@ -341,7 +341,7 @@ public DropboxListSharedLinksResult ListSharedLinks(string path, bool directOnly
                     direct_only = directOnly
                 });
 
-                string response = SendRequest(HttpMethod.POST, URLListSharedLinks, json, UploadHelpers.ContentTypeJSON, null, GetAuthHeaders());
+                string response = SendRequest(HttpMethod.POST, URLListSharedLinks, json, RequestHelpers.ContentTypeJSON, null, GetAuthHeaders());
 
                 if (!string.IsNullOrEmpty(response))
                 {
@@ -364,7 +364,7 @@ public DropboxMetadata Copy(string fromPath, string toPath)
                     to_path = VerifyPath(toPath)
                 });
 
-                string response = SendRequest(HttpMethod.POST, URLCopy, json, UploadHelpers.ContentTypeJSON, null, GetAuthHeaders());
+                string response = SendRequest(HttpMethod.POST, URLCopy, json, RequestHelpers.ContentTypeJSON, null, GetAuthHeaders());
 
                 if (!string.IsNullOrEmpty(response))
                 {
@@ -386,7 +386,7 @@ public DropboxMetadata CreateFolder(string path)
                     path = VerifyPath(path)
                 });
 
-                string response = SendRequest(HttpMethod.POST, URLCreateFolder, json, UploadHelpers.ContentTypeJSON, null, GetAuthHeaders());
+                string response = SendRequest(HttpMethod.POST, URLCreateFolder, json, RequestHelpers.ContentTypeJSON, null, GetAuthHeaders());
 
                 if (!string.IsNullOrEmpty(response))
                 {
@@ -408,7 +408,7 @@ public DropboxMetadata Delete(string path)
                     path = VerifyPath(path)
                 });
 
-                string response = SendRequest(HttpMethod.POST, URLDelete, json, UploadHelpers.ContentTypeJSON, null, GetAuthHeaders());
+                string response = SendRequest(HttpMethod.POST, URLDelete, json, RequestHelpers.ContentTypeJSON, null, GetAuthHeaders());
 
                 if (!string.IsNullOrEmpty(response))
                 {
@@ -431,7 +431,7 @@ public DropboxMetadata Move(string fromPath, string toPath)
                     to_path = VerifyPath(toPath)
                 });
 
-                string response = SendRequest(HttpMethod.POST, URLMove, json, UploadHelpers.ContentTypeJSON, null, GetAuthHeaders());
+                string response = SendRequest(HttpMethod.POST, URLMove, json, RequestHelpers.ContentTypeJSON, null, GetAuthHeaders());
 
                 if (!string.IsNullOrEmpty(response))
                 {
diff --git a/ShareX.UploadersLib/FileUploaders/Ge_tt.cs b/ShareX.UploadersLib/FileUploaders/Ge_tt.cs
index a17448709..eb462a66e 100644
--- a/ShareX.UploadersLib/FileUploaders/Ge_tt.cs
+++ b/ShareX.UploadersLib/FileUploaders/Ge_tt.cs
@@ -77,7 +77,7 @@ public Ge_ttLogin Login(string email, string password)
             string json = JsonConvert.SerializeObject(args);
 
             string url = URLHelpers.CombineURL(APIURL, "users/login");
-            string response = SendRequest(HttpMethod.POST, url, json, UploadHelpers.ContentTypeJSON);
+            string response = SendRequest(HttpMethod.POST, url, json, RequestHelpers.ContentTypeJSON);
 
             return JsonConvert.DeserializeObject<Ge_ttLogin>(response);
         }
@@ -103,7 +103,7 @@ public Ge_ttFile CreateFile(string accessToken, string shareName, string fileNam
 
             string json = JsonConvert.SerializeObject(args2);
 
-            string response = SendRequest(HttpMethod.POST, URLHelpers.CombineURL(APIURL, "files", shareName, "create"), json, UploadHelpers.ContentTypeJSON, args);
+            string response = SendRequest(HttpMethod.POST, URLHelpers.CombineURL(APIURL, "files", shareName, "create"), json, RequestHelpers.ContentTypeJSON, args);
 
             return JsonConvert.DeserializeObject<Ge_ttFile>(response);
         }
diff --git a/ShareX.UploadersLib/FileUploaders/GfycatUploader.cs b/ShareX.UploadersLib/FileUploaders/GfycatUploader.cs
index 5d45ea3de..cbdd7da34 100644
--- a/ShareX.UploadersLib/FileUploaders/GfycatUploader.cs
+++ b/ShareX.UploadersLib/FileUploaders/GfycatUploader.cs
@@ -112,7 +112,7 @@ public bool GetAccessToken(string code)
                 code = code
             });
 
-            string response = SendRequest(HttpMethod.POST, URL_API_TOKEN, request, UploadHelpers.ContentTypeJSON);
+            string response = SendRequest(HttpMethod.POST, URL_API_TOKEN, request, RequestHelpers.ContentTypeJSON);
 
             if (!string.IsNullOrEmpty(response))
             {
@@ -141,7 +141,7 @@ public bool RefreshAccessToken()
                     grant_type = "refresh"
                 });
 
-                string response = SendRequest(HttpMethod.POST, URL_API_TOKEN, request, UploadHelpers.ContentTypeJSON);
+                string response = SendRequest(HttpMethod.POST, URL_API_TOKEN, request, RequestHelpers.ContentTypeJSON);
 
                 if (!string.IsNullOrEmpty(response))
                 {
@@ -273,7 +273,7 @@ private GfycatCreateResponse CreateGfycat(NameValueCollection headers)
 
             string json = JsonConvert.SerializeObject(args);
 
-            string response = SendRequest(HttpMethod.POST, URL_API_CREATE_GFY, json, UploadHelpers.ContentTypeJSON, null, headers);
+            string response = SendRequest(HttpMethod.POST, URL_API_CREATE_GFY, json, RequestHelpers.ContentTypeJSON, null, headers);
 
             if (!string.IsNullOrEmpty(response))
             {
@@ -305,7 +305,7 @@ private OAuth2Token GetOrCreateToken()
                         grant_type = "client_credentials",
                     });
 
-                    string response = SendRequest(HttpMethod.POST, URL_API_TOKEN, request, UploadHelpers.ContentTypeJSON);
+                    string response = SendRequest(HttpMethod.POST, URL_API_TOKEN, request, RequestHelpers.ContentTypeJSON);
 
                     if (!string.IsNullOrEmpty(response))
                     {
diff --git a/ShareX.UploadersLib/FileUploaders/GoogleDrive.cs b/ShareX.UploadersLib/FileUploaders/GoogleDrive.cs
index 74fe95436..88ad49880 100644
--- a/ShareX.UploadersLib/FileUploaders/GoogleDrive.cs
+++ b/ShareX.UploadersLib/FileUploaders/GoogleDrive.cs
@@ -145,7 +145,7 @@ private void SetPermissions(string fileID, GoogleDrivePermissionRole role, Googl
                 allowFileDiscovery = allowFileDiscovery.ToString()
             });
 
-            string response = SendRequest(HttpMethod.POST, url, json, UploadHelpers.ContentTypeJSON, null, GoogleAuth.GetAuthHeaders());
+            string response = SendRequest(HttpMethod.POST, url, json, RequestHelpers.ContentTypeJSON, null, GoogleAuth.GetAuthHeaders());
         }
 
         public List<GoogleDriveFile> GetFolders(bool trashed = false, bool writer = true)
diff --git a/ShareX.UploadersLib/FileUploaders/Hostr.cs b/ShareX.UploadersLib/FileUploaders/Hostr.cs
index 74527dc74..feabbdfd9 100644
--- a/ShareX.UploadersLib/FileUploaders/Hostr.cs
+++ b/ShareX.UploadersLib/FileUploaders/Hostr.cs
@@ -72,7 +72,7 @@ public override UploadResult Upload(Stream stream, string fileName)
 
             if (!string.IsNullOrEmpty(Email) && !string.IsNullOrEmpty(Password))
             {
-                NameValueCollection headers = UploadHelpers.CreateAuthenticationHeader(Email, Password);
+                NameValueCollection headers = RequestHelpers.CreateAuthenticationHeader(Email, Password);
                 result = SendRequestFile("https://api.hostr.co/file", stream, fileName, "file", headers: headers);
 
                 if (result.IsSuccess)
diff --git a/ShareX.UploadersLib/FileUploaders/Mega.cs b/ShareX.UploadersLib/FileUploaders/Mega.cs
index a30e26470..e6fe127d9 100644
--- a/ShareX.UploadersLib/FileUploaders/Mega.cs
+++ b/ShareX.UploadersLib/FileUploaders/Mega.cs
@@ -152,7 +152,7 @@ public override UploadResult Upload(Stream stream, string fileName)
 
         public string PostRequestJson(Uri url, string jsonData)
         {
-            return SendRequest(HttpMethod.POST, url.ToString(), jsonData, UploadHelpers.ContentTypeJSON);
+            return SendRequest(HttpMethod.POST, url.ToString(), jsonData, RequestHelpers.ContentTypeJSON);
         }
 
         public string PostRequestRaw(Uri url, Stream dataStream)
diff --git a/ShareX.UploadersLib/FileUploaders/OneDrive.cs b/ShareX.UploadersLib/FileUploaders/OneDrive.cs
index 8e6e7c5d9..c20eaacbe 100644
--- a/ShareX.UploadersLib/FileUploaders/OneDrive.cs
+++ b/ShareX.UploadersLib/FileUploaders/OneDrive.cs
@@ -212,7 +212,7 @@ private string CreateSession(string fileName)
             string url = URLHelpers.BuildUri("https://graph.microsoft.com", $"/v1.0/{folderPath}:/{fileName}:/createUploadSession");
 
             AllowReportProgress = false;
-            string response = SendRequest(HttpMethod.POST, url, json, UploadHelpers.ContentTypeJSON, headers: GetAuthHeaders());
+            string response = SendRequest(HttpMethod.POST, url, json, RequestHelpers.ContentTypeJSON, headers: GetAuthHeaders());
             AllowReportProgress = true;
 
             OneDriveUploadSession session = JsonConvert.DeserializeObject<OneDriveUploadSession>(response);
@@ -291,7 +291,7 @@ public string CreateShareableLink(string id, OneDriveLinkType linkType = OneDriv
                 type = linkTypeValue
             });
 
-            string response = SendRequest(HttpMethod.POST, $"https://graph.microsoft.com/v1.0/me/drive/items/{id}/createLink", json, UploadHelpers.ContentTypeJSON,
+            string response = SendRequest(HttpMethod.POST, $"https://graph.microsoft.com/v1.0/me/drive/items/{id}/createLink", json, RequestHelpers.ContentTypeJSON,
                 headers: GetAuthHeaders());
 
             OneDrivePermission permissionInfo = JsonConvert.DeserializeObject<OneDrivePermission>(response);
diff --git a/ShareX.UploadersLib/FileUploaders/OwnCloud.cs b/ShareX.UploadersLib/FileUploaders/OwnCloud.cs
index a954670eb..ef622e7f8 100644
--- a/ShareX.UploadersLib/FileUploaders/OwnCloud.cs
+++ b/ShareX.UploadersLib/FileUploaders/OwnCloud.cs
@@ -109,10 +109,10 @@ public override UploadResult Upload(Stream stream, string fileName)
             string url = URLHelpers.CombineURL(Host, "remote.php/webdav", encodedPath);
             url = URLHelpers.FixPrefix(url);
 
-            NameValueCollection headers = UploadHelpers.CreateAuthenticationHeader(Username, Password);
+            NameValueCollection headers = RequestHelpers.CreateAuthenticationHeader(Username, Password);
             headers["OCS-APIREQUEST"] = "true";
 
-            string response = SendRequest(HttpMethod.PUT, url, stream, UploadHelpers.GetMimeType(fileName), null, headers);
+            string response = SendRequest(HttpMethod.PUT, url, stream, RequestHelpers.GetMimeType(fileName), null, headers);
 
             UploadResult result = new UploadResult(response);
 
@@ -166,7 +166,7 @@ public string ShareFile(string path)
             string url = URLHelpers.CombineURL(Host, "ocs/v1.php/apps/files_sharing/api/v1/shares?format=json");
             url = URLHelpers.FixPrefix(url);
 
-            NameValueCollection headers = UploadHelpers.CreateAuthenticationHeader(Username, Password);
+            NameValueCollection headers = RequestHelpers.CreateAuthenticationHeader(Username, Password);
             headers["OCS-APIREQUEST"] = "true";
 
             string response = SendRequestMultiPart(url, args, headers);
diff --git a/ShareX.UploadersLib/FileUploaders/Plik.cs b/ShareX.UploadersLib/FileUploaders/Plik.cs
index 447682a5f..68cf1c6bd 100644
--- a/ShareX.UploadersLib/FileUploaders/Plik.cs
+++ b/ShareX.UploadersLib/FileUploaders/Plik.cs
@@ -77,7 +77,7 @@ public override UploadResult Upload(Stream stream, string fileName)
             metaDataReq.Files = new UploadMetadataRequestFile0();
             metaDataReq.Files.File0 = new UploadMetadataRequestFile();
             metaDataReq.Files.File0.FileName = fileName;
-            metaDataReq.Files.File0.FileType = UploadHelpers.GetMimeType(fileName);
+            metaDataReq.Files.File0.FileType = RequestHelpers.GetMimeType(fileName);
             metaDataReq.Files.File0.FileSize = Convert.ToInt32(stream.Length);
             metaDataReq.Removable = Settings.Removable;
             metaDataReq.OneShot = Settings.OneShot;
diff --git a/ShareX.UploadersLib/FileUploaders/Pushbullet.cs b/ShareX.UploadersLib/FileUploaders/Pushbullet.cs
index bb30ac976..1015408bf 100644
--- a/ShareX.UploadersLib/FileUploaders/Pushbullet.cs
+++ b/ShareX.UploadersLib/FileUploaders/Pushbullet.cs
@@ -76,7 +76,7 @@ private const string
 
         public UploadResult PushFile(Stream stream, string fileName)
         {
-            NameValueCollection headers = UploadHelpers.CreateAuthenticationHeader(Config.UserAPIKey, "");
+            NameValueCollection headers = RequestHelpers.CreateAuthenticationHeader(Config.UserAPIKey, "");
 
             Dictionary<string, string> pushArgs, upArgs = new Dictionary<string, string>();
 
@@ -125,7 +125,7 @@ public UploadResult PushFile(Stream stream, string fileName)
 
         private string Push(string pushType, string valueType, string value, string title)
         {
-            NameValueCollection headers = UploadHelpers.CreateAuthenticationHeader(Config.UserAPIKey, "");
+            NameValueCollection headers = RequestHelpers.CreateAuthenticationHeader(Config.UserAPIKey, "");
 
             Dictionary<string, string> args = new Dictionary<string, string>();
             args.Add("device_iden", Config.CurrentDevice.Key);
@@ -174,7 +174,7 @@ public override UploadResult Upload(Stream stream, string fileName)
 
         public List<PushbulletDevice> GetDeviceList()
         {
-            NameValueCollection headers = UploadHelpers.CreateAuthenticationHeader(Config.UserAPIKey, "");
+            NameValueCollection headers = RequestHelpers.CreateAuthenticationHeader(Config.UserAPIKey, "");
 
             string response = SendRequest(HttpMethod.GET, apiGetDevicesURL, headers: headers);
 
diff --git a/ShareX.UploadersLib/FileUploaders/Streamable.cs b/ShareX.UploadersLib/FileUploaders/Streamable.cs
index 99748c8d9..d4ab9504c 100644
--- a/ShareX.UploadersLib/FileUploaders/Streamable.cs
+++ b/ShareX.UploadersLib/FileUploaders/Streamable.cs
@@ -82,7 +82,7 @@ public override UploadResult Upload(Stream stream, string fileName)
 
             if (!string.IsNullOrEmpty(Email) && !string.IsNullOrEmpty(Password))
             {
-                headers = UploadHelpers.CreateAuthenticationHeader(Email, Password);
+                headers = RequestHelpers.CreateAuthenticationHeader(Email, Password);
             }
 
             string url = URLHelpers.CombineURL(Host, "upload");
diff --git a/ShareX.UploadersLib/Helpers/UploadHelpers.cs b/ShareX.UploadersLib/Helpers/RequestHelpers.cs
similarity index 99%
rename from ShareX.UploadersLib/Helpers/UploadHelpers.cs
rename to ShareX.UploadersLib/Helpers/RequestHelpers.cs
index 5abea76d5..56214bddf 100644
--- a/ShareX.UploadersLib/Helpers/UploadHelpers.cs
+++ b/ShareX.UploadersLib/Helpers/RequestHelpers.cs
@@ -35,7 +35,7 @@ You should have received a copy of the GNU General Public License
 
 namespace ShareX.UploadersLib
 {
-    internal static class UploadHelpers
+    internal static class RequestHelpers
     {
         public const string ContentTypeMultipartFormData = "multipart/form-data";
         public const string ContentTypeJSON = "application/json";
diff --git a/ShareX.UploadersLib/Helpers/ResponseInfo.cs b/ShareX.UploadersLib/Helpers/ResponseInfo.cs
index 251a8870f..e15d3f965 100644
--- a/ShareX.UploadersLib/Helpers/ResponseInfo.cs
+++ b/ShareX.UploadersLib/Helpers/ResponseInfo.cs
@@ -32,7 +32,7 @@ public class ResponseInfo
     {
         public HttpStatusCode StatusCode { get; set; }
         public string StatusDescription { get; set; }
-        public bool IsSuccess => UploadHelpers.IsSuccessStatusCode(StatusCode);
+        public bool IsSuccess => RequestHelpers.IsSuccessStatusCode(StatusCode);
         public string ResponseURL { get; set; }
         public WebHeaderCollection Headers { get; set; }
         public string ResponseText { get; set; }
diff --git a/ShareX.UploadersLib/ImageUploaders/CustomImageUploader.cs b/ShareX.UploadersLib/ImageUploaders/CustomImageUploader.cs
index 64f68ff77..76e10aada 100644
--- a/ShareX.UploadersLib/ImageUploaders/CustomImageUploader.cs
+++ b/ShareX.UploadersLib/ImageUploaders/CustomImageUploader.cs
@@ -84,7 +84,7 @@ public override UploadResult Upload(Stream stream, string fileName)
             }
             else if (uploader.Body == CustomUploaderBody.Binary)
             {
-                result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), stream, UploadHelpers.GetMimeType(fileName),
+                result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), stream, RequestHelpers.GetMimeType(fileName),
                     null, uploader.GetHeaders(input));
             }
             else
diff --git a/ShareX.UploadersLib/ImageUploaders/GooglePhotos.cs b/ShareX.UploadersLib/ImageUploaders/GooglePhotos.cs
index ef0cff55f..47d670904 100644
--- a/ShareX.UploadersLib/ImageUploaders/GooglePhotos.cs
+++ b/ShareX.UploadersLib/ImageUploaders/GooglePhotos.cs
@@ -108,7 +108,7 @@ public GooglePhotosAlbum CreateAlbum(string albumName)
             };
 
             string serializedNewItemAlbum = JsonConvert.SerializeObject(newItemAlbum);
-            string serializedNewItemAlbumResponse = SendRequest(HttpMethod.POST, "https://photoslibrary.googleapis.com/v1/albums", serializedNewItemAlbum, UploadHelpers.ContentTypeJSON, newItemAlbumArgs, GoogleAuth.GetAuthHeaders());
+            string serializedNewItemAlbumResponse = SendRequest(HttpMethod.POST, "https://photoslibrary.googleapis.com/v1/albums", serializedNewItemAlbum, RequestHelpers.ContentTypeJSON, newItemAlbumArgs, GoogleAuth.GetAuthHeaders());
             GooglePhotosAlbum newItemAlbumResponse = JsonConvert.DeserializeObject<GooglePhotosAlbum>(serializedNewItemAlbumResponse);
 
             return newItemAlbumResponse;
@@ -180,7 +180,7 @@ public override UploadResult Upload(Stream stream, string fileName)
                 GooglePhotosAlbumOptions albumOptions = new GooglePhotosAlbumOptions();
 
                 string serializedAlbumOptions = JsonConvert.SerializeObject(albumOptions);
-                string serializedAlbumOptionsResponse = SendRequest(HttpMethod.POST, $"https://photoslibrary.googleapis.com/v1/albums/{AlbumID}:share", serializedAlbumOptions, UploadHelpers.ContentTypeJSON, albumOptionsResponseArgs, GoogleAuth.GetAuthHeaders());
+                string serializedAlbumOptionsResponse = SendRequest(HttpMethod.POST, $"https://photoslibrary.googleapis.com/v1/albums/{AlbumID}:share", serializedAlbumOptions, RequestHelpers.ContentTypeJSON, albumOptionsResponseArgs, GoogleAuth.GetAuthHeaders());
                 GooglePhotosAlbumOptionsResponse albumOptionsResponse = JsonConvert.DeserializeObject<GooglePhotosAlbumOptionsResponse>(serializedAlbumOptionsResponse);
 
                 result.URL = albumOptionsResponse.shareInfo.shareableUrl;
@@ -193,7 +193,7 @@ public override UploadResult Upload(Stream stream, string fileName)
                 { "Authorization", GoogleAuth.GetAuthHeaders()["Authorization"] }
             };
 
-            string uploadToken = SendRequest(HttpMethod.POST, "https://photoslibrary.googleapis.com/v1/uploads", stream, UploadHelpers.ContentTypeOctetStream, null, uploadTokenHeaders);
+            string uploadToken = SendRequest(HttpMethod.POST, "https://photoslibrary.googleapis.com/v1/uploads", stream, RequestHelpers.ContentTypeOctetStream, null, uploadTokenHeaders);
 
             GooglePhotosNewMediaItemRequest newMediaItemRequest = new GooglePhotosNewMediaItemRequest
             {
@@ -217,7 +217,7 @@ public override UploadResult Upload(Stream stream, string fileName)
 
             string serializedNewMediaItemRequest = JsonConvert.SerializeObject(newMediaItemRequest);
 
-            result.Response = SendRequest(HttpMethod.POST, "https://photoslibrary.googleapis.com/v1/mediaItems:batchCreate", serializedNewMediaItemRequest, UploadHelpers.ContentTypeJSON, newMediaItemRequestArgs, GoogleAuth.GetAuthHeaders());
+            result.Response = SendRequest(HttpMethod.POST, "https://photoslibrary.googleapis.com/v1/mediaItems:batchCreate", serializedNewMediaItemRequest, RequestHelpers.ContentTypeJSON, newMediaItemRequestArgs, GoogleAuth.GetAuthHeaders());
 
             GooglePhotosNewMediaItemResults newMediaItemResult = JsonConvert.DeserializeObject<GooglePhotosNewMediaItemResults>(result.Response);
 
diff --git a/ShareX.UploadersLib/ShareX.UploadersLib.csproj b/ShareX.UploadersLib/ShareX.UploadersLib.csproj
index 34e02613a..0f741f58e 100644
--- a/ShareX.UploadersLib/ShareX.UploadersLib.csproj
+++ b/ShareX.UploadersLib/ShareX.UploadersLib.csproj
@@ -237,7 +237,7 @@
     <Compile Include="Helpers\MimeTypes.cs" />
     <Compile Include="Helpers\OCROptions.cs" />
     <Compile Include="Helpers\ResponseInfo.cs" />
-    <Compile Include="Helpers\UploadHelpers.cs" />
+    <Compile Include="Helpers\RequestHelpers.cs" />
     <Compile Include="OAuth\GoogleOAuth2.cs" />
     <Compile Include="OAuth\IOAuthBase.cs" />
     <Compile Include="OAuth\OAuth2ProofKey.cs" />
diff --git a/ShareX.UploadersLib/TextUploaders/CustomTextUploader.cs b/ShareX.UploadersLib/TextUploaders/CustomTextUploader.cs
index 1968f1406..589cdb0f9 100644
--- a/ShareX.UploadersLib/TextUploaders/CustomTextUploader.cs
+++ b/ShareX.UploadersLib/TextUploaders/CustomTextUploader.cs
@@ -113,7 +113,7 @@ public override UploadResult UploadText(string text, string fileName)
                 byte[] bytes = Encoding.UTF8.GetBytes(text);
                 using (MemoryStream stream = new MemoryStream(bytes))
                 {
-                    result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), stream, UploadHelpers.GetMimeType(fileName),
+                    result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), stream, RequestHelpers.GetMimeType(fileName),
                         null, uploader.GetHeaders(input));
                 }
             }
diff --git a/ShareX.UploadersLib/TextUploaders/GitHubGist.cs b/ShareX.UploadersLib/TextUploaders/GitHubGist.cs
index d205b4467..9edcac3fb 100644
--- a/ShareX.UploadersLib/TextUploaders/GitHubGist.cs
+++ b/ShareX.UploadersLib/TextUploaders/GitHubGist.cs
@@ -93,7 +93,7 @@ public bool GetAccessToken(string code)
             args.Add("code", code);
 
             WebHeaderCollection headers = new WebHeaderCollection();
-            headers.Add("Accept", UploadHelpers.ContentTypeJSON);
+            headers.Add("Accept", RequestHelpers.ContentTypeJSON);
 
             string response = SendRequestMultiPart("https://github.com/login/oauth/access_token", args, headers);
 
@@ -144,7 +144,7 @@ public override UploadResult UploadText(string text, string fileName)
                 Dictionary<string, string> args = new Dictionary<string, string>();
                 args.Add("access_token", AuthInfo.Token.access_token);
 
-                string response = SendRequest(HttpMethod.POST, url, json, UploadHelpers.ContentTypeJSON, args);
+                string response = SendRequest(HttpMethod.POST, url, json, RequestHelpers.ContentTypeJSON, args);
 
                 GistResponse gistResponse = JsonConvert.DeserializeObject<GistResponse>(response);
 
diff --git a/ShareX.UploadersLib/TextUploaders/OneTimeSecret.cs b/ShareX.UploadersLib/TextUploaders/OneTimeSecret.cs
index 28e36459d..70fb0bae1 100644
--- a/ShareX.UploadersLib/TextUploaders/OneTimeSecret.cs
+++ b/ShareX.UploadersLib/TextUploaders/OneTimeSecret.cs
@@ -75,7 +75,7 @@ public override UploadResult UploadText(string text, string fileName)
 
                 if (!string.IsNullOrEmpty(API_USERNAME) && !string.IsNullOrEmpty(API_KEY))
                 {
-                    headers = UploadHelpers.CreateAuthenticationHeader(API_USERNAME, API_KEY);
+                    headers = RequestHelpers.CreateAuthenticationHeader(API_USERNAME, API_KEY);
                 }
 
                 result.Response = SendRequestMultiPart(API_ENDPOINT, args, headers);
diff --git a/ShareX.UploadersLib/TextUploaders/Paste_ee.cs b/ShareX.UploadersLib/TextUploaders/Paste_ee.cs
index d150f6cb0..6ff5e0167 100644
--- a/ShareX.UploadersLib/TextUploaders/Paste_ee.cs
+++ b/ShareX.UploadersLib/TextUploaders/Paste_ee.cs
@@ -104,7 +104,7 @@ public override UploadResult UploadText(string text, string fileName)
                 NameValueCollection headers = new NameValueCollection();
                 headers.Add("X-Auth-Token", APIKey);
 
-                ur.Response = SendRequest(HttpMethod.POST, "https://api.paste.ee/v1/pastes", json, UploadHelpers.ContentTypeJSON, null, headers);
+                ur.Response = SendRequest(HttpMethod.POST, "https://api.paste.ee/v1/pastes", json, RequestHelpers.ContentTypeJSON, null, headers);
 
                 if (!string.IsNullOrEmpty(ur.Response))
                 {
diff --git a/ShareX.UploadersLib/URLShorteners/FirebaseDynamicLinksURLShortener.cs b/ShareX.UploadersLib/URLShorteners/FirebaseDynamicLinksURLShortener.cs
index 201f38cfe..02cff9c7c 100644
--- a/ShareX.UploadersLib/URLShorteners/FirebaseDynamicLinksURLShortener.cs
+++ b/ShareX.UploadersLib/URLShorteners/FirebaseDynamicLinksURLShortener.cs
@@ -115,7 +115,7 @@ public override UploadResult ShortenURL(string url)
             };
 
             string serializedRequestOptions = JsonConvert.SerializeObject(requestOptions);
-            result.Response = SendRequest(HttpMethod.POST, "https://firebasedynamiclinks.googleapis.com/v1/shortLinks", serializedRequestOptions, UploadHelpers.ContentTypeJSON, args);
+            result.Response = SendRequest(HttpMethod.POST, "https://firebasedynamiclinks.googleapis.com/v1/shortLinks", serializedRequestOptions, RequestHelpers.ContentTypeJSON, args);
 
             FirebaseResponse firebaseResponse = JsonConvert.DeserializeObject<FirebaseResponse>(result.Response);
 
diff --git a/ShareX.UploadersLib/URLShorteners/KuttURLShortener.cs b/ShareX.UploadersLib/URLShorteners/KuttURLShortener.cs
index 35fb26c71..a0cf1a677 100644
--- a/ShareX.UploadersLib/URLShorteners/KuttURLShortener.cs
+++ b/ShareX.UploadersLib/URLShorteners/KuttURLShortener.cs
@@ -93,7 +93,7 @@ public string Submit(string url)
             NameValueCollection headers = new NameValueCollection();
             headers.Add("X-API-Key", Settings.APIKey);
 
-            string response = SendRequest(HttpMethod.POST, requestURL, json, UploadHelpers.ContentTypeJSON, headers: headers);
+            string response = SendRequest(HttpMethod.POST, requestURL, json, RequestHelpers.ContentTypeJSON, headers: headers);
 
             if (!string.IsNullOrEmpty(response))
             {