diff --git a/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java
index 1836423a2..946614172 100644
--- a/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java
@@ -55,8 +55,8 @@ public class MiningCommand extends SkillCommand {
         }
 
         // Mastery TRIPLE DROPS
-        if (Permissions.canUseSubSkill(player, SubSkillType.MINING_MASTERY)) {
-            String[] masteryTripleDropStrings = getAbilityDisplayValues(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, player, SubSkillType.MINING_MASTERY);
+        if (Permissions.canUseSubSkill(player, SubSkillType.MINING_MOTHER_LODE)) {
+            String[] masteryTripleDropStrings = getAbilityDisplayValues(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, player, SubSkillType.MINING_MOTHER_LODE);
             masteryTripleDropChance = masteryTripleDropStrings[0];
             masteryTripleDropChanceLucky = masteryTripleDropStrings[1];
         }
@@ -105,8 +105,8 @@ public class MiningCommand extends SkillCommand {
             //messages.add(LocaleLoader.getString("Mining.Effect.Decrease", blastDamageDecrease));
         }
 
-        if(Permissions.canUseSubSkill(player, SubSkillType.MINING_MASTERY)) {
-            messages.add(getStatMessage(SubSkillType.MINING_MASTERY, masteryTripleDropChance)
+        if(Permissions.canUseSubSkill(player, SubSkillType.MINING_MOTHER_LODE)) {
+            messages.add(getStatMessage(SubSkillType.MINING_MOTHER_LODE, masteryTripleDropChance)
                     + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", masteryTripleDropChanceLucky) : ""));
         }
         
diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkillType.java b/src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkillType.java
index 07135cc9b..ec8ace891 100644
--- a/src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkillType.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkillType.java
@@ -49,7 +49,7 @@ public enum PrimarySkillType {
     HERBALISM(HerbalismManager.class, Color.GREEN, SuperAbilityType.GREEN_TERRA, ToolType.HOE,
             ImmutableList.of(SubSkillType.HERBALISM_MASTERY, SubSkillType.HERBALISM_GREEN_TERRA, SubSkillType.HERBALISM_FARMERS_DIET, SubSkillType.HERBALISM_GREEN_THUMB, SubSkillType.HERBALISM_DOUBLE_DROPS, SubSkillType.HERBALISM_HYLIAN_LUCK, SubSkillType.HERBALISM_SHROOM_THUMB)),
     MINING(MiningManager.class, Color.GRAY, SuperAbilityType.SUPER_BREAKER, ToolType.PICKAXE,
-            ImmutableList.of(SubSkillType.MINING_MASTERY, SubSkillType.MINING_SUPER_BREAKER, SubSkillType.MINING_DEMOLITIONS_EXPERTISE, SubSkillType.MINING_BIGGER_BOMBS, SubSkillType.MINING_BLAST_MINING, SubSkillType.MINING_DOUBLE_DROPS)),
+            ImmutableList.of(SubSkillType.MINING_MOTHER_LODE, SubSkillType.MINING_SUPER_BREAKER, SubSkillType.MINING_DEMOLITIONS_EXPERTISE, SubSkillType.MINING_BIGGER_BOMBS, SubSkillType.MINING_BLAST_MINING, SubSkillType.MINING_DOUBLE_DROPS)),
     REPAIR(RepairManager.class, Color.SILVER,
             ImmutableList.of(SubSkillType.REPAIR_MASTERY, SubSkillType.REPAIR_ARCANE_FORGING, SubSkillType.REPAIR_REPAIR_MASTERY, SubSkillType.REPAIR_SUPER_REPAIR)),
     SALVAGE(SalvageManager.class, Color.ORANGE,
diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java b/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java
index 41b66a478..d2d908136 100644
--- a/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java
@@ -63,7 +63,7 @@ public enum SubSkillType {
     MINING_DEMOLITIONS_EXPERTISE(1),
     MINING_DOUBLE_DROPS(1),
     MINING_SUPER_BREAKER(1),
-    MINING_MASTERY(1),
+    MINING_MOTHER_LODE(1),
 
     /* Repair */
     REPAIR_ARCANE_FORGING(8),
diff --git a/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java b/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
index d574477a7..186746fad 100644
--- a/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
@@ -69,8 +69,8 @@ public class MiningManager extends SkillManager {
         return RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.MINING_DOUBLE_DROPS) && Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.MINING_DOUBLE_DROPS);
     }
 
-    public boolean canMiningMastery() {
-        return Permissions.canUseSubSkill(getPlayer(), SubSkillType.MINING_MASTERY);
+    public boolean canMotherLode() {
+        return Permissions.canUseSubSkill(getPlayer(), SubSkillType.MINING_MOTHER_LODE);
     }
 
 
@@ -101,7 +101,7 @@ public class MiningManager extends SkillManager {
             return;
 
         //Mining mastery allows for a chance of triple drops
-        if(canMiningMastery()) {
+        if(canMotherLode()) {
             //Triple Drops failed so do a normal double drops check
             if(!processTripleDrops(blockState)) {
                 processDoubleDrops(blockState);
@@ -114,7 +114,7 @@ public class MiningManager extends SkillManager {
 
     private boolean processTripleDrops(@NotNull BlockState blockState) {
         //TODO: Make this readable
-        if (RandomChanceUtil.checkRandomChanceExecutionSuccess(getPlayer(), SubSkillType.MINING_MASTERY, true)) {
+        if (RandomChanceUtil.checkRandomChanceExecutionSuccess(getPlayer(), SubSkillType.MINING_MOTHER_LODE, true)) {
             BlockUtils.markDropsAsBonus(blockState, 2);
             return true;
         } else {
diff --git a/src/main/resources/advanced.yml b/src/main/resources/advanced.yml
index 2c8353909..c07ff45c9 100644
--- a/src/main/resources/advanced.yml
+++ b/src/main/resources/advanced.yml
@@ -281,7 +281,7 @@ Skills:
     #  Settings for Mining
     ###
     Mining:
-        Mastery:
+        MotherLode:
             MaxBonusLevel:
                 Standard: 1000
                 RetroMode: 10000
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 50be749db..4317ac6ce 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -482,7 +482,7 @@ permissions:
             mcmmo.ability.mining.blastmining.all: true
             mcmmo.ability.mining.doubledrops: true
             mcmmo.ability.mining.superbreaker: true
-            mcmmo.ability.mining.mastery: true
+            mcmmo.ability.mining.motherlode: true
     mcmmo.ability.mining.blastmining.*:
         default: false
         description: Allows access to all Blast Mining abilities
@@ -500,8 +500,8 @@ permissions:
         description: Allows access to the Demolitions Expertise ability
     mcmmo.ability.mining.blastmining.detonate:
         description: Allows for remote TNT detonation
-    mcmmo.ability.mining.mastery:
-        description: Allows access to end game progression for Mining
+    mcmmo.ability.mining.motherlode:
+        description: Allows access to mother lode subskill
     mcmmo.ability.mining.doubledrops:
         description: Allows double drop chance when mining
     mcmmo.ability.mining.superbreaker:
diff --git a/src/main/resources/skillranks.yml b/src/main/resources/skillranks.yml
index d07377fa1..df742e81a 100644
--- a/src/main/resources/skillranks.yml
+++ b/src/main/resources/skillranks.yml
@@ -356,7 +356,7 @@ Salvage:
             Rank_7: 850
             Rank_8: 1000
 Mining:
-    Mastery:
+    MotherLode:
         Standard:
             Rank_1: 100
         RetroMode: