diff --git a/core/lib/Drupal/Core/Executable/ExecutableManagerInterface.php b/core/lib/Drupal/Core/Executable/ExecutableManagerInterface.php
index fa6ef12..3bcf683 100644
--- a/core/lib/Drupal/Core/Executable/ExecutableManagerInterface.php
+++ b/core/lib/Drupal/Core/Executable/ExecutableManagerInterface.php
@@ -20,12 +20,12 @@
    * @param \Drupal\Core\Executable\ExecutableInterface $plugin
    *   An executable plugin instance managed by the implementing manager.
    *
-   * @throws \Drupal\Core\Executable\ExecutableException
-   *   If the plugin could not be executed.
-   *
    * @return mixed
    *   The returned data varies by plugin implementation, e.g. conditions return
    *   the boolean evaluation result.
+   *
+   * @throws \Drupal\Core\Executable\ExecutableException
+   *   If the plugin could not be executed.
    */
   public function execute(ExecutableInterface $plugin);
 
diff --git a/core/lib/Drupal/Core/Extension/module.api.php b/core/lib/Drupal/Core/Extension/module.api.php
index 7d13f74..6dda3cc 100644
--- a/core/lib/Drupal/Core/Extension/module.api.php
+++ b/core/lib/Drupal/Core/Extension/module.api.php
@@ -588,17 +588,17 @@ function hook_install_tasks_alter(&$tasks, $install_state) {
  * @param array $sandbox
  *   Stores information for batch updates. See above for more information.
  *
+ * @return string|null
+ *   Optionally, update hooks may return a translated string that will be
+ *   displayed to the user after the update has completed. If no message is
+ *   returned, no message will be presented to the user.
+ *
  * @throws \Drupal\Core\Utility\UpdateException|PDOException
  *   In case of error, update hooks should throw an instance of
  *   Drupal\Core\Utility\UpdateException with a meaningful message for the user.
  *   If a database query fails for whatever reason, it will throw a
  *   PDOException.
  *
- * @return string|null
- *   Optionally, update hooks may return a translated string that will be
- *   displayed to the user after the update has completed. If no message is
- *   returned, no message will be presented to the user.
- *
  * @ingroup update_api
  *
  * @see batch
@@ -683,17 +683,17 @@ function hook_update_N(&$sandbox) {
  * @param array $sandbox
  *   Stores information for batch updates. See above for more information.
  *
+ * @return string|null
+ *   Optionally, hook_post_update_NAME() hooks may return a translated string
+ *   that will be displayed to the user after the update has completed. If no
+ *   message is returned, no message will be presented to the user.
+ *
  * @throws \Drupal\Core\Utility\UpdateException|PDOException
  *   In case of error, update hooks should throw an instance of
  *   \Drupal\Core\Utility\UpdateException with a meaningful message for the
  *   user. If a database query fails for whatever reason, it will throw a
  *   PDOException.
  *
- * @return string|null
- *   Optionally, hook_post_update_NAME() hooks may return a translated string
- *   that will be displayed to the user after the update has completed. If no
- *   message is returned, no message will be presented to the user.
- *
  * @ingroup update_api
  *
  * @see hook_update_N()
diff --git a/core/lib/Drupal/Core/Field/FieldItemInterface.php b/core/lib/Drupal/Core/Field/FieldItemInterface.php
index ad42da5..1053811 100644
--- a/core/lib/Drupal/Core/Field/FieldItemInterface.php
+++ b/core/lib/Drupal/Core/Field/FieldItemInterface.php
@@ -122,11 +122,11 @@ public function getFieldDefinition();
    * @param $property_name
    *   The name of the property to get; e.g., 'title' or 'name'.
    *
-   * @throws \InvalidArgumentException
-   *   If a not existing property is accessed.
-   *
    * @return \Drupal\Core\TypedData\TypedDataInterface
    *   The property object.
+   *
+   * @throws \InvalidArgumentException
+   *   If a not existing property is accessed.
    */
   public function __get($property_name);
 
diff --git a/core/lib/Drupal/Core/Menu/MenuTreeStorageInterface.php b/core/lib/Drupal/Core/Menu/MenuTreeStorageInterface.php
index c57272b..6608cbb 100644
--- a/core/lib/Drupal/Core/Menu/MenuTreeStorageInterface.php
+++ b/core/lib/Drupal/Core/Menu/MenuTreeStorageInterface.php
@@ -71,11 +71,11 @@ public function loadMultiple(array $ids);
    * @param array $properties
    *   The properties to filter by.
    *
-   * @throws \InvalidArgumentException
-   *   Thrown if an invalid property name is specified in $properties.
-   *
    * @return array
    *   An array of menu link definition arrays.
+   *
+   * @throws \InvalidArgumentException
+   *   Thrown if an invalid property name is specified in $properties.
    */
   public function loadByProperties(array $properties);
 
diff --git a/core/lib/Drupal/Core/ParamConverter/EntityConverter.php b/core/lib/Drupal/Core/ParamConverter/EntityConverter.php
index 172b27b..e1aa189 100644
--- a/core/lib/Drupal/Core/ParamConverter/EntityConverter.php
+++ b/core/lib/Drupal/Core/ParamConverter/EntityConverter.php
@@ -101,11 +101,11 @@ public function applies($definition, $name, Route $route) {
    * @param array $defaults
    *   The route defaults array.
    *
-   * @throws \Drupal\Core\ParamConverter\ParamNotConvertedException
-   *   Thrown when the dynamic entity type is not found in the route defaults.
-   *
    * @return string
    *   The entity type ID.
+   *
+   * @throws \Drupal\Core\ParamConverter\ParamNotConvertedException
+   *   Thrown when the dynamic entity type is not found in the route defaults.
    */
   protected function getEntityTypeFromDefaults($definition, $name, array $defaults) {
     $entity_type_id = substr($definition['type'], strlen('entity:'));
diff --git a/core/lib/Drupal/Core/ParamConverter/ParamConverterManagerInterface.php b/core/lib/Drupal/Core/ParamConverter/ParamConverterManagerInterface.php
index 77f69c5..775304c 100644
--- a/core/lib/Drupal/Core/ParamConverter/ParamConverterManagerInterface.php
+++ b/core/lib/Drupal/Core/ParamConverter/ParamConverterManagerInterface.php
@@ -54,12 +54,12 @@ public function setRouteParameterConverters(RouteCollection $routes);
    * @param array $defaults
    *   The route defaults array.
    *
+   * @return array
+   *   The modified defaults.
+   *
    * @throws \Drupal\Core\ParamConverter\ParamNotConvertedException
    *   If one of the assigned converters returned NULL because the given
    *   variable could not be converted.
-   *
-   * @return array
-   *   The modified defaults.
    */
   public function convert(array $defaults);