diff --git a/teams/teams-ps/teams/Get-CsSharedCallQueueHistoryTemplate.md b/teams/teams-ps/teams/Get-CsSharedCallQueueHistoryTemplate.md
index b4f72a53e4..eed80beb3f 100644
--- a/teams/teams-ps/teams/Get-CsSharedCallQueueHistoryTemplate.md
+++ b/teams/teams-ps/teams/Get-CsSharedCallQueueHistoryTemplate.md
@@ -10,7 +10,7 @@ ms.author: tomkau
 ms.reviewer: williamlooney
 ---
 
-# Get-SharedCallQueueHistoryTemplate
+# Get-CsSharedCallQueueHistoryTemplate
 
 ## SYNTAX
 
diff --git a/teams/teams-ps/teams/New-CsCallQueue.md b/teams/teams-ps/teams/New-CsCallQueue.md
index 352f7481f5..003cdb37c1 100644
--- a/teams/teams-ps/teams/New-CsCallQueue.md
+++ b/teams/teams-ps/teams/New-CsCallQueue.md
@@ -1294,7 +1294,8 @@ Accept wildcard characters: False
 ```
 
 ### -ShiftsTeamId
-_Voice applications private preview customers only_
+_Voice applications private preview customers only._
+
 _Saving a call queue configuration through Teams admin center will *remove* this setting._
 
 Id of the Team containing the Scheduling Group to connect a call queue to.
@@ -1313,7 +1314,8 @@ Accept wildcard characters: False
 ```
 
 ### -ShiftsSchedulingGroupId
-_Voice applications private preview customers only_
+_Voice applications private preview customers only._
+
 _Saving a call queue configuration through Teams admin center will *remove* this setting._
 
 Id of the Scheduling Group to connect a call queue to.
@@ -1542,6 +1544,9 @@ Accept wildcard characters: False
 ```
 
 ### -ComplianceRecordingForCallQueueTemplateId
+_Voice applications private preview customers only._
+
+_Saving a call queue configuration through Teams admin center will *remove* this setting._
 
 The ComplianceRecordingForCallQueueTemplateId parameter indicates a list of up to 2 Compliance Recording for Call Queue templates to apply to the call queue.
 
@@ -1558,6 +1563,9 @@ Accept wildcard characters: False
 ```
 
 ### -TextAnnouncementForCR
+_Voice applications private preview customers only._
+
+_Saving a call queue configuration through Teams admin center will *remove* this setting._
 
 The TextAnnouncementForCR parameter indicates the custom Text-to-Speech (TTS) prompt which is played to callers when compliance recording for call queues is enabled.
 
@@ -1575,6 +1583,9 @@ Accept wildcard characters: False
 ```
 
 ### -CustomAudioFileAnnouncementForCR
+_Voice applications private preview customers only._
+
+_Saving a call queue configuration through Teams admin center will *remove* this setting._
 
 The CustomAudioFileAnnouncementForCR parameter indicates the unique identifier for the Audio file prompt which is played to callers when compliance recording for call queues is enabled.
 
@@ -1592,6 +1603,9 @@ Accept wildcard characters: False
 ```
 
 ### -TextAnnouncementForCRFailure
+_Voice applications private preview customers only._
+
+_Saving a call queue configuration through Teams admin center will *remove* this setting._
 
 The TextAnnouncementForCRFailure parameter indicates the custom Text-to-Speech (TTS) prompt which is played to callers if the compliance recording for call queue bot is unable to join or drops from the call.
 
@@ -1609,6 +1623,9 @@ Accept wildcard characters: False
 ```
 
 ### -CustomAudioFileAnnouncementForCRFailure
+_Voice applications private preview customers only._
+
+_Saving a call queue configuration through Teams admin center will *remove* this setting._
 
 The CustomAudioFileAnnouncementForCRFailure parameter indicates the unique identifier for the Audio file prompt which is played to callers  if the compliance recording for call queue bot is unable to join or drops from the call.
 
@@ -1626,6 +1643,9 @@ Accept wildcard characters: False
 ```
 
 ### -SharedCallQueueHistoryTemplateId
+_Voice applications private preview customers only._
+
+_Saving a call queue configuration through Teams admin center will *remove* this setting._
 
 The SharedCallQueueHistoryTemplateId parameter indicates the Shared Call Queue History template to apply to the call queue.
 
