diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25b95dc..7f8459a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### New features
 Most of "Set" command accepts piped input. Piped objects "id" attribute
 is used to select asset set values. Like
-Get-SnipeItAsset -model_id 213 | Set-SnipeItAsset -notes 'This is nice!'
+Get-SnipeitAsset -model_id 213 | Set-SnipeitAsset -notes 'This is nice!'
 
 Set command accept id parameter as array, so its easier to set multiple items
 in one run.
@@ -29,7 +29,7 @@ needed
 ## More Activity
 
 ### New features
-SnipeIt activity history is now searchable. So finding out checked out the
+Snipeit activity history is now searchable. So finding out checked out the
 assest its easy. Api support many different target or item types that can
 be uses as filter. Searchable types are 'Accessory','Asset','AssetMaintenance'
 ,'AssetModel','Category','Company','Component','Consumable','CustomField',
diff --git a/README.md b/README.md
index 62fb243..d3adc1d 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ Update-Module SnipeitPS
 
 # To use each session:
 Import-Module SnipeitPS
-Set-SnipeItInfo -URL 'https://asset.example.com' -apiKey 'tokenKey'
+Set-SnipeitInfo -URL 'https://asset.example.com' -apiKey 'tokenKey'
 ```
 
 ### Usage
@@ -29,7 +29,7 @@ Set-SnipeItInfo -URL 'https://asset.example.com' -apiKey 'tokenKey'
 ```powershell
 # Review the help at any time!
 Get-Command -Module SnipeitPS
-Get-Help Get-SnipeItAsset -Full   # or any other command
+Get-Help Get-SnipeitAsset -Full   # or any other command
 ```
 ### Reporting bugs and issues
 Please use -Verbose switch with command you have problem with.
diff --git a/SnipeItPS.build.ps1 b/SnipeitPS.build.ps1
similarity index 100%
rename from SnipeItPS.build.ps1
rename to SnipeitPS.build.ps1
diff --git a/SnipeitPS/Private/Set-SnipeitAlias.ps1 b/SnipeitPS/Private/Set-SnipeitAlias.ps1
index 30a1ff6..3d91b9d 100644
--- a/SnipeitPS/Private/Set-SnipeitAlias.ps1
+++ b/SnipeitPS/Private/Set-SnipeitAlias.ps1
@@ -7,12 +7,12 @@ function Set-SnipeitAlias()
     param()
     Write-Verbose "Setting compatibility aliases.. "
     Write-Verbose "All aliases are deprediated."
-    $SnipeItAliases = get-SnipeitAlias
-    ForEach ($key in $SnipeItAliases.Keys ) {
-        New-Alias -Name $key -Value $($SnipeItAliases[$key]) -Scope 1
-        Write-Verbose ("{0,5} -> {1}" -f $key,$($SnipeItAliases[$key]))
+    $SnipeitAliases = get-SnipeitAlias
+    ForEach ($key in $SnipeitAliases.Keys ) {
+        New-Alias -Name $key -Value $($SnipeitAliases[$key]) -Scope 1
+        Write-Verbose ("{0,5} -> {1}" -f $key,$($SnipeitAliases[$key]))
     }
-    Write-Verbose "Please start using native 'SnipeIt' prfixed functions instead."
+    Write-Verbose "Please start using native 'Snipeit' prfixed functions instead."
     Get-Command -Module SnipeitPS -CommandType Alias | Select-Object -Property DisplayName,ResolvedCommand
 
 }
diff --git a/SnipeitPS/Public/Remove-SnipeitAssetMaintenance.ps1 b/SnipeitPS/Public/Remove-SnipeitAssetMaintenance.ps1
index 4d9b4c3..c3993e1 100644
--- a/SnipeitPS/Public/Remove-SnipeitAssetMaintenance.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitAssetMaintenance.ps1
@@ -25,12 +25,12 @@ function Remove-SnipeitAssetMaintenance {
         [int]
         $id,
 
-        # SnipeIt URL
+        # Snipeit URL
         [Parameter(Mandatory = $true)]
         [string]
         $url,
 
-        # SnipeIt ApiKey
+        # Snipeit ApiKey
         [Parameter(Mandatory = $true)]
         [string]
         $apiKey
diff --git a/SnipeitPS/Public/Update-SnipeitAlias.ps1 b/SnipeitPS/Public/Update-SnipeitAlias.ps1
index 0a1020c..9d9157a 100644
--- a/SnipeitPS/Public/Update-SnipeitAlias.ps1
+++ b/SnipeitPS/Public/Update-SnipeitAlias.ps1
@@ -30,17 +30,17 @@ function Update-SnipeitAlias()
 	    $String
     )
     begin{
-        Write-Verbose "Replacing old SnipeIt fuctions with new ones.. "
-        $SnipeItAliases = Get-SnipeitAlias
+        Write-Verbose "Replacing old Snipeit fuctions with new ones.. "
+        $SnipeitAliases = Get-SnipeitAlias
 
     }
     process {
         If ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
             ForEach ($st in $String){
                 $result = $st
-                ForEach ($key in $SnipeItAliases.Keys ) {
-                    #Write-Verbose "Replacing $key with $($SnipeItAliases[$key])"
-                    $result = $result -replace $key, $SnipeItAliases[$key]
+                ForEach ($key in $SnipeitAliases.Keys ) {
+                    #Write-Verbose "Replacing $key with $($SnipeitAliases[$key])"
+                    $result = $result -replace $key, $SnipeitAliases[$key]
                 }
                 $result
             }
diff --git a/SnipeitPS/SnipeitPS.psd1 b/SnipeitPS/SnipeitPS.psd1
index eb50343..7cf5bfb 100644
--- a/SnipeitPS/SnipeitPS.psd1
+++ b/SnipeitPS/SnipeitPS.psd1
@@ -30,7 +30,7 @@ CompanyName = 'Unknown'
 Copyright = '(c) 2017 Stephen Maunder. All rights reserved.'
 
 # Description of the functionality provided by this module
-Description = 'Powershell API for SnipeIt Asset Management'
+Description = 'Powershell API for Snipeit Asset Management'
 
 # Minimum version of the Windows PowerShell engine required by this module
 PowerShellVersion = '3.0'
diff --git a/SnipeitPS/SnipeitPS.psm1 b/SnipeitPS/SnipeitPS.psm1
index 54ba03e..ce0d808 100644
--- a/SnipeitPS/SnipeitPS.psm1
+++ b/SnipeitPS/SnipeitPS.psm1
@@ -1,6 +1,6 @@
 <#
 .DESCRIPTION
-Powershell API for SnipeIt Asset Management
+Powershell API for Snipeit Asset Management
 #>
 $scriptRoot = $PSScriptRoot + '\Public'
 
diff --git a/Tests/SnipeItPS.Tests.ps1 b/Tests/SnipeitPS.Tests.ps1
similarity index 100%
rename from Tests/SnipeItPS.Tests.ps1
rename to Tests/SnipeitPS.Tests.ps1
diff --git a/docs/Get-SnipeitAccessory.md b/docs/Get-SnipeitAccessory.md
index c0499ac..7449a1f 100644
--- a/docs/Get-SnipeitAccessory.md
+++ b/docs/Get-SnipeitAccessory.md
@@ -14,20 +14,14 @@ Gets a list of Snipe-it Accessories
 
 ### Search
 ```
