diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumberDecimalFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/DecimalFormatter.php
similarity index 92%
rename from core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumberDecimalFormatter.php
rename to core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/DecimalFormatter.php
index cfc255b..ae595d0 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumberDecimalFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/DecimalFormatter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Field\Plugin\Field\FieldFormatter\NumberDecimalFormatter.
+ * Contains \Drupal\Core\Field\Plugin\Field\FieldFormatter\DecimalFormatter.
  */
 
 namespace Drupal\Core\Field\Plugin\Field\FieldFormatter;
@@ -29,7 +29,7 @@
  *   }
  * )
  */
-class NumberDecimalFormatter extends DefaultNumberFormatter {
+class DecimalFormatter extends NumericFormatterBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumberIntegerFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/IntegerFormatter.php
similarity index 83%
rename from core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumberIntegerFormatter.php
rename to core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/IntegerFormatter.php
index 89f3e4a..7849031 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumberIntegerFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/IntegerFormatter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Field\Plugin\Field\FieldFormatter\NumberIntegerFormatter.
+ * Contains \Drupal\Core\Field\Plugin\Field\FieldFormatter\IntegerFormatter.
  */
 
 namespace Drupal\Core\Field\Plugin\Field\FieldFormatter;
@@ -26,7 +26,7 @@
  *   }
  * )
  */
-class NumberIntegerFormatter extends DefaultNumberFormatter {
+class IntegerFormatter extends NumericFormatterBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/DefaultNumberFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumericFormatterBase.php
similarity index 94%
rename from core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/DefaultNumberFormatter.php
rename to core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumericFormatterBase.php
index 140770a..cc360b9 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/DefaultNumberFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumericFormatterBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Field\Plugin\Field\FieldFormatter\DefaultNumberFormatter.
+ * Contains \Drupal\Core\Field\Plugin\Field\FieldFormatter\NumericFormatterBase.
  */
 
 namespace Drupal\Core\Field\Plugin\Field\FieldFormatter;
@@ -13,7 +13,7 @@
 /**
  * Parent plugin for decimal and integer formatters.
  */
-abstract class DefaultNumberFormatter extends FormatterBase {
+abstract class NumericFormatterBase extends FormatterBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumberUnformattedFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumericUnformattedFormatter.php
similarity index 82%
rename from core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumberUnformattedFormatter.php
rename to core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumericUnformattedFormatter.php
index be5f2af..55d9dbf 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumberUnformattedFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumericUnformattedFormatter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Field\Plugin\Field\FieldFormatter\NumberUnformattedFormatter.
+ * Contains \Drupal\Core\Field\Plugin\Field\FieldFormatter\NumericUnformattedFormatter.
  */
 
 namespace Drupal\Core\Field\Plugin\Field\FieldFormatter;
@@ -23,7 +23,7 @@
  *   }
  * )
  */
