diff --git a/backend/Modules/CIPPAlerts/Public/Alerts/Get-CIPPAlertInactiveUsers.ps1 b/backend/Modules/CIPPAlerts/Public/Alerts/Get-CIPPAlertInactiveUsers.ps1
index 46f31f567..0053de975 100644
--- a/backend/Modules/CIPPAlerts/Public/Alerts/Get-CIPPAlertInactiveUsers.ps1
+++ b/backend/Modules/CIPPAlerts/Public/Alerts/Get-CIPPAlertInactiveUsers.ps1
@@ -81,6 +81,6 @@ function Get-CIPPAlertInactiveUsers {
         } catch {}
     } catch {
         $ErrorMessage = Get-CippException -Exception $_
-        Write-LogMessage -API 'Alerts' -tenant $TenantFilter -message "Failed to check inactive users with licenses for $($TenantFilter): $($ErrorMessage.NormalizedError)" -sev Error -LogData $ErrorMessage
+        Write-LogMessage -API 'Alerts' -tenant $TenantFilter -message "Failed to check inactive users for $($TenantFilter): $($ErrorMessage.NormalizedError)" -sev Error -LogData $ErrorMessage
     }
 }
diff --git a/backend/Modules/CIPPAlerts/Public/Alerts/Get-CIPPAlertRoleEscalableGroups.ps1 b/backend/Modules/CIPPAlerts/Public/Alerts/Get-CIPPAlertRoleEscalableGroups.ps1
index b32e5ee17..85292cb9c 100644
--- a/backend/Modules/CIPPAlerts/Public/Alerts/Get-CIPPAlertRoleEscalableGroups.ps1
+++ b/backend/Modules/CIPPAlerts/Public/Alerts/Get-CIPPAlertRoleEscalableGroups.ps1
@@ -118,7 +118,7 @@ function Get-CIPPAlertRoleEscalableGroups {
         }
 
         if ($findings.Count -eq 0) {
-            Write-LogMessage -API 'Alerts' -tenant $TenantFilter -message "Role-escalable groups alert: no role-escalation group paths found" -sev 'Information'
+            Write-LogMessage -API 'Alerts' -tenant $TenantFilter -message "Role-escalable groups alert: no role-escalation group paths found" -sev 'Info'
         }
         Write-AlertTrace -cmdletName $MyInvocation.MyCommand -tenantFilter $TenantFilter -data @($findings)
     } catch {
diff --git a/backend/Modules/CIPPBaselines/Public/Executors/Invoke-CIPPBaselineGroupTemplate.ps1 b/backend/Modules/CIPPBaselines/Public/Executors/Invoke-CIPPBaselineGroupTemplate.ps1
index 8f1e8e4f8..eb395c6fa 100644
--- a/backend/Modules/CIPPBaselines/Public/Executors/Invoke-CIPPBaselineGroupTemplate.ps1
+++ b/backend/Modules/CIPPBaselines/Public/Executors/Invoke-CIPPBaselineGroupTemplate.ps1
@@ -48,7 +48,7 @@ function Invoke-CIPPBaselineGroupTemplate {
         # Dynamic Distribution Groups are no longer supported by CIPP: EXO canonicalises the recipient
         # filter (permanent drift) and Set-DynamicDistributionGroup -RecipientFilter throws. Skip the write
         # and surface the skip in the run log instead of failing every remediation.
-        Write-LogMessage -API 'Baselines' -tenant $TenantFilter -message "Group Template '$($Template.displayName)': skipped - Dynamic Distribution Groups are not supported by CIPP." -Sev 'Warn'
+        Write-LogMessage -API 'Baselines' -tenant $TenantFilter -message "Group Template '$($Template.displayName)': skipped - Dynamic Distribution Groups are not supported by CIPP." -Sev 'Warning'
         return
     }
 
diff --git a/backend/Modules/CIPPCore/Public/Functions/Invoke-CIPPCustomDomainCertificate.ps1 b/backend/Modules/CIPPCore/Public/Functions/Invoke-CIPPCustomDomainCertificate.ps1
index 4beed4204..a35823b97 100644
--- a/backend/Modules/CIPPCore/Public/Functions/Invoke-CIPPCustomDomainCertificate.ps1
+++ b/backend/Modules/CIPPCore/Public/Functions/Invoke-CIPPCustomDomainCertificate.ps1
@@ -39,7 +39,7 @@ function Invoke-CIPPCustomDomainCertificate {
 
     if ($AppService.Site.properties.hostNames -notcontains $Hostname) {
         $Message = "No hostname binding exists for '$Hostname' - the domain was removed or never added. Nothing to do."
-        Write-LogMessage -API 'CustomDomains' -message $Message -sev Warn
+        Write-LogMessage -API 'CustomDomains' -message $Message -sev Warning
         return $Message
     }
 
diff --git a/backend/Modules/CIPPCore/Public/GraphHelper/New-CIPPMFAConnectorToken.ps1 b/backend/Modules/CIPPCore/Public/GraphHelper/New-CIPPMFAConnectorToken.ps1
index 54b9ca398..6216b8bc4 100644
--- a/backend/Modules/CIPPCore/Public/GraphHelper/New-CIPPMFAConnectorToken.ps1
+++ b/backend/Modules/CIPPCore/Public/GraphHelper/New-CIPPMFAConnectorToken.ps1
@@ -120,7 +120,7 @@ function New-CIPPMFAConnectorToken {
             Write-LogMessage -headers $Headers -API 'MFAConnector' -tenant $TenantFilter -message "App management policy for the Azure Multi-Factor Auth Client: $($PolicyUpdate.PolicyAction)" -sev Info
         }
     } catch {
-        Write-LogMessage -headers $Headers -API 'MFAConnector' -tenant $TenantFilter -message "Failed to update app management policy for the Azure Multi-Factor Auth Client: $($_.Exception.Message)" -sev Warn
+        Write-LogMessage -headers $Headers -API 'MFAConnector' -tenant $TenantFilter -message "Failed to update app management policy for the Azure Multi-Factor Auth Client: $($_.Exception.Message)" -sev Warning
     }
 
     $SecretStart = (Get-Date).AddMinutes(-5)
diff --git a/backend/Modules/CIPPCore/Public/Invoke-CIPPOffboardingJob.ps1 b/backend/Modules/CIPPCore/Public/Invoke-CIPPOffboardingJob.ps1
index aa3bba1d5..1316407fd 100644
--- a/backend/Modules/CIPPCore/Public/Invoke-CIPPOffboardingJob.ps1
+++ b/backend/Modules/CIPPCore/Public/Invoke-CIPPOffboardingJob.ps1
@@ -440,7 +440,7 @@ function Invoke-CIPPOffboardingJob {
                     $null = New-CIPPAsyncDeployment -JobId $DeploymentId -Names @($Username) -StepTitles (@($Batch | ForEach-Object { $_.Title }) + $NotifySteps) -Source 'Offboarding' -TaskId $TaskInfo.RowKey -TenantFilter $TenantFilter
                 } catch {
                     # Progress is a nice-to-have: a storage hiccup here must not fail the offboarding itself.
-                    Write-LogMessage -API $APIName -tenant $TenantFilter -message "Could not write the progress row for $Username : $($_.Exception.Message)" -sev Warn
+                    Write-LogMessage -API $APIName -tenant $TenantFilter -message "Could not write the progress row for $Username : $($_.Exception.Message)" -sev Warning
                 }
             }
             for ($i = 0; $i -lt $Batch.Count; $i++) {
diff --git a/backend/Modules/CIPPCore/Public/Set-CIPPUser.ps1 b/backend/Modules/CIPPCore/Public/Set-CIPPUser.ps1
index f05d20641..83637f004 100644
--- a/backend/Modules/CIPPCore/Public/Set-CIPPUser.ps1
+++ b/backend/Modules/CIPPCore/Public/Set-CIPPUser.ps1
@@ -242,7 +242,7 @@ function Set-CIPPUser {
                 else { 'Security' }
             }
         } catch {
-            Write-LogMessage -headers $Headers -API $APIName -tenant $UserObj.tenantFilter -Sev 'Warn' -message "Could not look up group types, falling back to the types supplied by the request: $($_.Exception.Message)"
+            Write-LogMessage -headers $Headers -API $APIName -tenant $UserObj.tenantFilter -Sev 'Warning' -message "Could not look up group types, falling back to the types supplied by the request: $($_.Exception.Message)"
         }
     }
 
