Index: class.tx_templavoila_handlestaticdatastructures.php
===================================================================
--- class.tx_templavoila_handlestaticdatastructures.php	(revision 29775)
+++ class.tx_templavoila_handlestaticdatastructures.php	(working copy)
@@ -198,7 +198,7 @@
 	public function templateObjectItemsProcFunc(array &$params, t3lib_TCEforms &$pObj) {
 		$this->conf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['templavoila']);
 
-		if ($this->conf['enable.']['selectDataSource']) {
+		if ($this->conf['enable.']['selectDataStructure']) {
 			$this->templateObjectItemsProcFuncForCurrentDS($params, $pObj);
 		} else {
 			$this->templateObjectItemsProcFuncForAllDSes($params, $pObj);
Index: class.tx_templavoila_tcemain.php
===================================================================
--- class.tx_templavoila_tcemain.php	(revision 29771)
+++ class.tx_templavoila_tcemain.php	(working copy)
@@ -110,7 +110,7 @@
 			return;
 		}
 
-		if (!$this->extConf['enable.']['selectDataSource']) {
+		if (!$this->extConf['enable.']['selectDataStructure']) {
 			// Update DS if TO was changed
 			$this->updateDataSourceFromTemplateObject($table, $incomingFieldArray, $reference->BE_USER);
 		}
Index: ext_conf_template.txt
===================================================================
--- ext_conf_template.txt	(revision 29771)
+++ ext_conf_template.txt	(working copy)
@@ -1,8 +1,8 @@
 	# cat=basic/enable; type=boolean; label=LLL:EXT:templavoila/res1/language/template_conf.xml:enable.oldPageModule
 enable.oldPageModule = 0
 
-	# cat=basic/enable; type=boolean; label=LLL:EXT:templavoila/res1/language/template_conf.xml:enable.selectDataSource
-enable.selectDataSource = 0
+	# cat=basic/enable; type=boolean; label=LLL:EXT:templavoila/res1/language/template_conf.xml:enable.selectDataStructure
+enable.selectDataSructure = 0
 
 	# cat=basic/enable; type=boolean; label=LLL:EXT:templavoila/res1/language/template_conf.xml:enable.renderFCEHeader
 enable.renderFCEHeader = 0
Index: ext_tables.php
===================================================================
--- ext_tables.php	(revision 29771)
+++ ext_tables.php	(working copy)
@@ -181,7 +181,7 @@
 $TCA['tt_content']['ctrl']['typeicons'][$_EXTKEY . '_pi1'] = t3lib_extMgm::extRelPath($_EXTKEY) . '/icon_fce_ce.png';
 t3lib_extMgm::addPlugin(array('LLL:EXT:templavoila/locallang_db.xml:tt_content.CType_pi1', $_EXTKEY . '_pi1', 'EXT:' . $_EXTKEY . '/icon_fce_ce.png'), 'CType');
 
-if ($_EXTCONF['enable.']['selectDataSource']) {
+if ($_EXTCONF['enable.']['selectDataStructure']) {
 	$TCA['tt_content']['types'][$_EXTKEY . '_pi1']['showitem'] = 'CType;;4;button;1-1-1, header;;3;;2-2-2,tx_templavoila_ds,tx_templavoila_to,tx_templavoila_flex;;;;2-2-2, hidden;;1;;3-3-3';
 	if ($TCA['tt_content']['ctrl']['requestUpdate'] != '') {
 		$TCA['tt_content']['ctrl']['requestUpdate'] .= ',';
@@ -269,7 +269,7 @@
 	),
 );
 t3lib_extMgm::addTCAcolumns('pages', $tempColumns, 1);
-if ($_EXTCONF['enable.']['selectDataSource']) {
+if ($_EXTCONF['enable.']['selectDataStructure']) {
 	t3lib_extMgm::addToAllTCAtypes('pages','tx_templavoila_ds;;;;1-1-1,tx_templavoila_to,tx_templavoila_next_ds;;;;1-1-1,tx_templavoila_next_to,tx_templavoila_flex;;;;1-1-1');
 	if ($TCA['pages']['ctrl']['requestUpdate'] != '') {
 		$TCA['pages']['ctrl']['requestUpdate'] .= ',';
Index: res1/language/template_conf.xml
===================================================================
--- res1/language/template_conf.xml	(revision 29771)
+++ res1/language/template_conf.xml	(working copy)
@@ -11,7 +11,7 @@
 	<data type="array">
 		<languageKey index="default" type="array">
 			<label index="enable.oldPageModule">Enable the classic Page module:Check this box to enable classic Page module in the list of modules.</label>
-			<label index="enable.selectDataSource">Enable data source selection:If this checkbox is checked, page and content elements will have data source selector as they had in older TemplaVoila versions. If current installation has very few template objects, it is recommended to have this checkbox unchecked.</label>
+			<label index="enable.selectDataStructure">Enable data structure selection: If this checkbox is checked, page and content elements will have data structure selector as they had in older TemplaVoila versions. If current installation has very few template objects, it is recommended to have this checkbox unchecked.</label>
 			<label index="enable.renderFCEHeader">Enable Header for FCE's:If this checkbox is checked the header of Content Element type FCE will be rendered like headers of other Content Elements.</label>
 			<label index="staticDS.enable">Enable static files for data structures:Experimental! Use Static DS Conversion Wizard below!</label>
 			<label index="staticDS.path_fce">FCE Data Structure Path:Path to the static data structures for flexible content elements</label>