diff --git a/src/Dev/Validation/DatabaseAdminExtension.php b/src/Dev/Validation/DatabaseAdminExtension.php
index e8abf24df80..9907f1d3cbb 100644
--- a/src/Dev/Validation/DatabaseAdminExtension.php
+++ b/src/Dev/Validation/DatabaseAdminExtension.php
@@ -9,7 +9,6 @@
 /**
  * Hook up static validation to the deb/build process
  *
- * @method DatabaseAdmin getOwner()
  */
 class DatabaseAdminExtension extends Extension
 {
diff --git a/src/ORM/DataObject.php b/src/ORM/DataObject.php
index 3e978eb05f0..f380f158bb3 100644
--- a/src/ORM/DataObject.php
+++ b/src/ORM/DataObject.php
@@ -98,7 +98,6 @@
  * If any public method on this class is prefixed with an underscore,
  * the results are cached in memory through {@link cachedCall()}.
  *
- *
  * @property int $ID ID of the DataObject, 0 if the DataObject doesn't exist in database.
  * @property int $OldID ID of object, if deleted
  * @property string $Title
diff --git a/src/ORM/Hierarchy/Hierarchy.php b/src/ORM/Hierarchy/Hierarchy.php
index e1c4bb42fd5..2c7146cad57 100644
--- a/src/ORM/Hierarchy/Hierarchy.php
+++ b/src/ORM/Hierarchy/Hierarchy.php
@@ -24,7 +24,6 @@
  *
  * @property int $ParentID
  * @property DataObject|Hierarchy $owner
- * @method DataObject Parent()
  */
 class Hierarchy extends DataExtension
 {
diff --git a/src/Security/Group.php b/src/Security/Group.php
index 7bf3ed7c9c4..06b283d395c 100755
--- a/src/Security/Group.php
+++ b/src/Security/Group.php
@@ -47,11 +47,12 @@
  *
  * @property int $ParentID ID of parent group
  *
- * @method Group Parent() Return parent group
- * @method HasManyList Permissions() List of group permissions
- * @method HasManyList Groups() List of child groups
- * @method ManyManyList Roles() List of PermissionRoles
  * @mixin Hierarchy
+ * @method HasManyList<Group> Groups()
+ * @method ManyManyList<Member> Members()
+ * @method Group Parent()
+ * @method HasManyList<Permission> Permissions()
+ * @method ManyManyList<PermissionRole> Roles()
  */
 class Group extends DataObject
 {
diff --git a/src/Security/InheritedPermissionsExtension.php b/src/Security/InheritedPermissionsExtension.php
index 291e84bcd29..5240246c7f2 100644
--- a/src/Security/InheritedPermissionsExtension.php
+++ b/src/Security/InheritedPermissionsExtension.php
@@ -10,10 +10,10 @@
  *
  * @property string $CanViewType
  * @property string $CanEditType
- * @method ManyManyList ViewerGroups()
- * @method ManyManyList EditorGroups()
- * @method ManyManyList ViewerMembers()
- * @method ManyManyList EditorMembers()
+ * @method ManyManyList<Group> EditorGroups()
+ * @method ManyManyList<Member> EditorMembers()
+ * @method ManyManyList<Group> ViewerGroups()
+ * @method ManyManyList<Member> ViewerMembers()
  */
 class InheritedPermissionsExtension extends DataExtension
 {
diff --git a/src/Security/LoginAttempt.php b/src/Security/LoginAttempt.php
index 95eb30f1e6f..4ffda5c7616 100644
--- a/src/Security/LoginAttempt.php
+++ b/src/Security/LoginAttempt.php
@@ -20,7 +20,7 @@
  * @property string $IP IP address of user attempting to login
  * @property int $MemberID ID of the Member
  *
- * @method Member Member() Member object of the user trying to log in
+ * @method Member Member()
  */
 class LoginAttempt extends DataObject
 {
diff --git a/src/Security/Member.php b/src/Security/Member.php
index dc309b0da7a..03179c79103 100644
--- a/src/Security/Member.php
+++ b/src/Security/Member.php
@@ -39,8 +39,6 @@
 /**
  * The member class which represents the users of the system
  *
- * @method HasManyList LoggedPasswords()
- * @method HasManyList RememberLoginHashes()
  * @property string $FirstName
  * @property string $Surname
  * @property string $Email
@@ -57,6 +55,9 @@
  * @property int $FailedLoginCount
  * @property string $DateFormat
  * @property string $TimeFormat
+ * @method SilverStripe\ORM\ManyManyList<Group> Groups()
+ * @method HasManyList<MemberPassword> LoggedPasswords()
+ * @method HasManyList<RememberLoginHash> RememberLoginHashes()
  */
 class Member extends DataObject
 {
diff --git a/src/Security/MemberPassword.php b/src/Security/MemberPassword.php
index 751fcd85804..8488671f6c6 100644
--- a/src/Security/MemberPassword.php
+++ b/src/Security/MemberPassword.php
@@ -11,7 +11,7 @@
  * @property string $Salt
  * @property string $PasswordEncryption
  * @property int $MemberID ID of the Member
- * @method Member Member() Owner of the password
+ * @method Member Member()
  */
 class MemberPassword extends DataObject
 {
diff --git a/src/Security/PermissionRole.php b/src/Security/PermissionRole.php
index 92d8a633344..00d8f652728 100644
--- a/src/Security/PermissionRole.php
+++ b/src/Security/PermissionRole.php
@@ -20,8 +20,8 @@
  * @property string Title
  * @property string OnlyAdminCanApply
  *
- * @method HasManyList Codes() List of PermissionRoleCode objects
- * @method ManyManyList Groups() List of Group objects
+ * @method HasManyList<PermissionRoleCode> Codes()
+ * @method SilverStripe\ORM\ManyManyList<Group> Groups()
  */
 class PermissionRole extends DataObject
 {