diff --git a/core/includes/file.inc b/core/includes/file.inc
index 645c64b..26d1b5b 100644
--- a/core/includes/file.inc
+++ b/core/includes/file.inc
@@ -1773,7 +1773,7 @@ function file_validate_is_image(stdClass $file) {
  *
  * @see hook_file_validate()
  */
-function file_validate_image_resolution(stdClass $file, $maximum_dimensions = 0, $minimum_dimensions = 0) {
+function file_validate_image_dimensions(stdClass $file, $maximum_dimensions = 0, $minimum_dimensions = 0) {
   $errors = array();
 
   // Check first that the file is an image.
diff --git a/core/modules/file/file.field.inc b/core/modules/file/file.field.inc
index f0d978a..9020194 100644
--- a/core/modules/file/file.field.inc
+++ b/core/modules/file/file.field.inc
@@ -950,9 +950,9 @@ function theme_file_upload_help($variables) {
   if (isset($upload_validators['file_validate_extensions'])) {
     $descriptions[] = t('Allowed file types: !extensions.', array('!extensions' => '<strong>' . check_plain($upload_validators['file_validate_extensions'][0]) . '</strong>'));
   }
-  if (isset($upload_validators['file_validate_image_resolution'])) {
-    $max = $upload_validators['file_validate_image_resolution'][0];
-    $min = $upload_validators['file_validate_image_resolution'][1];
+  if (isset($upload_validators['file_validate_image_dimensions'])) {
+    $max = $upload_validators['file_validate_image_dimensions'][0];
+    $min = $upload_validators['file_validate_image_dimensions'][1];
     if ($min && $max && $min == $max) {
       $descriptions[] = t('Images must be exactly !size pixels.', array('!size' => '<strong>' . $max . '</strong>'));
     }
diff --git a/core/modules/image/image.field.inc b/core/modules/image/image.field.inc
index 7a38df4..a653561 100644
--- a/core/modules/image/image.field.inc
+++ b/core/modules/image/image.field.inc
@@ -23,8 +23,8 @@ function image_field_info() {
         'max_filesize' => '',
         'alt_field' => 0,
         'title_field' => 0,
-        'max_resolution' => '',
-        'min_resolution' => '',
+        'max_dimensions' => '',
+        'min_dimensions' => '',
       ),
       'default_widget' => 'image_image',
       'default_formatter' => 'image',
@@ -74,60 +74,60 @@ function image_field_instance_settings_form($field, $instance) {
   // Use the file field instance settings form as a basis.
   $form = file_field_instance_settings_form($field, $instance);
 
-  // Add maximum and minimum resolution settings.
-  $max_resolution = explode('x', $settings['max_resolution']) + array('', '');
-  $form['max_resolution'] = array(
+  // Add maximum and minimum dimensions settings.
+  $max_dimensions = explode('x', $settings['max_dimensions']) + array('', '');
+  $form['max_dimensions'] = array(
     '#type' => 'item',
-    '#title' => t('Maximum image resolution'),
-    '#element_validate' => array('_image_field_resolution_validate'),
+    '#title' => t('Maximum image dimensions'),
+    '#element_validate' => array('_image_field_dimensions_validate'),
     '#weight' => 4.1,
     '#field_prefix' => '<div class="container-inline">',
     '#field_suffix' => '</div>',
     '#description' => t('The maximum allowed image size expressed as WIDTHxHEIGHT (e.g. 640x480). Leave blank for no restriction. If a larger image is uploaded, it will be resized to reflect the given width and height. Resizing images on upload will cause the loss of <a href="http://en.wikipedia.org/wiki/Exchangeable_image_file_format">EXIF data</a> in the image.'),
   );
-  $form['max_resolution']['x'] = array(
+  $form['max_dimensions']['x'] = array(
     '#type' => 'textfield',
     '#title' => t('Maximum width'),
     '#title_display' => 'invisible',
-    '#default_value' => $max_resolution[0],
+    '#default_value' => $max_dimensions[0],
     '#size' => 5,
     '#maxlength' => 5,
     '#field_suffix' => ' x ',
   );
-  $form['max_resolution']['y'] = array(
+  $form['max_dimensions']['y'] = array(
     '#type' => 'textfield',
     '#title' => t('Maximum height'),
     '#title_display' => 'invisible',
-    '#default_value' => $max_resolution[1],
+    '#default_value' => $max_dimensions[1],
     '#size' => 5,
     '#maxlength' => 5,
     '#field_suffix' => ' ' . t('pixels'),
   );
 
-  $min_resolution = explode('x', $settings['min_resolution']) + array('', '');
-  $form['min_resolution'] = array(
+  $min_dimensions = explode('x', $settings['min_dimensions']) + array('', '');
+  $form['min_dimensions'] = array(
     '#type' => 'item',
-    '#title' => t('Minimum image resolution'),
-    '#element_validate' => array('_image_field_resolution_validate'),
+    '#title' => t('Minimum image dimensions'),
+    '#element_validate' => array('_image_field_dimensions_validate'),
     '#weight' => 4.2,
     '#field_prefix' => '<div class="container-inline">',
     '#field_suffix' => '</div>',
     '#description' => t('The minimum allowed image size expressed as WIDTHxHEIGHT (e.g. 640x480). Leave blank for no restriction. If a smaller image is uploaded, it will be rejected.'),
   );
-  $form['min_resolution']['x'] = array(
+  $form['min_dimensions']['x'] = array(
     '#type' => 'textfield',
     '#title' => t('Minimum width'),
     '#title_display' => 'invisible',
-    '#default_value' => $min_resolution[0],
+    '#default_value' => $min_dimensions[0],
     '#size' => 5,
     '#maxlength' => 5,
     '#field_suffix' => ' x ',
   );
-  $form['min_resolution']['y'] = array(
+  $form['min_dimensions']['y'] = array(
     '#type' => 'textfield',
     '#title' => t('Minimum height'),
     '#title_display' => 'invisible',
-    '#default_value' => $min_resolution[1],
+    '#default_value' => $min_dimensions[1],
     '#size' => 5,
     '#maxlength' => 5,
     '#field_suffix' => ' ' . t('pixels'),
@@ -156,9 +156,9 @@ function image_field_instance_settings_form($field, $instance) {
 }
 
 /**
- * Element validate function for resolution fields.
+ * Element validate function for dimensions fields.
  */
-function _image_field_resolution_validate($element, &$form_state) {
+function _image_field_dimensions_validate($element, &$form_state) {
   if (!empty($element['x']['#value']) || !empty($element['y']['#value'])) {
     foreach (array('x', 'y') as $dimension) {
       $value = $element[$dimension]['#value'];
@@ -312,9 +312,9 @@ function image_field_widget_form(&$form, &$form_state, $field, $instance, $langc
   $settings = $instance['settings'];
 
   foreach (element_children($elements) as $delta) {
-    // Add upload resolution validation.
-    if ($settings['max_resolution'] || $settings['min_resolution']) {
-      $elements[$delta]['#upload_validators']['file_validate_image_resolution'] = array($settings['max_resolution'], $settings['min_resolution']);
+    // Add upload dimensions validation.
+    if ($settings['max_dimensions'] || $settings['min_dimensions']) {
+      $elements[$delta]['#upload_validators']['file_validate_image_dimensions'] = array($settings['max_dimensions'], $settings['min_dimensions']);
     }
 
     // If not using custom extension validation, ensure this is an image.
diff --git a/core/modules/image/image.test b/core/modules/image/image.test
index 6fa015e..ca4d00d 100644
--- a/core/modules/image/image.test
+++ b/core/modules/image/image.test
@@ -739,8 +739,8 @@ class ImageFieldDisplayTestCase extends ImageFieldTestCase {
       'alt_field' => 1,
       'file_extensions' => $test_image_extension,
       'max_filesize' => '50 KB',
-      'max_resolution' => '100x100',
-      'min_resolution' => '10x10',
+      'max_dimensions' => '100x100',
+      'min_dimensions' => '10x10',
       'title_field' => 1,
     );
     $widget_settings = array(
@@ -752,7 +752,7 @@ class ImageFieldDisplayTestCase extends ImageFieldTestCase {
     $this->drupalGet('node/add/article');
     $this->assertText(t('Files must be less than 50 KB.'), t('Image widget max file size is displayed on article form.'));
     $this->assertText(t('Allowed file types: ' . $test_image_extension . '.'), t('Image widget allowed file types displayed on article form.'));
-    $this->assertText(t('Images must be between 10x10 and 100x100 pixels.'), t('Image widget allowed resolution displayed on article form.'));
+    $this->assertText(t('Images must be between 10x10 and 100x100 pixels.'), t('Image widget allowed dimensions displayed on article form.'));
 
     // We have to create the article first and then edit it because the alt
     // and title fields do not display until the image has been attached.
@@ -888,21 +888,21 @@ class ImageFieldValidateTestCase extends ImageFieldTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Image field validation tests',
-      'description' => 'Tests validation functions such as min/max resolution.',
+      'description' => 'Tests validation functions such as min/max dimensions.',
       'group' => 'Image',
     );
   }
 
   /**
-   * Test min/max resolution settings.
+   * Test min/max dimensions settings.
    */
-  function testResolution() {
+  function testDimensions() {
     $field_name = strtolower($this->randomName());
-    $min_resolution = 50;
-    $max_resolution = 100;
+    $min_dimensions = 50;
+    $max_dimensions = 100;
     $instance_settings = array(
-      'max_resolution' => $max_resolution . 'x' . $max_resolution,
-      'min_resolution' => $min_resolution . 'x' . $min_resolution,
+      'max_dimensions' => $max_dimensions . 'x' . $max_dimensions,
+      'min_dimensions' => $min_dimensions . 'x' . $min_dimensions,
     );
     $this->createImageField($field_name, 'article', array(), $instance_settings);
 
@@ -912,10 +912,10 @@ class ImageFieldValidateTestCase extends ImageFieldTestCase {
     $image_that_is_too_small = FALSE;
     foreach ($this->drupalGetTestFiles('image') as $image) {
       $info = image_get_info($image->uri);
-      if ($info['width'] > $max_resolution) {
+      if ($info['width'] > $max_dimensions) {
         $image_that_is_too_big = $image;
       }
-      if ($info['width'] < $min_resolution) {
+      if ($info['width'] < $min_dimensions) {
         $image_that_is_too_small = $image;
       }
       if ($image_that_is_too_small && $image_that_is_too_big) {
@@ -923,9 +923,9 @@ class ImageFieldValidateTestCase extends ImageFieldTestCase {
       }
     }
     $nid = $this->uploadNodeImage($image_that_is_too_small, $field_name, 'article');
-    $this->assertText(t('The specified file ' . $image_that_is_too_small->filename . ' could not be uploaded. The image is too small; the minimum dimensions are 50x50 pixels.'), t('Node save failed when minimum image resolution was not met.'));
+    $this->assertText(t('The specified file ' . $image_that_is_too_small->filename . ' could not be uploaded. The image is too small; the minimum dimensions are 50x50 pixels.'), t('Node save failed when minimum image dimensions was not met.'));
     $nid = $this->uploadNodeImage($image_that_is_too_big, $field_name, 'article');
-    $this->assertText(t('The image was resized to fit within the maximum allowed dimensions of 100x100 pixels.'), t('Image exceeding max resolution was properly resized.'));
+    $this->assertText(t('The image was resized to fit within the maximum allowed dimensions of 100x100 pixels.'), t('Image exceeding max dimensions was properly resized.'));
   }
 }
 
diff --git a/core/modules/simpletest/tests/file.test b/core/modules/simpletest/tests/file.test
index 7496902..a2d12e5 100644
--- a/core/modules/simpletest/tests/file.test
+++ b/core/modules/simpletest/tests/file.test
@@ -410,21 +410,21 @@ class FileValidatorTest extends DrupalWebTestCase {
    *  This ensures the resolution of a specific file is within bounds.
    *  The image will be resized if it's too large.
    */
-  function testFileValidateImageResolution() {
+  function testFileValidateImageDimensions() {
     // Non-images.
-    $errors = file_validate_image_resolution($this->non_image);
+    $errors = file_validate_image_dimensions($this->non_image);
     $this->assertEqual(count($errors), 0, t("Shouldn't get any errors for a non-image file."), 'File');
-    $errors = file_validate_image_resolution($this->non_image, '50x50', '100x100');
+    $errors = file_validate_image_dimensions($this->non_image, '50x50', '100x100');
     $this->assertEqual(count($errors), 0, t("Don't check the resolution on non files."), 'File');
 
     // Minimum size.
-    $errors = file_validate_image_resolution($this->image);
+    $errors = file_validate_image_dimensions($this->image);
     $this->assertEqual(count($errors), 0, t('No errors for an image when there is no minimum or maximum resolution.'), 'File');
-    $errors = file_validate_image_resolution($this->image, 0, '200x1');
+    $errors = file_validate_image_dimensions($this->image, 0, '200x1');
     $this->assertEqual(count($errors), 1, t("Got an error for an image that wasn't wide enough."), 'File');
-    $errors = file_validate_image_resolution($this->image, 0, '1x200');
+    $errors = file_validate_image_dimensions($this->image, 0, '1x200');
     $this->assertEqual(count($errors), 1, t("Got an error for an image that wasn't tall enough."), 'File');
-    $errors = file_validate_image_resolution($this->image, 0, '200x200');
+    $errors = file_validate_image_dimensions($this->image, 0, '200x200');
     $this->assertEqual(count($errors), 1, t('Small images report an error.'), 'File');
 
     // Maximum size.
@@ -433,7 +433,7 @@ class FileValidatorTest extends DrupalWebTestCase {
       copy('core/misc/druplicon.png', 'temporary://druplicon.png');
       $this->image->uri = 'temporary://druplicon.png';
 
-      $errors = file_validate_image_resolution($this->image, '10x5');
+      $errors = file_validate_image_dimensions($this->image, '10x5');
       $this->assertEqual(count($errors), 0, t('No errors should be reported when an oversized image can be scaled down.'), 'File');
 
       $info = image_get_info($this->image->uri);
@@ -444,7 +444,7 @@ class FileValidatorTest extends DrupalWebTestCase {
     }
     else {
       // TODO: should check that the error is returned if no toolkit is available.
-      $errors = file_validate_image_resolution($this->image, '5x10');
+      $errors = file_validate_image_dimensions($this->image, '5x10');
       $this->assertEqual(count($errors), 1, t("Oversize images that can't be scaled get an error."), 'File');
     }
   }
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 009a716..1ddf3f9 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -637,7 +637,7 @@ function user_validate_picture(&$form, &$form_state) {
   // If required, validate the uploaded picture.
   $validators = array(
     'file_validate_is_image' => array(),
-    'file_validate_image_resolution' => array(variable_get('user_picture_dimensions', '85x85')),
+    'file_validate_image_dimensions' => array(variable_get('user_picture_dimensions', '85x85')),
     'file_validate_size' => array(variable_get('user_picture_file_size', '30') * 1024),
   );