diff --git a/index.php b/index.php
index a301987bbe..9a708f961a 100644
--- a/index.php
+++ b/index.php
@@ -93,7 +93,7 @@ require_once('wp-blog-header.php');
  <li>Other:
 	<ul>
 		<li><a href="<?php echo $siteurl; ?>/wp-login.php">login</a></li>
-		<li><a href="<?php echo $siteurl; ?>/b2register.php">register</a></li>
+		<li><a href="<?php echo $siteurl; ?>/wp-register.php">register</a></li>
 	</ul>
  </li>
  <li>Meta:
diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 5324adba0f..8f57174189 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -76,7 +76,7 @@ setTimeout("redirect();", 600);
 	}
 
 	function launchupload() {
-		window.open ("upload.php", "b2upload", "width=380,height=360,location=0,menubar=0,resizable=1,scrollbars=yes,status=1,toolbar=0");
+		window.open ("upload.php", "wpupload", "width=380,height=360,location=0,menubar=0,resizable=1,scrollbars=yes,status=1,toolbar=0");
 	}
 
     function helpWindow(url) {
diff --git a/wp-admin/bookmarklet.php b/wp-admin/bookmarklet.php
index 131d3323e9..de64195105 100644
--- a/wp-admin/bookmarklet.php
+++ b/wp-admin/bookmarklet.php
@@ -38,7 +38,7 @@ window.close()
 <script type="text/javascript" language="javascript">
 <!--
 function launchupload() {
-	window.open ("upload.php", "b2upload", "width=380,height=360,location=0,menubar=0,resizable=1,scrollbars=yes,status=1,toolbar=0");
+	window.open ("upload.php", "wpupload", "width=380,height=360,location=0,menubar=0,resizable=1,scrollbars=yes,status=1,toolbar=0");
 }
 
 //-->
diff --git a/wp-admin/edit-showposts.php b/wp-admin/edit-showposts.php
index a554f646c9..9f3e5c4a0a 100644
--- a/wp-admin/edit-showposts.php
+++ b/wp-admin/edit-showposts.php
@@ -284,9 +284,9 @@ echo $posts_nav_bar;
 								echo " - <a href=\"post.php?action=deletecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return confirm('You are about to delete this comment by \'".$comment->comment_author."\'\\n  \'Cancel\' to stop, \'OK\' to delete.')\">Delete</a> ";
 								if ( ('none' != get_settings("comment_moderation")) && ($user_level >= 3) ) {
 									if ('approved' == wp_get_comment_status($comment->comment_ID)) {
-										echo " - <a href=\"b2edit.php?action=unapprovecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\">Unapprove</a> ";
+										echo " - <a href=\"edit.php?action=unapprovecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\">Unapprove</a> ";
 									} else {
-										echo " - <a href=\"b2edit.php?action=approvecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\">Approve</a> ";
+										echo " - <a href=\"edit.php?action=approvecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\">Approve</a> ";
 									}
 								}
 								echo " ]";
diff --git a/wp-admin/import-b2.php b/wp-admin/import-b2.php
index 675ea95f56..c5445f3394 100644
--- a/wp-admin/import-b2.php
+++ b/wp-admin/import-b2.php
@@ -59,7 +59,7 @@ switch($step) {
     Right now.</li>
 </ul>
 <p><code></code>Have you looked at the <a href="../readme.html">readme</a>? If 
-  you&#8217;re all ready, <a href="b2-2-wp.php?step=1">let&#8217;s go</a>!</p>
+  you&#8217;re all ready, <a href="import-b2.php.php?step=1">let&#8217;s go</a>!</p>
 <?php
 	break;
 	
@@ -188,7 +188,7 @@ if ($got_row) {
 }
 ?>
 <p>Did you defeat the boss monster at the end? Good, then you&#8217;re ready for 
-  <a href="b2-2-wp.php?step=2">Step 2</a>.</p>
+  <a href="import-b2.php.php?step=2">Step 2</a>.</p>
 <?php
 	break;
 	case 2:
diff --git a/wp-admin/import-blogger.php b/wp-admin/import-blogger.php
index ee3b9dbc98..07d3ed220b 100644
--- a/wp-admin/import-blogger.php
+++ b/wp-admin/import-blogger.php
@@ -29,7 +29,7 @@ case "step1":
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 	<title>Blogger to WordPress - Converting...</title>
-	<link rel="stylesheet" href="b2.css" type="text/css">
+	<link rel="stylesheet" href="wp-admin.css" type="text/css">
 </head>
 <body>
 <div class="wrap">
@@ -179,7 +179,7 @@ default:
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 	<title>Blogger to WordPress Import Utility</title>
-	<link rel="stylesheet" href="b2.css" type="text/css">
+	<link rel="stylesheet" href="wp-admin.css" type="text/css">
 </head>
 
 <body>
diff --git a/wp-admin/import-greymatter.php b/wp-admin/import-greymatter.php
index 87bf64d51c..b6fe8170a2 100644
--- a/wp-admin/import-greymatter.php
+++ b/wp-admin/import-greymatter.php
@@ -63,7 +63,7 @@ textarea,input,select {
 </style>
 </head>
 <body style="margin: 20px;">
-<p><font face="times new roman" style="font-size: 39px;">gm 2 <img src="wp-images/wpminilogo.png" width="50" height="50" border="0" alt="b2" align="top" /></font></p>
+<p><font face="times new roman" style="font-size: 39px;">gm 2 <img src="wp-images/wpminilogo.png" width="50" height="50" border="0" alt="WP" align="top" /></font></p>
 <p>The importer is running...</p>
 <ul>
 <li>importing users... <ul><?php
@@ -274,7 +274,7 @@ textarea,input,select {
 </style>
 </head>
 <body style="margin: 20px;">
-<p><font face="times new roman" style="font-size: 39px;">gm 2 <img src="wp-images/wpminilogo.png" width="50" height="50" border="0" alt="b2" align="top" /></font></p>
+<p><font face="times new roman" style="font-size: 39px;">gm 2 <img src="wp-images/wpminilogo.png" width="50" height="50" border="0" alt="WP" align="top" /></font></p>
 <p>This is a basic GreyMatter to b2 import script.</p>
 <p>What it does:</p>
 <ul>
diff --git a/wp-admin/profile.php b/wp-admin/profile.php
index a18c5cc4f7..3b282b0c59 100644
--- a/wp-admin/profile.php
+++ b/wp-admin/profile.php
@@ -208,7 +208,7 @@ case 'IErightclick':
 
 	<p>To have a one-click bookmarklet, just copy and paste this<br />into a new text file:</p>
 	<?php
-	$regedit = "REGEDIT4\r\n[HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\MenuExt\Post To &WP : ".$blogname."]\r\n@=\"javascript:doc=external.menuArguments.document;Q=doc.selection.createRange().text;void(btw=window.open('".$siteurl."/wp-admin/bookmarklet.php?text='+escape(Q)+'".$bookmarklet_tbpb."&popupurl='+escape(doc.location.href)+'&popuptitle='+escape(doc.title),'b2bookmarklet','scrollbars=no,width=480,height=".$bookmarklet_height.",left=100,top=150,status=yes'));btw.focus();\"\r\n\"contexts\"=hex:31\"";
+	$regedit = "REGEDIT4\r\n[HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\MenuExt\Post To &WP : ".$blogname."]\r\n@=\"javascript:doc=external.menuArguments.document;Q=doc.selection.createRange().text;void(btw=window.open('".$siteurl."/wp-admin/bookmarklet.php?text='+escape(Q)+'".$bookmarklet_tbpb."&popupurl='+escape(doc.location.href)+'&popuptitle='+escape(doc.title),'bookmarklet','scrollbars=no,width=480,height=".$bookmarklet_height.",left=100,top=150,status=yes'));btw.focus();\"\r\n\"contexts\"=hex:31\"";
 	?>
 	<pre style="margin: 20px; background-color: #cccccc; border: 1px dashed #333333; padding: 5px; font-size: 12px;"><?php echo $regedit; ?></pre>
 	<p>Save it as wordpress.reg, and double-click on this file in an Explorer<br />
@@ -329,7 +329,7 @@ if ($is_NS4 || $is_gecko) {
     <?php
 } else if ($is_winIE) {
 ?>
-    <a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;void(btw=window.open('<?php echo $siteurl ?>/wp-admin/bookmarklet.php?text='+escape(Q)+'<?php echo $bookmarklet_tbpb ?>&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title),'b2bookmarklet','scrollbars=no,width=480,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));btw.focus();">WordPress 
+    <a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;void(btw=window.open('<?php echo $siteurl ?>/wp-admin/bookmarklet.php?text='+escape(Q)+'<?php echo $bookmarklet_tbpb ?>&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title),'bookmarklet','scrollbars=no,width=480,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));btw.focus();">WordPress 
     - <?php echo $blogname ?></a> 
     <script type="text/javascript" language="JavaScript">
 <!--
@@ -345,12 +345,12 @@ function oneclickbookmarklet(blah) {
     <?php
 } else if ($is_opera) {
 ?>
-    <a href="javascript:void(window.open('<?php echo $siteurl ?>/wp-admin/bookmarklet.php?popupurl='+escape(location.href)+'&popuptitle='+escape(document.title)+'<?php echo $bookmarklet_tbpb ?>','b2bookmarklet','scrollbars=no,width=480,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));">WordPress 
+    <a href="javascript:void(window.open('<?php echo $siteurl ?>/wp-admin/bookmarklet.php?popupurl='+escape(location.href)+'&popuptitle='+escape(document.title)+'<?php echo $bookmarklet_tbpb ?>','bookmarklet','scrollbars=no,width=480,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));">WordPress 
     - <?php echo $blogname ?></a> 
     <?php
 } else if ($is_macIE) {
 ?>
-    <a href="javascript:Q='';if(top.frames.length==0);void(btw=window.open('<?php echo $siteurl ?>/wp-admin/bookmarklet.php?text='+escape(document.getSelection())+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title)+'<?php echo $bookmarklet_tbpb ?>','b2bookmarklet','scrollbars=no,width=480,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));btw.focus();">WordPress 
+    <a href="javascript:Q='';if(top.frames.length==0);void(btw=window.open('<?php echo $siteurl ?>/wp-admin/bookmarklet.php?text='+escape(document.getSelection())+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title)+'<?php echo $bookmarklet_tbpb ?>','bookmarklet','scrollbars=no,width=480,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));btw.focus();">WordPress 
     - <?php echo $blogname ?></a> 
     <?php
 }
diff --git a/wp-admin/sidebar.php b/wp-admin/sidebar.php
index d9503940b5..89d87c871a 100644
--- a/wp-admin/sidebar.php
+++ b/wp-admin/sidebar.php
@@ -46,7 +46,7 @@ if ($a=="b") {
 ?><html>
 <head>
 <title>WordPress > sidebar</title>
-<link rel="stylesheet" href="b2.css" type="text/css">
+<link rel="stylesheet" href="wp-admin.css" type="text/css">
 
 <style type="text/css">
 <!--
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index bfd9e2fce8..c3f02a3a0a 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -820,7 +820,7 @@ function timer_stop($display=0,$precision=3) { //if called like timer_stop(1), w
 function pingWeblogs($blog_ID = 1) {
 	// original function by Dries Buytaert for Drupal
 	global $use_weblogsping, $blogname,$siteurl,$blogfilename;
-	if ((!(($blogname=="my weblog") && ($siteurl=="http://example.com") && ($blogfilename=="b2.php"))) && (!preg_match("/localhost\//",$siteurl)) && ($use_weblogsping)) {
+	if ((!(($blogname=="my weblog") && ($siteurl=="http://example.com") && ($blogfilename=="wp.php"))) && (!preg_match("/localhost\//",$siteurl)) && ($use_weblogsping)) {
 		$client = new xmlrpc_client("/RPC2", "rpc.weblogs.com", 80);
 		$message = new xmlrpcmsg("weblogUpdates.ping", array(new xmlrpcval($blogname), new xmlrpcval($siteurl."/".$blogfilename)));
 		$result = $client->send($message);
@@ -852,7 +852,7 @@ function pingWeblogsRss($blog_ID = 1, $rss_url) {
 // pings CaféLog.com
 function pingCafelog($cafelogID,$title='',$p='') {
 	global $use_cafelogping, $blogname, $siteurl, $blogfilename;
-	if ((!(($blogname=="my weblog") && ($siteurl=="http://example.com") && ($blogfilename=="b2.php"))) && (!preg_match("/localhost\//",$siteurl)) && ($use_cafelogping) && ($cafelogID != '')) {
+	if ((!(($blogname=="my weblog") && ($siteurl=="http://example.com") && ($blogfilename=="wp.php"))) && (!preg_match("/localhost\//",$siteurl)) && ($use_cafelogping) && ($cafelogID != '')) {
 		$client = new xmlrpc_client("/xmlrpc.php", "cafelog.tidakada.com", 80);
 		$message = new xmlrpcmsg("b2.ping", array(new xmlrpcval($cafelogID), new xmlrpcval($title), new xmlrpcval($p)));
 		$result = $client->send($message);
@@ -868,7 +868,7 @@ function pingCafelog($cafelogID,$title='',$p='') {
 // pings Blo.gs
 function pingBlogs($blog_ID="1") {
 	global $use_blodotgsping, $blodotgsping_url, $use_rss, $blogname, $siteurl, $blogfilename;
-	if ((!(($blogname=='my weblog') && ($siteurl=='http://example.com') && ($blogfilename=='b2.php'))) && (!preg_match('/localhost\//',$siteurl)) && ($use_blodotgsping)) {
+	if ((!(($blogname=='my weblog') && ($siteurl=='http://example.com') && ($blogfilename=='wp.php'))) && (!preg_match('/localhost\//',$siteurl)) && ($use_blodotgsping)) {
 		$url = ($blodotgsping_url == 'http://example.com') ? $siteurl.'/'.$blogfilename : $blodotgsping_url;
 		$client = new xmlrpc_client('/', 'ping.blo.gs', 80);
 		if ($use_rss) {
diff --git a/wp-includes/template-functions.php b/wp-includes/template-functions.php
index bc513a3ff6..a8c32ca936 100644
--- a/wp-includes/template-functions.php
+++ b/wp-includes/template-functions.php
@@ -1462,7 +1462,7 @@ function comments_popup_script($width=400, $height=400, $file='wp-comments-popup
 	global $b2commentspopupfile, $b2trackbackpopupfile, $b2pingbackpopupfile, $b2commentsjavascript;
 	$b2commentspopupfile = $file;
 	$b2commentsjavascript = 1;
-	$javascript = "<script type='text/javascript'>\nfunction b2open (macagna) {\n    window.open(macagna, '_blank', 'width=$width,height=$height,scrollbars=yes,status=yes');\n}\n</script>\n";
+	$javascript = "<script type='text/javascript'>\nfunction wpopen (macagna) {\n    window.open(macagna, '_blank', 'width=$width,height=$height,scrollbars=yes,status=yes');\n}\n</script>\n";
 	echo $javascript;
 }
 
@@ -1484,7 +1484,7 @@ function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Com
         if ($b2commentsjavascript) {
             echo $b2commentspopupfile.$querystring_start.'p'.$querystring_equal.$id.$querystring_separator.'c'.$querystring_equal.'1';
             //echo get_permalink();
-            echo '" onclick="b2open(this.href); return false"';
+            echo '" onclick="wpopen(this.href); return false"';
         } else {
             // if comments_popup_script() is not in the template, display simple comment link
             comments_link();
