Index: modules/filter/filter.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.test,v
retrieving revision 1.54
diff -u -p -r1.54 filter.test
--- modules/filter/filter.test	9 Jan 2010 21:54:00 -0000	1.54
+++ modules/filter/filter.test	10 Jan 2010 21:49:11 -0000
@@ -294,7 +294,7 @@ class FilterAdminTestCase extends Drupal
     $edit["body[$langcode][0][value]"] = $text;
     $edit["body[$langcode][0][value_format]"] = $filtered;
     $this->drupalPost('node/add/page', $edit, t('Save'));
-    $this->assertRaw(t('Page %title has been created.', array('%title' => $edit["title"])), t('Filtered node created.'));
+    $this->assertRaw(t('Basic page %title has been created.', array('%title' => $edit["title"])), t('Filtered node created.'));
 
     $node = $this->drupalGetNodeByTitle($edit["title"]);
     $this->assertTrue($node, t('Node found in database.'));
Index: modules/locale/locale.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.test,v
retrieving revision 1.58
diff -u -p -r1.58 locale.test
--- modules/locale/locale.test	9 Jan 2010 21:54:00 -0000	1.58
+++ modules/locale/locale.test	10 Jan 2010 21:49:11 -0000
@@ -1421,14 +1421,14 @@ class LocaleContentFunctionalTest extend
     );
     $this->drupalPost($path, $edit, t('Save configuration'));
 
-    // Set page content type to use multilingual support.
+    // Set "Basic page" content type to use multilingual support.
     $this->drupalGet('admin/structure/types/manage/page');
     $this->assertText(t('Multilingual support'), t('Multilingual support fieldset present on content type configuration form.'));
     $edit = array(
       'language_content_type' => 1,
     );
     $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
-    $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Page')), t('Page content type has been updated.'));
+    $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Basic page')), t('Basic page content type has been updated.'));
     $this->drupalLogout();
 
     // Verify language selection is not present on add article form.
@@ -1437,16 +1437,16 @@ class LocaleContentFunctionalTest extend
     // Verify language select list is not present.
     $this->assertNoFieldByName('language', '', t('Language select not present on add article form.'));
 
-    // Verify language selection appears on add page form.
+    // Verify language selection appears on add "Basic page" form.
     $this->drupalGet('node/add/page');
     // Verify language select list is present.
-    $this->assertFieldByName('language', '', t('Language select present on add page form.'));
+    $this->assertFieldByName('language', '', t('Language select present on add Basic page form.'));
     // Ensure enabled language appears.
     $this->assertText($name, t('Enabled language present.'));
     // Ensure disabled language doesn't appear.
     $this->assertNoText($name_disabled, t('Disabled language not present.'));
 
-    // Create page content.
+    // Create "Basic page" content.
     $node_title = $this->randomName();
     $node_body =  $this->randomName();
     $edit = array(
@@ -1456,7 +1456,7 @@ class LocaleContentFunctionalTest extend
       'language' => $langcode,
     );
     $node = $this->drupalCreateNode($edit);
-    // Edit the page content and ensure correct language is selected.
+    // Edit the content and ensure correct language is selected.
     $path = 'node/' . $node->nid . '/edit';
     $this->drupalGet($path);
     $this->assertRaw('<option value="' . $langcode . '" selected="selected">' .  $name . '</option>', t('Correct language selected.'));
@@ -1465,7 +1465,7 @@ class LocaleContentFunctionalTest extend
       'language' => 'en',
     );
     $this->drupalPost($path, $edit, t('Save'));
-    $this->assertRaw(t('Page %title has been updated.', array('%title' => $node_title)), t('Page updated.'));
+    $this->assertRaw(t('%title has been updated.', array('%title' => $node_title)), t('Basic page content updated.'));
 
     $this->drupalLogout();
   }
