diff --git a/tests/Validation/ValidationTest.php b/tests/Validation/ValidationTest.php
index a7d3ec1..c3253c9 100644
--- a/tests/Validation/ValidationTest.php
+++ b/tests/Validation/ValidationTest.php
@@ -69,7 +69,7 @@ class ValidationTest extends TestCase
 
         $outputFile = getExpectedValuesFile($testCaseFile);
         if (!file_exists($outputFile)) {
-            file_put_contents(json_encode($actualValues, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES));
+            file_put_contents($outputFile, json_encode($actualValues, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES));
         }
 
         $expectedValues = (array)json_decode(file_get_contents($outputFile));
@@ -153,9 +153,9 @@ class ValidationTest extends TestCase
                     unset($definition->$propertyName->location->range);
                 } elseif ($propertyName === 'extends') {
                     $definition->$propertyName = $definition->$propertyName ?? [];
-                } elseif ($propertyName === 'type') {
+                } elseif ($propertyName === 'type' && $definition->type !== null) {
                     // Class info is not captured by json_encode. It's important for 'type'.
-                    $defsForAssert[$fqn][$propertyName . '__class'] = get_class($definition->$propertyName);
+                    $defsForAssert[$fqn]['type__class'] = get_class($definition->type);
                 }
 
                 $defsForAssert[$fqn][$propertyName] = $definition->$propertyName;
diff --git a/validation/frameworks/_cases/WithReturnTypehints.php.expected.json b/validation/frameworks/_cases/WithReturnTypehints.php.expected.json
index 17a5213..dd00cd5 100644
--- a/validation/frameworks/_cases/WithReturnTypehints.php.expected.json
+++ b/validation/frameworks/_cases/WithReturnTypehints.php.expected.json
@@ -24,7 +24,6 @@
                 },
                 "containerName": "Fixtures"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -43,7 +42,6 @@
                 },
                 "containerName": "Fixtures\\Prophecy"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/anonymousClassMembersShouldNotBeSymbols.php.expected.json b/validation/frameworks/_cases/anonymousClassMembersShouldNotBeSymbols.php.expected.json
index 719e388..b0a0982 100644
--- a/validation/frameworks/_cases/anonymousClassMembersShouldNotBeSymbols.php.expected.json
+++ b/validation/frameworks/_cases/anonymousClassMembersShouldNotBeSymbols.php.expected.json
@@ -14,7 +14,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         }
diff --git a/validation/frameworks/_cases/arrayValueShouldBeBoolean.php.expected.json b/validation/frameworks/_cases/arrayValueShouldBeBoolean.php.expected.json
index 78acadd..c461f3e 100644
--- a/validation/frameworks/_cases/arrayValueShouldBeBoolean.php.expected.json
+++ b/validation/frameworks/_cases/arrayValueShouldBeBoolean.php.expected.json
@@ -14,7 +14,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/caseStatement1.php.expected.json b/validation/frameworks/_cases/caseStatement1.php.expected.json
index 545de32..c302139 100644
--- a/validation/frameworks/_cases/caseStatement1.php.expected.json
+++ b/validation/frameworks/_cases/caseStatement1.php.expected.json
@@ -21,7 +21,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         }
diff --git a/validation/frameworks/_cases/classDefinition1.php.expected.json b/validation/frameworks/_cases/classDefinition1.php.expected.json
index 52dd9f6..efd937a 100644
--- a/validation/frameworks/_cases/classDefinition1.php.expected.json
+++ b/validation/frameworks/_cases/classDefinition1.php.expected.json
@@ -21,7 +21,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -38,7 +37,6 @@
                 },
                 "containerName": "TestNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/classProperty1.php.expected.json b/validation/frameworks/_cases/classProperty1.php.expected.json
index 5affe9d..56c8782 100644
--- a/validation/frameworks/_cases/classProperty1.php.expected.json
+++ b/validation/frameworks/_cases/classProperty1.php.expected.json
@@ -21,7 +21,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -38,7 +37,6 @@
                 },
                 "containerName": "TestNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/constants.php.expected.json b/validation/frameworks/_cases/constants.php.expected.json
