diff --git a/core/DataTable/Filter/SafeDecodeLabel.php b/core/DataTable/Filter/SafeDecodeLabel.php
index 9b658f9013dabd6b85b0419c4b3356abac23f049..aaa06aab97febebea63806312738452d9f74adc2 100644
--- a/core/DataTable/Filter/SafeDecodeLabel.php
+++ b/core/DataTable/Filter/SafeDecodeLabel.php
@@ -38,7 +38,7 @@ class SafeDecodeLabel extends BaseFilter
      * @param string $value
      * @return mixed|string
      */
-    public static function safeDecodeLabel($value)
+    public static function decodeLabelSafe($value)
     {
         if (empty($value)) {
             return $value;
@@ -66,7 +66,7 @@ class SafeDecodeLabel extends BaseFilter
         foreach ($table->getRows() as $row) {
             $value = $row->getColumn($this->columnToDecode);
             if ($value !== false) {
-                $value = self::safeDecodeLabel($value);
+                $value = self::decodeLabelSafe($value);
                 $row->setColumn($this->columnToDecode, $value);
 
                 $this->filterSubTable($row);
diff --git a/core/DataTable/Filter/Sort.php b/core/DataTable/Filter/Sort.php
index 7a58a877ae4482cb661518cbf628a851ec06e3de..4d67891b67d371edc3aa06a2a99cbd5a534ddcf4 100644
--- a/core/DataTable/Filter/Sort.php
+++ b/core/DataTable/Filter/Sort.php
@@ -73,7 +73,7 @@ class Sort extends BaseFilter
      * @param number $b
      * @return int
      */
-    public function sort($a, $b)
+    public function numberSort($a, $b)
     {
         return !isset($a->c[Row::COLUMNS][$this->columnToSort])
         && !isset($b->c[Row::COLUMNS][$this->columnToSort])
@@ -212,7 +212,7 @@ class Sort extends BaseFilter
 
         $value = $row->getColumn($this->columnToSort);
         if (is_numeric($value)) {
-            $methodToUse = "sort";
+            $methodToUse = "numberSort";
         } else {
             if ($this->naturalSort) {
                 $methodToUse = "naturalSort";
diff --git a/plugins/API/RowEvolution.php b/plugins/API/RowEvolution.php
index 4b84402524286d14b9fb144487fcd76f228aaa12..53686b25892c2125557bd419059c4313b688b357 100644
--- a/plugins/API/RowEvolution.php
+++ b/plugins/API/RowEvolution.php
@@ -184,7 +184,7 @@ class RowEvolution
         }
 
         $return = array(
-            'label'      => SafeDecodeLabel::safeDecodeLabel($actualLabel),
+            'label'      => SafeDecodeLabel::decodeLabelSafe($actualLabel),
             'reportData' => $dataTable,
             'metadata'   => $metadata
         );
@@ -480,7 +480,7 @@ class RowEvolution
                 $label .= ' (' . $metadata['columns'][$column] . ')';
             }
             $metricName = $column . '_' . $labelIndex;
-            $metadata['metrics'][$metricName] = SafeDecodeLabel::safeDecodeLabel($label);
+            $metadata['metrics'][$metricName] = SafeDecodeLabel::decodeLabelSafe($label);
 
             if (!empty($logos[$labelIndex])) {
                 $metadata['logos'][$metricName] = $logos[$labelIndex];