diff --git a/cockatrice/resources/help/search.md b/cockatrice/resources/help/search.md
index 481789cb..7ed56fb2 100644
--- a/cockatrice/resources/help/search.md
+++ b/cockatrice/resources/help/search.md
@@ -30,10 +30,10 @@ The search bar recognizes a set of special commands similar to some other card d
 <dd>[c:c](#c:c) <small>(Any colorless card)</small></dd>
 <dd>[ci:w](#ci:w) <small>(Any card that has white in it's color identity)</small></dd>
 
-<dt><u>Pow</u>er, <u>Tou</u>ghness, <u>C</u>onverted <u>M</u>ana <u>C</u>ost:</dt>
+<dt><u>Pow</u>er, <u>Tou</u>ghness, <u>M</u>ana <u>V</u>alue:</dt>
 <dd>[tou:1](#tou:1) <small>(Any card with a toughness of 1)</small></dd>
 <dd>[pow>=8](#pow>=8) <small>(Any card with a power greater than or equal to 8)</small></dd>
-<dd>[cmc=7](#cmc=7) <small>(Any card with a converted mana cost equal to 7)</small></dd>
+<dd>[mv=7](#mv=7) <small>(Any card with a mana value equal to 7)</small></dd>
 
 <dt><u>R</u>arity:</dt>
 <dd>[r:mythic](#r:mythic) <small>(Any card that has the mythic-rare rarity)</small></dd>
diff --git a/cockatrice/src/cardfilter.cpp b/cockatrice/src/cardfilter.cpp
index 05fee44f..f2d705d4 100644
--- a/cockatrice/src/cardfilter.cpp
+++ b/cockatrice/src/cardfilter.cpp
@@ -32,7 +32,7 @@ const QString CardFilter::attrName(Attr a)
         case AttrManaCost:
             return tr("Mana Cost");
         case AttrCmc:
-            return tr("CMC");
+            return tr("Mana Value");
         case AttrRarity:
             return tr("Rarity");
         case AttrPow:
diff --git a/cockatrice/src/filter_string.cpp b/cockatrice/src/filter_string.cpp
index 01afe74c..15cdbaca 100644
--- a/cockatrice/src/filter_string.cpp
+++ b/cockatrice/src/filter_string.cpp
@@ -23,7 +23,7 @@ SetQuery <- ('e'/'set') [:] FlexStringValue
 OracleQuery <- 'o' [:] RegexString
 
 
-CMCQuery <- 'cmc' ws? NumericExpression
+CMCQuery <- ('cmc'/'mv') ws? NumericExpression
 PowerQuery <- [Pp] 'ow' 'er'? ws? NumericExpression
 ToughnessQuery <- [Tt] 'ou' 'ghness'? ws? NumericExpression
 RarityQuery <- [rR] ':' RegexString
diff --git a/cockatrice/src/game_specific_terms.h b/cockatrice/src/game_specific_terms.h
index 76b90f30..cbf3e3ef 100644
--- a/cockatrice/src/game_specific_terms.h
+++ b/cockatrice/src/game_specific_terms.h
@@ -28,7 +28,7 @@ inline static const QString getNicePropertyName(QString key)
     if (key == CardType)
         return QCoreApplication::translate("Mtg", "Card Type");
     if (key == ConvertedManaCost)
-        return QCoreApplication::translate("Mtg", "Converted Mana Cost");
+        return QCoreApplication::translate("Mtg", "Mana Value");
     if (key == Colors)
         return QCoreApplication::translate("Mtg", "Color(s)");
     if (key == Loyalty)