From bc0b266339b8970acf3545807b6af474f1fe5142 Mon Sep 17 00:00:00 2001
From: Petri Asikainen <petri.asikainen@sataedu.fi>
Date: Sun, 22 Aug 2021 22:23:08 +0300
Subject: [PATCH] Renamed helper funtions

---
 SnipeitPS/Private/Invoke-SnipeitMethod.ps1               | 9 ++++++---
 ...PSSessionApiKey.ps1 => Set-SnipeitPSLegacyApiKey.ps1} | 4 ++--
 ...nipeitPSSessionUrl.ps1 => Set-SnipeitPSLegacyUrl.ps1} | 2 +-
 SnipeitPS/Public/Connect-Snipeit.ps1                     | 8 +++-----
 SnipeitPS/Public/Get-SnipeitAccessory.ps1                | 4 ++--
 SnipeitPS/Public/Get-SnipeitAccessoryOwner.ps1           | 4 ++--
 SnipeitPS/Public/Get-SnipeitActivity.ps1                 | 4 ++--
 SnipeitPS/Public/Get-SnipeitAsset.ps1                    | 4 ++--
 SnipeitPS/Public/Get-SnipeitAssetMaintenance.ps1         | 4 ++--
 SnipeitPS/Public/Get-SnipeitCategory.ps1                 | 4 ++--
 SnipeitPS/Public/Get-SnipeitCompany.ps1                  | 4 ++--
 SnipeitPS/Public/Get-SnipeitComponent.ps1                | 4 ++--
 SnipeitPS/Public/Get-SnipeitConsumable.ps1               | 8 ++++----
 SnipeitPS/Public/Get-SnipeitCustomField.ps1              | 4 ++--
 SnipeitPS/Public/Get-SnipeitDepartment.ps1               | 4 ++--
 SnipeitPS/Public/Get-SnipeitFieldset.ps1                 | 4 ++--
 SnipeitPS/Public/Get-SnipeitLicense.ps1                  | 4 ++--
 SnipeitPS/Public/Get-SnipeitLicenseSeat.ps1              | 4 ++--
 SnipeitPS/Public/Get-SnipeitLocation.ps1                 | 4 ++--
 SnipeitPS/Public/Get-SnipeitManufacturer.ps1             | 4 ++--
 SnipeitPS/Public/Get-SnipeitModel.ps1                    | 4 ++--
 SnipeitPS/Public/Get-SnipeitStatus.ps1                   | 4 ++--
 SnipeitPS/Public/Get-SnipeitSupplier.ps1                 | 4 ++--
 SnipeitPS/Public/Get-SnipeitUser.ps1                     | 4 ++--
 SnipeitPS/Public/New-SnipeitAccessory.ps1                | 4 ++--
 SnipeitPS/Public/New-SnipeitAsset.ps1                    | 4 ++--
 SnipeitPS/Public/New-SnipeitAssetMaintenance.ps1         | 4 ++--
 SnipeitPS/Public/New-SnipeitAudit.ps1                    | 4 ++--
 SnipeitPS/Public/New-SnipeitCategory.ps1                 | 4 ++--
 SnipeitPS/Public/New-SnipeitCompany.ps1                  | 4 ++--
 SnipeitPS/Public/New-SnipeitComponent.ps1                | 4 ++--
 SnipeitPS/Public/New-SnipeitConsumable.ps1               | 4 ++--
 SnipeitPS/Public/New-SnipeitCustomField.ps1              | 4 ++--
 SnipeitPS/Public/New-SnipeitDepartment.ps1               | 4 ++--
 SnipeitPS/Public/New-SnipeitLicense.ps1                  | 4 ++--
 SnipeitPS/Public/New-SnipeitLocation.ps1                 | 4 ++--
 SnipeitPS/Public/New-SnipeitManufacturer.ps1             | 4 ++--
 SnipeitPS/Public/New-SnipeitModel.ps1                    | 4 ++--
 SnipeitPS/Public/New-SnipeitSupplier.ps1                 | 4 ++--
 SnipeitPS/Public/New-SnipeitUser.ps1                     | 4 ++--
 SnipeitPS/Public/Remove-SnipeitAccessory.ps1             | 4 ++--
 SnipeitPS/Public/Remove-SnipeitAsset.ps1                 | 4 ++--
 SnipeitPS/Public/Remove-SnipeitAssetMaintenance.ps1      | 4 ++--
 SnipeitPS/Public/Remove-SnipeitCategory.ps1              | 4 ++--
 SnipeitPS/Public/Remove-SnipeitCompany.ps1               | 4 ++--
 SnipeitPS/Public/Remove-SnipeitComponent.ps1             | 4 ++--
 SnipeitPS/Public/Remove-SnipeitConsumable.ps1            | 4 ++--
 SnipeitPS/Public/Remove-SnipeitCustomField.ps1           | 4 ++--
 SnipeitPS/Public/Remove-SnipeitDepartment.ps1            | 4 ++--
 SnipeitPS/Public/Remove-SnipeitLicense.ps1               | 4 ++--
 SnipeitPS/Public/Remove-SnipeitLocation.ps1              | 4 ++--
 SnipeitPS/Public/Remove-SnipeitManufacturer.ps1          | 4 ++--
 SnipeitPS/Public/Remove-SnipeitModel.ps1                 | 4 ++--
 SnipeitPS/Public/Remove-SnipeitSupplier.ps1              | 4 ++--
 SnipeitPS/Public/Remove-SnipeitUser.ps1                  | 4 ++--
 SnipeitPS/Public/Reset-SnipeitAccessoryOwner.ps1         | 4 ++--
 SnipeitPS/Public/Reset-SnipeitAssetOwner.ps1             | 4 ++--
 SnipeitPS/Public/Set-SnipeitAccessory.ps1                | 4 ++--
 SnipeitPS/Public/Set-SnipeitAccessoryOwner.ps1           | 4 ++--
 SnipeitPS/Public/Set-SnipeitAsset.ps1                    | 4 ++--
 SnipeitPS/Public/Set-SnipeitAssetOwner.ps1               | 4 ++--
 SnipeitPS/Public/Set-SnipeitCategory.ps1                 | 4 ++--
 SnipeitPS/Public/Set-SnipeitCompany.ps1                  | 4 ++--
 SnipeitPS/Public/Set-SnipeitComponent.ps1                | 4 ++--
 SnipeitPS/Public/Set-SnipeitConsumable.ps1               | 4 ++--
 SnipeitPS/Public/Set-SnipeitCustomField.ps1              | 4 ++--
 SnipeitPS/Public/Set-SnipeitDepartment.ps1               | 4 ++--
 SnipeitPS/Public/Set-SnipeitLicense.ps1                  | 4 ++--
 SnipeitPS/Public/Set-SnipeitLicenseSeat.ps1              | 4 ++--
 SnipeitPS/Public/Set-SnipeitLocation.ps1                 | 4 ++--
 SnipeitPS/Public/Set-SnipeitManufacturer.ps1             | 4 ++--
 SnipeitPS/Public/Set-SnipeitModel.ps1                    | 4 ++--
 SnipeitPS/Public/Set-SnipeitStatus.ps1                   | 4 ++--
 SnipeitPS/Public/Set-SnipeitSupplier.ps1                 | 4 ++--
 SnipeitPS/Public/Set-SnipeitUser.ps1                     | 4 ++--
 75 files changed, 156 insertions(+), 155 deletions(-)
 rename SnipeitPS/Private/{Set-SnipeitPSSessionApiKey.ps1 => Set-SnipeitPSLegacyApiKey.ps1} (64%)
 rename SnipeitPS/Private/{Set-SnipeitPSSessionUrl.ps1 => Set-SnipeitPSLegacyUrl.ps1} (87%)

diff --git a/SnipeitPS/Private/Invoke-SnipeitMethod.ps1 b/SnipeitPS/Private/Invoke-SnipeitMethod.ps1
index 4e4dee1..710464b 100644
--- a/SnipeitPS/Private/Invoke-SnipeitMethod.ps1
+++ b/SnipeitPS/Private/Invoke-SnipeitMethod.ps1
@@ -34,9 +34,12 @@ function Invoke-SnipeitMethod {
     )
 
     BEGIN {
-        $Url = $SnipeitPSSession.url
-        $Token = $SnipeitPSSession.apiKey
-
+        if ( $null -eq $SnipeitPSSession.url -or $null -eq $SnipeitPSSession.apiKey ) {
+            throw "Cannot connect to Snipe it.Please run Connect-SnipePS to set connection information."
+        } else {
+            $Url = $SnipeitPSSession.url
+            $Token = $SnipeitPSSession.apiKey | ConvertFrom-SecureString -AsPlainText
+        }
         # Validation of parameters
         if (($Method -in ("POST", "PUT", "PATCH")) -and (!($Body))) {
             $message = "The following parameters are required when using the ${Method} parameter: Body."
diff --git a/SnipeitPS/Private/Set-SnipeitPSSessionApiKey.ps1 b/SnipeitPS/Private/Set-SnipeitPSLegacyApiKey.ps1
similarity index 64%
rename from SnipeitPS/Private/Set-SnipeitPSSessionApiKey.ps1
rename to SnipeitPS/Private/Set-SnipeitPSLegacyApiKey.ps1
index cd3e4da..199b421 100644
--- a/SnipeitPS/Private/Set-SnipeitPSSessionApiKey.ps1
+++ b/SnipeitPS/Private/Set-SnipeitPSLegacyApiKey.ps1
@@ -1,4 +1,4 @@
-function Set-SnipeitPSSessionApiKey {
+function Set-SnipeitPSLegacyApiKey {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -8,7 +8,7 @@ function Set-SnipeitPSSessionApiKey {
     )
     process {
         if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
-            $SnipeitPSSession.apiKey = $apiKey
+            $SnipeitPSSession.apiKey = $apiKey  | ConvertTo-SecureString -AsPlainText
         }
     }
 }
diff --git a/SnipeitPS/Private/Set-SnipeitPSSessionUrl.ps1 b/SnipeitPS/Private/Set-SnipeitPSLegacyUrl.ps1
similarity index 87%
rename from SnipeitPS/Private/Set-SnipeitPSSessionUrl.ps1
rename to SnipeitPS/Private/Set-SnipeitPSLegacyUrl.ps1
index b15153d..19a101d 100644
--- a/SnipeitPS/Private/Set-SnipeitPSSessionUrl.ps1
+++ b/SnipeitPS/Private/Set-SnipeitPSLegacyUrl.ps1
@@ -1,4 +1,4 @@
-function Set-SnipeitPSSessionUrl {
+function Set-SnipeitPSLegacyUrl {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
diff --git a/SnipeitPS/Public/Connect-Snipeit.ps1 b/SnipeitPS/Public/Connect-Snipeit.ps1
index 81505a3..58c6582 100644
--- a/SnipeitPS/Public/Connect-Snipeit.ps1
+++ b/SnipeitPS/Public/Connect-Snipeit.ps1
@@ -45,7 +45,6 @@ function Connect-SnipeitPS {
     [System.Diagnostics.CodeAnalysis.SuppressMessage('PSUseShouldProcessForStateChangingFunctions', '')]
 
     param (
-
         [Parameter(ParameterSetName='Connect with url and apikey',Mandatory=$true)]
         [Parameter(ParameterSetName='Connect with url and secure apikey',Mandatory=$true)]
         [Uri]$url,
@@ -54,12 +53,10 @@ function Connect-SnipeitPS {
         [String]$apiKey,
 
         [Parameter(ParameterSetName='Connect with url and secure apikey',Mandatory=$true)]
-        [SecureString]$SecureApiKey,
-
+        [SecureString]$secureApiKey,
 
         [Parameter(ParameterSetName='Connect with credential',Mandatory=$true)]
         [PSCredertial]$siteCred
-
     )
 
 
@@ -80,8 +77,9 @@ function Connect-SnipeitPS {
                 $SnipeitPSSession.apiKey = $siteCred.GetNetworkCredential().SecurePassword
             }
         }
+
         if (-not (Test-SnipeitPSConnection)) {
-            throw "Cannot verify connection to snipe it. For the start check url  and provided apikey"
+            throw "Cannot verify connection to snipe it. For the start try to check url and provided apikey or credentials"
         }
     }
 }
diff --git a/SnipeitPS/Public/Get-SnipeitAccessory.ps1 b/SnipeitPS/Public/Get-SnipeitAccessory.ps1
index 2006979..ea2b276 100644
--- a/SnipeitPS/Public/Get-SnipeitAccessory.ps1
+++ b/SnipeitPS/Public/Get-SnipeitAccessory.ps1
@@ -103,12 +103,12 @@ function Get-SnipeitAccessory() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($all) {
diff --git a/SnipeitPS/Public/Get-SnipeitAccessoryOwner.ps1 b/SnipeitPS/Public/Get-SnipeitAccessoryOwner.ps1
index 6a954a2..6a2cfb6 100644
--- a/SnipeitPS/Public/Get-SnipeitAccessoryOwner.ps1
+++ b/SnipeitPS/Public/Get-SnipeitAccessoryOwner.ps1
@@ -40,12 +40,12 @@ function Get-SnipeitAccessoryOwner() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Get-SnipeitActivity.ps1 b/SnipeitPS/Public/Get-SnipeitActivity.ps1
index e3a45c8..85cd966 100644
--- a/SnipeitPS/Public/Get-SnipeitActivity.ps1
+++ b/SnipeitPS/Public/Get-SnipeitActivity.ps1
@@ -99,12 +99,12 @@ function Get-SnipeitActivity() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($all) {
diff --git a/SnipeitPS/Public/Get-SnipeitAsset.ps1 b/SnipeitPS/Public/Get-SnipeitAsset.ps1
index 1f4bb33..3392df0 100644
--- a/SnipeitPS/Public/Get-SnipeitAsset.ps1
+++ b/SnipeitPS/Public/Get-SnipeitAsset.ps1
@@ -229,12 +229,12 @@ function Get-SnipeitAsset() {
 
      if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($all) {
diff --git a/SnipeitPS/Public/Get-SnipeitAssetMaintenance.ps1 b/SnipeitPS/Public/Get-SnipeitAssetMaintenance.ps1
index f01a409..c9590d8 100644
--- a/SnipeitPS/Public/Get-SnipeitAssetMaintenance.ps1
+++ b/SnipeitPS/Public/Get-SnipeitAssetMaintenance.ps1
@@ -73,12 +73,12 @@ function Get-SnipeitAssetMaintenance() {
 
      if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($all) {
diff --git a/SnipeitPS/Public/Get-SnipeitCategory.ps1 b/SnipeitPS/Public/Get-SnipeitCategory.ps1
index 17a1991..783768d 100644
--- a/SnipeitPS/Public/Get-SnipeitCategory.ps1
+++ b/SnipeitPS/Public/Get-SnipeitCategory.ps1
@@ -81,12 +81,12 @@ function Get-SnipeitCategory() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($all) {
diff --git a/SnipeitPS/Public/Get-SnipeitCompany.ps1 b/SnipeitPS/Public/Get-SnipeitCompany.ps1
index da98649..b37c9ae 100644
--- a/SnipeitPS/Public/Get-SnipeitCompany.ps1
+++ b/SnipeitPS/Public/Get-SnipeitCompany.ps1
@@ -83,12 +83,12 @@ function Get-SnipeitCompany() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($all) {
diff --git a/SnipeitPS/Public/Get-SnipeitComponent.ps1 b/SnipeitPS/Public/Get-SnipeitComponent.ps1
index b0acd7a..a76632c 100644
--- a/SnipeitPS/Public/Get-SnipeitComponent.ps1
+++ b/SnipeitPS/Public/Get-SnipeitComponent.ps1
@@ -100,12 +100,12 @@ function Get-SnipeitComponent() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($all) {
diff --git a/SnipeitPS/Public/Get-SnipeitConsumable.ps1 b/SnipeitPS/Public/Get-SnipeitConsumable.ps1
index 73c65c0..d033c05 100644
--- a/SnipeitPS/Public/Get-SnipeitConsumable.ps1
+++ b/SnipeitPS/Public/Get-SnipeitConsumable.ps1
@@ -118,12 +118,12 @@ function Get-SnipeitConsumable() {
 
                 if ($PSBoundParameters.ContainsKey('apiKey')) {
                     Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                    Set-SnipeitPSSessionApiKey -apiKey $apikey
+                    Set-SnipeitPSLegacyApiKey -apiKey $apikey
                 }
 
                 if ($PSBoundParameters.ContainsKey('url')) {
                     Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                    Set-SnipeitPSSessionUrl -url $url
+                    Set-SnipeitPSLegacyUrl -url $url
                 }
 
                 if ($all) {
@@ -157,12 +157,12 @@ function Get-SnipeitConsumable() {
 
                     if ($PSBoundParameters.ContainsKey('apiKey')) {
                         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                        Set-SnipeitPSSessionApiKey -apiKey $apikey
+                        Set-SnipeitPSLegacyApiKey -apiKey $apikey
                     }
 
                     if ($PSBoundParameters.ContainsKey('url')) {
                         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                        Set-SnipeitPSSessionUrl -url $url
+                        Set-SnipeitPSLegacyUrl -url $url
                     }
 
                     $result = Invoke-SnipeitMethod @Parameters
diff --git a/SnipeitPS/Public/Get-SnipeitCustomField.ps1 b/SnipeitPS/Public/Get-SnipeitCustomField.ps1
index 7e030bc..cc33891 100644
--- a/SnipeitPS/Public/Get-SnipeitCustomField.ps1
+++ b/SnipeitPS/Public/Get-SnipeitCustomField.ps1
@@ -48,12 +48,12 @@ function Get-SnipeitCustomField() {
 
      if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
 
diff --git a/SnipeitPS/Public/Get-SnipeitDepartment.ps1 b/SnipeitPS/Public/Get-SnipeitDepartment.ps1
index 1882658..f3c7faf 100644
--- a/SnipeitPS/Public/Get-SnipeitDepartment.ps1
+++ b/SnipeitPS/Public/Get-SnipeitDepartment.ps1
@@ -89,12 +89,12 @@ function Get-SnipeitDepartment() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($all) {
diff --git a/SnipeitPS/Public/Get-SnipeitFieldset.ps1 b/SnipeitPS/Public/Get-SnipeitFieldset.ps1
index a9d3717..999909a 100644
--- a/SnipeitPS/Public/Get-SnipeitFieldset.ps1
+++ b/SnipeitPS/Public/Get-SnipeitFieldset.ps1
@@ -47,12 +47,12 @@ function Get-SnipeitFieldset() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     $result = Invoke-SnipeitMethod @Parameters
diff --git a/SnipeitPS/Public/Get-SnipeitLicense.ps1 b/SnipeitPS/Public/Get-SnipeitLicense.ps1
index d84cd01..ff2fcaf 100644
--- a/SnipeitPS/Public/Get-SnipeitLicense.ps1
+++ b/SnipeitPS/Public/Get-SnipeitLicense.ps1
@@ -124,12 +124,12 @@ function Get-SnipeitLicense() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($all) {
diff --git a/SnipeitPS/Public/Get-SnipeitLicenseSeat.ps1 b/SnipeitPS/Public/Get-SnipeitLicenseSeat.ps1
index d666519..d57688f 100644
--- a/SnipeitPS/Public/Get-SnipeitLicenseSeat.ps1
+++ b/SnipeitPS/Public/Get-SnipeitLicenseSeat.ps1
@@ -73,12 +73,12 @@ function Get-SnipeitLicenseSeat() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($all) {
diff --git a/SnipeitPS/Public/Get-SnipeitLocation.ps1 b/SnipeitPS/Public/Get-SnipeitLocation.ps1
index 2e11db9..d362d9d 100644
--- a/SnipeitPS/Public/Get-SnipeitLocation.ps1
+++ b/SnipeitPS/Public/Get-SnipeitLocation.ps1
@@ -82,12 +82,12 @@ function Get-SnipeitLocation() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($all) {
diff --git a/SnipeitPS/Public/Get-SnipeitManufacturer.ps1 b/SnipeitPS/Public/Get-SnipeitManufacturer.ps1
index f4dcc17..579a2bc 100644
--- a/SnipeitPS/Public/Get-SnipeitManufacturer.ps1
+++ b/SnipeitPS/Public/Get-SnipeitManufacturer.ps1
@@ -83,12 +83,12 @@ function Get-SnipeitManufacturer() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($all) {
diff --git a/SnipeitPS/Public/Get-SnipeitModel.ps1 b/SnipeitPS/Public/Get-SnipeitModel.ps1
index 76e9415..e06cdb9 100644
--- a/SnipeitPS/Public/Get-SnipeitModel.ps1
+++ b/SnipeitPS/Public/Get-SnipeitModel.ps1
@@ -82,12 +82,12 @@ function Get-SnipeitModel() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($all) {
diff --git a/SnipeitPS/Public/Get-SnipeitStatus.ps1 b/SnipeitPS/Public/Get-SnipeitStatus.ps1
index c655384..ecdc3db 100644
--- a/SnipeitPS/Public/Get-SnipeitStatus.ps1
+++ b/SnipeitPS/Public/Get-SnipeitStatus.ps1
@@ -82,12 +82,12 @@ function Get-SnipeitStatus() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($all) {
diff --git a/SnipeitPS/Public/Get-SnipeitSupplier.ps1 b/SnipeitPS/Public/Get-SnipeitSupplier.ps1
index 718d7b0..d1106de 100644
--- a/SnipeitPS/Public/Get-SnipeitSupplier.ps1
+++ b/SnipeitPS/Public/Get-SnipeitSupplier.ps1
@@ -81,12 +81,12 @@ function Get-SnipeitSupplier() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($all) {
diff --git a/SnipeitPS/Public/Get-SnipeitUser.ps1 b/SnipeitPS/Public/Get-SnipeitUser.ps1
index b0be9b1..4297975 100644
--- a/SnipeitPS/Public/Get-SnipeitUser.ps1
+++ b/SnipeitPS/Public/Get-SnipeitUser.ps1
@@ -114,12 +114,12 @@ function Get-SnipeitUser() {
 
      if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($all) {
diff --git a/SnipeitPS/Public/New-SnipeitAccessory.ps1 b/SnipeitPS/Public/New-SnipeitAccessory.ps1
index 2e15a51..7474fa9 100644
--- a/SnipeitPS/Public/New-SnipeitAccessory.ps1
+++ b/SnipeitPS/Public/New-SnipeitAccessory.ps1
@@ -132,12 +132,12 @@ function New-SnipeitAccessory() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/New-SnipeitAsset.ps1 b/SnipeitPS/Public/New-SnipeitAsset.ps1
index b5e7fb8..fa3fa6b 100644
--- a/SnipeitPS/Public/New-SnipeitAsset.ps1
+++ b/SnipeitPS/Public/New-SnipeitAsset.ps1
@@ -177,12 +177,12 @@ function New-SnipeitAsset() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/New-SnipeitAssetMaintenance.ps1 b/SnipeitPS/Public/New-SnipeitAssetMaintenance.ps1
index 8854cfc..85dc774 100644
--- a/SnipeitPS/Public/New-SnipeitAssetMaintenance.ps1
+++ b/SnipeitPS/Public/New-SnipeitAssetMaintenance.ps1
@@ -98,12 +98,12 @@ function New-SnipeitAssetMaintenance() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/New-SnipeitAudit.ps1 b/SnipeitPS/Public/New-SnipeitAudit.ps1
index f5eb8c7..06e94c8 100644
--- a/SnipeitPS/Public/New-SnipeitAudit.ps1
+++ b/SnipeitPS/Public/New-SnipeitAudit.ps1
@@ -54,12 +54,12 @@ function New-SnipeitAudit() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/New-SnipeitCategory.ps1 b/SnipeitPS/Public/New-SnipeitCategory.ps1
index 0f8b11a..14d016a 100644
--- a/SnipeitPS/Public/New-SnipeitCategory.ps1
+++ b/SnipeitPS/Public/New-SnipeitCategory.ps1
@@ -85,12 +85,12 @@ function New-SnipeitCategory() {
 
         if ($PSBoundParameters.ContainsKey('apiKey')) {
             Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-            Set-SnipeitPSSessionApiKey -apiKey $apikey
+            Set-SnipeitPSLegacyApiKey -apiKey $apikey
         }
 
         if ($PSBoundParameters.ContainsKey('url')) {
             Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-            Set-SnipeitPSSessionUrl -url $url
+            Set-SnipeitPSLegacyUrl -url $url
         }
 
         if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/New-SnipeitCompany.ps1 b/SnipeitPS/Public/New-SnipeitCompany.ps1
index d57c986..e6c4e82 100644
--- a/SnipeitPS/Public/New-SnipeitCompany.ps1
+++ b/SnipeitPS/Public/New-SnipeitCompany.ps1
@@ -54,12 +54,12 @@ function New-SnipeitCompany() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/New-SnipeitComponent.ps1 b/SnipeitPS/Public/New-SnipeitComponent.ps1
index c88070b..c734a3c 100644
--- a/SnipeitPS/Public/New-SnipeitComponent.ps1
+++ b/SnipeitPS/Public/New-SnipeitComponent.ps1
@@ -93,12 +93,12 @@ function New-SnipeitComponent() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/New-SnipeitConsumable.ps1 b/SnipeitPS/Public/New-SnipeitConsumable.ps1
index a63ecb3..09ccb7f 100644
--- a/SnipeitPS/Public/New-SnipeitConsumable.ps1
+++ b/SnipeitPS/Public/New-SnipeitConsumable.ps1
@@ -133,12 +133,12 @@ function New-SnipeitConsumable() {
 
         if ($PSBoundParameters.ContainsKey('apiKey')) {
             Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-            Set-SnipeitPSSessionApiKey -apiKey $apikey
+            Set-SnipeitPSLegacyApiKey -apiKey $apikey
         }
 
         if ($PSBoundParameters.ContainsKey('url')) {
             Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-            Set-SnipeitPSSessionUrl -url $url
+            Set-SnipeitPSLegacyUrl -url $url
         }
 
         if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/New-SnipeitCustomField.ps1 b/SnipeitPS/Public/New-SnipeitCustomField.ps1
index f2675c0..c8552ed 100644
--- a/SnipeitPS/Public/New-SnipeitCustomField.ps1
+++ b/SnipeitPS/Public/New-SnipeitCustomField.ps1
@@ -89,11 +89,11 @@ function New-SnipeitCustomField() {
         }
 
         if ($PSBoundParameters.ContainsKey('apiKey')) {
-            Set-SnipeitPSSessionApiKey -apiKey $apikey
+            Set-SnipeitPSLegacyApiKey -apiKey $apikey
         }
 
         if ($PSBoundParameters.ContainsKey('url')) {
-            Set-SnipeitPSSessionUrl -url $url
+            Set-SnipeitPSLegacyUrl -url $url
         }
     }
 
diff --git a/SnipeitPS/Public/New-SnipeitDepartment.ps1 b/SnipeitPS/Public/New-SnipeitDepartment.ps1
index d69ff1a..30f8b5e 100644
--- a/SnipeitPS/Public/New-SnipeitDepartment.ps1
+++ b/SnipeitPS/Public/New-SnipeitDepartment.ps1
@@ -73,12 +73,12 @@ function New-SnipeitDepartment() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/New-SnipeitLicense.ps1 b/SnipeitPS/Public/New-SnipeitLicense.ps1
index a4844a4..edcc6e8 100644
--- a/SnipeitPS/Public/New-SnipeitLicense.ps1
+++ b/SnipeitPS/Public/New-SnipeitLicense.ps1
@@ -148,12 +148,12 @@ function New-SnipeitLicense() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/New-SnipeitLocation.ps1 b/SnipeitPS/Public/New-SnipeitLocation.ps1
index 5b2724f..a11fbb6 100644
--- a/SnipeitPS/Public/New-SnipeitLocation.ps1
+++ b/SnipeitPS/Public/New-SnipeitLocation.ps1
@@ -105,12 +105,12 @@ function New-SnipeitLocation() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/New-SnipeitManufacturer.ps1 b/SnipeitPS/Public/New-SnipeitManufacturer.ps1
index 12f8935..7ebf6ef 100644
--- a/SnipeitPS/Public/New-SnipeitManufacturer.ps1
+++ b/SnipeitPS/Public/New-SnipeitManufacturer.ps1
@@ -60,12 +60,12 @@ function New-SnipeitManufacturer() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/New-SnipeitModel.ps1 b/SnipeitPS/Public/New-SnipeitModel.ps1
index 931bcec..bd5686d 100644
--- a/SnipeitPS/Public/New-SnipeitModel.ps1
+++ b/SnipeitPS/Public/New-SnipeitModel.ps1
@@ -87,12 +87,12 @@ function New-SnipeitModel() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/New-SnipeitSupplier.ps1 b/SnipeitPS/Public/New-SnipeitSupplier.ps1
index a3bcbee..3a56a8a 100644
--- a/SnipeitPS/Public/New-SnipeitSupplier.ps1
+++ b/SnipeitPS/Public/New-SnipeitSupplier.ps1
@@ -109,12 +109,12 @@ function New-SnipeitSupplier() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/New-SnipeitUser.ps1 b/SnipeitPS/Public/New-SnipeitUser.ps1
index 2b40433..95d641c 100644
--- a/SnipeitPS/Public/New-SnipeitUser.ps1
+++ b/SnipeitPS/Public/New-SnipeitUser.ps1
@@ -133,12 +133,12 @@ function New-SnipeitUser() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Remove-SnipeitAccessory.ps1 b/SnipeitPS/Public/Remove-SnipeitAccessory.ps1
index ee17516..26fff6f 100644
--- a/SnipeitPS/Public/Remove-SnipeitAccessory.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitAccessory.ps1
@@ -47,12 +47,12 @@ function Remove-SnipeitAccessory () {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Remove-SnipeitAsset.ps1 b/SnipeitPS/Public/Remove-SnipeitAsset.ps1
index 3a09a64..fd7edd2 100644
--- a/SnipeitPS/Public/Remove-SnipeitAsset.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitAsset.ps1
@@ -48,12 +48,12 @@ function Remove-SnipeitAsset () {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Remove-SnipeitAssetMaintenance.ps1 b/SnipeitPS/Public/Remove-SnipeitAssetMaintenance.ps1
index 960b238..53d45f2 100644
--- a/SnipeitPS/Public/Remove-SnipeitAssetMaintenance.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitAssetMaintenance.ps1
@@ -47,12 +47,12 @@ function Remove-SnipeitAssetMaintenance {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Remove-SnipeitCategory.ps1 b/SnipeitPS/Public/Remove-SnipeitCategory.ps1
index 6dad5f6..d417068 100644
--- a/SnipeitPS/Public/Remove-SnipeitCategory.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitCategory.ps1
@@ -46,12 +46,12 @@ function Remove-SnipeitCategory () {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Remove-SnipeitCompany.ps1 b/SnipeitPS/Public/Remove-SnipeitCompany.ps1
index 429fb69..ffda78e 100644
--- a/SnipeitPS/Public/Remove-SnipeitCompany.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitCompany.ps1
@@ -46,12 +46,12 @@ function Remove-SnipeitCompany () {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Remove-SnipeitComponent.ps1 b/SnipeitPS/Public/Remove-SnipeitComponent.ps1
index 81a3df1..534e4ae 100644
--- a/SnipeitPS/Public/Remove-SnipeitComponent.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitComponent.ps1
@@ -47,12 +47,12 @@ function Remove-SnipeitComponent () {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Remove-SnipeitConsumable.ps1 b/SnipeitPS/Public/Remove-SnipeitConsumable.ps1
index fc7f33f..436af6b 100644
--- a/SnipeitPS/Public/Remove-SnipeitConsumable.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitConsumable.ps1
@@ -48,12 +48,12 @@ function Remove-SnipeitConsumable () {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Remove-SnipeitCustomField.ps1 b/SnipeitPS/Public/Remove-SnipeitCustomField.ps1
index 2bab78f..8945612 100644
--- a/SnipeitPS/Public/Remove-SnipeitCustomField.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitCustomField.ps1
@@ -45,12 +45,12 @@ function Remove-SnipeitCustomField () {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Remove-SnipeitDepartment.ps1 b/SnipeitPS/Public/Remove-SnipeitDepartment.ps1
index 344ae20..51cd030 100644
--- a/SnipeitPS/Public/Remove-SnipeitDepartment.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitDepartment.ps1
@@ -46,12 +46,12 @@ function Remove-SnipeitDepartment () {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Remove-SnipeitLicense.ps1 b/SnipeitPS/Public/Remove-SnipeitLicense.ps1
index b50d475..68e4ccd 100644
--- a/SnipeitPS/Public/Remove-SnipeitLicense.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitLicense.ps1
@@ -47,12 +47,12 @@ function Remove-SnipeitLicense () {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Remove-SnipeitLocation.ps1 b/SnipeitPS/Public/Remove-SnipeitLocation.ps1
index 47ba9f4..f4c5e43 100644
--- a/SnipeitPS/Public/Remove-SnipeitLocation.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitLocation.ps1
@@ -47,12 +47,12 @@ function Remove-SnipeitLocation () {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Remove-SnipeitManufacturer.ps1 b/SnipeitPS/Public/Remove-SnipeitManufacturer.ps1
index aa57d18..64bd8d4 100644
--- a/SnipeitPS/Public/Remove-SnipeitManufacturer.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitManufacturer.ps1
@@ -47,12 +47,12 @@ function Remove-SnipeitManufacturer () {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Remove-SnipeitModel.ps1 b/SnipeitPS/Public/Remove-SnipeitModel.ps1
index f65ebc8..8aad97b 100644
--- a/SnipeitPS/Public/Remove-SnipeitModel.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitModel.ps1
@@ -47,12 +47,12 @@ function Remove-SnipeitModel () {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Remove-SnipeitSupplier.ps1 b/SnipeitPS/Public/Remove-SnipeitSupplier.ps1
index 7f6594a..c22b64c 100644
--- a/SnipeitPS/Public/Remove-SnipeitSupplier.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitSupplier.ps1
@@ -47,12 +47,12 @@ function Remove-SnipeitSupplier () {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Remove-SnipeitUser.ps1 b/SnipeitPS/Public/Remove-SnipeitUser.ps1
index 5d02369..236d351 100644
--- a/SnipeitPS/Public/Remove-SnipeitUser.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitUser.ps1
@@ -46,12 +46,12 @@ function Remove-SnipeitUser () {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Reset-SnipeitAccessoryOwner.ps1 b/SnipeitPS/Public/Reset-SnipeitAccessoryOwner.ps1
index b01a51f..1888450 100644
--- a/SnipeitPS/Public/Reset-SnipeitAccessoryOwner.ps1
+++ b/SnipeitPS/Public/Reset-SnipeitAccessoryOwner.ps1
@@ -50,12 +50,12 @@ function Reset-SnipeitAccessoryOwner() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Reset-SnipeitAssetOwner.ps1 b/SnipeitPS/Public/Reset-SnipeitAssetOwner.ps1
index 59b1817..e2a2ef6 100644
--- a/SnipeitPS/Public/Reset-SnipeitAssetOwner.ps1
+++ b/SnipeitPS/Public/Reset-SnipeitAssetOwner.ps1
@@ -63,12 +63,12 @@ function Reset-SnipeitAssetOwner() {
 
     if ($PSBoundParameters.ContainsKey('apiKey')) {
         Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionApiKey -apiKey $apikey
+        Set-SnipeitPSLegacyApiKey -apiKey $apikey
     }
 
     if ($PSBoundParameters.ContainsKey('url')) {
         Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-        Set-SnipeitPSSessionUrl -url $url
+        Set-SnipeitPSLegacyUrl -url $url
     }
 
     if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Set-SnipeitAccessory.ps1 b/SnipeitPS/Public/Set-SnipeitAccessory.ps1
index ff1e671..cf76f59 100644
--- a/SnipeitPS/Public/Set-SnipeitAccessory.ps1
+++ b/SnipeitPS/Public/Set-SnipeitAccessory.ps1
@@ -134,12 +134,12 @@ function Set-SnipeitAccessory() {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Set-SnipeitAccessoryOwner.ps1 b/SnipeitPS/Public/Set-SnipeitAccessoryOwner.ps1
index 6806427..2a6219f 100644
--- a/SnipeitPS/Public/Set-SnipeitAccessoryOwner.ps1
+++ b/SnipeitPS/Public/Set-SnipeitAccessoryOwner.ps1
@@ -57,12 +57,12 @@ function Set-SnipeitAccessoryOwner() {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Set-SnipeitAsset.ps1 b/SnipeitPS/Public/Set-SnipeitAsset.ps1
index 53f7c99..5e1bebb 100644
--- a/SnipeitPS/Public/Set-SnipeitAsset.ps1
+++ b/SnipeitPS/Public/Set-SnipeitAsset.ps1
@@ -166,12 +166,12 @@ function Set-SnipeitAsset() {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Set-SnipeitAssetOwner.ps1 b/SnipeitPS/Public/Set-SnipeitAssetOwner.ps1
index 86f976e..7035021 100644
--- a/SnipeitPS/Public/Set-SnipeitAssetOwner.ps1
+++ b/SnipeitPS/Public/Set-SnipeitAssetOwner.ps1
@@ -101,12 +101,12 @@ function Set-SnipeitAssetOwner() {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Set-SnipeitCategory.ps1 b/SnipeitPS/Public/Set-SnipeitCategory.ps1
index 07f8c4c..9d038f2 100644
--- a/SnipeitPS/Public/Set-SnipeitCategory.ps1
+++ b/SnipeitPS/Public/Set-SnipeitCategory.ps1
@@ -94,12 +94,12 @@ function Set-SnipeitCategory() {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Set-SnipeitCompany.ps1 b/SnipeitPS/Public/Set-SnipeitCompany.ps1
index be00cc6..b96a75e 100644
--- a/SnipeitPS/Public/Set-SnipeitCompany.ps1
+++ b/SnipeitPS/Public/Set-SnipeitCompany.ps1
@@ -74,12 +74,12 @@ function Set-SnipeitCompany() {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Set-SnipeitComponent.ps1 b/SnipeitPS/Public/Set-SnipeitComponent.ps1
index 46a2f26..4aeb291 100644
--- a/SnipeitPS/Public/Set-SnipeitComponent.ps1
+++ b/SnipeitPS/Public/Set-SnipeitComponent.ps1
@@ -114,12 +114,12 @@ function Set-SnipeitComponent() {
 
         if ($PSBoundParameters.ContainsKey('apiKey')) {
             Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-            Set-SnipeitPSSessionApiKey -apiKey $apikey
+            Set-SnipeitPSLegacyApiKey -apiKey $apikey
         }
 
         if ($PSBoundParameters.ContainsKey('url')) {
             Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-            Set-SnipeitPSSessionUrl -url $url
+            Set-SnipeitPSLegacyUrl -url $url
         }
 
         if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Set-SnipeitConsumable.ps1 b/SnipeitPS/Public/Set-SnipeitConsumable.ps1
index 4304689..5b037d8 100644
--- a/SnipeitPS/Public/Set-SnipeitConsumable.ps1
+++ b/SnipeitPS/Public/Set-SnipeitConsumable.ps1
@@ -154,12 +154,12 @@ function Set-SnipeitConsumable() {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Set-SnipeitCustomField.ps1 b/SnipeitPS/Public/Set-SnipeitCustomField.ps1
index a20e1f8..76557dd 100644
--- a/SnipeitPS/Public/Set-SnipeitCustomField.ps1
+++ b/SnipeitPS/Public/Set-SnipeitCustomField.ps1
@@ -99,12 +99,12 @@ function Set-SnipeitCustomField() {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Set-SnipeitDepartment.ps1 b/SnipeitPS/Public/Set-SnipeitDepartment.ps1
index 948af13..a11885f 100644
--- a/SnipeitPS/Public/Set-SnipeitDepartment.ps1
+++ b/SnipeitPS/Public/Set-SnipeitDepartment.ps1
@@ -90,12 +90,12 @@ function Set-SnipeitDepartment() {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Set-SnipeitLicense.ps1 b/SnipeitPS/Public/Set-SnipeitLicense.ps1
index 098c504..912a5a4 100644
--- a/SnipeitPS/Public/Set-SnipeitLicense.ps1
+++ b/SnipeitPS/Public/Set-SnipeitLicense.ps1
@@ -163,12 +163,12 @@ function Set-SnipeitLicense() {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                  Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Set-SnipeitLicenseSeat.ps1 b/SnipeitPS/Public/Set-SnipeitLicenseSeat.ps1
index 22b98c7..07d1e43 100644
--- a/SnipeitPS/Public/Set-SnipeitLicenseSeat.ps1
+++ b/SnipeitPS/Public/Set-SnipeitLicenseSeat.ps1
@@ -84,12 +84,12 @@ function Set-SnipeitLicenseSeat() {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Set-SnipeitLocation.ps1 b/SnipeitPS/Public/Set-SnipeitLocation.ps1
index 6c1274d..fbc3bda 100644
--- a/SnipeitPS/Public/Set-SnipeitLocation.ps1
+++ b/SnipeitPS/Public/Set-SnipeitLocation.ps1
@@ -128,12 +128,12 @@ function Set-SnipeitLocation() {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Set-SnipeitManufacturer.ps1 b/SnipeitPS/Public/Set-SnipeitManufacturer.ps1
index 0dcadfe..cafbbc6 100644
--- a/SnipeitPS/Public/Set-SnipeitManufacturer.ps1
+++ b/SnipeitPS/Public/Set-SnipeitManufacturer.ps1
@@ -68,12 +68,12 @@ function Set-SnipeitManufacturer() {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Set-SnipeitModel.ps1 b/SnipeitPS/Public/Set-SnipeitModel.ps1
index 0ad6fe1..daed46a 100644
--- a/SnipeitPS/Public/Set-SnipeitModel.ps1
+++ b/SnipeitPS/Public/Set-SnipeitModel.ps1
@@ -97,12 +97,12 @@ function Set-SnipeitModel() {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Set-SnipeitStatus.ps1 b/SnipeitPS/Public/Set-SnipeitStatus.ps1
index c150869..f32826f 100644
--- a/SnipeitPS/Public/Set-SnipeitStatus.ps1
+++ b/SnipeitPS/Public/Set-SnipeitStatus.ps1
@@ -79,12 +79,12 @@ function Set-SnipeitStatus() {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Set-SnipeitSupplier.ps1 b/SnipeitPS/Public/Set-SnipeitSupplier.ps1
index ffc25b6..6d66d7d 100644
--- a/SnipeitPS/Public/Set-SnipeitSupplier.ps1
+++ b/SnipeitPS/Public/Set-SnipeitSupplier.ps1
@@ -124,12 +124,12 @@ function Set-SnipeitSupplier() {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
diff --git a/SnipeitPS/Public/Set-SnipeitUser.ps1 b/SnipeitPS/Public/Set-SnipeitUser.ps1
index 18191f9..8eda999 100644
--- a/SnipeitPS/Public/Set-SnipeitUser.ps1
+++ b/SnipeitPS/Public/Set-SnipeitUser.ps1
@@ -151,12 +151,12 @@ function Set-SnipeitUser() {
 
             if ($PSBoundParameters.ContainsKey('apiKey')) {
                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionApiKey -apiKey $apikey
+                Set-SnipeitPSLegacyApiKey -apiKey $apikey
             }
 
             if ($PSBoundParameters.ContainsKey('url')) {
                 Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
-                Set-SnipeitPSSessionUrl -url $url
+                Set-SnipeitPSLegacyUrl -url $url
             }
 
             if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {