diff --git a/src/main/java/net/coreprotect/listener/block/BlockExplodeListener.java b/src/main/java/net/coreprotect/listener/block/BlockExplodeListener.java
index f8a6a035..6ec0b07f 100644
--- a/src/main/java/net/coreprotect/listener/block/BlockExplodeListener.java
+++ b/src/main/java/net/coreprotect/listener/block/BlockExplodeListener.java
@@ -1,10 +1,10 @@
 package net.coreprotect.listener.block;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -37,9 +37,7 @@ public static void processBlockExplode(String user, World world, List<Block> blo
         }
 
         if (Config.getConfig(world).NATURAL_BREAK) {
-            Iterator<Map.Entry<Location, Block>> it = new HashMap<>(blockMap).entrySet().iterator();
-            while (it.hasNext()) {
-                Map.Entry<Location, Block> data = it.next();
+            for (Entry<Location, Block> data : new HashMap<>(blockMap).entrySet()) {
                 Block block = data.getValue();
                 int x = block.getX();
                 int y = block.getY();
@@ -158,7 +156,7 @@ protected void onBlockExplode(BlockExplodeEvent event) {
             user = "#tnt";
         }
         else if (user.contains("end_crystal")) {
-            user = "#endercrystal";
+            user = "#ender_crystal";
         }
         if (!user.startsWith("#")) {
             user = "#explosion";
diff --git a/src/main/java/net/coreprotect/listener/entity/EntityExplodeListener.java b/src/main/java/net/coreprotect/listener/entity/EntityExplodeListener.java
index c25e92b1..db1800eb 100755
--- a/src/main/java/net/coreprotect/listener/entity/EntityExplodeListener.java
+++ b/src/main/java/net/coreprotect/listener/entity/EntityExplodeListener.java
@@ -46,7 +46,7 @@ else if (entity instanceof Wither || entity instanceof WitherSkull) {
             user = "#wither";
         }
         else if (entity instanceof EnderCrystal) {
-            user = "#endercrystal";
+            user = "#ender_crystal";
         }
 
         boolean log = false;