diff --git a/teams/teams-ps/teams/New-CsSharedCallQueueHistoryTemplate.md b/teams/teams-ps/teams/New-CsSharedCallQueueHistoryTemplate.md
index 18ce112829..f71b11582d 100644
--- a/teams/teams-ps/teams/New-CsSharedCallQueueHistoryTemplate.md
+++ b/teams/teams-ps/teams/New-CsSharedCallQueueHistoryTemplate.md
@@ -10,12 +10,12 @@ ms.author: tomkau
 ms.reviewer: williamlooney
 ---
 
-# New-SharedCallQueueHistoryTemplate
+# New-CsSharedCallQueueHistoryTemplate
 
 ## SYNTAX
 
 ```powershell
-New-SharedCallQueueHistoryTemplate -Name <String> -Description <String> [-IncomingMissedCalls <Object>] [-AnsweredAndOutboundCalls <Object>] [<CommonParameters>]
+New-CsSharedCallQueueHistoryTemplate -Name <String> -Description <String> [-IncomingMissedCalls <Object>] [-AnsweredAndOutboundCalls <Object>] [<CommonParameters>]
 ``` 
 
 ## DESCRIPTION
diff --git a/teams/teams-ps/teams/Set-CsCallQueue.md b/teams/teams-ps/teams/Set-CsCallQueue.md
index 7c591733a9..8f93fc3973 100644
--- a/teams/teams-ps/teams/Set-CsCallQueue.md
+++ b/teams/teams-ps/teams/Set-CsCallQueue.md
@@ -19,7 +19,7 @@ Updates a Call Queue in your Skype for Business Online or Teams organization.
 ## SYNTAX
 
 ```
-Set-CsCallQueue -Identity <Guid> [-AgentAlertTime <Int16>] [-AllowOptOut <Boolean>] [-ChannelId <Guid>] [-ChannelUserObjectId <Guid>] [-ShiftsTeamId <String>] [-ShiftsSchedulingGroupId <String>] [-DistributionLists <List>] [-MusicOnHoldAudioFileId <Guid>] [-Name <String>] [-OboResourceAccountIds <List>] [-OverflowAction <Object>] [-OverflowActionTarget <Guid>] [-OverflowActionCallPriority <Int16>] [-OverflowThreshold <Int16>] [-RoutingMethod <Object>] [-TimeoutAction <Object>] [-Tenant <Guid>] [-TimeoutActionTarget <Guid>] [-TimeoutActionCallPriority <Int16>] [-TimeoutThreshold <Int16>] [-NoAgentApplyTo <String>] [-NoAgentAction <Object>] [-NoAgentActionTarget <Guid>] [-NoAgentActionCallPriority <Int16>] [-UseDefaultMusicOnHold <Boolean>] [-WelcomeMusicAudioFileId <Guid>] [-PresenceBasedRouting <Boolean>] [-ConferenceMode <Boolean>] [-Users <List>] [-LanguageId <String>] [-LineUri <String>] [-OverflowDisconnectTextToSpeechPrompt <String>][-OverflowDisconnectAudioFilePrompt <Guid>] [-OverflowRedirectPersonTextToSpeechPrompt <String>] [-OverflowRedirectPersonAudioFilePrompt <Guid>] [-OverflowRedirectVoiceAppTextToSpeechPrompt <String>] [-OverflowRedirectVoiceAppAudioFilePrompt <Guid>] [-OverflowRedirectPhoneNumberTextToSpeechPrompt <String>] [-OverflowRedirectPhoneNumberAudioFilePrompt <Guid>] [-OverflowRedirectVoicemailTextToSpeechPrompt <String>] [-OverflowRedirectVoicemailAudioFilePrompt <Guid>] [-OverflowSharedVoicemailTextToSpeechPrompt <String>] [-OverflowSharedVoicemailAudioFilePrompt <Guid>] [-EnableOverflowSharedVoicemailTranscription <Boolean>] [-EnableOverflowSharedVoicemailSystemPromptSuppression <Boolean>] [-TimeoutDisconnectTextToSpeechPrompt <String>][-TimeoutDisconnectAudioFilePrompt <Guid>] [-TimeoutRedirectPersonTextToSpeechPrompt <String>] [-TimeoutRedirectPersonAudioFilePrompt <Guid>] [-TimeoutRedirectVoiceAppTextToSpeechPrompt <String>] [-TimeoutRedirectVoiceAppAudioFilePrompt <Guid>] [-TimeoutRedirectPhoneNumberTextToSpeechPrompt <String>][-TimeoutRedirectPhoneNumberAudioFilePrompt <Guid>] [-TimeoutRedirectVoicemailTextToSpeechPrompt <String>] [-TimeoutRedirectVoicemailAudioFilePrompt <Guid>] [-TimeoutSharedVoicemailTextToSpeechPrompt <String>] [-TimeoutSharedVoicemailAudioFilePrompt <Guid>] [-TimeoutSharedVoicemailTextToSpeechPrompt <String>] [-TimeoutSharedVoicemailAudioFilePrompt <Guid>] [-EnableTimeoutSharedVoicemailTranscription <Boolean>] [-EnableTimeoutSharedVoicemailSystemPromptSuppression <Boolean>] [-NoAgentDisconnectTextToSpeechPrompt <String>][-NoAgentDisconnectAudioFilePrompt <Guid>] [-NoAgentRedirectPersonTextToSpeechPrompt <String>] [-NoAgentRedirectPersonAudioFilePrompt <Guid>] [-NoAgentRedirectVoiceAppTextToSpeechPrompt <String>] [-NoAgentRedirectVoiceAppAudioFilePrompt <Guid>] [-NoAgentRedirectPhoneNumberTextToSpeechPrompt <String>] [-NoAgentRedirectPhoneNumberAudioFilePrompt <Guid>] [-NoAgentRedirectVoicemailTextToSpeechPrompt <String>] [-NoAgentRedirectVoicemailAudioFilePrompt <Guid>] [-NoAgentSharedVoicemailTextToSpeechPrompt <String>] [-NoAgentSharedVoicemailAudioFilePrompt <Guid>] [-EnableNoAgentSharedVoicemailTranscription <Boolean>] [-EnableNoAgentSharedVoicemailSystemPromptSuppression <Boolean>] [AuthorizedUsers <List>] [-HideAuthorizedUsers <List>] [-WelcomeTextToSpeechPrompt <String>] [-IsCallbackEnabled <Boolean>] [-CallbackRequestDtmf <String>] [-WaitTimeBeforeOfferingCallbackInSecond <Int16>] [-NumberOfCallsInQueueBeforeOfferingCallback <Int16>] [-CallToAgentRatioThresholdBeforeOfferingCallback <Int16>] [-CallbackOfferAudioFilePromptResourceId <Guid>] [-CallbackOfferTextToSpeechPrompt <String>] [-CallbackEmailNotificationTarget <Guid>] [-ServiceLevelThresholdResponseTimeInSecond [Int16> ] [-ComplianceRecordingForCallQueueTemplateId <List>] [-TextAnnouncementForCR <String>] [-CustomAudioFileAnnouncementForCR <Guid>] [-TextAnnouncementForCRFailure <String>] [-CustomAudioFileAnnouncementForCRFailure <Guid>] [-ShouldOverwriteCallableChannelProperty <Boolean>] [-SharedCallQueueHistoryTemplateId <Guid>] [<CommonParameters>]
+Set-CsCallQueue -Identity <Guid> [-AgentAlertTime <Int16>] [-AllowOptOut <Boolean>] [-ChannelId <Guid>] [-ChannelUserObjectId <Guid>] [-ShiftsTeamId <String>] [-ShiftsSchedulingGroupId <String>] [-DistributionLists <List>] [-MusicOnHoldAudioFileId <Guid>] [-Name <String>] [-OboResourceAccountIds <List>] [-OverflowAction <Object>] [-OverflowActionTarget <Guid>] [-OverflowActionCallPriority <Int16>] [-OverflowThreshold <Int16>] [-RoutingMethod <Object>] [-TimeoutAction <Object>] [-Tenant <Guid>] [-TimeoutActionTarget <Guid>] [-TimeoutActionCallPriority <Int16>] [-TimeoutThreshold <Int16>] [-NoAgentApplyTo <String>] [-NoAgentAction <Object>] [-NoAgentActionTarget <Guid>] [-NoAgentActionCallPriority <Int16>] [-UseDefaultMusicOnHold <Boolean>] [-WelcomeMusicAudioFileId <Guid>] [-PresenceBasedRouting <Boolean>] [-ConferenceMode <Boolean>] [-Users <List>] [-LanguageId <String>] [-LineUri <String>] [-OverflowDisconnectTextToSpeechPrompt <String>][-OverflowDisconnectAudioFilePrompt <Guid>] [-OverflowRedirectPersonTextToSpeechPrompt <String>] [-OverflowRedirectPersonAudioFilePrompt <Guid>] [-OverflowRedirectVoiceAppTextToSpeechPrompt <String>] [-OverflowRedirectVoiceAppAudioFilePrompt <Guid>] [-OverflowRedirectPhoneNumberTextToSpeechPrompt <String>] [-OverflowRedirectPhoneNumberAudioFilePrompt <Guid>] [-OverflowRedirectVoicemailTextToSpeechPrompt <String>] [-OverflowRedirectVoicemailAudioFilePrompt <Guid>] [-OverflowSharedVoicemailTextToSpeechPrompt <String>] [-OverflowSharedVoicemailAudioFilePrompt <Guid>] [-EnableOverflowSharedVoicemailTranscription <Boolean>] [-EnableOverflowSharedVoicemailSystemPromptSuppression <Boolean>] [-TimeoutDisconnectTextToSpeechPrompt <String>][-TimeoutDisconnectAudioFilePrompt <Guid>] [-TimeoutRedirectPersonTextToSpeechPrompt <String>] [-TimeoutRedirectPersonAudioFilePrompt <Guid>] [-TimeoutRedirectVoiceAppTextToSpeechPrompt <String>] [-TimeoutRedirectVoiceAppAudioFilePrompt <Guid>] [-TimeoutRedirectPhoneNumberTextToSpeechPrompt <String>][-TimeoutRedirectPhoneNumberAudioFilePrompt <Guid>] [-TimeoutRedirectVoicemailTextToSpeechPrompt <String>] [-TimeoutRedirectVoicemailAudioFilePrompt <Guid>] [-TimeoutSharedVoicemailTextToSpeechPrompt <String>] [-TimeoutSharedVoicemailAudioFilePrompt <Guid>] [-TimeoutSharedVoicemailTextToSpeechPrompt <String>] [-TimeoutSharedVoicemailAudioFilePrompt <Guid>] [-EnableTimeoutSharedVoicemailTranscription <Boolean>] [-EnableTimeoutSharedVoicemailSystemPromptSuppression <Boolean>] [-NoAgentDisconnectTextToSpeechPrompt <String>][-NoAgentDisconnectAudioFilePrompt <Guid>] [-NoAgentRedirectPersonTextToSpeechPrompt <String>] [-NoAgentRedirectPersonAudioFilePrompt <Guid>] [-NoAgentRedirectVoiceAppTextToSpeechPrompt <String>] [-NoAgentRedirectVoiceAppAudioFilePrompt <Guid>] [-NoAgentRedirectPhoneNumberTextToSpeechPrompt <String>] [-NoAgentRedirectPhoneNumberAudioFilePrompt <Guid>] [-NoAgentRedirectVoicemailTextToSpeechPrompt <String>] [-NoAgentRedirectVoicemailAudioFilePrompt <Guid>] [-NoAgentSharedVoicemailTextToSpeechPrompt <String>] [-NoAgentSharedVoicemailAudioFilePrompt <Guid>] [-EnableNoAgentSharedVoicemailTranscription <Boolean>] [-EnableNoAgentSharedVoicemailSystemPromptSuppression <Boolean>] [AuthorizedUsers <List>] [-HideAuthorizedUsers <List>] [-WelcomeTextToSpeechPrompt <String>] [-IsCallbackEnabled <Boolean>] [-CallbackRequestDtmf <String>] [-WaitTimeBeforeOfferingCallbackInSecond <Int16>] [-NumberOfCallsInQueueBeforeOfferingCallback <Int16>] [-CallToAgentRatioThresholdBeforeOfferingCallback <Int16>] [-CallbackOfferAudioFilePromptResourceId <Guid>] [-CallbackOfferTextToSpeechPrompt <String>] [-CallbackEmailNotificationTarget <Guid>] [-ServiceLevelThresholdResponseTimeInSecond [Int16> ] [-ComplianceRecordingForCallQueueTemplateId <List>] [-TextAnnouncementForCR <String>] [-CustomAudioFileAnnouncementForCR <Guid>] [-TextAnnouncementForCRFailure <String>] [-CustomAudioFileAnnouncementForCRFailure <Guid>] [-ShouldOverwriteCallableChannelProperty <Boolean>] [-SharedCallQueueHistoryTemplateId <String>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -1314,7 +1314,8 @@ Accept wildcard characters: False
 ```
 
 ### -ShiftsTeamId
