18 files changed, 47 insertions, 47 deletions
diff --git a/phpBB/groupcp.php b/phpBB/groupcp.php
index ed477eaaad..3dc47c76fa 100644
--- a/phpBB/groupcp.php
+++ b/phpBB/groupcp.php
@@ -54,7 +54,7 @@ function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$
 
 	if ( !empty($row['user_viewemail']) || $group_mod )
 	{
-		$email_uri = ( $config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&amp;" . POST_USERS_URL .'=' . $row['user_id']) : 'mailto:' . $row['user_email'];
+		$email_uri = ( $config['board_email_form'] ) ? append_sid("ucp.$phpEx?mode=email&amp;" . POST_USERS_URL .'=' . $row['user_id']) : 'mailto:' . $row['user_email'];
 
 		$email_img = '<a href="' . $email_uri . '"><img src="' . $images['icon_email'] . '" alt="' . $lang['Send_email'] . '" title="' . $lang['Send_email'] . '" border="0" /></a>';
 		$email = '<a href="' . $email_uri . '">' . $lang['Send_email'] . '</a>';
@@ -65,7 +65,7 @@ function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$
 		$email = '&nbsp;';
 	}
 
-	$temp_url = append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id']);
+	$temp_url = append_sid("ucp.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id']);
 	$profile_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_profile'] . '" alt="' . $lang['Read_profile'] . '" title="' . $lang['Read_profile'] . '" border="0" /></a>';
 	$profile = '<a href="' . $temp_url . '">' . $lang['Read_profile'] . '</a>';
 
@@ -92,7 +92,7 @@ function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$
 	$aim_img = ( $row['user_aim'] ) ? '<a href="aim:goim?screenname=' . $row['user_aim'] . '&amp;message=Hello+Are+you+there?"><img src="' . $images['icon_aim'] . '" alt="' . $lang['AIM'] . '" title="' . $lang['AIM'] . '" border="0" /></a>' : '';
 	$aim = ( $row['user_aim'] ) ? '<a href="aim:goim?screenname=' . $row['user_aim'] . '&amp;message=Hello+Are+you+there?">' . $lang['AIM'] . '</a>' : '';
 
-	$temp_url = append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id']);
+	$temp_url = append_sid("ucp.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id']);
 	$msn_img = ( $row['user_msnm'] ) ? '<a href="' . $temp_url . '"><img src="' . $images['icon_msnm'] . '" alt="' . $lang['MSNM'] . '" title="' . $lang['MSNM'] . '" border="0" /></a>' : '';
 	$msn = ( $row['user_msnm'] ) ? '<a href="' . $temp_url . '">' . $lang['MSNM'] . '</a>' : '';
 
@@ -958,7 +958,7 @@ else if ( $group_id )
 		'MOD_YIM_IMG' => $yim_img,
 		'MOD_YIM' => $yim,
 
-		'U_MOD_VIEWPROFILE' => append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$user_id"),
+		'U_MOD_VIEWPROFILE' => append_sid("ucp.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$user_id"),
 		'U_SEARCH_USER' => append_sid("search.$phpEx?mode=searchuser"),
 
 		'S_GROUP_OPEN_TYPE' => GROUP_OPEN,
@@ -1017,7 +1017,7 @@ else if ( $group_id )
 				'YIM_IMG' => $yim_img,
 				'YIM' => $yim,
 
-				'U_VIEWPROFILE' => append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$user_id"))
+				'U_VIEWPROFILE' => append_sid("ucp.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$user_id"))
 			);
 
 			if ( $is_moderator )
@@ -1110,7 +1110,7 @@ else if ( $group_id )
 					'YIM_IMG' => $yim_img,
 					'YIM' => $yim,
 
-					'U_VIEWPROFILE' => append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$user_id"))
+					'U_VIEWPROFILE' => append_sid("ucp.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$user_id"))
 				);
 			}
 
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 250fe067f0..2e022b8966 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -159,7 +159,7 @@ function get_moderators(&$forum_moderators, $forum_id = false)
 
 	while ($row = $db->sql_fetchrow($result))
 	{
-		$forum_moderators[$row['forum_id']][] = (!empty($row['user_id'])) ? '<a href="profile.' . $phpEx . $SID . '&amp;mode=viewprofile&amp;u=' . $row['user_id'] . '">' . $row['username'] . '</a>' : '<a href="groupcp.' . $phpEx . $SID . '&amp;g=' . $row['group_id'] . '">' . $row['groupname'] . '</a>';
+		$forum_moderators[$row['forum_id']][] = (!empty($row['user_id'])) ? '<a href="ucp.' . $phpEx . $SID . '&amp;mode=viewprofile&amp;u=' . $row['user_id'] . '">' . $row['username'] . '</a>' : '<a href="groupcp.' . $phpEx . $SID . '&amp;g=' . $row['group_id'] . '">' . $row['groupname'] . '</a>';
 	}
 	$db->sql_freeresult($result);
 
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 4a1830a703..54c1e72d8f 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -145,7 +145,7 @@ function display_forums($root_data=array(), $display_moderators=TRUE)
 		{
 			$last_post = $user->format_date($row['forum_last_post_time']) . '<br />';
 
-			$last_post .= ($row['forum_last_poster_id'] == ANONYMOUS) ? (($row['forum_last_poster_name'] != '') ? $row['forum_last_poster_name'] . ' ' : $user->lang['Guest'] . ' ') : '<a href="profile.' . $phpEx . $SID . '&amp;mode=viewprofile&amp;u='  . $row['forum_last_poster_id'] . '">' . $row['forum_last_poster_name'] . '</a> ';
+			$last_post .= ($row['forum_last_poster_id'] == ANONYMOUS) ? (($row['forum_last_poster_name'] != '') ? $row['forum_last_poster_name'] . ' ' : $user->lang['Guest'] . ' ') : '<a href="ucp.' . $phpEx . $SID . '&amp;mode=viewprofile&amp;u='  . $row['forum_last_poster_id'] . '">' . $row['forum_last_poster_name'] . '</a> ';
 
 			$last_post .= '<a href="viewtopic.' . $phpEx . $SID . '&amp;f=' . $row['forum_id'] . '&amp;p=' . $row['forum_last_post_id'] . '#' . $row['forum_last_post_id'] . '">' . $user->img('goto_post_latest', 'View_latest_post') . '</a>';
 		}
diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php
index 8805456cd4..a7c72aa8bb 100644
--- a/phpBB/includes/page_header.php
+++ b/phpBB/includes/page_header.php
@@ -91,12 +91,12 @@ while ($row = $db->sql_fetchrow($result))
 
 			if ($row['user_allow_viewonline'])
 			{
-				$user_online_link = '<a href="' . "profile.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $row['user_id'] . '">' . $row['username'] . '</a>';
+				$user_online_link = '<a href="' . "ucp.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $row['user_id'] . '">' . $row['username'] . '</a>';
 				$logged_visible_online++;
 			}
 			else
 			{
-				$user_online_link = '<a href="' . "profile.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $row['user_id'] . '"><i>' . $row['username'] . '</i></a>';
+				$user_online_link = '<a href="' . "ucp.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $row['user_id'] . '"><i>' . $row['username'] . '</i></a>';
 				$logged_hidden_online++;
 			}
 
@@ -304,8 +304,8 @@ $template->assign_vars(array(
 	'U_LOGIN_LOGOUT'=> $u_login_logout,
 	'U_INDEX' 		=> 'index.'.$phpEx.$SID,
 	'U_SEARCH' 		=> 'search.'.$phpEx.$SID,
-	'U_REGISTER' 	=> 'profile.'.$phpEx.$SID.'&amp;mode=register',
-	'U_PROFILE' 	=> 'profile.'.$phpEx.$SID.'&amp;mode=editprofile',
+	'U_REGISTER' 	=> 'ucp.'.$phpEx.$SID.'&amp;mode=register',
+	'U_PROFILE' 	=> 'ucp.'.$phpEx.$SID.'&amp;mode=editprofile',
 	'U_MODCP' 		=> 'modcp.'.$phpEx.$SID,
 	'U_FAQ' 		=> 'faq.'.$phpEx.$SID,
 	'U_SEARCH_SELF'	=> 'search.'.$phpEx.$SID.'&amp;search_id=egosearch',
diff --git a/phpBB/includes/ucp/usercp_avatar.php b/phpBB/includes/ucp/usercp_avatar.php
index c7321d758c..5db77a5f9b 100644
--- a/phpBB/includes/ucp/usercp_avatar.php
+++ b/phpBB/includes/ucp/usercp_avatar.php
@@ -326,7 +326,7 @@ function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current
 
 		'S_CATEGORY_SELECT' => $s_categories,
 		'S_COLSPAN' => $s_colspan,
-		'S_PROFILE_ACTION' => append_sid("profile.$phpEx?mode=$mode"),
+		'S_PROFILE_ACTION' => append_sid("ucp.$phpEx?mode=$mode"),
 		'S_HIDDEN_FIELDS' => $s_hidden_vars)
 	);
 
