diff --git a/src/EllieBot/Modules/Xp/Xp.cs b/src/EllieBot/Modules/Xp/Xp.cs
index 76619c1..e961d87 100644
--- a/src/EllieBot/Modules/Xp/Xp.cs
+++ b/src/EllieBot/Modules/Xp/Xp.cs
@@ -445,7 +445,7 @@ public partial class Xp : EllieModule<XpService>
                   if (!string.IsNullOrWhiteSpace(item.Desc))
                       eb.AddField(GetText(strs.desc), item.Desc);
 
-#if GLOBAL_NADEKO
+#if GLOBAL_ELLIE
                   if (key == "default")
                       eb.WithDescription(GetText(strs.xpshop_website));
 #endif
diff --git a/src/EllieBot/Modules/Xp/XpService.cs b/src/EllieBot/Modules/Xp/XpService.cs
index 80dc5d9..98ae74f 100644
--- a/src/EllieBot/Modules/Xp/XpService.cs
+++ b/src/EllieBot/Modules/Xp/XpService.cs
@@ -112,7 +112,7 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
 
         _excludedServers = new(allGuildConfigs.Where(x => x.XpSettings.ServerExcluded).Select(x => x.GuildId));
 
-#if !GLOBAL_NADEKO
+#if !GLOBAL_ELLIE
         _client.UserVoiceStateUpdated += Client_OnUserVoiceStateUpdated;
 
         // Scan guilds on startup.
@@ -1249,7 +1249,7 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
             if (template.Club.Icon.Show)
                 await DrawClubImage(img, stats);
 
-// #if GLOBAL_NADEKO
+// #if GLOBAL_ELLIE
             await DrawFrame(img, stats.User.UserId);
 // #endif
 
@@ -1281,7 +1281,7 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
         return await _images.GetXpBackgroundImageAsync();
     }
 
-    // #if GLOBAL_NADEKO
+    // #if GLOBAL_ELLIE
     private async Task DrawFrame(Image<Rgba32> img, ulong userId)
     {
         var patron = await _ps.GetPatronAsync(userId);
diff --git a/src/EllieBot/_common/DownloadTracker.cs b/src/EllieBot/_common/DownloadTracker.cs
index 07a5670..b886228 100644
--- a/src/EllieBot/_common/DownloadTracker.cs
+++ b/src/EllieBot/_common/DownloadTracker.cs
@@ -13,7 +13,7 @@ public class DownloadTracker : IEService
     /// <returns>Task representing download state</returns>
     public async Task EnsureUsersDownloadedAsync(IGuild guild)
     {
-#if GLOBAL_NADEKO
+#if GLOBAL_ELLIE
         return;
 #endif
         await _downloadUsersSemaphore.WaitAsync();
diff --git a/src/EllieBot/_common/Interaction/Models/EllieInteractionExtensions.cs b/src/EllieBot/_common/Interaction/Models/EllieInteractionExtensions.cs
index fa3b0e0..cf54f9e 100644
--- a/src/EllieBot/_common/Interaction/Models/EllieInteractionExtensions.cs
+++ b/src/EllieBot/_common/Interaction/Models/EllieInteractionExtensions.cs
@@ -3,12 +3,12 @@
 public static class EllieInteractionExtensions
 {
     public static MessageComponent CreateComponent(
-        this EllieInteractionBase nadekoInteractionBase
+        this EllieInteractionBase ellieInteractionBase
     )
     {
         var cb = new ComponentBuilder();
 
-        nadekoInteractionBase.AddTo(cb);
+        ellieInteractionBase.AddTo(cb);
 
         return cb.Build();
     }
diff --git a/src/EllieBot/_common/ServiceCollectionExtensions.cs b/src/EllieBot/_common/ServiceCollectionExtensions.cs
index 92a204d..c5539af 100644
--- a/src/EllieBot/_common/ServiceCollectionExtensions.cs
+++ b/src/EllieBot/_common/ServiceCollectionExtensions.cs
@@ -118,7 +118,7 @@ public static class ServiceCollectionExtensions
         
         foreach (var svc in a.GetTypes()
                            .Where(type => type.IsClass && types.Any(t => type.IsAssignableTo(t)) && !type.HasAttribute<DIIgnoreAttribute>()
-#if GLOBAL_NADEKO
+#if GLOBAL_ELLIE
                             && !type.HasAttribute<NoPublicBotAttribute>()
 #endif
                            ))
diff --git a/src/EllieBot/_common/Services/CommandHandler.cs b/src/EllieBot/_common/Services/CommandHandler.cs
index 4a4e3cd..b9b0721 100644
--- a/src/EllieBot/_common/Services/CommandHandler.cs
+++ b/src/EllieBot/_common/Services/CommandHandler.cs
@@ -229,7 +229,7 @@ public class CommandHandler : IEService, IReadyExecutor, ICommandHandler
         {
             try
             {
-#if !GLOBAL_NADEKO
+#if !GLOBAL_ELLIE
                 // track how many messages each user is sending
                 UserMessagesSent.AddOrUpdate(usrMsg.Author.Id, 1, (_, old) => ++old);
 #endif