@@ -1695,21 +1695,21 @@ class LocaleMultilingualFieldsFunctional
     require_once DRUPAL_ROOT . '/includes/locale.inc';
     locale_add_language('it', 'Italian', 'Italiano', LANGUAGE_LTR, '', '', TRUE, FALSE);
 
-    // Set page content type to use multilingual support.
+    // Set "Basic page" content type to use multilingual support.
     $this->drupalGet('admin/structure/types/manage/page');
     $this->assertText(t('Multilingual support'), t('Multilingual support fieldset present on content type configuration form.'));
     $edit = array(
       'language_content_type' => 1,
     );
     $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
-    $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Page')), t('Page content type has been updated.'));
+    $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Basic page')), t('Basic page content type has been updated.'));
   }
 
   /**
    * Test if field languages are correctly set through the node form.
    */
   function testMultilingualNodeForm() {
-    // Create page content.
+    // Create "Basic page" content.
     $langcode = LANGUAGE_NONE;
     $title_key = "title";
     $title_value = $this->randomName(8);
@@ -1748,7 +1748,7 @@ class LocaleMultilingualFieldsFunctional
    * Test multilingual field display settings.
    */
   function testMultilingualDisplaySettings() {
-    // Create page content.
+    // Create "Basic page" content.
     $langcode = LANGUAGE_NONE;
     $title_key = "title";
     $title_value = $this->randomName(8);
Index: modules/node/node.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.test,v
retrieving revision 1.63
diff -u -p -r1.63 node.test
--- modules/node/node.test	9 Jan 2010 21:54:01 -0000	1.63
+++ modules/node/node.test	10 Jan 2010 21:49:11 -0000
@@ -152,7 +152,7 @@ class NodeRevisionsTestCase extends Drup
     // Confirm that revisions revert properly.
     $this->drupalPost("node/$node->nid/revisions/{$nodes[1]->vid}/revert", array(), t('Revert'));
     $this->assertRaw(t('@type %title has been reverted back to the revision from %revision-date.',
-                        array('@type' => 'Page', '%title' => $nodes[1]->title,
+                        array('@type' => 'Basic page', '%title' => $nodes[1]->title,
                               '%revision-date' => format_date($nodes[1]->revision_timestamp))), t('Revision reverted.'));
     $reverted_node = node_load($node->nid);
     $this->assertTrue(($nodes[1]->body[LANGUAGE_NONE][0]['value'] == $reverted_node->body[LANGUAGE_NONE][0]['value']), t('Node reverted correctly.'));
@@ -161,7 +161,7 @@ class NodeRevisionsTestCase extends Drup
     $this->drupalPost("node/$node->nid/revisions/{$nodes[1]->vid}/delete", array(), t('Delete'));
     $this->assertRaw(t('Revision from %revision-date of @type %title has been deleted.',
                         array('%revision-date' => format_date($nodes[1]->revision_timestamp),
-                              '@type' => 'Page', '%title' => $nodes[1]->title)), t('Revision deleted.'));
+                              '@type' => 'Basic page', '%title' => $nodes[1]->title)), t('Revision deleted.'));
     $this->assertTrue(db_query('SELECT COUNT(vid) FROM {node_revision} WHERE nid = :nid and vid = :vid', array(':nid' => $node->nid, ':vid' => $nodes[1]->vid))->fetchField() == 0, t('Revision not found.'));
   }
 }
@@ -279,7 +279,7 @@ class PagePreviewTestCase extends Drupal
     $this->drupalPost('node/add/page', $edit, t('Preview'));
 
     // Check that the preview is displaying the title and body.
-    $this->assertTitle(t('Preview | Drupal'), t('Page title is preview.'));
+    $this->assertTitle(t('Preview | Drupal'), t('Basic page title is preview.'));
     $this->assertText($edit[$title_key], t('Title displayed.'));
     $this->assertText($edit[$body_key], t('Body displayed.'));
 
@@ -295,7 +295,7 @@ class PagePreviewTestCase extends Drupal
     $langcode = LANGUAGE_NONE;
     $title_key = "title";
     $body_key = "body[$langcode][0][value]";
