diff --git a/UPGRADE-2.8.md b/UPGRADE-2.8.md
index ef4632615a..2c18e58f50 100644
--- a/UPGRADE-2.8.md
+++ b/UPGRADE-2.8.md
@@ -181,7 +181,7 @@ Form
    {
        public function getExtendedType()
        {
-           method_exists(AbstractType::class, 'getBlockPrefix') ? FormType::class : 'form';
+           return method_exists(AbstractType::class, 'getBlockPrefix') ? FormType::class : 'form';
        }
    }
    ```
diff --git a/src/Symfony/Component/Form/AbstractType.php b/src/Symfony/Component/Form/AbstractType.php
index 42666614e8..1c56677c05 100644
--- a/src/Symfony/Component/Form/AbstractType.php
+++ b/src/Symfony/Component/Form/AbstractType.php
@@ -74,7 +74,7 @@ abstract class AbstractType implements FormTypeInterface
     /**
      * Returns the prefix of the template block name for this type.
      *
-     * The block prefixes defaults to the underscored short class name with
+     * The block prefixes default to the underscored short class name with
      * the "Type" suffix removed (e.g. "UserProfileType" => "user_profile").
      *
      * @return string The prefix of the template block name