index 0c95336..228f838 100644
--- a/validation/frameworks/_cases/constants.php.expected.json
+++ b/validation/frameworks/_cases/constants.php.expected.json
@@ -21,7 +21,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -38,7 +37,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/constants2.php.expected.json b/validation/frameworks/_cases/constants2.php.expected.json
index ee44131..0404006 100644
--- a/validation/frameworks/_cases/constants2.php.expected.json
+++ b/validation/frameworks/_cases/constants2.php.expected.json
@@ -21,7 +21,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -38,7 +37,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/constants3.php.expected.json b/validation/frameworks/_cases/constants3.php.expected.json
index 35b13da..0ddad8c 100644
--- a/validation/frameworks/_cases/constants3.php.expected.json
+++ b/validation/frameworks/_cases/constants3.php.expected.json
@@ -21,7 +21,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -38,7 +37,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/constants4.php.expected.json b/validation/frameworks/_cases/constants4.php.expected.json
index 8f0752a..a1fe663 100644
--- a/validation/frameworks/_cases/constants4.php.expected.json
+++ b/validation/frameworks/_cases/constants4.php.expected.json
@@ -21,7 +21,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -38,7 +37,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/constants5.php.expected.json b/validation/frameworks/_cases/constants5.php.expected.json
index 0a3b68c..c7ebff9 100644
--- a/validation/frameworks/_cases/constants5.php.expected.json
+++ b/validation/frameworks/_cases/constants5.php.expected.json
@@ -18,7 +18,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -35,7 +34,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/constantsInFunctionParamDefault.php.expected.json b/validation/frameworks/_cases/constantsInFunctionParamDefault.php.expected.json
index 8ba8a2f..89613e9 100644
--- a/validation/frameworks/_cases/constantsInFunctionParamDefault.php.expected.json
+++ b/validation/frameworks/_cases/constantsInFunctionParamDefault.php.expected.json
@@ -18,7 +18,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/docBlocksOnNamespaceDefinition.php.expected.json b/validation/frameworks/_cases/docBlocksOnNamespaceDefinition.php.expected.json
index 50afd5e..1e72d0d 100644
--- a/validation/frameworks/_cases/docBlocksOnNamespaceDefinition.php.expected.json
+++ b/validation/frameworks/_cases/docBlocksOnNamespaceDefinition.php.expected.json
@@ -14,7 +14,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         }
diff --git a/validation/frameworks/_cases/exceptions1.php.expected.json b/validation/frameworks/_cases/exceptions1.php.expected.json
index debebd2..1204779 100644
--- a/validation/frameworks/_cases/exceptions1.php.expected.json
+++ b/validation/frameworks/_cases/exceptions1.php.expected.json
@@ -14,7 +14,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         }
diff --git a/validation/frameworks/_cases/ifStatement1.php.expected.json b/validation/frameworks/_cases/ifStatement1.php.expected.json
index 26d91dc..1341d08 100644
--- a/validation/frameworks/_cases/ifStatement1.php.expected.json
+++ b/validation/frameworks/_cases/ifStatement1.php.expected.json
@@ -21,7 +21,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         }
diff --git a/validation/frameworks/_cases/interfaceProperty.php.expected.json b/validation/frameworks/_cases/interfaceProperty.php.expected.json
index a4787ce..56dbc27 100644
--- a/validation/frameworks/_cases/interfaceProperty.php.expected.json
+++ b/validation/frameworks/_cases/interfaceProperty.php.expected.json
@@ -14,7 +14,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         }
diff --git a/validation/frameworks/_cases/magicConstantsShouldBeGlobal.php.expected.json b/validation/frameworks/_cases/magicConstantsShouldBeGlobal.php.expected.json
index 9e5002b..95737a9 100644
--- a/validation/frameworks/_cases/magicConstantsShouldBeGlobal.php.expected.json
+++ b/validation/frameworks/_cases/magicConstantsShouldBeGlobal.php.expected.json
@@ -14,7 +14,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         }
diff --git a/validation/frameworks/_cases/magicConsts.php.expected.json b/validation/frameworks/_cases/magicConsts.php.expected.json
index ce249ba..ddbe096 100644
--- a/validation/frameworks/_cases/magicConsts.php.expected.json
+++ b/validation/frameworks/_cases/magicConsts.php.expected.json
@@ -14,7 +14,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/memberAccess1.php.expected.json b/validation/frameworks/_cases/memberAccess1.php.expected.json
index 3e4d354..66601b8 100644
--- a/validation/frameworks/_cases/memberAccess1.php.expected.json
+++ b/validation/frameworks/_cases/memberAccess1.php.expected.json
@@ -21,7 +21,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -38,7 +37,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/memberAccess2.php.expected.json b/validation/frameworks/_cases/memberAccess2.php.expected.json
index 69a1e6a..ad94aa6 100644
--- a/validation/frameworks/_cases/memberAccess2.php.expected.json
+++ b/validation/frameworks/_cases/memberAccess2.php.expected.json
@@ -21,7 +21,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -38,7 +37,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/memberAccess3.php.expected.json b/validation/frameworks/_cases/memberAccess3.php.expected.json
index 6486a9c..68e4ae3 100644
--- a/validation/frameworks/_cases/memberAccess3.php.expected.json
+++ b/validation/frameworks/_cases/memberAccess3.php.expected.json
@@ -36,7 +36,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -53,7 +52,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/memberAccess4.php.expected.json b/validation/frameworks/_cases/memberAccess4.php.expected.json
index 78887b3..c6b939e 100644
--- a/validation/frameworks/_cases/memberAccess4.php.expected.json
+++ b/validation/frameworks/_cases/memberAccess4.php.expected.json
@@ -27,7 +27,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -44,7 +43,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/memberAccess5.php.expected.json b/validation/frameworks/_cases/memberAccess5.php.expected.json
index 40ee923..60392c4 100644
--- a/validation/frameworks/_cases/memberAccess5.php.expected.json
+++ b/validation/frameworks/_cases/memberAccess5.php.expected.json
@@ -14,7 +14,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -31,7 +30,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/memberCall1.php.expected.json b/validation/frameworks/_cases/memberCall1.php.expected.json
index fd91dc4..b2f8a88 100644
--- a/validation/frameworks/_cases/memberCall1.php.expected.json
+++ b/validation/frameworks/_cases/memberCall1.php.expected.json
@@ -24,7 +24,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -41,7 +40,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/multipleNamespaces.php.expected.json b/validation/frameworks/_cases/multipleNamespaces.php.expected.json
index fdfee7d..5e630c0 100644
--- a/validation/frameworks/_cases/multipleNamespaces.php.expected.json
+++ b/validation/frameworks/_cases/multipleNamespaces.php.expected.json
@@ -27,7 +27,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -44,7 +43,6 @@
                 },
                 "containerName": "MyNamespace1"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -78,7 +76,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -97,7 +94,6 @@
                 },
                 "containerName": "MyNamespace2"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/multiplePreceedingComments.php.expected.json b/validation/frameworks/_cases/multiplePreceedingComments.php.expected.json