-<<<<<<< HEAD:docs/Get-SnipeitAccessory.md
-Get-SnipeitAccessory [[-search] <String>] [[-company_id] <Int32>] [[-category_id] <Int32>]
- [[-manufacturer_id] <Int32>] [[-supplier_id] <Int32>] [[-sort] <String>] [[-order] <String>]
- [[-limit] <Int32>] [[-offset] <Int32>] [-all] [-url] <String> [-apiKey] <String> [<CommonParameters>]
-=======
-Get-SnipeItAccessory [-search <String>] [-company_id <Int32>] [-category_id <Int32>] [-manufacturer_id <Int32>]
+Get-SnipeitAccessory [-search <String>] [-company_id <Int32>] [-category_id <Int32>] [-manufacturer_id <Int32>]
  [-supplier_id <Int32>] [-sort <String>] [-order <String>] [-limit <Int32>] [-offset <Int32>] [-all]
  -url <String> -apiKey <String> [<CommonParameters>]
 ```
 
 ### Get by ID
 ```
-Get-SnipeItAccessory [-id <Int32>] -url <String> -apiKey <String> [<CommonParameters>]
->>>>>>> 9f68e602e32566c28846ccb9572fa0b078d64696:docs/Get-SnipeItAccessory.md
+Get-SnipeitAccessory [-id <Int32>] -url <String> -apiKey <String> [<CommonParameters>]
 ```
 
 ## DESCRIPTION
diff --git a/docs/Get-SnipeitAsset.md b/docs/Get-SnipeitAsset.md
index b37a2c7..092af5c 100644
--- a/docs/Get-SnipeitAsset.md
+++ b/docs/Get-SnipeitAsset.md
@@ -14,14 +14,7 @@ Gets a list of Snipe-it Assets or specific asset
 
 ### Search
 ```
