diff --git a/src/Issue/Attachment.php b/src/Issue/Attachment.php
index be85caaf..8a470ec3 100644
--- a/src/Issue/Attachment.php
+++ b/src/Issue/Attachment.php
@@ -13,7 +13,7 @@ class Attachment implements \JsonSerializable
     /* @var string */
     public $filename;
 
-    /* @var Reporter */
+    /* @var \JiraRestApi\Issue\Reporter */
     public $author;
 
     /* @var \DateTime */
diff --git a/src/Issue/ChangeLog.php b/src/Issue/ChangeLog.php
index 02353e9d..99ab9c68 100644
--- a/src/Issue/ChangeLog.php
+++ b/src/Issue/ChangeLog.php
@@ -18,7 +18,7 @@ class ChangeLog implements \JsonSerializable
     /** @var int */
     public $total;
 
-    /** @var History[]|null */
+    /** @var \JiraRestApi\Issue\History[]|null */
     public $histories;
 
     public function jsonSerialize()
diff --git a/src/Issue/Comment.php b/src/Issue/Comment.php
index 0817bbcd..a5aad326 100644
--- a/src/Issue/Comment.php
+++ b/src/Issue/Comment.php
@@ -10,13 +10,13 @@ class Comment implements \JsonSerializable
     /** @var string */
     public $id;
 
-    /** @var Reporter */
+    /** @var \JiraRestApi\Issue\Reporter */
     public $author;
 
     /** @var string */
     public $body;
 
-    /** @var Reporter */
+    /** @var \JiraRestApi\Issue\Reporter */
     public $updateAuthor;
 
     /** @var \DateTime */
@@ -25,7 +25,7 @@ class Comment implements \JsonSerializable
     /** @var \DateTime */
     public $updated;
 
-    /** @var Visibility */
+    /** @var \JiraRestApi\Issue\Visibility */
     public $visibility;
 
     public function setBody($body)
diff --git a/src/Issue/Comments.php b/src/Issue/Comments.php
index d8c275e3..0afdbc06 100644
--- a/src/Issue/Comments.php
+++ b/src/Issue/Comments.php
@@ -13,7 +13,7 @@ class Comments implements \JsonSerializable
     /** @var int */
     public $total;
 
-    /** @var Comment[] */
+    /** @var \JiraRestApi\Issue\Comment[] */
     public $comments;
 
     public function jsonSerialize()
diff --git a/src/Issue/History.php b/src/Issue/History.php
index 7aed35b5..f9d61cf9 100644
--- a/src/Issue/History.php
+++ b/src/Issue/History.php
@@ -12,7 +12,7 @@ class History implements \JsonSerializable
     /** @var int */
     public $id;
 
-    /** @var Reporter */
+    /** @var \JiraRestApi\Issue\Reporter */
     public $author;
 
     /** @var string */
diff --git a/src/Issue/Issue.php b/src/Issue/Issue.php
index f03d418d..ff0fb677 100644
--- a/src/Issue/Issue.php
+++ b/src/Issue/Issue.php
@@ -20,7 +20,7 @@ class Issue implements \JsonSerializable
     /** @var string */
     public $key;
 
-    /** @var IssueField */
+    /** @var \JiraRestApi\Issue\IssueField */
     public $fields;
 
     /** @var array|null */
@@ -41,7 +41,7 @@ class Issue implements \JsonSerializable
     /** @var array|null */
     public $editmeta;
 
-    /** @var ChangeLog|null */
+    /** @var \JiraRestApi\Issue\ChangeLog|null */
     public $changelog;
 
     public function jsonSerialize()
diff --git a/src/Issue/IssueField.php b/src/Issue/IssueField.php
index 71c3f3c9..d5b74742 100644
--- a/src/Issue/IssueField.php
+++ b/src/Issue/IssueField.php
@@ -14,10 +14,10 @@ class IssueField implements \JsonSerializable
     /** @var array */
     public $progress;
 
-    /** @var TimeTracking */
+    /** @var \JiraRestApi\Issue\TimeTracking */
     public $timeTracking;
 
-    /** @var IssueType */
+    /** @var \JiraRestApi\Issue\IssueType */
     public $issuetype;
 
     /** @var Reporter|null */
@@ -32,10 +32,10 @@ class IssueField implements \JsonSerializable
     /** @var string|null */
     public $description;
 
-    /** @var Priority|null */
+    /** @var \JiraRestApi\Issue\Priority|null */
     public $priority;
 