-_Voice applications private preview customers only_
+_Voice applications private preview customers only._
+
 _Saving a call queue configuration through Teams admin center will *remove* this setting._
 
 Id of the Team containing the Scheduling Group to connect a call queue to.
@@ -1333,7 +1334,8 @@ Accept wildcard characters: False
 ```
 
 ### -ShiftsSchedulingGroupId
-_Voice applications private preview customers only_
+_Voice applications private preview customers only._
+
 _Saving a call queue configuration through Teams admin center will *remove* this setting._
 
 Id of the Scheduling Group to connect a call queue to.
@@ -1562,6 +1564,9 @@ Accept wildcard characters: False
 ```
 
 ### -ComplianceRecordingForCallQueueTemplateId
+_Voice applications private preview customers only._
+
+_Saving a call queue configuration through Teams admin center will *remove* this setting._
 
 The ComplianceRecordingForCallQueueTemplateId parameter indicates a list of up to 2 Compliance Recording for Call Queue templates to apply to the call queue.
 
@@ -1578,6 +1583,9 @@ Accept wildcard characters: False
 ```
 
 ### -TextAnnouncementForCR
+_Voice applications private preview customers only._
+
+_Saving a call queue configuration through Teams admin center will *remove* this setting._
 
 The TextAnnouncementForCR parameter indicates the custom Text-to-Speech (TTS) prompt which is played to callers when compliance recording for call queues is enabled.
 
@@ -1595,6 +1603,9 @@ Accept wildcard characters: False
 ```
 
 ### -CustomAudioFileAnnouncementForCR
