diff --git a/app/hunt_group/app_config.php b/app/hunt_group/app_config.php
index 504dd2c6f1..585982e8f9 100644
--- a/app/hunt_group/app_config.php
+++ b/app/hunt_group/app_config.php
@@ -32,7 +32,7 @@
 		$apps[$x]['menu'][0]['uuid'] = '632f87de-7f86-b68f-c629-4c2d2b3ce545';
 		$apps[$x]['menu'][0]['parent_uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
 		$apps[$x]['menu'][0]['category'] = 'internal';
-		$apps[$x]['menu'][0]['path'] = '/app/hunt_group/v_hunt_group.php';
+		$apps[$x]['menu'][0]['path'] = '/app/hunt_group/hunt_groups.php';
 		$apps[$x]['menu'][0]['groups'][] = 'admin';
 		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
 
diff --git a/app/hunt_group/hunt_group_call_forward.php b/app/hunt_group/hunt_group_call_forward.php
index b8ae6149b2..6d76240bb4 100644
--- a/app/hunt_group/hunt_group_call_forward.php
+++ b/app/hunt_group/hunt_group_call_forward.php
@@ -94,7 +94,7 @@ if (permission_exists('hunt_group_call_forward')) {
 			echo "<tr >\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['hunt_group_extension']."</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>\n";
-			echo "		<a href='".PROJECT_PATH."/app/hunt_group/v_hunt_group_call_forward_edit.php?id=".$row['hunt_group_uuid']."&a=call_forward' alt='Call Forward'>Call Forward</a> \n";
+			echo "		<a href='".PROJECT_PATH."/app/hunt_group/hunt_group_call_forward_edit.php?id=".$row['hunt_group_uuid']."&a=call_forward' alt='Call Forward'>Call Forward</a> \n";
 			echo "	</td>\n";
 			echo "	<td valign='top' class='row_stylebg' width='40%'>".$row['hunt_group_description']."&nbsp;</td>\n";
 			echo "</tr>\n";
diff --git a/app/hunt_group/hunt_group_call_forward_edit.php b/app/hunt_group/hunt_group_call_forward_edit.php
index 92929379aa..fcc41b288c 100644
--- a/app/hunt_group/hunt_group_call_forward_edit.php
+++ b/app/hunt_group/hunt_group_call_forward_edit.php
@@ -341,7 +341,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 	//redirect the user
 		require_once "includes/header.php";
-		echo "<meta http-equiv=\"refresh\" content=\"3;url=".PROJECT_PATH."/app/hunt_group/v_hunt_group_call_forward.php\">\n";
+		echo "<meta http-equiv=\"refresh\" content=\"3;url=".PROJECT_PATH."/app/hunt_group/hunt_group_call_forward.php\">\n";
 		echo "<div align='center'>\n";
 		echo "Update Complete<br />\n";
 		echo "</div>\n";
@@ -415,7 +415,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "	<b>Hunt Group Call Forward</b>\n";
 	echo "</td>\n";
 	echo "<td width='70%' align='right'>\n";
-	echo "	<input type='button' class='btn' name='' alt='back' onclick=\"window.location='v_hunt_group_call_forward.php'\" value='Back'>\n";
+	echo "	<input type='button' class='btn' name='' alt='back' onclick=\"window.location='hunt_group_call_forward.php'\" value='Back'>\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 	echo "<tr>\n";
diff --git a/app/hunt_group/hunt_group_copy.php b/app/hunt_group/hunt_group_copy.php
index 11b0c1457d..d02dbaa956 100644
--- a/app/hunt_group/hunt_group_copy.php
+++ b/app/hunt_group/hunt_group_copy.php
@@ -43,8 +43,7 @@ require_once "includes/paging.php";
 	}
 
 //get the v_hunt_group data 
-	$sql = "";
-	$sql .= "select * from v_hunt_groups ";
+	$sql = "select * from v_hunt_groups ";
 	$sql .= "where hunt_group_uuid = '$hunt_group_uuid' ";
 	$sql .= "and domain_uuid = '$domain_uuid' ";
 	$prep_statement = $db->prepare(check_sql($sql));
@@ -109,8 +108,7 @@ require_once "includes/paging.php";
 		unset($sql);
 
 	//get the the hunt group destinations
-		$sql = "";
-		$sql .= "select * from v_hunt_group_destinations ";
+		$sql = "select * from v_hunt_group_destinations ";
 		$sql .= "where domain_uuid = '$domain_uuid' ";
 		$sql .= "and hunt_group_uuid = '$hunt_group_uuid' ";
 		$prep_statement = $db->prepare(check_sql($sql));
@@ -158,7 +156,7 @@ require_once "includes/paging.php";
 
 	//redirect the user
 		require_once "includes/header.php";
-		echo "<meta http-equiv=\"refresh\" content=\"2;url=v_hunt_group.php\">\n";
+		echo "<meta http-equiv=\"refresh\" content=\"2;url=hunt_group.php\">\n";
 		echo "<div align='center'>\n";
 		echo "Copy Complete\n";
 		echo "</div>\n";
diff --git a/app/hunt_group/hunt_group_delete.php b/app/hunt_group/hunt_group_delete.php
index 9b4d295815..588faacf70 100644
--- a/app/hunt_group/hunt_group_delete.php
+++ b/app/hunt_group/hunt_group_delete.php
@@ -95,7 +95,7 @@ if (strlen($id)>0) {
 
 //redirect the user
 	require_once "includes/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=v_hunt_group.php\">\n";
+	echo "<meta http-equiv=\"refresh\" content=\"2;url=hunt_groups.php\">\n";
 	echo "<div align='center'>\n";
 	echo "Delete Complete\n";
 	echo "</div>\n";
diff --git a/app/hunt_group/hunt_group_destination_delete.php b/app/hunt_group/hunt_group_destination_delete.php
index 4f2923e36d..a9b4285e9a 100644
--- a/app/hunt_group/hunt_group_destination_delete.php
+++ b/app/hunt_group/hunt_group_destination_delete.php
@@ -43,8 +43,7 @@ if (count($_GET)>0) {
 
 if (strlen($id)>0) {
 	//delete the data
-		$sql = "";
-		$sql .= "delete from v_hunt_group_destinations ";
+		$sql = "delete from v_hunt_group_destinations ";
 		$sql .= "where domain_uuid = '$domain_uuid' ";
 		$sql .= "and hunt_group_destination_uuid = '$id' ";
 		$sql .= "and hunt_group_uuid = '$hunt_group_uuid' ";
@@ -57,7 +56,7 @@ if (strlen($id)>0) {
 
 //redirect the user
 	require_once "includes/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=v_hunt_group_edit.php?id=".$hunt_group_uuid."\">\n";
+	echo "<meta http-equiv=\"refresh\" content=\"2;url=hunt_group_edit.php?id=".$hunt_group_uuid."\">\n";
 	echo "<div align='center'>\n";
 	echo "Delete Complete\n";
 	echo "</div>\n";
diff --git a/app/hunt_group/hunt_group_destination_edit.php b/app/hunt_group/hunt_group_destination_edit.php
index 4147f7c9a2..cb1b8b35f9 100644
--- a/app/hunt_group/hunt_group_destination_edit.php
+++ b/app/hunt_group/hunt_group_destination_edit.php
@@ -125,7 +125,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				save_hunt_group_xml();
 
 				require_once "includes/header.php";
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=v_hunt_group_edit.php?id=".$hunt_group_uuid."\">\n";
+				echo "<meta http-equiv=\"refresh\" content=\"2;url=hunt_group_edit.php?id=".$hunt_group_uuid."\">\n";
 				echo "<div align='center'>\n";
 				echo "Add Complete\n";
 				echo "</div>\n";
@@ -151,7 +151,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				save_hunt_group_xml();
 
 				require_once "includes/header.php";
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=v_hunt_group_edit.php?id=".$hunt_group_uuid."\">\n";
+				echo "<meta http-equiv=\"refresh\" content=\"2;url=hunt_group_edit.php?id=".$hunt_group_uuid."\">\n";
 				echo "<div align='center'>\n";
 				echo "Update Complete\n";
 				echo "</div>\n";
@@ -164,8 +164,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 //pre-populate the form
 	if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
 		$hunt_group_destination_uuid = $_GET["id"];
-		$sql = "";
-		$sql .= "select * from v_hunt_group_destinations ";
+		$sql = "select * from v_hunt_group_destinations ";
 		$sql .= "where domain_uuid = '$domain_uuid' ";
 		$sql .= "and hunt_group_destination_uuid = '$hunt_group_destination_uuid' ";
 		$prep_statement = $db->prepare(check_sql($sql));
@@ -207,7 +206,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "<td align='left' width='30%' nowrap><b>Destination Edit</b></td>\n";
 	}
-	echo "<td width='70%' align='right'><input type='button' class='btn' name='' alt='back' onclick=\"window.location='v_hunt_group_edit.php?id=".$hunt_group_uuid."'\" value='Back'></td>\n";
+	echo "<td width='70%' align='right'><input type='button' class='btn' name='' alt='back' onclick=\"window.location='hunt_group_edit.php?id=".$hunt_group_uuid."'\" value='Back'></td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
diff --git a/app/hunt_group/hunt_group_edit.php b/app/hunt_group/hunt_group_edit.php
index 04fa552705..702d0386f8 100644
--- a/app/hunt_group/hunt_group_edit.php
+++ b/app/hunt_group/hunt_group_edit.php
@@ -182,7 +182,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 				//redirect the user
 					require_once "includes/header.php";
-					echo "<meta http-equiv=\"refresh\" content=\"2;url=v_hunt_group.php\">\n";
+					echo "<meta http-equiv=\"refresh\" content=\"2;url=hunt_group.php\">\n";
 					echo "<div align='center'>\n";
 					echo "Add Complete\n";
 					echo "</div>\n";
@@ -256,7 +256,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 				//rediret the user
 					require_once "includes/header.php";
-					echo "<meta http-equiv=\"refresh\" content=\"2;url=v_hunt_group.php\">\n";
+					echo "<meta http-equiv=\"refresh\" content=\"2;url=hunt_group.php\">\n";
 					echo "<div align='center'>\n";
 					echo "Update Complete\n";
 					echo "</div>\n";
@@ -321,8 +321,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "	</span>\n";
 	echo "</td>\n";
 	echo "<td width='70%' align='right'>\n";
-	echo "	<input type='button' class='btn' name='' alt='copy' onclick=\"if (confirm('Do you really want to copy this?')){window.location='v_hunt_group_copy.php?id=".$hunt_group_uuid."';}\" value='Copy'>\n";
-	echo "	<input type='button' class='btn' name='' alt='back' onclick=\"window.location='v_hunt_group.php'\" value='Back'>\n";
+	echo "	<input type='button' class='btn' name='' alt='copy' onclick=\"if (confirm('Do you really want to copy this?')){window.location='hunt_group_copy.php?id=".$hunt_group_uuid."';}\" value='Copy'>\n";
+	echo "	<input type='button' class='btn' name='' alt='back' onclick=\"window.location='hunt_group.php'\" value='Back'>\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
@@ -659,8 +659,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "</table>\n";
 		echo "<br />\n";
 
-		$sql = "";
-		$sql .= " select * from v_hunt_group_destinations ";
+		$sql = " select * from v_hunt_group_destinations ";
 		$sql .= " where domain_uuid = '$domain_uuid' ";
 		$sql .= " and hunt_group_uuid = '$hunt_group_uuid' ";
 		$sql .= " order by destination_order, destination_data asc";
@@ -686,7 +685,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "<th align='center'>Description</th>\n";
 		echo "<td align='right' width='42'>\n";
 		if (permission_exists('hunt_group_add')) {
-			echo "	<a href='v_hunt_group_destinations_edit.php?id2=".$hunt_group_uuid."' alt='add'>$v_link_label_add</a>\n";
+			echo "	<a href='hunt_group_destination_edit.php?id2=".$hunt_group_uuid."' alt='add'>$v_link_label_add</a>\n";
 		}
 		echo "</td>\n";
 		echo "<tr>\n";
@@ -701,10 +700,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				echo "	<td valign='top' class='row_stylebg' width='30%'>".$row['destination_description']."&nbsp;</td>\n";
 				echo "	<td valign='top' align='right'>\n";
 				if (permission_exists('hunt_group_edit')) {
-					echo "		<a href='v_hunt_group_destinations_edit.php?id=".$row['hunt_group_destination_uuid']."&id2=".$hunt_group_uuid."' alt='edit'>$v_link_label_edit</a>\n";
+					echo "		<a href='hunt_group_destination_edit.php?id=".$row['hunt_group_destination_uuid']."&id2=".$hunt_group_uuid."' alt='edit'>$v_link_label_edit</a>\n";
 				}
 				if (permission_exists('hunt_group_delete')) {
-					echo "		<a href='v_hunt_group_destinations_delete.php?id=".$row['hunt_group_destination_uuid']."&id2=".$hunt_group_uuid."' alt='delete' onclick=\"return confirm('Do you really want to delete this?')\">$v_link_label_delete</a>\n";
+					echo "		<a href='hunt_group_destination_delete.php?id=".$row['hunt_group_destination_uuid']."&id2=".$hunt_group_uuid."' alt='delete' onclick=\"return confirm('Do you really want to delete this?')\">$v_link_label_delete</a>\n";
 				}
 				echo "	</td>\n";
 				echo "</tr>\n";
@@ -721,7 +720,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "		<td width='33.3%' align='center' nowrap>$paging_controls</td>\n";
 		echo "		<td width='33.3%' align='right'>\n";
 		if (permission_exists('hunt_group_add')) {
-			echo "			<a href='v_hunt_group_destinations_edit.php?id2=".$hunt_group_uuid."' alt='add'>$v_link_label_add</a>\n";
+			echo "			<a href='hunt_group_destination_edit.php?id2=".$hunt_group_uuid."' alt='add'>$v_link_label_add</a>\n";
 		}
 		echo "		</td>\n";
 		echo "	</tr>\n";
diff --git a/app/hunt_group/hunt_groups.php b/app/hunt_group/hunt_groups.php
index 5140675e3c..7ee8735928 100644
--- a/app/hunt_group/hunt_groups.php
+++ b/app/hunt_group/hunt_groups.php
@@ -111,7 +111,7 @@ echo th_order_by('hunt_group_name', 'Enabled', $order_by, $order);
 echo th_order_by('hunt_group_description', 'Description', $order_by, $order);
 echo "<td align='right' width='42'>\n";
 if (permission_exists('hunt_group_add')) {
-	echo "	<a href='v_hunt_group_edit.php' alt='add'>$v_link_label_add</a>\n";
+	echo "	<a href='hunt_group_edit.php' alt='add'>$v_link_label_add</a>\n";
 }
 echo "</td>\n";
 echo "<tr>\n";
@@ -125,10 +125,10 @@ if ($result_count > 0) {
 		echo "   <td valign='top' class='row_stylebg' width='40%'>".$row['hunt_group_description']."&nbsp;</td>\n";
 		echo "   <td valign='top' align='right'>\n";
 		if (permission_exists('hunt_group_edit')) {
-			echo "		<a href='v_hunt_group_edit.php?id=".$row['hunt_group_uuid']."' alt='edit'>$v_link_label_edit</a>\n";
+			echo "		<a href='hunt_group_edit.php?id=".$row['hunt_group_uuid']."' alt='edit'>$v_link_label_edit</a>\n";
 		}
 		if (permission_exists('hunt_group_delete')) {
-			echo "		<a href='v_hunt_group_delete.php?id=".$row['hunt_group_uuid']."' alt='delete' onclick=\"return confirm('Do you really want to delete this?')\">$v_link_label_delete</a>\n";
+			echo "		<a href='hunt_group_delete.php?id=".$row['hunt_group_uuid']."' alt='delete' onclick=\"return confirm('Do you really want to delete this?')\">$v_link_label_delete</a>\n";
 		}
 		echo "   </td>\n";
 		echo "</tr>\n";
@@ -145,7 +145,7 @@ echo "		<td width='33.3%' nowrap>&nbsp;</td>\n";
 echo "		<td width='33.3%' align='center' nowrap>$paging_controls</td>\n";
 echo "		<td width='33.3%' align='right'>\n";
 if (permission_exists('hunt_group_add')) {
-	echo "			<a href='v_hunt_group_edit.php' alt='add'>$v_link_label_add</a>\n";
+	echo "			<a href='hunt_group_edit.php' alt='add'>$v_link_label_add</a>\n";
 }
 echo "		</td>\n";
 echo "	</tr>\n";