index 81331ed..686aa45 100644
--- a/validation/frameworks/_cases/multiplePreceedingComments.php.expected.json
+++ b/validation/frameworks/_cases/multiplePreceedingComments.php.expected.json
@@ -14,7 +14,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/nameToken.php.expected.json b/validation/frameworks/_cases/nameToken.php.expected.json
index 256da00..836cf20 100644
--- a/validation/frameworks/_cases/nameToken.php.expected.json
+++ b/validation/frameworks/_cases/nameToken.php.expected.json
@@ -14,7 +14,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/namespaces2.php.expected.json b/validation/frameworks/_cases/namespaces2.php.expected.json
index a57f872..b3f73eb 100644
--- a/validation/frameworks/_cases/namespaces2.php.expected.json
+++ b/validation/frameworks/_cases/namespaces2.php.expected.json
@@ -27,7 +27,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         }
diff --git a/validation/frameworks/_cases/namespaces5.php.expected.json b/validation/frameworks/_cases/namespaces5.php.expected.json
index 4a9b18d..ef19aef 100644
--- a/validation/frameworks/_cases/namespaces5.php.expected.json
+++ b/validation/frameworks/_cases/namespaces5.php.expected.json
@@ -36,7 +36,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         }
diff --git a/validation/frameworks/_cases/namespaces6.php.expected.json b/validation/frameworks/_cases/namespaces6.php.expected.json
index 4c3e285..0acbf4a 100644
--- a/validation/frameworks/_cases/namespaces6.php.expected.json
+++ b/validation/frameworks/_cases/namespaces6.php.expected.json
@@ -14,7 +14,6 @@
                 },
                 "containerName": "A"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         }
diff --git a/validation/frameworks/_cases/namespaces8.php.expected.json b/validation/frameworks/_cases/namespaces8.php.expected.json
index 02e5a6e..ec654b6 100644
--- a/validation/frameworks/_cases/namespaces8.php.expected.json
+++ b/validation/frameworks/_cases/namespaces8.php.expected.json
@@ -18,7 +18,6 @@
                 },
                 "containerName": "LanguageServer\\Tests"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         }