diff --git a/phpBB/includes/ucp/usercp_email.php b/phpBB/includes/ucp/usercp_email.php
index 64f750c09c..3afb3f9872 100644
--- a/phpBB/includes/ucp/usercp_email.php
+++ b/phpBB/includes/ucp/usercp_email.php
@@ -36,7 +36,7 @@ else
 
 if ( $userdata['user_id'] == ANONYMOUS )
 {
-	header('Location: ' . "login.$phpEx$SID&redirect=profile.$phpEx&mode=email&u=$user_id");
+	header('Location: ' . "login.$phpEx$SID&redirect=ucp.$phpEx&mode=email&u=$user_id");
 	exit;
 }
 
@@ -149,7 +149,7 @@ if ( $row = $db->sql_fetchrow($result) )
 		$template->assign_vars(array(
 			'USERNAME' => $username,
 
-			'S_POST_ACTION' => "profile.$phpEx$SID&amp;mode=email&amp;u=$user_id",
+			'S_POST_ACTION' => "ucp.$phpEx$SID&amp;mode=email&amp;u=$user_id",
 
 			'L_SEND_EMAIL_MSG' => $lang['Send_email_msg'],
 			'L_RECIPIENT' => $lang['Recipient'],
diff --git a/phpBB/includes/ucp/usercp_register.php b/phpBB/includes/ucp/usercp_register.php
index 1d964ed4e0..ded5f2916f 100644
--- a/phpBB/includes/ucp/usercp_register.php
+++ b/phpBB/includes/ucp/usercp_register.php
@@ -46,8 +46,8 @@ function show_coppa()
 		"AGREE_UNDER_13" => $user->lang['Agree_under_13'],
 		'DO_NOT_AGREE' => $user->lang['Agree_not'],
 
-		"U_AGREE_OVER13" => "profile.$phpEx$SID&amp;mode=register&amp;agreed=true",
-		"U_AGREE_UNDER13" => "profile.$phpEx$SID&amp;mode=register&amp;agreed=true&amp;coppa=true")
+		"U_AGREE_OVER13" => "ucp.$phpEx$SID&amp;mode=register&amp;agreed=true",
+		"U_AGREE_UNDER13" => "ucp.$phpEx$SID&amp;mode=register&amp;agreed=true&amp;coppa=true")
 	);
 }
 //
@@ -751,7 +751,7 @@ if ($mode == 'editprofile')
 		'S_PROFILE_EDIT' => ($mode == 'editprofile') ? true : false,
 		'S_HIDDEN_FIELDS' => $s_hidden_fields,
 		'S_FORM_ENCTYPE' => $form_enctype,
-		'S_PROFILE_ACTION' => "profile.$phpEx$SID")
+		'S_PROFILE_ACTION' => "ucp.$phpEx$SID")
 	);
 
 //
diff --git a/phpBB/includes/ucp/usercp_viewprofile.php b/phpBB/includes/ucp/usercp_viewprofile.php
index 348ce42ed9..cb77f2246d 100644
--- a/phpBB/includes/ucp/usercp_viewprofile.php
+++ b/phpBB/includes/ucp/usercp_viewprofile.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                           usercp_viewprofile.php
+ *                           usercp_viewucp.php
  *                            -------------------
  *   begin                : Saturday, Feb 13, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -121,7 +121,7 @@ else
 
 if ( $profiledata['user_viewemail'] || $auth->acl_get('a_') )
 {
-	$email_uri = ( $config['board_email_form'] ) ? "profile.$phpEx$SID&amp;mode=email&amp;u=" . $profiledata['user_id'] : 'mailto:' . $profiledata['user_email'];
+	$email_uri = ( $config['board_email_form'] ) ? "ucp.$phpEx$SID&amp;mode=email&amp;u=" . $profiledata['user_id'] : 'mailto:' . $profiledata['user_email'];
 
 	$email_img = '<a href="' . $email_uri . '">' . $user->img('icon_email', $user->lang['Send_email']) . '</a>';
 	$email = '<a href="' . $email_uri . '">' . $user->lang['Send_email'] . '</a>';
@@ -132,7 +132,7 @@ else
 	$email = '&nbsp;';
 }
 