-class NumberUnformattedFormatter extends FormatterBase {
+class NumericUnformattedFormatter extends FormatterBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.php
index ed503f9..0d8dee4 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.php
@@ -11,7 +11,7 @@
 use Drupal\Core\TypedData\DataDefinition;
 
 /**
- * Defines the 'decimal' entity field type.
+ * Defines the 'decimal' field type.
  *
  * @FieldType(
  *   id = "decimal",
@@ -31,7 +31,7 @@
  *   default_formatter = "number_decimal"
  * )
  */
-class DecimalItem extends NumberItemBase {
+class DecimalItem extends NumericItemBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
index 94e422b..4061b12 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
@@ -12,7 +12,7 @@
 use Drupal\Core\TypedData\DataDefinition;
 
 /**
- * Defines the 'email' entity field type.
+ * Defines the 'email' field type.
  *
  * @FieldType(
  *   id = "email",
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/FloatItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/FloatItem.php
index b4464ae..2d9511b 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/FloatItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/FloatItem.php
@@ -11,7 +11,7 @@
 use Drupal\Core\TypedData\DataDefinition;
 
 /**
- * Defines the 'float' entity field type.
+ * Defines the 'float' field type.
  *
  * @FieldType(
  *   id = "float",
@@ -27,7 +27,7 @@
  *   default_formatter = "number_decimal"
  * )
  */
-class FloatItem extends NumberItemBase {
+class FloatItem extends NumericItemBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/IntegerItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/IntegerItem.php
index 0737de4..31f3bc6 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/IntegerItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/IntegerItem.php
@@ -11,7 +11,7 @@
 use Drupal\Core\TypedData\DataDefinition;
 
 /**
- * Defines the 'integer' entity field type.
+ * Defines the 'integer' field type.
  *
  * @FieldType(
  *   id = "integer",
@@ -27,7 +27,7 @@
  *   default_formatter = "number_integer"
  * )
  */
-class IntegerItem extends NumberItemBase {
+class IntegerItem extends NumericItemBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/NumberItemBase.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/NumericItemBase.php
similarity index 94%
rename from core/lib/Drupal/Core/Field/Plugin/Field/FieldType/NumberItemBase.php
rename to core/lib/Drupal/Core/Field/Plugin/Field/FieldType/NumericItemBase.php
index 04faa7e..c1270c4 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/NumberItemBase.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/NumericItemBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Field\Plugin\Field\FieldType\NumberItemBase.
+ * Contains \Drupal\Core\Field\Plugin\Field\FieldType\NumericItemBase.
  */
 
 namespace Drupal\Core\Field\Plugin\Field\FieldType;
@@ -10,9 +10,9 @@
 use Drupal\Core\Field\FieldItemBase;
 
 /**
- * Base class for 'number' configurable field types.
+ * Base class for numeric configurable field types.
  */
-abstract class NumberItemBase extends FieldItemBase {
+abstract class NumericItemBase extends FieldItemBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/field/config/schema/field.schema.yml b/core/modules/field/config/schema/field.schema.yml
index 8ac6a85..e1fe2c0 100644
--- a/core/modules/field/config/schema/field.schema.yml
+++ b/core/modules/field/config/schema/field.schema.yml
@@ -141,16 +141,16 @@ field.email.value:
           type: email
           label: 'Value'
 
-# Schema for configuration files of the number field types.
+# Schema for configuration files of a numeric field types.
 
-field.number_integer.settings:
+field.integer.settings:
   type: sequence
   label: 'Integer settings'
   sequence:
     - type: string
       label: 'setting'
 
-field.number_integer.instance_settings:
+field.integer.instance_settings:
   type: mapping
   label: 'Integer'
   mapping:
@@ -167,7 +167,7 @@ field.number_integer.instance_settings:
       type: string
       label: 'Suffix'
 
-field.number_integer.value:
+field.integer.value:
   type: sequence
   label: 'Default value'
   sequence:
@@ -178,7 +178,7 @@ field.number_integer.value:
           type: integer
           label: 'Value'
 
-field.number_decimal.settings:
+field.decimal.settings:
   type: mapping
   label: 'Decimal settings'
   mapping:
@@ -189,7 +189,7 @@ field.number_decimal.settings:
       type: integer
       label: 'Scale'
 
-field.number_decimal.instance_settings:
+field.decimal.instance_settings:
   type: mapping
   label: 'Decimal'
   mapping:
@@ -206,7 +206,7 @@ field.number_decimal.instance_settings:
       type: string
       label: 'Suffix'
 
-field.number_decimal.value:
+field.decimal.value:
    type: sequence
    label: 'Default value'
    sequence:
@@ -217,14 +217,14 @@ field.number_decimal.value:
            type: float
            label: 'Value'
 
-field.number_float.settings:
+field.float.settings:
   type: sequence
   label: 'Float settings'
   sequence:
     - type: string
       label: 'setting'
 
-field.number_float.instance_settings:
+field.float.instance_settings:
   type: mapping
   label: 'Float'
   mapping:
@@ -241,7 +241,7 @@ field.number_float.instance_settings:
       type: string
       label: 'Suffix'
 
-field.number_float.value:
+field.float.value:
   type: sequence
   label: 'Default value'
   sequence:
diff --git a/core/modules/field/lib/Drupal/field/Entity/FieldConfig.php b/core/modules/field/lib/Drupal/field/Entity/FieldConfig.php
index 9e8adee..8f85736 100644
--- a/core/modules/field/lib/Drupal/field/Entity/FieldConfig.php
+++ b/core/modules/field/lib/Drupal/field/Entity/FieldConfig.php
@@ -75,7 +75,7 @@ class FieldConfig extends ConfigEntityBase implements FieldConfigInterface {
   /**
    * The field type.
    *
-   * Example: text, number_integer.
+   * Example: text, integer.
    *
    * @var string
    */
diff --git a/core/modules/field/lib/Drupal/field/Entity/FieldInstanceConfig.php b/core/modules/field/lib/Drupal/field/Entity/FieldInstanceConfig.php
index cd78415..c52c084 100644
--- a/core/modules/field/lib/Drupal/field/Entity/FieldInstanceConfig.php
+++ b/core/modules/field/lib/Drupal/field/Entity/FieldInstanceConfig.php
@@ -135,7 +135,7 @@ class FieldInstanceConfig extends ConfigEntityBase implements FieldInstanceConfi
    *
    * This property is overlooked if the $default_value_function is non-empty.
    *
-   * Example for a number_integer field:
+   * Example for a integer field:
    * @code
    * array(
    *   array('value' => 1),
diff --git a/core/modules/field/lib/Drupal/field/Tests/NumberFieldTest.php b/core/modules/field/lib/Drupal/field/Tests/NumberFieldTest.php
index dba784a..531af43 100644
--- a/core/modules/field/lib/Drupal/field/Tests/NumberFieldTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/NumberFieldTest.php
@@ -430,7 +430,7 @@ function testNumberFormatter() {
     // Go to manage display page.
     $this->drupalGet("admin/structure/types/manage/$type/display");
 
-    // Configure number_decimal formatter for number_float_field
+    // Configure number_decimal formatter for the 'float' field type.
     $thousand_separator = $thousand_separators[array_rand($thousand_separators)];
     $decimal_separator = $decimal_separators[array_rand($decimal_separators)];
     $scale = rand(0, 10);