diff --git a/src/Bannerlord.BUTR.Shared/Extensions/DictionaryExtensions.cs b/src/Bannerlord.BUTR.Shared/Extensions/DictionaryExtensions.cs
index aa4055e..23419d9 100644
--- a/src/Bannerlord.BUTR.Shared/Extensions/DictionaryExtensions.cs
+++ b/src/Bannerlord.BUTR.Shared/Extensions/DictionaryExtensions.cs
@@ -49,7 +49,7 @@ namespace Bannerlord.BUTR.Shared.Extensions
     using global::System.Collections.Generic;
 
 #if !BANNERLORDBUTRSHARED_INCLUDE_IN_CODE_COVERAGE
-    [ExcludeFromCodeCoverage, DebuggerNonUserCode]
+    [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage, global::System.Diagnostics.CodeAnalysis.DebuggerNonUserCode]
 #endif
     internal static class DictionaryExtensions
     {
diff --git a/src/Bannerlord.BUTR.Shared/Extensions/MBSubModuleBaseExtensions.cs b/src/Bannerlord.BUTR.Shared/Extensions/MBSubModuleBaseExtensions.cs
index cf63217..626179f 100644
--- a/src/Bannerlord.BUTR.Shared/Extensions/MBSubModuleBaseExtensions.cs
+++ b/src/Bannerlord.BUTR.Shared/Extensions/MBSubModuleBaseExtensions.cs
@@ -1,4 +1,4 @@
-#if USE_LOGGER
+#if BANNERLORDBUTRSHARED_USE_LOGGER
 // <auto-generated>
 //   This code file has automatically been added by the "Bannerlord.BUTR.Shared" NuGet package (https://www.nuget.org/packages/Bannerlord.BUTR.Shared).
 //   Please see https://github.com/BUTR/Bannerlord.BUTR.Shared for more information.
@@ -55,7 +55,7 @@ namespace Bannerlord.BUTR.Shared.Extensions
     using global::TaleWorlds.MountAndBlade;
 
 #if !BANNERLORDBUTRSHARED_INCLUDE_IN_CODE_COVERAGE
-    [ExcludeFromCodeCoverage, DebuggerNonUserCode]
+    [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage, global::System.Diagnostics.CodeAnalysis.DebuggerNonUserCode]
 #endif
     internal static class MBSubModuleBaseExtensions
     {
@@ -75,4 +75,4 @@ public static ILogger GetLogger<T>(this MBSubModuleBase subModule)
 #endif
 #nullable restore
 #endif // BANNERLORDBUTRSHARED_DISABLE
-#endif // USE_LOGGER
\ No newline at end of file
+#endif // BANNERLORDBUTRSHARED_USE_LOGGER
\ No newline at end of file
diff --git a/src/Bannerlord.BUTR.Shared/Helpers/ApplicationVersionHelper.cs b/src/Bannerlord.BUTR.Shared/Helpers/ApplicationVersionHelper.cs
index 4b30706..a595fd1 100644
--- a/src/Bannerlord.BUTR.Shared/Helpers/ApplicationVersionHelper.cs
+++ b/src/Bannerlord.BUTR.Shared/Helpers/ApplicationVersionHelper.cs
@@ -50,7 +50,7 @@ namespace Bannerlord.BUTR.Shared.Helpers
     using global::TaleWorlds.Library;
 
 #if !BANNERLORDBUTRSHARED_INCLUDE_IN_CODE_COVERAGE
-    [ExcludeFromCodeCoverage, DebuggerNonUserCode]
+    [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage, global::System.Diagnostics.CodeAnalysis.DebuggerNonUserCode]
 #endif
     internal static class ApplicationVersionHelper
     {
diff --git a/src/Bannerlord.BUTR.Shared/Helpers/DecoratorModelHelper.cs b/src/Bannerlord.BUTR.Shared/Helpers/DecoratorModelHelper.cs
index 660e736..a67d84f 100644
--- a/src/Bannerlord.BUTR.Shared/Helpers/DecoratorModelHelper.cs
+++ b/src/Bannerlord.BUTR.Shared/Helpers/DecoratorModelHelper.cs
@@ -45,7 +45,7 @@
 
 namespace Bannerlord.BUTR.Shared.Helpers
 {
-#if USE_LOGGER
+#if BANNERLORDBUTRSHARED_USE_LOGGER
     using global::Microsoft.Extensions.Logging;
 #endif
 
@@ -57,11 +57,11 @@ namespace Bannerlord.BUTR.Shared.Helpers
     using global::TaleWorlds.Core;
 
 #if !BANNERLORDBUTRSHARED_INCLUDE_IN_CODE_COVERAGE
-    [ExcludeFromCodeCoverage, DebuggerNonUserCode]
+    [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage, global::System.Diagnostics.CodeAnalysis.DebuggerNonUserCode]
 #endif
     internal static class DecoratorModelHelper
     {
-#if USE_LOGGER
+#if BANNERLORDBUTRSHARED_USE_LOGGER
         public static void AddDecoratorModel<TBase, TNew, TDef>(IGameStarter gameStarterObject, CampaignGameStarter gameStarter, Func<TBase, TNew> decoratorModelCtor, ILogger logger)
 #else
         public static void AddDecoratorModel<TBase, TNew, TDef>(IGameStarter gameStarterObject, CampaignGameStarter gameStarter, Func<TBase, TNew> decoratorModelCtor)
@@ -73,7 +73,7 @@ public static void AddDecoratorModel<TBase, TNew, TDef>(IGameStarter gameStarter
             var currentModel = GetGameModel<TBase>(gameStarterObject);
             if (currentModel is null)
             {
-#if USE_LOGGER
+#if BANNERLORDBUTRSHARED_USE_LOGGER
                 logger.LogWarning($"No default model of type \"{typeof(TBase).FullName}\" was found!");
 #else
                 Trace.TraceWarning($"No default model of type \"{typeof(TBase).FullName}\" was found!");
diff --git a/src/Bannerlord.BUTR.Shared/Helpers/ModuleInfoExtendedHelper.cs b/src/Bannerlord.BUTR.Shared/Helpers/ModuleInfoExtendedHelper.cs
index 4c71e37..94b308c 100644
--- a/src/Bannerlord.BUTR.Shared/Helpers/ModuleInfoExtendedHelper.cs
+++ b/src/Bannerlord.BUTR.Shared/Helpers/ModuleInfoExtendedHelper.cs
@@ -50,7 +50,7 @@ namespace Bannerlord.BUTR.Shared.Helpers
     using global::System.Diagnostics.CodeAnalysis;
 
 #if !BANNERLORDBUTRSHARED_INCLUDE_IN_CODE_COVERAGE
-    [ExcludeFromCodeCoverage, DebuggerNonUserCode]
+    [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage, global::System.Diagnostics.CodeAnalysis.DebuggerNonUserCode]
 #endif
     internal record ModuleInfoExtendedHelper : ModuleInfoExtended
     {
diff --git a/src/Bannerlord.BUTR.Shared/Helpers/ModuleInfoHelper.cs b/src/Bannerlord.BUTR.Shared/Helpers/ModuleInfoHelper.cs
index 28e8ea8..3bf6dfb 100644
--- a/src/Bannerlord.BUTR.Shared/Helpers/ModuleInfoHelper.cs
+++ b/src/Bannerlord.BUTR.Shared/Helpers/ModuleInfoHelper.cs
@@ -70,7 +70,7 @@ namespace Bannerlord.BUTR.Shared.Helpers
     using Module = TaleWorlds.MountAndBlade.Module;
 
 #if !BANNERLORDBUTRSHARED_INCLUDE_IN_CODE_COVERAGE
-    [ExcludeFromCodeCoverage, DebuggerNonUserCode]
+    [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage, global::System.Diagnostics.CodeAnalysis.DebuggerNonUserCode]
 #endif
     internal static class ModuleInfoHelper
     {