From 48ea5fe7be4dca29a0b95afad2be5866536fc162 Mon Sep 17 00:00:00 2001
From: Jonathan Gillespie <jonathan.c.gillespie@gmail.com>
Date: Thu, 11 Jul 2024 11:57:44 -0400
Subject: [PATCH] Improved fully qualified references to code in the Schema and
 System namespaces (#712)

* Moved the existing name-shadowing classes in the extra-tests directory to be in separate subdirectories (one for each namespace, Schema and System)
    - There's just so many of them now!

* Added name-shadowing classes for several standard classes in the Schema and System namespaces & switched to using fully-qualified references for these classes:
    - Schema.ApexClass
    - Schema.ApexEmailNotification
    - Schema.ApexTrigger
    - Schema.AsyncApexJob
    - Schema.BatchApexErrorEvent
    - Schema.CustomPermission
    - Schema.DisplayType
    - Schema.FlowDefinitionView
    - Schema.FlowExecutionErrorEvent
    - Schema.FlowVersionView
    - Schema.PermissionSet
    - Schema.PermissionSetAssignment
    - Schema.SoapType
    - Schema.UserRecordAccess
    - Schema.UserRole
    - System.BatchableContext
    - System.Comparable
    - System.Database
    - System.EventBus
    - System.FinalizerContext
    - System.InstallHandler
    - System.JSON
    - System.Matcher
    - System.Pattern
    - System.PicklistEntry
    - System.Queueable
    - System.QueueableContext
    - System.Quiddity
    - System.Request
    - System.RestContext
    - System.RestRequest
    - System.RestResponse
    - System.Schedulable
    - System.SchedulableContext
    - System.Search
    - System.TriggerOperation
    - System.UUID

* Scope creep: fixed some flaky tests in LogBatchPurgeController_Tests
---
 README.md                                     |  10 +-
 docs/apex/Configuration/LoggerParameter.md    |  10 +-
 .../Configuration/LoggerTriggerableContext.md |   6 +-
 .../Log-Management/LogBatchPurgeController.md |  10 +-
 .../LogManagementDataSelector.md              |  60 +--
 .../LoggerSettingsController.md               |   2 +-
 .../Logger-Engine/LogEntryEventBuilder.md     | 115 ++++-
 docs/apex/Logger-Engine/Logger.md             |  10 +-
 docs/apex/Logger-Engine/LoggerDataStore.md    |  50 +-
 docs/apex/Logger-Engine/LoggerSObjectProxy.md |   6 +-
 docs/apex/Logger-Engine/LoggerStackTrace.md   |  10 -
 .../Test-Utilities/LoggerMockDataStore.md     |   8 +-
 .../configuration/classes/LoggerParameter.cls |  16 +-
 .../configuration/classes/LoggerPlugin.cls    |   6 +-
 .../classes/LoggerScenarioRule.cls            |   2 +-
 .../classes/LoggerTriggerableContext.cls      |   6 +-
 .../classes/LogBatchPurgeController.cls       |  16 +-
 .../classes/LogBatchPurgeScheduler.cls        |   2 +-
 .../log-management/classes/LogBatchPurger.cls |   8 +-
 .../classes/LogEntryEventHandler.cls          |   2 +-
 .../classes/LogEntryHandler.cls               |  42 +-
 .../log-management/classes/LogHandler.cls     |   2 +-
 .../classes/LogManagementDataSelector.cls     |  64 +--
 .../classes/LogMassDeleteExtension.cls        |   4 +-
 .../classes/LoggerEmailSender.cls             |   8 +-
 .../classes/LoggerSettingsController.cls      |   4 +-
 .../classes/RelatedLogEntriesController.cls   |   2 +-
 .../classes/FlowCollectionLogEntry.cls        |   5 +-
 .../logger-engine/classes/FlowLogEntry.cls    |   2 +-
 .../main/logger-engine/classes/FlowLogger.cls |   2 +-
 .../classes/FlowRecordLogEntry.cls            |   5 +-
 .../classes/LogEntryEventBuilder.cls          |  14 +-
 .../main/logger-engine/classes/Logger.cls     |  28 +-
 .../logger-engine/classes/LoggerDataStore.cls |   4 +-
 .../classes/LoggerEngineDataSelector.cls      |   3 +-
 .../classes/LoggerSObjectHandler.cls          |   2 +-
 .../classes/LoggerSObjectProxy.cls            |   4 +-
 .../lwc/logger/logEntryBuilder.js             |   2 +-
 .../classes/LoggerParameter_Tests.cls         | 126 +++--
 .../utilities/LoggerMockDataCreator.cls       |  34 +-
 .../classes/LogBatchPurgeController_Tests.cls |  49 +-
 .../classes/LogBatchPurger_Tests.cls          |  30 +-
 .../classes/LogEntryEventHandler_Tests.cls    |  10 +-
 .../LogEntryEventStreamController_Tests.cls   |   4 +-
 .../classes/LogEntryHandler_Tests.cls         |  82 ++--
 .../classes/LogHandler_Tests.cls              |  40 +-
 .../LogManagementDataSelector_Tests.cls       |  26 +-
 .../classes/LogMassDeleteExtension_Tests.cls  |   6 +-
 .../classes/LoggerEmailSender_Tests.cls       |  16 +-
 .../LoggerHomeHeaderController_Tests.cls      |   4 +-
 .../RelatedLogEntriesController_Tests.cls     |   2 +-
 .../utilities/LoggerTestConfigurator.cls      |  12 +-
 .../classes/ComponentLogger_Tests.cls         |   6 +-
 .../classes/FlowCollectionLogEntry_Tests.cls  |   8 +-
 .../classes/FlowLogEntry_Tests.cls            |   2 +-
 .../classes/FlowRecordLogEntry_Tests.cls      |   8 +-
 .../classes/LogEntryEventBuilder_Tests.cls    |  78 +--
 .../classes/LoggerDataStore_Tests.cls         |   6 +-
 .../LoggerEngineDataSelector_Tests.cls        |   4 +-
 .../classes/LoggerSObjectHandler_Tests.cls    |  58 +--
 .../LoggerTriggerableContext_Tests.cls        |   6 +-
 .../logger-engine/classes/Logger_Tests.cls    | 458 +++++++++---------
 .../utilities/LoggerMockDataStore.cls         |  18 +-
 .../classes/NebulaLogger_E2E_Tests.cls        |  16 +-
 .../name-shadowing/{ => Schema}/Account.cls   |   0
 .../{ => Schema}/Account.cls-meta.xml         |   0
 .../name-shadowing/Schema/ApexClass.cls       |  10 +
 .../ApexClass.cls-meta.xml}                   |   0
 .../Schema/ApexEmailNotification.cls          |  10 +
 .../ApexEmailNotification.cls-meta.xml}       |   0
 .../name-shadowing/Schema/ApexTrigger.cls     |  10 +
 .../ApexTrigger.cls-meta.xml}                 |   0
 .../name-shadowing/Schema/AsyncApexJob.cls    |  10 +
 .../AsyncApexJob.cls-meta.xml}                |   0
 .../{ => Schema}/AuthSession.cls              |   0
 .../AuthSession.cls-meta.xml}                 |   0
 .../Schema/BatchApexErrorEvent.cls            |  10 +
 .../BatchApexErrorEvent.cls-meta.xml}         |   0
 .../Schema/CustomPermission.cls               |  10 +
 .../CustomPermission.cls-meta.xml}            |   0
 .../name-shadowing/Schema/DisplayType.cls     |  10 +
 .../DisplayType.cls-meta.xml}                 |   0
 .../name-shadowing/{ => Schema}/FieldSet.cls  |   0
 .../FieldSet.cls-meta.xml}                    |   0
 .../{ => Schema}/FieldSetMember.cls           |   0
 .../FieldSetMember.cls-meta.xml}              |   0
 .../Schema/FlowDefinitionView.cls             |  10 +
 .../FlowDefinitionView.cls-meta.xml}          |   0
 .../Schema/FlowExecutionErrorEvent.cls        |  10 +
 .../FlowExecutionErrorEvent.cls-meta.xml}     |   0
 .../name-shadowing/Schema/FlowVersionView.cls |  10 +
 .../FlowVersionView.cls-meta.xml}             |   0
 .../{ => Schema}/LoginHistory.cls             |   0
 .../{ => Schema}/LoginHistory.cls-meta.xml    |   0
 .../name-shadowing/{ => Schema}/Network.cls   |   0
 .../{ => Schema}/Network.cls-meta.xml         |   0
 .../{ => Schema}/Organization.cls             |   0
 .../{ => Schema}/Organization.cls-meta.xml    |   0
 .../name-shadowing/Schema/PermissionSet.cls   |  10 +
 .../PermissionSet.cls-meta.xml}               |   0
 .../Schema/PermissionSetAssignment.cls        |  10 +
 .../PermissionSetAssignment.cls-meta.xml}     |   0
 .../name-shadowing/Schema/PicklistEntry.cls   |  10 +
 .../PicklistEntry.cls-meta.xml}               |   0
 .../name-shadowing/{ => Schema}/Profile.cls   |   0
 .../{ => Schema}/Profile.cls-meta.xml         |   0
 .../{ => Schema}/SObjectField.cls             |   0
 .../{ => Schema}/SObjectField.cls-meta.xml    |   0
 .../{ => Schema}/SObjectType.cls              |   0
 .../{ => Schema}/SObjectType.cls-meta.xml     |   0
 .../name-shadowing/Schema/SoapType.cls        |  10 +
 .../SoapType.cls-meta.xml}                    |   0
 .../name-shadowing/{ => Schema}/Topic.cls     |   0
 .../{ => Schema}/Topic.cls-meta.xml           |   0
 .../{ => Schema}/TopicAssignment.cls          |   0
 .../{ => Schema}/TopicAssignment.cls-meta.xml |   0
 .../name-shadowing/{ => Schema}/User.cls      |   0
 .../{ => Schema}/User.cls-meta.xml            |   0
 .../Schema/UserRecordAccess.cls               |  10 +
 .../UserRecordAccess.cls-meta.xml}            |   0
 .../name-shadowing/Schema/UserRole.cls        |  10 +
 .../UserRole.cls-meta.xml}                    |   0
 .../{ => System}/AccessType.cls               |   0
 .../AccessType.cls-meta.xml}                  |   0
 .../name-shadowing/{ => System}/Assert.cls    |   0
 .../Assert.cls-meta.xml}                      |   0
 .../{ => System}/AuraHandledException.cls     |   0
 .../System/AuraHandledException.cls-meta.xml  |   5 +
 .../System/BatchableContext.cls               |  10 +
 .../System/BatchableContext.cls-meta.xml      |   5 +
 .../{ => System}/CalloutException.cls         |   0
 .../System/CalloutException.cls-meta.xml      |   5 +
 .../name-shadowing/System/Comparable.cls      |  10 +
 .../System/Comparable.cls-meta.xml            |   5 +
 .../name-shadowing/System/Database.cls        |  10 +
 .../System/Database.cls-meta.xml              |   5 +
 .../{ => System}/DmlException.cls             |   0
 .../System/DmlException.cls-meta.xml          |   5 +
 .../name-shadowing/System/EventBus.cls        |  10 +
 .../System/EventBus.cls-meta.xml              |   5 +
 .../{ => System}/FeatureManagement.cls        |   0
 .../System/FeatureManagement.cls-meta.xml     |   5 +
 .../System/FinalizerContext.cls               |  10 +
 .../System/FinalizerContext.cls-meta.xml      |   5 +
 .../name-shadowing/{ => System}/Http.cls      |   0
 .../name-shadowing/System/Http.cls-meta.xml   |   5 +
 .../{ => System}/HttpCalloutMock.cls          |   0
 .../System/HttpCalloutMock.cls-meta.xml       |   5 +
 .../{ => System}/HttpRequest.cls              |   0
 .../System/HttpRequest.cls-meta.xml           |   5 +
 .../{ => System}/HttpResponse.cls             |   0
 .../System/HttpResponse.cls-meta.xml          |   5 +
 .../{ => System}/IllegalArgumentException.cls |   0
 .../IllegalArgumentException.cls-meta.xml     |   5 +
 .../name-shadowing/System/InstallHandler.cls  |  10 +
 .../System/InstallHandler.cls-meta.xml        |   5 +
 .../classes/name-shadowing/System/JSON.cls    |  10 +
 .../name-shadowing/System/JSON.cls-meta.xml   |   5 +
 .../name-shadowing/{ => System}/Limits.cls    |   0
 .../name-shadowing/System/Limits.cls-meta.xml |   5 +
 .../{ => System}/LoggingLevel.cls             |   0
 .../System/LoggingLevel.cls-meta.xml          |   5 +
 .../classes/name-shadowing/System/Matcher.cls |  10 +
 .../System/Matcher.cls-meta.xml               |   5 +
 .../classes/name-shadowing/System/Pattern.cls |  10 +
 .../System/Pattern.cls-meta.xml               |   5 +
 .../name-shadowing/System/Queueable.cls       |  10 +
 .../System/Queueable.cls-meta.xml             |   5 +
 .../System/QueueableContext.cls               |  10 +
 .../System/QueueableContext.cls-meta.xml      |   5 +
 .../name-shadowing/System/Quiddity.cls        |  10 +
 .../System/Quiddity.cls-meta.xml              |   5 +
 .../classes/name-shadowing/System/Request.cls |  10 +
 .../System/Request.cls-meta.xml               |   5 +
 .../name-shadowing/System/RestContext.cls     |  10 +
 .../System/RestContext.cls-meta.xml           |   5 +
 .../name-shadowing/System/RestRequest.cls     |  10 +
 .../System/RestRequest.cls-meta.xml           |   5 +
 .../name-shadowing/System/RestResponse.cls    |  10 +
 .../System/RestResponse.cls-meta.xml          |   5 +
 .../{ => System}/SObjectAccessDecision.cls    |   0
 .../System/SObjectAccessDecision.cls-meta.xml |   5 +
 .../name-shadowing/System/Schedulable.cls     |  10 +
 .../System/Schedulable.cls-meta.xml           |   5 +
 .../System/SchedulableContext.cls             |  10 +
 .../System/SchedulableContext.cls-meta.xml    |   5 +
 .../classes/name-shadowing/System/Search.cls  |  10 +
 .../name-shadowing/System/Search.cls-meta.xml |   5 +
 .../name-shadowing/{ => System}/Security.cls  |   0
 .../System/Security.cls-meta.xml              |   5 +
 .../name-shadowing/{ => System}/Test.cls      |   0
 .../name-shadowing/System/Test.cls-meta.xml   |   5 +
 .../System/TriggerOperation.cls               |  10 +
 .../System/TriggerOperation.cls-meta.xml      |   5 +
 .../name-shadowing/{ => System}/Type.cls      |   0
 .../name-shadowing/System/Type.cls-meta.xml   |   5 +
 .../classes/name-shadowing/System/UUID.cls    |  10 +
 .../name-shadowing/System/UUID.cls-meta.xml   |   5 +
 .../name-shadowing/{ => System}/UserInfo.cls  |   0
 .../System/UserInfo.cls-meta.xml              |   5 +
 .../tests/LogBatchPurger_Tests_Database.cls   |   2 +-
 .../tests/LogBatchPurger_Tests_Flow.cls       |   6 +-
 .../LogEntryEventBuilder_Tests_Network.cls    |   4 +-
 .../LogEntryEventBuilder_Tests_Security.cls   |  14 +-
 .../tests/LogEntryHandler_Tests_Flow.cls      |  18 +-
 ...ogEntryMetadataViwrCtlr_Tests_Security.cls |  14 +-
 .../LogManagementDataSelector_Tests_Flow.cls  |   6 +-
 ...LoggerEngineDataSelector_Tests_Network.cls |   2 +-
 .../tests/LoggerSObjectHandler_Tests_Flow.cls |   2 +-
 ...oggerSettingsController_Tests_Security.cls |   9 +-
 .../Logger_Tests_InboundEmailHandler.cls      |   2 +-
 .../tests/Logger_Tests_MergeResult.cls        |  56 +--
 .../classes/LoggerInstallHandler.cls          |   4 +-
 .../classes/LogBatchApexErrorEventHandler.cls |  18 +-
 .../LogBatchApexErrorEventHandler_Tests.cls   |   6 +-
 .../plugin/classes/LogFinalizer.cls           |   2 +-
 .../LogFlowExecutionErrorEventHandler.cls     |   6 +-
 ...ogFlowExecutionErrorEventHandler_Tests.cls |   6 +-
 .../classes/LogEntryArchiveController.cls     |   2 +-
 .../plugin/classes/LogEntryArchivePlugin.cls  |  12 +-
 .../classes/LogEntryArchivePlugin_Tests.cls   |   8 +-
 .../plugin/classes/LogRetentionFilter.cls     |   8 +-
 .../classes/LogRetentionFilter_Tests.cls      |   2 +-
 .../classes/LogRetentionRulesPlugin.cls       |   2 +-
 .../classes/LogRetentionRulesPlugin_Tests.cls |   8 +-
 .../slack/classes/SlackLoggerPlugin.cls       |  10 +-
 .../slack/classes/SlackLoggerPlugin_Tests.cls |  26 +-
 .../classes/Account_Batch_Logger_Example.cls  |   2 +-
 .../Account_Queueable_Logger_Example.cls      |   2 +-
 .../ExampleClassWithComplexLogging.cls        |   2 +-
 package.json                                  |   2 +-
 sfdx-project.json                             |   7 +-
 232 files changed, 1583 insertions(+), 903 deletions(-)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/Account.cls (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/Account.cls-meta.xml (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/Schema/ApexClass.cls
 rename nebula-logger/extra-tests/classes/name-shadowing/{AccessType.cls-meta.xml => Schema/ApexClass.cls-meta.xml} (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/Schema/ApexEmailNotification.cls
 rename nebula-logger/extra-tests/classes/name-shadowing/{Assert.cls-meta.xml => Schema/ApexEmailNotification.cls-meta.xml} (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/Schema/ApexTrigger.cls
 rename nebula-logger/extra-tests/classes/name-shadowing/{AuraHandledException.cls-meta.xml => Schema/ApexTrigger.cls-meta.xml} (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/Schema/AsyncApexJob.cls
 rename nebula-logger/extra-tests/classes/name-shadowing/{AuthSession.cls-meta.xml => Schema/AsyncApexJob.cls-meta.xml} (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/AuthSession.cls (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{CalloutException.cls-meta.xml => Schema/AuthSession.cls-meta.xml} (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/Schema/BatchApexErrorEvent.cls
 rename nebula-logger/extra-tests/classes/name-shadowing/{DmlException.cls-meta.xml => Schema/BatchApexErrorEvent.cls-meta.xml} (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/Schema/CustomPermission.cls
 rename nebula-logger/extra-tests/classes/name-shadowing/{FeatureManagement.cls-meta.xml => Schema/CustomPermission.cls-meta.xml} (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/Schema/DisplayType.cls
 rename nebula-logger/extra-tests/classes/name-shadowing/{FieldSet.cls-meta.xml => Schema/DisplayType.cls-meta.xml} (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/FieldSet.cls (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{FieldSetMember.cls-meta.xml => Schema/FieldSet.cls-meta.xml} (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/FieldSetMember.cls (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{Http.cls-meta.xml => Schema/FieldSetMember.cls-meta.xml} (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/Schema/FlowDefinitionView.cls
 rename nebula-logger/extra-tests/classes/name-shadowing/{HttpCalloutMock.cls-meta.xml => Schema/FlowDefinitionView.cls-meta.xml} (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/Schema/FlowExecutionErrorEvent.cls
 rename nebula-logger/extra-tests/classes/name-shadowing/{HttpRequest.cls-meta.xml => Schema/FlowExecutionErrorEvent.cls-meta.xml} (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/Schema/FlowVersionView.cls
 rename nebula-logger/extra-tests/classes/name-shadowing/{HttpResponse.cls-meta.xml => Schema/FlowVersionView.cls-meta.xml} (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/LoginHistory.cls (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/LoginHistory.cls-meta.xml (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/Network.cls (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/Network.cls-meta.xml (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/Organization.cls (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/Organization.cls-meta.xml (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/Schema/PermissionSet.cls
 rename nebula-logger/extra-tests/classes/name-shadowing/{IllegalArgumentException.cls-meta.xml => Schema/PermissionSet.cls-meta.xml} (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/Schema/PermissionSetAssignment.cls
 rename nebula-logger/extra-tests/classes/name-shadowing/{Limits.cls-meta.xml => Schema/PermissionSetAssignment.cls-meta.xml} (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/Schema/PicklistEntry.cls
 rename nebula-logger/extra-tests/classes/name-shadowing/{LoggingLevel.cls-meta.xml => Schema/PicklistEntry.cls-meta.xml} (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/Profile.cls (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/Profile.cls-meta.xml (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/SObjectField.cls (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/SObjectField.cls-meta.xml (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/SObjectType.cls (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/SObjectType.cls-meta.xml (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/Schema/SoapType.cls
 rename nebula-logger/extra-tests/classes/name-shadowing/{SObjectAccessDecision.cls-meta.xml => Schema/SoapType.cls-meta.xml} (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/Topic.cls (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/Topic.cls-meta.xml (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/TopicAssignment.cls (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/TopicAssignment.cls-meta.xml (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/User.cls (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => Schema}/User.cls-meta.xml (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/Schema/UserRecordAccess.cls
 rename nebula-logger/extra-tests/classes/name-shadowing/{Security.cls-meta.xml => Schema/UserRecordAccess.cls-meta.xml} (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/Schema/UserRole.cls
 rename nebula-logger/extra-tests/classes/name-shadowing/{Test.cls-meta.xml => Schema/UserRole.cls-meta.xml} (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => System}/AccessType.cls (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{Type.cls-meta.xml => System/AccessType.cls-meta.xml} (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => System}/Assert.cls (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{UserInfo.cls-meta.xml => System/Assert.cls-meta.xml} (100%)
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => System}/AuraHandledException.cls (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/AuraHandledException.cls-meta.xml
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/BatchableContext.cls
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/BatchableContext.cls-meta.xml
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => System}/CalloutException.cls (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/CalloutException.cls-meta.xml
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Comparable.cls
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Comparable.cls-meta.xml
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Database.cls
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Database.cls-meta.xml
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => System}/DmlException.cls (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/DmlException.cls-meta.xml
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/EventBus.cls
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/EventBus.cls-meta.xml
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => System}/FeatureManagement.cls (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/FeatureManagement.cls-meta.xml
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/FinalizerContext.cls
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/FinalizerContext.cls-meta.xml
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => System}/Http.cls (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Http.cls-meta.xml
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => System}/HttpCalloutMock.cls (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/HttpCalloutMock.cls-meta.xml
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => System}/HttpRequest.cls (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/HttpRequest.cls-meta.xml
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => System}/HttpResponse.cls (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/HttpResponse.cls-meta.xml
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => System}/IllegalArgumentException.cls (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/IllegalArgumentException.cls-meta.xml
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/InstallHandler.cls
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/InstallHandler.cls-meta.xml
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/JSON.cls
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/JSON.cls-meta.xml
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => System}/Limits.cls (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Limits.cls-meta.xml
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => System}/LoggingLevel.cls (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/LoggingLevel.cls-meta.xml
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Matcher.cls
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Matcher.cls-meta.xml
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Pattern.cls
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Pattern.cls-meta.xml
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Queueable.cls
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Queueable.cls-meta.xml
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/QueueableContext.cls
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/QueueableContext.cls-meta.xml
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Quiddity.cls
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Quiddity.cls-meta.xml
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Request.cls
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Request.cls-meta.xml
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/RestContext.cls
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/RestContext.cls-meta.xml
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/RestRequest.cls
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/RestRequest.cls-meta.xml
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/RestResponse.cls
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/RestResponse.cls-meta.xml
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => System}/SObjectAccessDecision.cls (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/SObjectAccessDecision.cls-meta.xml
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Schedulable.cls
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Schedulable.cls-meta.xml
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/SchedulableContext.cls
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/SchedulableContext.cls-meta.xml
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Search.cls
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Search.cls-meta.xml
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => System}/Security.cls (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Security.cls-meta.xml
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => System}/Test.cls (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Test.cls-meta.xml
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/TriggerOperation.cls
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/TriggerOperation.cls-meta.xml
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => System}/Type.cls (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/Type.cls-meta.xml
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/UUID.cls
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/UUID.cls-meta.xml
 rename nebula-logger/extra-tests/classes/name-shadowing/{ => System}/UserInfo.cls (100%)
 create mode 100644 nebula-logger/extra-tests/classes/name-shadowing/System/UserInfo.cls-meta.xml

diff --git a/README.md b/README.md
index 901289b3a..a03f23c67 100644
--- a/README.md
+++ b/README.md
@@ -5,15 +5,15 @@
 
 The most robust logger for Salesforce. Works with Apex, Lightning Components, Flow, Process Builder & Integrations. Designed for Salesforce admins, developers & architects.
 
-## Unlocked Package - v4.13.12
+## Unlocked Package - v4.13.13
 
-[![Install Unlocked Package in a Sandbox](./images/btn-install-unlocked-package-sandbox.png)](https://test.salesforce.com/packaging/installPackage.apexp?p0=04t5Y0000015oCkQAI)
-[![Install Unlocked Package in Production](./images/btn-install-unlocked-package-production.png)](https://login.salesforce.com/packaging/installPackage.apexp?p0=04t5Y0000015oCkQAI)
+[![Install Unlocked Package in a Sandbox](./images/btn-install-unlocked-package-sandbox.png)](https://test.salesforce.com/packaging/installPackage.apexp?p0=04t5Y0000015oDsQAI)
+[![Install Unlocked Package in Production](./images/btn-install-unlocked-package-production.png)](https://login.salesforce.com/packaging/installPackage.apexp?p0=04t5Y0000015oDsQAI)
 [![View Documentation](./images/btn-view-documentation.png)](https://jongpie.github.io/NebulaLogger/)
 
-`sf package install --wait 20 --security-type AdminsOnly --package 04t5Y0000015oCkQAI`
+`sf package install --wait 20 --security-type AdminsOnly --package 04t5Y0000015oDsQAI`
 
-`sfdx force:package:install --wait 20 --securitytype AdminsOnly --package 04t5Y0000015oCkQAI`
+`sfdx force:package:install --wait 20 --securitytype AdminsOnly --package 04t5Y0000015oDsQAI`
 
 ---
 
diff --git a/docs/apex/Configuration/LoggerParameter.md b/docs/apex/Configuration/LoggerParameter.md
index 8791a8ce5..96601e2ca 100644
--- a/docs/apex/Configuration/LoggerParameter.md
+++ b/docs/apex/Configuration/LoggerParameter.md
@@ -48,11 +48,11 @@ The name of the Platform Cache partition to use for caching (when platform cache
 
 #### `QUERY_APEX_CLASS_DATA` → `Boolean`
 
-Controls if Nebula Logger queries `ApexClass` data. When set to `false`, any `ApexClass` fields on `LogEntryEvent__e` and `Log__c` will not be populated Controlled by the custom metadata record `LoggerParameter.QueryApexClassData`, or `true` as the default
+Controls if Nebula Logger queries `Schema.ApexClass` data. When set to `false`, any `Schema.ApexClass` fields on `LogEntryEvent__e` and `Log__c` will not be populated Controlled by the custom metadata record `LoggerParameter.QueryApexClassData`, or `true` as the default
 
 #### `QUERY_APEX_TRIGGER_DATA` → `Boolean`
 
-Controls if Nebula Logger queries `ApexTrigger` data. When set to `false`, any `ApexTrigger` fields on `LogEntryEvent__e` and `Log__c` will not be populated Controlled by the custom metadata record `LoggerParameter.QueryApexTriggerData`, or `true` as the default
+Controls if Nebula Logger queries `Schema.ApexTrigger` data. When set to `false`, any `Schema.ApexTrigger` fields on `LogEntryEvent__e` and `Log__c` will not be populated Controlled by the custom metadata record `LoggerParameter.QueryApexTriggerData`, or `true` as the default
 
 #### `QUERY_AUTH_SESSION_DATA` → `Boolean`
 
@@ -64,7 +64,7 @@ Controls if Nebula Logger queries `Schema.AuthSession` data synchronously &amp;
 
 #### `QUERY_FLOW_DEFINITION_VIEW_DATA` → `Boolean`
 
-Controls if Nebula Logger queries `FlowDefinitionView` data. When set to `false`, any `FlowDefinitionView` fields on `LogEntryEvent__e` and `Log__c` will not be populated Controlled by the custom metadata record `LoggerParameter.QueryFlowDefinitionViewData`, or `true` as the default
+Controls if Nebula Logger queries `Schema.FlowDefinitionView` data. When set to `false`, any `Schema.FlowDefinitionView` fields on `LogEntryEvent__e` and `Log__c` will not be populated Controlled by the custom metadata record `LoggerParameter.QueryFlowDefinitionViewData`, or `true` as the default
 
 #### `QUERY_NETWORK_DATA` → `Boolean`
 
@@ -102,6 +102,10 @@ Indicates if Nebula Logger will enforce scenario-based logging to be used. When
 
 Indicates if Nebula Logger will send an error email notification if any internal exceptions occur. Controlled by the custom metadata record `LoggerParameter.SendErrorEmailNotifications`, or `true` as the default
 
+#### `STORE_HEAP_SIZE_LIMIT` → `Boolean`
+
+Indicates if Nebula Logger will store the transaction heap limits on `LogEntry__c`, retrieved from the class `System.Limits`. Controlled by the custom metadata record `LoggerParameter.StoreApexHeapSizeLimit`, or `true` as the default. Relies on `LoggerParameter.StoreTransactionLimits` to be true, as well.
+
 #### `STORE_HTTP_RESPONSE_HEADER_VALUES` → `Boolean`
 
 Indicates if Nebula Logger will store the header values when logging an instance of `System.HttpResponse`. Controlled by the custom metadata record `LoggerParameter.StoreHttpResponseHeaderValues`, or `true` as the default. Regardless of how this parameter is configured, Nebula Logger will still log the header keys of any instance of `System.HttpResponse` that is logged - this parameter only controls if the header values are stored.
diff --git a/docs/apex/Configuration/LoggerTriggerableContext.md b/docs/apex/Configuration/LoggerTriggerableContext.md
index 7662ab991..a8ae23709 100644
--- a/docs/apex/Configuration/LoggerTriggerableContext.md
+++ b/docs/apex/Configuration/LoggerTriggerableContext.md
@@ -16,9 +16,9 @@ Class used by the logging system for trigger contextual details
 
 ### Constructors
 
-#### `LoggerTriggerableContext(Schema.SObjectType sobjectType, TriggerOperation triggerOperationType, List<SObject> triggerNew)`
+#### `LoggerTriggerableContext(Schema.SObjectType sobjectType, System.TriggerOperation triggerOperationType, List<SObject> triggerNew)`
 
-#### `LoggerTriggerableContext(Schema.SObjectType sobjectType,TriggerOperation triggerOperationType,List<SObject> triggerNew,Map<Id, SObject> triggerNewMap,Map<Id, SObject> triggerOldMap)`
+#### `LoggerTriggerableContext(Schema.SObjectType sobjectType,System.TriggerOperation triggerOperationType,List<SObject> triggerNew,Map<Id, SObject> triggerNewMap,Map<Id, SObject> triggerOldMap)`
 
 ---
 
@@ -34,7 +34,7 @@ Class used by the logging system for trigger contextual details
 
 #### `triggerOldMap` → `Map<Id, SObject>`
 
-#### `triggerOperationType` → `TriggerOperation`
+#### `triggerOperationType` → `System.TriggerOperation`
 
 #### `triggerOperationTypeName` → `String`
 
diff --git a/docs/apex/Log-Management/LogBatchPurgeController.md b/docs/apex/Log-Management/LogBatchPurgeController.md
index 025c72178..af6338f61 100644
--- a/docs/apex/Log-Management/LogBatchPurgeController.md
+++ b/docs/apex/Log-Management/LogBatchPurgeController.md
@@ -24,19 +24,19 @@ Boolean
 
 true if the current user has delete permission on the Log\_\_c object.
 
-#### `getBatchPurgeJobRecords()` → `List<AsyncApexJob>`
+#### `getBatchPurgeJobRecords()` → `List<Schema.AsyncApexJob>`
 
-Returns `List&lt;AsyncApexJob&gt;` to display logBatchPurger jobs details in a Datatable.
+Returns `List&lt;Schema.AsyncApexJob&gt;` to display logBatchPurger jobs details in a Datatable.
 
 ##### Return
 
 **Type**
 
-List&lt;AsyncApexJob&gt;
+List&lt;Schema.AsyncApexJob&gt;
 
 **Description**
 
-The instance of `List&lt;AsyncApexJob&gt;`, containing list of logBatchPurge jobs.
+The instance of `List&lt;Schema.AsyncApexJob&gt;`, containing list of logBatchPurge jobs.
 
 #### `getMetrics(String dateFilterOption)` → `Map<String, Object>`
 
@@ -84,7 +84,7 @@ String
 
 **Description**
 
-Returns the ID of the AsyncApexJob object associated with the LogBatchPurger job as a string
+Returns the ID of the Schema.AsyncApexJob object associated with the LogBatchPurger job as a string
 
 ---
 
diff --git a/docs/apex/Log-Management/LogManagementDataSelector.md b/docs/apex/Log-Management/LogManagementDataSelector.md
index 348f4b30b..eb40e0e23 100644
--- a/docs/apex/Log-Management/LogManagementDataSelector.md
+++ b/docs/apex/Log-Management/LogManagementDataSelector.md
@@ -31,9 +31,9 @@ List&lt;SObject&gt;
 
 `List&lt;SObject&gt;` containing any records in the specified `SObjectType`
 
-#### `getApexClasses(Set<String> apexClassNames)` → `List<ApexClass>`
+#### `getApexClasses(Set<String> apexClassNames)` → `List<Schema.ApexClass>`
 
-Returns a list of `ApexClass` records
+Returns a list of `Schema.ApexClass` records
 
 ##### Parameters
 
@@ -45,15 +45,15 @@ Returns a list of `ApexClass` records
 
 **Type**
 
-List&lt;ApexClass&gt;
+List&lt;Schema.ApexClass&gt;
 
 **Description**
 
-`List&lt;ApexClass&gt;` containing any matching records
+`List&lt;Schema.ApexClass&gt;` containing any matching records
 
-#### `getApexTriggers(Set<String> apexTriggerNames)` → `List<ApexTrigger>`
+#### `getApexTriggers(Set<String> apexTriggerNames)` → `List<Schema.ApexTrigger>`
 
-Returns a list of `ApexTrigger` records
+Returns a list of `Schema.ApexTrigger` records
 
 ##### Parameters
 
@@ -65,11 +65,11 @@ Returns a list of `ApexTrigger` records
 
 **Type**
 
-List&lt;ApexTrigger&gt;
+List&lt;Schema.ApexTrigger&gt;
 
 **Description**
 
-`List&lt;ApexTrigger&gt;` containing any matching records
+`List&lt;Schema.ApexTrigger&gt;` containing any matching records
 
 #### `getById(Schema.SObjectType sobjectType, Set<String> fieldNames, List<Id> recordIds)` → `List<SObject>`
 
@@ -93,19 +93,19 @@ List&lt;SObject&gt;
 
 `List&lt;SObject&gt;` containing any matching records in the specified `SObjectType`
 
-#### `getCachedApexEmailNotifications()` → `List<ApexEmailNotification>`
+#### `getCachedApexEmailNotifications()` → `List<Schema.ApexEmailNotification>`
 
-Returns a cached copy of the `ApexEmailNotification` records in the org
+Returns a cached copy of the `Schema.ApexEmailNotification` records in the org
 
 ##### Return
 
 **Type**
 
-List&lt;ApexEmailNotification&gt;
+List&lt;Schema.ApexEmailNotification&gt;
 
 **Description**
 
-The cached `List&lt;ApexEmailNotification&gt;` records
+The cached `List&lt;Schema.ApexEmailNotification&gt;` records
 
 #### `getCachedRecentLogWithApiReleaseDetails()` → `Log__c`
 
@@ -123,15 +123,15 @@ The cached `Log__c` record, or `null` if no match is found
 
 #### `getCountOfAsyncApexJobs(String apexClassName, String apexMethodName, List<String> jobStatuses)` → `Integer`
 
-Returns the count of `AsyncApexJob` records with the specified Apex class name, method name &amp; job status
+Returns the count of `Schema.AsyncApexJob` records with the specified Apex class name, method name &amp; job status
 
 ##### Parameters
 
-| Param            | Description                                                                       |
-| ---------------- | --------------------------------------------------------------------------------- |
-| `apexClassName`  | The fully-qualified name of the Apex class associated with `AsyncApexJob`         |
-| `apexMethodName` | The specific method (if any) within the Apex class associated with `AsyncApexJob` |
-| `jobStatuses`    | The list of job statuses that should be used to filter `AsynxApexJob` records     |
+| Param            | Description                                                                              |
+| ---------------- | ---------------------------------------------------------------------------------------- |
+| `apexClassName`  | The fully-qualified name of the Apex class associated with `Schema.AsyncApexJob`         |
+| `apexMethodName` | The specific method (if any) within the Apex class associated with `Schema.AsyncApexJob` |
+| `jobStatuses`    | The list of job statuses that should be used to filter `AsynxApexJob` records            |
 
 ##### Return
 
@@ -163,9 +163,9 @@ Integer
 
 The `Integer` count of matching `LogEntry__c` records
 
-#### `getDeleteableUserRecordAccess(List<Id> recordIds)` → `List<UserRecordAccess>`
+#### `getDeleteableUserRecordAccess(List<Id> recordIds)` → `List<Schema.UserRecordAccess>`
 
-Returns the list of `UserRecordAccess` records for any of the specified record IDs that the current user can delete
+Returns the list of `Schema.UserRecordAccess` records for any of the specified record IDs that the current user can delete
 
 ##### Parameters
 
@@ -177,15 +177,15 @@ Returns the list of `UserRecordAccess` records for any of the specified record I
 
 **Type**
 
-List&lt;UserRecordAccess&gt;
+List&lt;Schema.UserRecordAccess&gt;
 
 **Description**
 
-The matching `List&lt;UserRecordAccess&gt;` records
+The matching `List&lt;Schema.UserRecordAccess&gt;` records
 
-#### `getFlowDefinitionViewsByFlowApiName(List<String> flowApiNames)` → `List<FlowDefinitionView>`
+#### `getFlowDefinitionViewsByFlowApiName(List<String> flowApiNames)` → `List<Schema.FlowDefinitionView>`
 
-Returns a list of `FlowDefinitionView` records
+Returns a list of `Schema.FlowDefinitionView` records
 
 ##### Parameters
 
@@ -197,15 +197,15 @@ Returns a list of `FlowDefinitionView` records
 
 **Type**
 
-List&lt;FlowDefinitionView&gt;
+List&lt;Schema.FlowDefinitionView&gt;
 
 **Description**
 
-`List&lt;FlowDefinitionView&gt;` containing any matching records
+`List&lt;Schema.FlowDefinitionView&gt;` containing any matching records
 
-#### `getFlowVersionViewsByDurableId(List<String> durableIds)` → `List<FlowVersionView>`
+#### `getFlowVersionViewsByDurableId(List<String> durableIds)` → `List<Schema.FlowVersionView>`
 
-Returns a list of `FlowVersionView` records description
+Returns a list of `Schema.FlowVersionView` records description
 
 ##### Parameters
 
@@ -217,11 +217,11 @@ Returns a list of `FlowVersionView` records description
 
 **Type**
 
-List&lt;FlowVersionView&gt;
+List&lt;Schema.FlowVersionView&gt;
 
 **Description**
 
-`List&lt;FlowDefinitionView&gt;` containing any matching records
+`List&lt;Schema.FlowDefinitionView&gt;` containing any matching records
 
 #### `getInstance()` → `LogManagementDataSelector`
 
diff --git a/docs/apex/Log-Management/LoggerSettingsController.md b/docs/apex/Log-Management/LoggerSettingsController.md
index 705b6bdd7..4a8ce40f1 100644
--- a/docs/apex/Log-Management/LoggerSettingsController.md
+++ b/docs/apex/Log-Management/LoggerSettingsController.md
@@ -185,7 +185,7 @@ Inner class used for sorting LoggerSettings\_\_c, used for 3 reasons: 1. Trying
 
 ###### `compareTo(Object compareTo)` → `Integer`
 
-Implements sorting logic for the `Comparable` interface
+Implements sorting logic for the `System.Comparable` interface
 
 ####### Parameters
 
diff --git a/docs/apex/Logger-Engine/LogEntryEventBuilder.md b/docs/apex/Logger-Engine/LogEntryEventBuilder.md
index 650bec0df..e2444bb14 100644
--- a/docs/apex/Logger-Engine/LogEntryEventBuilder.md
+++ b/docs/apex/Logger-Engine/LogEntryEventBuilder.md
@@ -14,19 +14,6 @@ Builder class that generates each `LogEntryEvent__e` record
 
 ### Constructors
 
-#### `LogEntryEventBuilder(LoggerSettings__c userSettings, System.LoggingLevel entryLoggingLevel, Boolean shouldSave, Set<String> ignoredOrigins)`
-
-`Deprecated` - Formally used by `Logger` to instantiate a new instance of `LogEntryEventBuilder`
-
-##### Parameters
-
-| Param               | Description                                                                                                        |
-| ------------------- | ------------------------------------------------------------------------------------------------------------------ |
-| `userSettings`      | The instance of `LoggerSettings__c` for the current to use to control any feature flags                            |
-| `entryLoggingLevel` | The `LoggingLevel` value to use for the log entry                                                                  |
-| `shouldSave`        | Indicates if the builder&apos;s instance of `LogEntryEvent__e` should be saved                                     |
-| `ignoredOrigins`    | A `Set&lt;String&gt;` of the names of any Apex classes that should be ignored when parsing the entry&apos;s origin |
-
 #### `LogEntryEventBuilder(LoggerSettings__c userSettings, System.LoggingLevel entryLoggingLevel, Boolean shouldSave)`
 
 Used by `Logger` to instantiate a new instance of `LogEntryEventBuilder`
@@ -41,6 +28,42 @@ Used by `Logger` to instantiate a new instance of `LogEntryEventBuilder`
 
 ---
 
+### Properties
+
+#### `aggregateQueriesMax` → `Integer`
+
+#### `asyncCallsMax` → `Integer`
+
+#### `calloutsMax` → `Integer`
+
+#### `cpuTimeMax` → `Integer`
+
+#### `dmlRowsMax` → `Integer`
+
+#### `dmlStatementsMax` → `Integer`
+
+#### `emailInvocationsMax` → `Integer`
+
+#### `futureCallsMax` → `Integer`
+
+#### `heapSizeMax` → `Integer`
+
+#### `mobilePushApexCallsMax` → `Integer`
+
+#### `publishImmediateDmlStatementsMax` → `Integer`
+
+#### `queueableJobsMax` → `Integer`
+
+#### `soqlQueriesMax` → `Integer`
+
+#### `soqlQueryLocatorRowsMax` → `Integer`
+
+#### `soqlQueryRowsMax` → `Integer`
+
+#### `soslSearchesMax` → `Integer`
+
+---
+
 ### Methods
 
 #### `addTag(String tag)` → `LogEntryEventBuilder`
@@ -417,6 +440,16 @@ LogEntryEventBuilder
 
 The same instance of `LogEntryEventBuilder`, useful for chaining methods
 
+#### `setLoggingContext(LoggingContext loggingContext)` → `void`
+
+**This is only intended to be used internally by Nebula Logger, and is subject to change.**
+
+##### Parameters
+
+| Param            | Description                                    |
+| ---------------- | ---------------------------------------------- |
+| `loggingContext` | Variables specific to the current Logger state |
+
 #### `setMessage(LogMessage logMessage)` → `LogEntryEventBuilder`
 
 Sets the log entry event&apos;s message field
@@ -583,9 +616,9 @@ Sets the log entry event&apos;s REST Request fields
 
 ##### Parameters
 
-| Param     | Description                          |
-| --------- | ------------------------------------ |
-| `request` | The instance of `RestRequest` to log |
+| Param     | Description                                 |
+| --------- | ------------------------------------------- |
+| `request` | The instance of `System.RestRequest` to log |
 
 ##### Return
 
@@ -603,9 +636,9 @@ Sets the log entry event&apos;s REST Response fields
 
 ##### Parameters
 
-| Param      | Description                           |
-| ---------- | ------------------------------------- |
-| `response` | The instance of `RestResponse` to log |
+| Param      | Description                                  |
+| ---------- | -------------------------------------------- |
+| `response` | The instance of `System.RestResponse` to log |
 
 ##### Return
 
@@ -617,6 +650,16 @@ LogEntryEventBuilder
 
 The same instance of `LogEntryEventBuilder`, useful for chaining methods
 
+#### `setTimestamp(Datetime timestamp)` → `void`
+
+**This is only intended to be used internally by Nebula Logger, and is subject to change.**
+
+##### Parameters
+
+| Param       | Description                                                     |
+| ----------- | --------------------------------------------------------------- |
+| `timestamp` | Datetime instance to set timestamp fields on this.logEntryEvent |
+
 #### `setTopics(List<String> tags)` → `LogEntryEventBuilder`
 
 Deprecated - use `addTags(List&lt;String&gt; tags)` instead. This method will be removed in a future release
@@ -652,3 +695,37 @@ Boolean
 A boolean set to true if the log entries should be saved.
 
 ---
+
+### Inner Classes
+
+#### LogEntryEventBuilder.LoggingContext class
+
+---
+
+##### Constructors
+
+###### `LoggingContext(String loggerVersionNumber,String organizationApiVersion,String organizationDomainUrl,String requestId,System.Quiddity systemMode,String transactionId)`
+
+---
+
+##### Properties
+
+###### `currentEntryScenario` → `String`
+
+###### `entryNumber` → `Integer`
+
+###### `loggerVersionNumber` → `String`
+
+###### `organizationApiVersion` → `String`
+
+###### `organizationDomainUrl` → `String`
+
+###### `requestId` → `String`
+
+###### `systemMode` → `System.Quiddity`
+
+###### `transactionId` → `String`
+
+###### `userLoggingLevel` → `System.LoggingLevel`
+
+---
diff --git a/docs/apex/Logger-Engine/Logger.md b/docs/apex/Logger-Engine/Logger.md
index 8f0f15b44..252b00a5b 100644
--- a/docs/apex/Logger-Engine/Logger.md
+++ b/docs/apex/Logger-Engine/Logger.md
@@ -3488,19 +3488,19 @@ Integer
 
 Integer
 
-#### `getCurrentQuiddity()` → `Quiddity`
+#### `getCurrentQuiddity()` → `System.Quiddity`
 
-Returns the Quiddity context of the current transaction.
+Returns the System.Quiddity context of the current transaction.
 
 ##### Return
 
 **Type**
 
-Quiddity
+System.Quiddity
 
 **Description**
 
-Quiddity - The value of System.Request.getCurrent().getQuiddity()
+System.Quiddity - The value of System.Request.getCurrent().getQuiddity()
 
 #### `getLoggingLevel(String loggingLevelName)` → `System.LoggingLevel`
 
@@ -5736,7 +5736,7 @@ The new entry&apos;s instance of `LogEntryEventBuilder`, useful for chaining met
 
 #### Logger.QueueableSaver class
 
-Inner class for publishing log entries via the Queueable interface.
+Inner class for publishing log entries via the System.Queueable interface.
 
 ---
 
diff --git a/docs/apex/Logger-Engine/LoggerDataStore.md b/docs/apex/Logger-Engine/LoggerDataStore.md
index 0fceeac96..46b7a9c63 100644
--- a/docs/apex/Logger-Engine/LoggerDataStore.md
+++ b/docs/apex/Logger-Engine/LoggerDataStore.md
@@ -52,6 +52,27 @@ JobQueue
 
 The singleton instance of `LoggerDataStore.JobQueue`
 
+#### `truncateFieldValue(Schema.SObjectField field, String value)` → `String`
+
+Truncates a string field using the max field length allowed for that `Schema.SObjectField`
+
+##### Parameters
+
+| Param   | Description                                                         |
+| ------- | ------------------------------------------------------------------- |
+| `field` | The `Schema.SObjectField` token to base the max field length off of |
+| `value` | The `String` value to truncate                                      |
+
+##### Return
+
+**Type**
+
+String
+
+**Description**
+
+The truncated value or null
+
 ---
 
 ### Inner Classes
@@ -466,7 +487,7 @@ Class used to centralize the handling of any platform event publishing operation
 
 ###### `publishRecord(SObject platformEvent)` → `Database.SaveResult`
 
-Publishes a single platform event record, using `EventBus.publish(SObject record);
+Publishes a single platform event record, using `EventBus.publish(SObject record);`
 
 ####### Parameters
 
@@ -486,7 +507,7 @@ The instance of `Database.SaveResult`, generated by the platform when publishing
 
 ###### `publishRecords(List<SObject> platformEvents)` → `List<Database.SaveResult>`
 
-Publishes a list of platform event records, using `EventBus.publish(List&lt;SObject&gt; records)`
+Publishes a list of platform event records, using `EventBus.publish(List&lt;SObject&gt; records);`
 
 ####### Parameters
 
@@ -504,27 +525,6 @@ List&lt;Database.SaveResult&gt;
 
 The instance of `List&lt;Database.SaveResult&gt;`, generated by the platform when publishing the platform event records
 
-###### `publishRecords(List<SObject> platformEvents, Database.DmlOptions dmlOptions)` → `List<Database.SaveResult>`
-
-Publishes a list of platform event records, using `EventBus.publish(List&lt;SObject&gt; records)`. The provided instance of `Database.DmlOptions` is used to control truncating of string fields before publishing the records.
-
-####### Parameters
-
-| Param            | Description                                                                       |
-| ---------------- | --------------------------------------------------------------------------------- |
-| `platformEvents` | The list of platform event records to publish                                     |
-| `dmlOptions`     | An instance of `Database.DmlOptions`, used to control truncating of string fields |
-
-####### Return
-
-**Type**
-
-List&lt;Database.SaveResult&gt;
-
-**Description**
-
-The instance of `List&lt;Database.SaveResult&gt;`, generated by the platform when publishing the platform event records
-
 ---
 
 #### LoggerDataStore.JobQueue class
@@ -535,9 +535,9 @@ Class used to centralize the handling of enqueueing any queueable jobs
 
 ##### Methods
 
-###### `enqueueJob(Queueable queueableJob)` → `Id`
+###### `enqueueJob(System.Queueable queueableJob)` → `Id`
 
-Enqueues a queueable job to execute asynchronously, using `System.enqueueJob(Queueable queueableJob)`
+Enqueues a queueable job to execute asynchronously, using `System.enqueueJob(System.Queueable queueableJob)`
 
 ####### Parameters
 
diff --git a/docs/apex/Logger-Engine/LoggerSObjectProxy.md b/docs/apex/Logger-Engine/LoggerSObjectProxy.md
index dd240084d..5cc6eb48f 100644
--- a/docs/apex/Logger-Engine/LoggerSObjectProxy.md
+++ b/docs/apex/Logger-Engine/LoggerSObjectProxy.md
@@ -12,7 +12,7 @@ Proxy class used as a middle layer between some problematic SObject Types and th
 
 #### LoggerSObjectProxy.AuthSession class
 
-All `Schema.AuthSession` SObjects are read-only in Apex, which makes them more difficult to work with, and impossible to mock field values directly during unit tests - even using tricks like JSON.deserialize() do not work. The `LoggerSObjectProxy.AuthSession` class acts as a substitute for a `Schema.AuthSession` record to provide the abilility to mock the data during unit &amp; integration tests.
+All `Schema.AuthSession` SObjects are read-only in Apex, which makes them more difficult to work with, and impossible to mock field values directly during unit tests - even using tricks like System.JSON.deserialize() do not work. The `LoggerSObjectProxy.AuthSession` class acts as a substitute for a `Schema.AuthSession` record to provide the abilility to mock the data during unit &amp; integration tests.
 
 ---
 
@@ -34,6 +34,8 @@ All `Schema.AuthSession` SObjects are read-only in Apex, which makes them more d
 
 ###### `LogoutUrl` → `String`
 
+###### `ParentId` → `Id`
+
 ###### `SessionSecurityLevel` → `String`
 
 ###### `SessionType` → `String`
@@ -46,7 +48,7 @@ All `Schema.AuthSession` SObjects are read-only in Apex, which makes them more d
 
 #### LoggerSObjectProxy.LoginHistory class
 
-All `Schema.LoginHistory` SObjects are read-only in Apex, which makes them more difficult to work with, and impossible to mock field values directly during unit tests - even using tricks like JSON.deserialize() do not work. The `LoggerSObjectProxy.LoginHistory` class acts as a substitute for a `Schema.LoginHistory` record to provide the abilility to mock the data during unit &amp; integration tests.
+All `Schema.LoginHistory` SObjects are read-only in Apex, which makes them more difficult to work with, and impossible to mock field values directly during unit tests - even using tricks like System.JSON.deserialize() do not work. The `LoggerSObjectProxy.LoginHistory` class acts as a substitute for a `Schema.LoginHistory` record to provide the abilility to mock the data during unit &amp; integration tests.
 
 ---
 
diff --git a/docs/apex/Logger-Engine/LoggerStackTrace.md b/docs/apex/Logger-Engine/LoggerStackTrace.md
index 7a1dea2ca..a8963fad9 100644
--- a/docs/apex/Logger-Engine/LoggerStackTrace.md
+++ b/docs/apex/Logger-Engine/LoggerStackTrace.md
@@ -97,16 +97,6 @@ Adds the specified string-based origin to the the current transaction&apos;s lis
 | `language` | The source language (Apex or JavaScript)                                     |
 | `origin`   | The string-based name of the Apex type or lightning component name to ignore |
 
-#### `ignoreOrigins(Set<System.Type> apexTypes)` → `void`
-
-Adds the specified Apex types to the list of ignored origin locations for the current transaction. Any ignored types will be removed from the StackTrace\_\_c field, and will be skipped when determining the log entry&apos;s origin location
-
-##### Parameters
-
-| Param       | Description                                                |
-| ----------- | ---------------------------------------------------------- |
-| `apexTypes` | A `Set` containing the Apex types of the classes to ignore |
-
 ---
 
 ### Inner Classes
diff --git a/docs/apex/Test-Utilities/LoggerMockDataStore.md b/docs/apex/Test-Utilities/LoggerMockDataStore.md
index 3173aa15a..a8bf42754 100644
--- a/docs/apex/Test-Utilities/LoggerMockDataStore.md
+++ b/docs/apex/Test-Utilities/LoggerMockDataStore.md
@@ -50,8 +50,6 @@ Utility class used to mock any data-related operations for the database, event b
 
 ###### `deliver(LoggerSObjectHandler sobjectHandlerInstance)` → `void`
 
-###### `getLastUsedDmlOptions()` → `Database.DmlOptions`
-
 ###### `getPublishCallCount()` → `Integer`
 
 ###### `getPublishedPlatformEvents()` → `List<SObject>`
@@ -60,8 +58,6 @@ Utility class used to mock any data-related operations for the database, event b
 
 ###### `publishRecords(List<SObject> platformEvents)` → `List<Database.SaveResult>`
 
-###### `publishRecords(List<SObject> platformEvents, Database.DmlOptions dmlOptions)` → `List<Database.SaveResult>`
-
 ---
 
 #### LoggerMockDataStore.MockJobQueue class
@@ -70,10 +66,10 @@ Utility class used to mock any data-related operations for the database, event b
 
 ##### Methods
 
-###### `enqueueJob(Queueable queueableJob)` → `Id`
+###### `enqueueJob(System.Queueable queueableJob)` → `Id`
 
 ###### `executeJobs()` → `void`
 
-###### `getEnqueuedJobs()` → `List<Queueable>`
+###### `getEnqueuedJobs()` → `List<System.Queueable>`
 
 ---
diff --git a/nebula-logger/core/main/configuration/classes/LoggerParameter.cls b/nebula-logger/core/main/configuration/classes/LoggerParameter.cls
index cc1fcb443..96039da48 100644
--- a/nebula-logger/core/main/configuration/classes/LoggerParameter.cls
+++ b/nebula-logger/core/main/configuration/classes/LoggerParameter.cls
@@ -152,8 +152,8 @@ public class LoggerParameter {
     }
 
     /**
-     * @description Controls if Nebula Logger queries `ApexClass` data.
-     *              When set to `false`, any `ApexClass` fields on `LogEntryEvent__e` and `Log__c` will not be populated
+     * @description Controls if Nebula Logger queries `Schema.ApexClass` data.
+     *              When set to `false`, any `Schema.ApexClass` fields on `LogEntryEvent__e` and `Log__c` will not be populated
      *              Controlled by the custom metadata record `LoggerParameter.QueryApexClassData`, or `true` as the default
      */
     public static final Boolean QUERY_APEX_CLASS_DATA {
@@ -167,8 +167,8 @@ public class LoggerParameter {
     }
 
     /**
-     * @description Controls if Nebula Logger queries `ApexTrigger` data.
-     *              When set to `false`, any `ApexTrigger` fields on `LogEntryEvent__e` and `Log__c` will not be populated
+     * @description Controls if Nebula Logger queries `Schema.ApexTrigger` data.
+     *              When set to `false`, any `Schema.ApexTrigger` fields on `LogEntryEvent__e` and `Log__c` will not be populated
      *              Controlled by the custom metadata record `LoggerParameter.QueryApexTriggerData`, or `true` as the default
      */
     public static final Boolean QUERY_APEX_TRIGGER_DATA {
@@ -213,8 +213,8 @@ public class LoggerParameter {
     }
 
     /**
-     * @description Controls if Nebula Logger queries `FlowDefinitionView` data.
-     *              When set to `false`, any `FlowDefinitionView` fields on `LogEntryEvent__e` and `Log__c` will not be populated
+     * @description Controls if Nebula Logger queries `Schema.FlowDefinitionView` data.
+     *              When set to `false`, any `Schema.FlowDefinitionView` fields on `LogEntryEvent__e` and `Log__c` will not be populated
      *              Controlled by the custom metadata record `LoggerParameter.QueryFlowDefinitionViewData`, or `true` as the default
      */
     public static final Boolean QUERY_FLOW_DEFINITION_VIEW_DATA {
@@ -802,7 +802,7 @@ public class LoggerParameter {
     @TestVisible
     private static void setMock(LoggerParameter__mdt parameter) {
         if (String.isBlank(parameter.DeveloperName)) {
-            throw new System.IllegalArgumentException('DeveloperName is required on `LoggerParameter__mdt: \n' + JSON.serializePretty(parameter));
+            throw new System.IllegalArgumentException('DeveloperName is required on `LoggerParameter__mdt: \n' + System.JSON.serializePretty(parameter));
         }
 
         DEVELOPER_NAME_TO_RECORD.put(parameter.DeveloperName, parameter);
@@ -813,7 +813,7 @@ public class LoggerParameter {
         if (parameterValue == null) {
             return null;
         } else {
-            return JSON.deserialize(parameterValue, dataType);
+            return System.JSON.deserialize(parameterValue, dataType);
         }
     }
 
diff --git a/nebula-logger/core/main/configuration/classes/LoggerPlugin.cls b/nebula-logger/core/main/configuration/classes/LoggerPlugin.cls
index 77a89fbfa..dea4d508a 100644
--- a/nebula-logger/core/main/configuration/classes/LoggerPlugin.cls
+++ b/nebula-logger/core/main/configuration/classes/LoggerPlugin.cls
@@ -118,7 +118,9 @@ public without sharing class LoggerPlugin {
     @TestVisible
     private static void setMock(LoggerPlugin__mdt pluginConfiguration) {
         if (String.isBlank(pluginConfiguration.DeveloperName)) {
-            throw new System.IllegalArgumentException('DeveloperName is required on mock LoggerPlugin__mdt: \n' + JSON.serializePretty(pluginConfiguration));
+            throw new System.IllegalArgumentException(
+                'DeveloperName is required on mock LoggerPlugin__mdt: \n' + System.JSON.serializePretty(pluginConfiguration)
+            );
         }
         if (pluginConfiguration.IsEnabled__c) {
             DEVELOPER_NAME_TO_RECORD.put(pluginConfiguration.DeveloperName, pluginConfiguration);
@@ -126,7 +128,7 @@ public without sharing class LoggerPlugin {
     }
 
     @SuppressWarnings('PMD.ApexDoc')
-    private class PluginConfigurationSorter implements Comparable {
+    private class PluginConfigurationSorter implements System.Comparable {
         public LoggerPlugin__mdt pluginConfiguration;
         private List<Schema.SObjectField> sortByFields = new List<Schema.SObjectField>();
 
diff --git a/nebula-logger/core/main/configuration/classes/LoggerScenarioRule.cls b/nebula-logger/core/main/configuration/classes/LoggerScenarioRule.cls
index 8435eee19..43b38184c 100644
--- a/nebula-logger/core/main/configuration/classes/LoggerScenarioRule.cls
+++ b/nebula-logger/core/main/configuration/classes/LoggerScenarioRule.cls
@@ -34,7 +34,7 @@ public without sharing class LoggerScenarioRule {
     @TestVisible
     private static void setMock(LoggerScenarioRule__mdt scenarioRule) {
         if (String.isBlank(scenarioRule.Scenario__c)) {
-            throw new System.IllegalArgumentException('Scenario__c is required on `LoggerScenarioRule__mdt: \n' + JSON.serializePretty(scenarioRule));
+            throw new System.IllegalArgumentException('Scenario__c is required on `LoggerScenarioRule__mdt: \n' + System.JSON.serializePretty(scenarioRule));
         }
 
         if (isValid(scenarioRule)) {
diff --git a/nebula-logger/core/main/configuration/classes/LoggerTriggerableContext.cls b/nebula-logger/core/main/configuration/classes/LoggerTriggerableContext.cls
index 96777840f..cc0edd821 100644
--- a/nebula-logger/core/main/configuration/classes/LoggerTriggerableContext.cls
+++ b/nebula-logger/core/main/configuration/classes/LoggerTriggerableContext.cls
@@ -12,7 +12,7 @@
 @SuppressWarnings('PMD.ApexDoc, PMD.ExcessiveParameterList')
 public without sharing class LoggerTriggerableContext {
     public Schema.SObjectType sobjectType { get; private set; }
-    public TriggerOperation triggerOperationType { get; private set; }
+    public System.TriggerOperation triggerOperationType { get; private set; }
     public List<SObject> triggerNew { get; private set; }
     public Map<Id, SObject> triggerNewMap { get; private set; }
     public Map<Id, SObject> triggerOldMap { get; private set; }
@@ -26,13 +26,13 @@ public without sharing class LoggerTriggerableContext {
     @AuraEnabled
     public List<RecordInput> triggerRecords { get; private set; }
 
-    public LoggerTriggerableContext(Schema.SObjectType sobjectType, TriggerOperation triggerOperationType, List<SObject> triggerNew) {
+    public LoggerTriggerableContext(Schema.SObjectType sobjectType, System.TriggerOperation triggerOperationType, List<SObject> triggerNew) {
         this(sobjectType, triggerOperationType, triggerNew, null, null);
     }
 
     public LoggerTriggerableContext(
         Schema.SObjectType sobjectType,
-        TriggerOperation triggerOperationType,
+        System.TriggerOperation triggerOperationType,
         List<SObject> triggerNew,
         Map<Id, SObject> triggerNewMap,
         Map<Id, SObject> triggerOldMap
diff --git a/nebula-logger/core/main/log-management/classes/LogBatchPurgeController.cls b/nebula-logger/core/main/log-management/classes/LogBatchPurgeController.cls
index f36b3a3d6..a3c13bec3 100644
--- a/nebula-logger/core/main/log-management/classes/LogBatchPurgeController.cls
+++ b/nebula-logger/core/main/log-management/classes/LogBatchPurgeController.cls
@@ -65,11 +65,11 @@ public with sharing class LogBatchPurgeController {
     }
 
     /**
-     * @description Returns `List<AsyncApexJob>` to display logBatchPurger jobs details in a Datatable.
-     * @return   The instance of `List<AsyncApexJob>`, containing list of logBatchPurge jobs.
+     * @description Returns `List<Schema.AsyncApexJob>` to display logBatchPurger jobs details in a Datatable.
+     * @return   The instance of `List<Schema.AsyncApexJob>`, containing list of logBatchPurge jobs.
      */
     @AuraEnabled
-    public static List<AsyncApexJob> getBatchPurgeJobRecords() {
+    public static List<Schema.AsyncApexJob> getBatchPurgeJobRecords() {
         List<String> qualifiedClassNamePieces = LogBatchPurger.class.getName().split('\\.');
         // If there are 2 pieces, then it
         String apexClassNamespacePrefix = qualifiedClassNamePieces.size() == 2 ? qualifiedClassNamePieces.get(0) : null;
@@ -89,11 +89,11 @@ public with sharing class LogBatchPurgeController {
 
     /**
      * @description execute the logBatchPurger batch with batch size 2000
-     * @return Returns the ID of the AsyncApexJob object associated with the LogBatchPurger job as a string
+     * @return Returns the ID of the Schema.AsyncApexJob object associated with the LogBatchPurger job as a string
      */
     @AuraEnabled
     public static String runBatchPurge() {
-        return Database.executeBatch(new LogBatchPurger(), LogBatchPurger.getDefaultBatchSize());
+        return System.Database.executeBatch(new LogBatchPurger(), LogBatchPurger.getDefaultBatchSize());
     }
 
     @TestVisible
@@ -102,7 +102,7 @@ public with sharing class LogBatchPurgeController {
             'select LogPurgeAction__c LogPurgeAction__c, count(id) from Log__c where CreatedDate=' +
             dateFilterOption +
             ' group by LogPurgeAction__c';
-        return Database.query(String.escapeSingleQuotes(query));
+        return System.Database.query(String.escapeSingleQuotes(query));
     }
 
     @TestVisible
@@ -111,7 +111,7 @@ public with sharing class LogBatchPurgeController {
             'select Log__r.LogPurgeAction__c LogPurgeAction__c, count(id) from LogEntry__c where CreatedDate=' +
             dateFilterOption +
             ' group by Log__r.LogPurgeAction__c';
-        return Database.query(String.escapeSingleQuotes(query));
+        return System.Database.query(String.escapeSingleQuotes(query));
     }
 
     @TestVisible
@@ -120,7 +120,7 @@ public with sharing class LogBatchPurgeController {
             'select LogEntry__r.Log__r.LogPurgeAction__c LogPurgeAction__c, count(id) from LogEntryTag__c where CreatedDate=' +
             dateFilterOption +
             ' group by LogEntry__r.Log__r.LogPurgeAction__c';
-        return Database.query(String.escapeSingleQuotes(query));
+        return System.Database.query(String.escapeSingleQuotes(query));
     }
 
     /**
diff --git a/nebula-logger/core/main/log-management/classes/LogBatchPurgeScheduler.cls b/nebula-logger/core/main/log-management/classes/LogBatchPurgeScheduler.cls
index a1d4a52ac..79329dd20 100644
--- a/nebula-logger/core/main/log-management/classes/LogBatchPurgeScheduler.cls
+++ b/nebula-logger/core/main/log-management/classes/LogBatchPurgeScheduler.cls
@@ -48,6 +48,6 @@ global with sharing class LogBatchPurgeScheduler implements System.Schedulable {
             this.batchSize = LogBatchPurger.getDefaultBatchSize();
         }
 
-        Database.executebatch(new LogBatchPurger().setChainedBatchSize(this.batchSize), this.batchSize);
+        System.Database.executeBatch(new LogBatchPurger().setChainedBatchSize(this.batchSize), this.batchSize);
     }
 }
diff --git a/nebula-logger/core/main/log-management/classes/LogBatchPurger.cls b/nebula-logger/core/main/log-management/classes/LogBatchPurger.cls
index 72aff2888..e43dd288c 100644
--- a/nebula-logger/core/main/log-management/classes/LogBatchPurger.cls
+++ b/nebula-logger/core/main/log-management/classes/LogBatchPurger.cls
@@ -144,7 +144,7 @@ global with sharing class LogBatchPurger implements Database.Batchable<SObject>,
 
         Id nextBatchJobId;
         if (this.currentSObjectType != Schema.Log__c.SObjectType) {
-            nextBatchJobId = Database.executeBatch(this, this.chainedBatchSize);
+            nextBatchJobId = System.Database.executeBatch(this, this.chainedBatchSize);
         }
 
         if (LoggerParameter.ENABLE_SYSTEM_MESSAGES) {
@@ -215,7 +215,7 @@ global with sharing class LogBatchPurger implements Database.Batchable<SObject>,
 
         switch on sobjectType.newSObject() {
             when LogEntryTag__c logEntryTag {
-                queryLocator = Database.getQueryLocator(
+                queryLocator = System.Database.getQueryLocator(
                     [
                         SELECT Id
                         FROM LogEntryTag__c
@@ -225,7 +225,7 @@ global with sharing class LogBatchPurger implements Database.Batchable<SObject>,
                 );
             }
             when LogEntry__c logEntry {
-                queryLocator = Database.getQueryLocator(
+                queryLocator = System.Database.getQueryLocator(
                     [
                         SELECT Id
                         FROM LogEntry__c
@@ -235,7 +235,7 @@ global with sharing class LogBatchPurger implements Database.Batchable<SObject>,
                 );
             }
             when Log__c log {
-                queryLocator = Database.getQueryLocator(
+                queryLocator = System.Database.getQueryLocator(
                     [
                         SELECT Id
                         FROM Log__c
diff --git a/nebula-logger/core/main/log-management/classes/LogEntryEventHandler.cls b/nebula-logger/core/main/log-management/classes/LogEntryEventHandler.cls
index 72a7e0dbb..f6e67753a 100644
--- a/nebula-logger/core/main/log-management/classes/LogEntryEventHandler.cls
+++ b/nebula-logger/core/main/log-management/classes/LogEntryEventHandler.cls
@@ -556,7 +556,7 @@ public without sharing class LogEntryEventHandler extends LoggerSObjectHandler {
                 ruleCriteriaMet = logEntryFieldValue == ruleComparisonValue;
             }
             when 'MATCHES_REGEX' {
-                ruleCriteriaMet = Pattern.compile(ruleComparisonValue).matcher(logEntryFieldValue).matches();
+                ruleCriteriaMet = System.Pattern.compile(ruleComparisonValue).matcher(logEntryFieldValue).matches();
             }
             when 'STARTS_WITH' {
                 ruleCriteriaMet = logEntryFieldValue.startsWith(ruleComparisonValue);
diff --git a/nebula-logger/core/main/log-management/classes/LogEntryHandler.cls b/nebula-logger/core/main/log-management/classes/LogEntryHandler.cls
index 538211d87..ddc152f18 100644
--- a/nebula-logger/core/main/log-management/classes/LogEntryHandler.cls
+++ b/nebula-logger/core/main/log-management/classes/LogEntryHandler.cls
@@ -64,8 +64,8 @@ public without sharing class LogEntryHandler extends LoggerSObjectHandler {
             return;
         }
 
-        Map<String, ApexClass> classNameToApexClass = new Map<String, ApexClass>();
-        for (ApexClass apexClass : LogManagementDataSelector.getInstance().getApexClasses(apexClassNames)) {
+        Map<String, Schema.ApexClass> classNameToApexClass = new Map<String, Schema.ApexClass>();
+        for (Schema.ApexClass apexClass : LogManagementDataSelector.getInstance().getApexClasses(apexClassNames)) {
             classNameToApexClass.put(apexClass.Name, apexClass);
         }
 
@@ -74,10 +74,10 @@ public without sharing class LogEntryHandler extends LoggerSObjectHandler {
         }
 
         for (LogEntry__c logEntry : apexClassLogEntries) {
-            ApexClass originApexClass = classNameToApexClass.get(logEntry.OriginSourceApiName__c);
+            Schema.ApexClass originApexClass = classNameToApexClass.get(logEntry.OriginSourceApiName__c);
             new OriginApexMetadataFieldApplier().apply(logEntry, originApexClass);
 
-            ApexClass exceptionApexClass = classNameToApexClass.get(logEntry.ExceptionSourceApiName__c);
+            Schema.ApexClass exceptionApexClass = classNameToApexClass.get(logEntry.ExceptionSourceApiName__c);
             new ExceptionApexMetadataFieldApplier().apply(logEntry, exceptionApexClass);
         }
     }
@@ -102,8 +102,8 @@ public without sharing class LogEntryHandler extends LoggerSObjectHandler {
             return;
         }
 
-        Map<String, ApexTrigger> triggerNameToApexTrigger = new Map<String, ApexTrigger>();
-        for (ApexTrigger apexTrigger : LogManagementDataSelector.getInstance().getApexTriggers(apexTriggerNames)) {
+        Map<String, Schema.ApexTrigger> triggerNameToApexTrigger = new Map<String, Schema.ApexTrigger>();
+        for (Schema.ApexTrigger apexTrigger : LogManagementDataSelector.getInstance().getApexTriggers(apexTriggerNames)) {
             triggerNameToApexTrigger.put(apexTrigger.Name, apexTrigger);
         }
 
@@ -112,10 +112,10 @@ public without sharing class LogEntryHandler extends LoggerSObjectHandler {
         }
 
         for (LogEntry__c logEntry : apexTriggerLogEntries) {
-            ApexTrigger originApexTrigger = triggerNameToApexTrigger.get(logEntry.OriginSourceApiName__c);
+            Schema.ApexTrigger originApexTrigger = triggerNameToApexTrigger.get(logEntry.OriginSourceApiName__c);
             new OriginApexMetadataFieldApplier().apply(logEntry, originApexTrigger);
 
-            ApexTrigger exceptionApexTrigger = triggerNameToApexTrigger.get(logEntry.ExceptionSourceApiName__c);
+            Schema.ApexTrigger exceptionApexTrigger = triggerNameToApexTrigger.get(logEntry.ExceptionSourceApiName__c);
             new ExceptionApexMetadataFieldApplier().apply(logEntry, exceptionApexTrigger);
         }
     }
@@ -143,8 +143,8 @@ public without sharing class LogEntryHandler extends LoggerSObjectHandler {
             return;
         }
 
-        Map<String, FlowDefinitionView> flowApiNameToDefinition = new Map<String, FlowDefinitionView>();
-        for (FlowDefinitionView flowDefinition : LogManagementDataSelector.getInstance().getFlowDefinitionViewsByFlowApiName(flowApiNames)) {
+        Map<String, Schema.FlowDefinitionView> flowApiNameToDefinition = new Map<String, Schema.FlowDefinitionView>();
+        for (Schema.FlowDefinitionView flowDefinition : LogManagementDataSelector.getInstance().getFlowDefinitionViewsByFlowApiName(flowApiNames)) {
             flowApiNameToDefinition.put(flowDefinition.ApiName, flowDefinition);
         }
 
@@ -153,7 +153,7 @@ public without sharing class LogEntryHandler extends LoggerSObjectHandler {
         }
 
         for (LogEntry__c logEntry : flowLogEntries) {
-            FlowDefinitionView flowDefinition = flowApiNameToDefinition.get(logEntry.OriginSourceApiName__c);
+            Schema.FlowDefinitionView flowDefinition = flowApiNameToDefinition.get(logEntry.OriginSourceApiName__c);
             if (flowDefinition == null) {
                 continue;
             }
@@ -191,8 +191,8 @@ public without sharing class LogEntryHandler extends LoggerSObjectHandler {
             return;
         }
 
-        Map<String, FlowVersionView> flowDurableIdToFlowVersionView = new Map<String, FlowVersionView>();
-        for (FlowVersionView flowVersionView : LogManagementDataSelector.getInstance().getFlowVersionViewsByDurableId(flowActiveVersionIds)) {
+        Map<String, Schema.FlowVersionView> flowDurableIdToFlowVersionView = new Map<String, Schema.FlowVersionView>();
+        for (Schema.FlowVersionView flowVersionView : LogManagementDataSelector.getInstance().getFlowVersionViewsByDurableId(flowActiveVersionIds)) {
             // Filtering on Status in SOQL seems to always return 0 results, so filter in code instead
             if (flowVersionView.Status == 'Active') {
                 flowDurableIdToFlowVersionView.put(flowVersionView.FlowDefinitionViewId, flowVersionView);
@@ -204,7 +204,7 @@ public without sharing class LogEntryHandler extends LoggerSObjectHandler {
         }
 
         for (LogEntry__c logEntry : flowLogEntries) {
-            FlowVersionView flowVersionView = flowDurableIdToFlowVersionView.get(logEntry.FlowDurableId__c);
+            Schema.FlowVersionView flowVersionView = flowDurableIdToFlowVersionView.get(logEntry.FlowDurableId__c);
             if (flowVersionView == null) {
                 continue;
             }
@@ -471,7 +471,7 @@ public without sharing class LogEntryHandler extends LoggerSObjectHandler {
         }
     }
 
-    // Helper classes that are used to apply field values for each entry's related ApexClass or ApexTrigger
+    // Helper classes that are used to apply field values for each entry's related Schema.ApexClass or Schema.ApexTrigger
     @SuppressWarnings('PMD.ApexDoc')
     private abstract class ApexMetadataFieldApplier {
         public abstract void apply(LogEntry__c logEntry, Schema.ApexClass topLevelApexClass);
@@ -495,7 +495,7 @@ public without sharing class LogEntryHandler extends LoggerSObjectHandler {
             logEntry.ExceptionSourceLastModifiedDate__c = apexClass.LastModifiedDate;
 
             LoggerStackTrace exceptionStackTrace = new LoggerStackTrace(logEntry.ExceptionStackTrace__c);
-            logEntry.ExceptionSourceSnippet__c = JSON.serializePretty(new SourceMetadataSnippet(exceptionStackTrace, apexClass));
+            logEntry.ExceptionSourceSnippet__c = System.JSON.serializePretty(new SourceMetadataSnippet(exceptionStackTrace, apexClass));
         }
 
         public override void apply(LogEntry__c logEntry, Schema.ApexTrigger apexTrigger) {
@@ -513,7 +513,7 @@ public without sharing class LogEntryHandler extends LoggerSObjectHandler {
             logEntry.ExceptionSourceLastModifiedDate__c = apexTrigger.LastModifiedDate;
 
             LoggerStackTrace exceptionStackTrace = new LoggerStackTrace(logEntry.ExceptionStackTrace__c);
-            logEntry.ExceptionSourceSnippet__c = JSON.serializePretty(new SourceMetadataSnippet(exceptionStackTrace, apexTrigger));
+            logEntry.ExceptionSourceSnippet__c = System.JSON.serializePretty(new SourceMetadataSnippet(exceptionStackTrace, apexTrigger));
         }
     }
 
@@ -526,7 +526,7 @@ public without sharing class LogEntryHandler extends LoggerSObjectHandler {
 
             LoggerStackTrace originStackTrace = new LoggerStackTrace(logEntry.StackTrace__c);
 
-            // Older ApexClass-specific fields
+            // Older Schema.ApexClass-specific fields
             logEntry.ApexClassApiVersion__c = 'v' + apexClass.ApiVersion;
             logEntry.ApexClassCreatedDate__c = apexClass.CreatedDate;
             logEntry.ApexClassId__c = apexClass.Id;
@@ -548,7 +548,7 @@ public without sharing class LogEntryHandler extends LoggerSObjectHandler {
             logEntry.OriginSourceLastModifiedById__c = apexClass.LastModifiedById;
             logEntry.OriginSourceLastModifiedByUsername__c = apexClass.LastModifiedBy.Username;
             logEntry.OriginSourceLastModifiedDate__c = apexClass.LastModifiedDate;
-            logEntry.OriginSourceSnippet__c = JSON.serializePretty(new SourceMetadataSnippet(originStackTrace, apexClass));
+            logEntry.OriginSourceSnippet__c = System.JSON.serializePretty(new SourceMetadataSnippet(originStackTrace, apexClass));
         }
 
         public override void apply(LogEntry__c logEntry, Schema.ApexTrigger apexTrigger) {
@@ -558,7 +558,7 @@ public without sharing class LogEntryHandler extends LoggerSObjectHandler {
 
             LoggerStackTrace originStackTrace = new LoggerStackTrace(logEntry.StackTrace__c);
 
-            // Currently, there aren't any ApexTrigger-specific fields on LogEntry__c,
+            // Currently, there aren't any Schema.ApexTrigger-specific fields on LogEntry__c,
             // so only set the newer, general-purpose 'origin source' fields
             logEntry.OriginSourceApiVersion__c = 'v' + apexTrigger.ApiVersion;
             logEntry.OriginSourceCreatedById__c = apexTrigger.CreatedById;
@@ -568,7 +568,7 @@ public without sharing class LogEntryHandler extends LoggerSObjectHandler {
             logEntry.OriginSourceLastModifiedById__c = apexTrigger.LastModifiedById;
             logEntry.OriginSourceLastModifiedByUsername__c = apexTrigger.LastModifiedBy.Username;
             logEntry.OriginSourceLastModifiedDate__c = apexTrigger.LastModifiedDate;
-            logEntry.OriginSourceSnippet__c = JSON.serializePretty(new SourceMetadataSnippet(originStackTrace, apexTrigger));
+            logEntry.OriginSourceSnippet__c = System.JSON.serializePretty(new SourceMetadataSnippet(originStackTrace, apexTrigger));
         }
     }
 }
diff --git a/nebula-logger/core/main/log-management/classes/LogHandler.cls b/nebula-logger/core/main/log-management/classes/LogHandler.cls
index 7b253bacf..2dd5528ec 100644
--- a/nebula-logger/core/main/log-management/classes/LogHandler.cls
+++ b/nebula-logger/core/main/log-management/classes/LogHandler.cls
@@ -93,7 +93,7 @@ public without sharing class LogHandler extends LoggerSObjectHandler {
         }
 
         for (Log__c log : this.logs) {
-            log.OrganizationLimits__c = JSON.serializePretty(ORGANIZATION_LIMITS);
+            log.OrganizationLimits__c = System.JSON.serializePretty(ORGANIZATION_LIMITS);
         }
     }
 
diff --git a/nebula-logger/core/main/log-management/classes/LogManagementDataSelector.cls b/nebula-logger/core/main/log-management/classes/LogManagementDataSelector.cls
index ef1d8890e..a6c4784c1 100644
--- a/nebula-logger/core/main/log-management/classes/LogManagementDataSelector.cls
+++ b/nebula-logger/core/main/log-management/classes/LogManagementDataSelector.cls
@@ -32,7 +32,7 @@ public without sharing virtual class LogManagementDataSelector {
      */
     public virtual List<SObject> getAll(Schema.SObjectType sobjectType, Set<String> fieldNames) {
         String query = String.format('SELECT {0} FROM {1}', new List<Object>{ String.join(fieldNames, ', '), sobjectType });
-        return Database.query(String.escapeSingleQuotes(query));
+        return System.Database.query(String.escapeSingleQuotes(query));
     }
 
     /**
@@ -45,17 +45,17 @@ public without sharing virtual class LogManagementDataSelector {
      */
     public virtual List<SObject> getById(Schema.SObjectType sobjectType, Set<String> fieldNames, List<Id> recordIds) {
         String query = String.format('SELECT {0} FROM {1} WHERE Id IN :recordIds', new List<Object>{ String.join(fieldNames, ', '), sobjectType });
-        return Database.query(String.escapeSingleQuotes(query));
+        return System.Database.query(String.escapeSingleQuotes(query));
     }
 
     /**
-     * @description Returns a list of `ApexClass` records
+     * @description Returns a list of `Schema.ApexClass` records
      * @param  apexClassNames The names of the Apex classes to query
-     * @return                `List<ApexClass>` containing any matching records
+     * @return                `List<Schema.ApexClass>` containing any matching records
      */
-    public virtual List<ApexClass> getApexClasses(Set<String> apexClassNames) {
+    public virtual List<Schema.ApexClass> getApexClasses(Set<String> apexClassNames) {
         if (LoggerParameter.QUERY_APEX_CLASS_DATA == false) {
-            return new List<ApexClass>();
+            return new List<Schema.ApexClass>();
         }
 
         return [
@@ -67,13 +67,13 @@ public without sharing virtual class LogManagementDataSelector {
     }
 
     /**
-     * @description Returns a list of `ApexTrigger` records
+     * @description Returns a list of `Schema.ApexTrigger` records
      * @param  apexTriggerNames The names of the Apex triggers to query
-     * @return                `List<ApexTrigger>` containing any matching records
+     * @return                `List<Schema.ApexTrigger>` containing any matching records
      */
-    public virtual List<ApexTrigger> getApexTriggers(Set<String> apexTriggerNames) {
+    public virtual List<Schema.ApexTrigger> getApexTriggers(Set<String> apexTriggerNames) {
         if (LoggerParameter.QUERY_APEX_TRIGGER_DATA == false) {
-            return new List<ApexTrigger>();
+            return new List<Schema.ApexTrigger>();
         }
 
         return [
@@ -85,16 +85,16 @@ public without sharing virtual class LogManagementDataSelector {
     }
 
     /**
-     * @description Returns a cached copy of the `ApexEmailNotification` records in the org
-     * @return   The cached `List<ApexEmailNotification>` records
+     * @description Returns a cached copy of the `Schema.ApexEmailNotification` records in the org
+     * @return   The cached `List<Schema.ApexEmailNotification>` records
      */
-    public virtual List<ApexEmailNotification> getCachedApexEmailNotifications() {
+    public virtual List<Schema.ApexEmailNotification> getCachedApexEmailNotifications() {
         String cacheKey = 'ApexEmailNotifications';
         if (LoggerCache.getOrganizationCache().contains(cacheKey)) {
-            return (List<ApexEmailNotification>) LoggerCache.getOrganizationCache().get(cacheKey);
+            return (List<Schema.ApexEmailNotification>) LoggerCache.getOrganizationCache().get(cacheKey);
         }
 
-        List<ApexEmailNotification> apexEmailNotifications = [
+        List<Schema.ApexEmailNotification> apexEmailNotifications = [
             SELECT Email, UserId
             FROM ApexEmailNotification
             WHERE Email != NULL OR User.IsActive = TRUE
@@ -136,9 +136,9 @@ public without sharing virtual class LogManagementDataSelector {
     }
 
     /**
-     * @description Returns the count of `AsyncApexJob` records with the specified Apex class name, method name & job status
-     * @param  apexClassName  The fully-qualified name of the Apex class associated with `AsyncApexJob`
-     * @param  apexMethodName The specific method (if any) within the Apex class associated with `AsyncApexJob`
+     * @description Returns the count of `Schema.AsyncApexJob` records with the specified Apex class name, method name & job status
+     * @param  apexClassName  The fully-qualified name of the Apex class associated with `Schema.AsyncApexJob`
+     * @param  apexMethodName The specific method (if any) within the Apex class associated with `Schema.AsyncApexJob`
      * @param  jobStatuses    The list of job statuses that should be used to filter `AsynxApexJob` records
      * @return                The `Integer` count of matching `AsynxApexJob` records
      */
@@ -156,22 +156,22 @@ public without sharing virtual class LogManagementDataSelector {
     }
 
     /**
-     * @description Returns the list of `UserRecordAccess` records for any of the specified record IDs that the current user can delete
+     * @description Returns the list of `Schema.UserRecordAccess` records for any of the specified record IDs that the current user can delete
      * @param  recordIds The list of `ID` for records to be deleted
-     * @return           The matching `List<UserRecordAccess>` records
+     * @return           The matching `List<Schema.UserRecordAccess>` records
      */
-    public virtual List<UserRecordAccess> getDeleteableUserRecordAccess(List<Id> recordIds) {
+    public virtual List<Schema.UserRecordAccess> getDeleteableUserRecordAccess(List<Id> recordIds) {
         return [SELECT RecordId FROM UserRecordAccess WHERE UserId = :System.UserInfo.getUserId() AND RecordId IN :recordIds AND HasDeleteAccess = TRUE];
     }
 
     /**
-     * @description Returns a list of `FlowDefinitionView` records
+     * @description Returns a list of `Schema.FlowDefinitionView` records
      * @param  flowApiNames The names of the Apex classes to query
-     * @return              `List<FlowDefinitionView>` containing any matching records
+     * @return              `List<Schema.FlowDefinitionView>` containing any matching records
      */
-    public virtual List<FlowDefinitionView> getFlowDefinitionViewsByFlowApiName(List<String> flowApiNames) {
+    public virtual List<Schema.FlowDefinitionView> getFlowDefinitionViewsByFlowApiName(List<String> flowApiNames) {
         if (LoggerParameter.QUERY_FLOW_DEFINITION_VIEW_DATA == false) {
-            return new List<FlowDefinitionView>();
+            return new List<Schema.FlowDefinitionView>();
         }
 
         return [
@@ -196,11 +196,11 @@ public without sharing virtual class LogManagementDataSelector {
     }
 
     /**
-     * @description Returns a list of `FlowVersionView` records description
+     * @description Returns a list of `Schema.FlowVersionView` records description
      * @param  durableIds The durable IDs of the Flows to query
-     * @return            `List<FlowDefinitionView>` containing any matching records
+     * @return            `List<Schema.FlowDefinitionView>` containing any matching records
      */
-    public virtual List<FlowVersionView> getFlowVersionViewsByDurableId(List<String> durableIds) {
+    public virtual List<Schema.FlowVersionView> getFlowVersionViewsByDurableId(List<String> durableIds) {
         return [SELECT ApiVersionRuntime, FlowDefinitionViewId, RunInMode, Status, VersionNumber FROM FlowVersionView WHERE DurableId IN :durableIds];
     }
 
@@ -217,7 +217,7 @@ public without sharing virtual class LogManagementDataSelector {
         List<String> textReplacements = new List<String>{ String.join(logFieldNames, ','), Schema.Log__c.SObjectType.getDescribe().getName() };
 
         String query = String.format(queryTemplate, textReplacements);
-        return (Log__c) Database.query(String.escapeSingleQuotes(query));
+        return (Log__c) System.Database.query(String.escapeSingleQuotes(query));
     }
 
     /**
@@ -232,7 +232,7 @@ public without sharing virtual class LogManagementDataSelector {
         List<String> textReplacements = new List<String>{ String.join(logEntryFieldNames, ','), Schema.LogEntry__c.SObjectType.getDescribe().getName() };
 
         String query = String.format(queryTemplate, textReplacements);
-        return (LogEntry__c) Database.query(String.escapeSingleQuotes(query));
+        return (LogEntry__c) System.Database.query(String.escapeSingleQuotes(query));
     }
 
     /**
@@ -252,7 +252,7 @@ public without sharing virtual class LogManagementDataSelector {
         };
 
         String query = String.format(queryTemplate, textReplacements);
-        return (List<LogEntry__c>) Database.query(String.escapeSingleQuotes(query));
+        return (List<LogEntry__c>) System.Database.query(String.escapeSingleQuotes(query));
     }
 
     /**
@@ -342,7 +342,7 @@ public without sharing virtual class LogManagementDataSelector {
         String logEntryQuery = 'SELECT {0} FROM {1} WHERE {2} = :recordId ORDER BY {3} LIMIT {4}';
         logEntryQuery = String.format(logEntryQuery, queryTextReplacements);
 
-        return (List<LogEntry__c>) Database.query(String.escapeSingleQuotes(logEntryQuery));
+        return (List<LogEntry__c>) System.Database.query(String.escapeSingleQuotes(logEntryQuery));
     }
 
     /**
diff --git a/nebula-logger/core/main/log-management/classes/LogMassDeleteExtension.cls b/nebula-logger/core/main/log-management/classes/LogMassDeleteExtension.cls
index 349f9ff38..5f3c34768 100644
--- a/nebula-logger/core/main/log-management/classes/LogMassDeleteExtension.cls
+++ b/nebula-logger/core/main/log-management/classes/LogMassDeleteExtension.cls
@@ -33,7 +33,7 @@ public with sharing class LogMassDeleteExtension {
      * @return      The matching `Log__c` records that the current user has access to delete
      */
     public List<Log__c> getDeletableLogs() {
-        // The UserRecordAccess object is weird - RecordId is not an actual ID field, so you can't filter using `List<SObject>` or `List<Id>`, you have to use strings
+        // The Schema.UserRecordAccess object is weird - RecordId is not an actual ID field, so you can't filter using `List<SObject>` or `List<Id>`, you have to use strings
         // So, here's some code that would be unnecessary if RecordId were a polymorphic ID field instead
         List<String> logIds = new List<String>();
         for (Log__c selectedLog : (List<Log__c>) this.controller.getSelected()) {
@@ -42,7 +42,7 @@ public with sharing class LogMassDeleteExtension {
 
         // Get the list of record IDs that the current user can delete
         List<Id> deletableLogIds = new List<Id>();
-        for (UserRecordAccess recordAccess : LogManagementDataSelector.getInstance().getDeleteableUserRecordAccess(logIds)) {
+        for (Schema.UserRecordAccess recordAccess : LogManagementDataSelector.getInstance().getDeleteableUserRecordAccess(logIds)) {
             deletableLogIds.add(recordAccess.RecordId);
         }
 
diff --git a/nebula-logger/core/main/log-management/classes/LoggerEmailSender.cls b/nebula-logger/core/main/log-management/classes/LoggerEmailSender.cls
index 0221d4c3d..2e68a81d3 100644
--- a/nebula-logger/core/main/log-management/classes/LoggerEmailSender.cls
+++ b/nebula-logger/core/main/log-management/classes/LoggerEmailSender.cls
@@ -10,12 +10,12 @@
 @SuppressWarnings('PMD.CognitiveComplexity, PMD.PropertyNamingConventions')
 public without sharing class LoggerEmailSender {
     @TestVisible
-    private static final List<ApexEmailNotification> MOCK_NOTIFICATIONS = new List<ApexEmailNotification>();
+    private static final List<Schema.ApexEmailNotification> MOCK_NOTIFICATIONS = new List<Schema.ApexEmailNotification>();
     @TestVisible
     private static final List<Messaging.SingleEmailMessage> SENT_EMAILS = new List<Messaging.SingleEmailMessage>();
 
     @TestVisible
-    private static final List<ApexEmailNotification> CACHED_APEX_ERROR_RECIPIENTS {
+    private static final List<Schema.ApexEmailNotification> CACHED_APEX_ERROR_RECIPIENTS {
         get {
             if (CACHED_APEX_ERROR_RECIPIENTS == null) {
                 CACHED_APEX_ERROR_RECIPIENTS = queryApexErrrorRecipients();
@@ -189,8 +189,8 @@ public without sharing class LoggerEmailSender {
         return String.format(emailBodyTemplate, emailBodyInputs);
     }
 
-    private static List<ApexEmailNotification> queryApexErrrorRecipients() {
-        List<ApexEmailNotification> notifications = LogManagementDataSelector.getInstance().getCachedApexEmailNotifications();
+    private static List<Schema.ApexEmailNotification> queryApexErrrorRecipients() {
+        List<Schema.ApexEmailNotification> notifications = LogManagementDataSelector.getInstance().getCachedApexEmailNotifications();
         if (System.Test.isRunningTest()) {
             notifications.clear();
             notifications.addAll(MOCK_NOTIFICATIONS);
diff --git a/nebula-logger/core/main/log-management/classes/LoggerSettingsController.cls b/nebula-logger/core/main/log-management/classes/LoggerSettingsController.cls
index 2e7573ebf..714445d50 100644
--- a/nebula-logger/core/main/log-management/classes/LoggerSettingsController.cls
+++ b/nebula-logger/core/main/log-management/classes/LoggerSettingsController.cls
@@ -367,7 +367,7 @@ public without sharing class LoggerSettingsController {
      *      2. Records tied to profiles do not return the actual profile name in SetupOwner.Name - example: System Admin returns as 'PT1' in query results
      *      3. Records tied to the org or profiles return unhelpful values in SetupOwner.Type - org returns '00D', profiles return '00e'
      */
-    public class SettingsRecordResult implements Comparable {
+    public class SettingsRecordResult implements System.Comparable {
         @AuraEnabled
         public String setupOwnerType;
         @AuraEnabled
@@ -380,7 +380,7 @@ public without sharing class LoggerSettingsController {
         public LoggerSettings__c record;
 
         /**
-         * @description Implements sorting logic for the `Comparable` interface
+         * @description Implements sorting logic for the `System.Comparable` interface
          * @param  compareTo The object to compare to when sorting the current item
          * @return           The sorting result
          */
diff --git a/nebula-logger/core/main/log-management/classes/RelatedLogEntriesController.cls b/nebula-logger/core/main/log-management/classes/RelatedLogEntriesController.cls
index 9727c07c5..e1ab6d7fa 100644
--- a/nebula-logger/core/main/log-management/classes/RelatedLogEntriesController.cls
+++ b/nebula-logger/core/main/log-management/classes/RelatedLogEntriesController.cls
@@ -75,7 +75,7 @@ public with sharing class RelatedLogEntriesController {
         String logEntrySearch = 'FIND {0} IN ALL FIELDS RETURNING {1}({2} WHERE {3} = :recordId ORDER BY {4} LIMIT {5})';
         logEntrySearch = String.format(logEntrySearch, searchTextReplacements);
 
-        return (List<LogEntry__c>) Search.query(logEntrySearch).get(0);
+        return (List<LogEntry__c>) System.Search.query(logEntrySearch).get(0);
     }
 
     private static String getFieldsClause(List<FieldMetadata> fields) {
diff --git a/nebula-logger/core/main/logger-engine/classes/FlowCollectionLogEntry.cls b/nebula-logger/core/main/logger-engine/classes/FlowCollectionLogEntry.cls
index b3e7bc8c0..320ade280 100644
--- a/nebula-logger/core/main/logger-engine/classes/FlowCollectionLogEntry.cls
+++ b/nebula-logger/core/main/logger-engine/classes/FlowCollectionLogEntry.cls
@@ -99,7 +99,10 @@ global inherited sharing class FlowCollectionLogEntry {
     global static List<String> addFlowCollectionEntries(List<FlowCollectionLogEntry> flowCollectionLogEntries) {
         List<FlowLogger.LogEntry> shadowLogEntries = new List<FlowLogger.LogEntry>();
         for (FlowCollectionLogEntry flowCollectionLogEntry : flowCollectionLogEntries) {
-            FlowLogger.LogEntry shadowLogEntry = (FlowLogger.LogEntry) JSON.deserialize(JSON.serialize(flowCollectionLogEntry), FlowLogger.LogEntry.class);
+            FlowLogger.LogEntry shadowLogEntry = (FlowLogger.LogEntry) System.JSON.deserialize(
+                System.JSON.serialize(flowCollectionLogEntry),
+                FlowLogger.LogEntry.class
+            );
             LogEntryEventBuilder builder = shadowLogEntry.addToLoggerBuffer()?.setRecord(flowCollectionLogEntry.records);
             if (builder.shouldSave() && flowCollectionLogEntry.records?.size() > 0) {
                 builder.getLogEntryEvent().RecordSObjectType__c = flowCollectionLogEntry.records.get(0).getSObjectType().getDescribe().getName();
diff --git a/nebula-logger/core/main/logger-engine/classes/FlowLogEntry.cls b/nebula-logger/core/main/logger-engine/classes/FlowLogEntry.cls
index 86018c3db..5bd38b791 100644
--- a/nebula-logger/core/main/logger-engine/classes/FlowLogEntry.cls
+++ b/nebula-logger/core/main/logger-engine/classes/FlowLogEntry.cls
@@ -95,7 +95,7 @@ global inherited sharing class FlowLogEntry {
     global static List<String> addFlowEntries(List<FlowLogEntry> flowLogEntries) {
         List<FlowLogger.LogEntry> shadowLogEntries = new List<FlowLogger.LogEntry>();
         for (FlowLogEntry flowLogEntry : flowLogEntries) {
-            FlowLogger.LogEntry shadowLogEntry = (FlowLogger.LogEntry) JSON.deserialize(JSON.serialize(flowLogEntry), FlowLogger.LogEntry.class);
+            FlowLogger.LogEntry shadowLogEntry = (FlowLogger.LogEntry) System.JSON.deserialize(System.JSON.serialize(flowLogEntry), FlowLogger.LogEntry.class);
             shadowLogEntry.addToLoggerBuffer()?.setRecordId(flowLogEntry.recordId);
 
             shadowLogEntries.add(shadowLogEntry);
diff --git a/nebula-logger/core/main/logger-engine/classes/FlowLogger.cls b/nebula-logger/core/main/logger-engine/classes/FlowLogger.cls
index 34ae01df8..76065f7d4 100644
--- a/nebula-logger/core/main/logger-engine/classes/FlowLogger.cls
+++ b/nebula-logger/core/main/logger-engine/classes/FlowLogger.cls
@@ -29,7 +29,7 @@ public inherited sharing class FlowLogger {
     //                       which also causes issues with sharing logic between classes (via abstract and virtual classes)
     // +3 goofiness points: if we duplicate properties between classes, we can convert all other classes
     //                      to one common class (FlowLogger.LogEntry), and use it for shared logic.
-    //                      For maximum goofiness, the conversion between classes happens using JSON.deserialize()
+    //                      For maximum goofiness, the conversion between classes happens using System.JSON.deserialize()
     /**
      * @description Inner, wrapper class containing Log Entry information.
      */
diff --git a/nebula-logger/core/main/logger-engine/classes/FlowRecordLogEntry.cls b/nebula-logger/core/main/logger-engine/classes/FlowRecordLogEntry.cls
index 19f065549..e04b238be 100644
--- a/nebula-logger/core/main/logger-engine/classes/FlowRecordLogEntry.cls
+++ b/nebula-logger/core/main/logger-engine/classes/FlowRecordLogEntry.cls
@@ -96,7 +96,10 @@ global inherited sharing class FlowRecordLogEntry {
     global static List<String> addFlowRecordEntries(List<FlowRecordLogEntry> flowRecordLogEntries) {
         List<FlowLogger.LogEntry> shadowLogEntries = new List<FlowLogger.LogEntry>();
         for (FlowRecordLogEntry flowRecordLogEntry : flowRecordLogEntries) {
-            FlowLogger.LogEntry shadowLogEntry = (FlowLogger.LogEntry) JSON.deserialize(JSON.serialize(flowRecordLogEntry), FlowLogger.LogEntry.class);
+            FlowLogger.LogEntry shadowLogEntry = (FlowLogger.LogEntry) System.JSON.deserialize(
+                System.JSON.serialize(flowRecordLogEntry),
+                FlowLogger.LogEntry.class
+            );
             shadowLogEntry.addToLoggerBuffer()?.setRecord(flowRecordLogEntry.record);
 
             shadowLogEntries.add(shadowLogEntry);
diff --git a/nebula-logger/core/main/logger-engine/classes/LogEntryEventBuilder.cls b/nebula-logger/core/main/logger-engine/classes/LogEntryEventBuilder.cls
index 3b997ddc2..b80d4213b 100644
--- a/nebula-logger/core/main/logger-engine/classes/LogEntryEventBuilder.cls
+++ b/nebula-logger/core/main/logger-engine/classes/LogEntryEventBuilder.cls
@@ -521,7 +521,7 @@ global with sharing class LogEntryEventBuilder {
 
     /**
      * @description Sets the log entry event's REST Request fields
-     * @param  request The instance of `RestRequest` to log
+     * @param  request The instance of `System.RestRequest` to log
      * @return              The same instance of `LogEntryEventBuilder`, useful for chaining methods
      */
     global LogEntryEventBuilder setRestRequestDetails(System.RestRequest request) {
@@ -569,7 +569,7 @@ global with sharing class LogEntryEventBuilder {
 
     /**
      * @description Sets the log entry event's REST Response fields
-     * @param  response The instance of `RestResponse` to log
+     * @param  response The instance of `System.RestResponse` to log
      * @return          The same instance of `LogEntryEventBuilder`, useful for chaining methods
      */
     global LogEntryEventBuilder setRestResponseDetails(System.RestResponse response) {
@@ -781,7 +781,9 @@ global with sharing class LogEntryEventBuilder {
 
         this.logEntryEvent.DatabaseResultCollectionSize__c = databaseResults.size();
         this.logEntryEvent.DatabaseResultCollectionType__c = this.logEntryEvent.DatabaseResultCollectionSize__c == 1 ? 'Single' : 'List';
-        String serializedResult = JSON.serializePretty(this.logEntryEvent.DatabaseResultCollectionSize__c == 1 ? databaseResults.get(0) : databaseResults);
+        String serializedResult = System.JSON.serializePretty(
+            this.logEntryEvent.DatabaseResultCollectionSize__c == 1 ? databaseResults.get(0) : databaseResults
+        );
         this.logEntryEvent.DatabaseResultJson__c = LoggerDataStore.truncateFieldValue(Schema.LogEntryEvent__e.DatabaseResultJson__c, serializedResult);
         this.logEntryEvent.DatabaseResultType__c = resultType.getName();
 
@@ -971,12 +973,12 @@ global with sharing class LogEntryEventBuilder {
         }
 
         SObject strippedRecord = records.get(0);
-        return JSON.serializePretty(strippedRecord);
+        return System.JSON.serializePretty(strippedRecord);
     }
 
     private static String getJson(List<SObject> records, Boolean isRecordFieldStrippingEnabled) {
         records = isRecordFieldStrippingEnabled == false ? records : stripInaccessible(records);
-        return JSON.serializePretty(records);
+        return System.JSON.serializePretty(records);
     }
 
     private static String getJson(Map<Id, SObject> recordIdToRecord, Boolean isRecordFieldStrippingEnabled) {
@@ -994,7 +996,7 @@ global with sharing class LogEntryEventBuilder {
             String recordIdString = recordId == null ? '' : recordId;
             strippedRecordIdToRecord.put(recordIdString, record);
         }
-        return JSON.serializePretty(strippedRecordIdToRecord);
+        return System.JSON.serializePretty(strippedRecordIdToRecord);
     }
 
     private static String getOrganizationEnvironmentType(LoggerSettings__c userSettings) {
diff --git a/nebula-logger/core/main/logger-engine/classes/Logger.cls b/nebula-logger/core/main/logger-engine/classes/Logger.cls
index 246839371..23d8c3151 100644
--- a/nebula-logger/core/main/logger-engine/classes/Logger.cls
+++ b/nebula-logger/core/main/logger-engine/classes/Logger.cls
@@ -15,7 +15,7 @@
 global with sharing class Logger {
     // There's no reliable way to get the version number dynamically in Apex
     @TestVisible
-    private static final String CURRENT_VERSION_NUMBER = 'v4.13.12';
+    private static final String CURRENT_VERSION_NUMBER = 'v4.13.13';
     private static final System.LoggingLevel FALLBACK_LOGGING_LEVEL = System.LoggingLevel.DEBUG;
     private static final List<LogEntryEventBuilder> LOG_ENTRIES_BUFFER = new List<LogEntryEventBuilder>();
     private static final String MISSING_SCENARIO_ERROR_MESSAGE = 'No logger scenario specified. A scenario is required for logging in this org.';
@@ -23,7 +23,7 @@ global with sharing class Logger {
     private static final String REQUEST_ID = System.Request.getCurrent().getRequestId();
     private static final Map<String, SaveMethod> SAVE_METHOD_NAME_TO_SAVE_METHOD = new Map<String, SaveMethod>();
     private static final String TRANSACTION_ID = System.UUID.randomUUID().toString();
-    private static final Quiddity TRANSACTION_QUIDDITY = loadTransactionQuiddity();
+    private static final System.Quiddity TRANSACTION_QUIDDITY = loadTransactionQuiddity();
 
     private static AsyncContext currentAsyncContext;
     private static String currentEntryScenario;
@@ -76,7 +76,7 @@ global with sharing class Logger {
                 // So, use System.UserInfo.getUserId() to create the current user's record without querying
                 // Then parse the JSON to get the API version
                 // Expected JSON: {"attributes":{"type":"Schema.User","url":"/services/data/v53.0/sobjects/Schema.User/005J000000AugnYIAR"}
-                String userJson = JSON.serialize(new Schema.User(Id = System.UserInfo.getUserId()));
+                String userJson = System.JSON.serialize(new Schema.User(Id = System.UserInfo.getUserId()));
                 ORGANIZATION_API_VERSION = userJson.substringAfter('/data/').substringBefore('/sobjects/User');
             }
             return ORGANIZATION_API_VERSION;
@@ -183,10 +183,10 @@ global with sharing class Logger {
     }
 
     /**
-     * @description Returns the Quiddity context of the current transaction.
-     * @return Quiddity - The value of System.Request.getCurrent().getQuiddity()
+     * @description Returns the System.Quiddity context of the current transaction.
+     * @return System.Quiddity - The value of System.Request.getCurrent().getQuiddity()
      */
-    global static Quiddity getCurrentQuiddity() {
+    global static System.Quiddity getCurrentQuiddity() {
         return TRANSACTION_QUIDDITY;
     }
 
@@ -3229,7 +3229,7 @@ global with sharing class Logger {
         // So, execute the handler, which internally then executes any plugins
         LoggerTriggerableContext logEntryEventsBeforeContext = new LoggerTriggerableContext(
             Schema.LogEntryEvent__e.SObjectType,
-            TriggerOperation.BEFORE_INSERT,
+            System.TriggerOperation.BEFORE_INSERT,
             logEntryEvents
         );
         LoggerSObjectHandler.getHandler(Schema.LogEntryEvent__e.SObjectType)?.overrideTriggerableContext(logEntryEventsBeforeContext).execute();
@@ -3259,7 +3259,7 @@ global with sharing class Logger {
             when SYNCHRONOUS_DML {
                 LoggerTriggerableContext logEntryEventsAfterContext = new LoggerTriggerableContext(
                     Schema.LogEntryEvent__e.SObjectType,
-                    TriggerOperation.AFTER_INSERT,
+                    System.TriggerOperation.AFTER_INSERT,
                     logEntryEvents
                 );
                 LoggerSObjectHandler.getHandler(Schema.LogEntryEvent__e.SObjectType)?.overrideTriggerableContext(logEntryEventsAfterContext).execute();
@@ -3325,7 +3325,7 @@ global with sharing class Logger {
                 throw new System.CalloutException(errorMessage);
             }
 
-            StatusApiResponse statusApiResponse = (StatusApiResponse) JSON.deserialize(response.getBody(), StatusApiResponse.class);
+            StatusApiResponse statusApiResponse = (StatusApiResponse) System.JSON.deserialize(response.getBody(), StatusApiResponse.class);
             return statusApiResponse;
         } catch (Exception ex) {
             if (LoggerParameter.ENABLE_SYSTEM_MESSAGES) {
@@ -3407,7 +3407,7 @@ global with sharing class Logger {
         return isStartTimeValid && isEndTimeValid;
     }
 
-    private static Quiddity loadTransactionQuiddity() {
+    private static System.Quiddity loadTransactionQuiddity() {
         // An error can sometimes occur when calling System.Request.getCurrent(), such as when logging
         // from an Auth Provider class (that implements Auth.RegistrationHandler). As a workaround,
         // skip calling System.Request.getCurrent() if there is no user session.
@@ -3421,7 +3421,7 @@ global with sharing class Logger {
 
     private static void setAsyncContext(AsyncContext asyncContext) {
         currentAsyncContext = asyncContext;
-        System.debug(System.LoggingLevel.INFO, 'Nebula Logger - Async Context: ' + JSON.serializePretty(asyncContext));
+        System.debug(System.LoggingLevel.INFO, 'Nebula Logger - Async Context: ' + System.JSON.serializePretty(asyncContext));
     }
 
     private static SaveMethod getSaveMethod(String saveMethodName) {
@@ -3488,9 +3488,9 @@ global with sharing class Logger {
 
     // Inner class for saving log entries via a queuable job
     /**
-     * @description Inner class for publishing log entries via the Queueable interface.
+     * @description Inner class for publishing log entries via the System.Queueable interface.
      */
-    global class QueueableSaver implements Queueable {
+    global class QueueableSaver implements System.Queueable {
         private List<LogEntryEvent__e> logEntryEvents = new List<LogEntryEvent__e>();
 
         private QueueableSaver(List<LogEntryEvent__e> logEntryEvents) {
@@ -3578,7 +3578,7 @@ global with sharing class Logger {
 
             Boolean allOrNone = true;
             RestSaveRequest saveRequest = new RestSaveRequest(records, allOrNone);
-            request.setBody(JSON.serialize(saveRequest));
+            request.setBody(System.JSON.serialize(saveRequest));
 
             System.HttpResponse response = new System.Http().send(request);
             this.validateResponse(response);
diff --git a/nebula-logger/core/main/logger-engine/classes/LoggerDataStore.cls b/nebula-logger/core/main/logger-engine/classes/LoggerDataStore.cls
index 60f469fa4..ad8f795a0 100644
--- a/nebula-logger/core/main/logger-engine/classes/LoggerDataStore.cls
+++ b/nebula-logger/core/main/logger-engine/classes/LoggerDataStore.cls
@@ -325,11 +325,11 @@ public without sharing class LoggerDataStore {
         }
 
         /**
-         * @description Enqueues a queueable job to execute asynchronously, using `System.enqueueJob(Queueable queueableJob)`
+         * @description Enqueues a queueable job to execute asynchronously, using `System.enqueueJob(System.Queueable queueableJob)`
          * @param  queueableJob An instance of a `Queueable` class that should be enqueued
          * @return              The `Id` of the queueable job
          */
-        public virtual Id enqueueJob(Queueable queueableJob) {
+        public virtual Id enqueueJob(System.Queueable queueableJob) {
             return System.enqueueJob(queueableJob);
         }
     }
diff --git a/nebula-logger/core/main/logger-engine/classes/LoggerEngineDataSelector.cls b/nebula-logger/core/main/logger-engine/classes/LoggerEngineDataSelector.cls
index 836dbc12e..f5564dbcd 100644
--- a/nebula-logger/core/main/logger-engine/classes/LoggerEngineDataSelector.cls
+++ b/nebula-logger/core/main/logger-engine/classes/LoggerEngineDataSelector.cls
@@ -219,10 +219,9 @@ public without sharing virtual class LoggerEngineDataSelector {
 
         // Networks (aka experience sites aka community sites aka portal sites ò_ô)
         // may not be enabled in the org (no Schema.Network object), so run everything dynamically
-        // return new Map<Id, SObject>(Database.query(String.escapeSingleQuotes(query)));
         Map<Id, LoggerSObjectProxy.Network> networkIdToNetworkProxy = new Map<Id, LoggerSObjectProxy.Network>();
         String query = 'SELECT Id, Name, UrlPathPrefix FROM Network WHERE Id IN :networkIds';
-        for (SObject networkRecord : Database.query(String.escapeSingleQuotes(query))) {
+        for (SObject networkRecord : System.Database.query(String.escapeSingleQuotes(query))) {
             LoggerSObjectProxy.Network networkProxy = new LoggerSObjectProxy.Network(networkRecord);
             networkIdToNetworkProxy.put(networkProxy.Id, networkProxy);
         }
diff --git a/nebula-logger/core/main/logger-engine/classes/LoggerSObjectHandler.cls b/nebula-logger/core/main/logger-engine/classes/LoggerSObjectHandler.cls
index 33308eb3e..77079a7cf 100644
--- a/nebula-logger/core/main/logger-engine/classes/LoggerSObjectHandler.cls
+++ b/nebula-logger/core/main/logger-engine/classes/LoggerSObjectHandler.cls
@@ -29,7 +29,7 @@ public without sharing abstract class LoggerSObjectHandler {
     }
 
     @TestVisible
-    private TriggerOperation triggerOperationType;
+    private System.TriggerOperation triggerOperationType;
     @TestVisible
     private List<SObject> triggerNew;
     @TestVisible
diff --git a/nebula-logger/core/main/logger-engine/classes/LoggerSObjectProxy.cls b/nebula-logger/core/main/logger-engine/classes/LoggerSObjectProxy.cls
index 0c851f55d..eaf517fea 100644
--- a/nebula-logger/core/main/logger-engine/classes/LoggerSObjectProxy.cls
+++ b/nebula-logger/core/main/logger-engine/classes/LoggerSObjectProxy.cls
@@ -13,7 +13,7 @@
 public without sharing class LoggerSObjectProxy {
     /**
      * @description All `Schema.AuthSession` SObjects are read-only in Apex, which makes them more difficult to work with, and impossible
-     *              to mock field values directly during unit tests - even using tricks like JSON.deserialize() do not work. The `LoggerSObjectProxy.AuthSession`
+     *              to mock field values directly during unit tests - even using tricks like System.JSON.deserialize() do not work. The `LoggerSObjectProxy.AuthSession`
      *              class acts as a substitute for a `Schema.AuthSession` record to provide the abilility to mock the data during unit & integration tests.
      */
     @SuppressWarnings('PMD.FieldNamingConventions, PMD.VariableNamingConventions')
@@ -48,7 +48,7 @@ public without sharing class LoggerSObjectProxy {
 
     /**
      * @description All `Schema.LoginHistory` SObjects are read-only in Apex, which makes them more difficult to work with, and impossible
-     *              to mock field values directly during unit tests - even using tricks like JSON.deserialize() do not work. The `LoggerSObjectProxy.LoginHistory`
+     *              to mock field values directly during unit tests - even using tricks like System.JSON.deserialize() do not work. The `LoggerSObjectProxy.LoginHistory`
      *              class acts as a substitute for a `Schema.LoginHistory` record to provide the abilility to mock the data during unit & integration tests.
      */
     @SuppressWarnings('PMD.FieldNamingConventions, PMD.VariableNamingConventions')
diff --git a/nebula-logger/core/main/logger-engine/lwc/logger/logEntryBuilder.js b/nebula-logger/core/main/logger-engine/lwc/logger/logEntryBuilder.js
index ec266ff1f..05339428c 100644
--- a/nebula-logger/core/main/logger-engine/lwc/logger/logEntryBuilder.js
+++ b/nebula-logger/core/main/logger-engine/lwc/logger/logEntryBuilder.js
@@ -4,7 +4,7 @@
 //------------------------------------------------------------------------------------------------//
 import FORM_FACTOR from '@salesforce/client/formFactor';
 
-const CURRENT_VERSION_NUMBER = 'v4.13.12';
+const CURRENT_VERSION_NUMBER = 'v4.13.13';
 
 // JavaScript equivalent to the Apex class ComponentLogger.ComponentLogEntry
 const ComponentLogEntry = class {
diff --git a/nebula-logger/core/tests/configuration/classes/LoggerParameter_Tests.cls b/nebula-logger/core/tests/configuration/classes/LoggerParameter_Tests.cls
index fef755e5e..e752aa85f 100644
--- a/nebula-logger/core/tests/configuration/classes/LoggerParameter_Tests.cls
+++ b/nebula-logger/core/tests/configuration/classes/LoggerParameter_Tests.cls
@@ -38,7 +38,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_call_status_api() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'CallStatusApi', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'CallStatusApi', Value__c = System.JSON.serialize(mockValue));
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.CALL_STATUS_API;
@@ -60,7 +60,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_enable_log_entry_event_stream() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'EnableLogEntryEventStream', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'EnableLogEntryEventStream', Value__c = System.JSON.serialize(mockValue));
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.ENABLE_LOG_ENTRY_EVENT_STREAM;
@@ -71,7 +71,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_enable_stack_trace_parsing() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'EnableStackTraceParsing', Value__c = JSON.serialize(false));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'EnableStackTraceParsing', Value__c = System.JSON.serialize(false));
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.ENABLE_STACK_TRACE_PARSING;
@@ -82,7 +82,10 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_enable_system_messages() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'EnableLoggerSystemMessages', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(
+            DeveloperName = 'EnableLoggerSystemMessages',
+            Value__c = System.JSON.serialize(mockValue)
+        );
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.ENABLE_SYSTEM_MESSAGES;
@@ -93,7 +96,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_enable_tagging() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'EnableTagging', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'EnableTagging', Value__c = System.JSON.serialize(mockValue));
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.ENABLE_TAGGING;
@@ -104,7 +107,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_normalize_scenario_data() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'NormalizeScenarioData', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'NormalizeScenarioData', Value__c = System.JSON.serialize(mockValue));
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.NORMALIZE_SCENARIO_DATA;
@@ -115,7 +118,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_normalize_tag_data() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'NormalizeTagData', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'NormalizeTagData', Value__c = System.JSON.serialize(mockValue));
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.NORMALIZE_TAG_DATA;
@@ -137,7 +140,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_query_apex_class_data() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'QueryApexClassData', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'QueryApexClassData', Value__c = System.JSON.serialize(mockValue));
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.QUERY_APEX_CLASS_DATA;
@@ -148,7 +151,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_query_apex_trigger_data() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'QueryApexTriggerData', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'QueryApexTriggerData', Value__c = System.JSON.serialize(mockValue));
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.QUERY_APEX_TRIGGER_DATA;
@@ -159,7 +162,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_query_auth_session_data() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'QueryAuthSessionData', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'QueryAuthSessionData', Value__c = System.JSON.serialize(mockValue));
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.QUERY_AUTH_SESSION_DATA;
@@ -172,7 +175,7 @@ private class LoggerParameter_Tests {
         Boolean mockValue = false;
         LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(
             DeveloperName = 'QueryAuthSessionDataSynchronously',
-            Value__c = JSON.serialize(mockValue)
+            Value__c = System.JSON.serialize(mockValue)
         );
         LoggerParameter.setMock(mockParameter);
 
@@ -184,7 +187,10 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_query_flow_definition_view_data() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'QueryFlowDefinitionViewData', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(
+            DeveloperName = 'QueryFlowDefinitionViewData',
+            Value__c = System.JSON.serialize(mockValue)
+        );
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.QUERY_FLOW_DEFINITION_VIEW_DATA;
@@ -195,7 +201,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_query_network_data() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'QueryNetworkData', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'QueryNetworkData', Value__c = System.JSON.serialize(mockValue));
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.QUERY_NETWORK_DATA;
@@ -206,7 +212,10 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_query_network_data_synchronously() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'QueryNetworkDataSynchronously', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(
+            DeveloperName = 'QueryNetworkDataSynchronously',
+            Value__c = System.JSON.serialize(mockValue)
+        );
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.QUERY_NETWORK_DATA_SYNCHRONOUSLY;
@@ -217,7 +226,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_query_organization_data() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'QueryOrganizationData', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'QueryOrganizationData', Value__c = System.JSON.serialize(mockValue));
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.QUERY_ORGANIZATION_DATA;
@@ -230,7 +239,7 @@ private class LoggerParameter_Tests {
         Boolean mockValue = false;
         LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(
             DeveloperName = 'QueryOrganizationDataSynchronously',
-            Value__c = JSON.serialize(mockValue)
+            Value__c = System.JSON.serialize(mockValue)
         );
         LoggerParameter.setMock(mockParameter);
 
@@ -242,7 +251,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_query_related_record_data() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'QueryRelatedRecordData', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'QueryRelatedRecordData', Value__c = System.JSON.serialize(mockValue));
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.QUERY_RELATED_RECORD_DATA;
@@ -253,7 +262,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_query_user_data() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'QueryUserData', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'QueryUserData', Value__c = System.JSON.serialize(mockValue));
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.QUERY_USER_DATA;
@@ -264,7 +273,10 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_query_user_data_synchronously() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'QueryUserDataSynchronously', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(
+            DeveloperName = 'QueryUserDataSynchronously',
+            Value__c = System.JSON.serialize(mockValue)
+        );
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.QUERY_USER_DATA_SYNCHRONOUSLY;
@@ -283,7 +295,7 @@ private class LoggerParameter_Tests {
 
     @IsTest
     static void it_should_return_constant_value_for_require_scenario_usage_when_true() {
-        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'RequireScenarioUsage', Value__c = JSON.serialize(true)));
+        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'RequireScenarioUsage', Value__c = System.JSON.serialize(true)));
 
         Boolean returnedValue = LoggerParameter.REQUIRE_SCENARIO_USAGE;
 
@@ -292,7 +304,7 @@ private class LoggerParameter_Tests {
 
     @IsTest
     static void it_should_return_constant_value_for_require_scenario_usage_when_false() {
-        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'RequireScenarioUsage', Value__c = JSON.serialize(false)));
+        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'RequireScenarioUsage', Value__c = System.JSON.serialize(false)));
 
         Boolean returnedValue = LoggerParameter.REQUIRE_SCENARIO_USAGE;
 
@@ -302,7 +314,10 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_send_error_email_notifications() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'SendErrorEmailNotifications', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(
+            DeveloperName = 'SendErrorEmailNotifications',
+            Value__c = System.JSON.serialize(mockValue)
+        );
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.SEND_ERROR_EMAIL_NOTIFICATIONS;
@@ -313,7 +328,10 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_store_http_response_header_values() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'StoreHttpResponseHeaderValues', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(
+            DeveloperName = 'StoreHttpResponseHeaderValues',
+            Value__c = System.JSON.serialize(mockValue)
+        );
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.STORE_HTTP_RESPONSE_HEADER_VALUES;
@@ -332,7 +350,7 @@ private class LoggerParameter_Tests {
 
     @IsTest
     static void it_should_return_constant_value_for_store_organization_limits_when_true() {
-        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreOrganizationLimits', Value__c = JSON.serialize(true)));
+        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreOrganizationLimits', Value__c = System.JSON.serialize(true)));
 
         Boolean returnedValue = LoggerParameter.STORE_ORGANIZATION_LIMITS;
 
@@ -341,7 +359,7 @@ private class LoggerParameter_Tests {
 
     @IsTest
     static void it_should_return_constant_value_for_store_organization_limits_when_false() {
-        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreOrganizationLimits', Value__c = JSON.serialize(false)));
+        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreOrganizationLimits', Value__c = System.JSON.serialize(false)));
 
         Boolean returnedValue = LoggerParameter.STORE_ORGANIZATION_LIMITS;
 
@@ -351,7 +369,10 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_store_rest_request_header_values() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'StoreRestRequestHeaderValues', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(
+            DeveloperName = 'StoreRestRequestHeaderValues',
+            Value__c = System.JSON.serialize(mockValue)
+        );
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.STORE_REST_REQUEST_HEADER_VALUES;
@@ -362,7 +383,10 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_store_rest_response_header_values() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'StoreRestResponseHeaderValues', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(
+            DeveloperName = 'StoreRestResponseHeaderValues',
+            Value__c = System.JSON.serialize(mockValue)
+        );
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.STORE_REST_RESPONSE_HEADER_VALUES;
@@ -381,7 +405,7 @@ private class LoggerParameter_Tests {
 
     @IsTest
     static void it_should_return_constant_value_for_store_transaction_limits_when_true() {
-        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreTransactionLimits', Value__c = JSON.serialize(true)));
+        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreTransactionLimits', Value__c = System.JSON.serialize(true)));
 
         Boolean returnedValue = LoggerParameter.STORE_TRANSACTION_LIMITS;
 
@@ -390,7 +414,7 @@ private class LoggerParameter_Tests {
 
     @IsTest
     static void it_should_return_constant_value_for_store_transaction_limits_when_false() {
-        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreTransactionLimits', Value__c = JSON.serialize(false)));
+        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreTransactionLimits', Value__c = System.JSON.serialize(false)));
 
         Boolean returnedValue = LoggerParameter.STORE_TRANSACTION_LIMITS;
 
@@ -412,7 +436,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_use_platform_cache() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'UsePlatformCache', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'UsePlatformCache', Value__c = System.JSON.serialize(mockValue));
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.USE_PLATFORM_CACHE;
@@ -423,7 +447,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_constant_value_for_use_topics_for_tags() {
         Boolean mockValue = true;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'UseTopicsForTags', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'UseTopicsForTags', Value__c = System.JSON.serialize(mockValue));
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.USE_TOPICS_FOR_TAGS;
@@ -434,7 +458,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_boolean_parameter() {
         Boolean parameterValue = true;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyBoolean', Value__c = JSON.serialize(parameterValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyBoolean', Value__c = System.JSON.serialize(parameterValue));
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LoggerParameter.getBoolean(mockParameter.DeveloperName, null);
@@ -445,7 +469,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_boolean_list_parameter() {
         List<Boolean> parameterValue = new List<Boolean>{ true, false, true, true };
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyBooleanList', Value__c = JSON.serialize(parameterValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyBooleanList', Value__c = System.JSON.serialize(parameterValue));
         LoggerParameter.setMock(mockParameter);
 
         List<Boolean> returnedValue = LoggerParameter.getBooleanList(mockParameter.DeveloperName, null);
@@ -456,7 +480,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_default_value_when_configured_boolean_list_parameter_is_null() {
         List<Boolean> parameterValue = null;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyBooleanList', Value__c = JSON.serialize(parameterValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyBooleanList', Value__c = System.JSON.serialize(parameterValue));
         LoggerParameter.setMock(mockParameter);
         List<Boolean> defaultParameterValue = new List<Boolean>{ true, false };
 
@@ -470,7 +494,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_date_parameter() {
         Date parameterValue = System.today().addDays(-7);
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyDate', Value__c = JSON.serialize(parameterValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyDate', Value__c = System.JSON.serialize(parameterValue));
         LoggerParameter.setMock(mockParameter);
 
         Date returnedValue = LoggerParameter.getDate(mockParameter.DeveloperName, null);
@@ -481,7 +505,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_date_list_parameter() {
         List<Date> parameterValue = new List<Date>{ System.today(), System.today().addDays(10) };
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyDateList', Value__c = JSON.serialize(parameterValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyDateList', Value__c = System.JSON.serialize(parameterValue));
         LoggerParameter.setMock(mockParameter);
 
         List<Date> returnedValue = LoggerParameter.getDateList(mockParameter.DeveloperName, null);
@@ -492,7 +516,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_datetime_parameter() {
         Datetime parameterValue = System.now().addDays(-7);
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyDatetime', Value__c = JSON.serialize(parameterValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyDatetime', Value__c = System.JSON.serialize(parameterValue));
         LoggerParameter.setMock(mockParameter);
 
         Datetime returnedValue = LoggerParameter.getDatetime(mockParameter.DeveloperName, null);
@@ -503,7 +527,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_datetime_list_parameter() {
         List<Datetime> parameterValue = new List<Datetime>{ System.now(), System.now().addDays(10) };
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyDatetimeList', Value__c = JSON.serialize(parameterValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyDatetimeList', Value__c = System.JSON.serialize(parameterValue));
         LoggerParameter.setMock(mockParameter);
 
         List<Datetime> returnedValue = LoggerParameter.getDatetimeList(mockParameter.DeveloperName, null);
@@ -514,7 +538,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_decimal_parameter() {
         Decimal parameterValue = 123456.0987;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyDecimal', Value__c = JSON.serialize(parameterValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyDecimal', Value__c = System.JSON.serialize(parameterValue));
         LoggerParameter.setMock(mockParameter);
 
         Decimal returnedValue = LoggerParameter.getDecimal(mockParameter.DeveloperName, null);
@@ -525,7 +549,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_decimal_list_parameter() {
         List<Decimal> parameterValue = new List<Decimal>{ 123.45, 678.09 };
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyDecimalList', Value__c = JSON.serialize(parameterValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyDecimalList', Value__c = System.JSON.serialize(parameterValue));
         LoggerParameter.setMock(mockParameter);
 
         List<Decimal> returnedValue = LoggerParameter.getDecimalList(mockParameter.DeveloperName, null);
@@ -536,7 +560,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_double_parameter() {
         Double parameterValue = 123456.0987;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyDouble', Value__c = JSON.serialize(parameterValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyDouble', Value__c = System.JSON.serialize(parameterValue));
         LoggerParameter.setMock(mockParameter);
 
         Double returnedValue = LoggerParameter.getDouble(mockParameter.DeveloperName, null);
@@ -547,7 +571,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_double_list_parameter() {
         List<Double> parameterValue = new List<Double>{ 123.45, 678.09 };
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyDoubleList', Value__c = JSON.serialize(parameterValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyDoubleList', Value__c = System.JSON.serialize(parameterValue));
         LoggerParameter.setMock(mockParameter);
 
         List<Double> returnedValue = LoggerParameter.getDoubleList(mockParameter.DeveloperName, null);
@@ -558,7 +582,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_id_parameter() {
         Id parameterValue = System.UserInfo.getUserId();
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyId', Value__c = JSON.serialize(parameterValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyId', Value__c = System.JSON.serialize(parameterValue));
         LoggerParameter.setMock(mockParameter);
 
         Id returnedValue = LoggerParameter.getId(mockParameter.DeveloperName, null);
@@ -569,7 +593,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_id_list_parameter() {
         List<Id> parameterValue = new List<Id>{ System.UserInfo.getUserId() };
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyIdList', Value__c = JSON.serialize(parameterValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyIdList', Value__c = System.JSON.serialize(parameterValue));
         LoggerParameter.setMock(mockParameter);
 
         List<Id> returnedValue = LoggerParameter.getIdList(mockParameter.DeveloperName, null);
@@ -580,7 +604,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_integer_parameter() {
         Integer parameterValue = 123456;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyInteger', Value__c = JSON.serialize(parameterValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyInteger', Value__c = System.JSON.serialize(parameterValue));
         LoggerParameter.setMock(mockParameter);
 
         Integer returnedValue = LoggerParameter.getInteger(mockParameter.DeveloperName, null);
@@ -591,7 +615,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_integer_list_parameter() {
         List<Integer> parameterValue = new List<Integer>{ 12345, 67809 };
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyIntegerList', Value__c = JSON.serialize(parameterValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyIntegerList', Value__c = System.JSON.serialize(parameterValue));
         LoggerParameter.setMock(mockParameter);
 
         List<Integer> returnedValue = LoggerParameter.getIntegerList(mockParameter.DeveloperName, null);
@@ -602,7 +626,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_long_parameter() {
         Long parameterValue = 123456;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyLong', Value__c = JSON.serialize(parameterValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyLong', Value__c = System.JSON.serialize(parameterValue));
         LoggerParameter.setMock(mockParameter);
 
         Long returnedValue = LoggerParameter.getLong(mockParameter.DeveloperName, null);
@@ -613,7 +637,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_long_list_parameter() {
         List<Long> parameterValue = new List<Long>{ 12345, 67809 };
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyLongList', Value__c = JSON.serialize(parameterValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyLongList', Value__c = System.JSON.serialize(parameterValue));
         LoggerParameter.setMock(mockParameter);
 
         List<Long> returnedValue = LoggerParameter.getLongList(mockParameter.DeveloperName, null);
@@ -624,7 +648,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_sobject_parameter() {
         SObject parameterValue = getUserRecord();
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MySObject', Value__c = JSON.serialize(parameterValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MySObject', Value__c = System.JSON.serialize(parameterValue));
         LoggerParameter.setMock(mockParameter);
 
         SObject returnedValue = LoggerParameter.getSObject(mockParameter.DeveloperName, null);
@@ -635,7 +659,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_sobject_list_parameter() {
         List<SObject> parameterValue = new List<SObject>{ getUserRecord() };
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MySObjectList', Value__c = JSON.serialize(parameterValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MySObjectList', Value__c = System.JSON.serialize(parameterValue));
         LoggerParameter.setMock(mockParameter);
 
         List<SObject> returnedValue = LoggerParameter.getSObjectList(mockParameter.DeveloperName, null);
@@ -657,7 +681,7 @@ private class LoggerParameter_Tests {
     @IsTest
     static void it_should_return_string_list_parameter() {
         List<String> parameterValue = new List<String>{ 'Hello', 'Goodbye' };
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyStringList', Value__c = JSON.serialize(parameterValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'MyStringList', Value__c = System.JSON.serialize(parameterValue));
         LoggerParameter.setMock(mockParameter);
 
         List<String> returnedValue = LoggerParameter.getStringList(mockParameter.DeveloperName, null);
diff --git a/nebula-logger/core/tests/configuration/utilities/LoggerMockDataCreator.cls b/nebula-logger/core/tests/configuration/utilities/LoggerMockDataCreator.cls
index 753d60f6a..edc0ba917 100644
--- a/nebula-logger/core/tests/configuration/utilities/LoggerMockDataCreator.cls
+++ b/nebula-logger/core/tests/configuration/utilities/LoggerMockDataCreator.cls
@@ -28,7 +28,7 @@ public class LoggerMockDataCreator {
      */
     public static AggregateResult createAggregateResult() {
         Map<String, Object> emptyAggregateKeyValues = new Map<String, Object>();
-        return (AggregateResult) JSON.deserialize(JSON.serialize(emptyAggregateKeyValues), AggregateResult.class);
+        return (AggregateResult) System.JSON.deserialize(System.JSON.serialize(emptyAggregateKeyValues), AggregateResult.class);
     }
 
     /**
@@ -51,9 +51,9 @@ public class LoggerMockDataCreator {
      */
     public static Database.LeadConvertResult createDatabaseLeadConvertResult(Boolean isSuccess, Id recordId) {
         if (isSuccess) {
-            return (Database.LeadConvertResult) JSON.deserialize('{"success": true, "leadid": "' + recordId + '"}', Database.LeadConvertResult.class);
+            return (Database.LeadConvertResult) System.JSON.deserialize('{"success": true, "leadid": "' + recordId + '"}', Database.LeadConvertResult.class);
         } else {
-            return (Database.LeadConvertResult) JSON.deserialize(
+            return (Database.LeadConvertResult) System.JSON.deserialize(
                 '{"success":false, "leadid": "' +
                     recordId +
                     '", "errors":[{"message": "convertedStatus is required...", "statusCode": "REQUIRED_FIELD_MISSING"}]}',
@@ -82,9 +82,9 @@ public class LoggerMockDataCreator {
      */
     public static Database.DeleteResult createDatabaseDeleteResult(Boolean isSuccess, Id recordId) {
         if (isSuccess) {
-            return (Database.DeleteResult) JSON.deserialize('{"success": true, "id": "' + recordId + '"}', Database.DeleteResult.class);
+            return (Database.DeleteResult) System.JSON.deserialize('{"success": true, "id": "' + recordId + '"}', Database.DeleteResult.class);
         } else {
-            return (Database.DeleteResult) JSON.deserialize(
+            return (Database.DeleteResult) System.JSON.deserialize(
                 '{"success":false, "id": "' + recordId + '", "errors":[{"message": "Could not delete...", "statusCode": "DELETE_FAILED"}]}',
                 Database.DeleteResult.class
             );
@@ -111,9 +111,9 @@ public class LoggerMockDataCreator {
      */
     public static Database.MergeResult createDatabaseMergeResult(Boolean isSuccess, Id recordId) {
         if (isSuccess) {
-            return (Database.MergeResult) JSON.deserialize('{"success": true, "id": "' + recordId + '"}', Database.MergeResult.class);
+            return (Database.MergeResult) System.JSON.deserialize('{"success": true, "id": "' + recordId + '"}', Database.MergeResult.class);
         } else {
-            return (Database.MergeResult) JSON.deserialize(
+            return (Database.MergeResult) System.JSON.deserialize(
                 '{"success":false,"errors":[{"message": "Could not merge...", "statusCode": "MERGE_FAILED"}]}',
                 Database.MergeResult.class
             );
@@ -140,9 +140,9 @@ public class LoggerMockDataCreator {
      */
     public static Database.SaveResult createDatabaseSaveResult(Boolean isSuccess, Id recordId) {
         if (isSuccess) {
-            return (Database.SaveResult) JSON.deserialize('{"success": true, "id": "' + recordId + '"}', Database.SaveResult.class);
+            return (Database.SaveResult) System.JSON.deserialize('{"success": true, "id": "' + recordId + '"}', Database.SaveResult.class);
         } else {
-            return (Database.SaveResult) JSON.deserialize(
+            return (Database.SaveResult) System.JSON.deserialize(
                 '{"success":false,"errors":[{"message": "Could not save...", "statusCode": "FIELD_CUSTOM_VALIDATION_EXCEPTION", "fields": ["Name"]}]}',
                 Database.SaveResult.class
             );
@@ -169,9 +169,9 @@ public class LoggerMockDataCreator {
      */
     public static Database.UndeleteResult createDatabaseUndeleteResult(Boolean isSuccess, Id recordId) {
         if (isSuccess) {
-            return (Database.UndeleteResult) JSON.deserialize('{"success": true, "id": "' + recordId + '"}', Database.UndeleteResult.class);
+            return (Database.UndeleteResult) System.JSON.deserialize('{"success": true, "id": "' + recordId + '"}', Database.UndeleteResult.class);
         } else {
-            return (Database.UndeleteResult) JSON.deserialize(
+            return (Database.UndeleteResult) System.JSON.deserialize(
                 '{"success":false,"errors":[{"message": "Could not undelete...", "statusCode": "FIELD_CUSTOM_VALIDATION_EXCEPTION", "fields": ["Name"]}]}',
                 Database.UndeleteResult.class
             );
@@ -200,12 +200,12 @@ public class LoggerMockDataCreator {
      */
     public static Database.UpsertResult createDatabaseUpsertResult(Boolean isSuccess, Boolean isCreated, Id recordId) {
         if (isSuccess) {
-            return (Database.UpsertResult) JSON.deserialize(
+            return (Database.UpsertResult) System.JSON.deserialize(
                 '{"success": ' + isSuccess + ', "created": ' + isCreated + ', "id": "' + recordId + '"}',
                 Database.UpsertResult.class
             );
         } else {
-            return (Database.UpsertResult) JSON.deserialize(
+            return (Database.UpsertResult) System.JSON.deserialize(
                 '{"success":false, "created":' +
                     isCreated +
                     ', "errors":[{"message": "Could not upsert...", "statusCode": "FIELD_CUSTOM_VALIDATION_EXCEPTION", "fields": ["Name"]}]}',
@@ -415,8 +415,8 @@ public class LoggerMockDataCreator {
      * @return                 A new copy of the original `SObject` record that has the specified read-only fields populated
      */
     public static SObject setReadOnlyField(SObject record, Map<Schema.SObjectField, Object> changesToFields) {
-        String serializedRecord = JSON.serialize(record);
-        Map<String, Object> deserializedRecordMap = (Map<String, Object>) JSON.deserializeUntyped(serializedRecord);
+        String serializedRecord = System.JSON.serialize(record);
+        Map<String, Object> deserializedRecordMap = (Map<String, Object>) System.JSON.deserializeUntyped(serializedRecord);
 
         // Loop through the deserialized record map and put the field & value
         // Since it's a map, if the field already exists on the SObject, it's updated (or added if it wasn't there already)
@@ -425,8 +425,8 @@ public class LoggerMockDataCreator {
             deserializedRecordMap.put(fieldName, changesToFields.get(sobjectField));
         }
 
-        serializedRecord = JSON.serialize(deserializedRecordMap);
-        return (SObject) JSON.deserialize(serializedRecord, SObject.class);
+        serializedRecord = System.JSON.serialize(deserializedRecordMap);
+        return (SObject) System.JSON.deserialize(serializedRecord, SObject.class);
     }
 
     @SuppressWarnings('PMD.ApexDoc')
diff --git a/nebula-logger/core/tests/log-management/classes/LogBatchPurgeController_Tests.cls b/nebula-logger/core/tests/log-management/classes/LogBatchPurgeController_Tests.cls
index 63f808e2c..7d5d83801 100644
--- a/nebula-logger/core/tests/log-management/classes/LogBatchPurgeController_Tests.cls
+++ b/nebula-logger/core/tests/log-management/classes/LogBatchPurgeController_Tests.cls
@@ -38,8 +38,8 @@ private class LogBatchPurgeController_Tests {
     private static void it_should_return_summary_for_logs_created_today() {
         Integer expectedRecordCountWithPurgeActionDelete = 5;
         Integer expectedRecordCountWithPurgeActionCustom = 4;
-        createLogRecords('TXN1', 'Delete', expectedRecordCountWithPurgeActionDelete, System.now());
-        createLogRecords('TXN2', 'Custom', expectedRecordCountWithPurgeActionCustom, System.now());
+        createLogRecords('Delete', expectedRecordCountWithPurgeActionDelete, System.now());
+        createLogRecords('Custom', expectedRecordCountWithPurgeActionCustom, System.now());
 
         List<AggregateResult> logObjectResult = LogBatchPurgeController.getLogObjectSummary('TODAY');
 
@@ -68,8 +68,8 @@ private class LogBatchPurgeController_Tests {
         Integer expectedRecordCountWithPurgeActionDelete = 5;
         Integer expectedRecordCountWithPurgeActionCustom = 4;
         Datetime createDate = DateTime.newInstance(Date.today().toStartOfWeek(), Datetime.now().time());
-        createLogRecords('TXN1', 'Delete', expectedRecordCountWithPurgeActionDelete, createDate);
-        createLogRecords('TXN2', 'Custom', expectedRecordCountWithPurgeActionCustom, createDate);
+        createLogRecords('Delete', expectedRecordCountWithPurgeActionDelete, createDate);
+        createLogRecords('Custom', expectedRecordCountWithPurgeActionCustom, createDate);
 
         List<AggregateResult> logObjectResult = LogBatchPurgeController.getLogObjectSummary('THIS_WEEK');
 
@@ -90,8 +90,8 @@ private class LogBatchPurgeController_Tests {
         Integer expectedRecordCountWithPurgeActionDelete = 5;
         Integer expectedRecordCountWithPurgeActionCustom = 4;
         Datetime createDate = DateTime.newInstance(Date.today().toStartOfMonth(), Datetime.now().time());
-        createLogRecords('TXN1', 'Delete', expectedRecordCountWithPurgeActionDelete, createDate);
-        createLogRecords('TXN2', 'Custom', expectedRecordCountWithPurgeActionCustom, createDate);
+        createLogRecords('Delete', expectedRecordCountWithPurgeActionDelete, createDate);
+        createLogRecords('Custom', expectedRecordCountWithPurgeActionCustom, createDate);
 
         List<AggregateResult> logObjectResult = LogBatchPurgeController.getLogObjectSummary('THIS_MONTH');
 
@@ -119,8 +119,8 @@ private class LogBatchPurgeController_Tests {
     private static void it_should_return_summary_for_logEntry_created_today() {
         Integer expectedRecordCountWithPurgeActionDelete = 5;
         Integer expectedRecordCountWithPurgeActionCustom = 4;
-        createLogEntryRecords('TXN1', 'Delete', expectedRecordCountWithPurgeActionDelete, System.now());
-        createLogEntryRecords('TXN2', 'Custom', expectedRecordCountWithPurgeActionCustom, System.now());
+        createLogEntryRecords('Delete', expectedRecordCountWithPurgeActionDelete, System.now());
+        createLogEntryRecords('Custom', expectedRecordCountWithPurgeActionCustom, System.now());
         List<AggregateResult> logObjectResult = LogBatchPurgeController.getLogEntryObjectSummary('TODAY');
 
         Integer expectedAggregateResultSize = 2;
@@ -148,8 +148,8 @@ private class LogBatchPurgeController_Tests {
         Integer expectedRecordCountWithPurgeActionDelete = 5;
         Integer expectedRecordCountWithPurgeActionCustom = 4;
         Datetime createDate = DateTime.newInstance(Date.today().toStartOfMonth(), Datetime.now().time());
-        createLogEntryRecords('TXN1', 'Delete', expectedRecordCountWithPurgeActionDelete, createDate);
-        createLogEntryRecords('TXN2', 'Custom', expectedRecordCountWithPurgeActionCustom, createDate);
+        createLogEntryRecords('Delete', expectedRecordCountWithPurgeActionDelete, createDate);
+        createLogEntryRecords('Custom', expectedRecordCountWithPurgeActionCustom, createDate);
 
         List<AggregateResult> logObjectResult = LogBatchPurgeController.getLogEntryObjectSummary('THIS_WEEK');
 
@@ -178,8 +178,8 @@ private class LogBatchPurgeController_Tests {
         Integer expectedRecordCountWithPurgeActionDelete = 5;
         Integer expectedRecordCountWithPurgeActionCustom = 4;
         Datetime createDate = DateTime.newInstance(Date.today().toStartOfMonth(), Datetime.now().time());
-        createLogEntryRecords('TXN1', 'Delete', expectedRecordCountWithPurgeActionDelete, createDate);
-        createLogEntryRecords('TXN2', 'Custom', expectedRecordCountWithPurgeActionCustom, createDate);
+        createLogEntryRecords('Delete', expectedRecordCountWithPurgeActionDelete, createDate);
+        createLogEntryRecords('Custom', expectedRecordCountWithPurgeActionCustom, createDate);
 
         List<AggregateResult> logObjectResult = LogBatchPurgeController.getLogEntryObjectSummary('THIS_MONTH');
 
@@ -317,19 +317,22 @@ private class LogBatchPurgeController_Tests {
     static void it_should_permit_user_to_execute_purge_batch_when_custom_permission_is_assigned() {
         Schema.User standardUser = LoggerMockDataCreator.createUser(STANDARD_USER_PROFILE.Id);
         insert standardUser;
-        PermissionSet permissionSet = new PermissionSet(Name = 'CanExecuteLogBatchPurger', Label = 'Custom Permisison Enabled');
+        Schema.PermissionSet permissionSet = new Schema.PermissionSet(Name = 'CanExecuteLogBatchPurger', Label = 'Custom Permisison Enabled');
         insert permissionSet;
         SetupEntityAccess setupEntityAccess = new SetupEntityAccess(
             ParentId = permissionSet.Id,
             SetupEntityId = getCanExecuteLogBatchPurgerCustomPermissionId()
         );
-        PermissionSetAssignment permissionSetAssignment = new PermissionSetAssignment(AssigneeId = standardUser.Id, PermissionSetId = permissionSet.Id);
+        Schema.PermissionSetAssignment permissionSetAssignment = new Schema.PermissionSetAssignment(
+            AssigneeId = standardUser.Id,
+            PermissionSetId = permissionSet.Id
+        );
         insert new List<SObject>{ setupEntityAccess, permissionSetAssignment };
 
         System.runAs(standardUser) {
             System.Assert.isTrue(
                 System.FeatureManagement.checkPermission(CAN_EXECUTE_LOG_BATCH_PURGER_PERMISSION),
-                JSON.serializePretty(permissionSetAssignment)
+                System.JSON.serializePretty(permissionSetAssignment)
             );
             System.Assert.areEqual(
                 true,
@@ -344,9 +347,9 @@ private class LogBatchPurgeController_Tests {
         System.Test.startTest();
         LogBatchPurgeController.runBatchPurge();
         System.Test.stopTest();
-        List<AsyncApexJob> purgeJobs = LogBatchPurgeController.getBatchPurgeJobRecords();
+        List<Schema.AsyncApexJob> purgeJobs = LogBatchPurgeController.getBatchPurgeJobRecords();
         System.Assert.areEqual(1, purgeJobs.size(), 'should return purge batch job records');
-        for (AsyncApexJob job : purgeJobs) {
+        for (Schema.AsyncApexJob job : purgeJobs) {
             System.Assert.isNotNull(job.JobType, 'it should return job type');
             System.Assert.isNotNull(job.JobItemsProcessed, 'it should return JobItemsProcessed');
             System.Assert.isNotNull(job.NumberOfErrors, 'it should return noOfErrors');
@@ -360,7 +363,7 @@ private class LogBatchPurgeController_Tests {
     static void it_should_not_permit_user_to_execute_purge_batch_when_custom_permission_is_not_assigned() {
         Schema.User standardUser = LoggerMockDataCreator.createUser(STANDARD_USER_PROFILE.Id);
         insert standardUser;
-        PermissionSet permissionSet = new PermissionSet(Name = 'CanExecuteLogBatchPurger', Label = 'Custom Permisison Enabled');
+        Schema.PermissionSet permissionSet = new Schema.PermissionSet(Name = 'CanExecuteLogBatchPurger', Label = 'Custom Permisison Enabled');
         insert permissionSet;
         SetupEntityAccess setupEntityAccess = new SetupEntityAccess(
             ParentId = permissionSet.Id,
@@ -388,7 +391,7 @@ private class LogBatchPurgeController_Tests {
         String apexClassName = LogBatchPurger.class.getName().contains('.')
             ? LogBatchPurger.class.getName().substringAfter('.')
             : LogBatchPurger.class.getName();
-        List<AsyncApexJob> purgeBatchJobs = [
+        List<Schema.AsyncApexJob> purgeBatchJobs = [
             SELECT Id
             FROM AsyncApexJob
             WHERE
@@ -400,10 +403,10 @@ private class LogBatchPurgeController_Tests {
         System.Assert.areEqual(1, purgeBatchJobs.size(), 'should execute the purge batch job');
     }
 
-    private static void createLogRecords(String transactionIdPrefix, String purgeAction, Integer noOfRecords, Datetime createDate) {
+    private static void createLogRecords(String purgeAction, Integer noOfRecords, Datetime createDate) {
         List<Log__c> logs = new List<Log__c>();
         for (Integer i = 1; i <= noOfRecords; i++) {
-            Log__c log = new Log__c(TransactionId__c = transactionIdPrefix + i);
+            Log__c log = new Log__c(TransactionId__c = System.UUID.randomUUID().toString());
             log.LogPurgeAction__c = purgeAction;
             log.LogRetentionDate__c = System.today();
             logs.add(log);
@@ -414,8 +417,8 @@ private class LogBatchPurgeController_Tests {
         }
     }
 
-    private static void createLogEntryRecords(String transactionIdPrefix, String purgeAction, Integer noOfRecords, Datetime createDate) {
-        Log__c log = new log__c(TransactionId__c = transactionIdPrefix);
+    private static void createLogEntryRecords(String purgeAction, Integer noOfRecords, Datetime createDate) {
+        Log__c log = new log__c(TransactionId__c = System.UUID.randomUUID().toString());
         log.LogPurgeAction__c = purgeAction;
         log.LogRetentionDate__c = System.today();
         insert log;
diff --git a/nebula-logger/core/tests/log-management/classes/LogBatchPurger_Tests.cls b/nebula-logger/core/tests/log-management/classes/LogBatchPurger_Tests.cls
index 51f08f302..d541d625a 100644
--- a/nebula-logger/core/tests/log-management/classes/LogBatchPurger_Tests.cls
+++ b/nebula-logger/core/tests/log-management/classes/LogBatchPurger_Tests.cls
@@ -110,13 +110,13 @@ private class LogBatchPurger_Tests {
         LoggerSObjectHandler.shouldExecute(true);
         LoggerTestConfigurator.setupMockSObjectHandlerConfigurations();
 
-        Database.executeBatch(new LogBatchPurger());
+        System.Database.executeBatch(new LogBatchPurger());
 
         System.Test.stopTest();
         logs = [SELECT Id FROM Log__c WHERE Id IN :logs];
         logEntries = [SELECT Id FROM LogEntry__c WHERE Id IN :logEntries];
-        System.Assert.areEqual(0, logs.size(), JSON.serializePretty(logs));
-        System.Assert.areEqual(0, logEntries.size(), JSON.serializePretty(logEntries));
+        System.Assert.areEqual(0, logs.size(), System.JSON.serializePretty(logs));
+        System.Assert.areEqual(0, logEntries.size(), System.JSON.serializePretty(logEntries));
     }
 
     @IsTest
@@ -140,13 +140,13 @@ private class LogBatchPurger_Tests {
         LoggerSObjectHandler.shouldExecute(false);
         LoggerTestConfigurator.setupMockSObjectHandlerConfigurations();
 
-        Database.executeBatch(new LogBatchPurger());
+        System.Database.executeBatch(new LogBatchPurger());
 
         System.Test.stopTest();
         logs = [SELECT Id FROM Log__c WHERE Id IN :logs];
         logEntries = [SELECT Id FROM LogEntry__c WHERE Id IN :logEntries];
-        System.Assert.areEqual(0, logs.size(), JSON.serializePretty(logs));
-        System.Assert.areEqual(0, logEntries.size(), JSON.serializePretty(logEntries));
+        System.Assert.areEqual(0, logs.size(), System.JSON.serializePretty(logs));
+        System.Assert.areEqual(0, logEntries.size(), System.JSON.serializePretty(logEntries));
     }
 
     @IsTest
@@ -166,7 +166,7 @@ private class LogBatchPurger_Tests {
         LoggerSObjectHandler.shouldExecute(false);
         LoggerTestConfigurator.setupMockSObjectHandlerConfigurations();
 
-        Database.executeBatch(new LogBatchPurger());
+        System.Database.executeBatch(new LogBatchPurger());
 
         System.Test.stopTest();
         logs = [SELECT Id FROM Log__c WHERE Id IN :logs];
@@ -193,13 +193,13 @@ private class LogBatchPurger_Tests {
         LoggerSObjectHandler.shouldExecute(false);
         LoggerTestConfigurator.setupMockSObjectHandlerConfigurations();
 
-        Database.executeBatch(new LogBatchPurger());
+        System.Database.executeBatch(new LogBatchPurger());
 
         System.Test.stopTest();
         logs = [SELECT Id FROM Log__c WHERE Id IN :logs];
         logEntries = [SELECT Id FROM LogEntry__c WHERE Id IN :logEntries];
-        System.Assert.areEqual(1, logs.size(), JSON.serializePretty(logs));
-        System.Assert.areEqual(NUMBER_OF_LOG_ENTRIES_TO_CREATE, logEntries.size(), JSON.serializePretty(logEntries));
+        System.Assert.areEqual(1, logs.size(), System.JSON.serializePretty(logs));
+        System.Assert.areEqual(NUMBER_OF_LOG_ENTRIES_TO_CREATE, logEntries.size(), System.JSON.serializePretty(logEntries));
     }
 
     @IsTest
@@ -217,7 +217,7 @@ private class LogBatchPurger_Tests {
         LoggerSObjectHandler.shouldExecute(false);
         LoggerTestConfigurator.setupMockSObjectHandlerConfigurations();
 
-        Database.executeBatch(new LogBatchPurger());
+        System.Database.executeBatch(new LogBatchPurger());
 
         System.Test.stopTest();
         List<Log__c> matchingLogs = [SELECT Id FROM Log__c WHERE Id = :log.Id];
@@ -238,7 +238,7 @@ private class LogBatchPurger_Tests {
         LoggerSObjectHandler.shouldExecute(false);
         LoggerTestConfigurator.setupMockSObjectHandlerConfigurations();
 
-        Database.executeBatch(new LogBatchPurger());
+        System.Database.executeBatch(new LogBatchPurger());
 
         System.Test.stopTest();
         List<Log__c> matchingLogs = [SELECT Id FROM Log__c WHERE Id = :log.Id];
@@ -288,7 +288,7 @@ private class LogBatchPurger_Tests {
             'No Apex plugins should have run in the batch job\'s finish method'
         );
         LoggerPlugin.Batchable apexStartPlugin = batchJobInstance.getExecutedApexPlugins().get(LogBatchPurger.BatchableMethod.START).get(0);
-        System.Assert.isInstanceOfType(apexStartPlugin, MockBatchPurgerPlugin.class, JSON.serializePretty(apexStartPlugin));
+        System.Assert.isInstanceOfType(apexStartPlugin, MockBatchPurgerPlugin.class, System.JSON.serializePretty(apexStartPlugin));
         System.Assert.isTrue(ranPluginStart);
         System.Assert.isFalse(ranPluginExecute);
         System.Assert.isFalse(ranPluginFinish);
@@ -341,7 +341,7 @@ private class LogBatchPurger_Tests {
             'No Apex plugins should have run in the batch job\'s finish method'
         );
         LoggerPlugin.Batchable apexExecutePlugin = batchJobInstance.getExecutedApexPlugins().get(LogBatchPurger.BatchableMethod.EXECUTE).get(0);
-        System.Assert.isInstanceOfType(apexExecutePlugin, MockBatchPurgerPlugin.class, JSON.serializePretty(apexExecutePlugin));
+        System.Assert.isInstanceOfType(apexExecutePlugin, MockBatchPurgerPlugin.class, System.JSON.serializePretty(apexExecutePlugin));
         System.Assert.isFalse(ranPluginStart);
         System.Assert.isTrue(ranPluginExecute);
         System.Assert.isFalse(ranPluginFinish);
@@ -393,7 +393,7 @@ private class LogBatchPurger_Tests {
             'One Apex plugin should have run in the batch job\'s finish method'
         );
         LoggerPlugin.Batchable apexFinishPlugin = batchJobInstance.getExecutedApexPlugins().get(LogBatchPurger.BatchableMethod.FINISH).get(0);
-        System.Assert.isInstanceOfType(apexFinishPlugin, MockBatchPurgerPlugin.class, JSON.serializePretty(apexFinishPlugin));
+        System.Assert.isInstanceOfType(apexFinishPlugin, MockBatchPurgerPlugin.class, System.JSON.serializePretty(apexFinishPlugin));
         System.Assert.isFalse(ranPluginStart);
         System.Assert.isFalse(ranPluginExecute);
         System.Assert.isTrue(ranPluginFinish);
diff --git a/nebula-logger/core/tests/log-management/classes/LogEntryEventHandler_Tests.cls b/nebula-logger/core/tests/log-management/classes/LogEntryEventHandler_Tests.cls
index ac7729da1..1e0611fea 100644
--- a/nebula-logger/core/tests/log-management/classes/LogEntryEventHandler_Tests.cls
+++ b/nebula-logger/core/tests/log-management/classes/LogEntryEventHandler_Tests.cls
@@ -94,7 +94,7 @@ private class LogEntryEventHandler_Tests {
         );
         System.Assert.areEqual(1, [SELECT COUNT() FROM Log__c]);
         List<LogEntry__c> logEntries = [SELECT Id, LoggingLevel__c, Message__c FROM LogEntry__c];
-        System.Assert.areEqual(1, logEntries.size(), JSON.serializePretty(logEntries));
+        System.Assert.areEqual(1, logEntries.size(), System.JSON.serializePretty(logEntries));
         System.Assert.areEqual(matchingLogEntryEvent.LoggingLevel__c, logEntries.get(0).LoggingLevel__c);
         System.Assert.areEqual(matchingLogEntryEvent.Message__c, logEntries.get(0).Message__c);
     }
@@ -229,7 +229,7 @@ private class LogEntryEventHandler_Tests {
             'Handler class should have executed one time for AFTER_INSERT'
         );
         List<Log__c> logs = [SELECT Id, TransactionId__c, (SELECT Id FROM LogEntries__r) FROM Log__c];
-        System.Assert.areEqual(2, logs.size(), JSON.serializePretty(logs));
+        System.Assert.areEqual(2, logs.size(), System.JSON.serializePretty(logs));
         Set<String> uniqueTransactionIds = new Set<String>(transactionIds);
         for (Log__c log : logs) {
             System.Assert.isTrue(uniqueTransactionIds.contains(log.TransactionId__c), log.TransactionId__c);
@@ -275,7 +275,7 @@ private class LogEntryEventHandler_Tests {
         LogEntryEvent__e logEntryEvent = createLogEntryEvent();
         logEntryEvent.EntryScenario__c = 'some entry scenario';
         logEntryEvent.TransactionScenario__c = 'some transaction scenario';
-        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'NormalizeScenarioData', Value__c = JSON.serialize(false)));
+        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'NormalizeScenarioData', Value__c = System.JSON.serialize(false)));
         System.Assert.isFalse(LoggerParameter.NORMALIZE_SCENARIO_DATA);
 
         Database.SaveResult saveResult = LoggerMockDataStore.getEventBus().publishRecord(logEntryEvent);
@@ -693,7 +693,7 @@ private class LogEntryEventHandler_Tests {
     //     System.Test.startTest();
     //     LogEntryEventHandler.ENABLE_TAGGING = true;
     //     LogEntryEventHandler.USE_TOPICS_FOR_TAGS = true;
-    //     Database.SaveResult saveResult = EventBus.publish(logEntryEvent);
+    //     Database.SaveResult saveResult = System.EventBus.publish(logEntryEvent);
     //     System.Test.stopTest();
 
     //     System.Assert.isTrue(saveResult.isSuccess(), saveResult.getErrors().toString());
@@ -721,7 +721,7 @@ private class LogEntryEventHandler_Tests {
         LoggerTestConfigurator.getSObjectHandlerConfiguration(Schema.LogEntry__c.SObjectType).IsEnabled__c = false;
         LogEntryEvent__e logEntryEvent = createLogEntryEvent();
         logEntryEvent.Tags__c = 'some entry scenario';
-        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'NormalizeTagData', Value__c = JSON.serialize(false)));
+        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'NormalizeTagData', Value__c = System.JSON.serialize(false)));
         System.Assert.isFalse(LoggerParameter.NORMALIZE_TAG_DATA);
 
         Database.SaveResult saveResult = LoggerMockDataStore.getEventBus().publishRecord(logEntryEvent);
diff --git a/nebula-logger/core/tests/log-management/classes/LogEntryEventStreamController_Tests.cls b/nebula-logger/core/tests/log-management/classes/LogEntryEventStreamController_Tests.cls
index e62ce1ad8..51b8f46ce 100644
--- a/nebula-logger/core/tests/log-management/classes/LogEntryEventStreamController_Tests.cls
+++ b/nebula-logger/core/tests/log-management/classes/LogEntryEventStreamController_Tests.cls
@@ -9,7 +9,7 @@ private class LogEntryEventStreamController_Tests {
     @IsTest
     static void it_should_return_is_enabled_parameter() {
         Boolean mockValue = false;
-        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'EnableLogEntryEventStream', Value__c = JSON.serialize(mockValue));
+        LoggerParameter__mdt mockParameter = new LoggerParameter__mdt(DeveloperName = 'EnableLogEntryEventStream', Value__c = System.JSON.serialize(mockValue));
         LoggerParameter.setMock(mockParameter);
 
         Boolean returnedValue = LogEntryEventStreamController.isEnabled();
@@ -23,7 +23,7 @@ private class LogEntryEventStreamController_Tests {
         LoggerTestConfigurator.setMock(
             new LoggerParameter__mdt(DeveloperName = LogEntryEventStreamController.DISPLAY_FIELDS_PARAMETER_NAME, Value__c = fields)
         );
-        List<String> mockDisplayFields = (List<String>) JSON.deserialize(fields, List<String>.class);
+        List<String> mockDisplayFields = (List<String>) System.JSON.deserialize(fields, List<String>.class);
         List<String> displayFields = LogEntryEventStreamController.getDatatableDisplayFields();
 
         System.Assert.areEqual(mockDisplayFields.size(), displayFields.size(), 'fields count mismatch');
diff --git a/nebula-logger/core/tests/log-management/classes/LogEntryHandler_Tests.cls b/nebula-logger/core/tests/log-management/classes/LogEntryHandler_Tests.cls
index 04b3c06d4..1b89dd5d1 100644
--- a/nebula-logger/core/tests/log-management/classes/LogEntryHandler_Tests.cls
+++ b/nebula-logger/core/tests/log-management/classes/LogEntryHandler_Tests.cls
@@ -134,7 +134,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_INSERT,
+            System.TriggerOperation.BEFORE_INSERT,
             new List<LogEntry__c>{ matchingLogEntry, nonMatchingLogEntry }
         );
         new LogEntryHandler().overrideTriggerableContext(context).execute();
@@ -156,7 +156,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_UPDATE,
+            System.TriggerOperation.BEFORE_UPDATE,
             updatedRecords,
             new Map<Id, SObject>(updatedRecords),
             null
@@ -176,7 +176,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_INSERT,
+            System.TriggerOperation.BEFORE_INSERT,
             new List<LogEntry__c>{ matchingLogEntry, nonMatchingLogEntry }
         );
         new LogEntryHandler().overrideTriggerableContext(context).execute();
@@ -198,7 +198,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_UPDATE,
+            System.TriggerOperation.BEFORE_UPDATE,
             updatedRecords,
             new Map<Id, SObject>(updatedRecords),
             null
@@ -218,7 +218,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_INSERT,
+            System.TriggerOperation.BEFORE_INSERT,
             new List<LogEntry__c>{ matchingLogEntry, nonMatchingLogEntry }
         );
         new LogEntryHandler().overrideTriggerableContext(context).execute();
@@ -237,7 +237,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_UPDATE,
+            System.TriggerOperation.BEFORE_UPDATE,
             updatedRecords,
             new Map<Id, SObject>(updatedRecords),
             null
@@ -257,7 +257,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_INSERT,
+            System.TriggerOperation.BEFORE_INSERT,
             new List<LogEntry__c>{ matchingLogEntry, nonMatchingLogEntry }
         );
         new LogEntryHandler().overrideTriggerableContext(context).execute();
@@ -276,7 +276,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_UPDATE,
+            System.TriggerOperation.BEFORE_UPDATE,
             updatedRecords,
             new Map<Id, SObject>(updatedRecords),
             null
@@ -296,7 +296,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_INSERT,
+            System.TriggerOperation.BEFORE_INSERT,
             new List<LogEntry__c>{ matchingLogEntry, nonMatchingLogEntry }
         );
         new LogEntryHandler().overrideTriggerableContext(context).execute();
@@ -321,7 +321,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_UPDATE,
+            System.TriggerOperation.BEFORE_UPDATE,
             updatedRecords,
             new Map<Id, SObject>(updatedRecords),
             null
@@ -341,7 +341,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_INSERT,
+            System.TriggerOperation.BEFORE_INSERT,
             new List<LogEntry__c>{ matchingLogEntry, nonMatchingLogEntry }
         );
         new LogEntryHandler().overrideTriggerableContext(context).execute();
@@ -363,7 +363,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_UPDATE,
+            System.TriggerOperation.BEFORE_UPDATE,
             updatedRecords,
             new Map<Id, SObject>(updatedRecords),
             null
@@ -383,7 +383,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_INSERT,
+            System.TriggerOperation.BEFORE_INSERT,
             new List<LogEntry__c>{ matchingLogEntry, nonMatchingLogEntry }
         );
         new LogEntryHandler().overrideTriggerableContext(context).execute();
@@ -402,7 +402,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_UPDATE,
+            System.TriggerOperation.BEFORE_UPDATE,
             updatedRecords,
             new Map<Id, SObject>(updatedRecords),
             null
@@ -422,7 +422,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_INSERT,
+            System.TriggerOperation.BEFORE_INSERT,
             new List<LogEntry__c>{ matchingLogEntry, nonMatchingLogEntry }
         );
         new LogEntryHandler().overrideTriggerableContext(context).execute();
@@ -444,7 +444,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_UPDATE,
+            System.TriggerOperation.BEFORE_UPDATE,
             updatedRecords,
             new Map<Id, SObject>(updatedRecords),
             null
@@ -464,7 +464,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_INSERT,
+            System.TriggerOperation.BEFORE_INSERT,
             new List<LogEntry__c>{ matchingLogEntry, nonMatchingLogEntry }
         );
         new LogEntryHandler().overrideTriggerableContext(context).execute();
@@ -486,7 +486,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_UPDATE,
+            System.TriggerOperation.BEFORE_UPDATE,
             updatedRecords,
             new Map<Id, SObject>(updatedRecords),
             null
@@ -506,7 +506,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_INSERT,
+            System.TriggerOperation.BEFORE_INSERT,
             new List<LogEntry__c>{ matchingLogEntry, nonMatchingLogEntry }
         );
         new LogEntryHandler().overrideTriggerableContext(context).execute();
@@ -525,7 +525,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_UPDATE,
+            System.TriggerOperation.BEFORE_UPDATE,
             updatedRecords,
             new Map<Id, SObject>(updatedRecords),
             null
@@ -545,7 +545,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_INSERT,
+            System.TriggerOperation.BEFORE_INSERT,
             new List<LogEntry__c>{ matchingLogEntry, nonMatchingLogEntry }
         );
         new LogEntryHandler().overrideTriggerableContext(context).execute();
@@ -570,7 +570,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_UPDATE,
+            System.TriggerOperation.BEFORE_UPDATE,
             updatedRecords,
             new Map<Id, SObject>(updatedRecords),
             null
@@ -590,7 +590,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_INSERT,
+            System.TriggerOperation.BEFORE_INSERT,
             new List<LogEntry__c>{ matchingLogEntry, nonMatchingLogEntry }
         );
         new LogEntryHandler().overrideTriggerableContext(context).execute();
@@ -612,7 +612,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_UPDATE,
+            System.TriggerOperation.BEFORE_UPDATE,
             updatedRecords,
             new Map<Id, SObject>(updatedRecords),
             null
@@ -632,7 +632,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_INSERT,
+            System.TriggerOperation.BEFORE_INSERT,
             new List<LogEntry__c>{ matchingLogEntry, nonMatchingLogEntry }
         );
         new LogEntryHandler().overrideTriggerableContext(context).execute();
@@ -651,7 +651,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_UPDATE,
+            System.TriggerOperation.BEFORE_UPDATE,
             updatedRecords,
             new Map<Id, SObject>(updatedRecords),
             null
@@ -671,7 +671,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_INSERT,
+            System.TriggerOperation.BEFORE_INSERT,
             new List<LogEntry__c>{ matchingLogEntry, nonMatchingLogEntry }
         );
         new LogEntryHandler().overrideTriggerableContext(context).execute();
@@ -690,7 +690,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_UPDATE,
+            System.TriggerOperation.BEFORE_UPDATE,
             updatedRecords,
             new Map<Id, SObject>(updatedRecords),
             null
@@ -710,7 +710,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_INSERT,
+            System.TriggerOperation.BEFORE_INSERT,
             new List<LogEntry__c>{ matchingLogEntry, nonMatchingLogEntry }
         );
         new LogEntryHandler().overrideTriggerableContext(context).execute();
@@ -729,7 +729,7 @@ private class LogEntryHandler_Tests {
 
         LoggerTriggerableContext context = new LoggerTriggerableContext(
             Schema.LogEntry__c.SObjectType,
-            TriggerOperation.BEFORE_UPDATE,
+            System.TriggerOperation.BEFORE_UPDATE,
             updatedRecords,
             new Map<Id, SObject>(updatedRecords),
             null
@@ -789,7 +789,7 @@ private class LogEntryHandler_Tests {
         }
 
         LoggerStackTrace stackTrace = new LoggerStackTrace();
-        ApexClass apexClass = [
+        Schema.ApexClass apexClass = [
             SELECT Id, ApiVersion, Body, CreatedBy.Username, CreatedDate, LastModifiedBy.Username, LastModifiedDate
             FROM ApexClass
             WHERE NamespacePrefix = :getNamespacePrefix() AND Name = :stackTrace.Source.ApiName
@@ -858,7 +858,7 @@ private class LogEntryHandler_Tests {
                 [x] public Integer targetLineNumber
                 [ ] public Integer totalLinesOfCode
         */
-        System.Assert.areEqual(JSON.serializePretty(expectedSnippet), logEntry.ExceptionSourceSnippet__c);
+        System.Assert.areEqual(System.JSON.serializePretty(expectedSnippet), logEntry.ExceptionSourceSnippet__c);
     }
 
     @IsTest
@@ -871,7 +871,7 @@ private class LogEntryHandler_Tests {
         }
 
         LoggerStackTrace stackTrace = new LoggerStackTrace();
-        ApexClass apexClass = [
+        Schema.ApexClass apexClass = [
             SELECT Id, ApiVersion, Body, CreatedBy.Username, CreatedDate, LastModifiedBy.Username, LastModifiedDate
             FROM ApexClass
             WHERE NamespacePrefix = :getNamespacePrefix() AND Name = :stackTrace.Source.ApiName
@@ -927,7 +927,7 @@ private class LogEntryHandler_Tests {
             FROM LogEntry__c
             WHERE Id = :logEntry.Id
         ];
-        // ApexClass fields
+        // Schema.ApexClass fields
         System.Assert.areEqual('v' + apexClass.ApiVersion, logEntry.ApexClassApiVersion__c);
         System.Assert.areEqual(apexClass.CreatedDate, logEntry.ApexClassCreatedDate__c);
         System.Assert.areEqual(apexClass.Id, logEntry.ApexClassId__c);
@@ -958,7 +958,7 @@ private class LogEntryHandler_Tests {
                 [x] public Integer targetLineNumber
                 [ ] public Integer totalLinesOfCode
         */
-        System.Assert.areEqual(JSON.serializePretty(expectedSnippet), logEntry.OriginSourceSnippet__c);
+        System.Assert.areEqual(System.JSON.serializePretty(expectedSnippet), logEntry.OriginSourceSnippet__c);
         System.Assert.isTrue(logEntry.HasStackTrace__c);
         // FIXME
         // System.Assert.areEqual(stackTrace.parsedStackTraceString, logEntry.StackTrace__c);
@@ -974,7 +974,7 @@ private class LogEntryHandler_Tests {
         }
 
         LoggerStackTrace stackTrace = new SomeInnerClass().getLoggerStackTrace();
-        ApexClass apexClass = [
+        Schema.ApexClass apexClass = [
             SELECT Id, ApiVersion, Body, CreatedBy.Username, CreatedDate, LastModifiedBy.Username, LastModifiedDate
             FROM ApexClass
             WHERE NamespacePrefix = :getNamespacePrefix() AND Name = :stackTrace.Source.ApiName
@@ -1030,7 +1030,7 @@ private class LogEntryHandler_Tests {
             FROM LogEntry__c
             WHERE Id = :logEntry.Id
         ];
-        // ApexClass fields
+        // Schema.ApexClass fields
         System.Assert.areEqual('v' + apexClass.ApiVersion, logEntry.ApexClassApiVersion__c);
         System.Assert.areEqual(apexClass.CreatedDate, logEntry.ApexClassCreatedDate__c);
         System.Assert.areEqual(apexClass.Id, logEntry.ApexClassId__c);
@@ -1063,7 +1063,7 @@ private class LogEntryHandler_Tests {
                 [x] public Integer targetLineNumber
                 [ ] public Integer totalLinesOfCode
         */
-        System.Assert.areEqual(JSON.serializePretty(expectedSnippet), logEntry.OriginSourceSnippet__c);
+        System.Assert.areEqual(System.JSON.serializePretty(expectedSnippet), logEntry.OriginSourceSnippet__c);
         System.Assert.isTrue(logEntry.HasStackTrace__c);
         // FIXME
         // System.Assert.areEqual(stackTrace.parsedStackTraceString, logEntry.StackTrace__c);
@@ -1082,7 +1082,7 @@ private class LogEntryHandler_Tests {
         // stack trace string so the code has an actual trigger to query
         String mockTriggerStackTraceString = String.join(new List<String>{ 'Trigger.LogEntry: line 2, column 1', 'AnonymousBlock: line 1, column 1' }, '\n');
         LoggerStackTrace stackTrace = new LoggerStackTrace(mockTriggerStackTraceString);
-        ApexTrigger apexTrigger = [
+        Schema.ApexTrigger apexTrigger = [
             SELECT Id, ApiVersion, Body, CreatedBy.Username, CreatedDate, LastModifiedBy.Username, LastModifiedDate
             FROM ApexTrigger
             WHERE NamespacePrefix = :getNamespacePrefix() AND Name = :stackTrace.Source.ApiName
@@ -1143,7 +1143,7 @@ private class LogEntryHandler_Tests {
                 [x] public Integer targetLineNumber
                 [ ] public Integer totalLinesOfCode
         */
-        System.Assert.areEqual(JSON.serializePretty(expectedSnippet), logEntry.OriginSourceSnippet__c);
+        System.Assert.areEqual(System.JSON.serializePretty(expectedSnippet), logEntry.OriginSourceSnippet__c);
         System.Assert.isTrue(logEntry.HasStackTrace__c);
         // FIXME
         // System.Assert.areEqual(stackTrace.parsedStackTraceString, logEntry.StackTrace__c);
@@ -1230,7 +1230,7 @@ private class LogEntryHandler_Tests {
         return namespacePrefix;
     }
 
-    // Helper class for testing stack trace parsing & ApexClass querying for an inner class
+    // Helper class for testing stack trace parsing & Schema.ApexClass querying for an inner class
     private class SomeInnerClass {
         public LoggerStackTrace getLoggerStackTrace() {
             return new LoggerStackTrace();
diff --git a/nebula-logger/core/tests/log-management/classes/LogHandler_Tests.cls b/nebula-logger/core/tests/log-management/classes/LogHandler_Tests.cls
index afbac1e10..f3ef00f88 100644
--- a/nebula-logger/core/tests/log-management/classes/LogHandler_Tests.cls
+++ b/nebula-logger/core/tests/log-management/classes/LogHandler_Tests.cls
@@ -170,7 +170,7 @@ private class LogHandler_Tests {
 
     @IsTest
     static void it_should_set_organization_limits_when_enabled() {
-        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreOrganizationLimits', Value__c = JSON.serialize(true)));
+        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreOrganizationLimits', Value__c = System.JSON.serialize(true)));
         setupConfigurations();
         Log__c log = new Log__c(TransactionId__c = '1234');
 
@@ -194,7 +194,7 @@ private class LogHandler_Tests {
             organizationLimit.Max = systemOrgLimit.getLimit();
             limitNameToExpectedOrganizationLimits.put(organizationLimit.Name, organizationLimit);
         }
-        List<LogHandler.OrganizationLimit> returnedOrganizationLimits = (List<LogHandler.OrganizationLimit>) JSON.deserialize(
+        List<LogHandler.OrganizationLimit> returnedOrganizationLimits = (List<LogHandler.OrganizationLimit>) System.JSON.deserialize(
             log.OrganizationLimits__c,
             List<LogHandler.OrganizationLimit>.class
         );
@@ -210,7 +210,7 @@ private class LogHandler_Tests {
 
     @IsTest
     static void it_should_not_set_organization_limits_when_disabled() {
-        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreOrganizationLimits', Value__c = JSON.serialize(false)));
+        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreOrganizationLimits', Value__c = System.JSON.serialize(false)));
         setupConfigurations();
         Log__c log = new Log__c(TransactionId__c = '1234');
 
@@ -245,7 +245,7 @@ private class LogHandler_Tests {
             'Handler class should have executed two times - once for BEFORE_INSERT and once for AFTER_INSERT'
         );
         log = [SELECT Id, OwnerId FROM Log__c WHERE Id = :log.Id];
-        System.Assert.areEqual(expectedLogOwnerUser.Id, log.OwnerId, JSON.serializePretty(log));
+        System.Assert.areEqual(expectedLogOwnerUser.Id, log.OwnerId, System.JSON.serializePretty(log));
     }
 
     @IsTest
@@ -267,7 +267,7 @@ private class LogHandler_Tests {
             'Handler class should have executed two times - once for BEFORE_INSERT and once for AFTER_INSERT'
         );
         log = [SELECT Id, OwnerId FROM Log__c WHERE Id = :log.Id];
-        System.Assert.areEqual(expectedLogOwnerUser.Id, log.OwnerId, JSON.serializePretty(log));
+        System.Assert.areEqual(expectedLogOwnerUser.Id, log.OwnerId, System.JSON.serializePretty(log));
     }
 
     @IsTest
@@ -288,7 +288,7 @@ private class LogHandler_Tests {
             'Handler class should have executed two times - once for BEFORE_INSERT and once for AFTER_INSERT'
         );
         log = [SELECT Id, OwnerId FROM Log__c WHERE Id = :log.Id];
-        System.Assert.areEqual(expectedLogOwnerQueue.Id, log.OwnerId, JSON.serializePretty(log));
+        System.Assert.areEqual(expectedLogOwnerQueue.Id, log.OwnerId, System.JSON.serializePretty(log));
     }
 
     @IsTest
@@ -309,7 +309,7 @@ private class LogHandler_Tests {
             'Handler class should have executed two times - once for BEFORE_INSERT and once for AFTER_INSERT'
         );
         log = [SELECT Id, OwnerId FROM Log__c WHERE Id = :log.Id];
-        System.Assert.areEqual(expectedLogOwnerQueue.Id, log.OwnerId, JSON.serializePretty(log));
+        System.Assert.areEqual(expectedLogOwnerQueue.Id, log.OwnerId, System.JSON.serializePretty(log));
     }
 
     @IsTest
@@ -329,7 +329,7 @@ private class LogHandler_Tests {
             'Handler class should have executed two times - once for BEFORE_INSERT and once for AFTER_INSERT'
         );
         log = [SELECT Id, OwnerId FROM Log__c WHERE Id = :log.Id];
-        System.Assert.areEqual(System.UserInfo.getUserId(), log.OwnerId, JSON.serializePretty(log));
+        System.Assert.areEqual(System.UserInfo.getUserId(), log.OwnerId, System.JSON.serializePretty(log));
     }
 
     @IsTest
@@ -340,8 +340,8 @@ private class LogHandler_Tests {
         insert log;
 
         log = [SELECT Id, ParentLogTransactionId__c, ParentLog__c FROM Log__c WHERE Id = :log.Id];
-        System.Assert.areEqual(parentLogTransactionId, log.ParentLogTransactionId__c, JSON.serializePretty(log));
-        System.Assert.isNull(log.ParentLog__c, JSON.serializePretty(log));
+        System.Assert.areEqual(parentLogTransactionId, log.ParentLogTransactionId__c, System.JSON.serializePretty(log));
+        System.Assert.isNull(log.ParentLog__c, System.JSON.serializePretty(log));
     }
 
     @IsTest
@@ -354,8 +354,8 @@ private class LogHandler_Tests {
         insert log;
 
         log = [SELECT Id, ParentLogTransactionId__c, ParentLog__c FROM Log__c WHERE Id = :log.Id];
-        System.Assert.areEqual(parentLogTransactionId, log.ParentLogTransactionId__c, JSON.serializePretty(log));
-        System.Assert.areEqual(parentLog.Id, log.ParentLog__c, JSON.serializePretty(log));
+        System.Assert.areEqual(parentLogTransactionId, log.ParentLogTransactionId__c, System.JSON.serializePretty(log));
+        System.Assert.areEqual(parentLog.Id, log.ParentLog__c, System.JSON.serializePretty(log));
     }
 
     @IsTest
@@ -368,8 +368,8 @@ private class LogHandler_Tests {
         insert parentLog;
 
         log = [SELECT Id, ParentLogTransactionId__c, ParentLog__c FROM Log__c WHERE Id = :log.Id];
-        System.Assert.areEqual(parentLogTransactionId, log.ParentLogTransactionId__c, JSON.serializePretty(log));
-        System.Assert.areEqual(parentLog.Id, log.ParentLog__c, JSON.serializePretty(log));
+        System.Assert.areEqual(parentLogTransactionId, log.ParentLogTransactionId__c, System.JSON.serializePretty(log));
+        System.Assert.areEqual(parentLog.Id, log.ParentLog__c, System.JSON.serializePretty(log));
     }
 
     @IsTest
@@ -381,8 +381,8 @@ private class LogHandler_Tests {
         insert new List<Log__c>{ log, parentLog };
 
         log = [SELECT Id, ParentLogTransactionId__c, ParentLog__c FROM Log__c WHERE Id = :log.Id];
-        System.Assert.areEqual(parentLogTransactionId, log.ParentLogTransactionId__c, JSON.serializePretty(log));
-        System.Assert.areEqual(parentLog.Id, log.ParentLog__c, JSON.serializePretty(log));
+        System.Assert.areEqual(parentLogTransactionId, log.ParentLogTransactionId__c, System.JSON.serializePretty(log));
+        System.Assert.areEqual(parentLog.Id, log.ParentLog__c, System.JSON.serializePretty(log));
     }
 
     @IsTest
@@ -563,7 +563,7 @@ private class LogHandler_Tests {
             'Handler class should have executed two times - once for BEFORE_INSERT and once for AFTER_INSERT'
         );
         List<Log__Share> logShares = [SELECT AccessLevel, ParentId, RowCause, UserOrGroupId FROM Log__Share WHERE ParentId = :log.Id AND AccessLevel != 'All'];
-        System.Assert.areEqual(1, logShares.size(), JSON.serializePretty(logShares));
+        System.Assert.areEqual(1, logShares.size(), System.JSON.serializePretty(logShares));
         System.Assert.areEqual('Read', logShares.get(0).AccessLevel);
         System.Assert.areEqual(log.Id, logShares.get(0).ParentId);
         System.Assert.areEqual(Schema.Log__Share.RowCause.LoggedByUser__c, logShares.get(0).RowCause);
@@ -586,7 +586,7 @@ private class LogHandler_Tests {
             'Handler class should have executed two times - once for BEFORE_INSERT and once for AFTER_INSERT'
         );
         List<Log__Share> logShares = [SELECT AccessLevel, ParentId, RowCause, UserOrGroupId FROM Log__Share WHERE ParentId = :log.Id AND AccessLevel != 'All'];
-        System.Assert.areEqual(1, logShares.size(), JSON.serializePretty(logShares));
+        System.Assert.areEqual(1, logShares.size(), System.JSON.serializePretty(logShares));
         System.Assert.areEqual('Edit', logShares.get(0).AccessLevel);
         System.Assert.areEqual(log.Id, logShares.get(0).ParentId);
         System.Assert.areEqual(Schema.Log__Share.RowCause.LoggedByUser__c, logShares.get(0).RowCause);
@@ -609,7 +609,7 @@ private class LogHandler_Tests {
             'Handler class should have executed two times - once for BEFORE_INSERT and once for AFTER_INSERT'
         );
         List<Log__Share> logShares = [SELECT AccessLevel, ParentId, RowCause, UserOrGroupId FROM Log__Share WHERE ParentId = :log.Id AND AccessLevel != 'All'];
-        System.Assert.areEqual(0, logShares.size(), JSON.serializePretty(logShares));
+        System.Assert.areEqual(0, logShares.size(), System.JSON.serializePretty(logShares));
     }
 
     @IsTest
@@ -628,7 +628,7 @@ private class LogHandler_Tests {
             'Handler class should have executed two times - once for BEFORE_INSERT and once for AFTER_INSERT'
         );
         List<Log__Share> logShares = [SELECT AccessLevel, ParentId, RowCause, UserOrGroupId FROM Log__Share WHERE ParentId = :log.Id AND AccessLevel != 'All'];
-        System.Assert.areEqual(0, logShares.size(), JSON.serializePretty(logShares));
+        System.Assert.areEqual(0, logShares.size(), System.JSON.serializePretty(logShares));
     }
 
     private static String getDefaultPicklistValue(Schema.SObjectField field) {
diff --git a/nebula-logger/core/tests/log-management/classes/LogManagementDataSelector_Tests.cls b/nebula-logger/core/tests/log-management/classes/LogManagementDataSelector_Tests.cls
index b1ab99fe0..ff7512b08 100644
--- a/nebula-logger/core/tests/log-management/classes/LogManagementDataSelector_Tests.cls
+++ b/nebula-logger/core/tests/log-management/classes/LogManagementDataSelector_Tests.cls
@@ -10,7 +10,7 @@ private class LogManagementDataSelector_Tests {
     static void it_dynamically_queries_all_records_for_specified_sobject_type_and_fields() {
         Schema.SObjectType targetSObjectType = Schema.Organization.SObjectType;
         Set<String> targetFieldNames = new Set<String>{ Schema.Organization.Id.getDescribe().getName(), Schema.Organization.Name.getDescribe().getName() };
-        List<Schema.Organization> expectedResults = Database.query('SELECT ' + String.join(targetFieldNames, ', ') + ' FROM ' + targetSObjectType);
+        List<Schema.Organization> expectedResults = System.Database.query('SELECT ' + String.join(targetFieldNames, ', ') + ' FROM ' + targetSObjectType);
 
         List<SObject> returnedResults = LogManagementDataSelector.getInstance().getAll(targetSObjectType, targetFieldNames);
 
@@ -23,7 +23,7 @@ private class LogManagementDataSelector_Tests {
         Schema.SObjectType targetSObjectType = Schema.User.SObjectType;
         Set<String> targetFieldNames = new Set<String>{ Schema.User.Id.getDescribe().getName(), Schema.User.Name.getDescribe().getName() };
         List<Id> targetIds = new List<Id>(new Map<Id, Schema.User>([SELECT Id FROM User LIMIT 3]).keySet());
-        List<Schema.User> expectedResults = Database.query(
+        List<Schema.User> expectedResults = System.Database.query(
             'SELECT ' + String.join(targetFieldNames, ', ') + ' FROM ' + targetSObjectType + ' WHERE Id IN :targetIds'
         );
 
@@ -35,14 +35,14 @@ private class LogManagementDataSelector_Tests {
     @IsTest
     static void it_returns_matching_apex_classes_for_specified_class_names() {
         Set<String> targetApexClassNames = new Set<String>{ Logger.class.getName(), LogEntryEventBuilder.class.getName() };
-        List<ApexClass> expectedResults = [
+        List<Schema.ApexClass> expectedResults = [
             SELECT ApiVersion, Body, CreatedById, CreatedBy.Username, CreatedDate, Id, LastModifiedById, LastModifiedBy.Username, LastModifiedDate, Name
             FROM ApexClass
             WHERE Name IN :targetApexClassNames
             ORDER BY NamespacePrefix NULLS LAST
         ];
 
-        List<ApexClass> returnedResults = LogManagementDataSelector.getInstance().getApexClasses(targetApexClassNames);
+        List<Schema.ApexClass> returnedResults = LogManagementDataSelector.getInstance().getApexClasses(targetApexClassNames);
 
         System.Assert.areEqual(expectedResults, returnedResults);
     }
@@ -54,7 +54,7 @@ private class LogManagementDataSelector_Tests {
         Integer originalQueryCount = System.Limits.getQueries();
         LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'QueryApexClassData', Value__c = String.valueOf(false)));
 
-        List<ApexClass> returnedResults = LogManagementDataSelector.getInstance().getApexClasses(targetApexClassNames);
+        List<Schema.ApexClass> returnedResults = LogManagementDataSelector.getInstance().getApexClasses(targetApexClassNames);
 
         System.Assert.areEqual(originalQueryCount, System.Limits.getQueries());
         System.Assert.areEqual(0, returnedResults.size());
@@ -63,14 +63,14 @@ private class LogManagementDataSelector_Tests {
     @IsTest
     static void it_returns_matching_apex_triggers_for_specified_class_names() {
         Set<String> targetApexTriggerNames = new Set<String>{ Logger.class.getName(), LogEntryEventBuilder.class.getName() };
-        List<ApexTrigger> expectedResults = [
+        List<Schema.ApexTrigger> expectedResults = [
             SELECT ApiVersion, Body, CreatedById, CreatedBy.Username, CreatedDate, Id, LastModifiedById, LastModifiedBy.Username, LastModifiedDate, Name
             FROM ApexTrigger
             WHERE Name IN :targetApexTriggerNames
             ORDER BY NamespacePrefix NULLS LAST
         ];
 
-        List<ApexTrigger> returnedResults = LogManagementDataSelector.getInstance().getApexTriggers(targetApexTriggerNames);
+        List<Schema.ApexTrigger> returnedResults = LogManagementDataSelector.getInstance().getApexTriggers(targetApexTriggerNames);
 
         System.Assert.areEqual(expectedResults, returnedResults);
     }
@@ -82,7 +82,7 @@ private class LogManagementDataSelector_Tests {
         Integer originalQueryCount = System.Limits.getQueries();
         LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'QueryApexTriggerData', Value__c = String.valueOf(false)));
 
-        List<ApexTrigger> returnedResults = LogManagementDataSelector.getInstance().getApexTriggers(targetApexTriggerNames);
+        List<Schema.ApexTrigger> returnedResults = LogManagementDataSelector.getInstance().getApexTriggers(targetApexTriggerNames);
 
         System.Assert.areEqual(originalQueryCount, System.Limits.getQueries());
         System.Assert.areEqual(0, returnedResults.size());
@@ -90,10 +90,10 @@ private class LogManagementDataSelector_Tests {
 
     @IsTest
     static void it_returns_cached_apex_email_notifications() {
-        List<ApexEmailNotification> expectedResults = [SELECT Email, UserId FROM ApexEmailNotification WHERE Email != NULL OR User.IsActive = TRUE];
+        List<Schema.ApexEmailNotification> expectedResults = [SELECT Email, UserId FROM ApexEmailNotification WHERE Email != NULL OR User.IsActive = TRUE];
         System.Assert.areEqual(1, System.Limits.getQueries());
 
-        List<ApexEmailNotification> returnedResults = LogManagementDataSelector.getInstance().getCachedApexEmailNotifications();
+        List<Schema.ApexEmailNotification> returnedResults = LogManagementDataSelector.getInstance().getCachedApexEmailNotifications();
 
         System.Assert.areEqual(2, System.Limits.getQueries());
         LogManagementDataSelector.getInstance().getCachedApexEmailNotifications();
@@ -115,7 +115,7 @@ private class LogManagementDataSelector_Tests {
     //     executeSomeFutureMethod();
     //     System.Test.stopTest();
 
-    //     System.Assert.fail([SELECT status FROM asyncapexjob]);
+    //     System.Assert.fail([SELECT status FROM AsyncApexJob]);
     //     Integer returnedCount = LogManagementDataSelector.getInstance().getCountOfAsyncApexJobs(apexClassName, apexMethodName, jobStatuses);
 
     //     System.Assert.areEqual(1, returnedCount);
@@ -149,7 +149,7 @@ private class LogManagementDataSelector_Tests {
             Log__c returnedLog = LogManagementDataSelector.getInstance().getCachedRecentLogWithApiReleaseDetails();
 
             System.Assert.areEqual(expectedLog.Id, returnedLog.Id);
-            System.Assert.areEqual(JSON.serialize(expectedLog), JSON.serialize(expectedLog));
+            System.Assert.areEqual(System.JSON.serialize(expectedLog), System.JSON.serialize(expectedLog));
         }
 
         System.Assert.areEqual(2, System.Limits.getQueries());
@@ -225,7 +225,7 @@ private class LogManagementDataSelector_Tests {
         Schema.User undeleteableRecord = new Schema.User(Id = System.UserInfo.getUserId());
         List<Id> recordIds = new List<Id>{ deleteableRecord.Id, undeleteableRecord.Id };
 
-        List<UserRecordAccess> returnedResults = LogManagementDataSelector.getInstance().getDeleteableUserRecordAccess(recordIds);
+        List<Schema.UserRecordAccess> returnedResults = LogManagementDataSelector.getInstance().getDeleteableUserRecordAccess(recordIds);
 
         System.Assert.areEqual(1, returnedResults.size());
         System.Assert.areEqual(deleteableRecord.Id, returnedResults.get(0).RecordId);
diff --git a/nebula-logger/core/tests/log-management/classes/LogMassDeleteExtension_Tests.cls b/nebula-logger/core/tests/log-management/classes/LogMassDeleteExtension_Tests.cls
index 9af0c4268..a4f8fe9eb 100644
--- a/nebula-logger/core/tests/log-management/classes/LogMassDeleteExtension_Tests.cls
+++ b/nebula-logger/core/tests/log-management/classes/LogMassDeleteExtension_Tests.cls
@@ -53,7 +53,7 @@ private class LogMassDeleteExtension_Tests {
             logIds.add(selectedLog.Id);
         }
         List<Log__c> expectedDeletableLogs = new List<Log__c>();
-        for (UserRecordAccess recordAccess : [
+        for (Schema.UserRecordAccess recordAccess : [
             SELECT RecordId
             FROM UserRecordAccess
             WHERE UserId = :System.UserInfo.getUserId() AND RecordId IN :logIds AND HasDeleteAccess = TRUE
@@ -94,11 +94,11 @@ private class LogMassDeleteExtension_Tests {
 
         logsToDelete = [SELECT Id, IsDeleted FROM Log__c WHERE Id IN :logsToDelete ALL ROWS];
         for (Log__c log : logsToDelete) {
-            System.Assert.isTrue(log.IsDeleted, JSON.serializePretty(log));
+            System.Assert.isTrue(log.IsDeleted, System.JSON.serializePretty(log));
         }
         logsToKeep = [SELECT Id, IsDeleted FROM Log__c WHERE Id IN :logsToKeep ALL ROWS];
         for (Log__c log : logsToKeep) {
-            System.Assert.isFalse(log.IsDeleted, JSON.serializePretty(log));
+            System.Assert.isFalse(log.IsDeleted, System.JSON.serializePretty(log));
         }
     }
 }
diff --git a/nebula-logger/core/tests/log-management/classes/LoggerEmailSender_Tests.cls b/nebula-logger/core/tests/log-management/classes/LoggerEmailSender_Tests.cls
index d3e0e64d1..4a44a7db4 100644
--- a/nebula-logger/core/tests/log-management/classes/LoggerEmailSender_Tests.cls
+++ b/nebula-logger/core/tests/log-management/classes/LoggerEmailSender_Tests.cls
@@ -47,8 +47,8 @@ private class LoggerEmailSender_Tests {
 
     @IsTest
     static void it_should_send_email_notification_for_saveResult_errors_when_enabled() {
-        LoggerEmailSender.MOCK_NOTIFICATIONS.add(new ApexEmailNotification(Email = 'some.email@test.com'));
-        LoggerEmailSender.MOCK_NOTIFICATIONS.add(new ApexEmailNotification(UserId = System.UserInfo.getUserId()));
+        LoggerEmailSender.MOCK_NOTIFICATIONS.add(new Schema.ApexEmailNotification(Email = 'some.email@test.com'));
+        LoggerEmailSender.MOCK_NOTIFICATIONS.add(new Schema.ApexEmailNotification(UserId = System.UserInfo.getUserId()));
         System.Assert.areEqual(0, System.Limits.getEmailInvocations(), 'No emails should have been sent yet');
 
         Database.SaveResult saveResultWithError = LoggerMockDataCreator.createDatabaseSaveResult(false);
@@ -89,8 +89,8 @@ private class LoggerEmailSender_Tests {
     static void it_should_not_send_email_notification_for_saveResult_errors_when_disabled() {
         LoggerTestConfigurator.setMock(new LoggerParameter__mdt(DeveloperName = 'SendErrorEmailNotifications', Value__c = 'false'));
         System.Assert.isFalse(LoggerParameter.SEND_ERROR_EMAIL_NOTIFICATIONS);
-        LoggerEmailSender.MOCK_NOTIFICATIONS.add(new ApexEmailNotification(Email = 'some.email@test.com'));
-        LoggerEmailSender.MOCK_NOTIFICATIONS.add(new ApexEmailNotification(UserId = System.UserInfo.getUserId()));
+        LoggerEmailSender.MOCK_NOTIFICATIONS.add(new Schema.ApexEmailNotification(Email = 'some.email@test.com'));
+        LoggerEmailSender.MOCK_NOTIFICATIONS.add(new Schema.ApexEmailNotification(UserId = System.UserInfo.getUserId()));
         System.Assert.areEqual(0, System.Limits.getEmailInvocations(), 'No emails should have been sent yet');
 
         Database.SaveResult saveResultWithError = LoggerMockDataCreator.createDatabaseSaveResult(false);
@@ -102,8 +102,8 @@ private class LoggerEmailSender_Tests {
 
     @IsTest
     static void it_should_send_email_notification_for_upsertResult_errors_when_enabled() {
-        LoggerEmailSender.MOCK_NOTIFICATIONS.add(new ApexEmailNotification(Email = 'some.email@test.com'));
-        LoggerEmailSender.MOCK_NOTIFICATIONS.add(new ApexEmailNotification(UserId = System.UserInfo.getUserId()));
+        LoggerEmailSender.MOCK_NOTIFICATIONS.add(new Schema.ApexEmailNotification(Email = 'some.email@test.com'));
+        LoggerEmailSender.MOCK_NOTIFICATIONS.add(new Schema.ApexEmailNotification(UserId = System.UserInfo.getUserId()));
         System.Assert.areEqual(0, System.Limits.getEmailInvocations(), 'No emails should have been sent yet');
 
         Database.UpsertResult upsertResultWithError = LoggerMockDataCreator.createDatabaseUpsertResult(false, false);
@@ -144,8 +144,8 @@ private class LoggerEmailSender_Tests {
     static void it_should_not_send_email_notification_for_upsertResult_errors_when_disabled() {
         LoggerTestConfigurator.setMock(new LoggerParameter__mdt(DeveloperName = 'SendErrorEmailNotifications', Value__c = 'false'));
         System.Assert.isFalse(LoggerParameter.SEND_ERROR_EMAIL_NOTIFICATIONS);
-        LoggerEmailSender.MOCK_NOTIFICATIONS.add(new ApexEmailNotification(Email = 'some.email@test.com'));
-        LoggerEmailSender.MOCK_NOTIFICATIONS.add(new ApexEmailNotification(UserId = System.UserInfo.getUserId()));
+        LoggerEmailSender.MOCK_NOTIFICATIONS.add(new Schema.ApexEmailNotification(Email = 'some.email@test.com'));
+        LoggerEmailSender.MOCK_NOTIFICATIONS.add(new Schema.ApexEmailNotification(UserId = System.UserInfo.getUserId()));
         System.Assert.areEqual(0, System.Limits.getEmailInvocations(), 'No emails should have been sent yet');
 
         Database.UpsertResult upsertResultWithError = LoggerMockDataCreator.createDatabaseUpsertResult(false, false);
diff --git a/nebula-logger/core/tests/log-management/classes/LoggerHomeHeaderController_Tests.cls b/nebula-logger/core/tests/log-management/classes/LoggerHomeHeaderController_Tests.cls
index 2ce1531c1..d841a717b 100644
--- a/nebula-logger/core/tests/log-management/classes/LoggerHomeHeaderController_Tests.cls
+++ b/nebula-logger/core/tests/log-management/classes/LoggerHomeHeaderController_Tests.cls
@@ -17,7 +17,7 @@ private class LoggerHomeHeaderController_Tests {
         mockApiResponse.Products = new List<Logger.StatusApiResponseProduct>{ mockProduct1, mockProduct2 };
         System.Test.setMock(
             System.HttpCalloutMock.class,
-            LoggerMockDataCreator.createHttpCallout().setStatusCode(200).setResponseBody(JSON.serialize(mockApiResponse))
+            LoggerMockDataCreator.createHttpCallout().setStatusCode(200).setResponseBody(System.JSON.serialize(mockApiResponse))
         );
 
         LoggerHomeHeaderController.Environment returnedEnvironment = LoggerHomeHeaderController.getEnvironmentDetails();
@@ -52,7 +52,7 @@ private class LoggerHomeHeaderController_Tests {
         mockApiResponse.Products = null;
         System.Test.setMock(
             System.HttpCalloutMock.class,
-            LoggerMockDataCreator.createHttpCallout().setStatusCode(200).setResponseBody(JSON.serialize(mockApiResponse))
+            LoggerMockDataCreator.createHttpCallout().setStatusCode(200).setResponseBody(System.JSON.serialize(mockApiResponse))
         );
 
         LoggerHomeHeaderController.Environment returnedEnvironment = LoggerHomeHeaderController.getEnvironmentDetails();
diff --git a/nebula-logger/core/tests/log-management/classes/RelatedLogEntriesController_Tests.cls b/nebula-logger/core/tests/log-management/classes/RelatedLogEntriesController_Tests.cls
index 5b963b1a3..f594370a0 100644
--- a/nebula-logger/core/tests/log-management/classes/RelatedLogEntriesController_Tests.cls
+++ b/nebula-logger/core/tests/log-management/classes/RelatedLogEntriesController_Tests.cls
@@ -98,7 +98,7 @@ private class RelatedLogEntriesController_Tests {
     //             countOfMatches = countOfMatches + 1;
     //         }
     //     }
-    //     System.Assert.areEqual(1, countOfMatches, JSON.serializePretty(logEntries));
+    //     System.Assert.areEqual(1, countOfMatches, System.JSON.serializePretty(logEntries));
 
     //     System.Test.startTest();
 
diff --git a/nebula-logger/core/tests/log-management/utilities/LoggerTestConfigurator.cls b/nebula-logger/core/tests/log-management/utilities/LoggerTestConfigurator.cls
index 234a4fef7..8f4c3c234 100644
--- a/nebula-logger/core/tests/log-management/utilities/LoggerTestConfigurator.cls
+++ b/nebula-logger/core/tests/log-management/utilities/LoggerTestConfigurator.cls
@@ -13,7 +13,7 @@
  */
 @IsTest
 public without sharing class LoggerTestConfigurator {
-    private static final Map<String, PermissionSet> PERMISSION_SETS_BY_NAME = queryPermissionSets();
+    private static final Map<String, Schema.PermissionSet> PERMISSION_SETS_BY_NAME = queryPermissionSets();
 
     /**
      * @description Assigns the permission set `LoggerAdmin` to the specified user ID
@@ -146,15 +146,15 @@ public without sharing class LoggerTestConfigurator {
     }
 
     // Helper methods
-    private static void assignPermissionSet(Id userId, PermissionSet permissionSet) {
-        PermissionSetAssignment permissionSetAssignment = new PermissionSetAssignment(AssigneeId = userId, PermissionSetId = permissionSet.Id);
+    private static void assignPermissionSet(Id userId, Schema.PermissionSet permissionSet) {
+        Schema.PermissionSetAssignment permissionSetAssignment = new Schema.PermissionSetAssignment(AssigneeId = userId, PermissionSetId = permissionSet.Id);
         insert permissionSetAssignment;
     }
 
-    private static Map<String, PermissionSet> queryPermissionSets() {
+    private static Map<String, Schema.PermissionSet> queryPermissionSets() {
         List<String> permissionSetNames = new List<String>{ 'LoggerAdmin', 'LoggerLogViewer', 'LoggerEndUser', 'LoggerLogCreator' };
-        Map<String, PermissionSet> results = new Map<String, PermissionSet>();
-        for (PermissionSet permissionSet : [SELECT Id, Name FROM PermissionSet WHERE Name IN :permissionSetNames]) {
+        Map<String, Schema.PermissionSet> results = new Map<String, Schema.PermissionSet>();
+        for (Schema.PermissionSet permissionSet : [SELECT Id, Name FROM PermissionSet WHERE Name IN :permissionSetNames]) {
             results.put(permissionSet.Name, permissionSet);
         }
         return results;
diff --git a/nebula-logger/core/tests/logger-engine/classes/ComponentLogger_Tests.cls b/nebula-logger/core/tests/logger-engine/classes/ComponentLogger_Tests.cls
index c58f8eaa9..5a7393e29 100644
--- a/nebula-logger/core/tests/logger-engine/classes/ComponentLogger_Tests.cls
+++ b/nebula-logger/core/tests/logger-engine/classes/ComponentLogger_Tests.cls
@@ -64,7 +64,7 @@ private class ComponentLogger_Tests {
         System.Assert.areEqual('Component', publishedLogEntryEvent.OriginType__c);
         System.Assert.isNull(
             publishedLogEntryEvent.OriginSourceMetadataType__c,
-            'Non-null value populated for OriginSourceMetadata__c: ' + JSON.serializePretty(publishedLogEntryEvent)
+            'Non-null value populated for OriginSourceMetadata__c: ' + System.JSON.serializePretty(publishedLogEntryEvent)
         );
         System.Assert.isNull(publishedLogEntryEvent.StackTrace__c);
         System.Assert.areEqual(componentLogEntry.browserFormFactor, publishedLogEntryEvent.BrowserFormFactor__c);
@@ -76,7 +76,7 @@ private class ComponentLogger_Tests {
         System.Assert.areEqual(componentLogEntry.loggingLevel, publishedLogEntryEvent.LoggingLevel__c);
         System.Assert.areEqual(componentLogEntry.message, publishedLogEntryEvent.Message__c);
         System.Assert.areEqual(componentLogEntry.recordId, publishedLogEntryEvent.RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(componentLogEntry.record), publishedLogEntryEvent.RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(componentLogEntry.record), publishedLogEntryEvent.RecordJson__c);
         System.Assert.areEqual(Schema.SObjectType.User.getName(), publishedLogEntryEvent.RecordSObjectType__c);
         System.Assert.areEqual(componentLogEntry.timestamp, publishedLogEntryEvent.Timestamp__c);
     }
@@ -121,7 +121,7 @@ private class ComponentLogger_Tests {
         System.Assert.areEqual(componentLogEntry.loggingLevel, publishedLogEntryEvent.LoggingLevel__c);
         System.Assert.areEqual(componentLogEntry.message, publishedLogEntryEvent.Message__c);
         System.Assert.areEqual(componentLogEntry.recordId, publishedLogEntryEvent.RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(componentLogEntry.record), publishedLogEntryEvent.RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(componentLogEntry.record), publishedLogEntryEvent.RecordJson__c);
         System.Assert.areEqual(Schema.SObjectType.User.getName(), publishedLogEntryEvent.RecordSObjectType__c);
         System.Assert.areEqual(componentLogEntry.timestamp, publishedLogEntryEvent.Timestamp__c);
     }
diff --git a/nebula-logger/core/tests/logger-engine/classes/FlowCollectionLogEntry_Tests.cls b/nebula-logger/core/tests/logger-engine/classes/FlowCollectionLogEntry_Tests.cls
index bb310737c..ded46c7fa 100644
--- a/nebula-logger/core/tests/logger-engine/classes/FlowCollectionLogEntry_Tests.cls
+++ b/nebula-logger/core/tests/logger-engine/classes/FlowCollectionLogEntry_Tests.cls
@@ -45,7 +45,7 @@ private class FlowCollectionLogEntry_Tests {
         System.Assert.areEqual(1, LoggerMockDataStore.getEventBus().getPublishCallCount());
         System.Assert.areEqual(1, LoggerMockDataStore.getEventBus().getPublishedPlatformEvents().size());
         LogEntryEvent__e publishedLogEntryEvent = (LogEntryEvent__e) LoggerMockDataStore.getEventBus().getPublishedPlatformEvents().get(0);
-        String expectedUserJson = JSON.serializePretty(new List<SObject>{ currentUser });
+        String expectedUserJson = System.JSON.serializePretty(new List<SObject>{ currentUser });
         System.Assert.areEqual(flowCollectionEntry.loggingLevelName, publishedLogEntryEvent.LoggingLevel__c);
         System.Assert.areEqual(flowCollectionEntry.message, publishedLogEntryEvent.Message__c);
         System.Assert.areEqual('Flow', publishedLogEntryEvent.OriginType__c);
@@ -84,7 +84,7 @@ private class FlowCollectionLogEntry_Tests {
         System.Assert.areEqual(1, LoggerMockDataStore.getEventBus().getPublishCallCount());
         System.Assert.areEqual(1, LoggerMockDataStore.getEventBus().getPublishedPlatformEvents().size());
         LogEntryEvent__e publishedLogEntryEvent = (LogEntryEvent__e) LoggerMockDataStore.getEventBus().getPublishedPlatformEvents().get(0);
-        String expectedUserJson = JSON.serializePretty(new List<SObject>{ currentUser });
+        String expectedUserJson = System.JSON.serializePretty(new List<SObject>{ currentUser });
         System.Assert.areEqual(flowCollectionEntry.loggingLevelName, publishedLogEntryEvent.LoggingLevel__c);
         System.Assert.areEqual(flowCollectionEntry.message, publishedLogEntryEvent.Message__c);
         System.Assert.areEqual('Flow', publishedLogEntryEvent.OriginType__c);
@@ -131,7 +131,7 @@ private class FlowCollectionLogEntry_Tests {
         System.Assert.areEqual(1, LoggerMockDataStore.getEventBus().getPublishCallCount());
         System.Assert.areEqual(1, LoggerMockDataStore.getEventBus().getPublishedPlatformEvents().size());
         LogEntryEvent__e publishedLogEntryEvent = (LogEntryEvent__e) LoggerMockDataStore.getEventBus().getPublishedPlatformEvents().get(0);
-        String expectedUserJson = JSON.serializePretty(new List<SObject>{ currentUser });
+        String expectedUserJson = System.JSON.serializePretty(new List<SObject>{ currentUser });
         System.Assert.areEqual(flowCollectionEntry.loggingLevelName, publishedLogEntryEvent.LoggingLevel__c);
         System.Assert.areEqual(flowCollectionEntry.message, publishedLogEntryEvent.Message__c);
         System.Assert.areEqual('Flow', publishedLogEntryEvent.OriginType__c);
@@ -326,7 +326,7 @@ private class FlowCollectionLogEntry_Tests {
         System.Assert.areEqual(flowCollectionEntry.message, publishedLogEntryEvent.Message__c);
         System.Assert.areEqual('Flow', publishedLogEntryEvent.OriginType__c);
         List<String> publishedLogEntryEventTags = publishedLogEntryEvent.Tags__c.split('\n');
-        System.Assert.areEqual(tags.size(), publishedLogEntryEventTags.size(), JSON.serializePretty(publishedLogEntryEventTags));
+        System.Assert.areEqual(tags.size(), publishedLogEntryEventTags.size(), System.JSON.serializePretty(publishedLogEntryEventTags));
         Set<String> tagsSet = new Set<String>(tags);
         for (String publishedTag : publishedLogEntryEventTags) {
             publishedTag = publishedTag.trim();
diff --git a/nebula-logger/core/tests/logger-engine/classes/FlowLogEntry_Tests.cls b/nebula-logger/core/tests/logger-engine/classes/FlowLogEntry_Tests.cls
index dc14a6ed2..bf5bffe65 100644
--- a/nebula-logger/core/tests/logger-engine/classes/FlowLogEntry_Tests.cls
+++ b/nebula-logger/core/tests/logger-engine/classes/FlowLogEntry_Tests.cls
@@ -284,7 +284,7 @@ private class FlowLogEntry_Tests {
         System.Assert.areEqual(flowEntry.message, publishedLogEntryEvent.Message__c);
         System.Assert.areEqual('Flow', publishedLogEntryEvent.OriginType__c);
         List<String> publishedLogEntryEventTags = publishedLogEntryEvent.Tags__c.split('\n');
-        System.Assert.areEqual(tags.size(), publishedLogEntryEventTags.size(), JSON.serializePretty(publishedLogEntryEventTags));
+        System.Assert.areEqual(tags.size(), publishedLogEntryEventTags.size(), System.JSON.serializePretty(publishedLogEntryEventTags));
         Set<String> tagsSet = new Set<String>(tags);
         for (String publishedTag : publishedLogEntryEventTags) {
             publishedTag = publishedTag.trim();
diff --git a/nebula-logger/core/tests/logger-engine/classes/FlowRecordLogEntry_Tests.cls b/nebula-logger/core/tests/logger-engine/classes/FlowRecordLogEntry_Tests.cls
index b86168f1a..e1e71d1e3 100644
--- a/nebula-logger/core/tests/logger-engine/classes/FlowRecordLogEntry_Tests.cls
+++ b/nebula-logger/core/tests/logger-engine/classes/FlowRecordLogEntry_Tests.cls
@@ -47,7 +47,7 @@ private class FlowRecordLogEntry_Tests {
         System.Assert.areEqual(1, LoggerMockDataStore.getEventBus().getPublishCallCount());
         System.Assert.areEqual(1, LoggerMockDataStore.getEventBus().getPublishedPlatformEvents().size());
         LogEntryEvent__e publishedLogEntryEvent = (LogEntryEvent__e) LoggerMockDataStore.getEventBus().getPublishedPlatformEvents().get(0);
-        String expectedUserJson = JSON.serializePretty(currentUser);
+        String expectedUserJson = System.JSON.serializePretty(currentUser);
         System.Assert.areEqual(flowRecordEntry.loggingLevelName, publishedLogEntryEvent.LoggingLevel__c);
         System.Assert.areEqual(flowRecordEntry.message, publishedLogEntryEvent.Message__c);
         System.Assert.areEqual('Flow', publishedLogEntryEvent.OriginType__c);
@@ -93,7 +93,7 @@ private class FlowRecordLogEntry_Tests {
         System.Assert.areEqual(1, LoggerMockDataStore.getEventBus().getPublishCallCount());
         System.Assert.areEqual(1, LoggerMockDataStore.getEventBus().getPublishedPlatformEvents().size());
         LogEntryEvent__e publishedLogEntryEvent = (LogEntryEvent__e) LoggerMockDataStore.getEventBus().getPublishedPlatformEvents().get(0);
-        String expectedUserJson = JSON.serializePretty(currentUser);
+        String expectedUserJson = System.JSON.serializePretty(currentUser);
         System.Assert.areEqual(flowRecordEntry.loggingLevelName, publishedLogEntryEvent.LoggingLevel__c);
         System.Assert.areEqual(flowRecordEntry.message, publishedLogEntryEvent.Message__c);
         System.Assert.areEqual('Flow', publishedLogEntryEvent.OriginType__c);
@@ -130,7 +130,7 @@ private class FlowRecordLogEntry_Tests {
         System.Assert.areEqual(1, LoggerMockDataStore.getEventBus().getPublishCallCount());
         System.Assert.areEqual(1, LoggerMockDataStore.getEventBus().getPublishedPlatformEvents().size());
         LogEntryEvent__e publishedLogEntryEvent = (LogEntryEvent__e) LoggerMockDataStore.getEventBus().getPublishedPlatformEvents().get(0);
-        String expectedUserJson = JSON.serializePretty(currentUser);
+        String expectedUserJson = System.JSON.serializePretty(currentUser);
         System.Assert.areEqual(flowRecordEntry.loggingLevelName, publishedLogEntryEvent.LoggingLevel__c);
         System.Assert.areEqual(flowRecordEntry.message, publishedLogEntryEvent.Message__c);
         System.Assert.areEqual('Flow', publishedLogEntryEvent.OriginType__c);
@@ -320,7 +320,7 @@ private class FlowRecordLogEntry_Tests {
         System.Assert.areEqual(1, LoggerMockDataStore.getEventBus().getPublishedPlatformEvents().size());
         LogEntryEvent__e publishedLogEntryEvent = (LogEntryEvent__e) LoggerMockDataStore.getEventBus().getPublishedPlatformEvents().get(0);
         List<String> publishedLogEntryEventTags = publishedLogEntryEvent.Tags__c.split('\n');
-        System.Assert.areEqual(tags.size(), publishedLogEntryEventTags.size(), JSON.serializePretty(publishedLogEntryEventTags));
+        System.Assert.areEqual(tags.size(), publishedLogEntryEventTags.size(), System.JSON.serializePretty(publishedLogEntryEventTags));
         Set<String> tagsSet = new Set<String>(tags);
         for (String publishedTag : publishedLogEntryEventTags) {
             publishedTag = publishedTag.trim();
diff --git a/nebula-logger/core/tests/logger-engine/classes/LogEntryEventBuilder_Tests.cls b/nebula-logger/core/tests/logger-engine/classes/LogEntryEventBuilder_Tests.cls
index 25638883d..e1ec129b0 100644
--- a/nebula-logger/core/tests/logger-engine/classes/LogEntryEventBuilder_Tests.cls
+++ b/nebula-logger/core/tests/logger-engine/classes/LogEntryEventBuilder_Tests.cls
@@ -72,8 +72,8 @@ private class LogEntryEventBuilder_Tests {
 
     @IsTest
     static void it_should_set_transaction_limits_fields_when_enabled_via_logger_parameter() {
-        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreTransactionLimits', Value__c = JSON.serialize(true)));
-        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreHeapSizeLimit', Value__c = JSON.serialize(true)));
+        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreTransactionLimits', Value__c = System.JSON.serialize(true)));
+        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreHeapSizeLimit', Value__c = System.JSON.serialize(true)));
         System.Assert.isTrue(LoggerParameter.STORE_TRANSACTION_LIMITS);
         System.Assert.isTrue(LoggerParameter.STORE_HEAP_SIZE_LIMIT);
         // Capture these limits first, before creating an instance of LogEntryEventBuilder - the builder runs several queries internally,
@@ -122,8 +122,8 @@ private class LogEntryEventBuilder_Tests {
 
     @IsTest
     static void it_should_not_set_transaction_heap_limits_fields_when_disabled_via_logger_parameter() {
-        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreTransactionLimits', Value__c = JSON.serialize(true)));
-        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreHeapSizeLimit', Value__c = JSON.serialize(false)));
+        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreTransactionLimits', Value__c = System.JSON.serialize(true)));
+        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreHeapSizeLimit', Value__c = System.JSON.serialize(false)));
         System.Assert.isTrue(LoggerParameter.STORE_TRANSACTION_LIMITS);
 
         LogEntryEvent__e logEntryEvent = new LogEntryEventBuilder(getUserSettings(), System.LoggingLevel.INFO, true).getLogEntryEvent();
@@ -133,8 +133,8 @@ private class LogEntryEventBuilder_Tests {
 
     @IsTest
     static void it_should_not_set_transaction_heap_limits_fields_when_transaction_limit_tracking_is_disabled_via_logger_parameter() {
-        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreTransactionLimits', Value__c = JSON.serialize(false)));
-        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreHeapSizeLimit', Value__c = JSON.serialize(true)));
+        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreTransactionLimits', Value__c = System.JSON.serialize(false)));
+        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreHeapSizeLimit', Value__c = System.JSON.serialize(true)));
         System.Assert.isFalse(LoggerParameter.STORE_TRANSACTION_LIMITS);
 
         LogEntryEvent__e logEntryEvent = new LogEntryEventBuilder(getUserSettings(), System.LoggingLevel.INFO, true).getLogEntryEvent();
@@ -144,7 +144,7 @@ private class LogEntryEventBuilder_Tests {
 
     @IsTest
     static void it_should_not_set_transaction_limits_fields_when_disabled_via_logger_parameter() {
-        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreTransactionLimits', Value__c = JSON.serialize(false)));
+        LoggerParameter.setMock(new LoggerParameter__mdt(DeveloperName = 'StoreTransactionLimits', Value__c = System.JSON.serialize(false)));
         System.Assert.isFalse(LoggerParameter.STORE_TRANSACTION_LIMITS);
 
         LogEntryEvent__e logEntryEvent = new LogEntryEventBuilder(getUserSettings(), System.LoggingLevel.INFO, true).getLogEntryEvent();
@@ -430,7 +430,7 @@ private class LogEntryEventBuilder_Tests {
         LogEntryEventBuilder.setMockDataMaskRule(rule);
         String message = 'Something, something, and my social is 400 11 9999 in case you want to steal my identity';
         Schema.Account account = new Schema.Account(Name = message);
-        String accountJson = JSON.serializePretty(account);
+        String accountJson = System.JSON.serializePretty(account);
 
         LogEntryEventBuilder builder = new LogEntryEventBuilder(userSettings, System.LoggingLevel.INFO, true);
         builder.setMessage(message).setRecord(account);
@@ -450,7 +450,7 @@ private class LogEntryEventBuilder_Tests {
         LogEntryEventBuilder.setMockDataMaskRule(rule);
         String message = 'Something, something, and my social is 400 11 9999 in case you want to steal my identity';
         Schema.Account account = new Schema.Account(Name = message);
-        String accountJson = JSON.serializePretty(account);
+        String accountJson = System.JSON.serializePretty(account);
 
         LogEntryEventBuilder builder = new LogEntryEventBuilder(userSettings, System.LoggingLevel.INFO, true);
         builder.setMessage(message).setRecord(account);
@@ -489,8 +489,8 @@ private class LogEntryEventBuilder_Tests {
         String sensitiveString = 'Something, something, and my social is 400 11 9999 in case you want to steal my identity';
         String expectedSanitizedString = 'Something, something, and my social is XXX-XX-9999 in case you want to steal my identity';
         Schema.Account account = new Schema.Account(Name = sensitiveString);
-        String accountJson = JSON.serializePretty(account);
-        String expectedSanitizedAccountJson = JSON.serializePretty(new Schema.Account(Name = expectedSanitizedString));
+        String accountJson = System.JSON.serializePretty(account);
+        String expectedSanitizedAccountJson = System.JSON.serializePretty(new Schema.Account(Name = expectedSanitizedString));
 
         LogEntryEventBuilder builder = new LogEntryEventBuilder(userSettings, System.LoggingLevel.INFO, true);
         builder.setRecord(account);
@@ -511,8 +511,8 @@ private class LogEntryEventBuilder_Tests {
         String sensitiveString = 'Something, something, and my social is 400 11 9999 in case you want to steal my identity';
         String expectedSanitizedString = 'Something, something, and my social is XXX-XX-9999 in case you want to steal my identity';
         List<Schema.Account> accounts = new List<Schema.Account>{ new Schema.Account(Name = sensitiveString) };
-        String accountListJson = JSON.serializePretty(accounts);
-        String expectedSanitizedAccountListJson = JSON.serializePretty(new List<Schema.Account>{ new Schema.Account(Name = expectedSanitizedString) });
+        String accountListJson = System.JSON.serializePretty(accounts);
+        String expectedSanitizedAccountListJson = System.JSON.serializePretty(new List<Schema.Account>{ new Schema.Account(Name = expectedSanitizedString) });
         LogEntryEventBuilder builder = new LogEntryEventBuilder(userSettings, System.LoggingLevel.INFO, true);
         builder.setRecord(accounts);
 
@@ -671,7 +671,7 @@ private class LogEntryEventBuilder_Tests {
 
         System.Assert.areEqual(1, builder.getLogEntryEvent().DatabaseResultCollectionSize__c);
         System.Assert.areEqual('Single', builder.getLogEntryEvent().DatabaseResultCollectionType__c);
-        System.Assert.areEqual(JSON.serializePretty(leadConvertResult), builder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(leadConvertResult), builder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.LeadConvertResult.class.getName(), builder.getLogEntryEvent().DatabaseResultType__c);
     }
 
@@ -685,7 +685,7 @@ private class LogEntryEventBuilder_Tests {
 
         System.Assert.areEqual(1, builder.getLogEntryEvent().DatabaseResultCollectionSize__c);
         System.Assert.areEqual('Single', builder.getLogEntryEvent().DatabaseResultCollectionType__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResult), builder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResult), builder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), builder.getLogEntryEvent().DatabaseResultType__c);
     }
 
@@ -699,7 +699,7 @@ private class LogEntryEventBuilder_Tests {
 
         System.Assert.areEqual(1, builder.getLogEntryEvent().DatabaseResultCollectionSize__c);
         System.Assert.areEqual('Single', builder.getLogEntryEvent().DatabaseResultCollectionType__c);
-        System.Assert.areEqual(JSON.serializePretty(mergeResult), builder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(mergeResult), builder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.MergeResult.class.getName(), builder.getLogEntryEvent().DatabaseResultType__c);
     }
 
@@ -713,7 +713,7 @@ private class LogEntryEventBuilder_Tests {
 
         System.Assert.areEqual(1, builder.getLogEntryEvent().DatabaseResultCollectionSize__c);
         System.Assert.areEqual('Single', builder.getLogEntryEvent().DatabaseResultCollectionType__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResult), builder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResult), builder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), builder.getLogEntryEvent().DatabaseResultType__c);
     }
 
@@ -727,7 +727,7 @@ private class LogEntryEventBuilder_Tests {
 
         System.Assert.areEqual(1, builder.getLogEntryEvent().DatabaseResultCollectionSize__c);
         System.Assert.areEqual('Single', builder.getLogEntryEvent().DatabaseResultCollectionType__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResult), builder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResult), builder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), builder.getLogEntryEvent().DatabaseResultType__c);
     }
 
@@ -742,7 +742,7 @@ private class LogEntryEventBuilder_Tests {
 
         System.Assert.areEqual(1, builder.getLogEntryEvent().DatabaseResultCollectionSize__c);
         System.Assert.areEqual('Single', builder.getLogEntryEvent().DatabaseResultCollectionType__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), builder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), builder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Insert', builder.getLogEntryEvent().DatabaseResultType__c);
     }
 
@@ -757,7 +757,7 @@ private class LogEntryEventBuilder_Tests {
 
         System.Assert.areEqual(1, builder.getLogEntryEvent().DatabaseResultCollectionSize__c);
         System.Assert.areEqual('Single', builder.getLogEntryEvent().DatabaseResultCollectionType__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), builder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), builder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Update', builder.getLogEntryEvent().DatabaseResultType__c);
     }
 
@@ -773,7 +773,7 @@ private class LogEntryEventBuilder_Tests {
 
         System.Assert.areEqual(leadConvertResults.size(), builder.getLogEntryEvent().DatabaseResultCollectionSize__c);
         System.Assert.areEqual('List', builder.getLogEntryEvent().DatabaseResultCollectionType__c);
-        System.Assert.areEqual(JSON.serializePretty(leadConvertResults), builder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(leadConvertResults), builder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.LeadConvertResult.class.getName(), builder.getLogEntryEvent().DatabaseResultType__c);
     }
 
@@ -789,7 +789,7 @@ private class LogEntryEventBuilder_Tests {
 
         System.Assert.areEqual(deleteResults.size(), builder.getLogEntryEvent().DatabaseResultCollectionSize__c);
         System.Assert.areEqual('List', builder.getLogEntryEvent().DatabaseResultCollectionType__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResults), builder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResults), builder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), builder.getLogEntryEvent().DatabaseResultType__c);
     }
 
@@ -805,7 +805,7 @@ private class LogEntryEventBuilder_Tests {
 
         System.Assert.areEqual(mergeResults.size(), builder.getLogEntryEvent().DatabaseResultCollectionSize__c);
         System.Assert.areEqual('List', builder.getLogEntryEvent().DatabaseResultCollectionType__c);
-        System.Assert.areEqual(JSON.serializePretty(mergeResults), builder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(mergeResults), builder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.MergeResult.class.getName(), builder.getLogEntryEvent().DatabaseResultType__c);
     }
 
@@ -821,7 +821,7 @@ private class LogEntryEventBuilder_Tests {
 
         System.Assert.areEqual(saveResults.size(), builder.getLogEntryEvent().DatabaseResultCollectionSize__c);
         System.Assert.areEqual('List', builder.getLogEntryEvent().DatabaseResultCollectionType__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResults), builder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResults), builder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), builder.getLogEntryEvent().DatabaseResultType__c);
     }
 
@@ -837,7 +837,7 @@ private class LogEntryEventBuilder_Tests {
 
         System.Assert.areEqual(undeleteResults.size(), builder.getLogEntryEvent().DatabaseResultCollectionSize__c);
         System.Assert.areEqual('List', builder.getLogEntryEvent().DatabaseResultCollectionType__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResults), builder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResults), builder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), builder.getLogEntryEvent().DatabaseResultType__c);
     }
 
@@ -853,7 +853,7 @@ private class LogEntryEventBuilder_Tests {
 
         System.Assert.areEqual(upsertResults.size(), builder.getLogEntryEvent().DatabaseResultCollectionSize__c);
         System.Assert.areEqual('List', builder.getLogEntryEvent().DatabaseResultCollectionType__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResults), builder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResults), builder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName(), builder.getLogEntryEvent().DatabaseResultType__c);
     }
 
@@ -976,7 +976,7 @@ private class LogEntryEventBuilder_Tests {
         System.Assert.areEqual(1, builder.getLogEntryEvent().RecordCollectionSize__c);
         System.Assert.areEqual('Single', builder.getLogEntryEvent().RecordCollectionType__c);
         System.Assert.areEqual(currentUser.Id, builder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(currentUser), builder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(currentUser), builder.getLogEntryEvent().RecordJson__c);
         System.Assert.areEqual('Standard Object', builder.getLogEntryEvent().RecordSObjectClassification__c);
         System.Assert.areEqual('User', builder.getLogEntryEvent().RecordSObjectType__c);
         System.Assert.isNull(builder.getLogEntryEvent().RecordSObjectTypeNamespace__c);
@@ -997,7 +997,7 @@ private class LogEntryEventBuilder_Tests {
         System.Assert.areEqual(1, builder.getLogEntryEvent().RecordCollectionSize__c);
         System.Assert.areEqual('Single', builder.getLogEntryEvent().RecordCollectionType__c);
         System.Assert.areEqual(log.Id, builder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(log), builder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(log), builder.getLogEntryEvent().RecordJson__c);
         System.Assert.areEqual('Custom Object', builder.getLogEntryEvent().RecordSObjectClassification__c);
         System.Assert.areEqual(Log__c.SObjectType.getDescribe().getName(), builder.getLogEntryEvent().RecordSObjectType__c);
     }
@@ -1017,7 +1017,7 @@ private class LogEntryEventBuilder_Tests {
         System.Assert.areEqual(1, builder.getLogEntryEvent().RecordCollectionSize__c);
         System.Assert.areEqual('Single', builder.getLogEntryEvent().RecordCollectionType__c);
         System.Assert.areEqual(status.Id, builder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(status), builder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(status), builder.getLogEntryEvent().RecordJson__c);
         System.Assert.areEqual('Custom Metadata Type Object', builder.getLogEntryEvent().RecordSObjectClassification__c);
         System.Assert.areEqual(LogStatus__mdt.SObjectType.getDescribe().getName(), builder.getLogEntryEvent().RecordSObjectType__c);
     }
@@ -1038,7 +1038,7 @@ private class LogEntryEventBuilder_Tests {
         System.Assert.areEqual(1, builder.getLogEntryEvent().RecordCollectionSize__c);
         System.Assert.areEqual('Single', builder.getLogEntryEvent().RecordCollectionType__c);
         System.Assert.isNull(builder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(platformEvent), builder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(platformEvent), builder.getLogEntryEvent().RecordJson__c);
         System.Assert.areEqual('Platform Event Object', builder.getLogEntryEvent().RecordSObjectClassification__c);
         System.Assert.areEqual(LogEntryEvent__e.SObjectType.getDescribe().getName(), builder.getLogEntryEvent().RecordSObjectType__c);
     }
@@ -1055,7 +1055,7 @@ private class LogEntryEventBuilder_Tests {
             builder = new LogEntryEventBuilder(userSettings, System.LoggingLevel.INFO, true).setRecord(mockAggregateResult);
         }
 
-        System.Assert.areEqual(JSON.serializePretty(mockAggregateResult), builder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(mockAggregateResult), builder.getLogEntryEvent().RecordJson__c);
     }
 
     @IsTest
@@ -1070,7 +1070,7 @@ private class LogEntryEventBuilder_Tests {
             builder = new LogEntryEventBuilder(userSettings, System.LoggingLevel.INFO, true).setRecord(mockAggregateResults);
         }
 
-        System.Assert.areEqual(JSON.serializePretty(mockAggregateResults), builder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(mockAggregateResults), builder.getLogEntryEvent().RecordJson__c);
     }
 
     @IsTest
@@ -1108,7 +1108,7 @@ private class LogEntryEventBuilder_Tests {
 
         System.Assert.areEqual('List', builder.getLogEntryEvent().RecordCollectionType__c);
         System.Assert.isNull(builder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(users), builder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(users), builder.getLogEntryEvent().RecordJson__c);
         System.Assert.areEqual('Unknown', builder.getLogEntryEvent().RecordSObjectClassification__c);
         System.Assert.areEqual('Unknown', builder.getLogEntryEvent().RecordSObjectType__c);
     }
@@ -1130,7 +1130,7 @@ private class LogEntryEventBuilder_Tests {
 
         System.Assert.areEqual('List', builder.getLogEntryEvent().RecordCollectionType__c);
         System.Assert.isNull(builder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(users), builder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(users), builder.getLogEntryEvent().RecordJson__c);
         System.Assert.areEqual('Unknown', builder.getLogEntryEvent().RecordSObjectClassification__c);
         System.Assert.areEqual('Unknown', builder.getLogEntryEvent().RecordSObjectType__c);
     }
@@ -1149,7 +1149,7 @@ private class LogEntryEventBuilder_Tests {
 
         System.Assert.areEqual('List', builder.getLogEntryEvent().RecordCollectionType__c);
         System.Assert.isNull(builder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(users), builder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(users), builder.getLogEntryEvent().RecordJson__c);
         System.Assert.areEqual('Standard Object', builder.getLogEntryEvent().RecordSObjectClassification__c);
         System.Assert.areEqual(Schema.User.SObjectType.getDescribe().getName(), builder.getLogEntryEvent().RecordSObjectType__c);
     }
@@ -1191,7 +1191,7 @@ private class LogEntryEventBuilder_Tests {
         System.Assert.areEqual(userIdToUser.size(), builder.getLogEntryEvent().RecordCollectionSize__c);
         System.Assert.areEqual('Map', builder.getLogEntryEvent().RecordCollectionType__c);
         System.Assert.isNull(builder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(userIdToUser), builder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(userIdToUser), builder.getLogEntryEvent().RecordJson__c);
         System.Assert.areEqual('Unknown', builder.getLogEntryEvent().RecordSObjectClassification__c);
         System.Assert.areEqual('Unknown', builder.getLogEntryEvent().RecordSObjectType__c);
     }
@@ -1212,7 +1212,7 @@ private class LogEntryEventBuilder_Tests {
         System.Assert.areEqual(userIdToUser.size(), builder.getLogEntryEvent().RecordCollectionSize__c);
         System.Assert.areEqual('Map', builder.getLogEntryEvent().RecordCollectionType__c);
         System.Assert.isNull(builder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(userIdStringToUser), builder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(userIdStringToUser), builder.getLogEntryEvent().RecordJson__c);
         System.Assert.areEqual('Standard Object', builder.getLogEntryEvent().RecordSObjectClassification__c);
         System.Assert.areEqual('User', builder.getLogEntryEvent().RecordSObjectType__c);
     }
@@ -1234,7 +1234,7 @@ private class LogEntryEventBuilder_Tests {
         };
         builder.setRecord(userIdToUser);
 
-        String expectedJson = JSON.serializePretty(userIdToUser);
+        String expectedJson = System.JSON.serializePretty(userIdToUser);
         System.Assert.areEqual(userIdToUser.size(), builder.getLogEntryEvent().RecordCollectionSize__c);
         System.Assert.areEqual('Map', builder.getLogEntryEvent().RecordCollectionType__c);
         System.Assert.isNull(builder.getLogEntryEvent().RecordId__c);
@@ -1258,7 +1258,7 @@ private class LogEntryEventBuilder_Tests {
         System.Assert.areEqual(userIdToUser.size(), builder.getLogEntryEvent().RecordCollectionSize__c);
         System.Assert.areEqual('Map', builder.getLogEntryEvent().RecordCollectionType__c);
         System.Assert.isNull(builder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(userIdToUser), builder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(userIdToUser), builder.getLogEntryEvent().RecordJson__c);
         System.Assert.areEqual('Standard Object', builder.getLogEntryEvent().RecordSObjectClassification__c);
         System.Assert.areEqual(Schema.User.SObjectType.getDescribe().getName(), builder.getLogEntryEvent().RecordSObjectType__c);
     }
diff --git a/nebula-logger/core/tests/logger-engine/classes/LoggerDataStore_Tests.cls b/nebula-logger/core/tests/logger-engine/classes/LoggerDataStore_Tests.cls
index 6eed144be..e6d9345a3 100644
--- a/nebula-logger/core/tests/logger-engine/classes/LoggerDataStore_Tests.cls
+++ b/nebula-logger/core/tests/logger-engine/classes/LoggerDataStore_Tests.cls
@@ -525,7 +525,7 @@ private class LoggerDataStore_Tests {
         }
     }
 
-    // Queueable tests
+    // System.Queueable tests
     @IsTest
     static void it_should_enqueue_job() {
         System.Assert.areEqual(0, System.Limits.getQueueableJobs());
@@ -593,13 +593,13 @@ private class LoggerDataStore_Tests {
     private class MockJobQueue extends LoggerDataStore.JobQueue {
         public Integer callCount = 0;
 
-        public override Id enqueueJob(Queueable queueableJob) {
+        public override Id enqueueJob(System.Queueable queueableJob) {
             this.callCount++;
             return LoggerMockDataCreator.createId(Schema.AsyncApexJob.SObjectType);
         }
     }
 
-    private class MockQueueable implements Queueable {
+    private class MockQueueable implements System.Queueable {
         public Integer callCount = 0;
         public void execute(System.QueueableContext queueableContext) {
             this.callCount++;
diff --git a/nebula-logger/core/tests/logger-engine/classes/LoggerEngineDataSelector_Tests.cls b/nebula-logger/core/tests/logger-engine/classes/LoggerEngineDataSelector_Tests.cls
index 6be250ba1..1db9167ec 100644
--- a/nebula-logger/core/tests/logger-engine/classes/LoggerEngineDataSelector_Tests.cls
+++ b/nebula-logger/core/tests/logger-engine/classes/LoggerEngineDataSelector_Tests.cls
@@ -21,11 +21,11 @@ private class LoggerEngineDataSelector_Tests {
         List<Schema.AuthSession> sessions = [
             SELECT
                 Id,
-                LoginType,
-                LoginHistoryId,
                 LoginHistory.Application,
                 LoginHistory.Browser,
                 LoginHistory.Platform,
+                LoginHistoryId,
+                LoginType,
                 LogoutUrl,
                 ParentId,
                 SessionSecurityLevel,
diff --git a/nebula-logger/core/tests/logger-engine/classes/LoggerSObjectHandler_Tests.cls b/nebula-logger/core/tests/logger-engine/classes/LoggerSObjectHandler_Tests.cls
index 8b7303f48..40b35e37c 100644
--- a/nebula-logger/core/tests/logger-engine/classes/LoggerSObjectHandler_Tests.cls
+++ b/nebula-logger/core/tests/logger-engine/classes/LoggerSObjectHandler_Tests.cls
@@ -73,7 +73,7 @@ private class LoggerSObjectHandler_Tests {
         LoggerTriggerableContext originalContext = mockHandler.input;
         LoggerTriggerableContext customContext = new LoggerTriggerableContext(
             Schema.User.SObjectType,
-            TriggerOperation.BEFORE_INSERT,
+            System.TriggerOperation.BEFORE_INSERT,
             new List<Schema.User>{ new Schema.User(Id = System.UserInfo.getUserId(), Email = System.UserInfo.getUserEmail()) }
         );
         System.Assert.areNotEqual(originalContext, customContext);
@@ -91,7 +91,7 @@ private class LoggerSObjectHandler_Tests {
         List<SObject> records = new List<Schema.User>{ mockUser };
         MockSObjectHandler mockHandler = new MockSObjectHandler(Schema.User.SObjectType);
         mockHandler.handlerConfiguration = new LoggerSObjectHandler__mdt(IsEnabled__c = false);
-        mockHandler.triggerOperationType = TriggerOperation.BEFORE_INSERT;
+        mockHandler.triggerOperationType = System.TriggerOperation.BEFORE_INSERT;
         mockHandler.triggerNew = records;
         mockHandler.triggerNewMap = null;
         mockHandler.triggerOldMap = null;
@@ -108,7 +108,7 @@ private class LoggerSObjectHandler_Tests {
         List<SObject> records = new List<Schema.User>{ mockUser };
         MockSObjectHandler mockHandler = new MockSObjectHandler(Schema.User.SObjectType);
         mockHandler.handlerConfiguration = new LoggerSObjectHandler__mdt(IsEnabled__c = true);
-        mockHandler.triggerOperationType = TriggerOperation.BEFORE_INSERT;
+        mockHandler.triggerOperationType = System.TriggerOperation.BEFORE_INSERT;
         mockHandler.triggerNew = records;
         mockHandler.triggerNewMap = null;
         mockHandler.triggerOldMap = null;
@@ -125,7 +125,7 @@ private class LoggerSObjectHandler_Tests {
         mockUser.Id = LoggerMockDataCreator.createId(Schema.User.SObjectType);
         List<SObject> records = new List<Schema.User>{ mockUser };
         MockSObjectHandler mockHandler = new MockSObjectHandler(Schema.User.SObjectType);
-        mockHandler.triggerOperationType = TriggerOperation.BEFORE_INSERT;
+        mockHandler.triggerOperationType = System.TriggerOperation.BEFORE_INSERT;
         mockHandler.triggerNew = records;
         mockHandler.triggerNewMap = null;
         mockHandler.triggerOldMap = null;
@@ -133,7 +133,7 @@ private class LoggerSObjectHandler_Tests {
         mockHandler.execute();
 
         System.Assert.areEqual(1, mockHandler.executionCount);
-        System.Assert.areEqual(TriggerOperation.BEFORE_INSERT, mockHandler.executedTriggerOperationType);
+        System.Assert.areEqual(System.TriggerOperation.BEFORE_INSERT, mockHandler.executedTriggerOperationType);
         System.Assert.areEqual(mockHandler.triggerNew, mockHandler.executedTriggerNew);
         System.Assert.isNull(mockHandler.executedTriggerNewMap);
         System.Assert.isNull(mockHandler.executedTriggerOldMap);
@@ -145,7 +145,7 @@ private class LoggerSObjectHandler_Tests {
         mockUser.Id = LoggerMockDataCreator.createId(Schema.User.SObjectType);
         List<SObject> records = new List<Schema.User>{ mockUser };
         MockSObjectHandler mockHandler = new MockSObjectHandler(Schema.User.SObjectType);
-        mockHandler.triggerOperationType = TriggerOperation.BEFORE_UPDATE;
+        mockHandler.triggerOperationType = System.TriggerOperation.BEFORE_UPDATE;
         mockHandler.triggerNew = null;
         mockHandler.triggerNewMap = new Map<Id, SObject>(records);
         mockHandler.triggerOldMap = new Map<Id, SObject>(records);
@@ -153,7 +153,7 @@ private class LoggerSObjectHandler_Tests {
         mockHandler.execute();
 
         System.Assert.areEqual(1, mockHandler.executionCount);
-        System.Assert.areEqual(TriggerOperation.BEFORE_UPDATE, mockHandler.executedTriggerOperationType);
+        System.Assert.areEqual(System.TriggerOperation.BEFORE_UPDATE, mockHandler.executedTriggerOperationType);
         System.Assert.isNull(mockHandler.executedTriggerNew);
         System.Assert.areEqual(mockHandler.triggerNewMap, mockHandler.executedTriggerNewMap);
         System.Assert.areEqual(mockHandler.triggerOldMap, mockHandler.executedTriggerOldMap);
@@ -165,7 +165,7 @@ private class LoggerSObjectHandler_Tests {
         mockUser.Id = LoggerMockDataCreator.createId(Schema.User.SObjectType);
         List<SObject> records = new List<Schema.User>{ mockUser };
         MockSObjectHandler mockHandler = new MockSObjectHandler(Schema.User.SObjectType);
-        mockHandler.triggerOperationType = TriggerOperation.BEFORE_DELETE;
+        mockHandler.triggerOperationType = System.TriggerOperation.BEFORE_DELETE;
         mockHandler.triggerNew = null;
         mockHandler.triggerNewMap = new Map<Id, SObject>(records);
         mockHandler.triggerOldMap = null;
@@ -173,7 +173,7 @@ private class LoggerSObjectHandler_Tests {
         mockHandler.execute();
 
         System.Assert.areEqual(1, mockHandler.executionCount);
-        System.Assert.areEqual(TriggerOperation.BEFORE_DELETE, mockHandler.executedTriggerOperationType);
+        System.Assert.areEqual(System.TriggerOperation.BEFORE_DELETE, mockHandler.executedTriggerOperationType);
         System.Assert.isNull(mockHandler.executedTriggerNew);
         System.Assert.areEqual(mockHandler.triggerNewMap, mockHandler.executedTriggerNewMap);
         System.Assert.isNull(mockHandler.executedTriggerOldMap);
@@ -187,7 +187,7 @@ private class LoggerSObjectHandler_Tests {
         mockUser.Id = LoggerMockDataCreator.createId(Schema.User.SObjectType);
         List<SObject> records = new List<Schema.User>{ mockUser };
         MockSObjectHandler mockHandler = new MockSObjectHandler(Schema.User.SObjectType);
-        mockHandler.triggerOperationType = TriggerOperation.AFTER_INSERT;
+        mockHandler.triggerOperationType = System.TriggerOperation.AFTER_INSERT;
         mockHandler.triggerNew = records;
         mockHandler.triggerNewMap = new Map<Id, SObject>(records);
         mockHandler.triggerOldMap = null;
@@ -195,7 +195,7 @@ private class LoggerSObjectHandler_Tests {
         mockHandler.execute();
 
         System.Assert.areEqual(2, mockHandler.executionCount);
-        System.Assert.areEqual(TriggerOperation.AFTER_INSERT, mockHandler.executedTriggerOperationType);
+        System.Assert.areEqual(System.TriggerOperation.AFTER_INSERT, mockHandler.executedTriggerOperationType);
         System.Assert.areEqual(mockHandler.triggerNew, mockHandler.executedTriggerNew);
         System.Assert.areEqual(mockHandler.triggerNewMap, mockHandler.executedTriggerNewMap);
         System.Assert.isNull(mockHandler.executedTriggerOldMap);
@@ -207,7 +207,7 @@ private class LoggerSObjectHandler_Tests {
         mockUser.Id = LoggerMockDataCreator.createId(Schema.User.SObjectType);
         List<SObject> records = new List<Schema.User>{ mockUser };
         MockSObjectHandler mockHandler = new MockSObjectHandler(Schema.User.SObjectType);
-        mockHandler.triggerOperationType = TriggerOperation.AFTER_UPDATE;
+        mockHandler.triggerOperationType = System.TriggerOperation.AFTER_UPDATE;
         mockHandler.triggerNew = null;
         mockHandler.triggerNewMap = new Map<Id, SObject>(records);
         mockHandler.triggerOldMap = new Map<Id, SObject>(records);
@@ -215,7 +215,7 @@ private class LoggerSObjectHandler_Tests {
         mockHandler.execute();
 
         System.Assert.areEqual(1, mockHandler.executionCount);
-        System.Assert.areEqual(TriggerOperation.AFTER_UPDATE, mockHandler.executedTriggerOperationType);
+        System.Assert.areEqual(System.TriggerOperation.AFTER_UPDATE, mockHandler.executedTriggerOperationType);
         System.Assert.isNull(mockHandler.executedTriggerNew);
         System.Assert.areEqual(mockHandler.triggerNewMap, mockHandler.executedTriggerNewMap);
         System.Assert.areEqual(mockHandler.triggerOldMap, mockHandler.executedTriggerOldMap);
@@ -227,7 +227,7 @@ private class LoggerSObjectHandler_Tests {
         mockUser.Id = LoggerMockDataCreator.createId(Schema.User.SObjectType);
         List<SObject> records = new List<Schema.User>{ mockUser };
         MockSObjectHandler mockHandler = new MockSObjectHandler(Schema.User.SObjectType);
-        mockHandler.triggerOperationType = TriggerOperation.AFTER_DELETE;
+        mockHandler.triggerOperationType = System.TriggerOperation.AFTER_DELETE;
         mockHandler.triggerNew = null;
         mockHandler.triggerNewMap = new Map<Id, SObject>(records);
         mockHandler.triggerOldMap = null;
@@ -235,7 +235,7 @@ private class LoggerSObjectHandler_Tests {
         mockHandler.execute();
 
         System.Assert.areEqual(1, mockHandler.executionCount);
-        System.Assert.areEqual(TriggerOperation.AFTER_DELETE, mockHandler.executedTriggerOperationType);
+        System.Assert.areEqual(System.TriggerOperation.AFTER_DELETE, mockHandler.executedTriggerOperationType);
         System.Assert.isNull(mockHandler.executedTriggerNew);
         System.Assert.areEqual(mockHandler.triggerNewMap, mockHandler.executedTriggerNewMap);
         System.Assert.isNull(mockHandler.executedTriggerOldMap);
@@ -247,7 +247,7 @@ private class LoggerSObjectHandler_Tests {
         mockUser.Id = LoggerMockDataCreator.createId(Schema.User.SObjectType);
         List<SObject> records = new List<Schema.User>{ mockUser };
         MockSObjectHandler mockHandler = new MockSObjectHandler(Schema.User.SObjectType);
-        mockHandler.triggerOperationType = TriggerOperation.AFTER_UNDELETE;
+        mockHandler.triggerOperationType = System.TriggerOperation.AFTER_UNDELETE;
         mockHandler.triggerNew = null;
         mockHandler.triggerNewMap = new Map<Id, SObject>(records);
         mockHandler.triggerOldMap = null;
@@ -255,7 +255,7 @@ private class LoggerSObjectHandler_Tests {
         mockHandler.execute();
 
         System.Assert.areEqual(1, mockHandler.executionCount);
-        System.Assert.areEqual(TriggerOperation.AFTER_UNDELETE, mockHandler.executedTriggerOperationType);
+        System.Assert.areEqual(System.TriggerOperation.AFTER_UNDELETE, mockHandler.executedTriggerOperationType);
         System.Assert.isNull(mockHandler.executedTriggerNew);
         System.Assert.areEqual(mockHandler.triggerNewMap, mockHandler.executedTriggerNewMap);
         System.Assert.isNull(mockHandler.executedTriggerOldMap);
@@ -267,7 +267,7 @@ private class LoggerSObjectHandler_Tests {
         mockUser.Id = LoggerMockDataCreator.createId(Schema.User.SObjectType);
         List<SObject> records = new List<Schema.User>{ mockUser };
         MockSObjectHandler mockHandler = new MockSObjectHandler(Schema.User.SObjectType);
-        mockHandler.triggerOperationType = TriggerOperation.BEFORE_INSERT;
+        mockHandler.triggerOperationType = System.TriggerOperation.BEFORE_INSERT;
         mockHandler.triggerNew = records;
         mockHandler.triggerNewMap = null;
         mockHandler.triggerOldMap = null;
@@ -291,7 +291,7 @@ private class LoggerSObjectHandler_Tests {
         mockUser.Id = LoggerMockDataCreator.createId(Schema.User.SObjectType);
         List<SObject> records = new List<Schema.User>{ mockUser };
         MockSObjectHandler mockHandler = new MockSObjectHandler(Schema.User.SObjectType);
-        mockHandler.triggerOperationType = TriggerOperation.BEFORE_INSERT;
+        mockHandler.triggerOperationType = System.TriggerOperation.BEFORE_INSERT;
         mockHandler.triggerNew = records;
         mockHandler.triggerNewMap = null;
         mockHandler.triggerOldMap = null;
@@ -318,7 +318,7 @@ private class LoggerSObjectHandler_Tests {
         mockUser.Id = LoggerMockDataCreator.createId(Schema.User.SObjectType);
         List<SObject> records = new List<Schema.User>{ mockUser };
         MockSObjectHandler mockHandler = new MockSObjectHandler(Schema.User.SObjectType);
-        mockHandler.triggerOperationType = TriggerOperation.BEFORE_INSERT;
+        mockHandler.triggerOperationType = System.TriggerOperation.BEFORE_INSERT;
         mockHandler.triggerNew = records;
         mockHandler.triggerNewMap = null;
         mockHandler.triggerOldMap = null;
@@ -344,7 +344,7 @@ private class LoggerSObjectHandler_Tests {
 
     public class MockSObjectHandler extends LoggerSObjectHandler {
         public Integer executionCount = 0;
-        public TriggerOperation executedTriggerOperationType;
+        public System.TriggerOperation executedTriggerOperationType;
         public List<SObject> executedTriggerNew;
         public Map<Id, SObject> executedTriggerNewMap;
         public Map<Id, SObject> executedTriggerOldMap;
@@ -365,14 +365,14 @@ private class LoggerSObjectHandler_Tests {
 
         protected override void executeBeforeInsert(List<SObject> triggerNew) {
             this.executionCount++;
-            this.executedTriggerOperationType = TriggerOperation.BEFORE_INSERT;
+            this.executedTriggerOperationType = System.TriggerOperation.BEFORE_INSERT;
             this.executedTriggerNew = triggerNew;
             super.executeBeforeInsert(triggerNew);
         }
 
         protected override void executeBeforeUpdate(Map<Id, SObject> triggerNewMap, Map<Id, SObject> triggerOldMap) {
             this.executionCount++;
-            this.executedTriggerOperationType = TriggerOperation.BEFORE_UPDATE;
+            this.executedTriggerOperationType = System.TriggerOperation.BEFORE_UPDATE;
             this.executedTriggerNewMap = triggerNewMap;
             this.executedTriggerOldMap = triggerOldMap;
             super.executeBeforeUpdate(triggerNewMap, triggerOldMap);
@@ -380,28 +380,28 @@ private class LoggerSObjectHandler_Tests {
 
         protected override void executeBeforeDelete(Map<Id, SObject> triggerNewMap) {
             this.executionCount++;
-            this.executedTriggerOperationType = TriggerOperation.BEFORE_DELETE;
+            this.executedTriggerOperationType = System.TriggerOperation.BEFORE_DELETE;
             this.executedTriggerNewMap = triggerNewMap;
             super.executeBeforeDelete(triggerNewMap);
         }
 
         protected override void executeAfterInsert(List<SObject> triggerNew) {
             this.executionCount++;
-            this.executedTriggerOperationType = TriggerOperation.AFTER_INSERT;
+            this.executedTriggerOperationType = System.TriggerOperation.AFTER_INSERT;
             this.executedTriggerNew = triggerNew;
             super.executeAfterInsert(triggerNew);
         }
 
         protected override void executeAfterInsert(Map<Id, SObject> triggerNewMap) {
             this.executionCount++;
-            this.executedTriggerOperationType = TriggerOperation.AFTER_INSERT;
+            this.executedTriggerOperationType = System.TriggerOperation.AFTER_INSERT;
             this.executedTriggerNewMap = triggerNewMap;
             super.executeAfterInsert(triggerNewMap);
         }
 
         protected override void executeAfterUpdate(Map<Id, SObject> triggerNewMap, Map<Id, SObject> triggerOldMap) {
             this.executionCount++;
-            this.executedTriggerOperationType = TriggerOperation.AFTER_UPDATE;
+            this.executedTriggerOperationType = System.TriggerOperation.AFTER_UPDATE;
             this.executedTriggerNewMap = triggerNewMap;
             this.executedTriggerOldMap = triggerOldMap;
             super.executeAfterUpdate(triggerNewMap, triggerOldMap);
@@ -409,14 +409,14 @@ private class LoggerSObjectHandler_Tests {
 
         protected override void executeAfterDelete(Map<Id, SObject> triggerNewMap) {
             this.executionCount++;
-            this.executedTriggerOperationType = TriggerOperation.AFTER_DELETE;
+            this.executedTriggerOperationType = System.TriggerOperation.AFTER_DELETE;
             this.executedTriggerNewMap = triggerNewMap;
             super.executeAfterDelete(triggerNewMap);
         }
 
         protected override void executeAfterUndelete(Map<Id, SObject> triggerNewMap) {
             this.executionCount++;
-            this.executedTriggerOperationType = TriggerOperation.AFTER_UNDELETE;
+            this.executedTriggerOperationType = System.TriggerOperation.AFTER_UNDELETE;
             this.executedTriggerNewMap = triggerNewMap;
             super.executeAfterUndelete(triggerNewMap);
         }
diff --git a/nebula-logger/core/tests/logger-engine/classes/LoggerTriggerableContext_Tests.cls b/nebula-logger/core/tests/logger-engine/classes/LoggerTriggerableContext_Tests.cls
index 9e5fc7443..0c3cb12d9 100644
--- a/nebula-logger/core/tests/logger-engine/classes/LoggerTriggerableContext_Tests.cls
+++ b/nebula-logger/core/tests/logger-engine/classes/LoggerTriggerableContext_Tests.cls
@@ -18,7 +18,7 @@ private class LoggerTriggerableContext_Tests {
     @IsTest
     static void it_constructs_instance_when_before_insert_operation() {
         Schema.SObjectType sobjectType = Schema.User.SObjectType;
-        TriggerOperation triggerOperationType = TriggerOperation.BEFORE_INSERT;
+        System.TriggerOperation triggerOperationType = System.TriggerOperation.BEFORE_INSERT;
         List<Schema.User> newUsers = new List<Schema.User>();
         for (Integer i = 0; i < 3; i++) {
             newUsers.add((Schema.User) LoggerMockDataCreator.createUser());
@@ -42,7 +42,7 @@ private class LoggerTriggerableContext_Tests {
     @IsTest
     static void it_constructs_instance_when_before_update_operation() {
         Schema.SObjectType sobjectType = Schema.User.SObjectType;
-        TriggerOperation triggerOperationType = TriggerOperation.BEFORE_UPDATE;
+        System.TriggerOperation triggerOperationType = System.TriggerOperation.BEFORE_UPDATE;
         List<Schema.User> updatedUsers = new List<Schema.User>();
         for (Integer i = 0; i < 3; i++) {
             Schema.User user = (Schema.User) LoggerMockDataCreator.createUser();
@@ -71,7 +71,7 @@ private class LoggerTriggerableContext_Tests {
     @IsTest
     static void it_constructs_instance_when_before_delete_operation() {
         Schema.SObjectType sobjectType = Schema.User.SObjectType;
-        TriggerOperation triggerOperationType = TriggerOperation.BEFORE_DELETE;
+        System.TriggerOperation triggerOperationType = System.TriggerOperation.BEFORE_DELETE;
         Map<Id, Schema.User> deletedLogsMap = new Map<Id, Schema.User>();
         for (Integer i = 0; i < 3; i++) {
             Schema.User user = (Schema.User) LoggerMockDataCreator.createDataBuilder(sobjectType).populateMockId().populateRequiredFields().getRecord();
diff --git a/nebula-logger/core/tests/logger-engine/classes/Logger_Tests.cls b/nebula-logger/core/tests/logger-engine/classes/Logger_Tests.cls
index 6c1aa5284..aadbacaf0 100644
--- a/nebula-logger/core/tests/logger-engine/classes/Logger_Tests.cls
+++ b/nebula-logger/core/tests/logger-engine/classes/Logger_Tests.cls
@@ -27,7 +27,7 @@ private class Logger_Tests {
 
     @IsTest
     static void it_should_return_organization_api_version() {
-        String userJson = JSON.serialize(new Schema.User(Id = System.UserInfo.getUserId()));
+        String userJson = System.JSON.serialize(new Schema.User(Id = System.UserInfo.getUserId()));
         String expectedApiVersion = userJson.substringAfter('/data/').substringBefore('/sobjects/User');
 
         String returnedApiVersion = Logger.getOrganizationApiVersion();
@@ -791,9 +791,13 @@ private class Logger_Tests {
 
     @IsTest
     static void it_should_return_quiddity_level() {
-        List<Quiddity> acceptableDefaultQuidditiesForTests = new List<Quiddity>{ Quiddity.RUNTEST_ASYNC, Quiddity.RUNTEST_DEPLOY, Quiddity.RUNTEST_SYNC };
+        List<System.Quiddity> acceptableDefaultQuidditiesForTests = new List<System.Quiddity>{
+            System.Quiddity.RUNTEST_ASYNC,
+            System.Quiddity.RUNTEST_DEPLOY,
+            System.Quiddity.RUNTEST_SYNC
+        };
 
-        Quiddity currentQuiddity = Logger.getCurrentQuiddity();
+        System.Quiddity currentQuiddity = Logger.getCurrentQuiddity();
 
         System.Assert.isTrue(acceptableDefaultQuidditiesForTests.contains(currentQuiddity));
         System.Assert.areEqual(System.Request.getCurrent().getQuiddity(), currentQuiddity);
@@ -1365,7 +1369,7 @@ private class Logger_Tests {
             .get(Schema.LogEntryEvent__e.SObjectType)
             .get(0);
         // System.Assert.areEqual(1, mockLogEntryEventBeforeInsertHandler.executionCount);
-        System.Assert.areEqual(TriggerOperation.BEFORE_INSERT, mockLogEntryEventBeforeInsertHandler.executedTriggerOperationType);
+        System.Assert.areEqual(System.TriggerOperation.BEFORE_INSERT, mockLogEntryEventBeforeInsertHandler.executedTriggerOperationType);
         System.Assert.areEqual(logEntryEvents.size(), mockLogEntryEventBeforeInsertHandler.executedTriggerNew.size());
         System.Assert.areEqual(logEntryEvents.get(0), mockLogEntryEventBeforeInsertHandler.executedTriggerNew.get(0));
         System.Assert.areEqual(logEntryEvents.get(1), mockLogEntryEventBeforeInsertHandler.executedTriggerNew.get(1));
@@ -1373,7 +1377,7 @@ private class Logger_Tests {
             .get(Schema.LogEntryEvent__e.SObjectType)
             .get(1);
         // System.Assert.areEqual(1, mockLogEntryEventAfterInsertHandler.executionCount);
-        System.Assert.areEqual(TriggerOperation.AFTER_INSERT, mockLogEntryEventAfterInsertHandler.executedTriggerOperationType);
+        System.Assert.areEqual(System.TriggerOperation.AFTER_INSERT, mockLogEntryEventAfterInsertHandler.executedTriggerOperationType);
         System.Assert.areEqual(logEntryEvents.size(), mockLogEntryEventAfterInsertHandler.executedTriggerNew.size());
         System.Assert.areEqual(logEntryEvents.get(0), mockLogEntryEventAfterInsertHandler.executedTriggerNew.get(0));
         System.Assert.areEqual(logEntryEvents.get(1), mockLogEntryEventAfterInsertHandler.executedTriggerNew.get(1));
@@ -1418,7 +1422,7 @@ private class Logger_Tests {
             .get(Schema.LogEntryEvent__e.SObjectType)
             .get(0);
         // System.Assert.areEqual(1, mockLogEntryEventBeforeInsertHandler.executionCount);
-        System.Assert.areEqual(TriggerOperation.BEFORE_INSERT, mockLogEntryEventBeforeInsertHandler.executedTriggerOperationType);
+        System.Assert.areEqual(System.TriggerOperation.BEFORE_INSERT, mockLogEntryEventBeforeInsertHandler.executedTriggerOperationType);
         System.Assert.areEqual(logEntryEvents.size(), mockLogEntryEventBeforeInsertHandler.executedTriggerNew.size());
         System.Assert.areEqual(logEntryEvents.get(0), mockLogEntryEventBeforeInsertHandler.executedTriggerNew.get(0));
         System.Assert.areEqual(logEntryEvents.get(1), mockLogEntryEventBeforeInsertHandler.executedTriggerNew.get(1));
@@ -1426,7 +1430,7 @@ private class Logger_Tests {
             .get(Schema.LogEntryEvent__e.SObjectType)
             .get(1);
         // System.Assert.areEqual(1, mockLogEntryEventAfterInsertHandler.executionCount);
-        System.Assert.areEqual(TriggerOperation.AFTER_INSERT, mockLogEntryEventAfterInsertHandler.executedTriggerOperationType);
+        System.Assert.areEqual(System.TriggerOperation.AFTER_INSERT, mockLogEntryEventAfterInsertHandler.executedTriggerOperationType);
         System.Assert.areEqual(logEntryEvents.size(), mockLogEntryEventAfterInsertHandler.executedTriggerNew.size());
         System.Assert.areEqual(logEntryEvents.get(0), mockLogEntryEventAfterInsertHandler.executedTriggerNew.get(0));
         System.Assert.areEqual(logEntryEvents.get(1), mockLogEntryEventAfterInsertHandler.executedTriggerNew.get(1));
@@ -1470,7 +1474,7 @@ private class Logger_Tests {
             .get(Schema.LogEntryEvent__e.SObjectType)
             .get(0);
         // System.Assert.areEqual(1, mockLogEntryEventBeforeInsertHandler.executionCount);
-        System.Assert.areEqual(TriggerOperation.BEFORE_INSERT, mockLogEntryEventBeforeInsertHandler.executedTriggerOperationType);
+        System.Assert.areEqual(System.TriggerOperation.BEFORE_INSERT, mockLogEntryEventBeforeInsertHandler.executedTriggerOperationType);
         System.Assert.areEqual(logEntryEvents.size(), mockLogEntryEventBeforeInsertHandler.executedTriggerNew.size());
         System.Assert.areEqual(logEntryEvents.get(0), mockLogEntryEventBeforeInsertHandler.executedTriggerNew.get(0));
         System.Assert.areEqual(logEntryEvents.get(1), mockLogEntryEventBeforeInsertHandler.executedTriggerNew.get(1));
@@ -1478,7 +1482,7 @@ private class Logger_Tests {
             .get(Schema.LogEntryEvent__e.SObjectType)
             .get(1);
         // System.Assert.areEqual(1, mockLogEntryEventAfterInsertHandler.executionCount);
-        System.Assert.areEqual(TriggerOperation.AFTER_INSERT, mockLogEntryEventAfterInsertHandler.executedTriggerOperationType);
+        System.Assert.areEqual(System.TriggerOperation.AFTER_INSERT, mockLogEntryEventAfterInsertHandler.executedTriggerOperationType);
         System.Assert.areEqual(logEntryEvents.size(), mockLogEntryEventAfterInsertHandler.executedTriggerNew.size());
         System.Assert.areEqual(logEntryEvents.get(0), mockLogEntryEventAfterInsertHandler.executedTriggerNew.get(0));
         System.Assert.areEqual(logEntryEvents.get(1), mockLogEntryEventAfterInsertHandler.executedTriggerNew.get(1));
@@ -1572,7 +1576,7 @@ private class Logger_Tests {
         System.Assert.areEqual(System.LoggingLevel.ERROR.name(), logEntryEvent.LoggingLevel__c);
         System.Assert.areEqual(logMessage.getMessage(), logEntryEvent.Message__c);
         System.Assert.areEqual(record.Id, logEntryEvent.RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(record), logEntryEvent.RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(record), logEntryEvent.RecordJson__c);
         System.Assert.areEqual(apexException.getMessage(), logEntryEvent.ExceptionMessage__c);
         System.Assert.areEqual(apexException.getTypeName(), logEntryEvent.ExceptionType__c);
     }
@@ -1600,7 +1604,7 @@ private class Logger_Tests {
         System.Assert.areEqual(System.LoggingLevel.ERROR.name(), logEntryEvent.LoggingLevel__c);
         System.Assert.areEqual(logMessage.getMessage(), logEntryEvent.Message__c);
         System.Assert.isNull(logEntryEvent.RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(records), logEntryEvent.RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(records), logEntryEvent.RecordJson__c);
         System.Assert.areEqual(apexException.getMessage(), logEntryEvent.ExceptionMessage__c);
         System.Assert.areEqual(apexException.getTypeName(), logEntryEvent.ExceptionType__c);
     }
@@ -1682,7 +1686,7 @@ private class Logger_Tests {
         System.Assert.areEqual(System.LoggingLevel.ERROR.name(), logEntryEvent.LoggingLevel__c);
         System.Assert.areEqual(message, logEntryEvent.Message__c);
         System.Assert.areEqual(record.Id, logEntryEvent.RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(record), logEntryEvent.RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(record), logEntryEvent.RecordJson__c);
         System.Assert.areEqual(apexException.getMessage(), logEntryEvent.ExceptionMessage__c);
         System.Assert.areEqual(apexException.getTypeName(), logEntryEvent.ExceptionType__c);
     }
@@ -1710,7 +1714,7 @@ private class Logger_Tests {
         System.Assert.areEqual(System.LoggingLevel.ERROR.name(), logEntryEvent.LoggingLevel__c);
         System.Assert.areEqual(message, logEntryEvent.Message__c);
         System.Assert.isNull(logEntryEvent.RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(records), logEntryEvent.RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(records), logEntryEvent.RecordJson__c);
         System.Assert.areEqual(apexException.getMessage(), logEntryEvent.ExceptionMessage__c);
         System.Assert.areEqual(apexException.getTypeName(), logEntryEvent.ExceptionType__c);
     }
@@ -1736,7 +1740,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(convertResult.getLeadId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(convertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(convertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.LeadConvertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -1760,7 +1764,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(convertResult.getLeadId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(convertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(convertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.LeadConvertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -1784,7 +1788,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(deleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -1808,7 +1812,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(deleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -1832,7 +1836,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -1856,7 +1860,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(saveResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -1880,7 +1884,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(saveResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -1904,7 +1908,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -1928,7 +1932,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(undeleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -1952,7 +1956,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(undeleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -1976,7 +1980,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2000,7 +2004,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Insert', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2024,7 +2028,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Insert', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2048,7 +2052,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Update', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2072,7 +2076,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Update', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2096,7 +2100,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2183,7 +2187,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(getRecord().Id, entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.areEqual(getException().getMessage(), entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.areEqual(getException().getTypeName(), entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -2205,7 +2209,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(getRecord().Id, entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -2228,7 +2232,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.areEqual(getException().getMessage(), entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.areEqual(getException().getTypeName(), entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -2251,7 +2255,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -2300,7 +2304,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(leadConvertResult.getLeadId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.LeadConvertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2324,7 +2328,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(leadConvertResult.getLeadId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.LeadConvertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2348,7 +2352,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(deleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2372,7 +2376,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(deleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2396,7 +2400,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(saveResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2420,7 +2424,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(saveResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2444,7 +2448,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(undeleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2468,7 +2472,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(undeleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2492,7 +2496,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Insert', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2516,7 +2520,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Insert', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2540,7 +2544,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Update', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2564,7 +2568,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Update', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2588,7 +2592,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2612,7 +2616,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2636,7 +2640,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2660,7 +2664,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2747,7 +2751,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(getRecord().Id, entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.areEqual(getException().getMessage(), entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.areEqual(getException().getTypeName(), entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -2769,7 +2773,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(getRecord().Id, entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -2792,7 +2796,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.areEqual(getException().getMessage(), entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.areEqual(getException().getTypeName(), entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -2815,7 +2819,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -2863,7 +2867,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(leadConvertResult.getLeadId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.LeadConvertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2887,7 +2891,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(leadConvertResult.getLeadId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.LeadConvertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2911,7 +2915,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(deleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2935,7 +2939,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(deleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2959,7 +2963,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(saveResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -2983,7 +2987,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(saveResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3007,7 +3011,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(undeleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3031,7 +3035,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(undeleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3055,7 +3059,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Insert', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3079,7 +3083,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Insert', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3103,7 +3107,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Update', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3127,7 +3131,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Update', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3214,7 +3218,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(getRecord().Id, entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.areEqual(getException().getMessage(), entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.areEqual(getException().getTypeName(), entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -3236,7 +3240,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(getRecord().Id, entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -3259,7 +3263,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.areEqual(getException().getMessage(), entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.areEqual(getException().getTypeName(), entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -3282,7 +3286,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -3331,7 +3335,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(leadConvertResult.getLeadId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.LeadConvertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3355,7 +3359,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(leadConvertResult.getLeadId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.LeadConvertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3379,7 +3383,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(deleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3403,7 +3407,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(deleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3427,7 +3431,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(saveResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3451,7 +3455,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(saveResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3475,7 +3479,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(undeleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3499,7 +3503,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(undeleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3523,7 +3527,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Insert', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3547,7 +3551,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Insert', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3571,7 +3575,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Update', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3595,7 +3599,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Update', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3682,7 +3686,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(getRecord().Id, entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.areEqual(getException().getMessage(), entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.areEqual(getException().getTypeName(), entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -3704,7 +3708,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(getRecord().Id, entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -3727,7 +3731,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.areEqual(getException().getMessage(), entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.areEqual(getException().getTypeName(), entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -3750,7 +3754,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -3799,7 +3803,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(leadConvertResult.getLeadId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.LeadConvertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3823,7 +3827,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(deleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3847,7 +3851,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(saveResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3871,7 +3875,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(undeleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3895,7 +3899,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Insert', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3919,7 +3923,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Update', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3943,7 +3947,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3967,7 +3971,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -3991,7 +3995,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4015,7 +4019,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4058,7 +4062,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(getRecord().Id, entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -4081,7 +4085,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -4130,7 +4134,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(leadConvertResult.getLeadId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.LeadConvertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4154,7 +4158,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(deleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4178,7 +4182,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(saveResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4202,7 +4206,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(undeleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4226,7 +4230,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Insert', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4250,7 +4254,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Update', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4274,7 +4278,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4298,7 +4302,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4322,7 +4326,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4346,7 +4350,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4389,7 +4393,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(getRecord().Id, entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -4412,7 +4416,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -4461,7 +4465,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(leadConvertResult.getLeadId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.LeadConvertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4485,7 +4489,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(deleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4509,7 +4513,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(saveResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4533,7 +4537,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(undeleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4557,7 +4561,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Insert', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4581,7 +4585,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Update', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4605,7 +4609,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4629,7 +4633,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4653,7 +4657,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4677,7 +4681,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4720,7 +4724,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(getRecord().Id, entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -4743,7 +4747,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -4792,7 +4796,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(leadConvertResult.getLeadId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.LeadConvertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4816,7 +4820,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(deleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4840,7 +4844,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(saveResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4864,7 +4868,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(undeleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4888,7 +4892,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Insert', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4912,7 +4916,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Update', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4936,7 +4940,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4960,7 +4964,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -4984,7 +4988,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5008,7 +5012,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5051,7 +5055,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(getRecord().Id, entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -5074,7 +5078,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -5123,7 +5127,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(leadConvertResult.getLeadId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.LeadConvertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5147,7 +5151,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(deleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5171,7 +5175,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(saveResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5195,7 +5199,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(undeleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5219,7 +5223,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Insert', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5243,7 +5247,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Update', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5267,7 +5271,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5291,7 +5295,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5315,7 +5319,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5339,7 +5343,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5382,7 +5386,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(getRecord().Id, entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -5405,7 +5409,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -5454,7 +5458,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(leadConvertResult.getLeadId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.LeadConvertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5478,7 +5482,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(deleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5502,7 +5506,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(saveResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5526,7 +5530,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(undeleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5550,7 +5554,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Insert', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5574,7 +5578,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Update', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5598,7 +5602,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5622,7 +5626,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5646,7 +5650,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5670,7 +5674,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5713,7 +5717,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(getRecord().Id, entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -5736,7 +5740,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -5785,7 +5789,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(leadConvertResult.getLeadId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.LeadConvertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5809,7 +5813,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(deleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5833,7 +5837,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(saveResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5857,7 +5861,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(undeleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5881,7 +5885,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Insert', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5905,7 +5909,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Update', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5929,7 +5933,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5953,7 +5957,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -5977,7 +5981,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6001,7 +6005,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6044,7 +6048,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(getRecord().Id, entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -6067,7 +6071,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -6116,7 +6120,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(leadConvertResult.getLeadId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.LeadConvertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6140,7 +6144,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(deleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6164,7 +6168,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(saveResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6188,7 +6192,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(undeleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6212,7 +6216,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Insert', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6236,7 +6240,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Update', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6260,7 +6264,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6284,7 +6288,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6308,7 +6312,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6332,7 +6336,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6375,7 +6379,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(getRecord().Id, entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -6398,7 +6402,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -6447,7 +6451,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(leadConvertResult.getLeadId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.LeadConvertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6471,7 +6475,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(deleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6495,7 +6499,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(saveResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6519,7 +6523,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(undeleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6543,7 +6547,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Insert', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6567,7 +6571,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Update', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6591,7 +6595,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6615,7 +6619,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6639,7 +6643,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6663,7 +6667,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6706,7 +6710,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(getRecord().Id, entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -6729,7 +6733,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getLogMessage().getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -6778,7 +6782,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(leadConvertResult.getLeadId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(leadConvertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.LeadConvertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6802,7 +6806,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(deleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6826,7 +6830,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(saveResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6850,7 +6854,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(undeleteResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6874,7 +6878,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Insert', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6898,7 +6902,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(upsertResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResult), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName() + '.Update', entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6922,7 +6926,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(deleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.DeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6946,7 +6950,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(saveResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.SaveResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6970,7 +6974,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(undeleteResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UndeleteResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -6994,7 +6998,7 @@ private class Logger_Tests {
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c);
-        System.Assert.areEqual(JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(upsertResults), entryBuilder.getLogEntryEvent().DatabaseResultJson__c);
         System.Assert.areEqual(Database.UpsertResult.class.getName(), entryBuilder.getLogEntryEvent().DatabaseResultType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
     }
@@ -7037,7 +7041,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(getRecord().Id, entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(getRecord()), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -7060,7 +7064,7 @@ private class Logger_Tests {
         System.Assert.areEqual(loggingLevel.name(), entryBuilder.getLogEntryEvent().LoggingLevel__c);
         System.Assert.areEqual(getMessage(), entryBuilder.getLogEntryEvent().Message__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c);
-        System.Assert.areEqual(JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
+        System.Assert.areEqual(System.JSON.serializePretty(users), entryBuilder.getLogEntryEvent().RecordJson__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionMessage__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().ExceptionType__c);
         System.Assert.isNull(entryBuilder.getLogEntryEvent().Tags__c);
@@ -7143,7 +7147,7 @@ private class Logger_Tests {
         System.Assert.isTrue(returnedBuilder.shouldSave());
         System.Assert.areEqual(message, returnedBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(1, returnedBuilder.getLogEntryEvent().DatabaseResultCollectionSize__c);
-        String expectedDatabaseResultJson = JSON.serializePretty(unsuccessfulResult);
+        String expectedDatabaseResultJson = System.JSON.serializePretty(unsuccessfulResult);
         System.Assert.areEqual(expectedDatabaseResultJson, returnedBuilder.getLogEntryEvent().DatabaseResultJson__c);
     }
 
@@ -7236,7 +7240,7 @@ private class Logger_Tests {
         System.Assert.isTrue(returnedBuilder.shouldSave());
         System.Assert.areEqual(logMessage.getMessage(), returnedBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(1, returnedBuilder.getLogEntryEvent().DatabaseResultCollectionSize__c);
-        String expectedDatabaseResultJson = JSON.serializePretty(unsuccessfulResult);
+        String expectedDatabaseResultJson = System.JSON.serializePretty(unsuccessfulResult);
         System.Assert.areEqual(expectedDatabaseResultJson, returnedBuilder.getLogEntryEvent().DatabaseResultJson__c);
     }
 
@@ -7293,7 +7297,7 @@ private class Logger_Tests {
         System.Assert.isTrue(returnedBuilder.shouldSave());
         System.Assert.areEqual(message, returnedBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(1, returnedBuilder.getLogEntryEvent().DatabaseResultCollectionSize__c);
-        String expectedDatabaseResultJson = JSON.serializePretty(unsuccessfulResult);
+        String expectedDatabaseResultJson = System.JSON.serializePretty(unsuccessfulResult);
         System.Assert.areEqual(expectedDatabaseResultJson, returnedBuilder.getLogEntryEvent().DatabaseResultJson__c);
     }
 
@@ -7350,7 +7354,7 @@ private class Logger_Tests {
         System.Assert.isTrue(returnedBuilder.shouldSave());
         System.Assert.areEqual(logMessage.getMessage(), returnedBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(1, returnedBuilder.getLogEntryEvent().DatabaseResultCollectionSize__c);
-        String expectedDatabaseResultJson = JSON.serializePretty(unsuccessfulResult);
+        String expectedDatabaseResultJson = System.JSON.serializePretty(unsuccessfulResult);
         System.Assert.areEqual(expectedDatabaseResultJson, returnedBuilder.getLogEntryEvent().DatabaseResultJson__c);
     }
 
@@ -7407,7 +7411,7 @@ private class Logger_Tests {
         System.Assert.isTrue(returnedBuilder.shouldSave());
         System.Assert.areEqual(message, returnedBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(1, returnedBuilder.getLogEntryEvent().DatabaseResultCollectionSize__c);
-        String expectedDatabaseResultJson = JSON.serializePretty(unsuccessfulResult);
+        String expectedDatabaseResultJson = System.JSON.serializePretty(unsuccessfulResult);
         System.Assert.areEqual(expectedDatabaseResultJson, returnedBuilder.getLogEntryEvent().DatabaseResultJson__c);
     }
 
@@ -7464,7 +7468,7 @@ private class Logger_Tests {
         System.Assert.isTrue(returnedBuilder.shouldSave());
         System.Assert.areEqual(logMessage.getMessage(), returnedBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(1, returnedBuilder.getLogEntryEvent().DatabaseResultCollectionSize__c);
-        String expectedDatabaseResultJson = JSON.serializePretty(unsuccessfulResult);
+        String expectedDatabaseResultJson = System.JSON.serializePretty(unsuccessfulResult);
         System.Assert.areEqual(expectedDatabaseResultJson, returnedBuilder.getLogEntryEvent().DatabaseResultJson__c);
     }
 
@@ -7521,7 +7525,7 @@ private class Logger_Tests {
         System.Assert.isTrue(returnedBuilder.shouldSave());
         System.Assert.areEqual(message, returnedBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(1, returnedBuilder.getLogEntryEvent().DatabaseResultCollectionSize__c);
-        String expectedDatabaseResultJson = JSON.serializePretty(unsuccessfulResult);
+        String expectedDatabaseResultJson = System.JSON.serializePretty(unsuccessfulResult);
         System.Assert.areEqual(expectedDatabaseResultJson, returnedBuilder.getLogEntryEvent().DatabaseResultJson__c);
     }
 
@@ -7578,7 +7582,7 @@ private class Logger_Tests {
         System.Assert.isTrue(returnedBuilder.shouldSave());
         System.Assert.areEqual(logMessage.getMessage(), returnedBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(1, returnedBuilder.getLogEntryEvent().DatabaseResultCollectionSize__c);
-        String expectedDatabaseResultJson = JSON.serializePretty(unsuccessfulResult);
+        String expectedDatabaseResultJson = System.JSON.serializePretty(unsuccessfulResult);
         System.Assert.areEqual(expectedDatabaseResultJson, returnedBuilder.getLogEntryEvent().DatabaseResultJson__c);
     }
 
@@ -7635,7 +7639,7 @@ private class Logger_Tests {
         System.Assert.isTrue(returnedBuilder.shouldSave());
         System.Assert.areEqual(message, returnedBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(1, returnedBuilder.getLogEntryEvent().DatabaseResultCollectionSize__c);
-        String expectedDatabaseResultJson = JSON.serializePretty(unsuccessfulResult);
+        String expectedDatabaseResultJson = System.JSON.serializePretty(unsuccessfulResult);
         System.Assert.areEqual(expectedDatabaseResultJson, returnedBuilder.getLogEntryEvent().DatabaseResultJson__c);
     }
 
@@ -7692,7 +7696,7 @@ private class Logger_Tests {
         System.Assert.isTrue(returnedBuilder.shouldSave());
         System.Assert.areEqual(logMessage.getMessage(), returnedBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(1, returnedBuilder.getLogEntryEvent().DatabaseResultCollectionSize__c);
-        String expectedDatabaseResultJson = JSON.serializePretty(unsuccessfulResult);
+        String expectedDatabaseResultJson = System.JSON.serializePretty(unsuccessfulResult);
         System.Assert.areEqual(expectedDatabaseResultJson, returnedBuilder.getLogEntryEvent().DatabaseResultJson__c);
     }
 
@@ -7749,7 +7753,7 @@ private class Logger_Tests {
         System.Assert.isTrue(returnedBuilder.shouldSave());
         System.Assert.areEqual(message, returnedBuilder.getLogEntryEvent().Message__c);
         System.Assert.areEqual(1, returnedBuilder.getLogEntryEvent().DatabaseResultCollectionSize__c);
-        String expectedDatabaseResultJson = JSON.serializePretty(unsuccessfulResult);
+        String expectedDatabaseResultJson = System.JSON.serializePretty(unsuccessfulResult);
         System.Assert.areEqual(expectedDatabaseResultJson, returnedBuilder.getLogEntryEvent().DatabaseResultJson__c);
     }
     // End logDatabaseErrors() test methods
@@ -7921,12 +7925,12 @@ private class Logger_Tests {
         mockApiResponse.releaseVersion = 'Spring \'23 Patch 19.17';
         System.Test.setMock(
             System.HttpCalloutMock.class,
-            LoggerMockDataCreator.createHttpCallout().setStatusCode(200).setResponseBody(JSON.serialize(mockApiResponse))
+            LoggerMockDataCreator.createHttpCallout().setStatusCode(200).setResponseBody(System.JSON.serialize(mockApiResponse))
         );
 
         Logger.StatusApiResponse returnedApiResponse = Logger.callStatusApi();
 
-        System.Assert.areEqual(JSON.serialize(mockApiResponse), JSON.serialize(returnedApiResponse));
+        System.Assert.areEqual(System.JSON.serialize(mockApiResponse), System.JSON.serialize(returnedApiResponse));
     }
 
     @IsTest
@@ -8063,7 +8067,7 @@ private class Logger_Tests {
 
     public class MockSObjectHandler extends LoggerSObjectHandler {
         public Integer executionCount = 0;
-        public TriggerOperation executedTriggerOperationType;
+        public System.TriggerOperation executedTriggerOperationType;
         public List<SObject> executedTriggerNew;
         public Map<Id, SObject> executedTriggerNewMap;
         public Map<Id, SObject> executedTriggerOldMap;
@@ -8085,51 +8089,51 @@ private class Logger_Tests {
 
         protected override void executeBeforeInsert(List<SObject> triggerNew) {
             this.executionCount++;
-            this.executedTriggerOperationType = TriggerOperation.BEFORE_INSERT;
+            this.executedTriggerOperationType = System.TriggerOperation.BEFORE_INSERT;
             this.executedTriggerNew = triggerNew;
         }
 
         protected override void executeBeforeUpdate(Map<Id, SObject> triggerNewMap, Map<Id, SObject> triggerOldMap) {
             this.executionCount++;
-            this.executedTriggerOperationType = TriggerOperation.BEFORE_UPDATE;
+            this.executedTriggerOperationType = System.TriggerOperation.BEFORE_UPDATE;
             this.executedTriggerNewMap = triggerNewMap;
             this.executedTriggerOldMap = triggerOldMap;
         }
 
         protected override void executeBeforeDelete(Map<Id, SObject> triggerNewMap) {
             this.executionCount++;
-            this.executedTriggerOperationType = TriggerOperation.BEFORE_DELETE;
+            this.executedTriggerOperationType = System.TriggerOperation.BEFORE_DELETE;
             this.executedTriggerNewMap = triggerNewMap;
         }
 
         protected override void executeAfterInsert(List<SObject> triggerNew) {
             this.executionCount++;
-            this.executedTriggerOperationType = TriggerOperation.AFTER_INSERT;
+            this.executedTriggerOperationType = System.TriggerOperation.AFTER_INSERT;
             this.executedTriggerNew = triggerNew;
         }
 
         protected override void executeAfterInsert(Map<Id, SObject> triggerNewMap) {
             this.executionCount++;
-            this.executedTriggerOperationType = TriggerOperation.AFTER_INSERT;
+            this.executedTriggerOperationType = System.TriggerOperation.AFTER_INSERT;
             this.executedTriggerNewMap = triggerNewMap;
         }
 
         protected override void executeAfterUpdate(Map<Id, SObject> triggerNewMap, Map<Id, SObject> triggerOldMap) {
             this.executionCount++;
-            this.executedTriggerOperationType = TriggerOperation.AFTER_UPDATE;
+            this.executedTriggerOperationType = System.TriggerOperation.AFTER_UPDATE;
             this.executedTriggerNewMap = triggerNewMap;
             this.executedTriggerOldMap = triggerOldMap;
         }
 
         protected override void executeAfterDelete(Map<Id, SObject> triggerNewMap) {
             this.executionCount++;
-            this.executedTriggerOperationType = TriggerOperation.AFTER_DELETE;
+            this.executedTriggerOperationType = System.TriggerOperation.AFTER_DELETE;
             this.executedTriggerNewMap = triggerNewMap;
         }
 
         protected override void executeAfterUndelete(Map<Id, SObject> triggerNewMap) {
             this.executionCount++;
-            this.executedTriggerOperationType = TriggerOperation.AFTER_UNDELETE;
+            this.executedTriggerOperationType = System.TriggerOperation.AFTER_UNDELETE;
             this.executedTriggerNewMap = triggerNewMap;
         }
     }
diff --git a/nebula-logger/core/tests/logger-engine/utilities/LoggerMockDataStore.cls b/nebula-logger/core/tests/logger-engine/utilities/LoggerMockDataStore.cls
index c748d657e..a6f322b74 100644
--- a/nebula-logger/core/tests/logger-engine/utilities/LoggerMockDataStore.cls
+++ b/nebula-logger/core/tests/logger-engine/utilities/LoggerMockDataStore.cls
@@ -54,11 +54,11 @@ public without sharing class LoggerMockDataStore {
 
             Schema.SObjectType sobjectType = records.get(0).getSObjectType();
 
-            LoggerTriggerableContext beforeInsertInput = new LoggerTriggerableContext(sobjectType, TriggerOperation.BEFORE_INSERT, records);
+            LoggerTriggerableContext beforeInsertInput = new LoggerTriggerableContext(sobjectType, System.TriggerOperation.BEFORE_INSERT, records);
             LoggerSObjectHandler beforeInsertHandler = LoggerSObjectHandler.getHandler(sobjectType);
             beforeInsertHandler?.overrideTriggerableContext(beforeInsertInput).execute();
 
-            LoggerTriggerableContext afterInsertInput = new LoggerTriggerableContext(sobjectType, TriggerOperation.AFTER_INSERT, records);
+            LoggerTriggerableContext afterInsertInput = new LoggerTriggerableContext(sobjectType, System.TriggerOperation.AFTER_INSERT, records);
             LoggerSObjectHandler afterInsertHandler = LoggerSObjectHandler.getHandler(sobjectType);
             afterInsertHandler?.overrideTriggerableContext(afterInsertInput).execute();
 
@@ -118,7 +118,7 @@ public without sharing class LoggerMockDataStore {
         public void deliver(LoggerSObjectHandler sobjectHandlerInstance) {
             LoggerTriggerableContext platformEventsTriggerContext = new LoggerTriggerableContext(
                 sobjectHandlerInstance.getSObjectType(),
-                TriggerOperation.AFTER_INSERT,
+                System.TriggerOperation.AFTER_INSERT,
                 this.publishedPlatformEvents
             );
             sobjectHandlerInstance?.overrideTriggerableContext(platformEventsTriggerContext).execute();
@@ -127,25 +127,25 @@ public without sharing class LoggerMockDataStore {
     }
 
     public class MockJobQueue extends LoggerDataStore.JobQueue {
-        private List<Queueable> enqueuedJobs;
+        private List<System.Queueable> enqueuedJobs;
         private Integer publishCount;
 
         private MockJobQueue() {
-            this.enqueuedJobs = new List<Queueable>();
+            this.enqueuedJobs = new List<System.Queueable>();
         }
 
-        public List<Queueable> getEnqueuedJobs() {
+        public List<System.Queueable> getEnqueuedJobs() {
             return this.enqueuedJobs;
         }
 
-        public override Id enqueueJob(Queueable queueableJob) {
+        public override Id enqueueJob(System.Queueable queueableJob) {
             this.enqueuedJobs.add(queueableJob);
 
             return LoggerMockDataCreator.createId(Schema.AsyncApexJob.SObjectType);
         }
 
         public void executeJobs() {
-            for (Queueable job : this.enqueuedJobs) {
+            for (System.Queueable job : this.enqueuedJobs) {
                 job.execute(null); // TODO create mock instance for System.QueueableContext queueableContext
             }
         }
@@ -178,7 +178,7 @@ public without sharing class LoggerMockDataStore {
             Boolean recordHasFieldValue = record.get(requiredField) != null;
             if (recordHasField == false || recordHasFieldValue == false) {
                 SObjectException ex = new SObjectException();
-                ex.setMessage('The field ' + requiredField + ' is required on record: ' + JSON.serializePretty(record));
+                ex.setMessage('The field ' + requiredField + ' is required on record: ' + System.JSON.serializePretty(record));
                 throw ex;
             }
         }
diff --git a/nebula-logger/extra-tests/classes/NebulaLogger_E2E_Tests.cls b/nebula-logger/extra-tests/classes/NebulaLogger_E2E_Tests.cls
index 098d712b9..af15395d9 100644
--- a/nebula-logger/extra-tests/classes/NebulaLogger_E2E_Tests.cls
+++ b/nebula-logger/extra-tests/classes/NebulaLogger_E2E_Tests.cls
@@ -105,11 +105,11 @@ private class NebulaLogger_E2E_Tests {
         // So instead, the callout is tested
         String expectedEndpoint = System.URL.getOrgDomainUrl().toExternalForm() + '/services/data/' + getOrganizationApiVersion() + '/composite/sobjects';
         System.Assert.areEqual(expectedEndpoint, mockCallout.request.getEndpoint());
-        Map<String, Object> untypedRequestBody = (Map<String, Object>) JSON.deserializeUntyped(mockCallout.request.getBody());
+        Map<String, Object> untypedRequestBody = (Map<String, Object>) System.JSON.deserializeUntyped(mockCallout.request.getBody());
         Boolean requestAllOrNone = (Boolean) untypedRequestBody.get('allOrNone');
         System.Assert.isTrue(requestAllOrNone);
-        List<LogEntryEvent__e> requestRecords = (List<LogEntryEvent__e>) JSON.deserialize(
-            JSON.serialize(untypedRequestBody.get('records')),
+        List<LogEntryEvent__e> requestRecords = (List<LogEntryEvent__e>) System.JSON.deserialize(
+            System.JSON.serialize(untypedRequestBody.get('records')),
             List<LogEntryEvent__e>.class
         );
         System.Assert.areEqual(1, requestRecords.size());
@@ -153,13 +153,13 @@ private class NebulaLogger_E2E_Tests {
         // So, use System.UserInfo.getUserId() to create the current user's record without querying
         // Then parse the JSON to get the API version
         // Expected JSON: {"attributes":{"type":"Schema.User","url":"/services/data/v53.0/sobjects/Schema.User/005J000000AugnYIAR"}
-        String userJson = JSON.serialize(new Schema.User(Id = System.UserInfo.getUserId()));
+        String userJson = System.JSON.serialize(new Schema.User(Id = System.UserInfo.getUserId()));
         return userJson.substringAfter('/data/').substringBefore('/sobjects/User');
     }
 
     private static SObject setReadOnlyField(SObject record, Map<Schema.SObjectField, Object> changesToFields) {
-        String serializedRecord = JSON.serialize(record);
-        Map<String, Object> deserializedRecordMap = (Map<String, Object>) JSON.deserializeUntyped(serializedRecord);
+        String serializedRecord = System.JSON.serialize(record);
+        Map<String, Object> deserializedRecordMap = (Map<String, Object>) System.JSON.deserializeUntyped(serializedRecord);
 
         // Loop through the deserialized record map and put the field & value
         // Since it's a map, if the field already exists on the SObject, it's updated (or added if it wasn't there already)
@@ -168,8 +168,8 @@ private class NebulaLogger_E2E_Tests {
             deserializedRecordMap.put(fieldName, changesToFields.get(sobjectField));
         }
 
-        serializedRecord = JSON.serialize(deserializedRecordMap);
-        return (SObject) JSON.deserialize(serializedRecord, SObject.class);
+        serializedRecord = System.JSON.serialize(deserializedRecordMap);
+        return (SObject) System.JSON.deserialize(serializedRecord, SObject.class);
     }
 
     @SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Account.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/Account.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/Account.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/Account.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Account.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/Account.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/Account.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/Account.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Schema/ApexClass.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/ApexClass.cls
new file mode 100644
index 000000000..5f7b62abf
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/Schema/ApexClass.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `Schema.ApexClass` instead of just `ApexClass`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class ApexClass {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/AccessType.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/ApexClass.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/AccessType.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/ApexClass.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Schema/ApexEmailNotification.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/ApexEmailNotification.cls
new file mode 100644
index 000000000..2b2a149c3
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/Schema/ApexEmailNotification.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `Schema.ApexEmailNotification` instead of just `ApexEmailNotification`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class ApexEmailNotification {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Assert.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/ApexEmailNotification.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/Assert.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/ApexEmailNotification.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Schema/ApexTrigger.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/ApexTrigger.cls
new file mode 100644
index 000000000..dcaa2e403
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/Schema/ApexTrigger.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `Schema.ApexTrigger` instead of just `ApexTrigger`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class ApexTrigger {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/AuraHandledException.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/ApexTrigger.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/AuraHandledException.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/ApexTrigger.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Schema/AsyncApexJob.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/AsyncApexJob.cls
new file mode 100644
index 000000000..c9cf7ebe3
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/Schema/AsyncApexJob.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `Schema.AsyncApexJob` instead of just `AsyncApexJob`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class AsyncApexJob {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/AuthSession.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/AsyncApexJob.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/AuthSession.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/AsyncApexJob.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/AuthSession.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/AuthSession.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/AuthSession.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/AuthSession.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/CalloutException.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/AuthSession.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/CalloutException.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/AuthSession.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Schema/BatchApexErrorEvent.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/BatchApexErrorEvent.cls
new file mode 100644
index 000000000..75c20b4f6
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/Schema/BatchApexErrorEvent.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `Schema.BatchApexErrorEvent` instead of just `BatchApexErrorEvent`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class BatchApexErrorEvent {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/DmlException.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/BatchApexErrorEvent.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/DmlException.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/BatchApexErrorEvent.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Schema/CustomPermission.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/CustomPermission.cls
new file mode 100644
index 000000000..3659d801e
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/Schema/CustomPermission.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `Schema.CustomPermission` instead of just `CustomPermission`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class CustomPermission {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/FeatureManagement.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/CustomPermission.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/FeatureManagement.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/CustomPermission.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Schema/DisplayType.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/DisplayType.cls
new file mode 100644
index 000000000..1aafeb671
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/Schema/DisplayType.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `Schema.DisplayType` instead of just `DisplayType`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class DisplayType {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/FieldSet.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/DisplayType.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/FieldSet.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/DisplayType.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/FieldSet.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/FieldSet.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/FieldSet.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/FieldSet.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/FieldSetMember.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/FieldSet.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/FieldSetMember.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/FieldSet.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/FieldSetMember.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/FieldSetMember.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/FieldSetMember.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/FieldSetMember.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Http.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/FieldSetMember.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/Http.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/FieldSetMember.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Schema/FlowDefinitionView.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/FlowDefinitionView.cls
new file mode 100644
index 000000000..733bff40b
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/Schema/FlowDefinitionView.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `Schema.FlowDefinitionView` instead of just `FlowDefinitionView`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class FlowDefinitionView {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/HttpCalloutMock.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/FlowDefinitionView.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/HttpCalloutMock.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/FlowDefinitionView.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Schema/FlowExecutionErrorEvent.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/FlowExecutionErrorEvent.cls
new file mode 100644
index 000000000..872c35426
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/Schema/FlowExecutionErrorEvent.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `Schema.FlowExecutionErrorEvent` instead of just `FlowExecutionErrorEvent`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class FlowExecutionErrorEvent {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/HttpRequest.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/FlowExecutionErrorEvent.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/HttpRequest.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/FlowExecutionErrorEvent.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Schema/FlowVersionView.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/FlowVersionView.cls
new file mode 100644
index 000000000..7bea84d64
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/Schema/FlowVersionView.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `Schema.FlowVersionView` instead of just `FlowVersionView`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class FlowVersionView {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/HttpResponse.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/FlowVersionView.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/HttpResponse.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/FlowVersionView.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/LoginHistory.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/LoginHistory.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/LoginHistory.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/LoginHistory.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/LoginHistory.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/LoginHistory.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/LoginHistory.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/LoginHistory.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Network.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/Network.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/Network.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/Network.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Network.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/Network.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/Network.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/Network.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Organization.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/Organization.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/Organization.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/Organization.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Organization.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/Organization.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/Organization.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/Organization.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Schema/PermissionSet.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/PermissionSet.cls
new file mode 100644
index 000000000..2724fca55
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/Schema/PermissionSet.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `Schema.PermissionSet` instead of just `PermissionSet`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class PermissionSet {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/IllegalArgumentException.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/PermissionSet.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/IllegalArgumentException.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/PermissionSet.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Schema/PermissionSetAssignment.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/PermissionSetAssignment.cls
new file mode 100644
index 000000000..6eb8a97bf
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/Schema/PermissionSetAssignment.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `Schema.PermissionSetAssignment` instead of just `PermissionSetAssignment`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class PermissionSetAssignment {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Limits.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/PermissionSetAssignment.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/Limits.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/PermissionSetAssignment.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Schema/PicklistEntry.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/PicklistEntry.cls
new file mode 100644
index 000000000..196f14525
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/Schema/PicklistEntry.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `Schema.PicklistEntry` instead of just `PicklistEntry`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class PicklistEntry {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/LoggingLevel.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/PicklistEntry.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/LoggingLevel.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/PicklistEntry.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Profile.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/Profile.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/Profile.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/Profile.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Profile.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/Profile.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/Profile.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/Profile.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/SObjectField.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/SObjectField.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/SObjectField.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/SObjectField.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/SObjectField.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/SObjectField.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/SObjectField.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/SObjectField.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/SObjectType.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/SObjectType.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/SObjectType.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/SObjectType.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/SObjectType.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/SObjectType.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/SObjectType.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/SObjectType.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Schema/SoapType.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/SoapType.cls
new file mode 100644
index 000000000..f41ac85cd
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/Schema/SoapType.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `Schema.SoapType` instead of just `SoapType`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class SoapType {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/SObjectAccessDecision.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/SoapType.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/SObjectAccessDecision.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/SoapType.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Topic.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/Topic.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/Topic.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/Topic.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Topic.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/Topic.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/Topic.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/Topic.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/TopicAssignment.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/TopicAssignment.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/TopicAssignment.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/TopicAssignment.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/TopicAssignment.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/TopicAssignment.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/TopicAssignment.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/TopicAssignment.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/User.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/User.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/User.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/User.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/User.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/User.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/User.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/User.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Schema/UserRecordAccess.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/UserRecordAccess.cls
new file mode 100644
index 000000000..4862a8122
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/Schema/UserRecordAccess.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `Schema.UserRecordAccess` instead of just `UserRecordAccess`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class UserRecordAccess {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Security.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/UserRecordAccess.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/Security.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/UserRecordAccess.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Schema/UserRole.cls b/nebula-logger/extra-tests/classes/name-shadowing/Schema/UserRole.cls
new file mode 100644
index 000000000..36940edf8
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/Schema/UserRole.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `Schema.UserRole` instead of just `UserRole`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class UserRole {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Test.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/Schema/UserRole.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/Test.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/Schema/UserRole.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/AccessType.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/AccessType.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/AccessType.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/System/AccessType.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Type.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/AccessType.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/Type.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/System/AccessType.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Assert.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/Assert.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/Assert.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/System/Assert.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/UserInfo.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/Assert.cls-meta.xml
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/UserInfo.cls-meta.xml
rename to nebula-logger/extra-tests/classes/name-shadowing/System/Assert.cls-meta.xml
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/AuraHandledException.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/AuraHandledException.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/AuraHandledException.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/System/AuraHandledException.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/AuraHandledException.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/AuraHandledException.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/AuraHandledException.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/BatchableContext.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/BatchableContext.cls
new file mode 100644
index 000000000..7b7125728
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/BatchableContext.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `Schema.BatchableContext` instead of just `BatchableContext`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class BatchableContext {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/BatchableContext.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/BatchableContext.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/BatchableContext.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/CalloutException.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/CalloutException.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/CalloutException.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/System/CalloutException.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/CalloutException.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/CalloutException.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/CalloutException.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Comparable.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/Comparable.cls
new file mode 100644
index 000000000..c743277e4
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Comparable.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `System.Comparable` instead of just `Comparable`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class Comparable {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Comparable.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/Comparable.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Comparable.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Database.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/Database.cls
new file mode 100644
index 000000000..7e924a662
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Database.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `System.Database` instead of just `Database`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class Database {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Database.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/Database.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Database.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/DmlException.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/DmlException.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/DmlException.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/System/DmlException.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/DmlException.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/DmlException.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/DmlException.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/EventBus.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/EventBus.cls
new file mode 100644
index 000000000..0450145fb
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/EventBus.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `System.EventBus` instead of just `EventBus`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class EventBus {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/EventBus.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/EventBus.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/EventBus.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/FeatureManagement.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/FeatureManagement.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/FeatureManagement.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/System/FeatureManagement.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/FeatureManagement.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/FeatureManagement.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/FeatureManagement.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/FinalizerContext.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/FinalizerContext.cls
new file mode 100644
index 000000000..25b58c468
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/FinalizerContext.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `Schema.FinalizerContext` instead of just `FinalizerContext`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class FinalizerContext {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/FinalizerContext.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/FinalizerContext.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/FinalizerContext.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Http.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/Http.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/Http.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/System/Http.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Http.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/Http.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Http.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/HttpCalloutMock.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/HttpCalloutMock.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/HttpCalloutMock.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/System/HttpCalloutMock.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/HttpCalloutMock.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/HttpCalloutMock.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/HttpCalloutMock.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/HttpRequest.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/HttpRequest.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/HttpRequest.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/System/HttpRequest.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/HttpRequest.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/HttpRequest.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/HttpRequest.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/HttpResponse.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/HttpResponse.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/HttpResponse.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/System/HttpResponse.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/HttpResponse.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/HttpResponse.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/HttpResponse.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/IllegalArgumentException.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/IllegalArgumentException.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/IllegalArgumentException.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/System/IllegalArgumentException.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/IllegalArgumentException.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/IllegalArgumentException.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/IllegalArgumentException.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/InstallHandler.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/InstallHandler.cls
new file mode 100644
index 000000000..f947124a0
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/InstallHandler.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `System.InstallHandler` instead of just `InstallHandler`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class InstallHandler {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/InstallHandler.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/InstallHandler.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/InstallHandler.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/JSON.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/JSON.cls
new file mode 100644
index 000000000..ff2941af7
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/JSON.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `System.JSON` instead of just `JSON`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class JSON {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/JSON.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/JSON.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/JSON.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Limits.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/Limits.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/Limits.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/System/Limits.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Limits.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/Limits.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Limits.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/LoggingLevel.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/LoggingLevel.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/LoggingLevel.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/System/LoggingLevel.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/LoggingLevel.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/LoggingLevel.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/LoggingLevel.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Matcher.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/Matcher.cls
new file mode 100644
index 000000000..f6f861db9
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Matcher.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `System.Matcher` instead of just `Matcher`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class Matcher {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Matcher.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/Matcher.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Matcher.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Pattern.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/Pattern.cls
new file mode 100644
index 000000000..04e1b8c91
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Pattern.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `System.Pattern` instead of just `Pattern`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class Pattern {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Pattern.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/Pattern.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Pattern.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Queueable.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/Queueable.cls
new file mode 100644
index 000000000..b8d81b8a6
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Queueable.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `System.Queueable` instead of just `Queueable`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class Queueable {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Queueable.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/Queueable.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Queueable.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/QueueableContext.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/QueueableContext.cls
new file mode 100644
index 000000000..2f7505671
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/QueueableContext.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `System.QueueableContext` instead of just `QueueableContext`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class QueueableContext {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/QueueableContext.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/QueueableContext.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/QueueableContext.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Quiddity.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/Quiddity.cls
new file mode 100644
index 000000000..7cb2ffe32
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Quiddity.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `System.Quiddity` instead of just `Quiddity`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class Quiddity {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Quiddity.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/Quiddity.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Quiddity.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Request.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/Request.cls
new file mode 100644
index 000000000..ccf9beb24
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Request.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `System.Request` instead of just `Request`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class Request {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Request.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/Request.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Request.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/RestContext.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/RestContext.cls
new file mode 100644
index 000000000..a5ec25f1d
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/RestContext.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `System.RestContext` instead of just `RestContext`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class RestContext {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/RestContext.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/RestContext.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/RestContext.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/RestRequest.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/RestRequest.cls
new file mode 100644
index 000000000..fe14c75b3
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/RestRequest.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `System.RestRequest` instead of just `RestRequest`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class RestRequest {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/RestRequest.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/RestRequest.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/RestRequest.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/RestResponse.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/RestResponse.cls
new file mode 100644
index 000000000..3f73c4f40
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/RestResponse.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `System.RestResponse` instead of just `RestResponse`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class RestResponse {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/RestResponse.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/RestResponse.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/RestResponse.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/SObjectAccessDecision.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/SObjectAccessDecision.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/SObjectAccessDecision.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/System/SObjectAccessDecision.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/SObjectAccessDecision.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/SObjectAccessDecision.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/SObjectAccessDecision.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Schedulable.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/Schedulable.cls
new file mode 100644
index 000000000..867dfe29b
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Schedulable.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `System.Schedulable` instead of just `Schedulable`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class Schedulable {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Schedulable.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/Schedulable.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Schedulable.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/SchedulableContext.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/SchedulableContext.cls
new file mode 100644
index 000000000..45e030409
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/SchedulableContext.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `System.SchedulableContext` instead of just `SchedulableContext`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class SchedulableContext {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/SchedulableContext.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/SchedulableContext.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/SchedulableContext.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Search.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/Search.cls
new file mode 100644
index 000000000..8ad128b4d
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Search.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `System.Search` instead of just `Search`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class Search {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Search.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/Search.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Search.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Security.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/Security.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/Security.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/System/Security.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Security.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/Security.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Security.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Test.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/Test.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/Test.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/System/Test.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Test.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/Test.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Test.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/TriggerOperation.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/TriggerOperation.cls
new file mode 100644
index 000000000..79f1a2a58
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/TriggerOperation.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `System.TriggerOperation` instead of just `TriggerOperation`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class TriggerOperation {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/TriggerOperation.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/TriggerOperation.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/TriggerOperation.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/Type.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/Type.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/Type.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/System/Type.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/Type.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/Type.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/Type.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/UUID.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/UUID.cls
new file mode 100644
index 000000000..274b123cd
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/UUID.cls
@@ -0,0 +1,10 @@
+//------------------------------------------------------------------------------------------------//
+// This file is part of the Nebula Logger project, released under the MIT License.                //
+// See LICENSE file or go to https://github.com/jongpie/NebulaLogger for full license details.    //
+//------------------------------------------------------------------------------------------------//
+
+// This class intentionally does nothing - it's here to ensure that any references
+// in Nebula Logger's codebase use `System.UUID` instead of just `UUID`
+@SuppressWarnings('PMD.ApexDoc, PMD.EmptyStatementBlock')
+public without sharing class UUID {
+}
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/UUID.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/UUID.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/UUID.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/UserInfo.cls b/nebula-logger/extra-tests/classes/name-shadowing/System/UserInfo.cls
similarity index 100%
rename from nebula-logger/extra-tests/classes/name-shadowing/UserInfo.cls
rename to nebula-logger/extra-tests/classes/name-shadowing/System/UserInfo.cls
diff --git a/nebula-logger/extra-tests/classes/name-shadowing/System/UserInfo.cls-meta.xml b/nebula-logger/extra-tests/classes/name-shadowing/System/UserInfo.cls-meta.xml
new file mode 100644
index 000000000..df13efa80
--- /dev/null
+++ b/nebula-logger/extra-tests/classes/name-shadowing/System/UserInfo.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>60.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/nebula-logger/extra-tests/tests/LogBatchPurger_Tests_Database.cls b/nebula-logger/extra-tests/tests/LogBatchPurger_Tests_Database.cls
index e6c3409f3..2fff94aaf 100644
--- a/nebula-logger/extra-tests/tests/LogBatchPurger_Tests_Database.cls
+++ b/nebula-logger/extra-tests/tests/LogBatchPurger_Tests_Database.cls
@@ -49,7 +49,7 @@ private class LogBatchPurger_Tests_Database {
 
             try {
                 System.Test.startTest();
-                Database.executeBatch(new LogBatchPurger());
+                System.Database.executeBatch(new LogBatchPurger());
                 System.Test.stopTest();
             } catch (NoAccessException ex) {
                 System.Assert.areEqual(LogBatchPurger.NO_DELETE_ACCESS_EXCEPTION_MESSAGE, ex.getMessage());
diff --git a/nebula-logger/extra-tests/tests/LogBatchPurger_Tests_Flow.cls b/nebula-logger/extra-tests/tests/LogBatchPurger_Tests_Flow.cls
index c1af9624c..9ea294d8f 100644
--- a/nebula-logger/extra-tests/tests/LogBatchPurger_Tests_Flow.cls
+++ b/nebula-logger/extra-tests/tests/LogBatchPurger_Tests_Flow.cls
@@ -88,7 +88,7 @@ private class LogBatchPurger_Tests_Flow {
         LoggerPlugin__mdt returnedPluginConfiguration = (LoggerPlugin__mdt) flowStartPlugin.getVariableValue('pluginConfiguration');
         System.Assert.areEqual(mockPluginConfiguration, returnedPluginConfiguration, 'LoggerPlugin__mdt records should match');
         LoggerBatchableContext returnedPluginInput = (LoggerBatchableContext) flowStartPlugin.getVariableValue('pluginInput');
-        System.Assert.areEqual(JSON.serialize(expectedInput), JSON.serialize(returnedPluginInput), 'Plugin inputs should match');
+        System.Assert.areEqual(System.JSON.serialize(expectedInput), System.JSON.serialize(returnedPluginInput), 'Plugin inputs should match');
         System.Assert.areEqual(
             MOCK_FLOW_OUTPUT_VARIABLE_VALUE,
             flowStartPlugin.getVariableValue(MOCK_FLOW_OUTPUT_VARIABLE_NAME),
@@ -138,7 +138,7 @@ private class LogBatchPurger_Tests_Flow {
         LoggerPlugin__mdt returnedPluginConfiguration = (LoggerPlugin__mdt) flowExecutePlugin.getVariableValue('pluginConfiguration');
         System.Assert.areEqual(mockPluginConfiguration, returnedPluginConfiguration, 'LoggerPlugin__mdt records should match');
         LoggerBatchableContext returnedPluginInput = (LoggerBatchableContext) flowExecutePlugin.getVariableValue('pluginInput');
-        System.Assert.areEqual(JSON.serialize(expectedInput), JSON.serialize(returnedPluginInput), 'Plugin inputs should match');
+        System.Assert.areEqual(System.JSON.serialize(expectedInput), System.JSON.serialize(returnedPluginInput), 'Plugin inputs should match');
         System.Assert.areEqual(
             MOCK_FLOW_OUTPUT_VARIABLE_VALUE,
             flowExecutePlugin.getVariableValue(MOCK_FLOW_OUTPUT_VARIABLE_NAME),
@@ -189,7 +189,7 @@ private class LogBatchPurger_Tests_Flow {
     //     LoggerPlugin__mdt returnedPluginConfiguration = (LoggerPlugin__mdt) flowFinishPlugin.getVariableValue('pluginConfiguration');
     //     System.Assert.areEqual(mockPluginConfiguration, returnedPluginConfiguration, 'LoggerPlugin__mdt records should match');
     //     LoggerBatchableContext returnedPluginInput = (LoggerBatchableContext) flowFinishPlugin.getVariableValue('pluginInput');
-    //     System.Assert.areEqual(JSON.serialize(expectedInput), JSON.serialize(returnedPluginInput), 'Plugin inputs should match');
+    //     System.Assert.areEqual(System.JSON.serialize(expectedInput), System.JSON.serialize(returnedPluginInput), 'Plugin inputs should match');
     //     System.Assert.areEqual(
     //         MOCK_FLOW_OUTPUT_VARIABLE_VALUE,
     //         flowFinishPlugin.getVariableValue(MOCK_FLOW_OUTPUT_VARIABLE_NAME),
diff --git a/nebula-logger/extra-tests/tests/LogEntryEventBuilder_Tests_Network.cls b/nebula-logger/extra-tests/tests/LogEntryEventBuilder_Tests_Network.cls
index 86fef9d64..82087a989 100644
--- a/nebula-logger/extra-tests/tests/LogEntryEventBuilder_Tests_Network.cls
+++ b/nebula-logger/extra-tests/tests/LogEntryEventBuilder_Tests_Network.cls
@@ -62,7 +62,7 @@ private class LogEntryEventBuilder_Tests_Network {
     }
 
     static SObject getExperienceCloudNetwork() {
-        return Database.query('SELECT Id, Name, UrlPathPrefix FROM Network WHERE Name = :EXPERIENCE_CLOUD_NETWORK_NAME');
+        return System.Database.query('SELECT Id, Name, UrlPathPrefix FROM Network WHERE Name = :EXPERIENCE_CLOUD_NETWORK_NAME');
     }
 
     static LoggerSettings__c getUserSettings() {
@@ -72,7 +72,7 @@ private class LogEntryEventBuilder_Tests_Network {
     }
 
     static Schema.User setupExperienceSiteUser() {
-        UserRole userRole = new UserRole(DeveloperName = 'LoggerTestRole', Name = 'Logger Test Role');
+        Schema.UserRole userRole = new Schema.UserRole(DeveloperName = 'LoggerTestRole', Name = 'Logger Test Role');
         insert userRole;
         Schema.User currentUser = new Schema.User(Id = System.UserInfo.getUserId(), UserRoleId = userRole.Id);
         update currentUser;
diff --git a/nebula-logger/extra-tests/tests/LogEntryEventBuilder_Tests_Security.cls b/nebula-logger/extra-tests/tests/LogEntryEventBuilder_Tests_Security.cls
index 7baaffd03..dee6662fc 100644
--- a/nebula-logger/extra-tests/tests/LogEntryEventBuilder_Tests_Security.cls
+++ b/nebula-logger/extra-tests/tests/LogEntryEventBuilder_Tests_Security.cls
@@ -37,12 +37,12 @@ private class LogEntryEventBuilder_Tests_Security {
         }
 
         System.Assert.areNotEqual(
-            JSON.serializePretty(mockAccountBrand),
+            System.JSON.serializePretty(mockAccountBrand),
             builder.getLogEntryEvent().RecordJson__c,
             'Log entry event record JSON was incorrect.'
         );
         System.Assert.areEqual(
-            JSON.serializePretty(strippedAccountBrand),
+            System.JSON.serializePretty(strippedAccountBrand),
             builder.getLogEntryEvent().RecordJson__c,
             'Log entry event record JSON was incorrect.'
         );
@@ -83,8 +83,8 @@ private class LogEntryEventBuilder_Tests_Security {
             builder = new LogEntryEventBuilder(userSettings, System.LoggingLevel.INFO, true).setRecord(mockAccountBrands);
         }
 
-        System.Assert.areNotEqual(JSON.serializePretty(mockAccountBrands), builder.getLogEntryEvent().RecordJson__c, 'Record JSON is incorrect.');
-        System.Assert.areEqual(JSON.serializePretty(strippedAccountBrands), builder.getLogEntryEvent().RecordJson__c, 'Record JSON is incorrect.');
+        System.Assert.areNotEqual(System.JSON.serializePretty(mockAccountBrands), builder.getLogEntryEvent().RecordJson__c, 'Record JSON is incorrect.');
+        System.Assert.areEqual(System.JSON.serializePretty(strippedAccountBrands), builder.getLogEntryEvent().RecordJson__c, 'Record JSON is incorrect.');
     }
 
     @IsTest
@@ -129,7 +129,11 @@ private class LogEntryEventBuilder_Tests_Security {
             builder = new LogEntryEventBuilder(userSettings, System.LoggingLevel.INFO, true).setRecord(mockIdToAccountBrand);
         }
 
-        System.Assert.areEqual(JSON.serializePretty(mockIdStringToStrippedAccountBrand), builder.getLogEntryEvent().RecordJson__c, 'Record JSON is incorrect.');
+        System.Assert.areEqual(
+            System.JSON.serializePretty(mockIdStringToStrippedAccountBrand),
+            builder.getLogEntryEvent().RecordJson__c,
+            'Record JSON is incorrect.'
+        );
     }
 
     static LoggerSettings__c getUserSettings() {
diff --git a/nebula-logger/extra-tests/tests/LogEntryHandler_Tests_Flow.cls b/nebula-logger/extra-tests/tests/LogEntryHandler_Tests_Flow.cls
index c4c6da2e7..d822bc5a2 100644
--- a/nebula-logger/extra-tests/tests/LogEntryHandler_Tests_Flow.cls
+++ b/nebula-logger/extra-tests/tests/LogEntryHandler_Tests_Flow.cls
@@ -50,8 +50,8 @@ private class LogEntryHandler_Tests_Flow {
 
     @IsTest
     static void it_should_set_flow_details_when_origin_location_is_a_flow() {
-        FlowDefinitionView flowDefinitionView = getFlowDefinitionView();
-        FlowVersionView flowVersion = getFlowVersion(flowDefinitionView.ActiveVersionId);
+        Schema.FlowDefinitionView flowDefinitionView = getFlowDefinitionView();
+        Schema.FlowVersionView flowVersion = getFlowVersion(flowDefinitionView.ActiveVersionId);
         Log__c log = new Log__c(TransactionId__c = '1234');
         insert log;
         LoggerTestConfigurator.setupMockSObjectHandlerConfigurations();
@@ -89,23 +89,23 @@ private class LogEntryHandler_Tests_Flow {
         System.Assert.areEqual(flowDefinitionView.LastModifiedDate, logEntry.OriginSourceLastModifiedDate__c);
         System.Assert.isNull(
             logEntry.OriginSourceCreatedById__c,
-            'Neither FlowDefinitionView nor FlowVersionView seem to be have "created by/date" fields, so always expect null 😥'
+            'Neither Schema.FlowDefinitionView nor Schema.FlowVersionView seem to be have "created by/date" fields, so always expect null 😥'
         );
         System.Assert.isNull(
             logEntry.OriginSourceCreatedByUsername__c,
-            'Neither FlowDefinitionView nor FlowVersionView seem to be have "created by/date" fields, so always expect null 😥'
+            'Neither Schema.FlowDefinitionView nor Schema.FlowVersionView seem to be have "created by/date" fields, so always expect null 😥'
         );
         System.Assert.isNull(
             logEntry.OriginSourceCreatedDate__c,
-            'Neither FlowDefinitionView nor FlowVersionView seem to be have "created by/date" fields, so always expect null 😥'
+            'Neither Schema.FlowDefinitionView nor Schema.FlowVersionView seem to be have "created by/date" fields, so always expect null 😥'
         );
         System.Assert.isNull(
             logEntry.OriginSourceLastModifiedById__c,
-            'Neither FlowDefinitionView nor FlowVersionView seem to be have "last modified by" fields (only the person\'s name is stored?!), so always expect null 😥'
+            'Neither Schema.FlowDefinitionView nor Schema.FlowVersionView seem to be have "last modified by" fields (only the person\'s name is stored?!), so always expect null 😥'
         );
         System.Assert.isNull(
             logEntry.OriginSourceLastModifiedByUsername__c,
-            'Neither FlowDefinitionView nor FlowVersionView seem to be have "last modified by" fields (only the person\'s name is stored?!), so always expect null 😥'
+            'Neither Schema.FlowDefinitionView nor FlowVersionView seem to be have "last modified by" fields (only the person\'s name is stored?!), so always expect null 😥'
         );
         System.Assert.isNull(logEntry.OriginSourceSnippet__c, 'There\'s currently not a way to generate a snippet for a Flow, so always expect null 😥');
     }
@@ -147,7 +147,7 @@ private class LogEntryHandler_Tests_Flow {
         ];
     }
 
-    private static FlowDefinitionView getFlowDefinitionView() {
+    private static Schema.FlowDefinitionView getFlowDefinitionView() {
         return [
             SELECT
                 ActiveVersionId,
@@ -168,7 +168,7 @@ private class LogEntryHandler_Tests_Flow {
         ];
     }
 
-    private static FlowVersionView getFlowVersion(Id flowActiveVersionId) {
+    private static Schema.FlowVersionView getFlowVersion(Id flowActiveVersionId) {
         return [SELECT ApiVersionRuntime, FlowDefinitionViewId, RunInMode, Status, VersionNumber FROM FlowVersionView WHERE DurableId = :flowActiveVersionId];
     }
 }
diff --git a/nebula-logger/extra-tests/tests/LogEntryMetadataViwrCtlr_Tests_Security.cls b/nebula-logger/extra-tests/tests/LogEntryMetadataViwrCtlr_Tests_Security.cls
index 895e398a1..bc45890c8 100644
--- a/nebula-logger/extra-tests/tests/LogEntryMetadataViwrCtlr_Tests_Security.cls
+++ b/nebula-logger/extra-tests/tests/LogEntryMetadataViwrCtlr_Tests_Security.cls
@@ -21,14 +21,17 @@ private class LogEntryMetadataViwrCtlr_Tests_Security {
     static void it_should_return_queried_exception_metadata_when_custom_permission_is_assigned() {
         Schema.User minimumAccessUser = LoggerMockDataCreator.createUser(MINIMUM_ACCESS_PROFILE.Id);
         insert minimumAccessUser;
-        PermissionSet permissionSet = new PermissionSet(Name = 'CustomPermissionEnabled', Label = 'Custom Permisison Enabled');
+        Schema.PermissionSet permissionSet = new Schema.PermissionSet(Name = 'CustomPermissionEnabled', Label = 'Custom Permisison Enabled');
         insert permissionSet;
         SetupEntityAccess setupEntityAccess = new SetupEntityAccess(
             ParentId = permissionSet.Id,
             SetupEntityId = [SELECT Id FROM CustomPermission WHERE DeveloperName = :CAN_VIEW_LOG_ENTRY_METADATA_PERMISSION_NAME]
             .Id
         );
-        PermissionSetAssignment permissionSetAssignment = new PermissionSetAssignment(AssigneeId = minimumAccessUser.Id, PermissionSetId = permissionSet.Id);
+        Schema.PermissionSetAssignment permissionSetAssignment = new Schema.PermissionSetAssignment(
+            AssigneeId = minimumAccessUser.Id,
+            PermissionSetId = permissionSet.Id
+        );
         insert new List<SObject>{ setupEntityAccess, permissionSetAssignment };
         String sourceMetadata = 'Exception';
         Schema.ApexClass mockApexClass = new Schema.ApexClass(Body = 'hello, world', Name = 'SomeApexClassName');
@@ -54,14 +57,17 @@ private class LogEntryMetadataViwrCtlr_Tests_Security {
     static void it_should_return_queried_origin_metadata_when_custom_permission_is_assigned() {
         Schema.User minimumAccessUser = LoggerMockDataCreator.createUser(MINIMUM_ACCESS_PROFILE.Id);
         insert minimumAccessUser;
-        PermissionSet permissionSet = new PermissionSet(Name = 'CustomPermissionEnabled', Label = 'Custom Permisison Enabled');
+        Schema.PermissionSet permissionSet = new Schema.PermissionSet(Name = 'CustomPermissionEnabled', Label = 'Custom Permisison Enabled');
         insert permissionSet;
         SetupEntityAccess setupEntityAccess = new SetupEntityAccess(
             ParentId = permissionSet.Id,
             SetupEntityId = [SELECT Id FROM CustomPermission WHERE DeveloperName = :CAN_VIEW_LOG_ENTRY_METADATA_PERMISSION_NAME]
             .Id
         );
-        PermissionSetAssignment permissionSetAssignment = new PermissionSetAssignment(AssigneeId = minimumAccessUser.Id, PermissionSetId = permissionSet.Id);
+        Schema.PermissionSetAssignment permissionSetAssignment = new Schema.PermissionSetAssignment(
+            AssigneeId = minimumAccessUser.Id,
+            PermissionSetId = permissionSet.Id
+        );
         insert new List<SObject>{ setupEntityAccess, permissionSetAssignment };
         String sourceMetadata = 'Origin';
         Schema.ApexClass mockApexClass = new Schema.ApexClass(Body = 'hello, world', Name = 'SomeApexClassName');
diff --git a/nebula-logger/extra-tests/tests/LogManagementDataSelector_Tests_Flow.cls b/nebula-logger/extra-tests/tests/LogManagementDataSelector_Tests_Flow.cls
index 7a7be5d0c..de1bac8b7 100644
--- a/nebula-logger/extra-tests/tests/LogManagementDataSelector_Tests_Flow.cls
+++ b/nebula-logger/extra-tests/tests/LogManagementDataSelector_Tests_Flow.cls
@@ -11,13 +11,13 @@ private class LogManagementDataSelector_Tests_Flow {
     @IsTest
     static void it_returns_matching_flow_definition_view_for_specified_flow_api_name() {
         List<String> targetFlowApiNames = new List<String>{ TEST_FLOW_NAME };
-        List<FlowDefinitionView> expectedResults = [
+        List<Schema.FlowDefinitionView> expectedResults = [
             SELECT ActiveVersionId, ApiName, Description, DurableId, Label, LastModifiedBy, LastModifiedDate, ManageableState, ProcessType, TriggerType
             FROM FlowDefinitionView
             WHERE ApiName IN :targetFlowApiNames AND IsActive = TRUE
         ];
 
-        List<FlowDefinitionView> returnedResults = LogManagementDataSelector.getInstance().getFlowDefinitionViewsByFlowApiName(targetFlowApiNames);
+        List<Schema.FlowDefinitionView> returnedResults = LogManagementDataSelector.getInstance().getFlowDefinitionViewsByFlowApiName(targetFlowApiNames);
 
         System.Assert.areEqual(expectedResults, returnedResults);
     }
@@ -29,7 +29,7 @@ private class LogManagementDataSelector_Tests_Flow {
         System.Assert.isFalse(LoggerParameter.QUERY_FLOW_DEFINITION_VIEW_DATA);
         Integer originalQueryCount = System.Limits.getQueries();
 
-        List<FlowDefinitionView> returnedResults = LogManagementDataSelector.getInstance().getFlowDefinitionViewsByFlowApiName(targetFlowApiNames);
+        List<Schema.FlowDefinitionView> returnedResults = LogManagementDataSelector.getInstance().getFlowDefinitionViewsByFlowApiName(targetFlowApiNames);
 
         System.Assert.areEqual(originalQueryCount, System.Limits.getQueries());
         System.Assert.areEqual(0, returnedResults.size());
diff --git a/nebula-logger/extra-tests/tests/LoggerEngineDataSelector_Tests_Network.cls b/nebula-logger/extra-tests/tests/LoggerEngineDataSelector_Tests_Network.cls
index 3091a9672..cb83bce89 100644
--- a/nebula-logger/extra-tests/tests/LoggerEngineDataSelector_Tests_Network.cls
+++ b/nebula-logger/extra-tests/tests/LoggerEngineDataSelector_Tests_Network.cls
@@ -66,6 +66,6 @@ private class LoggerEngineDataSelector_Tests_Network {
     }
 
     static SObject getExperienceCloudNetwork() {
-        return Database.query('SELECT Id, Name, UrlPathPrefix FROM Network WHERE Name = :EXPERIENCE_CLOUD_NETWORK_NAME');
+        return System.Database.query('SELECT Id, Name, UrlPathPrefix FROM Network WHERE Name = :EXPERIENCE_CLOUD_NETWORK_NAME');
     }
 }
diff --git a/nebula-logger/extra-tests/tests/LoggerSObjectHandler_Tests_Flow.cls b/nebula-logger/extra-tests/tests/LoggerSObjectHandler_Tests_Flow.cls
index 92dd803b1..a94ae6070 100644
--- a/nebula-logger/extra-tests/tests/LoggerSObjectHandler_Tests_Flow.cls
+++ b/nebula-logger/extra-tests/tests/LoggerSObjectHandler_Tests_Flow.cls
@@ -20,7 +20,7 @@ private class LoggerSObjectHandler_Tests_Flow {
         );
         LoggerTestConfigurator.setMock(mockPluginConfiguration);
         MockLogHandler mockHandler = new MockLogHandler();
-        mockHandler.triggerOperationType = TriggerOperation.BEFORE_INSERT;
+        mockHandler.triggerOperationType = System.TriggerOperation.BEFORE_INSERT;
         mockHandler.triggerNew = new List<Log__c>{ new Log__c(TransactionId__c = '1234') };
         mockHandler.triggerNewMap = null;
         mockHandler.triggerOldMap = null;
diff --git a/nebula-logger/extra-tests/tests/LoggerSettingsController_Tests_Security.cls b/nebula-logger/extra-tests/tests/LoggerSettingsController_Tests_Security.cls
index 20ee87c0f..26f70f3ba 100644
--- a/nebula-logger/extra-tests/tests/LoggerSettingsController_Tests_Security.cls
+++ b/nebula-logger/extra-tests/tests/LoggerSettingsController_Tests_Security.cls
@@ -13,20 +13,23 @@ private class LoggerSettingsController_Tests_Security {
     static void it_should_permit_user_to_modify_logger_settings_when_custom_permission_is_assigned() {
         Schema.User standardUser = LoggerMockDataCreator.createUser(STANDARD_USER_PROFILE.Id);
         insert standardUser;
-        PermissionSet permissionSet = new PermissionSet(Name = 'CustomPermissionEnabled', Label = 'Custom Permisison Enabled');
+        Schema.PermissionSet permissionSet = new Schema.PermissionSet(Name = 'CustomPermissionEnabled', Label = 'Custom Permisison Enabled');
         insert permissionSet;
         SetupEntityAccess setupEntityAccess = new SetupEntityAccess(
             ParentId = permissionSet.Id,
             SetupEntityId = [SELECT Id FROM CustomPermission WHERE DeveloperName = :CAN_MODIFY_LOGGER_SETTINGS_PERMISSION_NAME]
             .Id
         );
-        PermissionSetAssignment permissionSetAssignment = new PermissionSetAssignment(AssigneeId = standardUser.Id, PermissionSetId = permissionSet.Id);
+        Schema.PermissionSetAssignment permissionSetAssignment = new Schema.PermissionSetAssignment(
+            AssigneeId = standardUser.Id,
+            PermissionSetId = permissionSet.Id
+        );
         insert new List<SObject>{ setupEntityAccess, permissionSetAssignment };
 
         System.runAs(standardUser) {
             System.Assert.isTrue(
                 System.FeatureManagement.checkPermission(CAN_MODIFY_LOGGER_SETTINGS_PERMISSION_NAME),
-                JSON.serializePretty(permissionSetAssignment)
+                System.JSON.serializePretty(permissionSetAssignment)
             );
             System.Assert.isTrue(LoggerSettingsController.canUserModifyLoggerSettings());
         }
diff --git a/nebula-logger/extra-tests/tests/Logger_Tests_InboundEmailHandler.cls b/nebula-logger/extra-tests/tests/Logger_Tests_InboundEmailHandler.cls
index 66740f82a..8ea0bc67b 100644
--- a/nebula-logger/extra-tests/tests/Logger_Tests_InboundEmailHandler.cls
+++ b/nebula-logger/extra-tests/tests/Logger_Tests_InboundEmailHandler.cls
@@ -28,7 +28,7 @@ private class Logger_Tests_InboundEmailHandler {
         System.Assert.areEqual(1, logs.size(), 'Logs size did not match expected value of 1.');
         System.Assert.areEqual(transactionId, logs.get(0).TransactionId__c, 'Transaction Id does match expected value');
         List<LogEntry__c> logEntries = [SELECT Id, Message__c FROM LogEntry__c];
-        System.Assert.areEqual(2, logEntries.size(), 'Log entries size did not match expected value of 2 ' + JSON.serializePretty(logEntries));
+        System.Assert.areEqual(2, logEntries.size(), 'Log entries size did not match expected value of 2 ' + System.JSON.serializePretty(logEntries));
         System.Assert.areEqual(ExampleInboundEmailHandler.logEntryMessage, logEntries.get(0).Message__c, 'Log entries message did not match expected value');
     }
 }
diff --git a/nebula-logger/extra-tests/tests/Logger_Tests_MergeResult.cls b/nebula-logger/extra-tests/tests/Logger_Tests_MergeResult.cls
index d2be05d78..2e14c9245 100644
--- a/nebula-logger/extra-tests/tests/Logger_Tests_MergeResult.cls
+++ b/nebula-logger/extra-tests/tests/Logger_Tests_MergeResult.cls
@@ -40,7 +40,7 @@ private class Logger_Tests_MergeResult {
         System.Assert.areEqual(mergeResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c, 'Log entry event record id was incorrect.');
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c, 'Log entry record JSON was incorrect.');
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResult),
+            System.JSON.serializePretty(mergeResult),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry database result JSON was incorrect.'
         );
@@ -77,7 +77,7 @@ private class Logger_Tests_MergeResult {
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c, 'Log entry event record id was incorrect.');
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c, 'Log entry record JSON was incorrect.');
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResults),
+            System.JSON.serializePretty(mergeResults),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry database result JSON was incorrect.'
         );
@@ -114,7 +114,7 @@ private class Logger_Tests_MergeResult {
             'Log entry event database result collection type was incorrect.'
         );
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResult),
+            System.JSON.serializePretty(mergeResult),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -151,7 +151,7 @@ private class Logger_Tests_MergeResult {
             'Log entry event database result collection type was incorrect.'
         );
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResults),
+            System.JSON.serializePretty(mergeResults),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -183,7 +183,7 @@ private class Logger_Tests_MergeResult {
         System.Assert.areEqual(mergeResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c, 'Log entry event record id was incorrect.');
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c, 'Log entry event record JSON was incorrect.');
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResult),
+            System.JSON.serializePretty(mergeResult),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -220,7 +220,7 @@ private class Logger_Tests_MergeResult {
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c, 'Log entry event record id was incorrect.');
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c, 'Log entry event record JSON was incorrect.');
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResults),
+            System.JSON.serializePretty(mergeResults),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -257,7 +257,7 @@ private class Logger_Tests_MergeResult {
             'Log entry event database result collection type was incorrect.'
         );
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResult),
+            System.JSON.serializePretty(mergeResult),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -294,7 +294,7 @@ private class Logger_Tests_MergeResult {
             'Log entry event databse result collection type was incorrect.'
         );
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResults),
+            System.JSON.serializePretty(mergeResults),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result json was incorrect.'
         );
@@ -326,7 +326,7 @@ private class Logger_Tests_MergeResult {
         System.Assert.areEqual(mergeResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c, 'Log entry event record id.');
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c, 'Log entry event record JSON was not null.');
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResult),
+            System.JSON.serializePretty(mergeResult),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -363,7 +363,7 @@ private class Logger_Tests_MergeResult {
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c, 'Log entry event record id was incorrect.');
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c, 'Log entry event record JSON was incorrect.');
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResults),
+            System.JSON.serializePretty(mergeResults),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -400,7 +400,7 @@ private class Logger_Tests_MergeResult {
             'Log entry event database result collection type was incorrect.'
         );
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResult),
+            System.JSON.serializePretty(mergeResult),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -437,7 +437,7 @@ private class Logger_Tests_MergeResult {
             'Log entry event database result collection type was incorrect.'
         );
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResults),
+            System.JSON.serializePretty(mergeResults),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -469,7 +469,7 @@ private class Logger_Tests_MergeResult {
         System.Assert.areEqual(mergeResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c, 'Log entry event record id was incorrect.');
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c, 'Log entry event record JSON was incorrect.');
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResult),
+            System.JSON.serializePretty(mergeResult),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -506,7 +506,7 @@ private class Logger_Tests_MergeResult {
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c, 'Log entry event record id was incorrect.');
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c, 'Log entry event record JSON was incorrect.');
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResults),
+            System.JSON.serializePretty(mergeResults),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -543,7 +543,7 @@ private class Logger_Tests_MergeResult {
             'Log entry event database result collection type was incorrect.'
         );
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResult),
+            System.JSON.serializePretty(mergeResult),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -580,7 +580,7 @@ private class Logger_Tests_MergeResult {
             'Log entry event database result collection type was incorrect.'
         );
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResults),
+            System.JSON.serializePretty(mergeResults),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -612,7 +612,7 @@ private class Logger_Tests_MergeResult {
         System.Assert.areEqual(mergeResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c, 'Log entry event record id was incorrect.');
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c, 'Log entry event record JSON was incorrect.');
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResult),
+            System.JSON.serializePretty(mergeResult),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -649,7 +649,7 @@ private class Logger_Tests_MergeResult {
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c, 'Log entry event record id was incorrect.');
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c, 'Log entry event record JSON was incorrect.');
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResults),
+            System.JSON.serializePretty(mergeResults),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -686,7 +686,7 @@ private class Logger_Tests_MergeResult {
             'Log entry event database result collection type was incorrect.'
         );
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResult),
+            System.JSON.serializePretty(mergeResult),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -723,7 +723,7 @@ private class Logger_Tests_MergeResult {
             'Log entry event database result collection type was incorrect.'
         );
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResults),
+            System.JSON.serializePretty(mergeResults),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -755,7 +755,7 @@ private class Logger_Tests_MergeResult {
         System.Assert.areEqual(mergeResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c, 'Log entry event record id was incorrect.');
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c, 'Log entry event record JSON was incorrect.');
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResult),
+            System.JSON.serializePretty(mergeResult),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -792,7 +792,7 @@ private class Logger_Tests_MergeResult {
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c, 'Log entry event record id was incorrect.');
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c, 'Log entry event record JSON was incorrect.');
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResults),
+            System.JSON.serializePretty(mergeResults),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -829,7 +829,7 @@ private class Logger_Tests_MergeResult {
             'Log entry event database result collection type was incorrect.'
         );
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResult),
+            System.JSON.serializePretty(mergeResult),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -866,7 +866,7 @@ private class Logger_Tests_MergeResult {
             'Log entry event database result collection type was incorrect.'
         );
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResults),
+            System.JSON.serializePretty(mergeResults),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -898,7 +898,7 @@ private class Logger_Tests_MergeResult {
         System.Assert.areEqual(mergeResult.getId(), entryBuilder.getLogEntryEvent().RecordId__c, 'Log entry event record id was incorrect.');
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c, 'Log entry event record JSON was incorrect.');
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResult),
+            System.JSON.serializePretty(mergeResult),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -935,7 +935,7 @@ private class Logger_Tests_MergeResult {
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordId__c, 'Log entry event record id was incorrect.');
         System.Assert.isNull(entryBuilder.getLogEntryEvent().RecordJson__c, 'Log entry event record JSON was incorrect.');
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResults),
+            System.JSON.serializePretty(mergeResults),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -972,7 +972,7 @@ private class Logger_Tests_MergeResult {
             'Log entry event database result collection type was incorrect.'
         );
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResult),
+            System.JSON.serializePretty(mergeResult),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
@@ -1009,7 +1009,7 @@ private class Logger_Tests_MergeResult {
             'Log entry event database result collection type was incorrect.'
         );
         System.Assert.areEqual(
-            JSON.serializePretty(mergeResults),
+            System.JSON.serializePretty(mergeResults),
             entryBuilder.getLogEntryEvent().DatabaseResultJson__c,
             'Log entry event database result JSON was incorrect.'
         );
diff --git a/nebula-logger/managed-package/core/main/configuration/classes/LoggerInstallHandler.cls b/nebula-logger/managed-package/core/main/configuration/classes/LoggerInstallHandler.cls
index 56382dc45..0caedbc86 100644
--- a/nebula-logger/managed-package/core/main/configuration/classes/LoggerInstallHandler.cls
+++ b/nebula-logger/managed-package/core/main/configuration/classes/LoggerInstallHandler.cls
@@ -7,8 +7,8 @@
  * @group packaging
  * @description Automatically enables org default settings when installing the managed package
  */
-@SuppressWarnings('PMD.AvoidGlobalModifier')
-global without sharing class LoggerInstallHandler implements InstallHandler {
+@SuppressWarnings('PMD.AvoidGlobalModifier, PMD.ApexCRUDViolation')
+global without sharing class LoggerInstallHandler implements System.InstallHandler {
     @TestVisible
     private List<LoggerSettings__c> settingsWithouDefaultSaveMethod = [
         SELECT Id, DefaultSaveMethod__c
diff --git a/nebula-logger/plugins/async-failure-additions/plugin/classes/LogBatchApexErrorEventHandler.cls b/nebula-logger/plugins/async-failure-additions/plugin/classes/LogBatchApexErrorEventHandler.cls
index 4fd27b73f..8eb8d017a 100644
--- a/nebula-logger/plugins/async-failure-additions/plugin/classes/LogBatchApexErrorEventHandler.cls
+++ b/nebula-logger/plugins/async-failure-additions/plugin/classes/LogBatchApexErrorEventHandler.cls
@@ -4,7 +4,7 @@
 //------------------------------------------------------------------------------------------------//
 /**
  * @group Plugins
- * @description `BatchApexErrorEvent` handler to log unexpected batch errors for classes that implement `Database.RaisesPlatformEvents` and opt into processing via `LoggerParameter__mdt`
+ * @description `Schema.BatchApexErrorEvent` handler to log unexpected batch errors for classes that implement `Database.RaisesPlatformEvents` and opt into processing via `LoggerParameter__mdt`
  * @see LoggerSObjectHandler
  */
 public without sharing class LogBatchApexErrorEventHandler extends LoggerSObjectHandler {
@@ -12,7 +12,7 @@ public without sharing class LogBatchApexErrorEventHandler extends LoggerSObject
     public static final String LOG_MESSAGE = 'An unexpected job error occurred: {0} with exception type: {1} and message: {2} during batch phase: {3}.\nStacktrace: {4}';
     private static Boolean shouldSaveLogs = false;
 
-    private List<BatchApexErrorEvent> batchApexErrorEvents;
+    private List<Schema.BatchApexErrorEvent> batchApexErrorEvents;
 
     /**
      * @description Opts into the default constructor
@@ -26,19 +26,21 @@ public without sharing class LogBatchApexErrorEventHandler extends LoggerSObject
     }
 
     protected override void executeAfterInsert(List<SObject> triggerNew) {
-        this.batchApexErrorEvents = (List<BatchApexErrorEvent>) triggerNew;
+        this.batchApexErrorEvents = (List<Schema.BatchApexErrorEvent>) triggerNew;
         this.handleJobErrors();
     }
 
     private void handleJobErrors() {
         Set<Id> asyncApexJobIds = new Set<Id>();
-        for (BatchApexErrorEvent evt : this.batchApexErrorEvents) {
+        for (Schema.BatchApexErrorEvent evt : this.batchApexErrorEvents) {
             asyncApexJobIds.add(evt.AsyncApexJobId);
         }
 
-        Map<Id, AsyncApexJob> jobIdToClass = new Map<Id, AsyncApexJob>([SELECT Id, ApexClass.Name FROM AsyncApexJob WHERE Id IN :asyncApexJobIds]);
+        Map<Id, Schema.AsyncApexJob> jobIdToClass = new Map<Id, Schema.AsyncApexJob>(
+            [SELECT Id, ApexClass.Name FROM AsyncApexJob WHERE Id IN :asyncApexJobIds]
+        );
         Logger.error('Batch job terminated unexpectedly');
-        for (BatchApexErrorEvent errorEvent : this.batchApexErrorEvents) {
+        for (Schema.BatchApexErrorEvent errorEvent : this.batchApexErrorEvents) {
             shouldSaveLogs = this.getShouldSaveLogs(jobIdToClass, errorEvent);
             LogMessage logMessage = new LogMessage(
                 LOG_MESSAGE,
@@ -51,9 +53,9 @@ public without sharing class LogBatchApexErrorEventHandler extends LoggerSObject
         }
     }
 
-    private Boolean getShouldSaveLogs(Map<Id, AsyncApexJob> jobIdToClass, BatchApexErrorEvent errorEvent) {
+    private Boolean getShouldSaveLogs(Map<Id, Schema.AsyncApexJob> jobIdToClass, Schema.BatchApexErrorEvent errorEvent) {
         if (shouldSaveLogs == false) {
-            AsyncApexJob job = jobIdToClass.get(errorEvent.AsyncApexJobId);
+            Schema.AsyncApexJob job = jobIdToClass.get(errorEvent.AsyncApexJobId);
             List<LoggerParameter__mdt> configurationList = LoggerParameter.matchOnPrefix(BATCH_ERROR_LOGGER);
             for (LoggerParameter__mdt config : configurationList) {
                 if (config.Value__c == job?.ApexClass.Name) {
diff --git a/nebula-logger/plugins/async-failure-additions/plugin/classes/LogBatchApexErrorEventHandler_Tests.cls b/nebula-logger/plugins/async-failure-additions/plugin/classes/LogBatchApexErrorEventHandler_Tests.cls
index 18ef5a0c2..fc8d2dac9 100644
--- a/nebula-logger/plugins/async-failure-additions/plugin/classes/LogBatchApexErrorEventHandler_Tests.cls
+++ b/nebula-logger/plugins/async-failure-additions/plugin/classes/LogBatchApexErrorEventHandler_Tests.cls
@@ -37,7 +37,7 @@ private class LogBatchApexErrorEventHandler_Tests implements Database.Batchable<
         LoggerParameter.setMock(mockParam);
         try {
             System.Test.startTest();
-            Database.executeBatch(new LogBatchApexErrorEventHandler_Tests(phase));
+            System.Database.executeBatch(new LogBatchApexErrorEventHandler_Tests(phase));
             System.Test.stopTest();
         } catch (System.Exception ex) {
             // via https://salesforce.stackexchange.com/questions/263419/testing-batchapexerrorevent-trigger
@@ -66,7 +66,7 @@ private class LogBatchApexErrorEventHandler_Tests implements Database.Batchable<
     }
 
     /**
-     * the `BatchApexErrorEvent` type has a property, `Phase` with three possible values:
+     * the `Schema.BatchApexErrorEvent` type has a property, `Phase` with three possible values:
      * - START
      * - EXECUTE
      * - FINISH
@@ -77,7 +77,7 @@ private class LogBatchApexErrorEventHandler_Tests implements Database.Batchable<
 
     public Database.QueryLocator start(Database.BatchableContext bc) {
         throwOnLocationMatch(Phase.START);
-        return Database.getQueryLocator([SELECT Id FROM User LIMIT 1]);
+        return System.Database.getQueryLocator([SELECT Id FROM User LIMIT 1]);
     }
 
     public void execute(Database.BatchableContext bc, List<SObject> scope) {
diff --git a/nebula-logger/plugins/async-failure-additions/plugin/classes/LogFinalizer.cls b/nebula-logger/plugins/async-failure-additions/plugin/classes/LogFinalizer.cls
index dd9cfc89e..2b017d153 100644
--- a/nebula-logger/plugins/async-failure-additions/plugin/classes/LogFinalizer.cls
+++ b/nebula-logger/plugins/async-failure-additions/plugin/classes/LogFinalizer.cls
@@ -8,7 +8,7 @@
  */
 public without sharing virtual class LogFinalizer implements System.Finalizer {
     /**
-     * @description Is called by any `System.Queueable` where the finalizer is attached after the Queueable's `execute` method finishes
+     * @description Is called by any `System.Queueable` where the finalizer is attached after the System.Queueable's `execute` method finishes
      * @param finalizerContext The `System.FinalizerContext` associated with the finalizer
      */
     public void execute(System.FinalizerContext finalizerContext) {
diff --git a/nebula-logger/plugins/async-failure-additions/plugin/classes/LogFlowExecutionErrorEventHandler.cls b/nebula-logger/plugins/async-failure-additions/plugin/classes/LogFlowExecutionErrorEventHandler.cls
index 84b6c3681..6d4d49523 100644
--- a/nebula-logger/plugins/async-failure-additions/plugin/classes/LogFlowExecutionErrorEventHandler.cls
+++ b/nebula-logger/plugins/async-failure-additions/plugin/classes/LogFlowExecutionErrorEventHandler.cls
@@ -14,15 +14,15 @@ public without sharing class LogFlowExecutionErrorEventHandler {
 
     /**
      * @description Invocable method called by platform event-triggered flow to add errors to logs
-     * @param flowErrorEvents The `List<FlowExecutionErrorEvent>` associated with the unhandled exception(s)
+     * @param flowErrorEvents The `List<Schema.FlowExecutionErrorEvent>` associated with the unhandled exception(s)
      */
     @InvocableMethod(category='Logging' description='Adds error handling for unhandled errors in Screen Flows')
-    public static void logErrors(List<FlowExecutionErrorEvent> flowErrorEvents) {
+    public static void logErrors(List<Schema.FlowExecutionErrorEvent> flowErrorEvents) {
         if (LoggerParameter.getBoolean(PARAMETER_DEV_NAME, false) == false) {
             return;
         }
         Map<String, List<LogEntryEventBuilder>> usernameToBuilders = new Map<String, List<LogEntryEventBuilder>>();
-        for (FlowExecutionErrorEvent flowExecutionErrorEvent : flowErrorEvents) {
+        for (Schema.FlowExecutionErrorEvent flowExecutionErrorEvent : flowErrorEvents) {
             FlowLogger.LogEntry flowLogEntry = new FlowLogger.LogEntry();
             flowLogEntry.faultMessage = flowExecutionErrorEvent.ErrorMessage;
             flowLogEntry.flowName = flowExecutionErrorEvent.FlowApiName;
diff --git a/nebula-logger/plugins/async-failure-additions/plugin/classes/LogFlowExecutionErrorEventHandler_Tests.cls b/nebula-logger/plugins/async-failure-additions/plugin/classes/LogFlowExecutionErrorEventHandler_Tests.cls
index e216c68c1..1f43ee310 100644
--- a/nebula-logger/plugins/async-failure-additions/plugin/classes/LogFlowExecutionErrorEventHandler_Tests.cls
+++ b/nebula-logger/plugins/async-failure-additions/plugin/classes/LogFlowExecutionErrorEventHandler_Tests.cls
@@ -10,7 +10,7 @@ private class LogFlowExecutionErrorEventHandler_Tests {
         setLoggerParamEnabled(false);
 
         System.Test.startTest();
-        LogFlowExecutionErrorEventHandler.logErrors(new List<FlowExecutionErrorEvent>{ new FlowExecutionErrorEvent() });
+        LogFlowExecutionErrorEventHandler.logErrors(new List<Schema.FlowExecutionErrorEvent>{ new Schema.FlowExecutionErrorEvent() });
         System.Test.stopTest();
 
         System.Assert.areEqual(0, [SELECT COUNT() FROM Log__c]);
@@ -19,7 +19,7 @@ private class LogFlowExecutionErrorEventHandler_Tests {
     @IsTest
     static void it_logs_when_enabled() {
         setLoggerParamEnabled(true);
-        FlowExecutionErrorEvent flowExecutionErrorEvent = new FlowExecutionErrorEvent();
+        Schema.FlowExecutionErrorEvent flowExecutionErrorEvent = new Schema.FlowExecutionErrorEvent();
         flowExecutionErrorEvent.EventDate = System.now().addSeconds(-5);
         flowExecutionErrorEvent.ElementApiName = 'test_exception_element';
         flowExecutionErrorEvent.FlowApiName = 'Testing_FlowExecutionErrorEvent';
@@ -28,7 +28,7 @@ private class LogFlowExecutionErrorEventHandler_Tests {
 
         System.runAs(new Schema.User(Id = [SELECT Id FROM User WHERE Alias = 'autoproc'].Id)) {
             System.Test.startTest();
-            LogFlowExecutionErrorEventHandler.logErrors(new List<FlowExecutionErrorEvent>{ flowExecutionErrorEvent });
+            LogFlowExecutionErrorEventHandler.logErrors(new List<Schema.FlowExecutionErrorEvent>{ flowExecutionErrorEvent });
             System.Test.stopTest();
         }
 
diff --git a/nebula-logger/plugins/big-object-archiving/plugin/classes/LogEntryArchiveController.cls b/nebula-logger/plugins/big-object-archiving/plugin/classes/LogEntryArchiveController.cls
index b086988d6..aa166447b 100644
--- a/nebula-logger/plugins/big-object-archiving/plugin/classes/LogEntryArchiveController.cls
+++ b/nebula-logger/plugins/big-object-archiving/plugin/classes/LogEntryArchiveController.cls
@@ -95,7 +95,7 @@ public with sharing class LogEntryArchiveController {
         Boolean matchesSearchTerm =
             String.isBlank(messageSearchTerm) ||
             messageValue.containsIgnoreCase(messageSearchTerm) ||
-            Pattern.matches(messageSearchTerm, messageValue);
+            System.Pattern.matches(messageSearchTerm, messageValue);
 
         return matchesLoggingLevelOrdinal && matchesSearchTerm;
     }
diff --git a/nebula-logger/plugins/big-object-archiving/plugin/classes/LogEntryArchivePlugin.cls b/nebula-logger/plugins/big-object-archiving/plugin/classes/LogEntryArchivePlugin.cls
index d5fc92a55..e73a221ca 100644
--- a/nebula-logger/plugins/big-object-archiving/plugin/classes/LogEntryArchivePlugin.cls
+++ b/nebula-logger/plugins/big-object-archiving/plugin/classes/LogEntryArchivePlugin.cls
@@ -88,7 +88,7 @@ public without sharing class LogEntryArchivePlugin implements LoggerPlugin.Batch
         Set<String> bigObjectSaveMethods = new Set<String>{ BIG_OBJECT_IMMEDIATE_LOGGER_SAVE_METHOD, BIG_OBJECT_QUEUEABLE_LOGGER_SAVE_METHOD };
 
         if (
-            input.triggerOperationType == TriggerOperation.BEFORE_INSERT &&
+            input.triggerOperationType == System.TriggerOperation.BEFORE_INSERT &&
             bigObjectSaveMethods.contains(Logger.getUserSettings().DefaultSaveMethod__c) == false
         ) {
             return;
@@ -147,7 +147,7 @@ public without sharing class LogEntryArchivePlugin implements LoggerPlugin.Batch
             logPurgeActionParentFieldName
         };
         String query = String.escapeSingleQuotes(String.format(queryTemplate, queryInputs));
-        return (List<LogEntry__c>) Database.query(query);
+        return (List<LogEntry__c>) System.Database.query(query);
     }
 
     private String getParentFieldPath(List<Schema.SObjectField> parentFieldChainPieces) {
@@ -168,14 +168,14 @@ public without sharing class LogEntryArchivePlugin implements LoggerPlugin.Batch
         // In a BEFORE_INSERT context, if one of the 2 Big Object save methods is used, then
         // all of the LogEntryEvent__e records should be saved in LogEntryArchive__b
         if (
-            input.triggerOperationType == TriggerOperation.BEFORE_INSERT &&
+            input.triggerOperationType == System.TriggerOperation.BEFORE_INSERT &&
             new Set<String>{ BIG_OBJECT_IMMEDIATE_LOGGER_SAVE_METHOD, BIG_OBJECT_QUEUEABLE_LOGGER_SAVE_METHOD }
                 .contains(Logger.getUserSettings().DefaultSaveMethod__c)
         ) {
             return (List<LogEntryEvent__e>) input.triggerNew;
         }
 
-        if (input.triggerOperationType != TriggerOperation.AFTER_INSERT) {
+        if (input.triggerOperationType != System.TriggerOperation.AFTER_INSERT) {
             return new List<LogEntryEvent__e>();
         }
 
@@ -209,9 +209,9 @@ public without sharing class LogEntryArchivePlugin implements LoggerPlugin.Batch
     }
 
     /**
-     * @description Inner class for publishing log entries via the Queueable interface.
+     * @description Inner class for publishing log entries via the System.Queueable interface.
      */
-    private class QueueableSaver implements Queueable {
+    private class QueueableSaver implements System.Queueable {
         private List<LogEntryArchive__b> logEntryArchives = new List<LogEntryArchive__b>();
 
         private QueueableSaver(List<LogEntryArchive__b> logEntryArchives) {
diff --git a/nebula-logger/plugins/big-object-archiving/plugin/classes/LogEntryArchivePlugin_Tests.cls b/nebula-logger/plugins/big-object-archiving/plugin/classes/LogEntryArchivePlugin_Tests.cls
index 7541ae035..5ae8e7279 100644
--- a/nebula-logger/plugins/big-object-archiving/plugin/classes/LogEntryArchivePlugin_Tests.cls
+++ b/nebula-logger/plugins/big-object-archiving/plugin/classes/LogEntryArchivePlugin_Tests.cls
@@ -36,7 +36,7 @@ private class LogEntryArchivePlugin_Tests {
         Log__c log = [SELECT Id, (SELECT Id FROM LogEntries__r) FROM Log__c WHERE LogPurgeAction__c = :LogEntryArchivePlugin.BIG_OBJECT_LOG_PURGE_ACTION];
         System.Test.startTest();
 
-        Database.executeBatch(batchPurger);
+        System.Database.executeBatch(batchPurger);
 
         System.Test.stopTest();
         System.Assert.areEqual(log.LogEntries__r.size(), LogEntryArchivePlugin.LOG_ENTRY_ARCHIVES_TO_SAVE.size());
@@ -68,7 +68,7 @@ private class LogEntryArchivePlugin_Tests {
         );
         System.Test.startTest();
 
-        Database.executeBatch(batchPurger);
+        System.Database.executeBatch(batchPurger);
 
         System.Test.stopTest();
         System.Assert.areEqual(
@@ -100,7 +100,7 @@ private class LogEntryArchivePlugin_Tests {
         insert logEntryTags;
         System.Test.startTest();
 
-        Database.executeBatch(batchPurger);
+        System.Database.executeBatch(batchPurger);
 
         System.Assert.areEqual(0, System.Limits.getPublishImmediateDml());
         System.Test.stopTest();
@@ -125,7 +125,7 @@ private class LogEntryArchivePlugin_Tests {
         LoggerPlugin__mdt pluginConfiguration = createPluginConfiguration();
         LoggerTriggerableContext pluginInput = new LoggerTriggerableContext(
             Schema.LogEntryEvent__e.SObjectType,
-            TriggerOperation.BEFORE_INSERT,
+            System.TriggerOperation.BEFORE_INSERT,
             new List<LogEntryEvent__e>{ mockEvent },
             null,
             null
diff --git a/nebula-logger/plugins/log-retention-rules/plugin/classes/LogRetentionFilter.cls b/nebula-logger/plugins/log-retention-rules/plugin/classes/LogRetentionFilter.cls
index d4aaa0a50..dfe3f4870 100644
--- a/nebula-logger/plugins/log-retention-rules/plugin/classes/LogRetentionFilter.cls
+++ b/nebula-logger/plugins/log-retention-rules/plugin/classes/LogRetentionFilter.cls
@@ -199,7 +199,7 @@ public without sharing class LogRetentionFilter {
         }
 
         private Boolean matchesRegEx() {
-            Pattern pattern = Pattern.compile(this.filterCondition.Value__c);
+            System.Pattern pattern = System.Pattern.compile(this.filterCondition.Value__c);
             return pattern.matcher(String.valueOf(this.getFieldValue())).matches();
         }
 
@@ -233,7 +233,7 @@ public without sharing class LogRetentionFilter {
                 return (Datetime) datetimeValue;
             } else {
                 String datetimeString = (String) datetimeValue;
-                return (Datetime) JSON.deserialize(datetimeString, Datetime.class);
+                return (Datetime) System.JSON.deserialize(datetimeString, Datetime.class);
             }
         }
 
@@ -244,7 +244,7 @@ public without sharing class LogRetentionFilter {
                 return (Decimal) decimalValue;
             } else {
                 String decimalString = (String) decimalValue;
-                return (Decimal) JSON.deserialize(decimalString, Decimal.class);
+                return (Decimal) System.JSON.deserialize(decimalString, Decimal.class);
             }
         }
 
@@ -413,7 +413,7 @@ public without sharing class LogRetentionFilter {
 
             for (Schema.SObjectField field : this.fieldChain) {
                 Schema.DescribeFieldResult fieldDescribe = field.getDescribe();
-                if (fieldDescribe.getSoapType() != Schema.SoapType.Id) {
+                if (fieldDescribe.getSoapType() != Schema.SoapType.ID) {
                     return parentRecord.get(fieldDescribe.getName());
                 } else {
                     parentSObjectType = fieldDescribe.getReferenceTo().get(0);
diff --git a/nebula-logger/plugins/log-retention-rules/plugin/classes/LogRetentionFilter_Tests.cls b/nebula-logger/plugins/log-retention-rules/plugin/classes/LogRetentionFilter_Tests.cls
index e3c91ed47..99b1f089f 100644
--- a/nebula-logger/plugins/log-retention-rules/plugin/classes/LogRetentionFilter_Tests.cls
+++ b/nebula-logger/plugins/log-retention-rules/plugin/classes/LogRetentionFilter_Tests.cls
@@ -464,7 +464,7 @@ private class LogRetentionFilter_Tests {
     }
 
     static LogRetentionRuleCondition__mdt createMockRuleCondition(String fieldPath, String operator, String valueType, Object value) {
-        String valueString = value instanceof String ? (String) value : JSON.serialize(value);
+        String valueString = value instanceof String ? (String) value : System.JSON.serialize(value);
         return new LogRetentionRuleCondition__mdt(
             FieldPath__c = fieldPath,
             Operator__c = operator,
diff --git a/nebula-logger/plugins/log-retention-rules/plugin/classes/LogRetentionRulesPlugin.cls b/nebula-logger/plugins/log-retention-rules/plugin/classes/LogRetentionRulesPlugin.cls
index c2a56cf22..c0375c03a 100644
--- a/nebula-logger/plugins/log-retention-rules/plugin/classes/LogRetentionRulesPlugin.cls
+++ b/nebula-logger/plugins/log-retention-rules/plugin/classes/LogRetentionRulesPlugin.cls
@@ -54,7 +54,7 @@ public without sharing class LogRetentionRulesPlugin implements LoggerPlugin.Tri
             Schema.LogEntry__c.Id.getDescribe().getName()
         };
         String logEntryQuery = String.escapeSingleQuotes(String.format(queryTemplate, queryInputs));
-        return (List<LogEntry__c>) Database.query(logEntryQuery);
+        return (List<LogEntry__c>) System.Database.query(logEntryQuery);
     }
 
     private void setLogRetentionDate(List<LogEntry__c> logEntries) {
diff --git a/nebula-logger/plugins/log-retention-rules/plugin/classes/LogRetentionRulesPlugin_Tests.cls b/nebula-logger/plugins/log-retention-rules/plugin/classes/LogRetentionRulesPlugin_Tests.cls
index baf41a8af..c497f0e9d 100644
--- a/nebula-logger/plugins/log-retention-rules/plugin/classes/LogRetentionRulesPlugin_Tests.cls
+++ b/nebula-logger/plugins/log-retention-rules/plugin/classes/LogRetentionRulesPlugin_Tests.cls
@@ -116,7 +116,7 @@ private class LogRetentionRulesPlugin_Tests {
         insert logEntry;
 
         log = [SELECT Id, LogRetentionDate__c, Scenario__c, TotalERRORLogEntries__c FROM Log__c WHERE Id = :log.Id];
-        System.Assert.areEqual(expectedLogRetentionDate, log.LogRetentionDate__c, JSON.serializePretty(log));
+        System.Assert.areEqual(expectedLogRetentionDate, log.LogRetentionDate__c, System.JSON.serializePretty(log));
     }
 
     @IsTest
@@ -144,7 +144,7 @@ private class LogRetentionRulesPlugin_Tests {
         insert logEntry;
 
         log = [SELECT Id, LogRetentionDate__c, Scenario__c, TotalERRORLogEntries__c FROM Log__c WHERE Id = :log.Id];
-        System.Assert.areEqual(expectedLogRetentionDate, log.LogRetentionDate__c, JSON.serializePretty(log));
+        System.Assert.areEqual(expectedLogRetentionDate, log.LogRetentionDate__c, System.JSON.serializePretty(log));
     }
 
     @IsTest
@@ -175,7 +175,7 @@ private class LogRetentionRulesPlugin_Tests {
         insert logEntry;
 
         log = [SELECT Id, LogRetentionDate__c, Scenario__c, TotalERRORLogEntries__c FROM Log__c WHERE Id = :log.Id];
-        System.Assert.areEqual(expectedLogRetentionDate, log.LogRetentionDate__c, JSON.serializePretty(log));
+        System.Assert.areEqual(expectedLogRetentionDate, log.LogRetentionDate__c, System.JSON.serializePretty(log));
     }
 
     static void enablePlugin() {
@@ -199,7 +199,7 @@ private class LogRetentionRulesPlugin_Tests {
     }
 
     static LogRetentionRuleCondition__mdt createMockRuleCondition(String fieldPath, String operator, String valueType, Object value) {
-        String valueString = value instanceof String ? (String) value : JSON.serialize(value);
+        String valueString = value instanceof String ? (String) value : System.JSON.serialize(value);
         return new LogRetentionRuleCondition__mdt(
             FieldPath__c = fieldPath,
             Operator__c = operator,
diff --git a/nebula-logger/plugins/slack/plugin/slack/classes/SlackLoggerPlugin.cls b/nebula-logger/plugins/slack/plugin/slack/classes/SlackLoggerPlugin.cls
index 8d019aef4..fecb08ac6 100644
--- a/nebula-logger/plugins/slack/plugin/slack/classes/SlackLoggerPlugin.cls
+++ b/nebula-logger/plugins/slack/plugin/slack/classes/SlackLoggerPlugin.cls
@@ -7,8 +7,8 @@
  * @group Plugins
  * @description Optional plugin that integrates with Slack to send alerts for important logs
  */
-@SuppressWarnings('PMD.CyclomaticComplexity, PMD.ExcessivePublicCount')
-public without sharing class SlackLoggerPlugin implements LoggerPlugin.Triggerable, Queueable, Database.AllowsCallouts {
+@SuppressWarnings('PMD.ApexCRUDViolation, PMD.CyclomaticComplexity, PMD.ExcessivePublicCount')
+public without sharing class SlackLoggerPlugin implements LoggerPlugin.Triggerable, System.Queueable, Database.AllowsCallouts {
     @TestVisible
     private static final String ENDPOINT = LoggerParameter.getString('SlackEndpoint', null);
     @TestVisible
@@ -69,7 +69,7 @@ public without sharing class SlackLoggerPlugin implements LoggerPlugin.Triggerab
     }
 
     /**
-     * @description Handles the queuable execute logic. Required by the Queueable interface.
+     * @description Handles the queuable execute logic. Required by the System.Queueable interface.
      * @param queueableContext Context of the current queuable instance.
      */
     public void execute(System.QueueableContext queueableContext) {
@@ -97,7 +97,7 @@ public without sharing class SlackLoggerPlugin implements LoggerPlugin.Triggerab
             notification.text = NOTIFICATION_TITLE;
             notification.attachments = new List<LogDto>{ this.convertLog(log) };
             // 'Short' is a reserved word in Apex, but used in Slack's API, so the conversion happens in JSON
-            String notificationJson = JSON.serialize(notification).replace('"isShort"', '"short"');
+            String notificationJson = System.JSON.serialize(notification).replace('"isShort"', '"short"');
             request.setBody(notificationJson);
             if (LoggerParameter.ENABLE_SYSTEM_MESSAGES) {
                 Logger.finest('Sending log entries to Slack endpoint').setHttpRequestDetails(request);
@@ -180,7 +180,7 @@ public without sharing class SlackLoggerPlugin implements LoggerPlugin.Triggerab
             '\nAND MaxLogEntryLoggingLevelOrdinal__c >= :loggingLevelOrdinal' +
             '\nAND SendSlackNotification__c = TRUE' +
             '\nAND SlackNotificationDate__c = NULL';
-        this.logs = (List<Log__c>) Database.query(query);
+        this.logs = (List<Log__c>) System.Database.query(query);
     }
 
     private System.HttpRequest createSlackHttpRequest() {
diff --git a/nebula-logger/plugins/slack/plugin/slack/classes/SlackLoggerPlugin_Tests.cls b/nebula-logger/plugins/slack/plugin/slack/classes/SlackLoggerPlugin_Tests.cls
index f95867961..c08689000 100644
--- a/nebula-logger/plugins/slack/plugin/slack/classes/SlackLoggerPlugin_Tests.cls
+++ b/nebula-logger/plugins/slack/plugin/slack/classes/SlackLoggerPlugin_Tests.cls
@@ -15,7 +15,7 @@ private class SlackLoggerPlugin_Tests {
         List<Log__c> logs = insertLogAndLogEntry(logEntryLoggingLevel, false);
         Log__c log = logs.get(0);
         System.Assert.isFalse(log.SendSlackNotification__c);
-        LoggerTriggerableContext context = mockContext(TriggerOperation.BEFORE_INSERT, logs);
+        LoggerTriggerableContext context = mockContext(System.TriggerOperation.BEFORE_INSERT, logs);
 
         SlackLoggerPlugin plugin = new SlackLoggerPlugin();
         plugin.execute(pluginConfiguration, context);
@@ -33,7 +33,7 @@ private class SlackLoggerPlugin_Tests {
         List<Log__c> logs = insertLogAndLogEntry(logEntryLoggingLevel, false);
         Log__c log = logs.get(0);
         System.Assert.isFalse(log.SendSlackNotification__c);
-        LoggerTriggerableContext context = mockContext(TriggerOperation.BEFORE_INSERT, logs);
+        LoggerTriggerableContext context = mockContext(System.TriggerOperation.BEFORE_INSERT, logs);
 
         SlackLoggerPlugin plugin = new SlackLoggerPlugin();
         plugin.execute(pluginConfiguration, context);
@@ -50,7 +50,7 @@ private class SlackLoggerPlugin_Tests {
         System.Assert.isTrue(logEntryLoggingLevel.ordinal() < slackNotificationLoggingLevel.ordinal(), 'Slack logging level ordinal was incorrect');
         LoggerPlugin__mdt pluginConfiguration = mockConfigurations(slackNotificationLoggingLevel);
         List<Log__c> logs = insertLogAndLogEntry(logEntryLoggingLevel, false);
-        LoggerTriggerableContext context = mockContext(TriggerOperation.AFTER_UPDATE, logs);
+        LoggerTriggerableContext context = mockContext(System.TriggerOperation.AFTER_UPDATE, logs);
         LoggerMockDataCreator.MockHttpCallout calloutMock = LoggerMockDataCreator.createHttpCallout().setStatusCode(200);
         System.Test.setMock(System.HttpCalloutMock.class, calloutMock);
 
@@ -71,7 +71,7 @@ private class SlackLoggerPlugin_Tests {
         System.LoggingLevel logEntryLoggingLevel = System.LoggingLevel.ERROR;
         LoggerPlugin__mdt pluginConfiguration = mockConfigurations(logEntryLoggingLevel);
         List<Log__c> logs = insertLogAndLogEntry(logEntryLoggingLevel, true);
-        LoggerTriggerableContext context = mockContext(TriggerOperation.AFTER_UPDATE, logs);
+        LoggerTriggerableContext context = mockContext(System.TriggerOperation.AFTER_UPDATE, logs);
         LoggerMockDataCreator.MockHttpCallout calloutMock = LoggerMockDataCreator.createHttpCallout().setStatusCode(200);
         System.Test.setMock(System.HttpCalloutMock.class, calloutMock);
 
@@ -89,7 +89,7 @@ private class SlackLoggerPlugin_Tests {
         System.LoggingLevel logEntryLoggingLevel = System.LoggingLevel.WARN;
         LoggerPlugin__mdt pluginConfiguration = mockConfigurations(logEntryLoggingLevel);
         List<Log__c> logs = insertLogAndLogEntry(logEntryLoggingLevel, true);
-        LoggerTriggerableContext context = mockContext(TriggerOperation.AFTER_UPDATE, logs);
+        LoggerTriggerableContext context = mockContext(System.TriggerOperation.AFTER_UPDATE, logs);
         LoggerMockDataCreator.MockHttpCallout calloutMock = LoggerMockDataCreator.createHttpCallout().setStatusCode(200);
         System.Test.setMock(System.HttpCalloutMock.class, calloutMock);
 
@@ -107,7 +107,7 @@ private class SlackLoggerPlugin_Tests {
         System.LoggingLevel logEntryLoggingLevel = System.LoggingLevel.INFO;
         LoggerPlugin__mdt pluginConfiguration = mockConfigurations(logEntryLoggingLevel);
         List<Log__c> logs = insertLogAndLogEntry(logEntryLoggingLevel, true);
-        LoggerTriggerableContext context = mockContext(TriggerOperation.AFTER_UPDATE, logs);
+        LoggerTriggerableContext context = mockContext(System.TriggerOperation.AFTER_UPDATE, logs);
         LoggerMockDataCreator.MockHttpCallout calloutMock = LoggerMockDataCreator.createHttpCallout().setStatusCode(200);
         System.Test.setMock(System.HttpCalloutMock.class, calloutMock);
 
@@ -125,7 +125,7 @@ private class SlackLoggerPlugin_Tests {
         System.LoggingLevel logEntryLoggingLevel = System.LoggingLevel.DEBUG;
         LoggerPlugin__mdt pluginConfiguration = mockConfigurations(logEntryLoggingLevel);
         List<Log__c> logs = insertLogAndLogEntry(logEntryLoggingLevel, true);
-        LoggerTriggerableContext context = mockContext(TriggerOperation.AFTER_UPDATE, logs);
+        LoggerTriggerableContext context = mockContext(System.TriggerOperation.AFTER_UPDATE, logs);
         LoggerMockDataCreator.MockHttpCallout calloutMock = LoggerMockDataCreator.createHttpCallout().setStatusCode(200);
         System.Test.setMock(System.HttpCalloutMock.class, calloutMock);
 
@@ -143,7 +143,7 @@ private class SlackLoggerPlugin_Tests {
         System.LoggingLevel logEntryLoggingLevel = System.LoggingLevel.FINE;
         LoggerPlugin__mdt pluginConfiguration = mockConfigurations(logEntryLoggingLevel);
         List<Log__c> logs = insertLogAndLogEntry(logEntryLoggingLevel, true);
-        LoggerTriggerableContext context = mockContext(TriggerOperation.AFTER_UPDATE, logs);
+        LoggerTriggerableContext context = mockContext(System.TriggerOperation.AFTER_UPDATE, logs);
         LoggerMockDataCreator.MockHttpCallout calloutMock = LoggerMockDataCreator.createHttpCallout().setStatusCode(200);
         System.Test.setMock(System.HttpCalloutMock.class, calloutMock);
 
@@ -161,7 +161,7 @@ private class SlackLoggerPlugin_Tests {
         System.LoggingLevel logEntryLoggingLevel = System.LoggingLevel.FINER;
         LoggerPlugin__mdt pluginConfiguration = mockConfigurations(logEntryLoggingLevel);
         List<Log__c> logs = insertLogAndLogEntry(logEntryLoggingLevel, true);
-        LoggerTriggerableContext context = mockContext(TriggerOperation.AFTER_UPDATE, logs);
+        LoggerTriggerableContext context = mockContext(System.TriggerOperation.AFTER_UPDATE, logs);
         LoggerMockDataCreator.MockHttpCallout calloutMock = LoggerMockDataCreator.createHttpCallout().setStatusCode(200);
         System.Test.setMock(System.HttpCalloutMock.class, calloutMock);
 
@@ -179,7 +179,7 @@ private class SlackLoggerPlugin_Tests {
         System.LoggingLevel logEntryLoggingLevel = System.LoggingLevel.FINEST;
         LoggerPlugin__mdt pluginConfiguration = mockConfigurations(logEntryLoggingLevel);
         List<Log__c> logs = insertLogAndLogEntry(logEntryLoggingLevel, true);
-        LoggerTriggerableContext context = mockContext(TriggerOperation.AFTER_UPDATE, logs);
+        LoggerTriggerableContext context = mockContext(System.TriggerOperation.AFTER_UPDATE, logs);
         LoggerMockDataCreator.MockHttpCallout calloutMock = LoggerMockDataCreator.createHttpCallout().setStatusCode(200);
         System.Test.setMock(System.HttpCalloutMock.class, calloutMock);
 
@@ -210,7 +210,7 @@ private class SlackLoggerPlugin_Tests {
         return pluginConfiguration;
     }
 
-    private static LoggerTriggerableContext mockContext(TriggerOperation operationType, List<Log__c> logs) {
+    private static LoggerTriggerableContext mockContext(System.TriggerOperation operationType, List<Log__c> logs) {
         return new LoggerTriggerableContext(Schema.Log__c.SObjectType, operationType, logs, new Map<Id, SObject>(logs), new Map<Id, SObject>(logs));
     }
 
@@ -233,7 +233,7 @@ private class SlackLoggerPlugin_Tests {
     private static SlackLoggerPlugin.NotificationDto validateSlackNotification(LoggerMockDataCreator.MockHttpCallout calloutMock, Log__c log) {
         // 'Short' is a reserved word in Apex, but used in Slack's API, so the conversion happens in JSON
         String requestBody = calloutMock.request.getBody().replace('"short"', '"isShort"');
-        SlackLoggerPlugin.NotificationDto slackNotification = (SlackLoggerPlugin.NotificationDto) JSON.deserialize(
+        SlackLoggerPlugin.NotificationDto slackNotification = (SlackLoggerPlugin.NotificationDto) System.JSON.deserialize(
             requestBody,
             SlackLoggerPlugin.NotificationDto.class
         );
@@ -299,6 +299,6 @@ private class SlackLoggerPlugin_Tests {
         fieldNames.add(logEntryChildQuery);
 
         String query = 'SELECT ' + String.join(fieldNames, ', ') + ' FROM Log__c';
-        return (List<Log__c>) Database.query(query);
+        return (List<Log__c>) System.Database.query(query);
     }
 }
diff --git a/nebula-logger/recipes/classes/Account_Batch_Logger_Example.cls b/nebula-logger/recipes/classes/Account_Batch_Logger_Example.cls
index aecc3189c..8e2db1b2c 100644
--- a/nebula-logger/recipes/classes/Account_Batch_Logger_Example.cls
+++ b/nebula-logger/recipes/classes/Account_Batch_Logger_Example.cls
@@ -20,7 +20,7 @@ public with sharing class Account_Batch_Logger_Example implements Database.Batch
         Logger.saveLog();
 
         // Just as an example, query 100 accounts
-        return Database.getQueryLocator([SELECT Id, Name, OwnerId, Owner.Name, Type FROM Account LIMIT 100]);
+        return System.Database.getQueryLocator([SELECT Id, Name, OwnerId, Owner.Name, Type FROM Account LIMIT 100]);
     }
 
     /**
diff --git a/nebula-logger/recipes/classes/Account_Queueable_Logger_Example.cls b/nebula-logger/recipes/classes/Account_Queueable_Logger_Example.cls
index 922eeb2e1..72723236b 100644
--- a/nebula-logger/recipes/classes/Account_Queueable_Logger_Example.cls
+++ b/nebula-logger/recipes/classes/Account_Queueable_Logger_Example.cls
@@ -7,7 +7,7 @@
  * @description An example queueable job that will run several chained instances
  * Each instance uses the parentLogTransactionId to relate its log back to the original instance's log
  */
-public with sharing class Account_Queueable_Logger_Example implements Queueable {
+public with sharing class Account_Queueable_Logger_Example implements System.Queueable {
     private Integer numberOfJobsToChain;
     private String parentLogTransactionId;
 
diff --git a/nebula-logger/recipes/classes/ExampleClassWithComplexLogging.cls b/nebula-logger/recipes/classes/ExampleClassWithComplexLogging.cls
index 1c07a600c..772d7e351 100644
--- a/nebula-logger/recipes/classes/ExampleClassWithComplexLogging.cls
+++ b/nebula-logger/recipes/classes/ExampleClassWithComplexLogging.cls
@@ -65,7 +65,7 @@ public with sharing class ExampleClassWithComplexLogging {
             .setRestRequestDetails(serviceRequest)
             .setRestResponseDetails(serviceResponse)
             .setRecord(users)
-            .setDatabaseResult(Database.update(users, false))
+            .setDatabaseResult(System.Database.update(users, false))
             .setExceptionDetails(new System.IllegalArgumentException('derp'));
 
         Logger.saveLog();
diff --git a/package.json b/package.json
index d4a4a731a..68d32db56 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "nebula-logger",
-    "version": "4.13.12",
+    "version": "4.13.13",
     "description": "The most robust logger for Salesforce. Works with Apex, Lightning Components, Flow, Process Builder & Integrations. Designed for Salesforce admins, developers & architects.",
     "author": "Jonathan Gillespie",
     "license": "MIT",
diff --git a/sfdx-project.json b/sfdx-project.json
index 5706163e2..6c2251d3e 100644
--- a/sfdx-project.json
+++ b/sfdx-project.json
@@ -14,9 +14,9 @@
             "path": "./nebula-logger/core",
             "definitionFile": "./config/scratch-orgs/base-scratch-def.json",
             "scopeProfiles": true,
-            "versionNumber": "4.13.12.NEXT",
-            "versionName": "Added Refresh Button on relatedLogEntries LWC",
-            "versionDescription": "Added refresh button & lightning-spinner on relatedLogEntries LWC",
+            "versionNumber": "4.13.13.NEXT",
+            "versionName": "Improved Fully-Qualified References",
+            "versionDescription": "Switched to using fully-qualified references to all standard classes in the Schema & System namespaces",
             "releaseNotesUrl": "https://github.com/jongpie/NebulaLogger/releases",
             "unpackagedMetadata": {
                 "path": "./nebula-logger/extra-tests"
@@ -180,6 +180,7 @@
         "Nebula Logger - Core@4.13.10-authsession-bugfix-for-lwc-logging": "04t5Y0000027L04QAE",
         "Nebula Logger - Core@4.13.11-track-user-federation-identifier": "04t5Y0000027L98QAE",
         "Nebula Logger - Core@4.13.12-added-refresh-button-on-relatedlogentries-lwc": "04t5Y0000015oCkQAI",
+        "Nebula Logger - Core@4.13.13-improved-fully-qualified-references": "04t5Y0000015oDsQAI",
         "Nebula Logger - Core Plugin - Async Failure Additions": "0Ho5Y000000blO4SAI",
         "Nebula Logger - Core Plugin - Async Failure Additions@1.0.0": "04t5Y0000015lhiQAA",
         "Nebula Logger - Core Plugin - Async Failure Additions@1.0.1": "04t5Y0000015lhsQAA",