+_Voice applications private preview customers only._
+
+_Saving a call queue configuration through Teams admin center will *remove* this setting._
 
 The CustomAudioFileAnnouncementForCR parameter indicates the unique identifier for the Audio file prompt which is played to callers when compliance recording for call queues is enabled.
 
@@ -1612,6 +1623,9 @@ Accept wildcard characters: False
 ```
 
 ### -TextAnnouncementForCRFailure
+_Voice applications private preview customers only._
+
+_Saving a call queue configuration through Teams admin center will *remove* this setting._
 
 The TextAnnouncementForCRFailure parameter indicates the custom Text-to-Speech (TTS) prompt which is played to callers if the compliance recording for call queue bot is unable to join or drops from the call.
 
@@ -1629,6 +1643,9 @@ Accept wildcard characters: False
 ```
 
 ### -CustomAudioFileAnnouncementForCRFailure
+_Voice applications private preview customers only._
+
+_Saving a call queue configuration through Teams admin center will *remove* this setting._
 
 The CustomAudioFileAnnouncementForCRFailure parameter indicates the unique identifier for the Audio file prompt which is played to callers  if the compliance recording for call queue bot is unable to join or drops from the call.
 
@@ -1646,6 +1663,9 @@ Accept wildcard characters: False
 ```
 
 ### -SharedCallQueueHistoryTemplateId
+_Voice applications private preview customers only._
+
+_Saving a call queue configuration through Teams admin center will *remove* this setting._
 
 The SharedCallQueueHistoryTemplateId parameter indicates the Shared Call Queue History template to apply to the call queue.
 
diff --git a/teams/teams-ps/teams/Set-CsSharedCallQueueHistoryTemplate.md b/teams/teams-ps/teams/Set-CsSharedCallQueueHistoryTemplate.md
index 92fa9e190d..5cd82bcea2 100644
--- a/teams/teams-ps/teams/Set-CsSharedCallQueueHistoryTemplate.md
+++ b/teams/teams-ps/teams/Set-CsSharedCallQueueHistoryTemplate.md
@@ -10,7 +10,7 @@ ms.author: tomkau
 ms.reviewer: williamlooney
 ---
 
-# Set-SharedCallQueueHistoryTemplate
+# Set-CsSharedCallQueueHistoryTemplate
 
 ## SYNTAX