diff --git a/backend/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ListLogs.ps1 b/backend/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ListLogs.ps1
index 0de51445b..cc0f03691 100644
--- a/backend/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ListLogs.ps1	
+++ b/backend/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ListLogs.ps1	
@@ -120,6 +120,8 @@ function Invoke-ListLogs {
     # When true, the Severity/User/Tenant/API/StartDate/EndDate query filters are applied; otherwise the current day is returned unfiltered.
     if ($Request.Query.Filter -eq $true) {
         $LogLevel = if ($Request.Query.Severity) { ($Request.Query.Severity).split(',') } else { 'Info', 'Warn', 'Warning', 'Error', 'Critical', 'Alert' }
+        # The UI's Warning option sends 'Warn'; rows are logged as either spelling
+        if ($LogLevel -contains 'Warn') { $LogLevel = @($LogLevel) + 'Warning' | Select-Object -Unique }
         $Username = $Request.Query.User ?? '*'
         $TenantFilter = $Request.Query.Tenant
         $ApiFilter = $Request.Query.API
diff --git a/backend/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Extensions/Invoke-ExecExtensionSync.ps1 b/backend/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Extensions/Invoke-ExecExtensionSync.ps1
index 3ed27d6af..b245dddab 100644
--- a/backend/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Extensions/Invoke-ExecExtensionSync.ps1	
+++ b/backend/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Extensions/Invoke-ExecExtensionSync.ps1	
@@ -86,7 +86,7 @@ Function Invoke-ExecExtensionSync {
             } catch {
                 $StatusCode = [HttpStatusCode]::InternalServerError
                 $Results = [pscustomobject]@{'Results' = "Could not start NinjaOne Sync: $($_.Exception.Message)" }
-                Write-LogMessage -API 'Scheduler_Billing' -tenant 'none' -message "Could not start NinjaOne Sync $($_.Exception.Message)" -sev Error
+                Write-LogMessage -API 'NinjaOneSync' -tenant 'none' -message "Could not start NinjaOne Sync $($_.Exception.Message)" -sev Error
             }
         }
         'Hudu' {
diff --git a/backend/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Setup/Invoke-ExecAddTenant.ps1 b/backend/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Setup/Invoke-ExecAddTenant.ps1
index a6789ad94..b29573905 100644
--- a/backend/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Setup/Invoke-ExecAddTenant.ps1	
+++ b/backend/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Setup/Invoke-ExecAddTenant.ps1	
@@ -49,7 +49,7 @@ function Invoke-ExecAddTenant {
 
             $Results = @{'message' = "$($ExistingTenant.displayName) is already onboarded as a GDAP tenant and cannot be converted to a Direct Tenant. To manage it as a Direct Tenant, remove the tenant first under Settings > Tenants, then add it again using the Direct Tenant flow."; 'severity' = 'error' }
             $StatusCode = [HttpStatusCode]::BadRequest
-            Write-LogMessage -tenant $ExistingTenant.defaultDomainName -tenantid $ExistingTenant.customerId -API 'NewTenant' -message "Blocked conversion of GDAP tenant $($ExistingTenant.displayName) to a Direct Tenant, attempted by $ServiceAccount." -Sev 'Warn'
+            Write-LogMessage -tenant $ExistingTenant.defaultDomainName -tenantid $ExistingTenant.customerId -API 'NewTenant' -message "Blocked conversion of GDAP tenant $($ExistingTenant.displayName) to a Direct Tenant, attempted by $ServiceAccount." -Sev 'Warning'
         } elseif ($ExistingTenant) {
             # Existing direct tenant - refresh the stored credentials and service account details.
             $ExistingTenant | Add-Member -NotePropertyName 'directTenantUserPrincipalName' -NotePropertyValue $ServiceAccount -Force
diff --git a/backend/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ExecOffboardUser.ps1 b/backend/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ExecOffboardUser.ps1
index 9a1f2ce78..b958ad0b9 100644
--- a/backend/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ExecOffboardUser.ps1	
+++ b/backend/Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ExecOffboardUser.ps1	
@@ -86,7 +86,7 @@ function Invoke-ExecOffboardUser {
     try {
         $DeploymentId = New-CIPPAsyncDeployment -Names $AllUsers -Source 'Offboarding' -TenantFilter $TenantFilter
     } catch {
-        Write-LogMessage -headers $Request.Headers -API $Request.Params.CIPPEndpoint -tenant $TenantFilter -message "Could not create the offboarding progress rows: $($_.Exception.Message)" -sev Warn
+        Write-LogMessage -headers $Request.Headers -API $Request.Params.CIPPEndpoint -tenant $TenantFilter -message "Could not create the offboarding progress rows: $($_.Exception.Message)" -sev Warning
     }
 
     $Failed = 0
diff --git a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardAutoAddProxy.ps1 b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardAutoAddProxy.ps1
index a85aec4a1..34352e82d 100644
--- a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardAutoAddProxy.ps1
+++ b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardAutoAddProxy.ps1
@@ -36,7 +36,7 @@ function Invoke-CIPPStandardAutoAddProxy {
         $QueueItem
     )
 
-    $TestResult = Test-CIPPStandardLicense -StandardName 'AutoArchive' -TenantFilter $Tenant -Preset Exchange
+    $TestResult = Test-CIPPStandardLicense -StandardName 'AutoAddProxy' -TenantFilter $Tenant -Preset Exchange
     if ($TestResult -eq $false) {
         return $true
     }
diff --git a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardDisableAdditionalStorageProviders.ps1 b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardDisableAdditionalStorageProviders.ps1
index bfff0c85d..daebb8b9b 100644
--- a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardDisableAdditionalStorageProviders.ps1
+++ b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardDisableAdditionalStorageProviders.ps1
@@ -52,7 +52,7 @@ function Invoke-CIPPStandardDisableAdditionalStorageProviders {
     }
     catch {
         $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
-        Write-LogMessage -API 'Standards' -Tenant $Tenant -Message "Could not get the DisableAddShortcutsToOneDrive state for $Tenant. Error: $ErrorMessage" -Sev Error
+        Write-LogMessage -API 'Standards' -Tenant $Tenant -Message "Could not get the DisableAdditionalStorageProviders state for $Tenant. Error: $ErrorMessage" -Sev Error
         return
     }
 
diff --git a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardDisableEntraPortal.ps1 b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardDisableEntraPortal.ps1
index 5d2227609..b058ac700 100644
--- a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardDisableEntraPortal.ps1
+++ b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardDisableEntraPortal.ps1
@@ -29,7 +29,7 @@ function Invoke-CIPPStandardDisableEntraPortal {
     }
 
     if ($Settings.alert -eq $true) {
-        if ($CurrentInfo.isSoftwareOathEnabled) {
+        if ($CurrentInfo.restrictNonAdminAccess) {
             Write-LogMessage -API 'Standards' -tenant $tenant -message 'Disable user access to Entra Portal is enabled' -sev Info
         } else {
             Write-StandardsAlert -message 'Disable user access to Entra Portal is not enabled' -object $CurrentInfo -tenant $tenant -standardName 'DisableEntraPortal' -standardId $Settings.standardId
@@ -38,7 +38,7 @@ function Invoke-CIPPStandardDisableEntraPortal {
     }
 
     if ($Settings.report -eq $true) {
-        set-CIPPStandardsCompareField -FieldName 'standards.DisableEntraPortal' -FieldValue $CurrentInfo.isSoftwareOathEnabled -TenantFilter $Tenant
+        set-CIPPStandardsCompareField -FieldName 'standards.DisableEntraPortal' -FieldValue $CurrentInfo.restrictNonAdminAccess -TenantFilter $Tenant
     }
 
 }
diff --git a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardExchangeConnectorTemplate.ps1 b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardExchangeConnectorTemplate.ps1
index 0cca444dd..33581cbdc 100644
--- a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardExchangeConnectorTemplate.ps1
+++ b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardExchangeConnectorTemplate.ps1
@@ -34,7 +34,7 @@ function Invoke-CIPPStandardExchangeConnectorTemplate {
         https://docs.cipp.app/user-documentation/tenant/standards/alignment/templates/available-standards
     #>
     param($Tenant, $Settings)
-    $TestResult = Test-CIPPStandardLicense -StandardName 'ExConnector' -TenantFilter $Tenant -Preset Exchange #No Foundation because that does not allow powershell access
+    $TestResult = Test-CIPPStandardLicense -StandardName 'ExchangeConnectorTemplate' -TenantFilter $Tenant -Preset Exchange #No Foundation because that does not allow powershell access
 
     if ($TestResult -eq $false) {
         return $true
diff --git a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardFocusedInbox.ps1 b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardFocusedInbox.ps1
index 7b212193d..6bfc83484 100644
--- a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardFocusedInbox.ps1
+++ b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardFocusedInbox.ps1
@@ -48,7 +48,7 @@ function Invoke-CIPPStandardFocusedInbox {
 
     # Input validation
     if ([string]::IsNullOrWhiteSpace($state) -or $state -eq 'Select a value') {
-        Write-LogMessage -API 'Standards' -tenant $tenant -message 'ExternalMFATrusted: Invalid state parameter set' -sev Error
+        Write-LogMessage -API 'Standards' -tenant $tenant -message 'FocusedInbox: Invalid state parameter set' -sev Error
         return
     }
 
diff --git a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardGlobalQuarantineSettings.ps1 b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardGlobalQuarantineSettings.ps1
index 912e91722..aa74f2745 100644
--- a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardGlobalQuarantineSettings.ps1
+++ b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardGlobalQuarantineSettings.ps1
@@ -40,7 +40,7 @@ function Invoke-CIPPStandardGlobalQuarantineSettings {
         https://docs.cipp.app/user-documentation/tenant/standards/alignment/templates/available-standards
     #>
     param($Tenant, $Settings)
-    $TestResult = Test-CIPPStandardLicense -StandardName 'QuarantineTemplate' -TenantFilter $Tenant -Preset Exchange #No Foundation because that does not allow powershell access
+    $TestResult = Test-CIPPStandardLicense -StandardName 'GlobalQuarantineSettings' -TenantFilter $Tenant -Preset Exchange #No Foundation because that does not allow powershell access
 
     if ($TestResult -eq $false) {
         return $true
diff --git a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardGroupTemplate.ps1 b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardGroupTemplate.ps1
index 447e24933..50c6fd613 100644
--- a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardGroupTemplate.ps1
+++ b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardGroupTemplate.ps1
@@ -74,7 +74,7 @@ function Invoke-CIPPStandardGroupTemplate {
     $GroupTemplates = @($GroupTemplates | Where-Object { "$($_.groupType)" -ne 'dynamicDistribution' })
     if ($SkippedDynamicGroups.Count -gt 0) {
         $SkippedNames = @($SkippedDynamicGroups.displayName) -join ', '
-        Write-LogMessage -API 'Standards' -tenant $tenant -message "Group Template: skipped $($SkippedDynamicGroups.Count) Dynamic Distribution Group template(s) ($SkippedNames) - Dynamic Distribution Groups are not supported by CIPP." -sev 'Warn'
+        Write-LogMessage -API 'Standards' -tenant $tenant -message "Group Template: skipped $($SkippedDynamicGroups.Count) Dynamic Distribution Group template(s) ($SkippedNames) - Dynamic Distribution Groups are not supported by CIPP." -sev 'Warning'
     }
 
     if ('dynamicDistribution' -in $GroupTemplates.groupType) {
diff --git a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardIntuneComplianceSettings.ps1 b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardIntuneComplianceSettings.ps1
index 45fa04f16..08d70e93f 100644
--- a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardIntuneComplianceSettings.ps1
+++ b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardIntuneComplianceSettings.ps1
@@ -49,7 +49,7 @@ function Invoke-CIPPStandardIntuneComplianceSettings {
             Select-Object secureByDefault, deviceComplianceCheckinThresholdDays
     } catch {
         $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
-        Write-LogMessage -API 'Standards' -Tenant $Tenant -Message "Could not get the intuneDeviceReg state for $Tenant. Error: $ErrorMessage" -Sev Error
+        Write-LogMessage -API 'Standards' -Tenant $Tenant -Message "Could not get the IntuneComplianceSettings state for $Tenant. Error: $ErrorMessage" -Sev Error
         return
     }
 
diff --git a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardRestrictThirdPartyStorageServices.ps1 b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardRestrictThirdPartyStorageServices.ps1
index 0a87a5983..5f648e000 100644
--- a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardRestrictThirdPartyStorageServices.ps1
+++ b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardRestrictThirdPartyStorageServices.ps1
@@ -40,7 +40,7 @@ function Invoke-CIPPStandardRestrictThirdPartyStorageServices {
     #>
 
     param ($Tenant, $Settings)
-    $TestResult = Test-CIPPStandardLicense -StandardName 'ThirdPartyStorageServicesRestricted' -TenantFilter $Tenant -Preset SharePoint
+    $TestResult = Test-CIPPStandardLicense -StandardName 'RestrictThirdPartyStorageServices' -TenantFilter $Tenant -Preset SharePoint
 
     if ($TestResult -eq $false) {
         return $true
diff --git a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardSharePointMassDeletionAlert.ps1 b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardSharePointMassDeletionAlert.ps1
index 58963f317..1d91ca78e 100644
--- a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardSharePointMassDeletionAlert.ps1
+++ b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardSharePointMassDeletionAlert.ps1
@@ -35,7 +35,7 @@ function Invoke-CIPPStandardSharePointMassDeletionAlert {
     #>
 
     param ($Tenant, $Settings)
-    $TestResult = Test-CIPPStandardLicense -StandardName 'DeletedUserRentention' -TenantFilter $Tenant -RequiredCapabilities @('RMS_S_PREMIUM2')
+    $TestResult = Test-CIPPStandardLicense -StandardName 'SharePointMassDeletionAlert' -TenantFilter $Tenant -RequiredCapabilities @('RMS_S_PREMIUM2')
 
     if ($TestResult -eq $false) {
         return $true
@@ -48,7 +48,7 @@ function Invoke-CIPPStandardSharePointMassDeletionAlert {
             Where-Object { $_.Name -eq $PolicyName }
     } catch {
         $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
-        Write-LogMessage -API 'Standards' -Tenant $Tenant -Message "Could not get the sharingCapability state for $Tenant. Error: $ErrorMessage" -Sev Error
+        Write-LogMessage -API 'Standards' -Tenant $Tenant -Message "Could not get the SharePointMassDeletionAlert state for $Tenant. Error: $ErrorMessage" -Sev Error
         return
     }
 
diff --git a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardallowOAuthTokens.ps1 b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardallowOAuthTokens.ps1
index 0d8332355..0dafcf5dd 100644
--- a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardallowOAuthTokens.ps1
+++ b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardallowOAuthTokens.ps1
@@ -38,7 +38,7 @@ function Invoke-CIPPStandardallowOAuthTokens {
         $CurrentState = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/policies/authenticationMethodsPolicy/authenticationMethodConfigurations/softwareOath' -tenantid $Tenant
     } catch {
         $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
-        Write-LogMessage -API 'Standards' -Tenant $Tenant -Message "Could not get the allowOTPTokens state for $Tenant. Error: $ErrorMessage" -Sev Error
+        Write-LogMessage -API 'Standards' -Tenant $Tenant -Message "Could not get the allowOAuthTokens state for $Tenant. Error: $ErrorMessage" -Sev Error
         return
     }
     $StateIsCorrect = ($CurrentState.state -eq 'enabled')
diff --git a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardintuneRestrictUserDeviceJoin.ps1 b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardintuneRestrictUserDeviceJoin.ps1
index c571ec659..b4c2d3d5f 100644
--- a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardintuneRestrictUserDeviceJoin.ps1
+++ b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardintuneRestrictUserDeviceJoin.ps1
@@ -56,7 +56,7 @@ function Invoke-CIPPStandardintuneRestrictUserDeviceJoin {
         if ($StateIsCorrect -eq $true) {
             Write-LogMessage -API 'Standards' -tenant $Tenant -message "Device join restriction is already configured (users allowed to join: $DesiredStateText)." -sev Info
         } elseif ($IsAdminConfigurable -eq $false) {
-            Write-LogMessage -API 'Standards' -tenant $Tenant -message 'Cannot remediate device join restriction: azureADJoin.isAdminConfigurable is false for this tenant. Skipping remediation.' -sev Warn
+            Write-LogMessage -API 'Standards' -tenant $Tenant -message 'Cannot remediate device join restriction: azureADJoin.isAdminConfigurable is false for this tenant. Skipping remediation.' -sev Warning
         } else {
             try {
                 $PreviousSetting.azureADJoin.allowedToJoin = @{ '@odata.type' = $DesiredOdataType; users = $null; groups = $null }
diff --git a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardintuneRestrictUserDeviceRegistration.ps1 b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardintuneRestrictUserDeviceRegistration.ps1
index ed8f8d5b3..2a65baeb6 100644
--- a/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardintuneRestrictUserDeviceRegistration.ps1
+++ b/backend/Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardintuneRestrictUserDeviceRegistration.ps1
@@ -56,7 +56,7 @@ function Invoke-CIPPStandardintuneRestrictUserDeviceRegistration {
         if ($StateIsCorrect -eq $true) {
             Write-LogMessage -API 'Standards' -tenant $Tenant -message "Device registration restriction is already configured (users allowed to register: $DesiredStateText)." -sev Info
         } elseif ($IsAdminConfigurable -eq $false) {
-            Write-LogMessage -API 'Standards' -tenant $Tenant -message 'Cannot remediate device registration restriction: azureADRegistration.isAdminConfigurable is false for this tenant (commonly because Intune is enabled). Skipping remediation.' -sev Warn
+            Write-LogMessage -API 'Standards' -tenant $Tenant -message 'Cannot remediate device registration restriction: azureADRegistration.isAdminConfigurable is false for this tenant (commonly because Intune is enabled). Skipping remediation.' -sev Warning
         } else {
             try {
                 $PreviousSetting.azureADRegistration.allowedToRegister = @{ '@odata.type' = $DesiredOdataType; users = $null; groups = $null }