diff --git a/validation/frameworks/_cases/objectCreation.php.expected.json b/validation/frameworks/_cases/objectCreation.php.expected.json
index db211bf..070a8f7 100644
--- a/validation/frameworks/_cases/objectCreation.php.expected.json
+++ b/validation/frameworks/_cases/objectCreation.php.expected.json
@@ -18,7 +18,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -35,7 +34,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/objectCreation2.php.expected.json b/validation/frameworks/_cases/objectCreation2.php.expected.json
index f18ab10..e887559 100644
--- a/validation/frameworks/_cases/objectCreation2.php.expected.json
+++ b/validation/frameworks/_cases/objectCreation2.php.expected.json
@@ -21,7 +21,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -38,7 +37,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -55,7 +53,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/objectCreation3.php.expected.json b/validation/frameworks/_cases/objectCreation3.php.expected.json
index 198ef87..745f5d4 100644
--- a/validation/frameworks/_cases/objectCreation3.php.expected.json
+++ b/validation/frameworks/_cases/objectCreation3.php.expected.json
@@ -18,7 +18,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/param1.php.expected.json b/validation/frameworks/_cases/param1.php.expected.json
index 9cf8a0b..c086acc 100644
--- a/validation/frameworks/_cases/param1.php.expected.json
+++ b/validation/frameworks/_cases/param1.php.expected.json
@@ -18,7 +18,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/parent1.php.expected.json b/validation/frameworks/_cases/parent1.php.expected.json
index 1ca0490..2503280 100644
--- a/validation/frameworks/_cases/parent1.php.expected.json
+++ b/validation/frameworks/_cases/parent1.php.expected.json
@@ -21,7 +21,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -38,7 +37,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -74,7 +72,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/parent3.php.expected.json b/validation/frameworks/_cases/parent3.php.expected.json
index 63dab42..37e227f 100644
--- a/validation/frameworks/_cases/parent3.php.expected.json
+++ b/validation/frameworks/_cases/parent3.php.expected.json
@@ -24,7 +24,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -41,7 +40,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -77,7 +75,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/propertyName1.php.expected.json b/validation/frameworks/_cases/propertyName1.php.expected.json
index d858143..56d754c 100644
--- a/validation/frameworks/_cases/propertyName1.php.expected.json
+++ b/validation/frameworks/_cases/propertyName1.php.expected.json
@@ -14,7 +14,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/propertyName2.php.expected.json b/validation/frameworks/_cases/propertyName2.php.expected.json
index 916b014..7adecee 100644
--- a/validation/frameworks/_cases/propertyName2.php.expected.json
+++ b/validation/frameworks/_cases/propertyName2.php.expected.json
@@ -14,7 +14,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/returnType.php.expected.json b/validation/frameworks/_cases/returnType.php.expected.json
index a8be809..aa49588 100644
--- a/validation/frameworks/_cases/returnType.php.expected.json
+++ b/validation/frameworks/_cases/returnType.php.expected.json
@@ -21,7 +21,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/scopedPropertyAccess.php.expected.json b/validation/frameworks/_cases/scopedPropertyAccess.php.expected.json
index 0212fdf..6968698 100644
--- a/validation/frameworks/_cases/scopedPropertyAccess.php.expected.json
+++ b/validation/frameworks/_cases/scopedPropertyAccess.php.expected.json
@@ -21,7 +21,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -38,7 +37,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/scopedPropertyAccess2.php.expected.json b/validation/frameworks/_cases/scopedPropertyAccess2.php.expected.json
index 375b992..11b6267 100644
--- a/validation/frameworks/_cases/scopedPropertyAccess2.php.expected.json
+++ b/validation/frameworks/_cases/scopedPropertyAccess2.php.expected.json
@@ -18,7 +18,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         }
diff --git a/validation/frameworks/_cases/scopedPropertyAccess3.php.expected.json b/validation/frameworks/_cases/scopedPropertyAccess3.php.expected.json
index be2c0c3..fe417b3 100644
--- a/validation/frameworks/_cases/scopedPropertyAccess3.php.expected.json
+++ b/validation/frameworks/_cases/scopedPropertyAccess3.php.expected.json
@@ -21,7 +21,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/scopedPropertyAccess5.php.expected.json b/validation/frameworks/_cases/scopedPropertyAccess5.php.expected.json
index 79e7374..b88e83e 100644
--- a/validation/frameworks/_cases/scopedPropertyAccess5.php.expected.json
+++ b/validation/frameworks/_cases/scopedPropertyAccess5.php.expected.json
@@ -27,7 +27,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/self1.php.expected.json b/validation/frameworks/_cases/self1.php.expected.json
index a6a0a49..d6c1ccd 100644
--- a/validation/frameworks/_cases/self1.php.expected.json
+++ b/validation/frameworks/_cases/self1.php.expected.json
@@ -24,7 +24,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -41,7 +40,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -77,7 +75,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/self2.php.expected.json b/validation/frameworks/_cases/self2.php.expected.json
index 4820363..4416af5 100644
--- a/validation/frameworks/_cases/self2.php.expected.json
+++ b/validation/frameworks/_cases/self2.php.expected.json
@@ -24,7 +24,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -41,7 +40,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -77,7 +75,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/self3.php.expected.json b/validation/frameworks/_cases/self3.php.expected.json
index 9a5f633..a75d4cd 100644
--- a/validation/frameworks/_cases/self3.php.expected.json
+++ b/validation/frameworks/_cases/self3.php.expected.json
@@ -24,7 +24,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -41,7 +40,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -77,7 +75,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/self4.php.expected.json b/validation/frameworks/_cases/self4.php.expected.json
index b45c143..fe688f3 100644
--- a/validation/frameworks/_cases/self4.php.expected.json
+++ b/validation/frameworks/_cases/self4.php.expected.json
@@ -27,7 +27,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -44,7 +43,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/self5.php.expected.json b/validation/frameworks/_cases/self5.php.expected.json
index a03daff..914cf1b 100644
--- a/validation/frameworks/_cases/self5.php.expected.json
+++ b/validation/frameworks/_cases/self5.php.expected.json
@@ -18,7 +18,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -35,7 +34,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/static1.php.expected.json b/validation/frameworks/_cases/static1.php.expected.json
index 315a05e..3a7ddcc 100644
--- a/validation/frameworks/_cases/static1.php.expected.json
+++ b/validation/frameworks/_cases/static1.php.expected.json
@@ -24,7 +24,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -41,7 +40,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -77,7 +75,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/static2.php.expected.json b/validation/frameworks/_cases/static2.php.expected.json
index 9dd9249..73dbf9b 100644
--- a/validation/frameworks/_cases/static2.php.expected.json
+++ b/validation/frameworks/_cases/static2.php.expected.json
@@ -24,7 +24,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -41,7 +40,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -77,7 +75,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/static3.php.expected.json b/validation/frameworks/_cases/static3.php.expected.json
index 88f1db8..265a93b 100644
--- a/validation/frameworks/_cases/static3.php.expected.json
+++ b/validation/frameworks/_cases/static3.php.expected.json
@@ -24,7 +24,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -41,7 +40,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -77,7 +75,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/static4.php.expected.json b/validation/frameworks/_cases/static4.php.expected.json
index 6cca3db..d0b6aa9 100644
--- a/validation/frameworks/_cases/static4.php.expected.json
+++ b/validation/frameworks/_cases/static4.php.expected.json
@@ -21,7 +21,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
@@ -40,7 +39,6 @@
                 },
                 "containerName": "MyNamespace"
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/stringVariable.php.expected.json b/validation/frameworks/_cases/stringVariable.php.expected.json
index c5b43bf..6afd5c2 100644
--- a/validation/frameworks/_cases/stringVariable.php.expected.json
+++ b/validation/frameworks/_cases/stringVariable.php.expected.json
@@ -14,7 +14,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },
diff --git a/validation/frameworks/_cases/testQualifiedNameOutsideOfNamespace.php.expected.json b/validation/frameworks/_cases/testQualifiedNameOutsideOfNamespace.php.expected.json
index 2a65fa6..96cc2b8 100644
--- a/validation/frameworks/_cases/testQualifiedNameOutsideOfNamespace.php.expected.json
+++ b/validation/frameworks/_cases/testQualifiedNameOutsideOfNamespace.php.expected.json
@@ -18,7 +18,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         }
diff --git a/validation/frameworks/_cases/verifyFqsenOnClassProperty.php.expected.json b/validation/frameworks/_cases/verifyFqsenOnClassProperty.php.expected.json
index af4062b..42ef6d7 100644
--- a/validation/frameworks/_cases/verifyFqsenOnClassProperty.php.expected.json
+++ b/validation/frameworks/_cases/verifyFqsenOnClassProperty.php.expected.json
@@ -21,7 +21,6 @@
                 },
                 "containerName": ""
             },
-            "type__class": "LanguageServer\\Tests\\ValidationTest",
             "type": null,
             "documentation": null
         },