diff --git a/config.xsd b/config.xsd
index f451608af..105f4c5fd 100644
--- a/config.xsd
+++ b/config.xsd
@@ -146,11 +146,11 @@
             <xs:element name="ContinueOutsideLoop" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="ConflictingReferenceConstraint" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="DeprecatedClass" type="ClassIssueHandlerType" minOccurs="0" />
-            <xs:element name="DeprecatedConstant" type="ClassIssueHandlerType" minOccurs="0" />
-            <xs:element name="DeprecatedInterface" type="IssueHandlerType" minOccurs="0" />
+            <xs:element name="DeprecatedConstant" type="IssueHandlerType" minOccurs="0" />
+            <xs:element name="DeprecatedInterface" type="ClassIssueHandlerType" minOccurs="0" />
             <xs:element name="DeprecatedMethod" type="MethodIssueHandlerType" minOccurs="0" />
             <xs:element name="DeprecatedProperty" type="PropertyIssueHandlerType" minOccurs="0" />
-            <xs:element name="DeprecatedTrait" type="ClassIssueHandlerType" minOccurs="0" />
+            <xs:element name="DeprecatedTrait" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="DocblockTypeContradiction" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="DuplicateArrayKey" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="DuplicateParam" type="IssueHandlerType" minOccurs="0" />
diff --git a/src/Psalm/Internal/Analyzer/ClassAnalyzer.php b/src/Psalm/Internal/Analyzer/ClassAnalyzer.php
index 01a825e88..ebb30e9a6 100644
--- a/src/Psalm/Internal/Analyzer/ClassAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/ClassAnalyzer.php
@@ -251,7 +251,8 @@ class ClassAnalyzer extends ClassLikeAnalyzer
                     if (IssueBuffer::accepts(
                         new DeprecatedClass(
                             $parent_fq_class_name . ' is marked deprecated',
-                            $code_location
+                            $code_location,
+                            $parent_fq_class_name
                         ),
                         array_merge($storage->suppressed_issues, $this->getSuppressedIssues())
                     )) {
@@ -270,7 +271,8 @@ class ClassAnalyzer extends ClassLikeAnalyzer
                         if (IssueBuffer::accepts(
                             new InternalClass(
                                 $parent_fq_class_name . ' is marked internal',
-                                $code_location
+                                $code_location,
+                                $parent_fq_class_name
                             ),
                             array_merge($storage->suppressed_issues, $this->getSuppressedIssues())
                         )) {
@@ -285,7 +287,8 @@ class ClassAnalyzer extends ClassLikeAnalyzer
                     if (IssueBuffer::accepts(
                         new InternalClass(
                             $parent_fq_class_name . ' is internal to ' . $parent_class_storage->psalm_internal,
-                            $code_location
+                            $code_location,
+                            $parent_fq_class_name
                         ),
                         array_merge($storage->suppressed_issues, $this->getSuppressedIssues())
                     )) {
@@ -376,7 +379,8 @@ class ClassAnalyzer extends ClassLikeAnalyzer
                 if (IssueBuffer::accepts(
                     new UndefinedInterface(
                         $fq_interface_name . ' is not an interface',
-                        $code_location
+                        $code_location,
+                        $fq_interface_name
                     ),
                     array_merge($storage->suppressed_issues, $this->getSuppressedIssues())
                 )) {
@@ -461,7 +465,8 @@ class ClassAnalyzer extends ClassLikeAnalyzer
                     if (IssueBuffer::accepts(
                         new DeprecatedInterface(
                             $interface_name . ' is marked deprecated',
-                            $code_location
+                            $code_location,
+                            $interface_name
                         ),
                         array_merge($storage->suppressed_issues, $this->getSuppressedIssues())
                     )) {
diff --git a/src/Psalm/Internal/Analyzer/InterfaceAnalyzer.php b/src/Psalm/Internal/Analyzer/InterfaceAnalyzer.php
index 20fb1158b..93d13ca79 100644
--- a/src/Psalm/Internal/Analyzer/InterfaceAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/InterfaceAnalyzer.php
@@ -63,7 +63,8 @@ class InterfaceAnalyzer extends ClassLikeAnalyzer
                     if (\Psalm\IssueBuffer::accepts(
                         new UndefinedInterface(
                             $extended_interface_name . ' is not an interface',
-                            $code_location
+                            $code_location,
+                            $extended_interface_name
                         ),
                         $this->getSuppressedIssues()
                     )) {
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NewAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NewAnalyzer.php
index 0a8c64c44..85a38b775 100644
--- a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NewAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NewAnalyzer.php
@@ -311,7 +311,8 @@ class NewAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expression\CallAna
                     if (IssueBuffer::accepts(
                         new DeprecatedClass(
                             $fq_class_name . ' is marked deprecated',
-                            new CodeLocation($statements_analyzer->getSource(), $stmt)
+                            new CodeLocation($statements_analyzer->getSource(), $stmt),
+                            $fq_class_name
                         ),
                         $statements_analyzer->getSuppressedIssues()
                     )) {
@@ -325,7 +326,8 @@ class NewAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expression\CallAna
                         if (IssueBuffer::accepts(
                             new InternalClass(
                                 $fq_class_name . ' is marked internal to ' . $storage->psalm_internal,
-                                new CodeLocation($statements_analyzer->getSource(), $stmt)
+                                new CodeLocation($statements_analyzer->getSource(), $stmt),
+                                $fq_class_name
                             ),
                             $statements_analyzer->getSuppressedIssues()
                         )) {
@@ -339,7 +341,8 @@ class NewAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expression\CallAna
                         if (IssueBuffer::accepts(
                             new InternalClass(
                                 $fq_class_name . ' is marked internal',
-                                new CodeLocation($statements_analyzer->getSource(), $stmt)
+                                new CodeLocation($statements_analyzer->getSource(), $stmt),
+                                $fq_class_name
                             ),
                             $statements_analyzer->getSuppressedIssues()
                         )) {
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php
index 8eccbe8b0..3c8a95e04 100644
--- a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php
@@ -585,7 +585,8 @@ class StaticCallAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expression\
                     if (IssueBuffer::accepts(
                         new DeprecatedClass(
                             $fq_class_name . ' is marked deprecated',
-                            new CodeLocation($statements_analyzer->getSource(), $stmt)
+                            new CodeLocation($statements_analyzer->getSource(), $stmt),
+                            $fq_class_name
                         ),
                         $statements_analyzer->getSuppressedIssues()
                     )) {
@@ -600,7 +601,8 @@ class StaticCallAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expression\
                     if (IssueBuffer::accepts(
                         new InternalClass(
                             $fq_class_name . ' is marked internal to ' . $class_storage->psalm_internal,
-                            new CodeLocation($statements_analyzer->getSource(), $stmt)
+                            new CodeLocation($statements_analyzer->getSource(), $stmt),
+                            $fq_class_name
                         ),
                         $statements_analyzer->getSuppressedIssues()
                     )) {
@@ -617,7 +619,8 @@ class StaticCallAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expression\
                         if (IssueBuffer::accepts(
                             new InternalClass(
                                 $fq_class_name . ' is marked internal',
-                                new CodeLocation($statements_analyzer->getSource(), $stmt)
+                                new CodeLocation($statements_analyzer->getSource(), $stmt),
+                                $fq_class_name
                             ),
                             $statements_analyzer->getSuppressedIssues()
                         )) {
diff --git a/src/Psalm/Issue/DeprecatedClass.php b/src/Psalm/Issue/DeprecatedClass.php
index a29fd751b..a48ef5abf 100644
--- a/src/Psalm/Issue/DeprecatedClass.php
+++ b/src/Psalm/Issue/DeprecatedClass.php
@@ -1,6 +1,6 @@
 <?php
 namespace Psalm\Issue;
 
-class DeprecatedClass extends CodeIssue
+class DeprecatedClass extends ClassIssue
 {
 }
diff --git a/src/Psalm/Issue/DeprecatedInterface.php b/src/Psalm/Issue/DeprecatedInterface.php
index 75284ae69..7ca42c87f 100644
--- a/src/Psalm/Issue/DeprecatedInterface.php
+++ b/src/Psalm/Issue/DeprecatedInterface.php
@@ -1,6 +1,6 @@
 <?php
 namespace Psalm\Issue;
 
-class DeprecatedInterface extends CodeIssue
+class DeprecatedInterface extends ClassIssue
 {
 }
diff --git a/src/Psalm/Issue/InternalClass.php b/src/Psalm/Issue/InternalClass.php
index 47825dc73..3218962d1 100644
--- a/src/Psalm/Issue/InternalClass.php
+++ b/src/Psalm/Issue/InternalClass.php
@@ -1,6 +1,6 @@
 <?php
 namespace Psalm\Issue;
 
-class InternalClass extends CodeIssue
+class InternalClass extends ClassIssue
 {
 }
diff --git a/src/Psalm/Issue/UndefinedInterface.php b/src/Psalm/Issue/UndefinedInterface.php
index d0d62b006..d4a2c546f 100644
--- a/src/Psalm/Issue/UndefinedInterface.php
+++ b/src/Psalm/Issue/UndefinedInterface.php
@@ -1,6 +1,6 @@
 <?php
 namespace Psalm\Issue;
 
-class UndefinedInterface extends CodeIssue
+class UndefinedInterface extends ClassIssue
 {
 }