diff --git a/src/Core/DataFilter.cpp b/src/Core/DataFilter.cpp
index 65aa7c118d..0d344dddb6 100644
--- a/src/Core/DataFilter.cpp
+++ b/src/Core/DataFilter.cpp
@@ -1095,7 +1095,7 @@ void Leaf::validateFilter(Context *context, DataFilterRuntime *df, Leaf *leaf)
     case Leaf::Function :
         {
             // is the symbol valid?
-            QRegExp bestValidSymbols("^(apower|power|hr|cadence|speed|torque|vam|xpower|np|wpk)$", Qt::CaseInsensitive);
+            QRegExp bestValidSymbols("^(apower|power|hr|cadence|speed|torque|vam|xpower|isopower|wpk)$", Qt::CaseInsensitive);
             QRegExp tizValidSymbols("^(power|hr)$", Qt::CaseInsensitive);
             QRegExp configValidSymbols("^(cranklength|cp|ftp|w\\'|pmax|cv|d\\'|scv|sd\\'|height|weight|lthr|maxhr|rhr|units)$", Qt::CaseInsensitive);
             QRegExp constValidSymbols("^(e|pi)$", Qt::CaseInsensitive); // just do basics for now
diff --git a/src/Core/UserData.cpp b/src/Core/UserData.cpp
index 00c4c74c2a..c636e8390a 100644
--- a/src/Core/UserData.cpp
+++ b/src/Core/UserData.cpp
@@ -150,7 +150,7 @@ EditUserDataDialog::EditUserDataDialog(Context *context, UserData *here) :
     list << "best(cadence, 3600)";
     list << "best(speed, 3600)";
     list << "best(torque, 3600)";
-    list << "best(np, 3600)";
+    list << "best(isopower, 3600)";
     list << "best(xpower, 3600)";
     list << "best(vam, 3600)";
     list << "best(wpk, 3600)";
diff --git a/src/Gui/EditUserMetricDialog.cpp b/src/Gui/EditUserMetricDialog.cpp
index 987c212a95..b5cacbf66d 100644
--- a/src/Gui/EditUserMetricDialog.cpp
+++ b/src/Gui/EditUserMetricDialog.cpp
@@ -152,7 +152,7 @@ EditUserMetricDialog::EditUserMetricDialog(QWidget *parent, Context *context, Us
     list << "best(cadence, 3600)";
     list << "best(speed, 3600)";
     list << "best(torque, 3600)";
-    list << "best(np, 3600)";
+    list << "best(isopower, 3600)";
     list << "best(xpower, 3600)";
     list << "best(vam, 3600)";
     list << "best(wpk, 3600)";
diff --git a/src/Gui/SearchBox.cpp b/src/Gui/SearchBox.cpp
index f8bec4aab1..bc9329cc10 100644
--- a/src/Gui/SearchBox.cpp
+++ b/src/Gui/SearchBox.cpp
@@ -187,7 +187,7 @@ SearchBox::configChanged(qint32)
     list << "best(cadence, 3600)";
     list << "best(speed, 3600)";
     list << "best(torque, 3600)";
-    list << "best(np, 3600)";
+    list << "best(isopower, 3600)";
     list << "best(xpower, 3600)";
     list << "best(vam, 3600)";
     list << "best(wpk, 3600)";