-$temp_url = "profile.$phpEx$SID&amp;mode=viewprofile&amp;u=$user_id";
+$temp_url = "ucp.$phpEx$SID&amp;mode=viewprofile&amp;u=$user_id";
 $profile_img = '<a href="' . $temp_url . '">' . $user->img('icon_profile', $user->lang['Read_profile']) . '</a>';
 $profile = '<a href="' . $temp_url . '">' . $user->lang['Read_profile'] . '</a>';
 
@@ -159,7 +159,7 @@ else
 $aim_img = ( $profiledata['user_aim'] ) ? '<a href="aim:goim?screenname=' . $profiledata['user_aim'] . '&amp;message=Hello+Are+you+there?">' . $user->img('icon_aim', $user->lang['AIM']) . '</a>' : '';
 $aim = ( $profiledata['user_aim'] ) ? '<a href="aim:goim?screenname=' . $profiledata['user_aim'] . '&amp;message=Hello+Are+you+there?">' . $user->lang['AIM'] . '</a>' : '';
 
-$temp_url = "profile.$phpEx$SID&amp;mode=viewprofile&amp;u=$user_id";
+$temp_url = "ucp.$phpEx$SID&amp;mode=viewprofile&amp;u=$user_id";
 $msn_img = ( $profiledata['user_msnm'] ) ? '<a href="' . $temp_url . '">' . $user->img('icon_msnm', $user->lang['MSNM']) . '</a>' : '';
 $msn = ( $profiledata['user_msnm'] ) ? '<a href="' . $temp_url . '">' . $user->lang['MSNM'] . '</a>' : '';
 
@@ -232,7 +232,7 @@ $template->assign_vars(array(
 
 	'U_SEARCH_USER' => "search.$phpEx$SID&amp;search_author=" . urlencode($profiledata['username']),
 
-	'S_PROFILE_ACTION' => "profile.$phpEx$SID")
+	'S_PROFILE_ACTION' => "ucp.$phpEx$SID")
 );
 
 include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
diff --git a/phpBB/index.php b/phpBB/index.php
index 7891071e40..ea10654dc4 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -115,7 +115,7 @@ else
 $template->assign_vars(array(
 	'TOTAL_POSTS'	=>	sprintf($l_total_post_s, $total_posts),
 	'TOTAL_USERS'	=>	sprintf($l_total_user_s, $total_users),
-	'NEWEST_USER'	=>	sprintf($user->lang['Newest_user'], '<a href="profile.' . $phpEx . $SID . '&amp;mode=viewprofile&amp;u=' . $newest_uid . '">', $newest_user, '</a>'),
+	'NEWEST_USER'	=>	sprintf($user->lang['Newest_user'], '<a href="ucp.' . $phpEx . $SID . '&amp;mode=viewprofile&amp;u=' . $newest_uid . '">', $newest_user, '</a>'),
 
 	'FORUM_IMG'			=>	$user->img('forum', $user->lang['No_new_posts']),
 	'FORUM_NEW_IMG'		=>	$user->img('forum_new', $user->lang['New_posts']),
diff --git a/phpBB/login.php b/phpBB/login.php
index c8b18c859a..9f3c471655 100644
--- a/phpBB/login.php
+++ b/phpBB/login.php
@@ -80,7 +80,7 @@ if ( !$user->data['user_id'] )
 		'L_ENTER_PASSWORD'	=> $user->lang['Enter_password'],
 		'L_SEND_PASSWORD' 	=> $user->lang['Forgotten_password'],
 
-		'U_SEND_PASSWORD' 	=> "profile.$phpEx$SID&amp;mode=sendpassword",
+		'U_SEND_PASSWORD' 	=> "ucp.$phpEx$SID&amp;mode=sendpassword",
 
 		'S_HIDDEN_FIELDS' 	=> '<input type="hidden" name="redirect" value="' . $redirect . '" />')
 	);
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 33937bf777..b2351e78f9 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -209,7 +209,7 @@ if ($row = $db->sql_fetchrow($result))
 
 		if ($row['user_viewemail'] || $auth->acl_get('a_'))
 		{
-			$email_uri = ($config['board_email_form']) ? "profile.$phpEx$SID&amp;mode=email&amp;u=" . $user_id : 'mailto:' . $row['user_email'];
+			$email_uri = ($config['board_email_form']) ? "ucp.$phpEx$SID&amp;mode=email&amp;u=" . $user_id : 'mailto:' . $row['user_email'];
 
 			$email_img = '<a href="' . $email_uri . '">' . $user->img('icon_email', $user->lang['Send_email']) . '</a>';
 			$email = '<a href="' . $email_uri . '">' . $user->lang['Send_email'] . '</a>';
@@ -220,7 +220,7 @@ if ($row = $db->sql_fetchrow($result))
 			$email = '&nbsp;';
 		}
 
