Rename module (#1223)

microsoftgraph · Nov 21, 2024 · 0fff351 · 0fff351
1 parent 119292c
commit 0fff351
Show file tree

Hide file tree

Showing 1,485 changed files with 4,497 additions and 4,474 deletions.
diff --git a/.azure-pipelines/1es-entra-powershell-ci-build.yml b/.azure-pipelines/1es-entra-powershell-ci-build.yml
@@ -58,7 +58,7 @@ extends:
               - template: .azure-pipelines/common-templates/esrp/codesign-nuget-migrate.yml@self
                 parameters:
                   FolderPath: "$(Build.ArtifactStagingDirectory)"
-                  Pattern: "Microsoft.Graph.Entra.*.nupkg"
+                  Pattern: "Microsoft.Entra.*.nupkg"
               - task: 1ES.PublishBuildArtifacts@1
                 displayName: Publish Module Artifacts
                 inputs:
@@ -68,7 +68,7 @@ extends:
                 displayName: Publish NuGet to preview feed
                 inputs:
                   useDotNetTask: false
-                  packagesToPush: $(Build.ArtifactStagingDirectory)/**/Microsoft.Graph.Entra.*.nupkg
+                  packagesToPush: $(Build.ArtifactStagingDirectory)/**/Microsoft.Entra.*.nupkg
                   packageParentPath: '$(Build.ArtifactStagingDirectory)'
                   publishVstsFeed: $(PROJECT_NAME)/$(PREVIEW_FEED_NAME)
                   nuGetFeedType: internal

diff --git a/.azure-pipelines/1es-entra-powershell-release.yml b/.azure-pipelines/1es-entra-powershell-release.yml
@@ -58,7 +58,12 @@ extends:
           displayName: Publish Nuget package
           inputs:
             useDotNetTask: false
+<<<<<<< HEAD
             packagesToPush: '$(System.ArtifactsDirectory)/drop/Microsoft.Graph.Entra*.nupkg'
             packageParentPath: '$(System.ArtifactsDirectory)'
+=======
+            packagesToPush: '$(Pipeline.Workspace)/drop/Microsoft.Entra*.nupkg'
+            packageParentPath: '$(Pipeline.Workspace)/drop'
+>>>>>>> e6ba625db (Rename module (#1223))
             nuGetFeedType: external
             publishFeedCredentials: EntraPowerShell_PSGallery
diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml
@@ -41,7 +41,7 @@ jobs:
           - template: ./common-templates/esrp/codesign-nuget.yml
             parameters:
               FolderPath: "$(Build.ArtifactStagingDirectory)"
-              Pattern: "Microsoft.Graph.Entra.*.nupkg"
+              Pattern: "Microsoft.Entra.*.nupkg"
 
           - task: PublishBuildArtifacts@1
             displayName: Publish Module Artifacts
@@ -54,7 +54,7 @@ jobs:
             displayName: Publish NuGet to preview feed
             inputs:
               command: push
-              packagesToPush: $(Build.ArtifactStagingDirectory)/**/Microsoft.Graph.Entra.*.nupkg
+              packagesToPush: $(Build.ArtifactStagingDirectory)/**/Microsoft.Entra.*.nupkg
               publishVstsFeed: $(PROJECT_NAME)/$(PREVIEW_FEED_NAME)
               allowPackageConflicts: true
 

diff --git a/.azure-pipelines/entra-powershell-release.yml b/.azure-pipelines/entra-powershell-release.yml
@@ -40,7 +40,7 @@ stages:
       inputs:
         targetType: inline
         script: |
-          Publish-Module -NuGetApiKey $env:NuGetApiKey -Path $(Build.ArtifactStagingDirectory)/modules/Microsoft.Graph.Entra -Verbose
-          Publish-Module -NuGetApiKey $env:NuGetApiKey -Path $(Build.ArtifactStagingDirectory)/modules/Microsoft.Graph.Entra.Beta -Verbose
+          Publish-Module -NuGetApiKey $env:NuGetApiKey -Path $(Build.ArtifactStagingDirectory)/modules/Microsoft.Entra -Verbose
+          Publish-Module -NuGetApiKey $env:NuGetApiKey -Path $(Build.ArtifactStagingDirectory)/modules/Microsoft.Entra.Beta -Verbose
         pwsh: false
     dependsOn: Release_Approval
diff --git a/.azure-pipelines/generation-templates/generate_adapter.yml b/.azure-pipelines/generation-templates/generate_adapter.yml
@@ -64,8 +64,8 @@ steps:
       targetType: "inline"
       pwsh: true
       script: |
-        $ModulePsd1 = "bin/Microsoft.Graph.Entra.psd1"
-        $ModulePsm1 = "bin/Microsoft.Graph.Entra.psm1"
+        $ModulePsd1 = "bin/Microsoft.Entra.psd1"
+        $ModulePsm1 = "bin/Microsoft.Entra.psm1"
         ($ModulePsd1 | Get-AuthenticodeSignature).Status | Should -Be "Valid"
         ($ModulePsm1 | Get-AuthenticodeSignature).Status | Should -Be "Valid"
 - task: powershell@2
@@ -143,8 +143,8 @@ steps:
       targetType: "inline"
       pwsh: true
       script: |
-        $ModulePsd1 = "bin/Microsoft.Graph.Entra.Beta.psd1"
-        $ModulePsm1 = "bin/Microsoft.Graph.Entra.Beta.psm1"
+        $ModulePsd1 = "bin/Microsoft.Entra.Beta.psd1"
+        $ModulePsm1 = "bin/Microsoft.Entra.Beta.psm1"
         ($ModulePsd1 | Get-AuthenticodeSignature).Status | Should -Be "Valid"
         ($ModulePsm1 | Get-AuthenticodeSignature).Status | Should -Be "Valid"
 - task: powershell@2

diff --git a/build/Publish-LocalCompatModule.ps1 b/build/Publish-LocalCompatModule.ps1
@@ -22,7 +22,7 @@ else{
 	$fullModuleNames += $modName
 }
 
-if($fullModuleName -like 'Microsoft.Graph.Entra.Beta*'){
+if($fullModuleName -like 'Microsoft.Entra.Beta*'){
 	$moduleName = 'EntraBeta'
 }
 else{
@@ -44,7 +44,7 @@ foreach ($destinationModuleName in $content.destinationModuleName){
 }
 
 foreach($module in $fullModuleNames){
-	if(($module -eq 'Microsoft.Graph.Entra') -or ($module -eq 'Microsoft.Graph.Entra.Beta')){
+	if(($module -eq 'Microsoft.Entra') -or ($module -eq 'Microsoft.Entra.Beta')){
 		continue
 	}
 	$modulePath = Join-Path (Get-ModuleBasePath) (Get-ConfigValue -Name ModuleOutputSubdirectoryName)
@@ -60,10 +60,10 @@ foreach($module in $fullModuleNames){
 }
 
 if($moduleName -eq 'Entra'){
-	$module = 'Microsoft.Graph.Entra'
+	$module = 'Microsoft.Entra'
 }
 else{
-	$module = 'Microsoft.Graph.Entra.Beta'
+	$module = 'Microsoft.Entra.Beta'
 }
 
 $modulePath = Join-Path (Get-ModuleBasePath) (Get-ConfigValue -Name ModuleOutputSubdirectoryName)

diff --git a/build/Split-Tests.ps1 b/build/Split-Tests.ps1
@@ -21,13 +21,13 @@ function Split-Tests {
             $TestSourceDirectory = "../test_legacy/module/Entra"
             $MappingFilePath = '../module/Entra/config/moduleMapping.json'
             $OutputDirectory = '../test/Entra'
-            $modulePrefix = 'Microsoft.Graph.Entra'
+            $modulePrefix = 'Microsoft.Entra'
         }
         'EntraBeta' {
             $TestSourceDirectory = "../test_legacy/module/EntraBeta"
             $MappingFilePath = "../module/EntraBeta/config/moduleMapping.json"
             $OutputDirectory = "../test/EntraBeta"
-            $modulePrefix = 'Microsoft.Graph.Entra.Beta'
+            $modulePrefix = 'Microsoft.Entra.Beta'
         }
         default {
             Log-Message -Message "Invalid Source specified. Use 'Entra' or 'EntraBeta'." -Level 'ERROR'

diff --git a/build/VNext-Build.md b/build/VNext-Build.md
@@ -84,16 +84,16 @@ The generated modules are in the output folder `./bin`
 
 SubModule in this case is the name of the specific sub-module you want to use. They are: `Authentication,Users,DirectoryManagement, Groups, Applications,Governance,SignIns and Reports`
 
-In order to import it, you need to run `Import-Module .\bin\Microsoft.Graph.Entra.<SubModule>psd1 -Force`
+In order to import it, you need to run `Import-Module .\bin\Microsoft.Entra.<SubModule>psd1 -Force`
 
-Alternatively, import the root module(that encompases and includes all the sub-modules and their help and dependencies) `Import-Module .\bin\Microsoft.Graph.Entra.psd1 -Force`
+Alternatively, import the root module(that encompases and includes all the sub-modules and their help and dependencies) `Import-Module .\bin\Microsoft.Entra.psd1 -Force`
 
 ## Usage
 
 Import the module and test the generated commands.
 
 ```powershell
-Import-Module .\bin\Microsoft.Graph.Entra.<SubModule>.psd1 -Force
+Import-Module .\bin\Microsoft.Entra.<SubModule>.psd1 -Force
 Connect-MgGraph -Scopes "User.Read.All"
 Get-EntraUser -Top 10
 ```

diff --git a/build/ValidateAuthenticodeSignature.ps1 b/build/ValidateAuthenticodeSignature.ps1
@@ -13,7 +13,7 @@ foreach($moduleName in $moduleNames){
     $modulePsd1 = $modulePath + ".psd1"
     ($modulePsd1 | Get-AuthenticodeSignature).Status | Should -Be "Valid"
 
-    if(($moduleName -eq 'Microsoft.Graph.Entra') -or ($moduleName -eq 'Microsoft.Graph.Entra.Beta')){
+    if(($moduleName -eq 'Microsoft.Entra') -or ($moduleName -eq 'Microsoft.Entra.Beta')){
 		continue
 	}
     $modulePsm1 = $modulePath + ".psm1"

diff --git a/build/common-functions.ps1 b/build/common-functions.ps1
@@ -28,8 +28,8 @@ function Get-ModuleBasePath {
 }
 
 function Get-ModuleVersion {
-	# Added -ErrorAction SilentlyContinue due to validation failure on Microsoft.Graph.Entra RequiredModules
-	# The RequiredModules are the Microsoft.Graph.Entra.* sub-modules
+	# Added -ErrorAction SilentlyContinue due to validation failure on Microsoft.Entra RequiredModules
+	# The RequiredModules are the Microsoft.Entra.* sub-modules
     (Get-ModuleManifestFile).FullName | Test-ModuleManifest -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Version
 }
 
@@ -167,7 +167,7 @@ function Create-ModuleFolder {
 		$destinationFileList = @()
 		$moduleFiles = @()
 
-		if(($module -eq 'Microsoft.Graph.Entra') -or ($module -eq 'Microsoft.Graph.Entra.Beta')){
+		if(($module -eq 'Microsoft.Entra') -or ($module -eq 'Microsoft.Entra.Beta')){
 			$moduleFiles +=  Get-ModuleFiles | Where { $_ -like "*$module.psd1" }
 			$moduleFiles +=  Get-ModuleFiles | Where { $_ -like "*$module.psm1" }
 		}

diff --git a/development-docs/cmdlet-references-documentation/cmdlet-reference-example-beta.md b/development-docs/cmdlet-references-documentation/cmdlet-reference-example-beta.md
@@ -9,9 +9,9 @@ ms.author: eunicewaweru
 manager: CelesteDG
 author: msewaweru
 
-external help file: Microsoft.Graph.Entra.Beta-Help.xml
-Module Name: Microsoft.Graph.Entra.Beta
-online version: https://learn.microsoft.com/powershell/module/Microsoft.Graph.Entra.Beta/Get-EntraBetaUser
+external help file: Microsoft.Entra.Beta-Help.xml
+Module Name: Microsoft.Entra.Beta
+online version: https://learn.microsoft.com/powershell/module/Microsoft.Entra.Beta/Get-EntraBetaUser
 
 schema: 2.0.0
 ---
@@ -20,7 +20,7 @@ schema: 2.0.0
 
 Reference
 
-Module: **Microsoft.Graph.Entra.Beta**
+Module: **Microsoft.Entra.Beta**
 
 ## Synopsis
 

diff --git a/development-docs/cmdlet-references-documentation/cmdlet-reference-example.md b/development-docs/cmdlet-references-documentation/cmdlet-reference-example.md
@@ -9,9 +9,9 @@ ms.author: eunicewaweru
 manager: CelesteDG
 author: msewaweru
 
-external help file: Microsoft.Graph.Entra-Help.xml
-Module Name: Microsoft.Graph.Entra
-online version: https://learn.microsoft.com/powershell/module/Microsoft.Graph.Entra/Get-EntraUser
+external help file: Microsoft.Entra-Help.xml
+Module Name: Microsoft.Entra
+online version: https://learn.microsoft.com/powershell/module/Microsoft.Entra/Get-EntraUser
 
 schema: 2.0.0
 ---
@@ -20,7 +20,7 @@ schema: 2.0.0
 
 Reference
 
-Module: **Microsoft.Graph.Entra**
+Module: **Microsoft.Entra**
 
 ## Synopsis
 

diff --git a/development-docs/cmdlet-references-documentation/cmdlet-reference-template.md b/development-docs/cmdlet-references-documentation/cmdlet-reference-template.md
@@ -10,9 +10,9 @@ manager: CelesteDG
 author: msewaweru
 ms.reviewer: stevemutungi
 
-external help file: Microsoft.Graph.Entra-Help.xml  //use `Microsoft.Graph.Entra.Beta-Help.xml` for beta commands
-Module Name: Microsoft.Graph.Entra  //use `Microsoft.Graph.Entra.Beta` for beta commands
-online version: https://learn.microsoft.com/powershell/module/Microsoft.Graph.Entra/<Command-Name> //use `https://learn.microsoft.com/powershell/module/Microsoft.Graph.Entra.Beta/<Command-Name>` for beta commands
+external help file: Microsoft.Entra-Help.xml  //use `Microsoft.Entra.Beta-Help.xml` for beta commands
+Module Name: Microsoft.Entra  //use `Microsoft.Entra.Beta` for beta commands
+online version: https://learn.microsoft.com/powershell/module/Microsoft.Entra/<Command-Name> //use `https://learn.microsoft.com/powershell/module/Microsoft.Entra.Beta/<Command-Name>` for beta commands
 
 schema: 2.0.0
 ---

diff --git a/...pplications/Add-EntraApplicationOwner.ps1 → ...pplications/Add-EntraApplicationOwner.ps1 b/...pplications/Add-EntraApplicationOwner.ps1 → ...pplications/Add-EntraApplicationOwner.ps1
diff --git a/...ipalDelegatedPermissionClassification.ps1 → ...ipalDelegatedPermissionClassification.ps1 b/...ipalDelegatedPermissionClassification.ps1 → ...ipalDelegatedPermissionClassification.ps1
diff --git a/...ations/Add-EntraServicePrincipalOwner.ps1 → ...ations/Add-EntraServicePrincipalOwner.ps1 b/...ations/Add-EntraServicePrincipalOwner.ps1 → ...ations/Add-EntraServicePrincipalOwner.ps1
diff --git a/...plications/Enable-EntraAzureADAliases.ps1 → ...plications/Enable-EntraAzureADAliases.ps1 b/...plications/Enable-EntraAzureADAliases.ps1 → ...plications/Enable-EntraAzureADAliases.ps1
diff --git a/...tra/Applications/Get-EntraApplication.ps1 → ...tra/Applications/Get-EntraApplication.ps1 b/...tra/Applications/Get-EntraApplication.ps1 → ...tra/Applications/Get-EntraApplication.ps1
diff --git a/...Get-EntraApplicationExtensionProperty.ps1 → ...Get-EntraApplicationExtensionProperty.ps1 b/...Get-EntraApplicationExtensionProperty.ps1 → ...Get-EntraApplicationExtensionProperty.ps1
diff --git a/...ons/Get-EntraApplicationKeyCredential.ps1 → ...ons/Get-EntraApplicationKeyCredential.ps1 b/...ons/Get-EntraApplicationKeyCredential.ps1 → ...ons/Get-EntraApplicationKeyCredential.ps1
diff --git a/...Applications/Get-EntraApplicationLogo.ps1 → ...Applications/Get-EntraApplicationLogo.ps1 b/...Applications/Get-EntraApplicationLogo.ps1 → ...Applications/Get-EntraApplicationLogo.ps1
diff --git a/...pplications/Get-EntraApplicationOwner.ps1 → ...pplications/Get-EntraApplicationOwner.ps1 b/...pplications/Get-EntraApplicationOwner.ps1 → ...pplications/Get-EntraApplicationOwner.ps1
diff --git a/...et-EntraApplicationPasswordCredential.ps1 → ...et-EntraApplicationPasswordCredential.ps1 b/...et-EntraApplicationPasswordCredential.ps1 → ...et-EntraApplicationPasswordCredential.ps1
diff --git a/...s/Get-EntraApplicationServiceEndpoint.ps1 → ...s/Get-EntraApplicationServiceEndpoint.ps1 b/...s/Get-EntraApplicationServiceEndpoint.ps1 → ...s/Get-EntraApplicationServiceEndpoint.ps1
diff --git a/...ications/Get-EntraApplicationTemplate.ps1 → ...ications/Get-EntraApplicationTemplate.ps1 b/...ications/Get-EntraApplicationTemplate.ps1 → ...ications/Get-EntraApplicationTemplate.ps1
diff --git a/...lications/Get-EntraDeletedApplication.ps1 → ...lications/Get-EntraDeletedApplication.ps1 b/...lications/Get-EntraDeletedApplication.ps1 → ...lications/Get-EntraDeletedApplication.ps1
diff --git a/...pplications/Get-EntraServicePrincipal.ps1 → ...pplications/Get-EntraServicePrincipal.ps1 b/...pplications/Get-EntraServicePrincipal.ps1 → ...pplications/Get-EntraServicePrincipal.ps1
diff --git a/...ntraServicePrincipalAppRoleAssignedTo.ps1 → ...ntraServicePrincipalAppRoleAssignedTo.ps1 b/...ntraServicePrincipalAppRoleAssignedTo.ps1 → ...ntraServicePrincipalAppRoleAssignedTo.ps1
diff --git a/...ntraServicePrincipalAppRoleAssignment.ps1 → ...ntraServicePrincipalAppRoleAssignment.ps1 b/...ntraServicePrincipalAppRoleAssignment.ps1 → ...ntraServicePrincipalAppRoleAssignment.ps1
diff --git a/...et-EntraServicePrincipalCreatedObject.ps1 → ...et-EntraServicePrincipalCreatedObject.ps1 b/...et-EntraServicePrincipalCreatedObject.ps1 → ...et-EntraServicePrincipalCreatedObject.ps1
diff --git a/...ipalDelegatedPermissionClassification.ps1 → ...ipalDelegatedPermissionClassification.ps1 b/...ipalDelegatedPermissionClassification.ps1 → ...ipalDelegatedPermissionClassification.ps1
diff --git a/...et-EntraServicePrincipalKeyCredential.ps1 → ...et-EntraServicePrincipalKeyCredential.ps1 b/...et-EntraServicePrincipalKeyCredential.ps1 → ...et-EntraServicePrincipalKeyCredential.ps1
diff --git a/...s/Get-EntraServicePrincipalMembership.ps1 → ...s/Get-EntraServicePrincipalMembership.ps1 b/...s/Get-EntraServicePrincipalMembership.ps1 → ...s/Get-EntraServicePrincipalMembership.ps1
diff --git a/...ServicePrincipalOAuth2PermissionGrant.ps1 → ...ServicePrincipalOAuth2PermissionGrant.ps1 b/...ServicePrincipalOAuth2PermissionGrant.ps1 → ...ServicePrincipalOAuth2PermissionGrant.ps1
diff --git a/.../Get-EntraServicePrincipalOwnedObject.ps1 → .../Get-EntraServicePrincipalOwnedObject.ps1 b/.../Get-EntraServicePrincipalOwnedObject.ps1 → .../Get-EntraServicePrincipalOwnedObject.ps1
diff --git a/...ations/Get-EntraServicePrincipalOwner.ps1 → ...ations/Get-EntraServicePrincipalOwner.ps1 b/...ations/Get-EntraServicePrincipalOwner.ps1 → ...ations/Get-EntraServicePrincipalOwner.ps1
diff --git a/...traServicePrincipalPasswordCredential.ps1 → ...traServicePrincipalPasswordCredential.ps1 b/...traServicePrincipalPasswordCredential.ps1 → ...traServicePrincipalPasswordCredential.ps1
diff --git a/...lications/Get-EntraUnsupportedCommand.ps1 → ...lications/Get-EntraUnsupportedCommand.ps1 b/...lications/Get-EntraUnsupportedCommand.ps1 → ...lications/Get-EntraUnsupportedCommand.ps1
diff --git a/...tra/Applications/New-EntraApplication.ps1 → ...tra/Applications/New-EntraApplication.ps1 b/...tra/Applications/New-EntraApplication.ps1 → ...tra/Applications/New-EntraApplication.ps1
diff --git a/...New-EntraApplicationExtensionProperty.ps1 → ...New-EntraApplicationExtensionProperty.ps1 b/...New-EntraApplicationExtensionProperty.ps1 → ...New-EntraApplicationExtensionProperty.ps1
diff --git a/...traApplicationFromApplicationTemplate.ps1 → ...traApplicationFromApplicationTemplate.ps1 b/...traApplicationFromApplicationTemplate.ps1 → ...traApplicationFromApplicationTemplate.ps1
diff --git a/.../Applications/New-EntraApplicationKey.ps1 → .../Applications/New-EntraApplicationKey.ps1 b/.../Applications/New-EntraApplicationKey.ps1 → .../Applications/New-EntraApplicationKey.ps1
diff --git a/...ons/New-EntraApplicationKeyCredential.ps1 → ...ons/New-EntraApplicationKeyCredential.ps1 b/...ons/New-EntraApplicationKeyCredential.ps1 → ...ons/New-EntraApplicationKeyCredential.ps1
diff --git a/...ications/New-EntraApplicationPassword.ps1 → ...ications/New-EntraApplicationPassword.ps1 b/...ications/New-EntraApplicationPassword.ps1 → ...ications/New-EntraApplicationPassword.ps1
diff --git a/...ew-EntraApplicationPasswordCredential.ps1 → ...ew-EntraApplicationPasswordCredential.ps1 b/...ew-EntraApplicationPasswordCredential.ps1 → ...ew-EntraApplicationPasswordCredential.ps1
diff --git a/...h.Entra/Groups/New-EntraCustomHeaders.ps1 → ...a/Applications/New-EntraCustomHeaders.ps1 b/...h.Entra/Groups/New-EntraCustomHeaders.ps1 → ...a/Applications/New-EntraCustomHeaders.ps1
@@ -21,7 +21,7 @@ function New-EntraCustomHeaders {
     )
 
     $psVersion = $global:PSVersionTable.PSVersion
-    $entraVersion = (Get-Module Microsoft.Graph.Entra.Groups | Select-Object version).Version.ToString()
+    $entraVersion = (Get-Module Microsoft.Entra.Applications | Select-Object version).Version.ToString()
     $userAgentHeaderValue = "PowerShell/$psVersion EntraPowershell/$entraVersion $Command"
     $customHeaders = New-Object 'system.collections.generic.dictionary[string,string]'
     $customHeaders["User-Agent"] = $userAgentHeaderValue

diff --git a/...pplications/New-EntraServicePrincipal.ps1 → ...pplications/New-EntraServicePrincipal.ps1 b/...pplications/New-EntraServicePrincipal.ps1 → ...pplications/New-EntraServicePrincipal.ps1
diff --git a/...ntraServicePrincipalAppRoleAssignment.ps1 → ...ntraServicePrincipalAppRoleAssignment.ps1 b/...ntraServicePrincipalAppRoleAssignment.ps1 → ...ntraServicePrincipalAppRoleAssignment.ps1
diff --git a/...traServicePrincipalPasswordCredential.ps1 → ...traServicePrincipalPasswordCredential.ps1 b/...traServicePrincipalPasswordCredential.ps1 → ...traServicePrincipalPasswordCredential.ps1
diff --git a/.../Applications/Remove-EntraApplication.ps1 → .../Applications/Remove-EntraApplication.ps1 b/.../Applications/Remove-EntraApplication.ps1 → .../Applications/Remove-EntraApplication.ps1
diff --git a/...ove-EntraApplicationExtensionProperty.ps1 → ...ove-EntraApplicationExtensionProperty.ps1 b/...ove-EntraApplicationExtensionProperty.ps1 → ...ove-EntraApplicationExtensionProperty.ps1
diff --git a/...plications/Remove-EntraApplicationKey.ps1 → ...plications/Remove-EntraApplicationKey.ps1 b/...plications/Remove-EntraApplicationKey.ps1 → ...plications/Remove-EntraApplicationKey.ps1
diff --git a/.../Remove-EntraApplicationKeyCredential.ps1 → .../Remove-EntraApplicationKeyCredential.ps1 b/.../Remove-EntraApplicationKeyCredential.ps1 → .../Remove-EntraApplicationKeyCredential.ps1
diff --git a/...ications/Remove-EntraApplicationOwner.ps1 → ...ications/Remove-EntraApplicationOwner.ps1 b/...ications/Remove-EntraApplicationOwner.ps1 → ...ications/Remove-EntraApplicationOwner.ps1
diff --git a/...tions/Remove-EntraApplicationPassword.ps1 → ...tions/Remove-EntraApplicationPassword.ps1 b/...tions/Remove-EntraApplicationPassword.ps1 → ...tions/Remove-EntraApplicationPassword.ps1
diff --git a/...ve-EntraApplicationPasswordCredential.ps1 → ...ve-EntraApplicationPasswordCredential.ps1 b/...ve-EntraApplicationPasswordCredential.ps1 → ...ve-EntraApplicationPasswordCredential.ps1
diff --git a/...ove-EntraApplicationVerifiedPublisher.ps1 → ...ove-EntraApplicationVerifiedPublisher.ps1 b/...ove-EntraApplicationVerifiedPublisher.ps1 → ...ove-EntraApplicationVerifiedPublisher.ps1
diff --git a/...ations/Remove-EntraDeletedApplication.ps1 → ...ations/Remove-EntraDeletedApplication.ps1 b/...ations/Remove-EntraDeletedApplication.ps1 → ...ations/Remove-EntraDeletedApplication.ps1
diff --git a/...ns/Remove-EntraDeletedDirectoryObject.ps1 → ...ns/Remove-EntraDeletedDirectoryObject.ps1 b/...ns/Remove-EntraDeletedDirectoryObject.ps1 → ...ns/Remove-EntraDeletedDirectoryObject.ps1
diff --git a/...ications/Remove-EntraServicePrincipal.ps1 → ...ications/Remove-EntraServicePrincipal.ps1 b/...ications/Remove-EntraServicePrincipal.ps1 → ...ications/Remove-EntraServicePrincipal.ps1
diff --git a/...ntraServicePrincipalAppRoleAssignment.ps1 → ...ntraServicePrincipalAppRoleAssignment.ps1 b/...ntraServicePrincipalAppRoleAssignment.ps1 → ...ntraServicePrincipalAppRoleAssignment.ps1
diff --git a/...ipalDelegatedPermissionClassification.ps1 → ...ipalDelegatedPermissionClassification.ps1 b/...ipalDelegatedPermissionClassification.ps1 → ...ipalDelegatedPermissionClassification.ps1
diff --git a/...ve-EntraServicePrincipalKeyCredential.ps1 → ...ve-EntraServicePrincipalKeyCredential.ps1 b/...ve-EntraServicePrincipalKeyCredential.ps1 → ...ve-EntraServicePrincipalKeyCredential.ps1
diff --git a/...ons/Remove-EntraServicePrincipalOwner.ps1 → ...ons/Remove-EntraServicePrincipalOwner.ps1 b/...ons/Remove-EntraServicePrincipalOwner.ps1 → ...ons/Remove-EntraServicePrincipalOwner.ps1
diff --git a/...traServicePrincipalPasswordCredential.ps1 → ...traServicePrincipalPasswordCredential.ps1 b/...traServicePrincipalPasswordCredential.ps1 → ...traServicePrincipalPasswordCredential.ps1
diff --git a/...tions/Restore-EntraDeletedApplication.ps1 → ...tions/Restore-EntraDeletedApplication.ps1 b/...tions/Restore-EntraDeletedApplication.ps1 → ...tions/Restore-EntraDeletedApplication.ps1
diff --git a/...traGroupIdsServicePrincipalIsMemberOf.ps1 → ...traGroupIdsServicePrincipalIsMemberOf.ps1 b/...traGroupIdsServicePrincipalIsMemberOf.ps1 → ...traGroupIdsServicePrincipalIsMemberOf.ps1
diff --git a/...tra/Applications/Set-EntraApplication.ps1 → ...tra/Applications/Set-EntraApplication.ps1 b/...tra/Applications/Set-EntraApplication.ps1 → ...tra/Applications/Set-EntraApplication.ps1
diff --git a/...Applications/Set-EntraApplicationLogo.ps1 → ...Applications/Set-EntraApplicationLogo.ps1 b/...Applications/Set-EntraApplicationLogo.ps1 → ...Applications/Set-EntraApplicationLogo.ps1
diff --git a/...Set-EntraApplicationVerifiedPublisher.ps1 → ...Set-EntraApplicationVerifiedPublisher.ps1 b/...Set-EntraApplicationVerifiedPublisher.ps1 → ...Set-EntraApplicationVerifiedPublisher.ps1
diff --git a/...pplications/Set-EntraServicePrincipal.ps1 → ...pplications/Set-EntraServicePrincipal.ps1 b/...pplications/Set-EntraServicePrincipal.ps1 → ...pplications/Set-EntraServicePrincipal.ps1
diff --git a/...a/Authentication/Add-EntraEnvironment.ps1 → ...a/Authentication/Add-EntraEnvironment.ps1 b/...a/Authentication/Add-EntraEnvironment.ps1 → ...a/Authentication/Add-EntraEnvironment.ps1
diff --git a/...ph.Entra/Authentication/Connect-Entra.ps1 → ...ft.Entra/Authentication/Connect-Entra.ps1 b/...ph.Entra/Authentication/Connect-Entra.ps1 → ...ft.Entra/Authentication/Connect-Entra.ps1
diff --git a/...Entra/Authentication/Disconnect-Entra.ps1 → ...Entra/Authentication/Disconnect-Entra.ps1 b/...Entra/Authentication/Disconnect-Entra.ps1 → ...Entra/Authentication/Disconnect-Entra.ps1
diff --git a/...entication/Enable-EntraAzureADAliases.ps1 → ...entication/Enable-EntraAzureADAliases.ps1 b/...entication/Enable-EntraAzureADAliases.ps1 → ...entication/Enable-EntraAzureADAliases.ps1
diff --git a/...a/Authentication/Find-EntraPermission.ps1 → ...a/Authentication/Find-EntraPermission.ps1 b/...a/Authentication/Find-EntraPermission.ps1 → ...a/Authentication/Find-EntraPermission.ps1
diff --git a/...Entra/Authentication/Get-EntraContext.ps1 → ...Entra/Authentication/Get-EntraContext.ps1 b/...Entra/Authentication/Get-EntraContext.ps1 → ...Entra/Authentication/Get-EntraContext.ps1
diff --git a/...a/Authentication/Get-EntraEnvironment.ps1 → ...a/Authentication/Get-EntraEnvironment.ps1 b/...a/Authentication/Get-EntraEnvironment.ps1 → ...a/Authentication/Get-EntraEnvironment.ps1
diff --git a/...ntication/Get-EntraUnsupportedCommand.ps1 → ...ntication/Get-EntraUnsupportedCommand.ps1 b/...ntication/Get-EntraUnsupportedCommand.ps1 → ...ntication/Get-EntraUnsupportedCommand.ps1
diff --git a/module/Entra/Microsoft.Entra/Authentication/New-EntraCustomHeaders.ps1 b/module/Entra/Microsoft.Entra/Authentication/New-EntraCustomHeaders.ps1
@@ -0,0 +1,31 @@
+# ------------------------------------------------------------------------------ 
+#  Copyright (c) Microsoft Corporation.  All Rights Reserved.  
+#  Licensed under the MIT License.  See License in the project root for license information. 
+# ------------------------------------------------------------------------------ 
+function New-EntraCustomHeaders {
+    <#
+    .SYNOPSIS
+        Creates a custom header for use in telemetry.
+    .DESCRIPTION
+        The custom header created is a User-Agent with header value "<PowerShell version> EntraPowershell/<EntraPowershell version> <Entra PowerShell command>"
+    .PARAMETER Command
+        The command that is being executed.
+    .EXAMPLE
+        New-EntraCustomHeaders -Command Get-EntraUser
+    #>
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $true)]
+        [string]
+		$Command
+    )
+
+    $psVersion = $global:PSVersionTable.PSVersion
+    $entraVersion = (Get-Module Microsoft.Entra.Authentication | Select-Object version).Version.ToString()
+    $userAgentHeaderValue = "PowerShell/$psVersion EntraPowershell/$entraVersion $Command"
+    $customHeaders = New-Object 'system.collections.generic.dictionary[string,string]'
+    $customHeaders["User-Agent"] = $userAgentHeaderValue
+
+    $customHeaders
+}# ------------------------------------------------------------------------------
+
diff --git a/...-EntraStrongAuthenticationMethodByUpn.ps1 → ...-EntraStrongAuthenticationMethodByUpn.ps1 b/...-EntraStrongAuthenticationMethodByUpn.ps1 → ...-EntraStrongAuthenticationMethodByUpn.ps1
diff --git a/...voke-EntraSignedInUserAllRefreshToken.ps1 → ...voke-EntraSignedInUserAllRefreshToken.ps1 b/...voke-EntraSignedInUserAllRefreshToken.ps1 → ...voke-EntraSignedInUserAllRefreshToken.ps1
diff --git a/...ation/Revoke-EntraUserAllRefreshToken.ps1 → ...ation/Revoke-EntraUserAllRefreshToken.ps1 b/...ation/Revoke-EntraUserAllRefreshToken.ps1 → ...ation/Revoke-EntraUserAllRefreshToken.ps1
diff --git a/...ent/Add-EntraAdministrativeUnitMember.ps1 → ...ent/Add-EntraAdministrativeUnitMember.ps1 b/...ent/Add-EntraAdministrativeUnitMember.ps1 → ...ent/Add-EntraAdministrativeUnitMember.ps1
diff --git a/...curityAttributeDefinitionAllowedValue.ps1 → ...curityAttributeDefinitionAllowedValue.ps1 b/...curityAttributeDefinitionAllowedValue.ps1 → ...curityAttributeDefinitionAllowedValue.ps1
diff --git a/...gement/Add-EntraDeviceRegisteredOwner.ps1 → ...gement/Add-EntraDeviceRegisteredOwner.ps1 b/...gement/Add-EntraDeviceRegisteredOwner.ps1 → ...gement/Add-EntraDeviceRegisteredOwner.ps1
diff --git a/...agement/Add-EntraDeviceRegisteredUser.ps1 → ...agement/Add-EntraDeviceRegisteredUser.ps1 b/...agement/Add-EntraDeviceRegisteredUser.ps1 → ...agement/Add-EntraDeviceRegisteredUser.ps1
diff --git a/...nagement/Add-EntraDirectoryRoleMember.ps1 → ...nagement/Add-EntraDirectoryRoleMember.ps1 b/...nagement/Add-EntraDirectoryRoleMember.ps1 → ...nagement/Add-EntraDirectoryRoleMember.ps1
diff --git a/...agement/Add-EntraScopedRoleMembership.ps1 → ...agement/Add-EntraScopedRoleMembership.ps1 b/...agement/Add-EntraScopedRoleMembership.ps1 → ...agement/Add-EntraScopedRoleMembership.ps1
diff --git a/...rectoryManagement/Confirm-EntraDomain.ps1 → ...rectoryManagement/Confirm-EntraDomain.ps1 b/...rectoryManagement/Confirm-EntraDomain.ps1 → ...rectoryManagement/Confirm-EntraDomain.ps1
diff --git a/...Management/Enable-EntraAzureADAliases.ps1 → ...Management/Enable-EntraAzureADAliases.ps1 b/...Management/Enable-EntraAzureADAliases.ps1 → ...Management/Enable-EntraAzureADAliases.ps1
diff --git a/...yManagement/Enable-EntraDirectoryRole.ps1 → ...yManagement/Enable-EntraDirectoryRole.ps1 b/...yManagement/Enable-EntraDirectoryRole.ps1 → ...yManagement/Enable-EntraDirectoryRole.ps1
diff --git a/...rectoryManagement/Get-EntraAccountSku.ps1 → ...rectoryManagement/Get-EntraAccountSku.ps1 b/...rectoryManagement/Get-EntraAccountSku.ps1 → ...rectoryManagement/Get-EntraAccountSku.ps1
diff --git a/...anagement/Get-EntraAdministrativeUnit.ps1 → ...anagement/Get-EntraAdministrativeUnit.ps1 b/...anagement/Get-EntraAdministrativeUnit.ps1 → ...anagement/Get-EntraAdministrativeUnit.ps1
diff --git a/...ent/Get-EntraAdministrativeUnitMember.ps1 → ...ent/Get-EntraAdministrativeUnitMember.ps1 b/...ent/Get-EntraAdministrativeUnitMember.ps1 → ...ent/Get-EntraAdministrativeUnitMember.ps1
diff --git a/...ctoryManagement/Get-EntraAttributeSet.ps1 → ...ctoryManagement/Get-EntraAttributeSet.ps1 b/...ctoryManagement/Get-EntraAttributeSet.ps1 → ...ctoryManagement/Get-EntraAttributeSet.ps1
diff --git a/.../DirectoryManagement/Get-EntraContact.ps1 → .../DirectoryManagement/Get-EntraContact.ps1 b/.../DirectoryManagement/Get-EntraContact.ps1 → .../DirectoryManagement/Get-EntraContact.ps1
diff --git a/...nagement/Get-EntraContactDirectReport.ps1 → ...nagement/Get-EntraContactDirectReport.ps1 b/...nagement/Get-EntraContactDirectReport.ps1 → ...nagement/Get-EntraContactDirectReport.ps1
diff --git a/...oryManagement/Get-EntraContactManager.ps1 → ...oryManagement/Get-EntraContactManager.ps1 b/...oryManagement/Get-EntraContactManager.ps1 → ...oryManagement/Get-EntraContactManager.ps1
diff --git a/...Management/Get-EntraContactMembership.ps1 → ...Management/Get-EntraContactMembership.ps1 b/...Management/Get-EntraContactMembership.ps1 → ...Management/Get-EntraContactMembership.ps1
diff --git a/...DirectoryManagement/Get-EntraContract.ps1 → ...DirectoryManagement/Get-EntraContract.ps1 b/...DirectoryManagement/Get-EntraContract.ps1 → ...DirectoryManagement/Get-EntraContract.ps1
diff --git a/...ntraCustomSecurityAttributeDefinition.ps1 → ...ntraCustomSecurityAttributeDefinition.ps1 b/...ntraCustomSecurityAttributeDefinition.ps1 → ...ntraCustomSecurityAttributeDefinition.ps1
diff --git a/...curityAttributeDefinitionAllowedValue.ps1 → ...curityAttributeDefinitionAllowedValue.ps1 b/...curityAttributeDefinitionAllowedValue.ps1 → ...curityAttributeDefinitionAllowedValue.ps1
diff --git a/...ement/Get-EntraDeletedDirectoryObject.ps1 → ...ement/Get-EntraDeletedDirectoryObject.ps1 b/...ement/Get-EntraDeletedDirectoryObject.ps1 → ...ement/Get-EntraDeletedDirectoryObject.ps1
diff --git a/...a/DirectoryManagement/Get-EntraDevice.ps1 → ...a/DirectoryManagement/Get-EntraDevice.ps1 b/...a/DirectoryManagement/Get-EntraDevice.ps1 → ...a/DirectoryManagement/Get-EntraDevice.ps1
diff --git a/...gement/Get-EntraDeviceRegisteredOwner.ps1 → ...gement/Get-EntraDeviceRegisteredOwner.ps1 b/...gement/Get-EntraDeviceRegisteredOwner.ps1 → ...gement/Get-EntraDeviceRegisteredOwner.ps1
diff --git a/...agement/Get-EntraDeviceRegisteredUser.ps1 → ...agement/Get-EntraDeviceRegisteredUser.ps1 b/...agement/Get-EntraDeviceRegisteredUser.ps1 → ...agement/Get-EntraDeviceRegisteredUser.ps1
diff --git a/...agement/Get-EntraDirSyncConfiguration.ps1 → ...agement/Get-EntraDirSyncConfiguration.ps1 b/...agement/Get-EntraDirSyncConfiguration.ps1 → ...agement/Get-EntraDirSyncConfiguration.ps1
diff --git a/...toryObjectOnPremisesProvisioningError.ps1 → ...toryObjectOnPremisesProvisioningError.ps1 b/...toryObjectOnPremisesProvisioningError.ps1 → ...toryObjectOnPremisesProvisioningError.ps1
diff --git a/...toryManagement/Get-EntraDirectoryRole.ps1 → ...toryManagement/Get-EntraDirectoryRole.ps1 b/...toryManagement/Get-EntraDirectoryRole.ps1 → ...toryManagement/Get-EntraDirectoryRole.ps1
diff --git a/...nagement/Get-EntraDirectoryRoleMember.ps1 → ...nagement/Get-EntraDirectoryRoleMember.ps1 b/...nagement/Get-EntraDirectoryRoleMember.ps1 → ...nagement/Get-EntraDirectoryRoleMember.ps1
diff --git a/...gement/Get-EntraDirectoryRoleTemplate.ps1 → ...gement/Get-EntraDirectoryRoleTemplate.ps1 b/...gement/Get-EntraDirectoryRoleTemplate.ps1 → ...gement/Get-EntraDirectoryRoleTemplate.ps1
diff --git a/...a/DirectoryManagement/Get-EntraDomain.ps1 → ...a/DirectoryManagement/Get-EntraDomain.ps1 b/...a/DirectoryManagement/Get-EntraDomain.ps1 → ...a/DirectoryManagement/Get-EntraDomain.ps1
diff --git a/...ent/Get-EntraDomainFederationSettings.ps1 → ...ent/Get-EntraDomainFederationSettings.ps1 b/...ent/Get-EntraDomainFederationSettings.ps1 → ...ent/Get-EntraDomainFederationSettings.ps1
diff --git a/...nagement/Get-EntraDomainNameReference.ps1 → ...nagement/Get-EntraDomainNameReference.ps1 b/...nagement/Get-EntraDomainNameReference.ps1 → ...nagement/Get-EntraDomainNameReference.ps1
diff --git a/...EntraDomainServiceConfigurationRecord.ps1 → ...EntraDomainServiceConfigurationRecord.ps1 b/...EntraDomainServiceConfigurationRecord.ps1 → ...EntraDomainServiceConfigurationRecord.ps1
diff --git a/.../Get-EntraDomainVerificationDnsRecord.ps1 → .../Get-EntraDomainVerificationDnsRecord.ps1 b/.../Get-EntraDomainVerificationDnsRecord.ps1 → .../Get-EntraDomainVerificationDnsRecord.ps1
diff --git a/...Management/Get-EntraExtensionProperty.ps1 → ...Management/Get-EntraExtensionProperty.ps1 b/...Management/Get-EntraExtensionProperty.ps1 → ...Management/Get-EntraExtensionProperty.ps1
diff --git a/...anagement/Get-EntraFederationProperty.ps1 → ...anagement/Get-EntraFederationProperty.ps1 b/...anagement/Get-EntraFederationProperty.ps1 → ...anagement/Get-EntraFederationProperty.ps1
diff --git a/...yManagement/Get-EntraObjectByObjectId.ps1 → ...yManagement/Get-EntraObjectByObjectId.ps1 b/...yManagement/Get-EntraObjectByObjectId.ps1 → ...yManagement/Get-EntraObjectByObjectId.ps1
diff --git a/...anagement/Get-EntraPartnerInformation.ps1 → ...anagement/Get-EntraPartnerInformation.ps1 b/...anagement/Get-EntraPartnerInformation.ps1 → ...anagement/Get-EntraPartnerInformation.ps1
diff --git a/...oryManagement/Get-EntraPasswordPolicy.ps1 → ...oryManagement/Get-EntraPasswordPolicy.ps1 b/...oryManagement/Get-EntraPasswordPolicy.ps1 → ...oryManagement/Get-EntraPasswordPolicy.ps1
diff --git a/...agement/Get-EntraScopedRoleMembership.ps1 → ...agement/Get-EntraScopedRoleMembership.ps1 b/...agement/Get-EntraScopedRoleMembership.ps1 → ...agement/Get-EntraScopedRoleMembership.ps1
diff --git a/...toryManagement/Get-EntraSubscribedSku.ps1 → ...toryManagement/Get-EntraSubscribedSku.ps1 b/...toryManagement/Get-EntraSubscribedSku.ps1 → ...toryManagement/Get-EntraSubscribedSku.ps1
diff --git a/...ctoryManagement/Get-EntraTenantDetail.ps1 → ...ctoryManagement/Get-EntraTenantDetail.ps1 b/...ctoryManagement/Get-EntraTenantDetail.ps1 → ...ctoryManagement/Get-EntraTenantDetail.ps1
diff --git a/...anagement/Get-EntraUnsupportedCommand.ps1 → ...anagement/Get-EntraUnsupportedCommand.ps1 b/...anagement/Get-EntraUnsupportedCommand.ps1 → ...anagement/Get-EntraUnsupportedCommand.ps1
diff --git a/...anagement/New-EntraAdministrativeUnit.ps1 → ...anagement/New-EntraAdministrativeUnit.ps1 b/...anagement/New-EntraAdministrativeUnit.ps1 → ...anagement/New-EntraAdministrativeUnit.ps1
diff --git a/...ctoryManagement/New-EntraAttributeSet.ps1 → ...ctoryManagement/New-EntraAttributeSet.ps1 b/...ctoryManagement/New-EntraAttributeSet.ps1 → ...ctoryManagement/New-EntraAttributeSet.ps1
diff --git a/...a/Applications/New-EntraCustomHeaders.ps1 → ...toryManagement/New-EntraCustomHeaders.ps1 b/...a/Applications/New-EntraCustomHeaders.ps1 → ...toryManagement/New-EntraCustomHeaders.ps1
@@ -21,7 +21,7 @@ function New-EntraCustomHeaders {
     )
 
     $psVersion = $global:PSVersionTable.PSVersion
-    $entraVersion = (Get-Module Microsoft.Graph.Entra.Applications | Select-Object version).Version.ToString()
+    $entraVersion = (Get-Module Microsoft.Entra.DirectoryManagement | Select-Object version).Version.ToString()
     $userAgentHeaderValue = "PowerShell/$psVersion EntraPowershell/$entraVersion $Command"
     $customHeaders = New-Object 'system.collections.generic.dictionary[string,string]'
     $customHeaders["User-Agent"] = $userAgentHeaderValue

diff --git a/...ntraCustomSecurityAttributeDefinition.ps1 → ...ntraCustomSecurityAttributeDefinition.ps1 b/...ntraCustomSecurityAttributeDefinition.ps1 → ...ntraCustomSecurityAttributeDefinition.ps1
diff --git a/...a/DirectoryManagement/New-EntraDevice.ps1 → ...a/DirectoryManagement/New-EntraDevice.ps1 b/...a/DirectoryManagement/New-EntraDevice.ps1 → ...a/DirectoryManagement/New-EntraDevice.ps1
diff --git a/...a/DirectoryManagement/New-EntraDomain.ps1 → ...a/DirectoryManagement/New-EntraDomain.ps1 b/...a/DirectoryManagement/New-EntraDomain.ps1 → ...a/DirectoryManagement/New-EntraDomain.ps1
diff --git a/...gement/Remove-EntraAdministrativeUnit.ps1 → ...gement/Remove-EntraAdministrativeUnit.ps1 b/...gement/Remove-EntraAdministrativeUnit.ps1 → ...gement/Remove-EntraAdministrativeUnit.ps1
diff --git a/.../Remove-EntraAdministrativeUnitMember.ps1 → .../Remove-EntraAdministrativeUnitMember.ps1 b/.../Remove-EntraAdministrativeUnitMember.ps1 → .../Remove-EntraAdministrativeUnitMember.ps1
diff --git a/...rectoryManagement/Remove-EntraContact.ps1 → ...rectoryManagement/Remove-EntraContact.ps1 b/...rectoryManagement/Remove-EntraContact.ps1 → ...rectoryManagement/Remove-EntraContact.ps1
diff --git a/...irectoryManagement/Remove-EntraDevice.ps1 → ...irectoryManagement/Remove-EntraDevice.ps1 b/...irectoryManagement/Remove-EntraDevice.ps1 → ...irectoryManagement/Remove-EntraDevice.ps1
diff --git a/...ent/Remove-EntraDeviceRegisteredOwner.ps1 → ...ent/Remove-EntraDeviceRegisteredOwner.ps1 b/...ent/Remove-EntraDeviceRegisteredOwner.ps1 → ...ent/Remove-EntraDeviceRegisteredOwner.ps1
diff --git a/...ment/Remove-EntraDeviceRegisteredUser.ps1 → ...ment/Remove-EntraDeviceRegisteredUser.ps1 b/...ment/Remove-EntraDeviceRegisteredUser.ps1 → ...ment/Remove-EntraDeviceRegisteredUser.ps1
diff --git a/...ement/Remove-EntraDirectoryRoleMember.ps1 → ...ement/Remove-EntraDirectoryRoleMember.ps1 b/...ement/Remove-EntraDirectoryRoleMember.ps1 → ...ement/Remove-EntraDirectoryRoleMember.ps1
diff --git a/...irectoryManagement/Remove-EntraDomain.ps1 → ...irectoryManagement/Remove-EntraDomain.ps1 b/...irectoryManagement/Remove-EntraDomain.ps1 → ...irectoryManagement/Remove-EntraDomain.ps1
diff --git a/...ment/Remove-EntraScopedRoleMembership.ps1 → ...ment/Remove-EntraScopedRoleMembership.ps1 b/...ment/Remove-EntraScopedRoleMembership.ps1 → ...ment/Remove-EntraScopedRoleMembership.ps1
diff --git a/...t/Restore-EntraDeletedDirectoryObject.ps1 → ...t/Restore-EntraDeletedDirectoryObject.ps1 b/...t/Restore-EntraDeletedDirectoryObject.ps1 → ...t/Restore-EntraDeletedDirectoryObject.ps1
diff --git a/...anagement/Set-EntraAdministrativeUnit.ps1 → ...anagement/Set-EntraAdministrativeUnit.ps1 b/...anagement/Set-EntraAdministrativeUnit.ps1 → ...anagement/Set-EntraAdministrativeUnit.ps1
diff --git a/...ctoryManagement/Set-EntraAttributeSet.ps1 → ...ctoryManagement/Set-EntraAttributeSet.ps1 b/...ctoryManagement/Set-EntraAttributeSet.ps1 → ...ctoryManagement/Set-EntraAttributeSet.ps1
diff --git a/...ntraCustomSecurityAttributeDefinition.ps1 → ...ntraCustomSecurityAttributeDefinition.ps1 b/...ntraCustomSecurityAttributeDefinition.ps1 → ...ntraCustomSecurityAttributeDefinition.ps1
diff --git a/...curityAttributeDefinitionAllowedValue.ps1 → ...curityAttributeDefinitionAllowedValue.ps1 b/...curityAttributeDefinitionAllowedValue.ps1 → ...curityAttributeDefinitionAllowedValue.ps1
diff --git a/...a/DirectoryManagement/Set-EntraDevice.ps1 → ...a/DirectoryManagement/Set-EntraDevice.ps1 b/...a/DirectoryManagement/Set-EntraDevice.ps1 → ...a/DirectoryManagement/Set-EntraDevice.ps1
diff --git a/...agement/Set-EntraDirSyncConfiguration.ps1 → ...agement/Set-EntraDirSyncConfiguration.ps1 b/...agement/Set-EntraDirSyncConfiguration.ps1 → ...agement/Set-EntraDirSyncConfiguration.ps1
diff --git a/...oryManagement/Set-EntraDirSyncEnabled.ps1 → ...oryManagement/Set-EntraDirSyncEnabled.ps1 b/...oryManagement/Set-EntraDirSyncEnabled.ps1 → ...oryManagement/Set-EntraDirSyncEnabled.ps1
diff --git a/...oryManagement/Set-EntraDirSyncFeature.ps1 → ...oryManagement/Set-EntraDirSyncFeature.ps1 b/...oryManagement/Set-EntraDirSyncFeature.ps1 → ...oryManagement/Set-EntraDirSyncFeature.ps1
diff --git a/...a/DirectoryManagement/Set-EntraDomain.ps1 → ...a/DirectoryManagement/Set-EntraDomain.ps1 b/...a/DirectoryManagement/Set-EntraDomain.ps1 → ...a/DirectoryManagement/Set-EntraDomain.ps1
diff --git a/...ent/Set-EntraDomainFederationSettings.ps1 → ...ent/Set-EntraDomainFederationSettings.ps1 b/...ent/Set-EntraDomainFederationSettings.ps1 → ...ent/Set-EntraDomainFederationSettings.ps1
diff --git a/...anagement/Set-EntraPartnerInformation.ps1 → ...anagement/Set-EntraPartnerInformation.ps1 b/...anagement/Set-EntraPartnerInformation.ps1 → ...anagement/Set-EntraPartnerInformation.ps1
diff --git a/...ctoryManagement/Set-EntraTenantDetail.ps1 → ...ctoryManagement/Set-EntraTenantDetail.ps1 b/...ctoryManagement/Set-EntraTenantDetail.ps1 → ...ctoryManagement/Set-EntraTenantDetail.ps1
diff --git a/....Graph.Entra/Enable-EntraAzureADAlias.ps1 → ...rosoft.Entra/Enable-EntraAzureADAlias.ps1 b/....Graph.Entra/Enable-EntraAzureADAlias.ps1 → ...rosoft.Entra/Enable-EntraAzureADAlias.ps1
diff --git a/...Governance/Enable-EntraAzureADAliases.ps1 → ...Governance/Enable-EntraAzureADAliases.ps1 b/...Governance/Enable-EntraAzureADAliases.ps1 → ...Governance/Enable-EntraAzureADAliases.ps1
diff --git a/...ance/Get-EntraDirectoryRoleAssignment.ps1 → ...ance/Get-EntraDirectoryRoleAssignment.ps1 b/...ance/Get-EntraDirectoryRoleAssignment.ps1 → ...ance/Get-EntraDirectoryRoleAssignment.ps1
diff --git a/...ance/Get-EntraDirectoryRoleDefinition.ps1 → ...ance/Get-EntraDirectoryRoleDefinition.ps1 b/...ance/Get-EntraDirectoryRoleDefinition.ps1 → ...ance/Get-EntraDirectoryRoleDefinition.ps1
diff --git a/...overnance/Get-EntraUnsupportedCommand.ps1 → ...overnance/Get-EntraUnsupportedCommand.ps1 b/...overnance/Get-EntraUnsupportedCommand.ps1 → ...overnance/Get-EntraUnsupportedCommand.ps1
diff --git a/...ph.Entra/Users/New-EntraCustomHeaders.ps1 → ...tra/Governance/New-EntraCustomHeaders.ps1 b/...ph.Entra/Users/New-EntraCustomHeaders.ps1 → ...tra/Governance/New-EntraCustomHeaders.ps1
@@ -21,7 +21,7 @@ function New-EntraCustomHeaders {
     )
 
     $psVersion = $global:PSVersionTable.PSVersion
-    $entraVersion = (Get-Module Microsoft.Graph.Entra.Users | Select-Object version).Version.ToString()
+    $entraVersion = (Get-Module Microsoft.Entra.Governance | Select-Object version).Version.ToString()
     $userAgentHeaderValue = "PowerShell/$psVersion EntraPowershell/$entraVersion $Command"
     $customHeaders = New-Object 'system.collections.generic.dictionary[string,string]'
     $customHeaders["User-Agent"] = $userAgentHeaderValue

diff --git a/...ance/New-EntraDirectoryRoleAssignment.ps1 → ...ance/New-EntraDirectoryRoleAssignment.ps1 b/...ance/New-EntraDirectoryRoleAssignment.ps1 → ...ance/New-EntraDirectoryRoleAssignment.ps1
diff --git a/...ance/New-EntraDirectoryRoleDefinition.ps1 → ...ance/New-EntraDirectoryRoleDefinition.ps1 b/...ance/New-EntraDirectoryRoleDefinition.ps1 → ...ance/New-EntraDirectoryRoleDefinition.ps1
diff --git a/...e/Remove-EntraDirectoryRoleAssignment.ps1 → ...e/Remove-EntraDirectoryRoleAssignment.ps1 b/...e/Remove-EntraDirectoryRoleAssignment.ps1 → ...e/Remove-EntraDirectoryRoleAssignment.ps1
diff --git a/...e/Remove-EntraDirectoryRoleDefinition.ps1 → ...e/Remove-EntraDirectoryRoleDefinition.ps1 b/...e/Remove-EntraDirectoryRoleDefinition.ps1 → ...e/Remove-EntraDirectoryRoleDefinition.ps1
diff --git a/...ance/Set-EntraDirectoryRoleDefinition.ps1 → ...ance/Set-EntraDirectoryRoleDefinition.ps1 b/...ance/Set-EntraDirectoryRoleDefinition.ps1 → ...ance/Set-EntraDirectoryRoleDefinition.ps1
diff --git a/...aph.Entra/Groups/Add-EntraGroupMember.ps1 → ...oft.Entra/Groups/Add-EntraGroupMember.ps1 b/...aph.Entra/Groups/Add-EntraGroupMember.ps1 → ...oft.Entra/Groups/Add-EntraGroupMember.ps1
diff --git a/...raph.Entra/Groups/Add-EntraGroupOwner.ps1 → ...soft.Entra/Groups/Add-EntraGroupOwner.ps1 b/...raph.Entra/Groups/Add-EntraGroupOwner.ps1 → ...soft.Entra/Groups/Add-EntraGroupOwner.ps1
diff --git a/.../Groups/Add-EntraLifecyclePolicyGroup.ps1 → .../Groups/Add-EntraLifecyclePolicyGroup.ps1 b/.../Groups/Add-EntraLifecyclePolicyGroup.ps1 → .../Groups/Add-EntraLifecyclePolicyGroup.ps1
diff --git a/...tra/Groups/Enable-EntraAzureADAliases.ps1 → ...tra/Groups/Enable-EntraAzureADAliases.ps1 b/...tra/Groups/Enable-EntraAzureADAliases.ps1 → ...tra/Groups/Enable-EntraAzureADAliases.ps1
diff --git a/...ph.Entra/Groups/Get-EntraDeletedGroup.ps1 → ...ft.Entra/Groups/Get-EntraDeletedGroup.ps1 b/...ph.Entra/Groups/Get-EntraDeletedGroup.ps1 → ...ft.Entra/Groups/Get-EntraDeletedGroup.ps1
diff --git a/...oft.Graph.Entra/Groups/Get-EntraGroup.ps1 → ...Microsoft.Entra/Groups/Get-EntraGroup.ps1 b/...oft.Graph.Entra/Groups/Get-EntraGroup.ps1 → ...Microsoft.Entra/Groups/Get-EntraGroup.ps1
diff --git a/...roups/Get-EntraGroupAppRoleAssignment.ps1 → ...roups/Get-EntraGroupAppRoleAssignment.ps1 b/...roups/Get-EntraGroupAppRoleAssignment.ps1 → ...roups/Get-EntraGroupAppRoleAssignment.ps1
diff --git a/.../Groups/Get-EntraGroupLifecyclePolicy.ps1 → .../Groups/Get-EntraGroupLifecyclePolicy.ps1 b/.../Groups/Get-EntraGroupLifecyclePolicy.ps1 → .../Groups/Get-EntraGroupLifecyclePolicy.ps1
diff --git a/...aph.Entra/Groups/Get-EntraGroupMember.ps1 → ...oft.Entra/Groups/Get-EntraGroupMember.ps1 b/...aph.Entra/Groups/Get-EntraGroupMember.ps1 → ...oft.Entra/Groups/Get-EntraGroupMember.ps1
diff --git a/...raph.Entra/Groups/Get-EntraGroupOwner.ps1 → ...soft.Entra/Groups/Get-EntraGroupOwner.ps1 b/...raph.Entra/Groups/Get-EntraGroupOwner.ps1 → ...soft.Entra/Groups/Get-EntraGroupOwner.ps1
diff --git a/.../Groups/Get-EntraGroupPermissionGrant.ps1 → .../Groups/Get-EntraGroupPermissionGrant.ps1 b/.../Groups/Get-EntraGroupPermissionGrant.ps1 → .../Groups/Get-EntraGroupPermissionGrant.ps1
diff --git a/.../Groups/Get-EntraLifecyclePolicyGroup.ps1 → .../Groups/Get-EntraLifecyclePolicyGroup.ps1 b/.../Groups/Get-EntraLifecyclePolicyGroup.ps1 → .../Groups/Get-EntraLifecyclePolicyGroup.ps1
diff --git a/...h.Entra/Groups/Get-EntraObjectSetting.ps1 → ...t.Entra/Groups/Get-EntraObjectSetting.ps1 b/...h.Entra/Groups/Get-EntraObjectSetting.ps1 → ...t.Entra/Groups/Get-EntraObjectSetting.ps1
diff --git a/...ra/Groups/Get-EntraUnsupportedCommand.ps1 → ...ra/Groups/Get-EntraUnsupportedCommand.ps1 b/...ra/Groups/Get-EntraUnsupportedCommand.ps1 → ...ra/Groups/Get-EntraUnsupportedCommand.ps1
diff --git a/....Entra/SignIns/New-EntraCustomHeaders.ps1 → ...t.Entra/Groups/New-EntraCustomHeaders.ps1 b/....Entra/SignIns/New-EntraCustomHeaders.ps1 → ...t.Entra/Groups/New-EntraCustomHeaders.ps1
@@ -21,7 +21,7 @@ function New-EntraCustomHeaders {
     )
 
     $psVersion = $global:PSVersionTable.PSVersion
-    $entraVersion = (Get-Module Microsoft.Graph.Entra.SignIns | Select-Object version).Version.ToString()
+    $entraVersion = (Get-Module Microsoft.Entra.Groups | Select-Object version).Version.ToString()
     $userAgentHeaderValue = "PowerShell/$psVersion EntraPowershell/$entraVersion $Command"
     $customHeaders = New-Object 'system.collections.generic.dictionary[string,string]'
     $customHeaders["User-Agent"] = $userAgentHeaderValue

diff --git a/...oft.Graph.Entra/Groups/New-EntraGroup.ps1 → ...Microsoft.Entra/Groups/New-EntraGroup.ps1 b/...oft.Graph.Entra/Groups/New-EntraGroup.ps1 → ...Microsoft.Entra/Groups/New-EntraGroup.ps1
diff --git a/...roups/New-EntraGroupAppRoleAssignment.ps1 → ...roups/New-EntraGroupAppRoleAssignment.ps1 b/...roups/New-EntraGroupAppRoleAssignment.ps1 → ...roups/New-EntraGroupAppRoleAssignment.ps1
diff --git a/.../Groups/New-EntraGroupLifecyclePolicy.ps1 → .../Groups/New-EntraGroupLifecyclePolicy.ps1 b/.../Groups/New-EntraGroupLifecyclePolicy.ps1 → .../Groups/New-EntraGroupLifecyclePolicy.ps1
diff --git a/....Graph.Entra/Groups/Remove-EntraGroup.ps1 → ...rosoft.Entra/Groups/Remove-EntraGroup.ps1 b/....Graph.Entra/Groups/Remove-EntraGroup.ps1 → ...rosoft.Entra/Groups/Remove-EntraGroup.ps1
diff --git a/...ps/Remove-EntraGroupAppRoleAssignment.ps1 → ...ps/Remove-EntraGroupAppRoleAssignment.ps1 b/...ps/Remove-EntraGroupAppRoleAssignment.ps1 → ...ps/Remove-EntraGroupAppRoleAssignment.ps1
diff --git a/...oups/Remove-EntraGroupLifecyclePolicy.ps1 → ...oups/Remove-EntraGroupLifecyclePolicy.ps1 b/...oups/Remove-EntraGroupLifecyclePolicy.ps1 → ...oups/Remove-EntraGroupLifecyclePolicy.ps1
diff --git a/....Entra/Groups/Remove-EntraGroupMember.ps1 → ....Entra/Groups/Remove-EntraGroupMember.ps1 b/....Entra/Groups/Remove-EntraGroupMember.ps1 → ....Entra/Groups/Remove-EntraGroupMember.ps1
diff --git a/...h.Entra/Groups/Remove-EntraGroupOwner.ps1 → ...t.Entra/Groups/Remove-EntraGroupOwner.ps1 b/...h.Entra/Groups/Remove-EntraGroupOwner.ps1 → ...t.Entra/Groups/Remove-EntraGroupOwner.ps1
diff --git a/...oups/Remove-EntraLifecyclePolicyGroup.ps1 → ...oups/Remove-EntraLifecyclePolicyGroup.ps1 b/...oups/Remove-EntraLifecyclePolicyGroup.ps1 → ...oups/Remove-EntraLifecyclePolicyGroup.ps1
diff --git a/...ntra/Groups/Reset-EntraLifeCycleGroup.ps1 → ...ntra/Groups/Reset-EntraLifeCycleGroup.ps1 b/...ntra/Groups/Reset-EntraLifeCycleGroup.ps1 → ...ntra/Groups/Reset-EntraLifeCycleGroup.ps1
diff --git a/...Select-EntraGroupIdsContactIsMemberOf.ps1 → ...Select-EntraGroupIdsContactIsMemberOf.ps1 b/...Select-EntraGroupIdsContactIsMemberOf.ps1 → ...Select-EntraGroupIdsContactIsMemberOf.ps1
diff --git a/...s/Select-EntraGroupIdsGroupIsMemberOf.ps1 → ...s/Select-EntraGroupIdsGroupIsMemberOf.ps1 b/...s/Select-EntraGroupIdsGroupIsMemberOf.ps1 → ...s/Select-EntraGroupIdsGroupIsMemberOf.ps1
diff --git a/...ps/Select-EntraGroupIdsUserIsMemberOf.ps1 → ...ps/Select-EntraGroupIdsUserIsMemberOf.ps1 b/...ps/Select-EntraGroupIdsUserIsMemberOf.ps1 → ...ps/Select-EntraGroupIdsUserIsMemberOf.ps1
diff --git a/...oft.Graph.Entra/Groups/Set-EntraGroup.ps1 → ...Microsoft.Entra/Groups/Set-EntraGroup.ps1 b/...oft.Graph.Entra/Groups/Set-EntraGroup.ps1 → ...Microsoft.Entra/Groups/Set-EntraGroup.ps1
diff --git a/.../Groups/Set-EntraGroupLifecyclePolicy.ps1 → .../Groups/Set-EntraGroupLifecyclePolicy.ps1 b/.../Groups/Set-EntraGroupLifecyclePolicy.ps1 → .../Groups/Set-EntraGroupLifecyclePolicy.ps1
diff --git a/...ra/Reports/Enable-EntraAzureADAliases.ps1 → ...ra/Reports/Enable-EntraAzureADAliases.ps1 b/...ra/Reports/Enable-EntraAzureADAliases.ps1 → ...ra/Reports/Enable-EntraAzureADAliases.ps1
diff --git a/...ra/Reports/Get-EntraAuditDirectoryLog.ps1 → ...ra/Reports/Get-EntraAuditDirectoryLog.ps1 b/...ra/Reports/Get-EntraAuditDirectoryLog.ps1 → ...ra/Reports/Get-EntraAuditDirectoryLog.ps1
diff --git a/...Entra/Reports/Get-EntraAuditSignInLog.ps1 → ...Entra/Reports/Get-EntraAuditSignInLog.ps1 b/...Entra/Reports/Get-EntraAuditSignInLog.ps1 → ...Entra/Reports/Get-EntraAuditSignInLog.ps1
diff --git a/...a/Reports/Get-EntraUnsupportedCommand.ps1 → ...a/Reports/Get-EntraUnsupportedCommand.ps1 b/...a/Reports/Get-EntraUnsupportedCommand.ps1 → ...a/Reports/Get-EntraUnsupportedCommand.ps1
diff --git a/....Entra/Reports/New-EntraCustomHeaders.ps1 → ....Entra/Reports/New-EntraCustomHeaders.ps1 b/....Entra/Reports/New-EntraCustomHeaders.ps1 → ....Entra/Reports/New-EntraCustomHeaders.ps1
@@ -21,7 +21,7 @@ function New-EntraCustomHeaders {
     )
 
     $psVersion = $global:PSVersionTable.PSVersion
-    $entraVersion = (Get-Module Microsoft.Graph.Entra.Reports | Select-Object version).Version.ToString()
+    $entraVersion = (Get-Module Microsoft.Entra.Reports | Select-Object version).Version.ToString()
     $userAgentHeaderValue = "PowerShell/$psVersion EntraPowershell/$entraVersion $Command"
     $customHeaders = New-Object 'system.collections.generic.dictionary[string,string]'
     $customHeaders["User-Agent"] = $userAgentHeaderValue

diff --git a/...ra/SignIns/Enable-EntraAzureADAliases.ps1 → ...ra/SignIns/Enable-EntraAzureADAliases.ps1 b/...ra/SignIns/Enable-EntraAzureADAliases.ps1 → ...ra/SignIns/Enable-EntraAzureADAliases.ps1
diff --git a/.../SignIns/Get-EntraAuthorizationPolicy.ps1 → .../SignIns/Get-EntraAuthorizationPolicy.ps1 b/.../SignIns/Get-EntraAuthorizationPolicy.ps1 → .../SignIns/Get-EntraAuthorizationPolicy.ps1
diff --git a/...nIns/Get-EntraConditionalAccessPolicy.ps1 → ...nIns/Get-EntraConditionalAccessPolicy.ps1 b/...nIns/Get-EntraConditionalAccessPolicy.ps1 → ...nIns/Get-EntraConditionalAccessPolicy.ps1
diff --git a/...SignIns/Get-EntraFeatureRolloutPolicy.ps1 → ...SignIns/Get-EntraFeatureRolloutPolicy.ps1 b/...SignIns/Get-EntraFeatureRolloutPolicy.ps1 → ...SignIns/Get-EntraFeatureRolloutPolicy.ps1
diff --git a/...tra/SignIns/Get-EntraIdentityProvider.ps1 → ...tra/SignIns/Get-EntraIdentityProvider.ps1 b/...tra/SignIns/Get-EntraIdentityProvider.ps1 → ...tra/SignIns/Get-EntraIdentityProvider.ps1
diff --git a/.../SignIns/Get-EntraNamedLocationPolicy.ps1 → .../SignIns/Get-EntraNamedLocationPolicy.ps1 b/.../SignIns/Get-EntraNamedLocationPolicy.ps1 → .../SignIns/Get-EntraNamedLocationPolicy.ps1
diff --git a/...ignIns/Get-EntraOAuth2PermissionGrant.ps1 → ...ignIns/Get-EntraOAuth2PermissionGrant.ps1 b/...ignIns/Get-EntraOAuth2PermissionGrant.ps1 → ...ignIns/Get-EntraOAuth2PermissionGrant.ps1
diff --git a/.../Get-EntraPermissionGrantConditionSet.ps1 → .../Get-EntraPermissionGrantConditionSet.ps1 b/.../Get-EntraPermissionGrantConditionSet.ps1 → .../Get-EntraPermissionGrantConditionSet.ps1
diff --git a/...ignIns/Get-EntraPermissionGrantPolicy.ps1 → ...ignIns/Get-EntraPermissionGrantPolicy.ps1 b/...ignIns/Get-EntraPermissionGrantPolicy.ps1 → ...ignIns/Get-EntraPermissionGrantPolicy.ps1
diff --git a/...t.Graph.Entra/SignIns/Get-EntraPolicy.ps1 → ...crosoft.Entra/SignIns/Get-EntraPolicy.ps1 b/...t.Graph.Entra/SignIns/Get-EntraPolicy.ps1 → ...crosoft.Entra/SignIns/Get-EntraPolicy.ps1
diff --git a/.../Get-EntraTrustedCertificateAuthority.ps1 → .../Get-EntraTrustedCertificateAuthority.ps1 b/.../Get-EntraTrustedCertificateAuthority.ps1 → .../Get-EntraTrustedCertificateAuthority.ps1
diff --git a/...a/SignIns/Get-EntraUnsupportedCommand.ps1 → ...a/SignIns/Get-EntraUnsupportedCommand.ps1 b/...a/SignIns/Get-EntraUnsupportedCommand.ps1 → ...a/SignIns/Get-EntraUnsupportedCommand.ps1
diff --git a/...nIns/New-EntraConditionalAccessPolicy.ps1 → ...nIns/New-EntraConditionalAccessPolicy.ps1 b/...nIns/New-EntraConditionalAccessPolicy.ps1 → ...nIns/New-EntraConditionalAccessPolicy.ps1
diff --git a/module/Entra/Microsoft.Entra/SignIns/New-EntraCustomHeaders.ps1 b/module/Entra/Microsoft.Entra/SignIns/New-EntraCustomHeaders.ps1
@@ -0,0 +1,31 @@
+# ------------------------------------------------------------------------------ 
+#  Copyright (c) Microsoft Corporation.  All Rights Reserved.  
+#  Licensed under the MIT License.  See License in the project root for license information. 
+# ------------------------------------------------------------------------------ 
+function New-EntraCustomHeaders {
+    <#
+    .SYNOPSIS
+        Creates a custom header for use in telemetry.
+    .DESCRIPTION
+        The custom header created is a User-Agent with header value "<PowerShell version> EntraPowershell/<EntraPowershell version> <Entra PowerShell command>"
+    .PARAMETER Command
+        The command that is being executed.
+    .EXAMPLE
+        New-EntraCustomHeaders -Command Get-EntraUser
+    #>
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $true)]
+        [string]
+		$Command
+    )
+
+    $psVersion = $global:PSVersionTable.PSVersion
+    $entraVersion = (Get-Module Microsoft.Entra.SignIns | Select-Object version).Version.ToString()
+    $userAgentHeaderValue = "PowerShell/$psVersion EntraPowershell/$entraVersion $Command"
+    $customHeaders = New-Object 'system.collections.generic.dictionary[string,string]'
+    $customHeaders["User-Agent"] = $userAgentHeaderValue
+
+    $customHeaders
+}# ------------------------------------------------------------------------------
+
diff --git a/...SignIns/New-EntraFeatureRolloutPolicy.ps1 → ...SignIns/New-EntraFeatureRolloutPolicy.ps1 b/...SignIns/New-EntraFeatureRolloutPolicy.ps1 → ...SignIns/New-EntraFeatureRolloutPolicy.ps1
diff --git a/...tra/SignIns/New-EntraIdentityProvider.ps1 → ...tra/SignIns/New-EntraIdentityProvider.ps1 b/...tra/SignIns/New-EntraIdentityProvider.ps1 → ...tra/SignIns/New-EntraIdentityProvider.ps1
diff --git a/.../SignIns/New-EntraNamedLocationPolicy.ps1 → .../SignIns/New-EntraNamedLocationPolicy.ps1 b/.../SignIns/New-EntraNamedLocationPolicy.ps1 → .../SignIns/New-EntraNamedLocationPolicy.ps1
diff --git a/...ignIns/New-EntraOauth2PermissionGrant.ps1 → ...ignIns/New-EntraOauth2PermissionGrant.ps1 b/...ignIns/New-EntraOauth2PermissionGrant.ps1 → ...ignIns/New-EntraOauth2PermissionGrant.ps1
diff --git a/.../New-EntraPermissionGrantConditionSet.ps1 → .../New-EntraPermissionGrantConditionSet.ps1 b/.../New-EntraPermissionGrantConditionSet.ps1 → .../New-EntraPermissionGrantConditionSet.ps1
diff --git a/...ignIns/New-EntraPermissionGrantPolicy.ps1 → ...ignIns/New-EntraPermissionGrantPolicy.ps1 b/...ignIns/New-EntraPermissionGrantPolicy.ps1 → ...ignIns/New-EntraPermissionGrantPolicy.ps1
diff --git a/...t.Graph.Entra/SignIns/New-EntraPolicy.ps1 → ...crosoft.Entra/SignIns/New-EntraPolicy.ps1 b/...t.Graph.Entra/SignIns/New-EntraPolicy.ps1 → ...crosoft.Entra/SignIns/New-EntraPolicy.ps1
diff --git a/.../New-EntraTrustedCertificateAuthority.ps1 → .../New-EntraTrustedCertificateAuthority.ps1 b/.../New-EntraTrustedCertificateAuthority.ps1 → .../New-EntraTrustedCertificateAuthority.ps1
diff --git a/...s/Remove-EntraConditionalAccessPolicy.ps1 → ...s/Remove-EntraConditionalAccessPolicy.ps1 b/...s/Remove-EntraConditionalAccessPolicy.ps1 → ...s/Remove-EntraConditionalAccessPolicy.ps1
diff --git a/...nIns/Remove-EntraFeatureRolloutPolicy.ps1 → ...nIns/Remove-EntraFeatureRolloutPolicy.ps1 b/...nIns/Remove-EntraFeatureRolloutPolicy.ps1 → ...nIns/Remove-EntraFeatureRolloutPolicy.ps1
diff --git a/...raFeatureRolloutPolicyDirectoryObject.ps1 → ...raFeatureRolloutPolicyDirectoryObject.ps1 b/...raFeatureRolloutPolicyDirectoryObject.ps1 → ...raFeatureRolloutPolicyDirectoryObject.ps1
diff --git a/.../SignIns/Remove-EntraIdentityProvider.ps1 → .../SignIns/Remove-EntraIdentityProvider.ps1 b/.../SignIns/Remove-EntraIdentityProvider.ps1 → .../SignIns/Remove-EntraIdentityProvider.ps1
diff --git a/...gnIns/Remove-EntraNamedLocationPolicy.ps1 → ...gnIns/Remove-EntraNamedLocationPolicy.ps1 b/...gnIns/Remove-EntraNamedLocationPolicy.ps1 → ...gnIns/Remove-EntraNamedLocationPolicy.ps1
diff --git a/...Ins/Remove-EntraOAuth2PermissionGrant.ps1 → ...Ins/Remove-EntraOAuth2PermissionGrant.ps1 b/...Ins/Remove-EntraOAuth2PermissionGrant.ps1 → ...Ins/Remove-EntraOAuth2PermissionGrant.ps1
diff --git a/...move-EntraPermissionGrantConditionSet.ps1 → ...move-EntraPermissionGrantConditionSet.ps1 b/...move-EntraPermissionGrantConditionSet.ps1 → ...move-EntraPermissionGrantConditionSet.ps1
diff --git a/...Ins/Remove-EntraPermissionGrantPolicy.ps1 → ...Ins/Remove-EntraPermissionGrantPolicy.ps1 b/...Ins/Remove-EntraPermissionGrantPolicy.ps1 → ...Ins/Remove-EntraPermissionGrantPolicy.ps1
diff --git a/...raph.Entra/SignIns/Remove-EntraPolicy.ps1 → ...soft.Entra/SignIns/Remove-EntraPolicy.ps1 b/...raph.Entra/SignIns/Remove-EntraPolicy.ps1 → ...soft.Entra/SignIns/Remove-EntraPolicy.ps1
diff --git a/...move-EntraTrustedCertificateAuthority.ps1 → ...move-EntraTrustedCertificateAuthority.ps1 b/...move-EntraTrustedCertificateAuthority.ps1 → ...move-EntraTrustedCertificateAuthority.ps1
diff --git a/.../SignIns/Set-EntraAuthorizationPolicy.ps1 → .../SignIns/Set-EntraAuthorizationPolicy.ps1 b/.../SignIns/Set-EntraAuthorizationPolicy.ps1 → .../SignIns/Set-EntraAuthorizationPolicy.ps1
diff --git a/...nIns/Set-EntraConditionalAccessPolicy.ps1 → ...nIns/Set-EntraConditionalAccessPolicy.ps1 b/...nIns/Set-EntraConditionalAccessPolicy.ps1 → ...nIns/Set-EntraConditionalAccessPolicy.ps1
diff --git a/...SignIns/Set-EntraFeatureRolloutPolicy.ps1 → ...SignIns/Set-EntraFeatureRolloutPolicy.ps1 b/...SignIns/Set-EntraFeatureRolloutPolicy.ps1 → ...SignIns/Set-EntraFeatureRolloutPolicy.ps1
diff --git a/...tra/SignIns/Set-EntraIdentityProvider.ps1 → ...tra/SignIns/Set-EntraIdentityProvider.ps1 b/...tra/SignIns/Set-EntraIdentityProvider.ps1 → ...tra/SignIns/Set-EntraIdentityProvider.ps1
diff --git a/.../SignIns/Set-EntraNamedLocationPolicy.ps1 → .../SignIns/Set-EntraNamedLocationPolicy.ps1 b/.../SignIns/Set-EntraNamedLocationPolicy.ps1 → .../SignIns/Set-EntraNamedLocationPolicy.ps1
diff --git a/.../Set-EntraPermissionGrantConditionSet.ps1 → .../Set-EntraPermissionGrantConditionSet.ps1 b/.../Set-EntraPermissionGrantConditionSet.ps1 → .../Set-EntraPermissionGrantConditionSet.ps1
diff --git a/...ignIns/Set-EntraPermissionGrantPolicy.ps1 → ...ignIns/Set-EntraPermissionGrantPolicy.ps1 b/...ignIns/Set-EntraPermissionGrantPolicy.ps1 → ...ignIns/Set-EntraPermissionGrantPolicy.ps1
diff --git a/...t.Graph.Entra/SignIns/Set-EntraPolicy.ps1 → ...crosoft.Entra/SignIns/Set-EntraPolicy.ps1 b/...t.Graph.Entra/SignIns/Set-EntraPolicy.ps1 → ...crosoft.Entra/SignIns/Set-EntraPolicy.ps1
diff --git a/.../Set-EntraTrustedCertificateAuthority.ps1 → .../Set-EntraTrustedCertificateAuthority.ps1 b/.../Set-EntraTrustedCertificateAuthority.ps1 → .../Set-EntraTrustedCertificateAuthority.ps1
diff --git a/...icrosoft.Graph.Entra/UnMappedAliases.psd1 → ...ntra/Microsoft.Entra/UnMappedAliases.psd1 b/...icrosoft.Graph.Entra/UnMappedAliases.psd1 → ...ntra/Microsoft.Entra/UnMappedAliases.psd1
diff --git a/...ntra/Users/Enable-EntraAzureADAliases.ps1 → ...ntra/Users/Enable-EntraAzureADAliases.ps1 b/...ntra/Users/Enable-EntraAzureADAliases.ps1 → ...ntra/Users/Enable-EntraAzureADAliases.ps1
diff --git a/...tra/Users/Get-EntraUnsupportedCommand.ps1 → ...tra/Users/Get-EntraUnsupportedCommand.ps1 b/...tra/Users/Get-EntraUnsupportedCommand.ps1 → ...tra/Users/Get-EntraUnsupportedCommand.ps1
diff --git a/...osoft.Graph.Entra/Users/Get-EntraUser.ps1 → ...a/Microsoft.Entra/Users/Get-EntraUser.ps1 b/...osoft.Graph.Entra/Users/Get-EntraUser.ps1 → ...a/Microsoft.Entra/Users/Get-EntraUser.ps1
diff --git a/.../Users/Get-EntraUserAppRoleAssignment.ps1 → .../Users/Get-EntraUserAppRoleAssignment.ps1 b/.../Users/Get-EntraUserAppRoleAssignment.ps1 → .../Users/Get-EntraUserAppRoleAssignment.ps1
diff --git a/...ntra/Users/Get-EntraUserCreatedObject.ps1 → ...ntra/Users/Get-EntraUserCreatedObject.ps1 b/...ntra/Users/Get-EntraUserCreatedObject.ps1 → ...ntra/Users/Get-EntraUserCreatedObject.ps1
diff --git a/...Entra/Users/Get-EntraUserDirectReport.ps1 → ...Entra/Users/Get-EntraUserDirectReport.ps1 b/...Entra/Users/Get-EntraUserDirectReport.ps1 → ...Entra/Users/Get-EntraUserDirectReport.ps1
diff --git a/...ph.Entra/Users/Get-EntraUserExtension.ps1 → ...ft.Entra/Users/Get-EntraUserExtension.ps1 b/...ph.Entra/Users/Get-EntraUserExtension.ps1 → ...ft.Entra/Users/Get-EntraUserExtension.ps1
diff --git a/...ntra/Users/Get-EntraUserLicenseDetail.ps1 → ...ntra/Users/Get-EntraUserLicenseDetail.ps1 b/...ntra/Users/Get-EntraUserLicenseDetail.ps1 → ...ntra/Users/Get-EntraUserLicenseDetail.ps1
diff --git a/...raph.Entra/Users/Get-EntraUserManager.ps1 → ...soft.Entra/Users/Get-EntraUserManager.ps1 b/...raph.Entra/Users/Get-EntraUserManager.ps1 → ...soft.Entra/Users/Get-EntraUserManager.ps1
diff --git a/...h.Entra/Users/Get-EntraUserMembership.ps1 → ...t.Entra/Users/Get-EntraUserMembership.ps1 b/...h.Entra/Users/Get-EntraUserMembership.ps1 → ...t.Entra/Users/Get-EntraUserMembership.ps1
diff --git a/...rs/Get-EntraUserOAuth2PermissionGrant.ps1 → ...rs/Get-EntraUserOAuth2PermissionGrant.ps1 b/...rs/Get-EntraUserOAuth2PermissionGrant.ps1 → ...rs/Get-EntraUserOAuth2PermissionGrant.ps1
diff --git a/....Entra/Users/Get-EntraUserOwnedDevice.ps1 → ....Entra/Users/Get-EntraUserOwnedDevice.ps1 b/....Entra/Users/Get-EntraUserOwnedDevice.ps1 → ....Entra/Users/Get-EntraUserOwnedDevice.ps1
diff --git a/....Entra/Users/Get-EntraUserOwnedObject.ps1 → ....Entra/Users/Get-EntraUserOwnedObject.ps1 b/....Entra/Users/Get-EntraUserOwnedObject.ps1 → ....Entra/Users/Get-EntraUserOwnedObject.ps1
diff --git a/...a/Users/Get-EntraUserRegisteredDevice.ps1 → ...a/Users/Get-EntraUserRegisteredDevice.ps1 b/...a/Users/Get-EntraUserRegisteredDevice.ps1 → ...a/Users/Get-EntraUserRegisteredDevice.ps1
diff --git a/...tra/Users/Get-EntraUserThumbnailPhoto.ps1 → ...tra/Users/Get-EntraUserThumbnailPhoto.ps1 b/...tra/Users/Get-EntraUserThumbnailPhoto.ps1 → ...tra/Users/Get-EntraUserThumbnailPhoto.ps1
diff --git a/module/Entra/Microsoft.Entra/Users/New-EntraCustomHeaders.ps1 b/module/Entra/Microsoft.Entra/Users/New-EntraCustomHeaders.ps1
@@ -0,0 +1,31 @@
+# ------------------------------------------------------------------------------ 
+#  Copyright (c) Microsoft Corporation.  All Rights Reserved.  
+#  Licensed under the MIT License.  See License in the project root for license information. 
+# ------------------------------------------------------------------------------ 
+function New-EntraCustomHeaders {
+    <#
+    .SYNOPSIS
+        Creates a custom header for use in telemetry.
+    .DESCRIPTION
+        The custom header created is a User-Agent with header value "<PowerShell version> EntraPowershell/<EntraPowershell version> <Entra PowerShell command>"
+    .PARAMETER Command
+        The command that is being executed.
+    .EXAMPLE
+        New-EntraCustomHeaders -Command Get-EntraUser
+    #>
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $true)]
+        [string]
+		$Command
+    )
+
+    $psVersion = $global:PSVersionTable.PSVersion
+    $entraVersion = (Get-Module Microsoft.Entra.Users | Select-Object version).Version.ToString()
+    $userAgentHeaderValue = "PowerShell/$psVersion EntraPowershell/$entraVersion $Command"
+    $customHeaders = New-Object 'system.collections.generic.dictionary[string,string]'
+    $customHeaders["User-Agent"] = $userAgentHeaderValue
+
+    $customHeaders
+}# ------------------------------------------------------------------------------
+
diff --git a/...osoft.Graph.Entra/Users/New-EntraUser.ps1 → ...a/Microsoft.Entra/Users/New-EntraUser.ps1 b/...osoft.Graph.Entra/Users/New-EntraUser.ps1 → ...a/Microsoft.Entra/Users/New-EntraUser.ps1
diff --git a/.../Users/New-EntraUserAppRoleAssignment.ps1 → .../Users/New-EntraUserAppRoleAssignment.ps1 b/.../Users/New-EntraUserAppRoleAssignment.ps1 → .../Users/New-EntraUserAppRoleAssignment.ps1
diff --git a/...ft.Graph.Entra/Users/Remove-EntraUser.ps1 → ...icrosoft.Entra/Users/Remove-EntraUser.ps1 b/...ft.Graph.Entra/Users/Remove-EntraUser.ps1 → ...icrosoft.Entra/Users/Remove-EntraUser.ps1
diff --git a/...ers/Remove-EntraUserAppRoleAssignment.ps1 → ...ers/Remove-EntraUserAppRoleAssignment.ps1 b/...ers/Remove-EntraUserAppRoleAssignment.ps1 → ...ers/Remove-EntraUserAppRoleAssignment.ps1
diff --git a/...Entra/Users/Remove-EntraUserExtension.ps1 → ...Entra/Users/Remove-EntraUserExtension.ps1 b/...Entra/Users/Remove-EntraUserExtension.ps1 → ...Entra/Users/Remove-EntraUserExtension.ps1
diff --git a/...h.Entra/Users/Remove-EntraUserManager.ps1 → ...t.Entra/Users/Remove-EntraUserManager.ps1 b/...h.Entra/Users/Remove-EntraUserManager.ps1 → ...t.Entra/Users/Remove-EntraUserManager.ps1
diff --git a/...osoft.Graph.Entra/Users/Set-EntraUser.ps1 → ...a/Microsoft.Entra/Users/Set-EntraUser.ps1 b/...osoft.Graph.Entra/Users/Set-EntraUser.ps1 → ...a/Microsoft.Entra/Users/Set-EntraUser.ps1
diff --git a/...ph.Entra/Users/Set-EntraUserExtension.ps1 → ...ft.Entra/Users/Set-EntraUserExtension.ps1 b/...ph.Entra/Users/Set-EntraUserExtension.ps1 → ...ft.Entra/Users/Set-EntraUserExtension.ps1
diff --git a/...raph.Entra/Users/Set-EntraUserLicense.ps1 → ...soft.Entra/Users/Set-EntraUserLicense.ps1 b/...raph.Entra/Users/Set-EntraUserLicense.ps1 → ...soft.Entra/Users/Set-EntraUserLicense.ps1
diff --git a/...raph.Entra/Users/Set-EntraUserManager.ps1 → ...soft.Entra/Users/Set-EntraUserManager.ps1 b/...raph.Entra/Users/Set-EntraUserManager.ps1 → ...soft.Entra/Users/Set-EntraUserManager.ps1
diff --git a/...aph.Entra/Users/Set-EntraUserPassword.ps1 → ...oft.Entra/Users/Set-EntraUserPassword.ps1 b/...aph.Entra/Users/Set-EntraUserPassword.ps1 → ...oft.Entra/Users/Set-EntraUserPassword.ps1
diff --git a/...tra/Users/Set-EntraUserThumbnailPhoto.ps1 → ...tra/Users/Set-EntraUserThumbnailPhoto.ps1 b/...tra/Users/Set-EntraUserThumbnailPhoto.ps1 → ...tra/Users/Set-EntraUserThumbnailPhoto.ps1
diff --git a/...sers/Update-EntraSignedInUserPassword.ps1 → ...sers/Update-EntraSignedInUserPassword.ps1 b/...sers/Update-EntraSignedInUserPassword.ps1 → ...sers/Update-EntraSignedInUserPassword.ps1
diff --git a/...a/Users/Update-EntraUserFromFederated.ps1 → ...a/Users/Update-EntraUserFromFederated.ps1 b/...a/Users/Update-EntraUserFromFederated.ps1 → ...a/Users/Update-EntraUserFromFederated.ps1