1 files changed, 13 insertions, 10 deletions

diff --git a/plugins/Events/Columns/EventName.php b/plugins/Events/Columns/EventName.php
index bbe01ae0ff..71876dfc28 100644
--- a/plugins/Events/Columns/EventName.php
+++ b/plugins/Events/Columns/EventName.php
@@ -8,9 +8,9 @@
  */
 namespace Piwik\Plugins\Events\Columns;
 
-use Piwik\Piwik;
+use Piwik\Columns\Discriminator;
+use Piwik\Columns\Join\ActionNameJoin;
 use Piwik\Plugin\Dimension\ActionDimension;
-use Piwik\Plugins\Events\Segment;
 use Piwik\Plugins\Events\Actions\ActionEvent;
 use Piwik\Tracker\Action;
 use Piwik\Tracker\Request;
@@ -18,18 +18,21 @@ use Piwik\Tracker\Request;
 class EventName extends ActionDimension
 {
     protected $columnName = 'idaction_name';
-
-    protected function configureSegments()
+    protected $type = self::TYPE_TEXT;
+    protected $category = 'Events_Events';
+    protected $sqlFilter = '\Piwik\Tracker\TableLogAction::getIdActionFromSegment';
+    protected $segmentName = 'eventName';
+    protected $nameSingular = 'Events_EventName';
+    protected $namePlural = 'Events_EventNames';
+
+    public function getDbColumnJoin()
     {
-        $segment = new Segment();
-        $segment->setSegment('eventName');
-        $segment->setName('Events_EventName');
-        $this->addSegment($segment);
+        return new ActionNameJoin();
     }
 
-    public function getName()
+    public function getDbDiscriminator()
     {
-        return Piwik::translate('Events_EventName');
+        return new Discriminator('log_action', 'type', $this->getActionId());
     }
 
     public function getActionId()