-    // Force revision on page content.
+    // Force revision on "Basic page" content.
     variable_set('node_options_page', array('status', 'revision'));
 
     // Fill in node creation form and preview node.
@@ -306,7 +306,7 @@ class PagePreviewTestCase extends Drupal
     $this->drupalPost('node/add/page', $edit, t('Preview'));
 
     // Check that the preview is displaying the title and body.
-    $this->assertTitle(t('Preview | Drupal'), t('Page title is preview.'));
+    $this->assertTitle(t('Preview | Drupal'), t('Basic page title is preview.'));
     $this->assertText($edit[$title_key], t('Title displayed.'));
     $this->assertText($edit[$body_key], t('Body displayed.'));
 
@@ -337,7 +337,7 @@ class NodeCreationTestCase extends Drupa
   }
 
   /**
-   * Create a page node and verify its consistency in the database.
+   * Create a "Basic page" node and verify its consistency in the database.
    */
   function testNodeCreation() {
     // Create a node.
@@ -347,8 +347,8 @@ class NodeCreationTestCase extends Drupa
     $edit["body[$langcode][0][value]"] = $this->randomName(16);
     $this->drupalPost('node/add/page', $edit, t('Save'));
 
-    // Check that the page has been created.
-    $this->assertRaw(t('!post %title has been created.', array('!post' => 'Page', '%title' => $edit["title"])), t('Page created.'));
+    // Check that the Basic page has been created.
+    $this->assertRaw(t('!post %title has been created.', array('!post' => 'Basic page', '%title' => $edit["title"])), t('Basic page created.'));
 
     // Check that the node exists in the database.
     $node = $this->drupalGetNodeByTitle($edit["title"]);
@@ -457,7 +457,7 @@ class SummaryLengthTestCase extends Drup
     $expected = 'What is a Drupalism?';
     $this->assertRaw($expected, t('Check that the summary is 600 characters in length'), 'Node');
 
-    // Edit the teaser lenght for 'page' content type
+    // Edit the teaser length for "Basic page" content type
     $edit = array (
       'teaser_length' => 200,
     );
@@ -552,11 +552,11 @@ class NodePostSettingsTestCase extends D
   }
 
   /**
-   * Set page content type to display post information and confirm its presence on a new node.
+   * Set "Basic page" content type to display post information and confirm its presence on a new node.
    */
   function testPagePostInfo() {
 
-    // Set page content type to display post information.
+    // Set "Basic page" content type to display post information.
     $edit = array();
     $edit['node_submitted'] = TRUE;
     $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
@@ -574,11 +574,11 @@ class NodePostSettingsTestCase extends D
   }
 
   /**
-   * Set page content type to not display post information and confirm its absence on a new node.
+   * Set "Basic page" content type to not display post information and confirm its absence on a new node.
    */
   function testPageNotPostInfo() {
 
-    // Set page content type to display post information.
+    // Set "Basic page" content type to display post information.
     $edit = array();
     $edit['node_submitted'] = FALSE;
     $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
@@ -752,9 +752,9 @@ class NodeAccessRecordsUnitTest extends 
     $this->assertEqual($records[0]->realm, 'test_article_realm', t('Grant with article_realm acquired for node without alteration.'));
     $this->assertEqual($records[0]->gid, 1, t('Grant with gid = 1 acquired for node without alteration.'));
 
-    // Create an unpromoted page node.
+    // Create an unpromoted "Basic page" node.
     $node2 = $this->drupalCreateNode(array('type' => 'page', 'promote' => 0));
-    $this->assertTrue(node_load($node1->nid), t('Unpromoted page node created.'));
+    $this->assertTrue(node_load($node1->nid), t('Unpromoted basic page node created.'));
 
     // Check to see if grants added by node_test_node_access_records made it in.
     $records = db_query('SELECT realm, gid FROM {node_access} WHERE nid = :nid', array(':nid' => $node2->nid))->fetchAll();
@@ -762,9 +762,9 @@ class NodeAccessRecordsUnitTest extends 
     $this->assertEqual($records[0]->realm, 'test_page_realm', t('Grant with page_realm acquired for node without alteration.'));
     $this->assertEqual($records[0]->gid, 1, t('Grant with gid = 1 acquired for node without alteration.'));
 
-    // Create an unpromoted, unpublished page node.
+    // Create an unpromoted, unpublished "Basic page" node.
     $node3 = $this->drupalCreateNode(array('type' => 'page', 'promote' => 0, 'status' => 0));
-    $this->assertTrue(node_load($node3->nid), t('Unpromoted, unpublished page node created.'));
+    $this->assertTrue(node_load($node3->nid), t('Unpromoted, unpublished basic page node created.'));
 
     // Check to see if grants added by node_test_node_access_records made it in.
     $records = db_query('SELECT realm, gid FROM {node_access} WHERE nid = :nid', array(':nid' => $node3->nid))->fetchAll();
@@ -772,9 +772,9 @@ class NodeAccessRecordsUnitTest extends 
     $this->assertEqual($records[0]->realm, 'test_page_realm', t('Grant with page_realm acquired for node without alteration.'));
     $this->assertEqual($records[0]->gid, 1, t('Grant with gid = 1 acquired for node without alteration.'));
 
-    // Create a promoted page node.
+    // Create a promoted "Basic page" node.
     $node4 = $this->drupalCreateNode(array('type' => 'page', 'promote' => 1));
-    $this->assertTrue(node_load($node4->nid), t('Promoted page node created.'));
+    $this->assertTrue(node_load($node4->nid), t('Promoted basic page node created.'));
 
     // Check to see if grant added by node_test_node_access_records was altered
     // by node_test_node_access_records_alter.
@@ -874,7 +874,7 @@ class NodeTypeTestCase extends DrupalWeb
     $node_names = node_type_get_names();
 
     $this->assertTrue(isset($node_types['article']), t('Node type article is available.'));
-    $this->assertTrue(isset($node_types['page']), t('Node type page is available.'));
+    $this->assertTrue(isset($node_types['page']), t('Node type basic page is available.'));
 
     $this->assertEqual($node_types['article']->name, $node_names['article'], t('Correct node type base has been returned.'));
 
@@ -1046,7 +1046,7 @@ class NodeAdminTestCase extends DrupalWe
     );
     $this->drupalPost(NULL, $edit, t('Refine'));
     $this->assertRaw(t('<strong>%type</strong> is <strong>%value</strong>', array('%type' => t('status'), '%value' => t('published'))), t('Content list is filtered by status.'));
