diff --git a/core/components/formsave/elements/snippets/snippet.formsave.php b/core/components/formsave/elements/snippets/snippet.formsave.php
index 2ef5085..6a8c864 100644
--- a/core/components/formsave/elements/snippets/snippet.formsave.php
+++ b/core/components/formsave/elements/snippets/snippet.formsave.php
@@ -8,6 +8,7 @@
 $formValues = $hook->getValues();
 $formTopic = $modx->getOption('fsFormTopic', $formit->config, 'form');
 $formFields = $modx->getOption('fsFormFields', $formit->config, false);
+$fsFormFieldNames = $modx->getOption('fsFormFieldNames', $formit->config, false);
 $formPublished = (int) $modx->getOption('fsFormPublished', $formit->config, 1);
 
 if ($formFields !== false) {
@@ -37,6 +38,25 @@
 	}
 }
 
+//Change the fieldnames
+if($fsFormFieldNames){
+	$newDataArray = array();
+	$fieldLabels = array();
+	$formFieldNames = explode(',', $fsFormFieldNames);
+	foreach($formFieldNames as $formFieldName){
+		list($name, $label) = explode('==', $formFieldName);
+		$fieldLabels[trim($name)] = trim($label);
+	}
+	foreach ($dataArray as $key => $value) {
+		if($fieldLabels[$key]){
+			$newDataArray[$fieldLabels[$key]] = $value;
+		}else{
+			$newDataArray[$key] = $value;
+		}
+	}
+	$dataArray = $newDataArray;
+}
+
 // Fill the database object
 $newForm->fromArray(array(
 	'topic' => $formTopic,