Add Tweak string in front of all tweak function

CONTRIBUTING.md

@@ -299,7 +299,7 @@ Even though the names are not 100% match, they aim to tweak similar aspects and
 
 ```powershell
 # Enable some feature
-Function EnableSomeFeature {
+Function TweakEnableSomeFeature {
 	Write-Output "Enabling some feature..."
 	If (!(Test-Path "HKLM:\Some\Registry\Key")) {
 		New-Item -Path "HKLM:\Some\Registry\Key" -Force | Out-Null
@@ -308,7 +308,7 @@ Function EnableSomeFeature {
 }
 
 # Disable some feature
-Function DisableSomeFeature {
+Function TweakDisableSomeFeature {
 	Write-Output "Disabling some feature..."
 	Remove-ItemProperty -Path "HKLM:\Some\Registry\Key" -Name "SomeValueName" -ErrorAction SilentlyContinue
 }

Modules/SWMB.psm1

@@ -18,7 +18,7 @@
 # Write message separator
 $Script:SWMB_MsgCount = 0
 
-Function SysMessage {
+Function TweakSysMessage {
 	$Script:SWMB_MsgCount++
 	Write-Output "Message separator " $Script:SWMB_MsgCount
 }
@@ -28,7 +28,7 @@ Function SysMessage {
 # Write event message
 $Script:SWMB_EventCount = 0
 
-Function SysEvent {
+Function TweakSysEvent {
 	$Script:SWMB_EventCount++
 	Write-EventLog -LogName "Application" -Source "SWMB" -EntryType "Information" -EventID $Script:SWMB_EventCount `
 		-Message "SWMB Event Message $Script:SWMB_EventCount"
