diff --git a/src/main/java/me/xginko/villageroptimizer/modules/BlockOptimization.java b/src/main/java/me/xginko/villageroptimizer/modules/BlockOptimization.java
index c5c3f99..04b90a1 100644
--- a/src/main/java/me/xginko/villageroptimizer/modules/BlockOptimization.java
+++ b/src/main/java/me/xginko/villageroptimizer/modules/BlockOptimization.java
@@ -99,9 +99,11 @@ public class BlockOptimization implements VillagerOptimizerModule, Listener {
                 counter++;
                 if (shouldNotifyPlayer) {
                     Player player = event.getPlayer();
+                    final String villagerType = wVillager.villager().getProfession().toString().toLowerCase();
+                    final String placedType = placed.getType().toString().toLowerCase();
                     VillagerOptimizer.getLang(player.locale()).block_optimize_success.forEach(line -> player.sendMessage(line
-                            .replaceText(TextReplacementConfig.builder().matchLiteral("%villagertype%").replacement(wVillager.villager().getProfession().toString().toLowerCase()).build())
-                            .replaceText(TextReplacementConfig.builder().matchLiteral("%blocktype%").replacement(placed.getType().toString().toLowerCase()).build())
+                            .replaceText(TextReplacementConfig.builder().matchLiteral("%villagertype%").replacement(villagerType).build())
+                            .replaceText(TextReplacementConfig.builder().matchLiteral("%blocktype%").replacement(placedType).build())
                     ));
                 }
                 if (shouldLog)
@@ -136,9 +138,11 @@ public class BlockOptimization implements VillagerOptimizerModule, Listener {
 
                 if (shouldNotifyPlayer) {
                     Player player = event.getPlayer();
+                    final String villagerType = wVillager.villager().getProfession().toString().toLowerCase();
+                    final String brokenType = broken.getType().toString().toLowerCase();
                     VillagerOptimizer.getLang(player.locale()).block_unoptimize_success.forEach(line -> player.sendMessage(line
-                            .replaceText(TextReplacementConfig.builder().matchLiteral("%villagertype%").replacement(wVillager.villager().getProfession().toString().toLowerCase()).build())
-                            .replaceText(TextReplacementConfig.builder().matchLiteral("%blocktype%").replacement(broken.getType().toString().toLowerCase()).build())
+                            .replaceText(TextReplacementConfig.builder().matchLiteral("%villagertype%").replacement(villagerType).build())
+                            .replaceText(TextReplacementConfig.builder().matchLiteral("%blocktype%").replacement(brokenType).build())
                     ));
                 }
                 if (shouldLog)
@@ -189,10 +193,10 @@ public class BlockOptimization implements VillagerOptimizerModule, Listener {
                 wVillager.setOptimization(OptimizationType.OFF);
                 if (shouldNotifyPlayer) {
                     Player player = event.getPlayer();
-                    final String vilType = wVillager.villager().getProfession().toString().toLowerCase();
+                    final String villagerType = wVillager.villager().getProfession().toString().toLowerCase();
                     final String blockType = entityLegs.getBlock().getType().toString().toLowerCase();
                     VillagerOptimizer.getLang(player.locale()).block_unoptimize_success.forEach(line -> player.sendMessage(line
-                            .replaceText(TextReplacementConfig.builder().matchLiteral("%villagertype%").replacement(vilType).build())
+                            .replaceText(TextReplacementConfig.builder().matchLiteral("%villagertype%").replacement(villagerType).build())
                             .replaceText(TextReplacementConfig.builder().matchLiteral("%blocktype%").replacement(blockType).build())
                     ));
                 }
diff --git a/src/main/java/me/xginko/villageroptimizer/modules/WorkstationOptimization.java b/src/main/java/me/xginko/villageroptimizer/modules/WorkstationOptimization.java
index e470b4f..b20ebe5 100644
--- a/src/main/java/me/xginko/villageroptimizer/modules/WorkstationOptimization.java
+++ b/src/main/java/me/xginko/villageroptimizer/modules/WorkstationOptimization.java
@@ -108,10 +108,10 @@ public class WorkstationOptimization implements VillagerOptimizerModule, Listene
             closestOptimizableVillager.saveOptimizeTime();
             if (shouldNotifyPlayer) {
                 Player player = event.getPlayer();
-                final String vilType = closestOptimizableVillager.villager().getProfession().toString().toLowerCase();
+                final String villagerType = closestOptimizableVillager.villager().getProfession().toString().toLowerCase();
                 final String workstation = placed.getType().toString().toLowerCase();
                 VillagerOptimizer.getLang(player.locale()).workstation_unoptimize_success.forEach(line -> player.sendMessage(line
-                        .replaceText(TextReplacementConfig.builder().matchLiteral("%villagertype%").replacement(vilType).build())
+                        .replaceText(TextReplacementConfig.builder().matchLiteral("%villagertype%").replacement(villagerType).build())
                         .replaceText(TextReplacementConfig.builder().matchLiteral("%workstation%").replacement(workstation).build())
                 ));
             }
@@ -156,10 +156,10 @@ public class WorkstationOptimization implements VillagerOptimizerModule, Listene
         if (closestOptimizedVillager != null && closestOptimizedVillager.getOptimizationType().equals(OptimizationType.WORKSTATION)) {
             if (shouldNotifyPlayer) {
                 Player player = event.getPlayer();
-                final String vilType = closestOptimizedVillager.villager().getProfession().toString().toLowerCase();
+                final String villagerType = closestOptimizedVillager.villager().getProfession().toString().toLowerCase();
                 final String workstation = placed.getType().toString().toLowerCase();
                 VillagerOptimizer.getLang(player.locale()).workstation_unoptimize_success.forEach(line -> player.sendMessage(line
-                        .replaceText(TextReplacementConfig.builder().matchLiteral("%villagertype%").replacement(vilType).build())
+                        .replaceText(TextReplacementConfig.builder().matchLiteral("%villagertype%").replacement(villagerType).build())
                         .replaceText(TextReplacementConfig.builder().matchLiteral("%workstation%").replacement(workstation).build())
                 ));
             }