Index: wp-admin/includes/class-wp-debug-data.php
===================================================================
--- wp-admin/includes/class-wp-debug-data.php	(revision 45063)
+++ wp-admin/includes/class-wp-debug-data.php	(working copy)
@@ -740,7 +740,7 @@
 		);
 
 		$info['wp-database']['fields']['database_user'] = array(
-			'label'   => __( 'Database user' ),
+			'label'   => __( 'Database username' ),
 			'value'   => $wpdb->dbuser,
 			'private' => true,
 		);
@@ -758,7 +758,7 @@
 		);
 
 		$info['wp-database']['fields']['database_prefix'] = array(
-			'label'   => __( 'Database prefix' ),
+			'label'   => __( 'Table prefix' ),
 			'value'   => $wpdb->prefix,
 			'private' => true,
 		);
Index: wp-admin/setup-config.php
===================================================================
--- wp-admin/setup-config.php	(revision 45063)
+++ wp-admin/setup-config.php	(working copy)
@@ -209,22 +209,22 @@
 	<p><?php _e( 'Below you should enter your database connection details. If you&#8217;re not sure about these, contact your host.' ); ?></p>
 	<table class="form-table">
 		<tr>
-			<th scope="row"><label for="dbname"><?php _e( 'Database Name' ); ?></label></th>
+			<th scope="row"><label for="dbname"><?php _e( 'Database name' ); ?></label></th>
 			<td><input name="dbname" id="dbname" type="text" size="25" value="wordpress"<?php echo $autofocus; ?>/></td>
 			<td><?php _e( 'The name of the database you want to use with WordPress.' ); ?></td>
 		</tr>
 		<tr>
-			<th scope="row"><label for="uname"><?php _e( 'Username' ); ?></label></th>
+			<th scope="row"><label for="uname"><?php _e( 'Database username' ); ?></label></th>
 			<td><input name="uname" id="uname" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'username', 'example username' ), ENT_QUOTES ); ?>" /></td>
 			<td><?php _e( 'Your database username.' ); ?></td>
 		</tr>
 		<tr>
-			<th scope="row"><label for="pwd"><?php _e( 'Password' ); ?></label></th>
+			<th scope="row"><label for="pwd"><?php _e( 'Database password' ); ?></label></th>
 			<td><input name="pwd" id="pwd" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'password', 'example password' ), ENT_QUOTES ); ?>" autocomplete="off" /></td>
 			<td><?php _e( 'Your database password.' ); ?></td>
 		</tr>
 		<tr>
-			<th scope="row"><label for="dbhost"><?php _e( 'Database Host' ); ?></label></th>
+			<th scope="row"><label for="dbhost"><?php _e( 'Database host' ); ?></label></th>
 			<td><input name="dbhost" id="dbhost" type="text" size="25" value="localhost" /></td>
 			<td>
 			<?php
@@ -234,7 +234,7 @@
 			</td>
 		</tr>
 		<tr>
-			<th scope="row"><label for="prefix"><?php _e( 'Table Prefix' ); ?></label></th>
+			<th scope="row"><label for="prefix"><?php _e( 'Table prefix' ); ?></label></th>
 			<td><input name="prefix" id="prefix" type="text" value="wp_" size="25" /></td>
 			<td><?php _e( 'If you want to run multiple WordPress installations in a single database, change this.' ); ?></td>
 		</tr>