-    /** @var IssueStatus */
+    /** @var \JiraRestApi\Issue\IssueStatus */
     public $status;
 
     /** @var array */
@@ -50,7 +50,7 @@ class IssueField implements \JsonSerializable
     /** @var \JiraRestApi\Issue\Component[] */
     public $components;
 
-    /** @var Comments */
+    /** @var \JiraRestApi\Issue\Comments */
     public $comment;
 
     /** @var object */
@@ -62,7 +62,7 @@ class IssueField implements \JsonSerializable
     /** @var array */
     public $fixVersions;
 
-    /** @var Reporter|null */
+    /** @var \JiraRestApi\Issue\Reporter|null */
     public $creator;
 
     /** @var object|null */
@@ -71,7 +71,7 @@ class IssueField implements \JsonSerializable
     /** @var object|null */
     public $worklog;
 
-    /** @var Reporter|null */
+    /** @var \JiraRestApi\Issue\Reporter|null */
     public $assignee;
 
     /** @var \JiraRestApi\Issue\Version[] */
@@ -98,7 +98,7 @@ class IssueField implements \JsonSerializable
     /** @var array */
     public $issuelinks;
 
-    /** @var Issue[] */
+    /** @var \JiraRestApi\Issue\Issue[] */
     public $subtasks;
 
     /** @var int */
@@ -122,7 +122,7 @@ class IssueField implements \JsonSerializable
     /** @var array|null */
     public $customFields;
 
-    /** @var SecurityScheme|null */
+    /** @var \JiraRestApi\Issue\SecurityScheme|null */
     public $security;
 
     public function __construct($updateIssue = false)
diff --git a/src/Issue/IssueSearchResult.php b/src/Issue/IssueSearchResult.php
index af110216..3c0cb70c 100644
--- a/src/Issue/IssueSearchResult.php
+++ b/src/Issue/IssueSearchResult.php
@@ -34,7 +34,7 @@ class IssueSearchResult
     public $total;
 
     /**
-     * @var Issue[]
+     * @var \JiraRestApi\Issue\Issue[]
      */
     public $issues;
 
diff --git a/src/Issue/IssueStatus.php b/src/Issue/IssueStatus.php
index f6e9ef08..baa8e6f3 100644
--- a/src/Issue/IssueStatus.php
+++ b/src/Issue/IssueStatus.php
@@ -19,7 +19,7 @@ class IssueStatus implements \JsonSerializable
     /* @var string */
     public $name;
 
-    /* @var Statuscategory */
+    /* @var \JiraRestApi\Issue\Statuscategory */
     public $statuscategory;
 
     public function jsonSerialize()
diff --git a/src/Issue/IssueType.php b/src/Issue/IssueType.php
index dc982f25..b2220b17 100644
--- a/src/Issue/IssueType.php
+++ b/src/Issue/IssueType.php
@@ -22,7 +22,7 @@ class IssueType implements \JsonSerializable
     /** @var bool */
     public $subtask;
 
-    /** @var IssueStatus[] */
+    /** @var \JiraRestApi\Issue\IssueStatus[] */
     public $statuses;
 
     public function jsonSerialize()
diff --git a/src/Issue/RemoteIssueLink.php b/src/Issue/RemoteIssueLink.php
index 4f4bc270..5c23e2bf 100644
--- a/src/Issue/RemoteIssueLink.php
+++ b/src/Issue/RemoteIssueLink.php
@@ -19,7 +19,7 @@ class RemoteIssueLink implements \JsonSerializable
     /** @var string|null */
     public $relationship;
 
-    /** @var RemoteIssueLinkObject|null */
+    /** @var \JiraRestApi\Issue\RemoteIssueLinkObject|null */
     public $object;
 
     public function jsonSerialize()
diff --git a/src/Issue/Transition.php b/src/Issue/Transition.php
index 337b1834..acfd6fd5 100644
--- a/src/Issue/Transition.php
+++ b/src/Issue/Transition.php
@@ -13,13 +13,13 @@ class Transition implements \JsonSerializable
     /** @var string */
     public $name;
 
-    /** @var TransitionTo */
+    /** @var \JiraRestApi\Issue\TransitionTo */
     public $to;
 
     /** @var array */
     public $fields;
 
-    /** @var IssueField */
+    /** @var \JiraRestApi\Issue\IssueField */
     public $issueFields;
 
     /** @var array */