diff --git a/includes/Bundleable.php b/includes/Bundleable.php
index 2469027f6..1610328ed 100644
--- a/includes/Bundleable.php
+++ b/includes/Bundleable.php
@@ -1,8 +1,6 @@
 <?php
 
 /**
- * Interface Bundleable
- *
  * Indicates that an object can be bundled.
  */
 interface Bundleable {
diff --git a/includes/DiscussionParser.php b/includes/DiscussionParser.php
index 1c3d60302..18ca95829 100644
--- a/includes/DiscussionParser.php
+++ b/includes/DiscussionParser.php
@@ -478,7 +478,7 @@ abstract class EchoDiscussionParser {
 	 * @todo Expand recognisable actions.
 	 *
 	 * @param array $changes Output of EchoEvent::getMachineReadableDiff
-	 * @param string $username Username
+	 * @param string $username
 	 * @param Title|null $title
 	 * @return array[] Array of associative arrays.
 	 *
diff --git a/includes/EchoHooks.php b/includes/EchoHooks.php
index cf685b996..b6214bb0e 100644
--- a/includes/EchoHooks.php
+++ b/includes/EchoHooks.php
@@ -844,7 +844,7 @@ class EchoHooks {
 	/**
 	 * Handler for BeforePageDisplay hook.
 	 * @see http://www.mediawiki.org/wiki/Manual:Hooks/BeforePageDisplay
-	 * @param OutputPage $out OutputPage object
+	 * @param OutputPage $out
 	 * @param Skin $skin Skin being used.
 	 * @return bool true in all cases
 	 */
@@ -1160,7 +1160,7 @@ class EchoHooks {
 	 * @param array $newtalks This will be empty if the user has no new messages
 	 *     or an Array containing links and revisions if there are new messages
 	 * @param User $user The user who is loading the page
-	 * @param OutputPage $out Output object
+	 * @param OutputPage $out
 	 * @return bool Should return false to prevent the new messages alert (OBOD)
 	 *     or true to allow the new messages alert
 	 */
diff --git a/includes/ForeignWikiRequest.php b/includes/ForeignWikiRequest.php
index 064a18ff6..ebf2f3db7 100644
--- a/includes/ForeignWikiRequest.php
+++ b/includes/ForeignWikiRequest.php
@@ -6,7 +6,7 @@ use MediaWiki\Session\SessionManager;
 class EchoForeignWikiRequest {
 
 	/**
-	 * @param User $user User object
+	 * @param User $user
 	 * @param array $params Request parameters
 	 * @param array $wikis Wikis to send the request to
 	 * @param string|null $wikiParam Parameter name to set to the name of the wiki
diff --git a/includes/formatters/EchoIcon.php b/includes/formatters/EchoIcon.php
index 74b90f6a0..5d1b186d9 100644
--- a/includes/formatters/EchoIcon.php
+++ b/includes/formatters/EchoIcon.php
@@ -50,7 +50,7 @@ class EchoIcon {
 	 * Get a link to a rasterized version of the icon
 	 *
 	 * @param string $icon Icon name
-	 * @param string $lang Language
+	 * @param string $lang
 	 * @return string URL to the rasterized version of the icon
 	 */
 	public static function getRasterizedUrl( $icon, $lang ) {