-		$temp_url = "profile.$phpEx$SID&amp;mode=viewprofile&amp;u=$user_id";
+		$temp_url = "ucp.$phpEx$SID&amp;mode=viewprofile&amp;u=$user_id";
 		$profile_img = '<a href="' . $temp_url . '">' . $user->img('icon_profile', $user->lang['Read_profile']) . '</a>';
 		$profile = '<a href="' . $temp_url . '">' . $user->lang['Read_profile'] . '</a>';
 
@@ -247,7 +247,7 @@ if ($row = $db->sql_fetchrow($result))
 		$aim_img = ($row['user_aim']) ? '<a href="aim:goim?screenname=' . $row['user_aim'] . '&amp;message=Hello+Are+you+there?">' . $user->img('icon_aim', $user->lang['AIM']) . '</a>' : '';
 		$aim = ($row['user_aim']) ? '<a href="aim:goim?screenname=' . $row['user_aim'] . '&amp;message=Hello+Are+you+there?">' . $user->lang['AIM'] . '</a>' : '';
 
-		$temp_url = "profile.$phpEx$SID&amp;mode=viewprofile&amp;u=$user_id";
+		$temp_url = "ucp.$phpEx$SID&amp;mode=viewprofile&amp;u=$user_id";
 		$msn_img = ($row['user_msnm']) ? '<a href="' . $temp_url . '">' . $user->img('icon_msnm', $user->lang['MSNM']) . '</a>' : '';
 		$msn = ($row['user_msnm']) ? '<a href="' . $temp_url . '">' . $user->lang['MSNM'] . '</a>' : '';
 
@@ -288,7 +288,7 @@ if ($row = $db->sql_fetchrow($result))
 
 			'S_ROW_COUNT' => $i,
 
-			'U_VIEWPROFILE' => "profile.$phpEx$SID&amp;mode=viewprofile&amp;u=$user_id")
+			'U_VIEWPROFILE' => "ucp.$phpEx$SID&amp;mode=viewprofile&amp;u=$user_id")
 		);
 
 		$i++;
diff --git a/phpBB/modcp.php b/phpBB/modcp.php
index e18d2a645a..0bf601fa1c 100644
--- a/phpBB/modcp.php
+++ b/phpBB/modcp.php
@@ -822,7 +822,7 @@ switch( $mode )
 					'POSTS' => $row['postings'] . ' ' . ( ( $row['postings'] == 1 ) ? $user->lang['Post'] : $user->lang['Posts'] ),
 					'L_SEARCH_POSTS' => sprintf($user->lang['Search_user_posts'], $username),
 
-					'U_PROFILE' => "profile.$phpEx$SID&amp;mode=viewprofile&amp;u=$id",
+					'U_PROFILE' => "ucp.$phpEx$SID&amp;mode=viewprofile&amp;u=$id",
 					'U_SEARCHPOSTS' => "search.$phpEx$SID&amp;search_author=" . urlencode($username) . "&amp;showresults=topics")
 				);
 
diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php
index 9bfdd0d51a..0e3fd638e6 100644
--- a/phpBB/privmsg.php
+++ b/phpBB/privmsg.php
@@ -438,7 +438,7 @@ else if ( $mode == 'read' )
 
 	$post_date = $user->format_date($privmsg['privmsgs_date']);
 
-	$temp_url = append_sid("profile.$phpEx?mode=viewprofile&amp;u=$user_id_from");
+	$temp_url = append_sid("ucp.$phpEx?mode=viewprofile&amp;u=$user_id_from");
 	$profile_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_profile'] . '" alt="' . $lang['Read_profile'] . '" title="' . $lang['Read_profile'] . '" border="0" /></a>';
 	$profile = '<a href="' . $temp_url . '">' . $lang['Read_profile'] . '</a>';
 