-<<<<<<< HEAD:docs/Get-SnipeitAsset.md
-Get-SnipeitAsset [[-search] <String>] [[-id] <Int32>] [[-asset_tag] <String>] [[-serial] <String>]
- [[-order_number] <String>] [[-model_id] <Int32>] [[-category_id] <Int32>] [[-manufacturer_id] <Int32>]
- [[-company_id] <Int32>] [[-location_id] <Int32>] [[-depreciation_id] <Int32>] [[-requestable] <Boolean>]
- [[-status] <String>] [[-status_id] <Int32>] [[-sort] <String>] [[-order] <String>] [[-limit] <Int32>]
- [[-offset] <Int32>] [-all] [-url] <String> [-apiKey] <String> [<CommonParameters>]
-=======
-Get-SnipeItAsset [-search <String>] [-order_number <String>] [-model_id <Int32>] [-category_id <Int32>]
+Get-SnipeitAsset [-search <String>] [-order_number <String>] [-model_id <Int32>] [-category_id <Int32>]
  [-manufacturer_id <Int32>] [-company_id <Int32>] [-location_id <Int32>] [-depreciation_id <Int32>]
  [-requestable <Boolean>] [-status <String>] [-status_id <Int32>] [-sort <String>] [-order <String>]
  [-limit <Int32>] [-offset <Int32>] [-all] -url <String> -apiKey <String> [<CommonParameters>]
@@ -29,18 +22,17 @@ Get-SnipeItAsset [-search <String>] [-order_number <String>] [-model_id <Int32>]
 
 ### Get with id
 ```
-Get-SnipeItAsset [-id <Int32>] -url <String> -apiKey <String> [<CommonParameters>]
+Get-SnipeitAsset [-id <Int32>] -url <String> -apiKey <String> [<CommonParameters>]
 ```
 
 ### Get with asset tag
 ```
-Get-SnipeItAsset [-asset_tag <String>] -url <String> -apiKey <String> [<CommonParameters>]
+Get-SnipeitAsset [-asset_tag <String>] -url <String> -apiKey <String> [<CommonParameters>]
 ```
 
 ### Get with serial
 ```
-Get-SnipeItAsset [-serial <String>] -url <String> -apiKey <String> [<CommonParameters>]
->>>>>>> 9f68e602e32566c28846ccb9572fa0b078d64696:docs/Get-SnipeItAsset.md
+Get-SnipeitAsset [-serial <String>] -url <String> -apiKey <String> [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -277,7 +269,7 @@ Aliases:
 
 Required: False
 Position: Named
-Default value: 0
+Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
diff --git a/docs/Get-SnipeitCategory.md b/docs/Get-SnipeitCategory.md
index 38de3c8..ab0d6f6 100644
--- a/docs/Get-SnipeitCategory.md
+++ b/docs/Get-SnipeitCategory.md
@@ -14,18 +14,13 @@ Gets a list of Snipe-it Categories
 
 ### Search
 ```
-<<<<<<< HEAD:docs/Get-SnipeitCategory.md
-Get-SnipeitCategory [[-search] <String>] [[-id] <Int32>] [[-order] <String>] [[-limit] <Int32>]
- [[-offset] <Int32>] [-all] [-url] <String> [-apiKey] <String> [<CommonParameters>]
-=======
-Get-SnipeItCategory [-search <String>] [-order <String>] [-limit <Int32>] [-offset <Int32>] [-all]
+Get-SnipeitCategory [-search <String>] [-order <String>] [-limit <Int32>] [-offset <Int32>] [-all]
  -url <String> -apiKey <String> [<CommonParameters>]
 ```
 
 ### Get with ID
 ```
-Get-SnipeItCategory [-id <Int32>] -url <String> -apiKey <String> [<CommonParameters>]
->>>>>>> 9f68e602e32566c28846ccb9572fa0b078d64696:docs/Get-SnipeItCategory.md
+Get-SnipeitCategory [-id <Int32>] -url <String> -apiKey <String> [<CommonParameters>]
 ```
 
 ## DESCRIPTION
diff --git a/docs/Get-SnipeitCompany.md b/docs/Get-SnipeitCompany.md
index 4612d30..9f7b944 100644
--- a/docs/Get-SnipeitCompany.md
+++ b/docs/Get-SnipeitCompany.md
@@ -14,18 +14,13 @@ Gets a list of Snipe-it Companies
 
 ### Search
 ```
