diff --git a/core/includes/utility.inc b/core/includes/utility.inc
index d44e4dd..5019852 100644
--- a/core/includes/utility.inc
+++ b/core/includes/utility.inc
@@ -46,7 +46,7 @@ function drupal_var_export($var, $prefix = '') {
       $output = "'" . $var . "'";
     }
   }
-  else if (is_object($var) && get_class($var) === 'stdClass') {
+  elseif (is_object($var) && get_class($var) === 'stdClass') {
     // var_export() will export stdClass objects using an undefined
     // magic method __set_state() leaving the export broken. This
     // workaround avoids this by casting the object as an array for
diff --git a/core/lib/Drupal/Component/Archiver/ArchiveTar.php b/core/lib/Drupal/Component/Archiver/ArchiveTar.php
index f6ef506..32c0a0f 100644
--- a/core/lib/Drupal/Component/Archiver/ArchiveTar.php
+++ b/core/lib/Drupal/Component/Archiver/ArchiveTar.php
@@ -140,7 +140,7 @@ class ArchiveTar // extends PEAR
             if (($p_compress === true) || ($p_compress == 'gz')) {
                 $this->_compress = true;
                 $this->_compress_type = 'gz';
-            } else if ($p_compress == 'bz2') {
+            } elseif ($p_compress == 'bz2') {
                 $this->_compress = true;
                 $this->_compress_type = 'bz2';
             } else {
@@ -153,7 +153,7 @@ class ArchiveTar // extends PEAR
         if ($this->_compress) { // assert zlib or bz2 extension support
             if ($this->_compress_type == 'gz')
                 $extname = 'zlib';
-            else if ($this->_compress_type == 'bz2')
+            elseif ($this->_compress_type == 'bz2')
                 $extname = 'bz2';
 
             if (!extension_loaded($extname)) {
@@ -663,9 +663,9 @@ class ArchiveTar // extends PEAR
     {
         if ($this->_compress_type == 'gz')
             $this->_file = @gzopen($this->_tarname, "wb9");
-        else if ($this->_compress_type == 'bz2')
+        elseif ($this->_compress_type == 'bz2')
             $this->_file = @bzopen($this->_tarname, "w");
-        else if ($this->_compress_type == 'none')
+        elseif ($this->_compress_type == 'none')
             $this->_file = @fopen($this->_tarname, "wb");
         else
             $this->_error('Unknown or missing compression type ('
@@ -716,9 +716,9 @@ class ArchiveTar // extends PEAR
 
         if ($this->_compress_type == 'gz')
             $this->_file = @gzopen($v_filename, "rb");
-        else if ($this->_compress_type == 'bz2')
+        elseif ($this->_compress_type == 'bz2')
             $this->_file = @bzopen($v_filename, "r");
-        else if ($this->_compress_type == 'none')
+        elseif ($this->_compress_type == 'none')
             $this->_file = @fopen($v_filename, "rb");
         else
             $this->_error('Unknown or missing compression type ('
@@ -738,11 +738,11 @@ class ArchiveTar // extends PEAR
     {
         if ($this->_compress_type == 'gz')
             $this->_file = @gzopen($this->_tarname, "r+b");
-        else if ($this->_compress_type == 'bz2') {
+        elseif ($this->_compress_type == 'bz2') {
             $this->_error('Unable to open bz2 in read/write mode \''
 			              .$this->_tarname.'\' (limitation of bz2 extension)');
             return false;
-        } else if ($this->_compress_type == 'none')
+        } elseif ($this->_compress_type == 'none')
             $this->_file = @fopen($this->_tarname, "r+b");
         else
             $this->_error('Unknown or missing compression type ('
@@ -765,9 +765,9 @@ class ArchiveTar // extends PEAR
         if (is_resource($this->_file)) {
             if ($this->_compress_type == 'gz')
                 @gzclose($this->_file);
-            else if ($this->_compress_type == 'bz2')
+            elseif ($this->_compress_type == 'bz2')
                 @bzclose($this->_file);
-            else if ($this->_compress_type == 'none')
+            elseif ($this->_compress_type == 'none')
                 @fclose($this->_file);
             else
                 $this->_error('Unknown or missing compression type ('
@@ -814,9 +814,9 @@ class ArchiveTar // extends PEAR
           if ($p_len === null) {
               if ($this->_compress_type == 'gz')
                   @gzputs($this->_file, $p_binary_data);
-              else if ($this->_compress_type == 'bz2')
+              elseif ($this->_compress_type == 'bz2')
                   @bzwrite($this->_file, $p_binary_data);
-              else if ($this->_compress_type == 'none')
+              elseif ($this->_compress_type == 'none')
                   @fputs($this->_file, $p_binary_data);
               else
                   $this->_error('Unknown or missing compression type ('
@@ -824,9 +824,9 @@ class ArchiveTar // extends PEAR
           } else {
               if ($this->_compress_type == 'gz')
                   @gzputs($this->_file, $p_binary_data, $p_len);
-              else if ($this->_compress_type == 'bz2')
+              elseif ($this->_compress_type == 'bz2')
                   @bzwrite($this->_file, $p_binary_data, $p_len);
-              else if ($this->_compress_type == 'none')
+              elseif ($this->_compress_type == 'none')
                   @fputs($this->_file, $p_binary_data, $p_len);
               else
                   $this->_error('Unknown or missing compression type ('
@@ -845,9 +845,9 @@ class ArchiveTar // extends PEAR
       if (is_resource($this->_file)) {
           if ($this->_compress_type == 'gz')
               $v_block = @gzread($this->_file, 512);
-          else if ($this->_compress_type == 'bz2')
+          elseif ($this->_compress_type == 'bz2')
               $v_block = @bzread($this->_file, 512);
-          else if ($this->_compress_type == 'none')
+          elseif ($this->_compress_type == 'none')
               $v_block = @fread($this->_file, 512);
           else
               $this->_error('Unknown or missing compression type ('
@@ -867,11 +867,11 @@ class ArchiveTar // extends PEAR
           if ($this->_compress_type == 'gz') {
               @gzseek($this->_file, gztell($this->_file)+($p_len*512));
           }
-          else if ($this->_compress_type == 'bz2') {
+          elseif ($this->_compress_type == 'bz2') {
               // ----- Replace missing bztell() and bzseek()
               for ($i=0; $i<$p_len; $i++)
                   $this->_readBlock();
-          } else if ($this->_compress_type == 'none')
+          } elseif ($this->_compress_type == 'none')
               @fseek($this->_file, ftell($this->_file)+($p_len*512));
           else
               $this->_error('Unknown or missing compression type ('
@@ -1851,11 +1851,11 @@ class ArchiveTar // extends PEAR
                     // ----- Ignore this directory
                     // Should be the first $i=0, but no check is done
                 }
-                else if ($v_list[$i] == "..") {
+                elseif ($v_list[$i] == "..") {
                     // ----- Ignore it and ignore the $i-1
                     $i--;
                 }
-                else if (   ($v_list[$i] == '')
+                elseif (   ($v_list[$i] == '')
 				         && ($i!=(sizeof($v_list)-1))
 						 && ($i!=0)) {
                     // ----- Ignore only the double '//' in path,
diff --git a/core/modules/field/modules/options/options.module b/core/modules/field/modules/options/options.module
index 04b88d8..15e1714 100644
--- a/core/modules/field/modules/options/options.module
+++ b/core/modules/field/modules/options/options.module
@@ -208,7 +208,7 @@ function _options_properties($type, $multiple, $required, $has_value) {
         if (!$required) {
           $properties['empty_option'] = 'option_none';
         }
-        else if (!$has_value) {
+        elseif (!$has_value) {
           $properties['empty_option'] = 'option_select';
         }
       }
diff --git a/core/modules/locale/locale.admin.inc b/core/modules/locale/locale.admin.inc
index 321b8ce..58e12ec 100644
--- a/core/modules/locale/locale.admin.inc
+++ b/core/modules/locale/locale.admin.inc
@@ -306,7 +306,7 @@ function language_negotiation_configure_url_form_validate($form, &$form_state) {
         form_error($form['prefix'][$langcode], t('The prefix may only be left blank for the default language.'));
       }
     }
-    else if (isset($count[$value]) && $count[$value] > 1) {
+    elseif (isset($count[$value]) && $count[$value] > 1) {
       // Validation error if there are two languages with the same domain/prefix.
       form_error($form['prefix'][$langcode], t('The prefix for %language, %value, is not unique.', array('%language' => $language->name, '%value' => $value)));
     }
@@ -323,7 +323,7 @@ function language_negotiation_configure_url_form_validate($form, &$form_state) {
         form_error($form['domain'][$langcode], t('The domain may only be left blank for the default language.'));
       }
     }
-    else if (isset($count[$value]) && $count[$value] > 1) {
+    elseif (isset($count[$value]) && $count[$value] > 1) {
       // Validation error if there are two languages with the same domain/domain.
       form_error($form['domain'][$langcode], t('The domain for %language, %value, is not unique.', array('%language' => $language->name, '%value' => $value)));
     }
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index 03eea92..89a40ae 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -1324,7 +1324,7 @@ function taxonomy_field_formatter_prepare_view($entity_type, $entities, $field,
           $items[$id][$delta]['taxonomy_term'] = $terms[$item['tid']];
         }
         // Terms to be created are not in $terms, but are still legitimate.
-        else if ($item['tid'] == 'autocreate') {
+        elseif ($item['tid'] == 'autocreate') {
           // Leave the item in place.
         }
         // Otherwise, unset the instance value, since the term does not exist.