@@ -448,7 +448,7 @@ else if ( $mode == 'read' )
 
 	if ( !empty($privmsg['user_viewemail']) || $auth->acl_get('a_') )
 	{
-		$email_uri = ( $config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&amp;u$user_id_from") : 'mailto:' . $privmsg['user_email'];
+		$email_uri = ( $config['board_email_form'] ) ? append_sid("ucp.$phpEx?mode=email&amp;u$user_id_from") : 'mailto:' . $privmsg['user_email'];
 
 		$email_img = '<a href="' . $email_uri . '"><img src="' . $images['icon_email'] . '" alt="' . $lang['Send_email'] . '" title="' . $lang['Send_email'] . '" border="0" /></a>';
 		$email = '<a href="' . $email_uri . '">' . $lang['Send_email'] . '</a>';
@@ -478,7 +478,7 @@ else if ( $mode == 'read' )
 	$aim_img = ( $privmsg['user_aim'] ) ? '<a href="aim:goim?screenname=' . $privmsg['user_aim'] . '&amp;message=Hello+Are+you+there?"><img src="' . $images['icon_aim'] . '" alt="' . $lang['AIM'] . '" title="' . $lang['AIM'] . '" border="0" /></a>' : '';
 	$aim = ( $privmsg['user_aim'] ) ? '<a href="aim:goim?screenname=' . $privmsg['user_aim'] . '&amp;message=Hello+Are+you+there?">' . $lang['AIM'] . '</a>' : '';
 
-	$temp_url = append_sid("profile.$phpEx?mode=viewprofile&amp;u=$poster_id");
+	$temp_url = append_sid("ucp.$phpEx?mode=viewprofile&amp;u=$poster_id");
 	$msn_img = ( $privmsg['user_msnm'] ) ? '<a href="' . $temp_url . '"><img src="' . $images['icon_msnm'] . '" alt="' . $lang['MSNM'] . '" title="' . $lang['MSNM'] . '" border="0" /></a>' : '';
 	$msn = ( $privmsg['user_msnm'] ) ? '<a href="' . $temp_url . '">' . $lang['MSNM'] . '</a>' : '';
 
@@ -1823,7 +1823,7 @@ if ( $row = $db->sql_fetchrow($result) )
 		$msg_userid = $row['user_id'];
 		$msg_username = $row['username'];
 
-		$u_from_user_profile = append_sid("profile.$phpEx?mode=viewprofile&amp;u=$msg_userid");
+		$u_from_user_profile = append_sid("ucp.$phpEx?mode=viewprofile&amp;u=$msg_userid");
 
 		$msg_subject = $row['privmsgs_subject'];
 
diff --git a/phpBB/search.php b/phpBB/search.php
index bbd76ef591..b4ca6dd8be 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -839,7 +839,7 @@ if ( $search_keywords != '' || $search_author != '' || $search_id )
 
 				}
 
-				$poster = ( !$searchset[$i]['user_id'] ) ? '<a href="' . "profile.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $searchset[$i]['user_id'] . '">' : '';
+				$poster = ( !$searchset[$i]['user_id'] ) ? '<a href="' . "ucp.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $searchset[$i]['user_id'] . '">' : '';
 				$poster .= ( $searchset[$i]['user_id'] ) ? $searchset[$i]['username'] : ( ( $searchset[$i]['post_username'] != "" ) ? $searchset[$i]['post_username'] : $user->lang['Guest'] );
 				$poster .= ( $searchset[$i]['user_id'] ) ? '</a>' : '';
 
@@ -1067,7 +1067,7 @@ if ( $search_keywords != '' || $search_author != '' || $search_id )
 				}
 
 
-				$topic_author = ( $searchset[$i]['user_id'] ) ? '<a href="' . "profile.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $searchset[$i]['user_id'] . '">' : '';
+				$topic_author = ( $searchset[$i]['user_id'] ) ? '<a href="' . "ucp.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $searchset[$i]['user_id'] . '">' : '';
 				$topic_author .= ( $searchset[$i]['user_id'] ) ? $searchset[$i]['username'] : ( ( $searchset[$i]['post_username'] != '' ) ? $searchset[$i]['post_username'] : $user->lang['Guest'] );
 
 				$topic_author .= ( $searchset[$i]['user_id'] ) ? '</a>' : '';
@@ -1076,7 +1076,7 @@ if ( $search_keywords != '' || $search_author != '' || $search_id )
 
 				$last_post_time = $user->format_date($searchset[$i]['post_time']);
 