-<<<<<<< HEAD:docs/Get-SnipeitCompany.md
-Get-SnipeitCompany [[-search] <String>] [[-id] <Int32>] [[-order] <String>] [[-limit] <Int32>]
- [[-offset] <Int32>] [-all] [-url] <String> [-apiKey] <String> [<CommonParameters>]
-=======
-Get-SnipeItCompany [-search <String>] [-order <String>] [-limit <Int32>] [-offset <Int32>] [-all] -url <String>
+Get-SnipeitCompany [-search <String>] [-order <String>] [-limit <Int32>] [-offset <Int32>] [-all] -url <String>
  -apiKey <String> [<CommonParameters>]
 ```
 
 ### Get with ID
 ```
-Get-SnipeItCompany [-id <Int32>] -url <String> -apiKey <String> [<CommonParameters>]
->>>>>>> 9f68e602e32566c28846ccb9572fa0b078d64696:docs/Get-SnipeItCompany.md
+Get-SnipeitCompany [-id <Int32>] -url <String> -apiKey <String> [<CommonParameters>]
 ```
 
 ## DESCRIPTION
diff --git a/docs/Get-SnipeitComponent.md b/docs/Get-SnipeitComponent.md
index b667718..403b1c0 100644
--- a/docs/Get-SnipeitComponent.md
+++ b/docs/Get-SnipeitComponent.md
@@ -14,20 +14,14 @@ Gets a list of Snipe-it Components
 
 ### Search
 ```
-<<<<<<< HEAD:docs/Get-SnipeitComponent.md
-Get-SnipeitComponent [[-search] <String>] [[-id] <Int32>] [[-category_id] <Int32>] [[-company_id] <Int32>]
- [[-location_id] <Int32>] [[-order] <String>] [[-sort] <String>] [[-limit] <Int32>] [[-offset] <Int32>] [-all]
- [-url] <String> [-apiKey] <String> [<CommonParameters>]
-=======
-Get-SnipeItComponent [-search <String>] [-category_id <Int32>] [-company_id <Int32>] [-location_id <Int32>]
+Get-SnipeitComponent [-search <String>] [-category_id <Int32>] [-company_id <Int32>] [-location_id <Int32>]
  [-order <String>] [-sort <String>] [-limit <Int32>] [-offset <Int32>] [-all] -url <String> -apiKey <String>
  [<CommonParameters>]
 ```
 
 ### Get with ID
 ```
-Get-SnipeItComponent [-id <Int32>] -url <String> -apiKey <String> [<CommonParameters>]
->>>>>>> 9f68e602e32566c28846ccb9572fa0b078d64696:docs/Get-SnipeItComponent.md
+Get-SnipeitComponent [-id <Int32>] -url <String> -apiKey <String> [<CommonParameters>]
 ```
 
 ## DESCRIPTION
diff --git a/docs/Get-SnipeitDepartment.md b/docs/Get-SnipeitDepartment.md
index 7057146..3b22d6b 100644
--- a/docs/Get-SnipeitDepartment.md
+++ b/docs/Get-SnipeitDepartment.md
@@ -14,18 +14,13 @@ Gets a list of Snipe-it Departments
 
 ### Search
 ```
-<<<<<<< HEAD:docs/Get-SnipeitDepartment.md
-Get-SnipeitDepartment [[-search] <String>] [[-id] <Int32>] [[-order] <String>] [[-limit] <Int32>]
- [[-offset] <Int32>] [-all] [[-sort] <String>] [-url] <String> [-apiKey] <String> [<CommonParameters>]
-=======
-Get-SnipeItDepartment [-search <String>] [-order <String>] [-limit <Int32>] [-offset <Int32>] [-all]
+Get-SnipeitDepartment [-search <String>] [-order <String>] [-limit <Int32>] [-offset <Int32>] [-all]
  [-sort <String>] -url <String> -apiKey <String> [<CommonParameters>]
 ```
 
 ### Get with ID
 ```
-Get-SnipeItDepartment [-id <Int32>] -url <String> -apiKey <String> [<CommonParameters>]
->>>>>>> 9f68e602e32566c28846ccb9572fa0b078d64696:docs/Get-SnipeItDepartment.md
+Get-SnipeitDepartment [-id <Int32>] -url <String> -apiKey <String> [<CommonParameters>]
 ```
 
 ## DESCRIPTION
diff --git a/docs/Get-SnipeitLicense.md b/docs/Get-SnipeitLicense.md
index 659f22a..27b95bc 100644
--- a/docs/Get-SnipeitLicense.md
+++ b/docs/Get-SnipeitLicense.md
@@ -14,14 +14,7 @@ Gets a list of Snipe-it Licenses
 
 ### Search
 ```
