diff --git a/wp-admin/install.php b/wp-admin/install.php
index 1fbc734379..b516d666b6 100644
--- a/wp-admin/install.php
+++ b/wp-admin/install.php
@@ -1,6 +1,7 @@
 <?php
 $_wp_installing = 1;
-if (!file_exists('../wp-config.php')) die(__("There doesn't seem to be a wp-config.php file. You must create one (<a href='install-config.php'>attempt automatically</a>) before moving on."));
+if (!file_exists('../wp-config.php')) 
+    die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://wordpress.org/docs/faq/#wp-config'>We got it</a>. You can <a href='wp-admin/setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.");
 require_once('../wp-config.php');
 require('upgrade-functions.php');
 
diff --git a/wp-admin/install-config.php b/wp-admin/setup-config.php
similarity index 97%
rename from wp-admin/install-config.php
rename to wp-admin/setup-config.php
index 8630ef89b2..db7f5c2548 100644
--- a/wp-admin/install-config.php
+++ b/wp-admin/setup-config.php
@@ -62,14 +62,14 @@ switch($step) {
   <li>Table prefix (if you want to run more than one WordPress in a single database) </li>
 </ol> 
 <p><strong>If for any reason this automatic file creation doens't work, don't worry. All this does is fill in the database information to a configuration file. You may also simply open <code>wp-config-sample.php</code> in a text editor, fill in your information, and save it as <code>wp-config.php</code>. </strong></p>
-<p>In all likelihood, these items were supplied to you by your ISP. If you do not have this information, then you will need to contact them before you can continue. If you&#8217;re all ready, <a href="install-config.php?step=1">let&#8217;s go</a>! </p>
+<p>In all likelihood, these items were supplied to you by your ISP. If you do not have this information, then you will need to contact them before you can continue. If you&#8217;re all ready, <a href="setup-config.php?step=1">let&#8217;s go</a>! </p>
 <?php
 	break;
 
 	case 1:
 	?> 
 </p> 
-<form method="post" action="install-config.php?step=2"> 
+<form method="post" action="setup-config.php?step=2"> 
   <p>Below you should enter your database connection details. If you're not sure about these, contact your host. </p>
   <table> 
     <tr> 
diff --git a/wp-blog-header.php b/wp-blog-header.php
index d44b075ab0..ab078855ce 100644
--- a/wp-blog-header.php
+++ b/wp-blog-header.php
@@ -1,7 +1,7 @@
 <?php
 
 if (!file_exists(dirname(__FILE__).'/' . 'wp-config.php'))
-    die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://wordpress.org/docs/faq/#wp-config'>We got it</a>. You can <a href='wp-admin/install-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.");
+    die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://wordpress.org/docs/faq/#wp-config'>We got it</a>. You can <a href='wp-admin/setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.");
 
 require_once(dirname(__FILE__).'/' . '/wp-config.php');