-    $this->assertRaw(t('<strong>%type</strong> is <strong>%value</strong>', array('%type' => t('type'), '%value' => 'Page')), t('Content list is filtered by content type.'));
+    $this->assertRaw(t('<strong>%type</strong> is <strong>%value</strong>', array('%type' => t('type'), '%value' => 'Basic page')), t('Content list is filtered by content type.'));
     $this->assertLinkByHref('node/' . $nodes['published_page']->nid . '/edit');
     $this->assertNoLinkByHref('node/' . $nodes['published_article']->nid . '/edit');
 
@@ -1125,7 +1125,7 @@ class NodeTitleTestCase extends DrupalWe
    *  Create one node and test if the node title has the correct value.
    */
   function testNodeTitle() {
-    // Create page content with title
+    // Create "Basic page" content with title
     $settings = array(
       'title' => $this->randomName(8),
     );
Index: modules/php/php.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/php/php.test,v
retrieving revision 1.22
diff -u -p -r1.22 php.test
--- modules/php/php.test	9 Jan 2010 21:54:01 -0000	1.22
+++ modules/php/php.test	10 Jan 2010 21:49:11 -0000
@@ -79,7 +79,7 @@ class PHPFilterTestCase extends PHPTestC
     $langcode = LANGUAGE_NONE;
     $edit["body[$langcode][0][value_format]"] = $this->php_code_format;
     $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
-    $this->assertRaw(t('Page %title has been updated.', array('%title' => $node->title)), t('PHP code filter turned on.'));
+    $this->assertRaw(t('Basic page %title has been updated.', array('%title' => $node->title)), t('PHP code filter turned on.'));
 
     // Make sure that the PHP code shows up as text.
     $this->assertNoText('print "SimpleTest PHP was executed!"', t("PHP code isn't displayed."));
Index: modules/search/search.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.test,v
retrieving revision 1.48
diff -u -p -r1.48 search.test
--- modules/search/search.test	9 Jan 2010 21:54:01 -0000	1.48
+++ modules/search/search.test	10 Jan 2010 21:49:11 -0000
@@ -298,10 +298,10 @@ class SearchAdvancedSearchForm extends D
 
   /**
    * Test using the search form with GET and POST queries.
-   * Test using the advanced search form to limit search to pages.
+   * Test using the advanced search form to limit search to nodes of type "Basic page".
    */
   function testNodeType() {
-    $this->assertTrue($this->node->type == 'page', t('Node type is page.'));
+    $this->assertTrue($this->node->type == 'page', t('Node type is Basic page.'));
 
     // Assert that the dummy title doesn't equal the real title.
     $dummy_title = 'Lorem ipsum';
@@ -309,20 +309,20 @@ class SearchAdvancedSearchForm extends D
 
     // Search for the dummy title with a GET query.
     $this->drupalGet('search/node/' . $dummy_title);
-    $this->assertNoText($this->node->title, t('Page node is not found with dummy title.'));
+    $this->assertNoText($this->node->title, t('Basic page node is not found with dummy title.'));
 
     // Search for the title of the node with a GET query.
     $this->drupalGet('search/node/' . $this->node->title);
-    $this->assertText($this->node->title, t('Page node is found with GET query.'));
+    $this->assertText($this->node->title, t('Basic page node is found with GET query.'));
 
     // Search for the title of the node with a POST query.
     $edit = array('or' => $this->node->title);
     $this->drupalPost('search/node', $edit, t('Advanced search'));
-    $this->assertText($this->node->title, t('Page node is found with POST query.'));
+    $this->assertText($this->node->title, t('Basic page node is found with POST query.'));
 
     // Advanced search type option.
     $this->drupalPost('search/node', array_merge($edit, array('type[page]' => 'page')), t('Advanced search'));
-    $this->assertText($this->node->title, t('Page node is found with POST query and type:page.'));
+    $this->assertText($this->node->title, t('Basic page node is found with POST query and type:page.'));
 
     $this->drupalPost('search/node', array_merge($edit, array('type[article]' => 'article')), t('Advanced search'));
     $this->assertText('bike shed', t('Article node is not found with POST query and type:article.'));
Index: modules/taxonomy/taxonomy.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.test,v
retrieving revision 1.67
diff -u -p -r1.67 taxonomy.test
--- modules/taxonomy/taxonomy.test	9 Jan 2010 21:54:01 -0000	1.67
+++ modules/taxonomy/taxonomy.test	10 Jan 2010 21:49:12 -0000
@@ -420,7 +420,7 @@ class TaxonomyTermTestCase extends Taxon
     // free-tagging field created by the default profile.
     $edit[$instance['field_name'] . "[$langcode]"] = implode(', ', $terms);
     $this->drupalPost('node/add/page', $edit, t('Save'));
-    $this->assertRaw(t('@type %title has been created.', array('@type' => t('Page'), '%title' => $edit["title"])), t('The node was created successfully'));
+    $this->assertRaw(t('@type %title has been created.', array('@type' => t('Basic page'), '%title' => $edit["title"])), t('The node was created successfully'));
     foreach ($terms as $term) {
       $this->assertText($term, t('The term was saved and appears on the node page'));
     }
Index: modules/translation/translation.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/translation/translation.test,v
retrieving revision 1.22
diff -u -p -r1.22 translation.test
--- modules/translation/translation.test	9 Jan 2010 21:54:01 -0000	1.22
+++ modules/translation/translation.test	10 Jan 2010 21:49:12 -0000
@@ -7,7 +7,7 @@ class TranslationTestCase extends Drupal
   public static function getInfo() {
     return array(
       'name' => 'Translation functionality',
-      'description' => 'Create a page with translation, modify the page outdating translation, and update translation.',
+      'description' => 'Create a basic page with translation, modify the page outdating translation, and update translation.',
       'group' => 'Translation'
     );
   }
@@ -17,7 +17,7 @@ class TranslationTestCase extends Drupal
   }
 
   /**
-   * Create a page with translation, modify the page outdating translation, and update translation.
+   * Create a basic page with translation, modify the basic page outdating translation, and update translation.
    */
   function testContentTranslation() {
     // Setup users.
@@ -30,17 +30,17 @@ class TranslationTestCase extends Drupal
     $this->addLanguage('en');
     $this->addLanguage('es');
 
-    // Set page content type to use multilingual support with translation.
+    // Set "Basic page" content type to use multilingual support with translation.
     $this->drupalGet('admin/structure/types/manage/page');
     $edit = array();
     $edit['language_content_type'] = 2;
     $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
-    $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Page')), t('Page content type has been updated.'));
+    $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Basic page')), t('Basic page content type has been updated.'));
 
     $this->drupalLogout();
     $this->drupalLogin($translator);
 
-    // Create page in English.
+    // Create Basic page in English.
     $node_title = $this->randomName();
     $node_body =  $this->randomName();
     $node = $this->createPage($node_title, $node_body, 'en');
@@ -71,7 +71,7 @@ class TranslationTestCase extends Drupal
     $edit["body[$node->language][0][value]"] = $this->randomName();
     $edit['translation[retranslate]'] = TRUE;
     $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
-    $this->assertRaw(t('Page %title has been updated.', array('%title' => $node_title)), t('Original node updated.'));
+    $this->assertRaw(t('Basic page %title has been updated.', array('%title' => $node_title)), t('Original node updated.'));
 
     // Check to make sure that interface shows translation as outdated
     $this->drupalGet('node/' . $node->nid . '/translate');
@@ -82,7 +82,7 @@ class TranslationTestCase extends Drupal
     $edit["body[$node_translation->language][0][value]"] = $this->randomName();
     $edit['translation[status]'] = FALSE;
     $this->drupalPost('node/' . $node_translation->nid . '/edit', $edit, t('Save'));
-    $this->assertRaw(t('Page %title has been updated.', array('%title' => $node_translation_title)), t('Translated node updated.'));
+    $this->assertRaw(t('Basic page %title has been updated.', array('%title' => $node_translation_title)), t('Translated node updated.'));
   }
 
   /**
@@ -120,10 +120,10 @@ class TranslationTestCase extends Drupal
   }
 
   /**
-   * Create a page in the specified language.
+   * Create a "Basic page" in the specified language.
    *
-   * @param string $title Title of page in specified language.
-   * @param string $body Body of page in specified language.
+   * @param string $title Title of basic page in specified language.
+   * @param string $body Body of basic page in specified language.
    * @param string $language Language code.
    */
   function createPage($title, $body, $language) {
@@ -133,7 +133,7 @@ class TranslationTestCase extends Drupal
     $edit["body[$langcode][0][value]"] = $body;
     $edit['language'] = $language;
     $this->drupalPost('node/add/page', $edit, t('Save'));
-    $this->assertRaw(t('Page %title has been created.', array('%title' => $title)), t('Page created.'));
+    $this->assertRaw(t('Basic page %title has been created.', array('%title' => $title)), t('Basic page created.'));
 
     // Check to make sure the node was created.
     $node = $this->drupalGetNodeByTitle($title);
@@ -143,11 +143,11 @@ class TranslationTestCase extends Drupal
   }
 
   /**
-   * Create a translation for the specified page in the specified language.
+   * Create a translation for the specified basic page in the specified language.
    *
-   * @param integer $nid Node id of page to create translation for.
-   * @param string $title Title of page in specified language.
-   * @param string $body Body of page in specified language.
+   * @param integer $nid Node id of basic page to create translation for.
+   * @param string $title Title of basic page in specified language.
+   * @param string $body Body of basic page in specified language.
    * @param string $language Language code.
    */
   function createTranslation($nid, $title, $body, $language) {
@@ -158,7 +158,7 @@ class TranslationTestCase extends Drupal
     $edit["title"] = $title;
     $edit["body[$language][0][value]"] = $body;
     $this->drupalPost(NULL, $edit, t('Save'));
-    $this->assertRaw(t('Page %title has been created.', array('%title' => $title)), t('Translation created.'));
+    $this->assertRaw(t('Basic page %title has been created.', array('%title' => $title)), t('Translation created.'));
 
     // Check to make sure that translation was successful.
     $node = $this->drupalGetNodeByTitle($title);
Index: modules/trigger/trigger.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/trigger/trigger.test,v
retrieving revision 1.24
diff -u -p -r1.24 trigger.test
--- modules/trigger/trigger.test	9 Jan 2010 21:54:01 -0000	1.24
+++ modules/trigger/trigger.test	10 Jan 2010 21:49:12 -0000
@@ -43,7 +43,7 @@ class TriggerContentTestCase extends Dru
       $edit[$info['property']] = !$info['expected'];
       $this->drupalPost('node/add/page', $edit, t('Save'));
       // Make sure the text we want appears.
-      $this->assertRaw(t('!post %title has been created.', array('!post' => 'Page', '%title' => $edit["title"])), t('Make sure the page has actually been created'));
+      $this->assertRaw(t('!post %title has been created.', array('!post' => 'Basic page', '%title' => $edit["title"])), t('Make sure the Basic page has actually been created'));
       // Action should have been fired.
       $loaded_node = $this->drupalGetNodeByTitle($edit["title"]);;
       $this->assertTrue($loaded_node->$info['property'] == $info['expected'], t('Make sure the @action action fired.', array('@action' => $info['name'])));
Index: profiles/standard/standard.install
===================================================================
RCS file: /cvs/drupal/drupal/profiles/standard/standard.install,v
retrieving revision 1.1
diff -u -p -r1.1 standard.install
--- profiles/standard/standard.install	4 Jan 2010 23:08:34 -0000	1.1
+++ profiles/standard/standard.install	10 Jan 2010 21:49:12 -0000
@@ -218,9 +218,9 @@ function standard_install() {
   $types = array(
     array(
       'type' => 'page',
-      'name' => st('Page'),
+      'name' => st('Basic page'),
       'base' => 'node_content',
-      'description' => st("Use <em>pages</em> for your static content, such as an 'About us' page."),
+      'description' => st("Use <em>basic pages</em> for your static content, such as an 'About us' page."),
       'custom' => 1,
       'modified' => 1,
       'locked' => 0,
@@ -262,11 +262,11 @@ function standard_install() {
     rdf_mapping_save($rdf_mapping);
   }
 
-  // Default page to not be promoted and have comments disabled.
+  // Default "Basic page" to not be promoted and have comments disabled.
   variable_set('node_options_page', array('status'));
   variable_set('comment_page', COMMENT_NODE_HIDDEN);
 
-  // Don't display date and author information for page nodes by default.
+  // Don't display date and author information for "Basic page" nodes by default.
   variable_set('node_submitted_page', FALSE);
 
   // Enable user picture support and set the default to a square thumbnail option.