-<<<<<<< HEAD:docs/Get-SnipeitLicense.md
-Get-SnipeitLicense [[-search] <String>] [[-id] <Int32>] [[-name] <String>] [[-company_id] <Int32>]
- [[-product_key] <String>] [[-order_number] <String>] [[-purchase_order] <String>] [[-license_name] <String>]
- [[-license_email] <MailAddress>] [[-manufacturer_id] <Int32>] [[-supplier_id] <Int32>]
- [[-depreciation_id] <Int32>] [[-category_id] <Int32>] [[-order] <String>] [[-sort] <String>]
- [[-limit] <Int32>] [[-offset] <Int32>] [-all] [-url] <String> [-apiKey] <String> [<CommonParameters>]
-=======
-Get-SnipeItLicense [-search <String>] [-name <String>] [-company_id <Int32>] [-product_key <String>]
+Get-SnipeitLicense [-search <String>] [-name <String>] [-company_id <Int32>] [-product_key <String>]
  [-order_number <String>] [-purchase_order <String>] [-license_name <String>] [-license_email <MailAddress>]
  [-manufacturer_id <Int32>] [-supplier_id <Int32>] [-depreciation_id <Int32>] [-category_id <Int32>]
  [-order <String>] [-sort <String>] [-limit <Int32>] [-offset <Int32>] [-all] -url <String> -apiKey <String>