@@ -37,14 +37,14 @@ Function SysEvent {
 ################################################################
 
 # Wait for box ok
-Function SysBox {
+Function TweakSysBox {
 	[System.Windows.MessageBox]::Show('SWMB: Press OK to continue')
 }
 
 ################################################################
 
 # Wait for key press
-Function SysPause {
+Function TweakSysPause {
 	Write-Output "`nPress any key to continue..."
 	[Console]::ReadKey($true) | Out-Null
 }
@@ -52,7 +52,7 @@ Function SysPause {
 ################################################################
 
 # Halt computer
-Function SysHalt {
+Function TweakSysHalt {
 	Write-Output "Shutdown now..."
 	Stop-Computer -ComputerName localhost -Force
 }
@@ -60,7 +60,7 @@ Function SysHalt {
 ################################################################
 
 # Restart computer
-Function SysRestart {
+Function TweakSysRestart {
 	Write-Output "Restarting..."
 	Restart-Computer
 }
@@ -68,7 +68,7 @@ Function SysRestart {
 ################################################################
 
 # Checkpoint computer
-Function SysCheckpoint {
+Function TweakSysCheckpoint {
 	Write-Output "Make a System Checkpoint..."
 	$Date = (Get-Date -Format "yyyy/MM/dd HH:mm")
 	Checkpoint-Computer -Description "SWMB Checkpoint performed at $Date"
@@ -78,7 +78,7 @@ Function SysCheckpoint {
 
 # Implementation used in powershell script
 # The main implementation in swmb.ps1 is used otherwise in the CLI
-Function SysRequireAdmin {
+Function TweakSysRequireAdmin {
 	If (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]"Administrator")) {
 		Write-Output "You must run this script with administrator privileges"
 		Exit
@@ -87,7 +87,7 @@ Function SysRequireAdmin {
 
 ################################################################
 
-Function SysAutoUpgrade {
+Function TweakSysAutoUpgrade {
 	$moduleScriptPath = (Get-Item (Get-PSCallStack)[0].ScriptName).DirectoryName
 	$swmbCorePath = (Resolve-Path (Join-Path -Path $moduleScriptPath -ChildPath '..') -ErrorAction SilentlyContinue)
 
@@ -121,7 +121,7 @@ Function SysAutoUpgrade {
 
 # Since 2021/06
 # Wait for key press
-Function WaitForKey {
+Function TweakWaitForKey {
 	Write-Output "Warning: obsolete tweak WaitForKey, now use SysPause"
 	SysPause
 }
@@ -130,7 +130,7 @@ Function WaitForKey {
 
 # Since 2021/06
 # Restart computer
-Function Restart {
+Function TweakRestart {
 	Write-Output "Warning: obsolete tweak Restart, now use SysRestart"
 	SysRestart
 }
@@ -139,7 +139,7 @@ Function Restart {
 
 # Since 2021/07
 # Require administrator privileges
-Function RequireAdmin {
+Function TweakRequireAdmin {
 	Write-Output "Warning: obsolete tweak RequireAdmin, now use SysRequireAdmin"
 	SysRequireAdmin
 }
@@ -243,7 +243,7 @@ Function SWMB_LoadTweakFile() {
 
 Function SWMB_RunTweaks {
 	$Global:SWMB_Tweaks | ForEach-Object {
-		Invoke-Expression $_
+		Invoke-Expression "Tweak$_"
 	}
 }
 
@@ -254,7 +254,7 @@ Function SWMB_CheckTweaks {
 
 	ForEach ($tweak in $Global:SWMB_Tweaks) {
 		# Test if tweak function really exists
-		If (-not(Get-Command -Name $tweak -ErrorAction SilentlyContinue)) {
+		If (-not(Get-Command -Name "Tweak$tweak" -ErrorAction SilentlyContinue)) {
 			Write-Output "Tweak $tweak is not defined!"
 		}
 
@@ -277,7 +277,7 @@ Function SWMB_CheckTweaks {
 Function SWMB_PrintTweaks {
 	ForEach ($tweak in $Global:SWMB_Tweaks) {
 		# Test if tweak function really exists
-		If (-not(Get-Command -Name $tweak -ErrorAction SilentlyContinue)) {
+		If (-not(Get-Command -Name "Tweak$tweak" -ErrorAction SilentlyContinue)) {
 			Write-Output "# $tweak"
 		} Else {
 			Write-Output "$tweak"

Modules/SWMB/BSI.psm1

@@ -32,13 +32,13 @@
 # Par défaut cette clé ne semble pas exister, on l'efface donc en fonction Disable, comme avant
 
 # Disable
-Function DisableAutologgerDiagTrack {
+Function TweakDisableAutologgerDiagTrack {
 	Write-Output "Désactivation du Autologger-DiagTrack-Listener..."
 	Remove-Item -Path "HKLM:\SYSTEM\CurrentControlSet\Control\WMI\Autologger\AutoLogger-Diagtrack-Listener" -Force | Out-Null
 }
 
 # Enable
-Function EnableAutologgerDiagTrack {
+Function TweakEnableAutologgerDiagTrack {
 	Write-Output "Activation du Autologger-DiagTrack-Listener..."
 	If (!(Test-Path "HKLM:\SYSTEM\CurrentControlSet\Control\WMI\Autologger\AutoLogger-Diagtrack-Listener")) {
 		New-Item -Path "HKLM:\SYSTEM\CurrentControlSet\Control\WMI\Autologger\AutoLogger-Diagtrack-Listener" -Force | Out-Null
@@ -47,7 +47,7 @@ Function EnableAutologgerDiagTrack {
 }
 
 # View
-Function ViewEnableAutologgerDiagTrack {
+Function TweakViewEnableAutologgerDiagTrack {
 	Write-Output 'Autologger-DiagTrack-Listener (0 no or not exist, 2 activated)'
 	Get-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\WMI\Autologger\AutoLogger-Diagtrack-Listener" -Name "Start"
 }
@@ -57,13 +57,13 @@ Function ViewEnableAutologgerDiagTrack {
 # Désactivation des anciennes versions de PowerShell (2.0) qui ne proposent pas les fonctionnalités de sécurité avancées
 
 # Disable
-Function DisablePowershell2 {
+Function TweakDisablePowershell2 {
 	Write-Output "Désactivation des anciennes versions de Powershell(2)..."
 	Disable-WindowsOptionalFeature -Online -FeatureName MicrosoftWindowsPowerShellV2Root
 }
 
 # Enable
-Function EnablePowershell2 {
+Function TweakEnablePowershell2 {
 	Write-Output "Activation des anciennes versions de Powershell(2)..."
 	Enable-WindowsOptionalFeature -Online -FeatureName MicrosoftWindowsPowerShellV2Root
 }
@@ -74,13 +74,13 @@ Function EnablePowershell2 {
 #PAS ENCORE FAIT
 
 # Disable
-Function DisableRemotePowershell {
+Function TweakDisableRemotePowershell {
 	Write-Output "Désactivation de l'utilisation de PowerShell à distance"
 	Disable-WindowsOptionalFeature -Online -FeatureName MicrosoftWindowsPowerShellV2Root
 }
 
 # Enable
-Function EnableRemotePowershell {
+Function TweakEnableRemotePowershell {
 	Write-Output "Activation de l'utilisation de PowerShell à distance"
 	Disable-WindowsOptionalFeature -Online -FeatureName MicrosoftWindowsPowerShellV2Root
 }

Modules/SWMB/Contrib.psm1

@@ -19,7 +19,7 @@
 # https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.Feeds::EnableFeeds&Language=fr-fr
 # https://www.tenforums.com/tutorials/178178-how-enable-disable-news-interests-taskbar-windows-10-a.html
 # Disable
-Function DisableWindowsFeeds {
+Function TweakDisableWindowsFeeds {
 	Write-Output "Turn off windows feeds (news and interests)..."
 	If (!(Test-Path "HKLM:\Software\Policies\Microsoft\Windows\Windows Feeds")) {
 		New-Item -Path "HKLM:\Software\Policies\Microsoft\Windows\Windows Feeds" -Force | Out-Null
@@ -28,7 +28,7 @@ Function DisableWindowsFeeds {
 }
 
 # Enable
-Function EnableWindowsFeeds {
+Function TweakEnableWindowsFeeds {
 	Write-Output "Turn on windows feeds (news and interests)..."
 	Remove-ItemProperty -Path "HKLM:\Software\Policies\Microsoft\Windows\Windows Feeds" -Name "EnableFeeds" -ErrorAction SilentlyContinue
 }
@@ -37,14 +37,14 @@ Function EnableWindowsFeeds {
 
 # https://www.commentcamarche.net/informatique/windows/29-activer-le-god-mode-mode-dieu-de-windows-10/
 # Enable
-Function EnableGodMod_CU {
+Function TweakEnableGodMod_CU {
 	Write-Output "Enable GodMod on current user desktop..."
 	$DesktopPath = [Environment]::GetFolderPath("Desktop");
 	New-Item -Path  "$DesktopPath\GodMode.{ED7BA470-8E54-465E-825C-99712043E01C}" -Type Directory
 }
 
 # Disable
-Function DisableGodMod_CU {
+Function TweakDisableGodMod_CU {
 	Write-Output "Disable GodMod from current user desktop..."
 	$DesktopPath = [Environment]::GetFolderPath("Desktop");
 	Remove-Item -Path  "$DesktopPath\GodMode.{ED7BA470-8E54-465E-825C-99712043E01C}" -Recurse -ErrorAction SilentlyContinue
@@ -57,7 +57,7 @@ Function DisableGodMod_CU {
 
 ## https://getadmx.com/?Category=Windows_10_2016&Policy=Microsoft.Policies.AppPrivacy::LetAppsAccessLocation&Language=fr-fr
 # Disable access to location from UWP apps
-Function DisableUWPAccessLocation {
+Function TweakDisableUWPAccessLocation {
 	Write-Output "Disabling access to location from UWP apps..."
 	If (!(Test-Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy")) {
 		New-Item -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" -Force | Out-Null
@@ -66,7 +66,7 @@ Function DisableUWPAccessLocation {
 }
 
 # Enable access to location from UWP apps
-Function EnableUWPAccessLocation {
+Function TweakEnableUWPAccessLocation {
 	Write-Output "Enabling access to location from UWP apps..."
 	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" -Name "LetAppsAccessLocation" -ErrorAction SilentlyContinue
 }
@@ -77,13 +77,13 @@ Function EnableUWPAccessLocation {
 ################################################################
 
 # Disable obsolete SMB 1.0 protocol - Disabled by default since 1709
-Function DisableSMB1Protocol {
+Function TweakDisableSMB1Protocol {
 	Write-Output "Disabling SMB 1.0 protocol..."
 	Disable-WindowsOptionalFeature -Online -FeatureName SMB1Protocol -Norestart
 }
 
 # Enable obsolete SMB 1.0 protocol - Disabled by default since 1709
-Function EnableSMB1Protocol {
+Function TweakEnableSMB1Protocol {
 	Write-Output "Enabling SMB 1.0 protocol..."
 	Enable-WindowsOptionalFeature -Online -FeatureName SMB1Protocol -Norestart
 }
@@ -96,7 +96,7 @@ Function EnableSMB1Protocol {
 # https://getadmx.com/?Category=Windows_10_2016&Policy=Microsoft.Policies.LanmanWorkstation::Pol_EnableInsecureGuestLogons
 # https://docs.microsoft.com/en-us/windows-hardware/customize/desktop/unattend/microsoft-windows-workstationservice-allowinsecureguestauth
 # Enable
-Function EnableInsecureGuestLogons {
+Function TweakEnableInsecureGuestLogons {
 	Write-Output "SMB client will allow insecure guest logons to an SMB server"
 	If (!(Test-Path "HKLM:\Software\Policies\Microsoft\Windows\LanmanWorkstation")) {
 		New-Item -Path "HKLM:\Software\Policies\Microsoft\Windows\LanmanWorkstation" -Force | Out-Null
@@ -105,7 +105,7 @@ Function EnableInsecureGuestLogons {
 }
 
 # Disable (default)
-Function DisableInsecureGuestLogons {
+Function TweakDisableInsecureGuestLogons {
 	Write-Output "SMB client rejects insecure guest logons to an SMB server (default)"
 	Remove-ItemProperty -Path "HKLM:\Software\Policies\Microsoft\Windows\LanmanWorkstation" -Name "AllowInsecureGuestAuth" -ErrorAction SilentlyContinue
 }
@@ -118,7 +118,7 @@ Function DisableInsecureGuestLogons {
 
 # Disable offering of drivers through network
 # Is part of DisableUpdateDriver
-Function DisableAutoloadDriver {
+Function TweakDisableAutoloadDriver {
 	Write-Output "Disabling autoload driver from network..."
 	If (!(Test-Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Device Metadata")) {
 		New-Item -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Device Metadata" -Force | Out-Null
@@ -127,13 +127,13 @@ Function DisableAutoloadDriver {
 }
 
 # Enable offering of drivers through network
-Function EnableAutoloadDriver {
+Function TweakEnableAutoloadDriver {
 	Write-Output "Enabling autoload driver from network..."
 	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Device Metadata" -Name "PreventDeviceMetadataFromNetwork" -ErrorAction SilentlyContinue
 }
 
 # View
-Function ViewAutoloadDriver {
+Function TweakViewAutoloadDriver {
 	Write-Output 'Autoload driver from network (0 no or not exist - enable, 1 disable)'
 	Get-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Device Metadata" -Name "PreventDeviceMetadataFromNetwork"
 }

Modules/SWMB/CurrentUser-Application.psm1

@@ -12,14 +12,14 @@
 ################################################################
 
 # Disable Xbox features - Not applicable to Server
-Function DisableXboxFeatures_CU {
+Function TweakDisableXboxFeatures_CU {
 	Write-Output "Disabling Xbox features for CU. See DisableXboxFeatures..."
 	Set-ItemProperty -Path "HKCU:\Software\Microsoft\GameBar" -Name "AutoGameModeEnabled" -Type DWord -Value 0
 	Set-ItemProperty -Path "HKCU:\System\GameConfigStore" -Name "GameDVR_Enabled" -Type DWord -Value 0
 }
 
 # Enable Xbox features - Not applicable to Server
-Function EnableXboxFeatures_CU {
+Function TweakEnableXboxFeatures_CU {
 	Write-Output "Enabling Xbox features for CU. See EnableXboxFeatures..."
 	Remove-ItemProperty -Path "HKCU:\Software\Microsoft\GameBar" -Name "AutoGameModeEnabled" -ErrorAction SilentlyContinue
 	Set-ItemProperty -Path "HKCU:\System\GameConfigStore" -Name "GameDVR_Enabled" -Type DWord -Value 1
@@ -28,7 +28,7 @@ Function EnableXboxFeatures_CU {
 ################################################################
 
 # Disable Fullscreen optimizations
-Function DisableFullscreenOptims_CU {
+Function TweakDisableFullscreenOptims_CU {
 	Write-Output "Disabling Fullscreen optimizations for CU..."
 	Set-ItemProperty -Path "HKCU:\System\GameConfigStore" -Name "GameDVR_DXGIHonorFSEWindowsCompatible" -Type DWord -Value 1
 	Set-ItemProperty -Path "HKCU:\System\GameConfigStore" -Name "GameDVR_FSEBehavior" -Type DWord -Value 2
@@ -37,7 +37,7 @@ Function DisableFullscreenOptims_CU {
 }
 
 # Enable Fullscreen optimizations
-Function EnableFullscreenOptims_CU {
+Function TweakEnableFullscreenOptims_CU {
 	Write-Output "Enabling Fullscreen optimizations for CU..."
 	Set-ItemProperty -Path "HKCU:\System\GameConfigStore" -Name "GameDVR_DXGIHonorFSEWindowsCompatible" -Type DWord -Value 0
 	Remove-ItemProperty -Path "HKCU:\System\GameConfigStore" -Name "GameDVR_FSEBehavior" -ErrorAction SilentlyContinue
@@ -48,7 +48,7 @@ Function EnableFullscreenOptims_CU {
 ################################################################
 
 # Disable Windows Media Player online access - audio file metadata download, radio presets, DRM.
-Function DisableMediaOnlineAccess_CU {
+Function TweakDisableMediaOnlineAccess_CU {
 	Write-Output "Disabling Windows Media Player online access for CU. See DisableMediaOnlineAccess..."
 	If (!(Test-Path "HKCU:\SOFTWARE\Policies\Microsoft\WindowsMediaPlayer")) {
 		New-Item -Path "HKCU:\SOFTWARE\Policies\Microsoft\WindowsMediaPlayer" -Force | Out-Null
@@ -59,7 +59,7 @@ Function DisableMediaOnlineAccess_CU {
 }
 
 # Enable Windows Media Player online access
-Function EnableMediaOnlineAccess_CU {
+Function TweakEnableMediaOnlineAccess_CU {
 	Write-Output "Enabling Windows Media Player online access for CU. See EnableMediaOnlineAccess..."
 	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Policies\Microsoft\WindowsMediaPlayer" -Name "PreventCDDVDMetadataRetrieval" -ErrorAction SilentlyContinue
 	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Policies\Microsoft\WindowsMediaPlayer" -Name "PreventMusicFileMetadataRetrieval" -ErrorAction SilentlyContinue

Modules/SWMB/CurrentUser-Privacy.psm1

@@ -12,7 +12,7 @@
 ################################################################
 
 # Disable Cortana
-Function DisableCortana_CU {
+Function TweakDisableCortana_CU {
 	Write-Output "Disabling Cortana for CU. See DisableCortana..."
 	If (!(Test-Path "HKCU:\Software\Microsoft\Personalization\Settings")) {
 		New-Item -Path "HKCU:\Software\Microsoft\Personalization\Settings" -Force | Out-Null
@@ -28,7 +28,7 @@ Function DisableCortana_CU {
 }
 
 # Enable Cortana
-Function EnableCortana_CU {
+Function TweakEnableCortana_CU {
 	Write-Output "Enabling Cortana for CU. See EnableCortana..."
 	Remove-ItemProperty -Path "HKCU:\Software\Microsoft\Personalization\Settings" -Name "AcceptedPrivacyPolicy" -ErrorAction SilentlyContinue
 	Set-ItemProperty -Path "HKCU:\Software\Microsoft\InputPersonalization" -Name "RestrictImplicitTextCollection" -Type DWord -Value 0
@@ -40,14 +40,14 @@ Function EnableCortana_CU {
 ################################################################
 
 # Disable Web Search in Start Menu
-Function DisableWebSearch_CU {
+Function TweakDisableWebSearch_CU {
 	Write-Output "Disabling Bing Search in Start Menu for CU. See DisableWebSearch..."
 	Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Search" -Name "BingSearchEnabled" -Type DWord -Value 0
 	Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Search" -Name "CortanaConsent" -Type DWord -Value 0
 }
 
 # Enable Web Search in Start Menu
-Function EnableWebSearch_CU {
+Function TweakEnableWebSearch_CU {
 	Write-Output "Enabling Bing Search in Start Menu for CU. See EnableWebSearch..."
 	Remove-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Search" -Name "BingSearchEnabled" -ErrorAction SilentlyContinue
 	Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Search" -Name "CortanaConsent" -Type DWord -Value 1
@@ -56,7 +56,7 @@ Function EnableWebSearch_CU {
 ################################################################
 
 # Disable Application suggestions and automatic installation
-Function DisableAppSuggestions_CU {
+Function TweakDisableAppSuggestions_CU {
 	Write-Output "Disabling Application suggestions for CU. See DisableAppSuggestions..."
 	Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" -Name "ContentDeliveryAllowed" -Type DWord -Value 0
 	Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" -Name "OemPreInstalledAppsEnabled" -Type DWord -Value 0
@@ -86,7 +86,7 @@ Function DisableAppSuggestions_CU {
 }
 
 # Enable Application suggestions and automatic installation
-Function EnableAppSuggestions_CU {
+Function TweakEnableAppSuggestions_CU {
 	Write-Output "Enabling Application suggestions for CU. See EnableAppSuggestions..."
 	Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" -Name "ContentDeliveryAllowed" -Type DWord -Value 1
 	Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" -Name "OemPreInstalledAppsEnabled" -Type DWord -Value 1
@@ -109,7 +109,7 @@ Function EnableAppSuggestions_CU {
 ################################################################
 
 # Disable Feedback
-Function DisableFeedback_CU {
+Function TweakDisableFeedback_CU {
 	Write-Output "Disabling Feedback for CU. See DisableFeedback..."
 	If (!(Test-Path "HKCU:\Software\Microsoft\Siuf\Rules")) {
 		New-Item -Path "HKCU:\Software\Microsoft\Siuf\Rules" -Force | Out-Null
@@ -121,7 +121,7 @@ Function DisableFeedback_CU {
 }
 
 # Enable Feedback
-Function EnableFeedback_CU {
+Function TweakEnableFeedback_CU {
 	Write-Output "Enabling Feedback for CU. See EnableFeedback..."
 	Remove-ItemProperty -Path "HKCU:\Software\Microsoft\Siuf\Rules" -Name "NumberOfSIUFInPeriod" -ErrorAction SilentlyContinue
 	Enable-ScheduledTask -TaskName "Microsoft\Windows\Feedback\Siuf\DmClient" -ErrorAction SilentlyContinue | Out-Null
@@ -131,7 +131,7 @@ Function EnableFeedback_CU {
 ################################################################
 
 # Disable Tailored Experiences
-Function DisableTailoredExperiences_CU {
+Function TweakDisableTailoredExperiences_CU {
 	Write-Output "Disabling Tailored Experiences for CU..."
 	If (!(Test-Path "HKCU:\Software\Policies\Microsoft\Windows\CloudContent")) {
 		New-Item -Path "HKCU:\Software\Policies\Microsoft\Windows\CloudContent" -Force | Out-Null
@@ -140,7 +140,7 @@ Function DisableTailoredExperiences_CU {
 }
 
 # Enable Tailored Experiences
-Function EnableTailoredExperiences_CU {
+Function TweakEnableTailoredExperiences_CU {
 	Write-Output "Enabling Tailored Experiences for CU..."
 	Remove-ItemProperty -Path "HKCU:\Software\Policies\Microsoft\Windows\CloudContent" -Name "DisableTailoredExperiencesWithDiagnosticData" -ErrorAction SilentlyContinue
 }
@@ -148,13 +148,13 @@ Function EnableTailoredExperiences_CU {
 ################################################################
 
 # Disable setting 'Let websites provide locally relevant content by accessing my language list'
-Function DisableWebLangList_CU {
+Function TweakDisableWebLangList_CU {
 	Write-Output "Disabling Website Access to Language List for CU..."
 	Set-ItemProperty -Path "HKCU:\Control Panel\International\User Profile" -Name "HttpAcceptLanguageOptOut" -Type DWord -Value 1
 }
 
 # Enable setting 'Let websites provide locally relevant content by accessing my language list'
-Function EnableWebLangList_CU {
+Function TweakEnableWebLangList_CU {
 	Write-Output "Enabling Website Access to Language List for CU..."
 	Remove-ItemProperty -Path "HKCU:\Control Panel\International\User Profile" -Name "HttpAcceptLanguageOptOut" -ErrorAction SilentlyContinue
 }

Modules/SWMB/CurrentUser-Service.psm1

@@ -13,7 +13,7 @@
 
 # Disable Shared Experiences - Applicable since 1703. Not applicable to Server
 # This setting can be set also via GPO, however doing so causes reset of Start Menu cache. See https://github.com/Disassembler0/Win10-Initial-Setup-Script/issues/145 for details
-Function DisableSharedExperiences_CU {
+Function TweakDisableSharedExperiences_CU {
 	Write-Output "Disabling Shared Experiences for CU..."
 	If (!(Test-Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\CDP")) {
 		New-Item -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\CDP" | Out-Null
@@ -22,7 +22,7 @@ Function DisableSharedExperiences_CU {
 }
 
 # Enable Shared Experiences - Applicable since 1703. Not applicable to Server
-Function EnableSharedExperiences_CU {
+Function TweakEnableSharedExperiences_CU {
 	Write-Output "Enabling Shared Experiences for CU..."
 	Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\CDP" -Name "RomeSdkChannelUserAuthzPolicy" -Type DWord -Value 1
 }
@@ -30,13 +30,13 @@ Function EnableSharedExperiences_CU {
 ################################################################
 
 # Enable Clipboard History - Applicable since 1809. Not applicable to Server
-Function EnableClipboardHistory_CU {
+Function TweakEnableClipboardHistory_CU {
 	Write-Output "Enabling Clipboard History for CU..."
 	Set-ItemProperty -Path "HKCU:\Software\Microsoft\Clipboard" -Name "EnableClipboardHistory" -Type DWord -Value 1
 }
 
 # Disable Clipboard History - Applicable since 1809. Not applicable to Server
-Function DisableClipboardHistory_CU {
+Function TweakDisableClipboardHistory_CU {
 	Write-Output "Disabling Clipboard History for CU..."
 	Remove-ItemProperty -Path "HKCU:\Software\Microsoft\Clipboard" -Name "EnableClipboardHistory" -ErrorAction SilentlyContinue
 }
@@ -44,13 +44,13 @@ Function DisableClipboardHistory_CU {
 ################################################################
 
 # Disable Autoplay
-Function DisableAutoplay_CU {
+Function TweakDisableAutoplay_CU {
 	Write-Output "Disabling Autoplay for CU..."
 	Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers" -Name "DisableAutoplay" -Type DWord -Value 1
 }
 
 # Enable Autoplay
-Function EnableAutoplay_CU {
+Function TweakEnableAutoplay_CU {
 	Write-Output "Enabling Autoplay for CU..."
 	Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers" -Name "DisableAutoplay" -Type DWord -Value 0
 }
@@ -58,7 +58,7 @@ Function EnableAutoplay_CU {
 ################################################################
 
 # Enable Storage Sense - automatic disk cleanup - Applicable since 1703
-Function EnableStorageSense_CU {
+Function TweakEnableStorageSense_CU {
 	Write-Output "Enabling Storage Sense for CU..."
 	If (!(Test-Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\StorageSense\Parameters\StoragePolicy")) {
 		New-Item -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\StorageSense\Parameters\StoragePolicy" -Force | Out-Null
@@ -68,7 +68,7 @@ Function EnableStorageSense_CU {
 }
 
 # Disable Storage Sense - Applicable since 1703
-Function DisableStorageSense_CU {
+Function TweakDisableStorageSense_CU {
 	Write-Output "Disabling Storage Sense for CU..."
 	Remove-Item -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\StorageSense\Parameters\StoragePolicy" -Recurse -ErrorAction SilentlyContinue
 }
@@ -76,7 +76,7 @@ Function DisableStorageSense_CU {
 ################################################################
 
 # Disable Recycle Bin - Files will be permanently deleted without placing into Recycle Bin
-Function DisableRecycleBin_CU {
+Function TweakDisableRecycleBin_CU {
 	Write-Output "Disabling Recycle Bin for CU..."
 	If (!(Test-Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer")) {
 		New-Item -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer" | Out-Null
@@ -85,7 +85,7 @@ Function DisableRecycleBin_CU {
 }
 
 # Enable Recycle Bin
-Function EnableRecycleBin_CU {
+Function TweakEnableRecycleBin_CU {
 	Write-Output "Enable Recycle Bin for CU..."
 	Remove-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Policies\Explorer" -Name "NoRecycleFiles" -ErrorAction SilentlyContinue
 }

Modules/SWMB/CurrentUser-UWPPrivacy.psm1

@@ -13,7 +13,7 @@
 
 # Disable UWP apps background access - ie. if UWP apps can download data or update themselves when they aren't used
 # Until 1809, Cortana and ShellExperienceHost need to be explicitly excluded as their inclusion breaks start menu search and toast notifications respectively.
-Function DisableUWPBackgroundApps_CU {
+Function TweakDisableUWPBackgroundApps_CU {
 	Write-Output "Disabling UWP apps background access for CU. See DisableUWPBackgroundApps..."
 	If ([System.Environment]::OSVersion.Version.Build -ge 17763) {
 	} Else {
@@ -25,7 +25,7 @@ Function DisableUWPBackgroundApps_CU {
 }
 
 # Enable UWP apps background access
-Function EnableUWPBackgroundApps_CU {
+Function TweakEnableUWPBackgroundApps_CU {
 	Write-Output "Enabling UWP apps background access for CU. See EnableUWPBackgroundApps..."
 	Get-ChildItem -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\BackgroundAccessApplications" | ForEach-Object {
 		Remove-ItemProperty -Path $_.PsPath -Name "Disabled" -ErrorAction SilentlyContinue
@@ -36,7 +36,7 @@ Function EnableUWPBackgroundApps_CU {
 ################################################################
 
 # Hide Account Protection warning in Defender about not using a Microsoft account
-Function HideAccountProtectionWarn_CU {
+Function TweakHideAccountProtectionWarn_CU {
 	Write-Output "Hiding Account Protection warning for CU..."
 	If (!(Test-Path "HKCU:\Software\Microsoft\Windows Security Health\State")) {
 		New-Item -Path "HKCU:\Software\Microsoft\Windows Security Health\State" -Force | Out-Null
@@ -45,7 +45,7 @@ Function HideAccountProtectionWarn_CU {
 }
 
 # Show Account Protection warning in Defender
-Function ShowAccountProtectionWarn_CU {
+Function TweakShowAccountProtectionWarn_CU {
 	Write-Output "Showing Account Protection warning for CU..."
 	Remove-ItemProperty "HKCU:\Software\Microsoft\Windows Security Health\State" -Name "AccountProtection_MicrosoftAccount_Disconnected" -ErrorAction SilentlyContinue
 }
@@ -53,7 +53,7 @@ Function ShowAccountProtectionWarn_CU {
 ################################################################
 
 # Disable blocking of downloaded files (i.e. storing zone information - no need to do File\Properties\Unblock)
-Function DisableDownloadBlocking_CU {
+Function TweakDisableDownloadBlocking_CU {
 	Write-Output "Disabling blocking of downloaded files for CU..."
 	If (!(Test-Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Policies\Attachments")) {
 		New-Item -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Policies\Attachments" | Out-Null
@@ -62,7 +62,7 @@ Function DisableDownloadBlocking_CU {
 }
 
 # Enable blocking of downloaded files
-Function EnableDownloadBlocking_CU {
+Function TweakEnableDownloadBlocking_CU {
 	Write-Output "Enabling blocking of downloaded files for CU..."
 	Remove-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Policies\Attachments" -Name "SaveZoneInformation" -ErrorAction SilentlyContinue
 }

Modules/SWMB/CurrentUser-Unpinning.psm1

@@ -13,7 +13,7 @@
 
 # Unpin all Start Menu tiles
 # Note: This function has no counterpart. You have to pin the tiles back manually.
-Function UnpinStartMenuTiles_CU {
+Function TweakUnpinStartMenuTiles_CU {
 	Write-Output "Unpinning all Start Menu tiles for CU..."
 	If ([System.Environment]::OSVersion.Version.Build -ge 15063 -And [System.Environment]::OSVersion.Version.Build -le