diff --git a/core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceSettings.php b/core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceSettings.php
index f40816a..f1f6734 100644
--- a/core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceSettings.php
+++ b/core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceSettings.php
@@ -43,8 +43,8 @@ public function transform($value, MigrateExecutableInterface $migrate_executable
           $length = max(count($prefixes), count($suffixes));
           $strings = [];
           for ($i = 0; $i < $length; $i++) {
-            $prefix = isset($prefixes[$i]) ?: $prefixes[count($prefixes) - 1];
-            $suffix = isset($suffixes[$i]) ?: $suffixes[count($suffixes) - 1];
+            $prefix = isset($prefixes[$i]) ? $prefixes[$i] : $prefixes[count($prefixes) - 1];
+            $suffix = isset($suffixes[$i]) ? $suffixes[$i] : $suffixes[count($suffixes) - 1];
             $strings[] = $prefix . '@count' . $suffix;
           }
           $settings['format_plural_string'] = implode(PluralTranslatableMarkup::DELIMITER, $strings);
diff --git a/core/modules/field/src/Tests/Number/NumberFieldTest.php b/core/modules/field/src/Tests/Number/NumberFieldTest.php
index aeeddef..b12e932 100644
--- a/core/modules/field/src/Tests/Number/NumberFieldTest.php
+++ b/core/modules/field/src/Tests/Number/NumberFieldTest.php
@@ -157,7 +157,7 @@ function testNumberIntegerField() {
         'type' => 'number',
         'settings' => array(
           'placeholder' => '4',
-          'plural_format' => TRUE,
+          'format_plural' => TRUE,
         ),
       ))
       ->save();
@@ -198,7 +198,7 @@ function testNumberIntegerField() {
         'type' => 'number',
         'settings' => array(
           'placeholder' => '7',
-          'plural_format' => FALSE,
+          'format_plural' => FALSE,
         ),
       ))
       ->save();
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index edcde9e..618df41 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -1889,8 +1889,8 @@ function system_update_8014($sandbox) {
           $length = max(count($prefixes), count($suffixes));
           $strings = [];
           for ($i = 0; $i < $length; $i++) {
-            $prefix = isset($prefixes[$i]) ?: $prefixes[count($prefixes) - 1];
-            $suffix = isset($suffixes[$i]) ?: $suffixes[count($suffixes) - 1];
+            $prefix = isset($prefixes[$i]) ? $prefixes[$i] : $prefixes[count($prefixes) - 1];
+            $suffix = isset($suffixes[$i]) ? $suffixes[$i] : $suffixes[count($suffixes) - 1];
             $strings[] = $prefix . '@count' . $suffix;
           }
           $settings['format_plural_string'] = implode(PluralTranslatableMarkup::DELIMITER, $strings);