diff --git a/src/Psalm/Checker/FileChecker.php b/src/Psalm/Checker/FileChecker.php
index 5c4a738b9..0cad372b5 100644
--- a/src/Psalm/Checker/FileChecker.php
+++ b/src/Psalm/Checker/FileChecker.php
@@ -63,7 +63,7 @@ class FileChecker extends SourceChecker implements StatementsSource
     protected $function_checkers = [];
 
     /**
-     * @var ?Context
+     * @var null|Context
      */
     public $context;
 
diff --git a/src/Psalm/Checker/Statements/Expression/CallChecker.php b/src/Psalm/Checker/Statements/Expression/CallChecker.php
index 252e73157..1b2d65cb2 100644
--- a/src/Psalm/Checker/Statements/Expression/CallChecker.php
+++ b/src/Psalm/Checker/Statements/Expression/CallChecker.php
@@ -2325,7 +2325,7 @@ class CallChecker
             $array_arg_types[] = $array_arg_type;
         }
 
-        /** @var ?PhpParser\Node\Arg */
+        /** @var null|PhpParser\Node\Arg */
         $closure_arg = isset($args[$closure_index]) ? $args[$closure_index] : null;
 
         /** @var Type\Union|null */
diff --git a/src/Psalm/CodeLocation.php b/src/Psalm/CodeLocation.php
index 5f36824a0..fab0f5d44 100644
--- a/src/Psalm/CodeLocation.php
+++ b/src/Psalm/CodeLocation.php
@@ -41,7 +41,7 @@ class CodeLocation
     /** @var string */
     private $snippet = '';
 
-    /** @var ?string */
+    /** @var null|string */
     private $text;
 
     /** @var int|null */
@@ -50,13 +50,13 @@ class CodeLocation
     /** @var int|null */
     private $docblock_line_number;
 
-    /** @var ?int */
+    /** @var null|int */
     private $regex_type;
 
     /** @var bool */
     private $have_recalculated = false;
 
-    /** @var ?CodeLocation */
+    /** @var null|CodeLocation */
     public $previous_location;
 
     const VAR_TYPE = 0;
diff --git a/src/Psalm/Codebase.php b/src/Psalm/Codebase.php
index 5dab0cdd2..579639ff8 100644
--- a/src/Psalm/Codebase.php
+++ b/src/Psalm/Codebase.php
@@ -169,7 +169,7 @@ class Codebase
     public $collect_references = false;
 
     /**
-     * @var ?array<string, string>
+     * @var null|array<string, string>
      */
     private $composer_classmap;
 
diff --git a/src/Psalm/Context.php b/src/Psalm/Context.php
index dda0f2538..1a5420f84 100644
--- a/src/Psalm/Context.php
+++ b/src/Psalm/Context.php
@@ -45,7 +45,7 @@ class Context
     public $inside_isset = false;
 
     /**
-     * @var ?CodeLocation
+     * @var null|CodeLocation
      */
     public $include_location = null;
 
diff --git a/src/Psalm/FileManipulation/FunctionDocblockManipulator.php b/src/Psalm/FileManipulation/FunctionDocblockManipulator.php
index 1aef9ab92..3ba9e27a1 100644
--- a/src/Psalm/FileManipulation/FunctionDocblockManipulator.php
+++ b/src/Psalm/FileManipulation/FunctionDocblockManipulator.php
@@ -32,25 +32,25 @@ class FunctionDocblockManipulator
     /** @var int */
     private $return_typehint_area_start;
 
-    /** @var ?int */
+    /** @var null|int */
     private $return_typehint_colon_start;
 
-    /** @var ?int */
+    /** @var null|int */
     private $return_typehint_start;
 
-    /** @var ?int */
+    /** @var null|int */
     private $return_typehint_end;
 
-    /** @var ?string */
+    /** @var null|string */
     private $new_php_return_type;
 
     /** @var bool */
     private $return_type_is_php_compatible = false;
 
-    /** @var ?string */
+    /** @var null|string */
     private $new_phpdoc_return_type;
 
-    /** @var ?string */
+    /** @var null|string */
     private $new_psalm_return_type;
 
     /** @var array<string, int> */
diff --git a/src/Psalm/Type/Union.php b/src/Psalm/Type/Union.php
index aedc90a9a..279ff05f4 100644
--- a/src/Psalm/Type/Union.php
+++ b/src/Psalm/Type/Union.php
@@ -60,7 +60,7 @@ class Union
      */
     public $by_ref = false;
 
-    /** @var ?string */
+    /** @var null|string */
     private $id;
 
     /**