diff --git a/RoboFile.php b/RoboFile.php
index 5b13e3d465..d70bacbb2c 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -567,7 +567,7 @@ class RoboFile extends \Robo\Tasks {
     return \MailPoetTasks\Release\ChangelogController::createWithJiraCredentials(
       getenv('WP_JIRA_TOKEN'),
       getenv('WP_JIRA_USER'),
-      \MailPoetTasks\Release\Jira::PROJECT_MAILPOET,
+      \MailPoetTasks\Release\JiraController::PROJECT_MAILPOET,
       __DIR__ . '/readme.txt'
     );
   }
@@ -578,7 +578,7 @@ class RoboFile extends \Robo\Tasks {
     return \MailPoetTasks\Release\ReleaseVersionController::createWithJiraCredentials(
       getenv('WP_JIRA_TOKEN'),
       getenv('WP_JIRA_USER'),
-      \MailPoetTasks\Release\Jira::PROJECT_MAILPOET
+      \MailPoetTasks\Release\JiraController::PROJECT_MAILPOET
     );
   }
 
diff --git a/tasks/release/ChangelogController.php b/tasks/release/ChangelogController.php
index 3ad827cc39..44a5fd0883 100644
--- a/tasks/release/ChangelogController.php
+++ b/tasks/release/ChangelogController.php
@@ -2,7 +2,7 @@
 
 namespace MailPoetTasks\Release;
 
-require_once __DIR__ . '/Jira.php';
+require_once __DIR__ . '/JiraController.php';
 
 class ChangelogController {
 
@@ -12,16 +12,16 @@ class ChangelogController {
   /** @var string */
   private $readme_file;
 
-  /** @var Jira */
+  /** @var JiraController */
   private $jira;
 
-  function __construct(Jira $jira, $readme_file) {
+  function __construct(JiraController $jira, $readme_file) {
     $this->jira = $jira;
     $this->readme_file = $readme_file;
   }
 
   static function createWithJiraCredentials($token, $user, $project, $readme_file) {
-    return new self(new Jira($token, $user, $project), $readme_file);
+    return new self(new JiraController($token, $user, $project), $readme_file);
   }
 
   function update($version_name = null) {
@@ -34,11 +34,11 @@ class ChangelogController {
     $version = $this->jira->getVersion($version_name);
     $issues = $this->jira->getIssuesDataForVersion($version);
     $heading = $this->renderHeading($version);
-    $changelog = $this->renderList($issues, Jira::CHANGELOG_FIELD_ID);
+    $changelog = $this->renderList($issues, JiraController::CHANGELOG_FIELD_ID);
     if (!$changelog) {
       $changelog = self::FALLBACK_RECORD;
     }
-    $notes = $this->renderList($issues, Jira::RELEASENOTE_FIELD_ID);
+    $notes = $this->renderList($issues, JiraController::RELEASENOTE_FIELD_ID);
     return [$heading, $changelog, $notes];
   }
 
@@ -52,7 +52,7 @@ class ChangelogController {
     foreach ($issues as $issue) {
       if (
         !isset($issue['fields'][$field])
-        || ($issue['fields']['resolution']['id'] === Jira::WONT_DO_RESOLUTION_ID)
+        || ($issue['fields']['resolution']['id'] === JiraController::WONT_DO_RESOLUTION_ID)
       ) {
         continue;
       }
diff --git a/tasks/release/Jira.php b/tasks/release/JiraController.php
similarity index 99%
rename from tasks/release/Jira.php
rename to tasks/release/JiraController.php
index 291a291538..6f346b50d5 100644
--- a/tasks/release/Jira.php
+++ b/tasks/release/JiraController.php
@@ -4,7 +4,7 @@ namespace MailPoetTasks\Release;
 
 require_once __DIR__ . '/HttpClient.php';
 
-class Jira {
+class JiraController {
 
   const CHANGELOG_FIELD_ID = 'customfield_10500';
   const RELEASENOTE_FIELD_ID = 'customfield_10504';
diff --git a/tasks/release/ReleaseVersionController.php b/tasks/release/ReleaseVersionController.php
index ce80a181fe..af2aeae805 100644
--- a/tasks/release/ReleaseVersionController.php
+++ b/tasks/release/ReleaseVersionController.php
@@ -2,23 +2,23 @@
 
 namespace MailPoetTasks\Release;
 
-require_once __DIR__ . '/Jira.php';
+require_once __DIR__ . '/JiraController.php';
 
 class ReleaseVersionController {
 
-  /** @var Jira */
+  /** @var JiraController */
   private $jira;
 
   /** @var string */
   private $project;
 
-  function __construct(Jira $jira, $project) {
+  function __construct(JiraController $jira, $project) {
     $this->jira = $jira;
     $this->project = $project;
   }
 
   static function createWithJiraCredentials($token, $user, $project) {
-    return new self(new Jira($token, $user, $project), $project);
+    return new self(new JiraController($token, $user, $project), $project);
   }
 
   function assignVersionToCompletedTickets($version = null) {