diff --git a/modules/backend/classes/FormWidgetBase.php b/modules/backend/classes/FormWidgetBase.php
index e59458c50..212bfeb5e 100644
--- a/modules/backend/classes/FormWidgetBase.php
+++ b/modules/backend/classes/FormWidgetBase.php
@@ -87,11 +87,11 @@ abstract class FormWidgetBase extends WidgetBase
     }
 
     /**
-     * Process the postback data for this widget.
+     * Process the postback value for this widget.
      * @param $value The existing value for this widget.
      * @return string The new value for this widget.
      */
-    public function getSaveData($value)
+    public function getSaveValue($value)
     {
         return $value;
     }
@@ -131,4 +131,5 @@ abstract class FormWidgetBase extends WidgetBase
 
         return [$model, $last];
     }
+
 }
diff --git a/modules/backend/formwidgets/ColorPicker.php b/modules/backend/formwidgets/ColorPicker.php
index 463109843..14dd951f8 100644
--- a/modules/backend/formwidgets/ColorPicker.php
+++ b/modules/backend/formwidgets/ColorPicker.php
@@ -74,7 +74,7 @@ class ColorPicker extends FormWidgetBase
     /**
      * {@inheritDoc}
      */
-    public function getSaveData($value)
+    public function getSaveValue($value)
     {
         return strlen($value) ? $value : null;
     }
diff --git a/modules/backend/formwidgets/DataGrid.php b/modules/backend/formwidgets/DataGrid.php
index 8a14211ba..705eae131 100644
--- a/modules/backend/formwidgets/DataGrid.php
+++ b/modules/backend/formwidgets/DataGrid.php
@@ -69,7 +69,7 @@ class DataGrid extends FormWidgetBase
     /**
      * {@inheritDoc}
      */
-    public function getSaveData($value)
+    public function getSaveValue($value)
     {
         return json_decode($value);
     }
diff --git a/modules/backend/formwidgets/DataTable.php b/modules/backend/formwidgets/DataTable.php
index c41b0f03a..dd62a2c3e 100644
--- a/modules/backend/formwidgets/DataTable.php
+++ b/modules/backend/formwidgets/DataTable.php
@@ -69,7 +69,7 @@ class DataTable extends FormWidgetBase
     /**
      * {@inheritDoc}
      */
-    public function getSaveData($value)
+    public function getSaveValue($value)
     {
         $dataSource = $this->table->getDataSource();
 
diff --git a/modules/backend/formwidgets/DatePicker.php b/modules/backend/formwidgets/DatePicker.php
index 1e283aaff..5a1a9dfce 100644
--- a/modules/backend/formwidgets/DatePicker.php
+++ b/modules/backend/formwidgets/DatePicker.php
@@ -120,7 +120,7 @@ class DatePicker extends FormWidgetBase
     /**
      * {@inheritDoc}
      */
-    public function getSaveData($value)
+    public function getSaveValue($value)
     {
         if (!strlen($value)) {
             return null;
diff --git a/modules/backend/formwidgets/FileUpload.php b/modules/backend/formwidgets/FileUpload.php
index 5212de4cf..0358dbc73 100644
--- a/modules/backend/formwidgets/FileUpload.php
+++ b/modules/backend/formwidgets/FileUpload.php
@@ -195,7 +195,7 @@ class FileUpload extends FormWidgetBase
     /**
      * {@inheritDoc}
      */
-    public function getSaveData($value)
+    public function getSaveValue($value)
     {
         return FormField::NO_SAVE_DATA;
     }
diff --git a/modules/backend/formwidgets/RecordFinder.php b/modules/backend/formwidgets/RecordFinder.php
index 45db4ff90..83e0fb06c 100644
--- a/modules/backend/formwidgets/RecordFinder.php
+++ b/modules/backend/formwidgets/RecordFinder.php
@@ -165,7 +165,7 @@ class RecordFinder extends FormWidgetBase
     /**
      * {@inheritDoc}
      */
-    public function getSaveData($value)
+    public function getSaveValue($value)
     {
         return strlen($value) ? $value : null;
     }
diff --git a/modules/backend/formwidgets/Relation.php b/modules/backend/formwidgets/Relation.php
index 16c576ff1..f976f177c 100644
--- a/modules/backend/formwidgets/Relation.php
+++ b/modules/backend/formwidgets/Relation.php
@@ -141,7 +141,7 @@ class Relation extends FormWidgetBase
     /**
      * {@inheritDoc}
      */
-    public function getSaveData($value)
+    public function getSaveValue($value)
     {
         if (is_string($value) && !strlen($value)) {
             return null;
diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php
index 3081793bc..445bf6eae 100644
--- a/modules/backend/widgets/Form.php
+++ b/modules/backend/widgets/Form.php
@@ -710,7 +710,9 @@ class Form extends WidgetBase
         }
 
         $fieldName = $field->fieldName;
-        $defaultValue = (!$this->model->exists && $field->defaults !== '') ? $field->defaults : null;
+        $defaultValue = (!$this->model->exists && $field->defaults !== '')
+            ? $field->defaults
+            : null;
 
         /*
          * Array field name, eg: field[key][key2][key3]
@@ -806,7 +808,16 @@ class Form extends WidgetBase
             $parts = Str::evalHtmlArray($field);
             $dotted = implode('.', $parts);
 
-            $widgetValue = $widget->getSaveData(array_get($data, $dotted));
+            $widgetValue = $widget->getSaveValue(array_get($data, $dotted));
+
+            /*
+             * @deprecated Remove if year >= 2016
+             */
+            if (method_exists($widget, 'getSaveData')) {
+                traceLog('Method getSaveData() is deprecated, use getSaveValue() instead. Found in: ' . get_class($widget), 'warning');
+                $widgetValue = $widget->getSaveData(array_get($data, $dotted));
+            }
+
             array_set($data, $dotted, $widgetValue);
         }