-				$last_post_author = ( $searchset[$i]['id2'] ) ? ( ($searchset[$i]['post_username2'] != '' ) ? $searchset[$i]['post_username2'] . ' ' : $user->lang['Guest'] . ' ' ) : '<a href="' . "profile.$phpEx$SID&amp;mode=viewprofile&amp;u="  . $searchset[$i]['id2'] . '">' . $searchset[$i]['user2'] . '</a>';
+				$last_post_author = ( $searchset[$i]['id2'] ) ? ( ($searchset[$i]['post_username2'] != '' ) ? $searchset[$i]['post_username2'] . ' ' : $user->lang['Guest'] . ' ' ) : '<a href="' . "ucp.$phpEx$SID&amp;mode=viewprofile&amp;u="  . $searchset[$i]['id2'] . '">' . $searchset[$i]['user2'] . '</a>';
 
 				$last_post_url = '<a href="' . "viewtopic.$phpEx$SID&amp;p=" . $searchset[$i]['topic_last_post_id'] . '#' . $searchset[$i]['topic_last_post_id'] . '">' . $user->img('icon_latest_reply', $user->lang['View_latest_post']) . '</a>';
 
diff --git a/phpBB/profile.php b/phpBB/ucp.php
index 20e33ce027..60170cd119 100644..100755
--- a/phpBB/profile.php
+++ b/phpBB/ucp.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                                profile.php
+ *                                ucp.php
  *                            -------------------
  *   begin                : Saturday, Feb 13, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -33,7 +33,7 @@ $auth->acl($user->data);
 
 // Set default email variables
 $script_name = preg_replace('/^\/?(.*?)\/?$/', '\1', trim($config['script_path']));
-$script_name = ( $script_name != '' ) ? $script_name . '/profile.'.$phpEx : 'profile.'.$phpEx;
+$script_name = ( $script_name != '' ) ? $script_name . '/ucp.'.$phpEx : 'ucp.'.$phpEx;
 $server_name = trim($config['server_name']);
 $server_protocol = ( $config['cookie_secure'] ) ? 'https://' : 'http://';
 $server_port = ( $config['server_port'] <> 80 ) ? ':' . trim($config['server_port']) . '/' : '/';
