diff --git a/wp-admin/includes/bookmark.php b/wp-admin/includes/bookmark.php
index 8f36f9f1d5..7dd8baf651 100644
--- a/wp-admin/includes/bookmark.php
+++ b/wp-admin/includes/bookmark.php
@@ -246,7 +246,7 @@ function wp_set_link_cats( $link_id = 0, $link_categories = array() ) {
 function wp_update_link( $linkdata ) {
 	$link_id = (int) $linkdata['link_id'];
 
-	$link = get_link( $link_id, ARRAY_A );
+	$link = get_bookmark( $link_id, ARRAY_A );
 
 	// Escape data pulled from DB.
 	$link = add_magic_quotes( $link );
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index fbec483966..32eae42237 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -1146,7 +1146,7 @@ function get_media_items( $post_id, $errors ) {
 function get_media_item( $attachment_id, $args = null ) {
 	global $redir_tab;
 
-	if ( ( $attachment_id = intval( $attachment_id ) ) && $thumb_url = get_attachment_icon_src( $attachment_id ) )
+	if ( ( $attachment_id = intval( $attachment_id ) ) && $thumb_url = wp_get_attachment_image_src( $attachment_id ) )
 		$thumb_url = $thumb_url[0];
 	else
 		return false;
diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php
index ed9f6f4957..787cb4532b 100644
--- a/wp-admin/includes/ms.php
+++ b/wp-admin/includes/ms.php
@@ -212,7 +212,7 @@ function wpmu_get_blog_allowedthemes( $blog_id = 0 ) {
 
 		if ( is_array( $blog_allowed_themes ) ) {
 			foreach( (array) $themes as $key => $theme ) {
-				$theme_key = wp_specialchars( $theme[ 'Stylesheet' ] );
+				$theme_key = esc_html( $theme[ 'Stylesheet' ] );
 				if ( isset( $blog_allowed_themes[ $key ] ) == true ) {
 					$blog_allowedthemes[ $theme_key ] = 1;
 				}
@@ -335,7 +335,7 @@ function get_site_allowed_themes() {
 			$allowed_themes = array();
 		} else {
 			foreach( (array) $themes as $key => $theme ) {
-				$theme_key = wp_specialchars( $theme[ 'Stylesheet' ] );
+				$theme_key = esc_html( $theme[ 'Stylesheet' ] );
 				if ( isset( $allowed_themes[ $key ] ) == true ) {
 					$allowedthemes[ $theme_key ] = 1;
 				}
diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php
index 56a4241b24..de9029d150 100644
--- a/wp-admin/includes/theme.php
+++ b/wp-admin/includes/theme.php
@@ -142,12 +142,12 @@ function get_allowed_themes() {
 	if ( is_array( $blog_allowed_themes ) )
 		$allowed_themes = array_merge( $allowed_themes, $blog_allowed_themes );
 
-	if ( isset( $allowed_themes[ wp_specialchars( $ct->stylesheet ) ] ) == false )
-		$allowed_themes[ wp_specialchars( $ct->stylesheet ) ] = true;
+	if ( isset( $allowed_themes[ esc_html( $ct->stylesheet ) ] ) == false )
+		$allowed_themes[ esc_html( $ct->stylesheet ) ] = true;
 
 	reset( $themes );
 	foreach ( $themes as $key => $theme ) {
-		if ( isset( $allowed_themes[ wp_specialchars( $theme[ 'Stylesheet' ] ) ] ) == false )
+		if ( isset( $allowed_themes[ esc_html( $theme[ 'Stylesheet' ] ) ] ) == false )
 			unset( $themes[ $key ] );
 	}
 	reset( $themes );
diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php
index 731aee6f35..5597bb1a80 100644
--- a/wp-admin/includes/user.php
+++ b/wp-admin/includes/user.php
@@ -92,7 +92,7 @@ function edit_user( $user_id = 0 ) {
 		if ( empty ( $_POST['url'] ) || $_POST['url'] == 'http://' ) {
 			$user->user_url = '';
 		} else {
-			$user->user_url = sanitize_url( $_POST['url'] );
+			$user->user_url = esc_url_raw( $_POST['url'] );
 			$user->user_url = preg_match('/^(https?|ftps?|mailto|news|irc|gopher|nntp|feed|telnet):/is', $user->user_url) ? $user->user_url : 'http://'.$user->user_url;
 		}
 	}
diff --git a/wp-admin/ms-edit.php b/wp-admin/ms-edit.php
index 3f413cf236..d435282e75 100644
--- a/wp-admin/ms-edit.php
+++ b/wp-admin/ms-edit.php
@@ -385,8 +385,8 @@ switch ( $_GET['action'] ) {
 			$themes = get_themes();
 			reset( $themes );
 			foreach ( (array) $themes as $key => $theme ) {
-				if ( $_POST['theme'][ wp_specialchars( $theme['Stylesheet'] ) ] == 'enabled' )
-					$allowed_themes[ wp_specialchars( $theme['Stylesheet'] ) ] = true;
+				if ( $_POST['theme'][ esc_html( $theme['Stylesheet'] ) ] == 'enabled' )
+					$allowed_themes[ esc_html( $theme['Stylesheet'] ) ] = true;
 			}
 			update_site_option( 'allowedthemes', $allowed_themes );
 		}
@@ -413,12 +413,12 @@ switch ( $_GET['action'] ) {
 			</head>
 			<body id="error-page">
 				<h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
-				<form action='ms-edit.php?action=<?php echo wp_specialchars( $_GET[ 'action2' ] ) ?>' method='post'>
-					<input type='hidden' name='action' value='<?php echo wp_specialchars( $_GET['action2'] ) ?>' />
-					<input type='hidden' name='id' value='<?php echo wp_specialchars( $id ); ?>' />
+				<form action='ms-edit.php?action=<?php echo esc_attr( $_GET[ 'action2' ] ) ?>' method='post'>
+					<input type='hidden' name='action' value='<?php echo esc_attr( $_GET['action2'] ) ?>' />
+					<input type='hidden' name='id' value='<?php echo esc_attr( $id ); ?>' />
 					<input type='hidden' name='ref' value='<?php echo $referrer; ?>' />
 					<?php wp_nonce_field( $_GET['action2'] ) ?>
-					<p><?php echo wp_specialchars( stripslashes($_GET['msg']) ); ?></p>
+					<p><?php echo esc_html( stripslashes($_GET['msg']) ); ?></p>
 					<p class="submit"><input class="button" type='submit' value='<?php _e("Confirm"); ?>' /></p>
 				</form>
 			</body>
@@ -499,7 +499,7 @@ switch ( $_GET['action'] ) {
 			wp_die( __('Missing email.') );
 
 		$password = wp_generate_password();
-		$user_id = wpmu_create_user(wp_specialchars( strtolower( $user['username'] ) ), $password, wp_specialchars( $user['email'] ) );
+		$user_id = wpmu_create_user(wp_specialchars( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) );
 
 		if ( false == $user_id )
  			wp_die( __('Duplicated username or email address.') );
diff --git a/wp-admin/ms-options.php b/wp-admin/ms-options.php
index 129c7f0ce0..10b19e969f 100644
--- a/wp-admin/ms-options.php
+++ b/wp-admin/ms-options.php
@@ -280,7 +280,7 @@ if (isset($_GET['updated'])) {
 			$menu_perms = get_site_option( 'menu_items' );
 			$menu_items = apply_filters( 'mu_menu_items', array('plugins' => __('Plugins')) );
 			foreach ( (array) $menu_items as $key => $val ) {
-				echo "<tr><th scope='row'>" . wp_specialchars($val) . "</th><td><input type='checkbox' name='menu_items[" . $key . "]' value='1'" . checked($menu_perms[$key], '1', false) . " /></td></tr>";
+				echo "<tr><th scope='row'>" . esc_html($val) . "</th><td><input type='checkbox' name='menu_items[" . $key . "]' value='1'" . checked($menu_perms[$key], '1', false) . " /></td></tr>";
 			}
 			?>
 		</table>
diff --git a/wp-admin/ms-sites.php b/wp-admin/ms-sites.php
index 4f0f1bce3e..242c53115a 100644
--- a/wp-admin/ms-sites.php
+++ b/wp-admin/ms-sites.php
@@ -168,7 +168,7 @@ switch ( $action ) {
 								$disabled = '';
 								if ( is_serialized($option->option_value) ) {
 									if ( is_serialized_string($option->option_value) ) {
-										$option->option_value = wp_specialchars(maybe_unserialize($option->option_value), 'single');
+										$option->option_value = esc_html(maybe_unserialize($option->option_value), 'single');
 									} else {
 										$option->option_value = "SERIALIZED DATA";
 										$disabled = ' disabled="disabled"';
@@ -210,7 +210,7 @@ switch ( $action ) {
 						$allowed_themes = array_keys( $themes );
 					$out = '';
 					foreach ( $themes as $key => $theme ) {
-						$theme_key = wp_specialchars( $theme['Stylesheet'] );
+						$theme_key = esc_html( $theme['Stylesheet'] );
 						if ( ! isset($allowed_themes[$theme_key] ) ) {
 							$checked = ( isset($blog_allowed_themes[ $theme_key ]) ) ? 'checked="checked"' : '';
 							$out .= '<tr class="form-field form-required">
@@ -253,7 +253,7 @@ switch ( $action ) {
 								<td>
 									<select name="role[<?php echo $val->user_id ?>]" id="new_role"><?php
 										foreach ( $editblog_roles as $role => $role_assoc ){
-											$name = translate_with_context($role_assoc['name']);
+											$name = translate_user_role($role_assoc['name']);
 											$selected = ( $role == $existing_role ) ? 'selected="selected"' : '';
 											echo "<option {$selected} value=\"" . esc_attr($role) . "\">{$name}</option>";
 										}
diff --git a/wp-admin/ms-themes.php b/wp-admin/ms-themes.php
index 8ee76216ca..1c5924beda 100644
--- a/wp-admin/ms-themes.php
+++ b/wp-admin/ms-themes.php
@@ -37,7 +37,7 @@ $allowed_themes = get_site_allowed_themes();
 			$class = '';
 			foreach ( (array) $themes as $key => $theme ) {
 				$total_theme_count++;
-				$theme_key = wp_specialchars($theme['Stylesheet']);
+				$theme_key = esc_html($theme['Stylesheet']);
 				$class = ('alt' == $class) ? '' : 'alt';
 				$class1 = $enabled = $disabled = '';
 
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index 52ba22cef1..1902ec5daf 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -70,7 +70,7 @@ if ( is_multisite() && IS_PROFILE_PAGE && isset( $_GET[ 'newuseremail' ] ) && $c
 	$new_email = get_option( $current_user->ID . '_new_email' );
 	if ( $new_email[ 'hash' ] == $_GET[ 'newuseremail' ] ) {
 		$user->ID = $current_user->ID;
-		$user->user_email = wp_specialchars( trim( $new_email[ 'newemail' ] ) );
+		$user->user_email = esc_html( trim( $new_email[ 'newemail' ] ) );
 		if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) )
 			$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login ) );
 		wp_update_user( get_object_vars( $user ) );
diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php
index 2e805cdd00..bb8f54565c 100644
--- a/wp-admin/user-new.php
+++ b/wp-admin/user-new.php
@@ -27,7 +27,7 @@ If you do not want to join this blog please ignore
 this email. This invitation will expire in a few days.
 
 Please click the following link to activate your user account:
-%%s" ), get_bloginfo('name'), site_url(), wp_specialchars( $_REQUEST[ 'role' ] ) );
+%%s" ), get_bloginfo('name'), site_url(), esc_html( $_REQUEST[ 'role' ] ) );
 	}
 	add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' );
 
@@ -55,7 +55,7 @@ if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) {
 		$user_details = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->users} WHERE user_login = %s AND user_email = %s", $user_login, $_REQUEST[ 'email' ] ) );
 		if ( $user_details ) {
 			// Adding an existing user to this blog
-			$new_user_email = wp_specialchars(trim($_REQUEST['email']));
+			$new_user_email = esc_html(trim($_REQUEST['email']));
 			$redirect = 'user-new.php';
 			$username = $user_details->user_login;
 			$user_id = $user_details->ID;
diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index ddd8bebb8e..0eceb67415 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -867,7 +867,7 @@ function wpmu_admin_do_redirect( $url = '' ) {
 	$url = wpmu_admin_redirect_add_updated_param( $url );
 	if ( isset( $_GET['redirect'] ) ) {
 		if ( substr( $_GET['redirect'], 0, 2 ) == 's_' )
-			$url .= "&action=blogs&s=". wp_specialchars( substr( $_GET['redirect'], 2 ) );
+			$url .= "&action=blogs&s=". esc_html( substr( $_GET['redirect'], 2 ) );
 	} elseif ( isset( $_POST['redirect'] ) ) {
 		$url = wpmu_admin_redirect_add_updated_param( $_POST['redirect'] );
 	}
@@ -1155,7 +1155,7 @@ function wpmu_signup_blog_notification($domain, $path, $title, $user, $user_emai
 	$admin_email = get_site_option( "admin_email" );
 	if ( $admin_email == '' )
 		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
-	$from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
+	$from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : esc_html( get_site_option( "site_name" ) );
 	$message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = sprintf( apply_filters( 'wpmu_signup_blog_notification_email', __( "To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your blog here:\n\n%s" ) ), $activate_url, esc_url( "http://{$domain}{$path}" ), $key );
 	// TODO: Don't hard code activation link.
@@ -1174,7 +1174,7 @@ function wpmu_signup_user_notification($user, $user_email, $key, $meta = '') {
 	$admin_email = get_site_option( "admin_email" );
 	if ( $admin_email == '' )
 		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
-	$from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
+	$from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : esc_html( get_site_option( "site_name" ) );
 	$message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = sprintf( apply_filters( 'wpmu_signup_user_notification_email', __( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\n" ) ), site_url( "wp-activate.php?key=$key" ), $key );
 	// TODO: Don't hard code activation link.
@@ -1478,7 +1478,7 @@ Thanks!
 	if ( $admin_email == '' )
 		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
 
-	$from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
+	$from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : esc_html( get_site_option( "site_name" ) );
 	$message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = $welcome_email;
 
@@ -1511,7 +1511,7 @@ function wpmu_welcome_user_notification($user_id, $password, $meta = '') {
 	if ( $admin_email == '' )
 		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
 
-	$from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
+	$from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : esc_html( get_site_option( "site_name" ) );
 	$message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = $welcome_email;
 
diff --git a/wp-signup.php b/wp-signup.php
index 38ac06aa16..533cdc0fce 100644
--- a/wp-signup.php
+++ b/wp-signup.php
@@ -230,7 +230,7 @@ function signup_user($user_name = '', $user_email = '', $errors = '') {
 	if ( !is_wp_error($errors) )
 		$errors = new WP_Error();
 	if ( isset( $_POST[ 'signup_for' ] ) )
-		$signup[ wp_specialchars( $_POST[ 'signup_for' ] ) ] = 'checked="checked"';
+		$signup[ esc_html( $_POST[ 'signup_for' ] ) ] = 'checked="checked"';
 	else
 		$signup[ 'blog' ] = 'checked="checked"';