diff --git a/app/gateways/app_config.php b/app/gateways/app_config.php
index 1708d4d05d..d40087f597 100644
--- a/app/gateways/app_config.php
+++ b/app/gateways/app_config.php
@@ -32,7 +32,7 @@
 		$apps[$x]['menu'][0]['uuid'] = '237a512a-f8fe-1ce4-b5d7-e71c401d7159';
 		$apps[$x]['menu'][0]['parent_uuid'] = 'bc96d773-ee57-0cdd-c3ac-2d91aba61b55';
 		$apps[$x]['menu'][0]['category'] = 'internal';
-		$apps[$x]['menu'][0]['path'] = '/app/gateways/v_gateways.php';
+		$apps[$x]['menu'][0]['path'] = '/app/gateways/gateways.php';
 		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
 
 	//permission details
diff --git a/app/gateways/gateway_copy.php b/app/gateways/gateway_copy.php
index 46de3bb2d0..ae3f7da4d2 100644
--- a/app/gateways/gateway_copy.php
+++ b/app/gateways/gateway_copy.php
@@ -150,7 +150,7 @@ else {
 
 //redirect the user
 	require_once "includes/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=v_gateways.php\">\n";
+	echo "<meta http-equiv=\"refresh\" content=\"2;url=gateways.php\">\n";
 	echo "<div align='center'>\n";
 	echo "Copy Complete\n";
 	echo "</div>\n";
diff --git a/app/gateways/gateway_delete.php b/app/gateways/gateway_delete.php
index 9c965156cf..9d47db01a7 100644
--- a/app/gateways/gateway_delete.php
+++ b/app/gateways/gateway_delete.php
@@ -39,8 +39,7 @@ if (strlen($_GET["id"])>0) {
 		$id = $_GET["id"];
 
 	//get the gateway name
-		$sql = "";
-		$sql .= "select * from v_gateways ";
+		$sql = "select * from v_gateways ";
 		$sql .= "where domain_uuid = '$domain_uuid' ";
 		$sql .= "and gateway_uuid = '$id' ";
 		$prep_statement = $db->prepare(check_sql($sql));
@@ -112,7 +111,7 @@ if (strlen($_GET["id"])>0) {
 
 //redirect the users
 	require_once "includes/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=v_gateways.php\">\n";
+	echo "<meta http-equiv=\"refresh\" content=\"2;url=gateways.php\">\n";
 	echo "<div align='center'>\n";
 	echo "Delete Complete\n";
 	echo "</div>\n";
diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php
index 70893d3a38..5a3f0ee76f 100644
--- a/app/gateways/gateway_edit.php
+++ b/app/gateways/gateway_edit.php
@@ -253,7 +253,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	//redirect the user
 		if (isset($action)) {
 			require_once "includes/header.php";
-			echo "<meta http-equiv=\"refresh\" content=\"2;url=v_gateways.php\">\n";
+			echo "<meta http-equiv=\"refresh\" content=\"2;url=gateways.php\">\n";
 			echo "<div align='center'>\n";
 			if ($action == "add") {
 				echo "Add Complete\n";
@@ -354,8 +354,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "		</td>";
 	echo "		<td width='50%' align='right'>\n";
 	echo "			<input type='submit' name='submit' class='btn' value='Save'>\n";
-	echo "			<input type='button' class='btn' name='' alt='copy' onclick=\"if (confirm('Do you really want to copy this?')){window.location='v_gateways_copy.php?id=".$gateway_uuid."';}\" value='Copy'>\n";
-	echo "			<input type='button' class='btn' name='' alt='back' onclick=\"window.location='v_gateways.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='gateways_copy.php?id=".$gateway_uuid."';}\" value='Copy'>\n";
+	echo "			<input type='button' class='btn' name='' alt='back' onclick=\"window.location='gateways.php'\" value='Back'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "	<tr>";
diff --git a/app/gateways/gateways.php b/app/gateways/gateways.php
index e84b43ff12..f37fc14d4f 100644
--- a/app/gateways/gateways.php
+++ b/app/gateways/gateways.php
@@ -92,7 +92,7 @@ echo "    <td align='left'><span class=\"vexpl\">\n";
 echo "        <strong>Gateways</strong></span>\n";
 echo "    </td>\n";
 echo "    <td align='right'>";
-echo "        <input type='button' class='btn' name='' alt='back' onclick=\"window.location='v_gateways.php'\" value='Refresh'>\n";
+echo "        <input type='button' class='btn' name='' alt='back' onclick=\"window.location='gateways.php'\" value='Refresh'>\n";
 echo "    </td>\n";
 echo "  </tr>\n";
 echo "  <tr>\n";
@@ -107,8 +107,7 @@ echo "</table>";
 echo "<br />\n";
 echo "<br />\n";
 
-$sql = "";
-$sql .= " select * from v_gateways ";
+$sql = "select * from v_gateways ";
 $sql .= "where domain_uuid = '$domain_uuid' ";
 if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
 $prep_statement = $db->prepare(check_sql($sql));
@@ -124,8 +123,7 @@ if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
 list($paging_controls, $rows_per_page, $var_3) = paging($num_rows, $param, $rows_per_page); 
 $offset = $rows_per_page * $page; 
 
-$sql = "";
-$sql .= " select * from v_gateways ";
+$sql = "select * from v_gateways ";
 $sql .= "where domain_uuid = '$domain_uuid' ";
 if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
 $sql .= " limit $rows_per_page offset $offset ";
@@ -153,7 +151,7 @@ echo th_order_by('enabled', 'Enabled', $order_by, $order);
 echo th_order_by('description', 'Gateway Description', $order_by, $order);
 echo "<td align='right' width='42'>\n";
 if (permission_exists('gateways_add')) {
-	echo "	<a href='v_gateways_edit.php' alt='add'>$v_link_label_add</a>\n";
+	echo "	<a href='gateway_edit.php' alt='add'>$v_link_label_add</a>\n";
 }
 echo "</td>\n";
 echo "<tr>\n";
@@ -173,7 +171,7 @@ else { //received results
 				if ($response == "Invalid Gateway!") {
 					//not running
 					echo "	<td valign='top' class='".$row_style[$c]."'>Stopped</td>\n";
-					echo "	<td valign='top' class='".$row_style[$c]."'><a href='v_gateways.php?a=start&gateway=".$row["gateway"]."&profile=".$row["profile"]."' alt='start'>Start</a></td>\n";
+					echo "	<td valign='top' class='".$row_style[$c]."'><a href='gateways.php?a=start&gateway=".$row["gateway"]."&profile=".$row["profile"]."' alt='start'>Start</a></td>\n";
 					echo "	<td valign='top' class='".$row_style[$c]."'>&nbsp;</td>\n";
 				}
 				else {
@@ -182,7 +180,7 @@ else { //received results
 						$xml = new SimpleXMLElement($response);
 						$state = $xml->state;
 						echo "	<td valign='top' class='".$row_style[$c]."'>Running</td>\n";
-						echo "	<td valign='top' class='".$row_style[$c]."'><a href='v_gateways.php?a=stop&gateway=".$row["gateway"]."&profile=".$row["profile"]."' alt='stop'>Stop</a></td>\n";
+						echo "	<td valign='top' class='".$row_style[$c]."'><a href='gateways.php?a=stop&gateway=".$row["gateway"]."&profile=".$row["profile"]."' alt='stop'>Stop</a></td>\n";
 						echo "	<td valign='top' class='".$row_style[$c]."'>".$state."</td>\n";
 					}
 					catch(Exception $e) {
@@ -201,10 +199,10 @@ else { //received results
 		echo "	<td valign='top' class='row_stylebg'>".$row["description"]."</td>\n";
 		echo "	<td valign='top' align='right'>\n";
 		if (permission_exists('gateways_edit')) {
-			echo "		<a href='v_gateways_edit.php?id=".$row["gateway_uuid"]."' alt='edit'>$v_link_label_edit</a>\n";
+			echo "		<a href='gateway_edit.php?id=".$row["gateway_uuid"]."' alt='edit'>$v_link_label_edit</a>\n";
 		}
 		if (permission_exists('gateways_delete')) {
-			echo "		<a href='v_gateways_delete.php?id=".$row["gateway_uuid"]."' onclick=\"return confirm('Do you really want to delete this?')\" alt='delete'>$v_link_label_delete</a>\n";
+			echo "		<a href='gateway_delete.php?id=".$row["gateway_uuid"]."' onclick=\"return confirm('Do you really want to delete this?')\" alt='delete'>$v_link_label_delete</a>\n";
 		}
 		echo "	</td>\n";
 		echo "</tr>\n";
@@ -221,7 +219,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('gateways_add')) {
-	echo "				<a href='v_gateways_edit.php' alt='add'>$v_link_label_add</a>\n";
+	echo "				<a href='gateway_edit.php' alt='add'>$v_link_label_add</a>\n";
 }
 echo "			</td>\n";
 echo "		</tr>\n";
@@ -250,4 +248,4 @@ echo "</div>";
 echo "<br><br>";
 
 require_once "includes/footer.php";
-?>
+?>
\ No newline at end of file