@@ -71,14 +71,14 @@ if ( isset($_GET['mode']) || isset($_POST['mode']) )
 
 	if ( $mode == 'viewprofile' )
 	{
-		include($phpbb_root_path . 'includes/usercp_viewprofile.'.$phpEx);
+		include($phpbb_root_path . 'includes/usercp_viewucp.'.$phpEx);
 		exit;
 	}
 	else if ( $mode == 'editprofile' || $mode == 'register' )
 	{
 		if ( !$user->data['user_id'] && $mode == 'editprofile' )
 		{
-			redirect("login.$phpEx$SID&redirect=profile.$phpEx&mode=editprofile");
+			redirect("login.$phpEx$SID&redirect=ucp.$phpEx&mode=editprofile");
 		}
 		else if ( $user->data['user_id'] && $mode == 'register' )
 		{
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index c1095ef5f3..57acab90f2 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -493,7 +493,7 @@ if ($forum_data['forum_postable'])
 			// Generate all the URIs ...
 			$view_topic_url = 'viewtopic.' . $phpEx . $SID . '&amp;f=' . $forum_id . '&amp;t=' . $topic_id;
 
-			$topic_author = ($topic_rowset[$i]['user_id'] != ANONYMOUS) ? '<a href="profile.' . $phpEx . $SID . '&amp;mode=viewprofile&amp;u=' . $topic_rowset[$i]['user_id'] . '">' : '';
+			$topic_author = ($topic_rowset[$i]['user_id'] != ANONYMOUS) ? '<a href="ucp.' . $phpEx . $SID . '&amp;mode=viewprofile&amp;u=' . $topic_rowset[$i]['user_id'] . '">' : '';
 			$topic_author .= ($topic_rowset[$i]['user_id'] != ANONYMOUS) ? $topic_rowset[$i]['username'] : (($topic_rowset[$i]['topic_first_poster_name'] != '') ? $topic_rowset[$i]['topic_first_poster_name'] : $user->lang['Guest']);
 
 			$topic_author .= ($topic_rowset[$i]['user_id'] != ANONYMOUS) ? '</a>' : '';
@@ -502,7 +502,7 @@ if ($forum_data['forum_postable'])
 
 			$last_post_time = $user->format_date($topic_rowset[$i]['topic_last_post_time']);
 
-			$last_post_author = ($topic_rowset[$i]['id2'] == ANONYMOUS) ? (($topic_rowset[$i]['topic_last_poster_name'] != '') ? $topic_rowset[$i]['topic_last_poster_name'] . ' ' : $user->lang['Guest'] . ' ') : '<a href="profile.' . $phpEx . $SID . '&amp;mode=viewprofile&amp;u='  . $topic_rowset[$i]['topic_last_poster_id'] . '">' . $topic_rowset[$i]['user2'] . '</a>';
+			$last_post_author = ($topic_rowset[$i]['id2'] == ANONYMOUS) ? (($topic_rowset[$i]['topic_last_poster_name'] != '') ? $topic_rowset[$i]['topic_last_poster_name'] . ' ' : $user->lang['Guest'] . ' ') : '<a href="ucp.' . $phpEx . $SID . '&amp;mode=viewprofile&amp;u='  . $topic_rowset[$i]['topic_last_poster_id'] . '">' . $topic_rowset[$i]['user2'] . '</a>';
 
 			$last_post_url = '<a href="viewtopic.' . $phpEx . $SID . '&amp;f=' . $forum_id . '&amp;p=' . $topic_rowset[$i]['topic_last_post_id'] . '#' . $topic_rowset[$i]['topic_last_post_id'] . '">' . $user->img('goto_post_latest', 'View_latest_post') . '</a>';
 
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php
index 41eee0cb0d..0cc7ee950d 100644
--- a/phpBB/viewonline.php
+++ b/phpBB/viewonline.php
@@ -190,7 +190,7 @@ while ( $row = $db->sql_fetchrow($result) )
 
 			'S_ROW_COUNT'	=> $$which_counter,
 
-			'U_USER_PROFILE'	=> "profile.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $user_id,
+			'U_USER_PROFILE'	=> "ucp.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $user_id,
 			'U_FORUM_LOCATION'	=> $location_url)
 		);
 
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 38de8a5716..c5c47d1c60 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -612,7 +612,7 @@ if ($row = $db->sql_fetchrow($result))
 
 		if (!isset($poster_details[$poster_id]['profile']) && $poster_id)
 		{
-			$temp_url = "profile.$phpEx$SID&amp;mode=viewprofile&amp;u=$poster_id";
+			$temp_url = "ucp.$phpEx$SID&amp;mode=viewprofile&amp;u=$poster_id";
 			$poster_details[$poster_id]['profile_img'] = '<a href="' . $temp_url . '">' . $user->img('icon_profile', $user->lang['Read_profile']) . '</a>';
 			$poster_details[$poster_id]['profile'] = '<a href="' . $temp_url . '">' . $user->lang['Read_profile'] . '</a>';
 
@@ -622,7 +622,7 @@ if ($row = $db->sql_fetchrow($result))
 
 			if (!empty($row['user_viewemail']) || $auth->acl_get('m_', $forum_id))
 			{
-				$email_uri = ($config['board_email_form'] && $config['email_enable']) ? "profile.$phpEx$SID&amp;mode=email&amp;u=" . $poster_id : 'mailto:' . $row['user_email'];
+				$email_uri = ($config['board_email_form'] && $config['email_enable']) ? "ucp.$phpEx$SID&amp;mode=email&amp;u=" . $poster_id : 'mailto:' . $row['user_email'];
 
 				$poster_details[$poster_id]['email_img'] = '<a href="' . $email_uri . '">' . $user->img('icon_email', $user->lang['Send_email']) . '</a>';
 				$poster_details[$poster_id]['email'] = '<a href="' . $email_uri . '">' . $user->lang['Send_email'] . '</a>';
@@ -652,7 +652,7 @@ if ($row = $db->sql_fetchrow($result))
 			$poster_details[$poster_id]['aim_img'] = ($row['user_aim']) ? '<a href="aim:goim?screenname=' . $row['user_aim'] . '&amp;message=Hello+Are+you+there?">' . $user->img('icon_aim', $user->lang['AIM']) . '</a>' : '';
 			$poster_details[$poster_id]['aim'] = ($row['user_aim']) ? '<a href="aim:goim?screenname=' . $row['user_aim'] . '&amp;message=Hello+Are+you+there?">' . $user->lang['AIM'] . '</a>' : '';
 
-			$temp_url = "profile.$phpEx$SID&amp;mode=viewprofile&amp;u=$poster_id";
+			$temp_url = "ucp.$phpEx$SID&amp;mode=viewprofile&amp;u=$poster_id";
 			$poster_details[$poster_id]['msn_img'] = ($row['user_msnm']) ? '<a href="' . $temp_url . '">' . $user->img('icon_msnm', $user->lang['MSNM']) . '</a>' : '';
 			$poster_details[$poster_id]['msn'] = ($row['user_msnm']) ? '<a href="' . $temp_url . '">' . $user->lang['MSNM'] . '</a>' : '';