diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BloodMagicGuideAPIPlugin.java
similarity index 97%
rename from src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java
rename to src/main/java/WayofTime/bloodmagic/compat/guideapi/BloodMagicGuideAPIPlugin.java
index 39319de7..b21f5281 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BloodMagicGuideAPIPlugin.java
@@ -24,7 +24,7 @@ import javax.annotation.Nullable;
 import java.awt.Color;
 
 @GuideBook(priority = EventPriority.HIGHEST)
-public class GuideBloodMagic implements IGuideBook {
+public class BloodMagicGuideAPIPlugin implements IGuideBook {
 
     public static final Book GUIDE_BOOK = new Book();
 
diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java
similarity index 99%
rename from src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java
rename to src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java
index ab7ed560..e5d2b153 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java
@@ -33,7 +33,7 @@ import javax.annotation.Nonnull;
 import java.util.Map;
 
 @JEIPlugin
-public class BloodMagicPlugin implements IModPlugin {
+public class BloodMagicJEIPlugin implements IModPlugin {
     public static IJeiHelpers jeiHelper;
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java
index 5b9b8e22..5e51760a 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java
@@ -2,7 +2,7 @@ package WayofTime.bloodmagic.compat.jei.alchemyArray;
 
 import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin;
+import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import mezz.jei.api.gui.IDrawable;
 import mezz.jei.api.gui.IRecipeLayout;
@@ -22,7 +22,7 @@ public class AlchemyArrayCraftingCategory implements IRecipeCategory {
     private static final int OUTPUT_SLOT = 2;
 
     @Nonnull
-    private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/binding.png"), 0, 0, 100, 30);
+    private final IDrawable background = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/binding.png"), 0, 0, 100, 30);
     @Nonnull
     private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.alchemyArrayCrafting");
 
diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java
index a6b38e9c..2e938c83 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java
@@ -3,7 +3,7 @@ package WayofTime.bloodmagic.compat.jei.alchemyTable;
 import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.registry.OrbRegistry;
-import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin;
+import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import mezz.jei.api.gui.ICraftingGridHelper;
 import mezz.jei.api.gui.IDrawable;
@@ -22,14 +22,14 @@ public class AlchemyTableRecipeCategory implements IRecipeCategory<AlchemyTableR
     private static final int INPUT_SLOT = 2;
 
     @Nonnull
-    private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/alchemyTable.png"), 0, 0, 118, 40);
+    private final IDrawable background = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/alchemyTable.png"), 0, 0, 118, 40);
     @Nonnull
     private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.alchemyTable");
     @Nonnull
     private final ICraftingGridHelper craftingGridHelper;
 
     public AlchemyTableRecipeCategory() {
-        craftingGridHelper = BloodMagicPlugin.jeiHelper.getGuiHelper().createCraftingGridHelper(INPUT_SLOT, OUTPUT_SLOT);
+        craftingGridHelper = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createCraftingGridHelper(INPUT_SLOT, OUTPUT_SLOT);
     }
 
     @Nonnull
diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java
index 8ec43f49..9910f1fd 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java
@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.compat.jei.alchemyTable;
 
 import WayofTime.bloodmagic.api_impl.recipe.RecipeAlchemyTable;
-import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin;
+import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import com.google.common.collect.Lists;
 import mezz.jei.api.ingredients.IIngredients;
@@ -19,7 +19,7 @@ public class AlchemyTableRecipeJEI implements IRecipeWrapper {
 
     @Override
     public void getIngredients(IIngredients ingredients) {
-        List<List<ItemStack>> expanded = BloodMagicPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput());
+        List<List<ItemStack>> expanded = BloodMagicJEIPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput());
         ingredients.setInputLists(ItemStack.class, expanded);
         ingredients.setOutput(ItemStack.class, recipe.getOutput());
     }
diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java
index 32f955c8..dea74887 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java
@@ -2,7 +2,7 @@ package WayofTime.bloodmagic.compat.jei.altar;
 
 import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin;
+import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import mezz.jei.api.gui.IDrawable;
 import mezz.jei.api.gui.IRecipeLayout;
@@ -20,7 +20,7 @@ public class AltarRecipeCategory implements IRecipeCategory<AltarRecipeJEI> {
     private static final int OUTPUT_SLOT = 1;
 
     @Nonnull
-    private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/altar.png"), 3, 4, 155, 65);
+    private final IDrawable background = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/altar.png"), 3, 4, 155, 65);
     @Nonnull
     private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.altar");
 
diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java
index f8a93172..ccde0d58 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java
@@ -2,7 +2,7 @@ package WayofTime.bloodmagic.compat.jei.armourDowngrade;
 
 import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin;
+import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import mezz.jei.api.gui.ICraftingGridHelper;
 import mezz.jei.api.gui.IDrawable;
@@ -24,14 +24,14 @@ public class ArmourDowngradeRecipeCategory implements IRecipeCategory {
     private static final int INPUT_SLOT = 2;
 
     @Nonnull
-    private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/alchemyTable.png"), 0, 0, 118, 40);
+    private final IDrawable background = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/alchemyTable.png"), 0, 0, 118, 40);
     @Nonnull
     private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.armourDowngrade");
     @Nonnull
     private final ICraftingGridHelper craftingGridHelper;
 
     public ArmourDowngradeRecipeCategory() {
-        craftingGridHelper = BloodMagicPlugin.jeiHelper.getGuiHelper().createCraftingGridHelper(INPUT_SLOT, OUTPUT_SLOT);
+        craftingGridHelper = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createCraftingGridHelper(INPUT_SLOT, OUTPUT_SLOT);
     }
 
     @Nonnull
diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java
index d8155ace..c7a2c037 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java
@@ -2,7 +2,7 @@ package WayofTime.bloodmagic.compat.jei.armourDowngrade;
 
 import WayofTime.bloodmagic.api.recipe.LivingArmourDowngradeRecipe;
 import WayofTime.bloodmagic.api.util.helper.ItemHelper.LivingUpgrades;
-import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin;
+import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin;
 import WayofTime.bloodmagic.core.RegistrarBloodMagicItems;
 import com.google.common.collect.Lists;
 import mezz.jei.api.ingredients.IIngredients;
@@ -20,7 +20,7 @@ public class ArmourDowngradeRecipeJEI extends BlankRecipeWrapper {
 
     @Override
     public void getIngredients(IIngredients ingredients) {
-        List<List<ItemStack>> expanded = BloodMagicPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput());
+        List<List<ItemStack>> expanded = BloodMagicJEIPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput());
         expanded.add(Lists.newArrayList(recipe.getKey()));
         ingredients.setInputLists(ItemStack.class, expanded);
         ItemStack upgradeStack = new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME);
diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java
index c511fa04..dad5481a 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java
@@ -2,7 +2,7 @@ package WayofTime.bloodmagic.compat.jei.binding;
 
 import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin;
+import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import mezz.jei.api.gui.IDrawable;
 import mezz.jei.api.gui.IRecipeLayout;
@@ -22,7 +22,7 @@ public class BindingRecipeCategory implements IRecipeCategory {
     private static final int OUTPUT_SLOT = 2;
 
     @Nonnull
-    private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/binding.png"), 0, 0, 100, 30);
+    private final IDrawable background = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/binding.png"), 0, 0, 100, 30);
     @Nonnull
     private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.binding");
 
diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java
index 3e03d2f7..9e2ae73c 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java
@@ -2,7 +2,7 @@ package WayofTime.bloodmagic.compat.jei.forge;
 
 import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin;
+import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import mezz.jei.api.gui.ICraftingGridHelper;
 import mezz.jei.api.gui.IDrawable;
@@ -24,14 +24,14 @@ public class TartaricForgeRecipeCategory implements IRecipeCategory<TartaricForg
     private static final int INPUT_SLOT = 2;
 
     @Nonnull
-    private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/soulForge.png"), 0, 0, 100, 40);
+    private final IDrawable background = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/soulForge.png"), 0, 0, 100, 40);
     @Nonnull
     private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.soulForge");
     @Nonnull
     private final ICraftingGridHelper craftingGridHelper;
 
     public TartaricForgeRecipeCategory() {
-        craftingGridHelper = BloodMagicPlugin.jeiHelper.getGuiHelper().createCraftingGridHelper(INPUT_SLOT, OUTPUT_SLOT);
+        craftingGridHelper = BloodMagicJEIPlugin.jeiHelper.getGuiHelper().createCraftingGridHelper(INPUT_SLOT, OUTPUT_SLOT);
     }
 
     @Nonnull
diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java
index 2c7d4f97..79c6536f 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java
@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.compat.jei.forge;
 
 import WayofTime.bloodmagic.api_impl.recipe.RecipeTartaricForge;
-import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin;
+import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin;
 import WayofTime.bloodmagic.core.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import com.google.common.collect.Lists;
@@ -26,7 +26,7 @@ public class TartaricForgeRecipeJEI extends BlankRecipeWrapper {
 
     @Override
     public void getIngredients(IIngredients ingredients) {
-        List<List<ItemStack>> expandedInputs = BloodMagicPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput());
+        List<List<ItemStack>> expandedInputs = BloodMagicJEIPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput());
         expandedInputs.add(validGems);
         ingredients.setInputLists(ItemStack.class, expandedInputs);
         ingredients.setOutput(ItemStack.class, recipe.getOutput());
diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/WailaPluginBloodMagic.java b/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java
similarity index 96%
rename from src/main/java/WayofTime/bloodmagic/compat/waila/WailaPluginBloodMagic.java
rename to src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java
index 5cfd9622..7ec1536f 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/waila/WailaPluginBloodMagic.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java
@@ -9,7 +9,7 @@ import mcp.mobius.waila.api.IWailaRegistrar;
 import mcp.mobius.waila.api.WailaPlugin;
 
 @WailaPlugin
-public class WailaPluginBloodMagic implements IWailaPlugin {
+public class BloodMagicHwylaPlugin implements IWailaPlugin {
     @Override
     public void register(IWailaRegistrar registrar) {
         registrar.registerBodyProvider(new DataProviderBloodAltar(), BlockAltar.class);