diff --git a/main/src/main/java/me/blackvein/quests/conditions/ConditionFactory.java b/main/src/main/java/me/blackvein/quests/conditions/ConditionFactory.java
index 6adeae447..c5aae5e3a 100644
--- a/main/src/main/java/me/blackvein/quests/conditions/ConditionFactory.java
+++ b/main/src/main/java/me/blackvein/quests/conditions/ConditionFactory.java
@@ -83,7 +83,7 @@ public class ConditionFactory implements ConversationAbandonedListener {
                 && condition.getItemsWhileHoldingMainHand().isEmpty() == false) {
             LinkedList<ItemStack> items = new LinkedList<ItemStack>();
             items.addAll(condition.getItemsWhileHoldingMainHand());
-            context.setSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND, items);
+            context.setSessionData(CK.C_WHILE_HOLDING_MAIN_HAND, items);
         }
     }
 
@@ -91,7 +91,7 @@ public class ConditionFactory implements ConversationAbandonedListener {
         context.setSessionData(CK.C_OLD_CONDITION, null);
         context.setSessionData(CK.C_NAME, null);
         context.setSessionData(CK.C_FAIL_QUEST, null);
-        context.setSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND, null);
+        context.setSessionData(CK.C_WHILE_HOLDING_MAIN_HAND, null);
     }
 
     public void deleteCondition(ConversationContext context) {
@@ -167,9 +167,9 @@ public class ConditionFactory implements ConversationAbandonedListener {
                 section.set("fail-quest", true);
             }
         }
-        if (context.getSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND) != null) {
+        if (context.getSessionData(CK.C_WHILE_HOLDING_MAIN_HAND) != null) {
             section.set("hold-main-hand", 
-                    (LinkedList<ItemStack>) context.getSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND));
+                    (LinkedList<ItemStack>) context.getSessionData(CK.C_WHILE_HOLDING_MAIN_HAND));
         }
         try {
             data.save(conditionsFile);
diff --git a/main/src/main/java/me/blackvein/quests/convo/conditions/tasks/PlayerPrompt.java b/main/src/main/java/me/blackvein/quests/convo/conditions/tasks/PlayerPrompt.java
index 1d1b34326..68f045969 100644
--- a/main/src/main/java/me/blackvein/quests/convo/conditions/tasks/PlayerPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/conditions/tasks/PlayerPrompt.java
@@ -70,11 +70,11 @@ public class PlayerPrompt extends QuestsEditorNumericPrompt {
     public String getAdditionalText(ConversationContext context, int number) {
         switch(number) {
         case 1:
-            if (context.getSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND) == null) {
+            if (context.getSessionData(CK.C_WHILE_HOLDING_MAIN_HAND) == null) {
                 return ChatColor.GRAY + "(" + Lang.get("noneSet") + ")";
             } else {
                 String text = "\n";
-                LinkedList<ItemStack> items = (LinkedList<ItemStack>) context.getSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND);
+                LinkedList<ItemStack> items = (LinkedList<ItemStack>) context.getSessionData(CK.C_WHILE_HOLDING_MAIN_HAND);
                 for (int i = 0; i < items.size(); i++) {
                     text += ChatColor.GRAY + "     - " + ChatColor.BLUE + ItemUtil.getName(items.get(i)) 
                             + ChatColor.GRAY + " x " + ChatColor.AQUA + items.get(i).getAmount() + "\n";
@@ -93,10 +93,10 @@ public class PlayerPrompt extends QuestsEditorNumericPrompt {
     public String getPromptText(ConversationContext context) {
         // Check/add newly made item
         if (context.getSessionData("newItem") != null) {
-            if (context.getSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND) != null) {
-                List<ItemStack> items = (List<ItemStack>) context.getSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND);
+            if (context.getSessionData(CK.C_WHILE_HOLDING_MAIN_HAND) != null) {
+                List<ItemStack> items = (List<ItemStack>) context.getSessionData(CK.C_WHILE_HOLDING_MAIN_HAND);
                 items.add((ItemStack) context.getSessionData("tempStack"));
-                context.setSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND, items);
+                context.setSessionData(CK.C_WHILE_HOLDING_MAIN_HAND, items);
             }
             context.setSessionData("newItem", null);
             context.setSessionData("tempStack", null);
@@ -176,11 +176,11 @@ public class PlayerPrompt extends QuestsEditorNumericPrompt {
         public String getAdditionalText(ConversationContext context, int number) {
             switch(number) {
             case 1:
-                if (context.getSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND) == null) {
+                if (context.getSessionData(CK.C_WHILE_HOLDING_MAIN_HAND) == null) {
                     return ChatColor.GRAY + "(" + Lang.get("noneSet") + ")";
                 } else {
                     String text = "\n";
-                    for (ItemStack is : (List<ItemStack>) context.getSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND)) {
+                    for (ItemStack is : (List<ItemStack>) context.getSessionData(CK.C_WHILE_HOLDING_MAIN_HAND)) {
                         text += ChatColor.GRAY + "     - " + ItemUtil.getDisplayString(is) + "\n";
                     }
                     return text;
@@ -198,14 +198,14 @@ public class PlayerPrompt extends QuestsEditorNumericPrompt {
         public String getPromptText(ConversationContext context) {
             // Check/add newly made item
             if (context.getSessionData("newItem") != null) {
-                if (context.getSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND) != null) {
-                    List<ItemStack> items = (List<ItemStack>) context.getSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND);
+                if (context.getSessionData(CK.C_WHILE_HOLDING_MAIN_HAND) != null) {
+                    List<ItemStack> items = (List<ItemStack>) context.getSessionData(CK.C_WHILE_HOLDING_MAIN_HAND);
                     items.add((ItemStack) context.getSessionData("tempStack"));
-                    context.setSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND, items);
+                    context.setSessionData(CK.C_WHILE_HOLDING_MAIN_HAND, items);
                 } else {
                     LinkedList<ItemStack> items = new LinkedList<ItemStack>();
                     items.add((ItemStack) context.getSessionData("tempStack"));
-                    context.setSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND, items);
+                    context.setSessionData(CK.C_WHILE_HOLDING_MAIN_HAND, items);
                 }
                 context.setSessionData("newItem", null);
                 context.setSessionData("tempStack", null);
@@ -229,7 +229,7 @@ public class PlayerPrompt extends QuestsEditorNumericPrompt {
                 return new ItemStackPrompt(ItemsInMainHandListPrompt.this);
             case 2:
                 context.getForWhom().sendRawMessage(ChatColor.YELLOW + Lang.get("conditionEditorConditionCleared"));
-                context.setSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND, null);
+                context.setSessionData(CK.C_WHILE_HOLDING_MAIN_HAND, null);
                 return new ItemsInMainHandListPrompt(context);
             case 3:
                 return new PlayerPrompt(context);
diff --git a/main/src/main/java/me/blackvein/quests/util/CK.java b/main/src/main/java/me/blackvein/quests/util/CK.java
index 424c54fdb..f53a533c0 100644
--- a/main/src/main/java/me/blackvein/quests/util/CK.java
+++ b/main/src/main/java/me/blackvein/quests/util/CK.java
@@ -177,5 +177,5 @@ public class CK {
     public static final String C_OLD_CONDITION = "oldCondition";
     public static final String C_NAME = "conName";
     public static final String C_FAIL_QUEST = "conFailQuest";
-    public static final String C_ITEMS_WHILE_HOLDING_MAIN_HAND = "conItemsMainHand";
+    public static final String C_WHILE_HOLDING_MAIN_HAND = "conHoldingMainHand";
 }