@@ -30,8 +23,7 @@ Get-SnipeItLicense [-search <String>] [-name <String>] [-company_id <Int32>] [-p
 
 ### Get with ID
 ```
-Get-SnipeItLicense [-id <Int32>] -url <String> -apiKey <String> [<CommonParameters>]
->>>>>>> 9f68e602e32566c28846ccb9572fa0b078d64696:docs/Get-SnipeItLicense.md
+Get-SnipeitLicense [-id <Int32>] -url <String> -apiKey <String> [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -258,7 +250,7 @@ Aliases:
 
 Required: False
 Position: Named
-Default value: 0
+Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
diff --git a/docs/Get-SnipeitManufacturer.md b/docs/Get-SnipeitManufacturer.md
index e8320a8..45d9b26 100644
--- a/docs/Get-SnipeitManufacturer.md
+++ b/docs/Get-SnipeitManufacturer.md
@@ -14,18 +14,13 @@ schema: 2.0.0
 
 ### Search
 ```
-<<<<<<< HEAD:docs/Get-SnipeitManufacturer.md
-Get-SnipeitManufacturer [[-search] <String>] [[-id] <Int32>] [[-order] <String>] [[-limit] <Int32>]
- [[-offset] <Int32>] [-all] [-url] <String> [-apiKey] <String> [<CommonParameters>]
-=======
-Get-SnipeItManufacturer [-search <String>] [-order <String>] [-limit <Int32>] [-offset <Int32>] [-all]
+Get-SnipeitManufacturer [-search <String>] [-order <String>] [-limit <Int32>] [-offset <Int32>] [-all]
  -url <String> -apiKey <String> [<CommonParameters>]
 ```
 
 ### Get with ID
 ```
-Get-SnipeItManufacturer [-id <Int32>] -url <String> -apiKey <String> [<CommonParameters>]
->>>>>>> 9f68e602e32566c28846ccb9572fa0b078d64696:docs/Get-SnipeItManufacturer.md
+Get-SnipeitManufacturer [-id <Int32>] -url <String> -apiKey <String> [<CommonParameters>]
 ```
 
 ## DESCRIPTION
diff --git a/docs/Get-SnipeitModel.md b/docs/Get-SnipeitModel.md
index c73b5c1..1caa52a 100644
--- a/docs/Get-SnipeitModel.md
+++ b/docs/Get-SnipeitModel.md
@@ -14,18 +14,13 @@ Gets a list of Snipe-it Models
 
 ### Search
 ```
-<<<<<<< HEAD:docs/Get-SnipeitModel.md
-Get-SnipeitModel [[-search] <String>] [[-id] <Int32>] [[-order] <String>] [[-limit] <Int32>]
- [[-offset] <Int32>] [-all] [-url] <String> [-apiKey] <String> [<CommonParameters>]
-=======
-Get-SnipeItModel [-search <String>] [-order <String>] [-limit <Int32>] [-offset <Int32>] [-all] -url <String>
+Get-SnipeitModel [-search <String>] [-order <String>] [-limit <Int32>] [-offset <Int32>] [-all] -url <String>
  -apiKey <String> [<CommonParameters>]
 ```
 
 ### Get with ID
 ```
-Get-SnipeItModel [-id <Int32>] -url <String> -apiKey <String> [<CommonParameters>]
->>>>>>> 9f68e602e32566c28846ccb9572fa0b078d64696:docs/Get-SnipeItModel.md
+Get-SnipeitModel [-id <Int32>] -url <String> -apiKey <String> [<CommonParameters>]
 ```
 
 ## DESCRIPTION
diff --git a/docs/Get-SnipeitStatus.md b/docs/Get-SnipeitStatus.md
index 6439a5b..a27482a 100644
--- a/docs/Get-SnipeitStatus.md
+++ b/docs/Get-SnipeitStatus.md
@@ -14,18 +14,13 @@ Gets a list of Snipe-it Status Labels
 
 ### Search
 ```
-<<<<<<< HEAD:docs/Get-SnipeitStatus.md
-Get-SnipeitStatus [[-search] <String>] [[-id] <Int32>] [[-order] <String>] [[-limit] <Int32>]
- [[-offset] <Int32>] [-all] [-url] <String> [-apiKey] <String> [<CommonParameters>]
-=======
-Get-SnipeItStatus [-search <String>] [-order <String>] [-limit <Int32>] [-offset <Int32>] [-all] -url <String>
+Get-SnipeitStatus [-search <String>] [-order <String>] [-limit <Int32>] [-offset <Int32>] [-all] -url <String>
  -apiKey <String> [<CommonParameters>]
 ```
 
 ### Get with ID
 ```
-Get-SnipeItStatus [-id <Int32>] -url <String> -apiKey <String> [<CommonParameters>]
->>>>>>> 9f68e602e32566c28846ccb9572fa0b078d64696:docs/Get-SnipeItStatus.md
+Get-SnipeitStatus [-id <Int32>] -url <String> -apiKey <String> [<CommonParameters>]
 ```
 
 ## DESCRIPTION
diff --git a/docs/Get-SnipeitSupplier.md b/docs/Get-SnipeitSupplier.md
index bac1c49..ce401d3 100644
--- a/docs/Get-SnipeitSupplier.md
+++ b/docs/Get-SnipeitSupplier.md
@@ -14,18 +14,13 @@ schema: 2.0.0
 
 ### Search
 ```
-<<<<<<< HEAD:docs/Get-SnipeitSupplier.md
-Get-SnipeitSupplier [[-search] <String>] [[-id] <Int32>] [[-order] <String>] [[-limit] <Int32>]
- [[-offset] <Int32>] [-all] [-url] <String> [-apiKey] <String> [<CommonParameters>]
-=======
-Get-SnipeItSupplier [-search <String>] [-order <String>] [-limit <Int32>] [-offset <Int32>] [-all]
+Get-SnipeitSupplier [-search <String>] [-order <String>] [-limit <Int32>] [-offset <Int32>] [-all]
  -url <String> -apiKey <String> [<CommonParameters>]
 ```
 
 ### Get with ID
 ```
-Get-SnipeItSupplier [-id <Int32>] -url <String> -apiKey <String> [<CommonParameters>]
->>>>>>> 9f68e602e32566c28846ccb9572fa0b078d64696:docs/Get-SnipeItSupplier.md
+Get-SnipeitSupplier [-id <Int32>] -url <String> -apiKey <String> [<CommonParameters>]
 ```
 
 ## DESCRIPTION
diff --git a/docs/Get-SnipeitUser.md b/docs/Get-SnipeitUser.md
index d3f4cf4..62f2b9e 100644
--- a/docs/Get-SnipeitUser.md
+++ b/docs/Get-SnipeitUser.md
@@ -14,21 +14,14 @@ schema: 2.0.0
 
 ### Search
 ```
-<<<<<<< HEAD:docs/Get-SnipeitUser.md
-Get-SnipeitUser [[-search] <String>] [[-id] <String>] [[-company_id] <Int32>] [[-location_id] <Int32>]
- [[-group_id] <Int32>] [[-department_id] <Int32>] [[-username] <String>] [[-email] <String>]
- [[-order] <String>] [[-limit] <Int32>] [[-offset] <Int32>] [-all] [-url] <String> [-apiKey] <String>
- [<CommonParameters>]
-=======
-Get-SnipeItUser [-search <String>] [-company_id <Int32>] [-location_id <Int32>] [-group_id <Int32>]
+Get-SnipeitUser [-search <String>] [-company_id <Int32>] [-location_id <Int32>] [-group_id <Int32>]
  [-department_id <Int32>] [-username <String>] [-email <String>] [-order <String>] [-limit <Int32>]
  [-offset <Int32>] [-all] -url <String> -apiKey <String> [<CommonParameters>]
 ```
 
 ### Get with ID
 ```
-Get-SnipeItUser [-id <String>] -url <String> -apiKey <String> [<CommonParameters>]
->>>>>>> 9f68e602e32566c28846ccb9572fa0b078d64696:docs/Get-SnipeItUser.md
+Get-SnipeitUser [-id <String>] -url <String> -apiKey <String> [<CommonParameters>]
 ```
 
 ## DESCRIPTION
diff --git a/docs/New-SnipeitComponent.md b/docs/New-SnipeitComponent.md
index 800fe4f..19a69e5 100644
--- a/docs/New-SnipeitComponent.md
+++ b/docs/New-SnipeitComponent.md
@@ -13,15 +13,9 @@ Create a new component
 ## SYNTAX
 
 ```
-<<<<<<< HEAD:docs/New-SnipeitComponent.md
 New-SnipeitComponent [-name] <String> [-category_id] <Int32> [-qty] <String> [[-company_id] <Int32>]
- [[-location_id] <Int32>] [[-purchase_date] <DateTime>] [[-purchase_cost] <Single>] [-url] <String>
- [-apiKey] <String> [-WhatIf] [-Confirm] [<CommonParameters>]
-=======
-New-SnipeItComponent [-name] <String> [-category_id] <Int32> [-qty] <String> [[-company_id] <Int32>]
  [[-location_id] <Int32>] [[-order_number] <String>] [[-purchase_date] <DateTime>] [[-purchase_cost] <Single>]
  [-url] <String> [-apiKey] <String> [-WhatIf] [-Confirm] [<CommonParameters>]
->>>>>>> 9f68e602e32566c28846ccb9572fa0b078d64696:docs/New-SnipeItComponent.md
 ```
 
 ## DESCRIPTION
diff --git a/docs/Set-SnipeitAccessory.md b/docs/Set-SnipeitAccessory.md
index 93c01e8..ae2b45c 100644
--- a/docs/Set-SnipeitAccessory.md
+++ b/docs/Set-SnipeitAccessory.md
@@ -86,7 +86,7 @@ Aliases:
 
 Required: True
 Position: 1
-Default value: 0
+Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
@@ -122,7 +122,7 @@ Accept wildcard characters: False
 ```
 
 ### -name
-ID number of Accessory on Snipe-It system
+ID number of Accessory or array of IDs on Snipe-It system
 
 ```yaml
 Type: String
diff --git a/docs/Set-SnipeitAccessoryOwner.md b/docs/Set-SnipeitAccessoryOwner.md
index 460f2f7..52f65bc 100644
--- a/docs/Set-SnipeitAccessoryOwner.md
+++ b/docs/Set-SnipeitAccessoryOwner.md
@@ -60,7 +60,7 @@ Accept wildcard characters: False
 ```
 
 ### -id
-Unique ID For accessory to checkout
+Unique ID  For accessory or array of IDs to checkout
 
 ```yaml
 Type: Int32[]
@@ -69,7 +69,7 @@ Aliases:
 
 Required: True
 Position: 1
-Default value: 0
+Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
diff --git a/docs/Set-SnipeitAsset.md b/docs/Set-SnipeitAsset.md
index 623901a..0f0591c 100644
--- a/docs/Set-SnipeitAsset.md
+++ b/docs/Set-SnipeitAsset.md
@@ -36,6 +36,11 @@ Set-SnipeitAsset -id 1 -status_id 1 -model_id 1 -name "Machine1"
 Set-SnipeitAsset -id 1 -status_id 1 -model_id 1 -name "Machine1" -CustomValues = @{ "_snipeit_os_5 = "Windows 10 Pro" }
 ```
 
+### EXAMPLE 3
+```
+Get-SnipeitAsset -serial 12345678 | Set-SnipeitAsset -notes 'Just updated'
+```
+
 ## PARAMETERS
 
 ### -apiKey
@@ -115,7 +120,7 @@ Accept wildcard characters: False
 ```
 
 ### -id
-ID of the Asset
+ID of the Asset or array of IDs
 
 ```yaml
 Type: Int32[]
@@ -124,7 +129,7 @@ Aliases:
 
 Required: True
 Position: 1
-Default value: 0
+Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
diff --git a/docs/Set-SnipeitAssetOwner.md b/docs/Set-SnipeitAssetOwner.md
index d9d892a..5af3c6a 100644
--- a/docs/Set-SnipeitAssetOwner.md
+++ b/docs/Set-SnipeitAssetOwner.md
@@ -106,7 +106,7 @@ Accept wildcard characters: False
 ```
 
 ### -id
-Unique ID For asset to checkout
+Unique IDs For assets to checkout
 
 ```yaml
 Type: Int32[]
@@ -115,7 +115,7 @@ Aliases:
 
 Required: True
 Position: 1
-Default value: 0
+Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
diff --git a/docs/Set-SnipeitComponent.md b/docs/Set-SnipeitComponent.md
index c0ff9d3..cbf0d06 100644
--- a/docs/Set-SnipeitComponent.md
+++ b/docs/Set-SnipeitComponent.md
@@ -13,15 +13,9 @@ Updates component
 ## SYNTAX
 
 ```
-<<<<<<< HEAD:docs/Set-SnipeitComponent.md
 Set-SnipeitComponent [-id] <Int32> [-qty] <Int32> [[-name] <String>] [[-company_id] <Int32>]
- [[-location_id] <Int32>] [[-purchase_date] <DateTime>] [[-purchase_cost] <Single>] [-url] <String>
- [-apiKey] <String> [-WhatIf] [-Confirm] [<CommonParameters>]
-=======
-Set-SnipeItComponent [-id] <Int32> [-qty] <Int32> [[-name] <String>] [[-company_id] <Int32>]
  [[-location_id] <Int32>] [[-order_number] <String>] [[-purchase_date] <DateTime>] [[-purchase_cost] <Single>]
  [-url] <String> [-apiKey] <String> [-WhatIf] [-Confirm] [<CommonParameters>]
->>>>>>> 9f68e602e32566c28846ccb9572fa0b078d64696:docs/Set-SnipeItComponent.md
 ```
 
 ## DESCRIPTION
diff --git a/docs/Set-SnipeitLicense.md b/docs/Set-SnipeitLicense.md
index 12ff68f..4e20e67 100644
--- a/docs/Set-SnipeitLicense.md
+++ b/docs/Set-SnipeitLicense.md
@@ -94,7 +94,7 @@ Accept wildcard characters: False
 ```
 
 ### -id
-ID number of licence
+ID number of license or array of license IDs
 
 ```yaml
 Type: Int32[]
@@ -103,7 +103,7 @@ Aliases:
 
 Required: True
 Position: 1
-Default value: 0
+Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
diff --git a/docs/Set-SnipeitLicenseSeat.md b/docs/Set-SnipeitLicenseSeat.md
index 3706d40..e0400f2 100644
--- a/docs/Set-SnipeitLicenseSeat.md
+++ b/docs/Set-SnipeitLicenseSeat.md
@@ -82,7 +82,7 @@ Accept wildcard characters: False
 ```
 
 ### -id
-Unique ID For asset to checkout
+Unique ID For license to checkout or array of IDs
 
 ```yaml
 Type: Int32[]
@@ -91,7 +91,7 @@ Aliases:
 
 Required: True
 Position: 1
-Default value: 0
+Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
diff --git a/docs/Set-SnipeitLocation.md b/docs/Set-SnipeitLocation.md
index 8d9bef4..d4f5925 100644
--- a/docs/Set-SnipeitLocation.md
+++ b/docs/Set-SnipeitLocation.md
@@ -122,7 +122,7 @@ Accept wildcard characters: False
 ```
 
 ### -id
-{{ Fill id Description }}
+ID number of location or array or IDs
 
 ```yaml
 Type: Int32[]
@@ -131,7 +131,7 @@ Aliases:
 
 Required: True
 Position: 1
-Default value: 0
+Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
diff --git a/docs/Set-SnipeitModel.md b/docs/Set-SnipeitModel.md
index 2b554cd..640eb6e 100644
--- a/docs/Set-SnipeitModel.md
+++ b/docs/Set-SnipeitModel.md
@@ -91,7 +91,7 @@ Accept wildcard characters: False
 ```
 
 ### -id
-ID number  of the Asset Model
+ID number of the Asset Model or array of IDs
 
 ```yaml
 Type: Int32[]
@@ -100,7 +100,7 @@ Aliases:
 
 Required: True
 Position: 1
-Default value: 0
+Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
diff --git a/docs/Set-SnipeitUser.md b/docs/Set-SnipeitUser.md
index e95ba10..d3c09f9 100644
--- a/docs/Set-SnipeitUser.md
+++ b/docs/Set-SnipeitUser.md
@@ -139,7 +139,7 @@ Accept wildcard characters: False
 ```
 
 ### -id
-{{ Fill id Description }}
+ID number of Snipe--It user or array of IDs
 
 ```yaml
 Type: Int32[]
@@ -148,7 +148,7 @@ Aliases:
 
 Required: True
 Position: 1
-Default value: 0
+Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```