diff --git a/src/Psalm/Checker/StatementsChecker.php b/src/Psalm/Checker/StatementsChecker.php
index 4fadbdb03..585e7bac7 100644
--- a/src/Psalm/Checker/StatementsChecker.php
+++ b/src/Psalm/Checker/StatementsChecker.php
@@ -38,8 +38,10 @@ use Psalm\Issue\TypeCoercion;
 use Psalm\Issue\UndefinedClass;
 use Psalm\Issue\UndefinedConstant;
 use Psalm\Issue\UndefinedFunction;
-use Psalm\Issue\UndefinedProperty;
-use Psalm\Issue\UndefinedThisProperty;
+use Psalm\Issue\UndefinedPropertyAssignment;
+use Psalm\Issue\UndefinedPropertyFetch;
+use Psalm\Issue\UndefinedThisPropertyAssignment;
+use Psalm\Issue\UndefinedThisPropertyFetch;
 use Psalm\Issue\UndefinedVariable;
 
 use Psalm\Type;
@@ -1505,7 +1507,7 @@ class StatementsChecker
             if (!$class_properties || !isset($class_properties[$stmt->name])) {
                 if ($stmt_var_id === 'this') {
                     if (IssueBuffer::accepts(
-                        new UndefinedThisProperty(
+                        new UndefinedThisPropertyFetch(
                             'Property ' . $lhs_type_part->value .'::$' . $stmt->name . ' is not defined',
                             $this->checked_file_name,
                             $stmt->getLine()
@@ -1517,7 +1519,7 @@ class StatementsChecker
                 }
                 else {
                     if (IssueBuffer::accepts(
-                        new UndefinedProperty(
+                        new UndefinedPropertyFetch(
                             'Property ' . $lhs_type_part->value .'::$' . $stmt->name . ' is not defined',
                             $this->checked_file_name,
                             $stmt->getLine()
@@ -1724,7 +1726,7 @@ class StatementsChecker
                 if (!isset($class_properties[$prop_name])) {
                     if ($stmt->var->name === 'this') {
                         if (IssueBuffer::accepts(
-                            new UndefinedThisProperty(
+                            new UndefinedThisPropertyAssignment(
                                 'Instance property ' . $lhs_type_part->value . '::' . $prop_name . ' is not defined',
                                 $this->checked_file_name,
                                 $stmt->getLine()
@@ -1736,7 +1738,7 @@ class StatementsChecker
                     }
                     else {
                         if (IssueBuffer::accepts(
-                            new UndefinedProperty(
+                            new UndefinedPropertyAssignment(
                                 'Instance property ' . $lhs_type_part->value . '::' . $prop_name . ' is not defined',
                                 $this->checked_file_name,
                                 $stmt->getLine()
@@ -3558,7 +3560,7 @@ class StatementsChecker
                 }
                 else {
                     IssueBuffer::add(
-                        new UndefinedProperty('Static property ' . $var_id . ' does not exist', $this->checked_file_name, $stmt->getLine())
+                        new UndefinedPropertyFetch('Static property ' . $var_id . ' does not exist', $this->checked_file_name, $stmt->getLine())
                     );
                 }
 
diff --git a/src/Psalm/Issue/UndefinedProperty.php b/src/Psalm/Issue/UndefinedProperty.php
deleted file mode 100644
index 8b0e070a7..000000000
--- a/src/Psalm/Issue/UndefinedProperty.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Psalm\Issue;
-
-class UndefinedProperty extends CodeError
-{
-}
diff --git a/src/Psalm/Issue/UndefinedPropertyAssignment.php b/src/Psalm/Issue/UndefinedPropertyAssignment.php
new file mode 100644
index 000000000..fb34abc91
--- /dev/null
+++ b/src/Psalm/Issue/UndefinedPropertyAssignment.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Psalm\Issue;
+
+class UndefinedPropertyAssignment extends CodeError
+{
+}
diff --git a/src/Psalm/Issue/UndefinedPropertyFetch.php b/src/Psalm/Issue/UndefinedPropertyFetch.php
new file mode 100644
index 000000000..e10307a1d
--- /dev/null
+++ b/src/Psalm/Issue/UndefinedPropertyFetch.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Psalm\Issue;
+
+class UndefinedPropertyFetch extends CodeError
+{
+}
diff --git a/src/Psalm/Issue/UndefinedThisProperty.php b/src/Psalm/Issue/UndefinedThisProperty.php
deleted file mode 100644
index 4e98e12e7..000000000
--- a/src/Psalm/Issue/UndefinedThisProperty.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Psalm\Issue;
-
-class UndefinedThisProperty extends UndefinedProperty
-{
-}
diff --git a/src/Psalm/Issue/UndefinedThisPropertyAssignment.php b/src/Psalm/Issue/UndefinedThisPropertyAssignment.php
new file mode 100644
index 000000000..98abc209e
--- /dev/null
+++ b/src/Psalm/Issue/UndefinedThisPropertyAssignment.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Psalm\Issue;
+
+class UndefinedThisPropertyAssignment extends UndefinedPropertyAssignment
+{
+}
diff --git a/src/Psalm/Issue/UndefinedThisPropertyFetch.php b/src/Psalm/Issue/UndefinedThisPropertyFetch.php
new file mode 100644
index 000000000..cb6e58d64
--- /dev/null
+++ b/src/Psalm/Issue/UndefinedThisPropertyFetch.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Psalm\Issue;
+
+class UndefinedThisPropertyFetch extends UndefinedPropertyFetch
+{
+}