diff --git a/app/virtual_tables/app_config.php b/app/virtual_tables/app_config.php
index f4adcd11c2..3659f11b99 100644
--- a/app/virtual_tables/app_config.php
+++ b/app/virtual_tables/app_config.php
@@ -163,7 +163,7 @@
 
 		$y = 1; //table array index
 		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_virtual_table_data_types_name_value';
+		$apps[$x]['db'][$y]['table'] = 'v_virtual_table_name_values';
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'virtual_table_data_types_name_value_id';
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'serial';
 		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'integer';
@@ -171,7 +171,7 @@
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'virtual_table_data_types_name_value_uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'virtual_table_name_value_uuid';
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
 		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
diff --git a/app/virtual_tables/virtual_table_data_edit.php b/app/virtual_tables/virtual_table_data_edit.php
index 9a146838ca..83a3e64cbf 100644
--- a/app/virtual_tables/virtual_table_data_edit.php
+++ b/app/virtual_tables/virtual_table_data_edit.php
@@ -740,7 +740,7 @@ else {
 							echo "<input type='hidden' name=\"".$x."field_name\" value=\"".$row['virtual_field_name']."\">\n";
 
 							$sqlselect = "SELECT virtual_data_types_name, virtual_data_types_value ";
-							$sqlselect .= "FROM v_virtual_table_data_types_name_value ";
+							$sqlselect .= "FROM v_virtual_table_name_values ";
 							$sqlselect .= "where domain_uuid = '".$domain_uuid."' ";
 							$sqlselect .= "and virtual_table_field_uuid = '".$row[virtual_table_field_uuid]."' ";
 							$prep_statement_2 = $db->prepare($sqlselect);
@@ -766,7 +766,7 @@ else {
 							echo "<input type='hidden' name='".$x."field_name' value='".$row['virtual_field_name']."'>\n";
 
 							$sqlselect = "SELECT virtual_data_types_name, virtual_data_types_value ";
-							$sqlselect .= "FROM v_virtual_table_data_types_name_value ";
+							$sqlselect .= "FROM v_virtual_table_name_values ";
 							$sqlselect .= "where domain_uuid = '".$domain_uuid."' ";
 							$sqlselect .= "and virtual_table_field_uuid = '".$row[virtual_table_field_uuid]."' ";
 							$prep_statement_2 = $db->prepare($sqlselect);
diff --git a/app/virtual_tables/virtual_table_data_types_name_value.php b/app/virtual_tables/virtual_table_data_types_name_value.php
index 2e58888ea1..43bd3044e3 100644
--- a/app/virtual_tables/virtual_table_data_types_name_value.php
+++ b/app/virtual_tables/virtual_table_data_types_name_value.php
@@ -60,7 +60,7 @@ require_once "includes/paging.php";
 	echo "</tr></table>\n";
 
 	//$sql = "";
-	//$sql .= " select * from v_virtual_table_data_types_name_value ";
+	//$sql .= " select * from v_virtual_table_name_values ";
 	//$sql .= " where domain_uuid = '$domain_uuid' ";
 	//$sql .= " and virtual_table_field_uuid = '$virtual_table_field_uuid' ";
 	//if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
@@ -77,7 +77,7 @@ require_once "includes/paging.php";
 	//$offset = $rows_per_page * $page; 
 
 	$sql = "";
-	$sql .= " select * from v_virtual_table_data_types_name_value ";
+	$sql .= " select * from v_virtual_table_name_values ";
 	$sql .= " where domain_uuid = '$domain_uuid' ";
 	$sql .= " and virtual_table_field_uuid = '$virtual_table_field_uuid' ";
 	if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
@@ -108,10 +108,10 @@ require_once "includes/paging.php";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row[virtual_data_types_name]."</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row[virtual_data_types_value]."</td>\n";
 			echo "	<td valign='top' align='right'>\n";
-			echo "		<a href='virtual_table_data_types_name_value_edit.php?virtual_table_uuid=".$row[virtual_table_uuid]."&virtual_table_field_uuid=".$row[virtual_table_field_uuid]."&id=".$row[virtual_table_data_types_name_value_uuid]."' alt='edit'>$v_link_label_edit</a>\n";
-			echo "		<a href='virtual_table_data_types_name_value_delete.php?virtual_table_uuid=".$row[virtual_table_uuid]."&virtual_table_field_uuid=".$row[virtual_table_field_uuid]."&id=".$row[virtual_table_data_types_name_value_uuid]."' alt='delete' onclick=\"return confirm('Do you really want to delete this?')\">$v_link_label_delete</a>\n";
-			//echo "		<input type='button' class='btn' name='' alt='edit' onclick=\"window.location='virtual_table_data_types_name_value_edit.php?id=".$row[virtual_table_data_types_name_value_uuid]."'\" value='e'>\n";
-			//echo "		<input type='button' class='btn' name='' alt='delete' onclick=\"if (confirm('Are you sure you want to delete this?')) { window.location='virtual_table_data_types_name_value_delete.php?id=".$row[virtual_table_data_types_name_value_uuid]."' }\" value='x'>\n";
+			echo "		<a href='virtual_table_data_types_name_value_edit.php?virtual_table_uuid=".$row[virtual_table_uuid]."&virtual_table_field_uuid=".$row[virtual_table_field_uuid]."&id=".$row[virtual_table_name_value_uuid]."' alt='edit'>$v_link_label_edit</a>\n";
+			echo "		<a href='virtual_table_data_types_name_value_delete.php?virtual_table_uuid=".$row[virtual_table_uuid]."&virtual_table_field_uuid=".$row[virtual_table_field_uuid]."&id=".$row[virtual_table_name_value_uuid]."' alt='delete' onclick=\"return confirm('Do you really want to delete this?')\">$v_link_label_delete</a>\n";
+			//echo "		<input type='button' class='btn' name='' alt='edit' onclick=\"window.location='virtual_table_data_types_name_value_edit.php?id=".$row[virtual_table_name_value_uuid]."'\" value='e'>\n";
+			//echo "		<input type='button' class='btn' name='' alt='delete' onclick=\"if (confirm('Are you sure you want to delete this?')) { window.location='virtual_table_data_types_name_value_delete.php?id=".$row[virtual_table_name_value_uuid]."' }\" value='x'>\n";
 			echo "	</td>\n";
 			echo "</tr>\n";
 			if ($c==0) { $c=1; } else { $c=0; }
diff --git a/app/virtual_tables/virtual_table_data_types_name_value_delete.php b/app/virtual_tables/virtual_table_data_types_name_value_delete.php
index c7c9feabb2..7511221ffc 100644
--- a/app/virtual_tables/virtual_table_data_types_name_value_delete.php
+++ b/app/virtual_tables/virtual_table_data_types_name_value_delete.php
@@ -44,9 +44,9 @@ else {
 //delete the data
 	if (strlen($id)>0) {
 		$sql = "";
-		$sql .= "delete from v_virtual_table_data_types_name_value ";
+		$sql .= "delete from v_virtual_table_name_values ";
 		$sql .= "where domain_uuid = '$domain_uuid' ";
-		$sql .= "and virtual_table_data_types_name_value_uuid = '$id' ";
+		$sql .= "and virtual_table_name_value_uuid = '$id' ";
 		$prep_statement = $db->prepare(check_sql($sql));
 		$prep_statement->execute();
 		unset($sql);
diff --git a/app/virtual_tables/virtual_table_data_types_name_value_edit.php b/app/virtual_tables/virtual_table_data_types_name_value_edit.php
index 5ea55031cc..2e8aa8c78d 100644
--- a/app/virtual_tables/virtual_table_data_types_name_value_edit.php
+++ b/app/virtual_tables/virtual_table_data_types_name_value_edit.php
@@ -37,7 +37,7 @@ else {
 //action add or update
 	if (isset($_REQUEST["id"])) {
 		$action = "update";
-		$virtual_table_data_types_name_value_uuid = check_str($_REQUEST["id"]);
+		$virtual_table_name_value_uuid = check_str($_REQUEST["id"]);
 	}
 	else {
 		$action = "add";
@@ -60,7 +60,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 	$msg = '';
 	if ($action == "update") {
-		$virtual_table_data_types_name_value_uuid = check_str($_POST["virtual_table_data_types_name_value_uuid"]);
+		$virtual_table_name_value_uuid = check_str($_POST["virtual_table_name_value_uuid"]);
 	}
 
 	//check for all required data
@@ -85,9 +85,9 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	//add or update the database
 		if ($_POST["persistformvar"] != "true") {
 			if ($action == "add") {
-				$sql = "insert into v_virtual_table_data_types_name_value ";
+				$sql = "insert into v_virtual_table_name_values ";
 				$sql .= "(";
-				$sql .= "virtual_table_data_types_name_value_uuid, ";
+				$sql .= "virtual_table_name_value_uuid, ";
 				$sql .= "domain_uuid, ";
 				$sql .= "virtual_table_uuid, ";
 				$sql .= "virtual_table_field_uuid, ";
@@ -116,13 +116,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			} //if ($action == "add")
 
 			if ($action == "update") {
-				$sql = "update v_virtual_table_data_types_name_value set ";
+				$sql = "update v_virtual_table_name_values set ";
 				$sql .= "virtual_data_types_name = '$virtual_data_types_name', ";
 				$sql .= "virtual_data_types_value = '$virtual_data_types_value' ";
 				$sql .= "where domain_uuid = '$domain_uuid' ";
 				$sql .= "and virtual_table_uuid = '$virtual_table_uuid' ";
 				$sql .= "and virtual_table_field_uuid = '$virtual_table_field_uuid' ";
-				$sql .= "and virtual_table_data_types_name_value_uuid = '$virtual_table_data_types_name_value_uuid' ";
+				$sql .= "and virtual_table_name_value_uuid = '$virtual_table_name_value_uuid' ";
 				$db->exec(check_sql($sql));
 				unset($sql);
 
@@ -141,13 +141,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
 		$virtual_table_uuid = $_GET["virtual_table_uuid"];
 		$virtual_table_field_uuid = $_GET["virtual_table_field_uuid"];
-		$virtual_table_data_types_name_value_uuid = $_GET["id"];
+		$virtual_table_name_value_uuid = $_GET["id"];
 		$sql = "";
-		$sql .= "select * from v_virtual_table_data_types_name_value ";
+		$sql .= "select * from v_virtual_table_name_values ";
 		$sql .= "where domain_uuid = '$domain_uuid' ";
 		//$sql .= "and virtual_table_uuid = '$virtual_table_uuid' ";
 		$sql .= "and virtual_table_field_uuid = '$virtual_table_field_uuid' ";
-		$sql .= "and virtual_table_data_types_name_value_uuid = '$virtual_table_data_types_name_value_uuid' ";
+		$sql .= "and virtual_table_name_value_uuid = '$virtual_table_name_value_uuid' ";
 
 		$prep_statement = $db->prepare(check_sql($sql));
 		$prep_statement->execute();
@@ -215,7 +215,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "			<input type='hidden' name='virtual_table_uuid' value='$virtual_table_uuid'>\n";
 	echo "			<input type='hidden' name='virtual_table_field_uuid' value='$virtual_table_field_uuid'>\n";
 	if ($action == "update") {
-		echo "			<input type='hidden' name='virtual_table_data_types_name_value_uuid' value='$virtual_table_data_types_name_value_uuid'>\n";
+		echo "			<input type='hidden' name='virtual_table_name_value_uuid' value='$virtual_table_name_value_uuid'>\n";
 	}
 	echo "				<input type='submit' name='submit' class='btn' value='Save'>\n";
 	echo "		</td>\n";