diff --git a/app/voicemail_msgs/app_config.php b/app/voicemail_msgs/app_config.php
index 78c9ee6eee..58123829a7 100644
--- a/app/voicemail_msgs/app_config.php
+++ b/app/voicemail_msgs/app_config.php
@@ -32,7 +32,7 @@
 		$apps[$x]['menu'][0]['uuid'] = 'e10d5672-0f82-6e5d-5022-a02ac8545198';
 		$apps[$x]['menu'][0]['parent_uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
 		$apps[$x]['menu'][0]['category'] = 'internal';
-		$apps[$x]['menu'][0]['path'] = '/app/voicemail_msgs/v_voicemail_msgs.php';
+		$apps[$x]['menu'][0]['path'] = '/app/voicemail_msgs/voicemail_msgs.php';
 		$apps[$x]['menu'][0]['groups'][] = 'user';
 		$apps[$x]['menu'][0]['groups'][] = 'admin';
 		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
diff --git a/app/voicemail_msgs/voicemail_msgs.php b/app/voicemail_msgs/voicemail_msgs.php
index 6cde4ec347..35fb39d858 100644
--- a/app/voicemail_msgs/voicemail_msgs.php
+++ b/app/voicemail_msgs/voicemail_msgs.php
@@ -184,7 +184,7 @@ else {
 				echo "</td>\n";
 				echo "<td valign='bottom' align='right'>\n";
 				echo "	<input type='button' class='btn' name='' alt='greetings' onclick=\"window.location='".PROJECT_PATH."/app/voicemail_greetings/v_voicemail_greetings.php?id=".$value['user']."'\" value='".$text['button-greetings']."'>\n";
-				echo "	<input type='button' class='btn' name='' alt='settings' onclick=\"window.location='v_voicemail_msgs_password.php?id=".$value['extension_uuid']."'\" value='".$text['button-settings']."'>\n";
+				echo "	<input type='button' class='btn' name='' alt='settings' onclick=\"window.location='voicemail_msgs_password.php?id=".$value['extension_uuid']."'\" value='".$text['button-settings']."'>\n";
 				echo "</td>\n";
 				echo "</tr>\n";
 
@@ -256,20 +256,20 @@ else {
 						echo "   <td valign='top' class='".$row_style[$c]."' $style>".$row['cid_number']."</td>\n";
 						echo "   <td valign='top' class='".$row_style[$c]."' $style>".$row['in_folder']."</td>\n";
 						echo "	<td valign='top' class='".$row_style[$c]."' $style>\n";
-						echo "		<a href=\"javascript:void(0);\" onclick=\"window.open('v_voicemail_msgs_play.php?a=download&type=vm&uuid=".$row['uuid']."&id=".$row['username']."&ext=".$file_ext."&desc=".urlencode($row['cid_name']." ".$row['cid_number'])."', 'play',' width=420,height=40,menubar=no,status=no,toolbar=no')\">\n";
+						echo "		<a href=\"javascript:void(0);\" onclick=\"window.open('voicemail_msgs_play.php?a=download&type=vm&uuid=".$row['uuid']."&id=".$row['username']."&ext=".$file_ext."&desc=".urlencode($row['cid_name']." ".$row['cid_number'])."', 'play',' width=420,height=40,menubar=no,status=no,toolbar=no')\">\n";
 						echo "		$tmp_message_len";
 						echo "		</a>";
 						echo "	</td>\n";
 						//echo "	<td valign='top' class='".$row_style[$c]."'>".$row[flags]."&nbsp;</td>\n";
 						//echo "	<td valign='top' class='".$row_style[$c]."'>".$row[read_flags]."</td>\n";
 						echo "	<td valign='top' class='".$row_style[$c]."'  $style nowrap=\"nowrap\">";
-						echo "		<a href=\"v_voicemail_msgs.php?a=download&type=vm&t=bin&uuid=".$row['uuid']."\">\n";
+						echo "		<a href=\"voicemail_msgs.php?a=download&type=vm&t=bin&uuid=".$row['uuid']."\">\n";
 						echo $tmp_filesize;
 						echo "		</a>";
 						echo 	"</td>\n";
 						echo "   <td valign='top' align='center' nowrap>\n";
-						//echo "		<a href='v_voicemail_msgs_edit.php?id=".$row[voicemail_msg_id]."' alt='edit'>$v_link_label_edit</a>\n";
-						echo "			&nbsp;&nbsp;<a href='v_voicemail_msgs_delete.php?uuid=".$row['uuid']."&id=".$row['username']."' alt='delete message' title='delete message' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>\n";
+						//echo "		<a href='voicemail_msgs_edit.php?id=".$row[voicemail_msg_id]."' alt='edit'>$v_link_label_edit</a>\n";
+						echo "			&nbsp;&nbsp;<a href='voicemail_msgs_delete.php?uuid=".$row['uuid']."&id=".$row['username']."' alt='delete message' title='delete message' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>\n";
 						echo "   </td>\n";
 						echo "</tr>\n";
 
diff --git a/app/voicemail_msgs/voicemail_msgs_delete.php b/app/voicemail_msgs/voicemail_msgs_delete.php
index 094a164f85..67b503af94 100644
--- a/app/voicemail_msgs/voicemail_msgs_delete.php
+++ b/app/voicemail_msgs/voicemail_msgs_delete.php
@@ -86,7 +86,7 @@ else {
 
 //redirect the user
 	require_once "includes/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=v_voicemail_msgs.php\">\n";
+	echo "<meta http-equiv=\"refresh\" content=\"2;url=voicemail_msgs.php\">\n";
 	echo "<div align='center'>\n";
 	echo "".$text['confirm-delete-2']." $msg\n";
 	echo "</div>\n";
diff --git a/app/voicemail_msgs/voicemail_msgs_password.php b/app/voicemail_msgs/voicemail_msgs_password.php
index 5949bc3246..51a065b647 100644
--- a/app/voicemail_msgs/voicemail_msgs_password.php
+++ b/app/voicemail_msgs/voicemail_msgs_password.php
@@ -188,7 +188,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_voicemail_msgs.php\">\n";
+				echo "<meta http-equiv=\"refresh\" content=\"2;url=voicemail_msgs.php\">\n";
 				echo "<div align='center'>\n";
 				echo "".$text['confirm-update']."\n";
 				echo "</div>\n";
@@ -273,7 +273,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<table width='100%'  border='0' cellpadding='6' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "	<td width='30%' nowrap valign='top' align='left'><b>".$text['label-voicemail']." $extension</b></td>\n";
-	echo "	<td width='70%' align='right' valign='top'><input type='button' class='btn' name='' alt='back' onclick=\"window.location='v_voicemail_msgs.php'\" value='".$text['button-back']."'><br /><br /></td>\n";
+	echo "	<td width='70%' align='right' valign='top'><input type='button' class='btn' name='' alt='back' onclick=\"window.location='voicemail_msgs.php'\" value='".$text['button-back']."'><br /><br /></td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
diff --git a/app/voicemail_msgs/voicemail_msgs_play.php b/app/voicemail_msgs/voicemail_msgs_play.php
index 28b15fb3b2..6c71a34939 100644
--- a/app/voicemail_msgs/voicemail_msgs_play.php
+++ b/app/voicemail_msgs/voicemail_msgs_play.php
@@ -100,12 +100,12 @@ else {
 		}
 	//embed html tag to play the wav file
 		if ($file_ext == "wav") {
-			echo "<embed src=\"v_voicemail_msgs.php?a=download&type=".$type."&uuid=".$uuid."\" autostart=true width=200 height=40 name=\"sound".$uuid."\" enablejavascript=\"true\">\n";
+			echo "<embed src=\"voicemail_msgs.php?a=download&type=".$type."&uuid=".$uuid."\" autostart=true width=200 height=40 name=\"sound".$uuid."\" enablejavascript=\"true\">\n";
 		}
 	//object html tag to add flash player that can play the mp3 file
 		if ($file_ext == "mp3") {
-			echo "<object type=\"application/x-shockwave-flash\" width=\"400\" height=\"17\" data=\"slim.swf?autoplay=true&song_title=".urlencode($uuid)."&song_url=".urlencode(PROJECT_PATH."/v_voicemail_msgs.php?a=download&type=".$type."&uuid=".$uuid)."\">\n";
-			echo "<param name=\"movie\" value=\"slim.swf?autoplay=true&song_url=".urlencode(PROJECT_PATH."/v_voicemail_msgs.php?a=download&type=".$type."&uuid=".$uuid)."\" />\n";
+			echo "<object type=\"application/x-shockwave-flash\" width=\"400\" height=\"17\" data=\"slim.swf?autoplay=true&song_title=".urlencode($uuid)."&song_url=".urlencode(PROJECT_PATH."/voicemail_msgs.php?a=download&type=".$type."&uuid=".$uuid)."\">\n";
+			echo "<param name=\"movie\" value=\"slim.swf?autoplay=true&song_url=".urlencode(PROJECT_PATH."/voicemail_msgs.php?a=download&type=".$type."&uuid=".$uuid)."\" />\n";
 			echo "<param name=\"quality\" value=\"high\"/>\n";
 			echo "<param name=\"bgcolor\" value=\"#E6E6E6\"/>\n";
 			echo "</object>\n";