3 files changed, 4 insertions, 4 deletions
diff --git a/modules/node/node.install b/modules/node/node.install
index 23775827e..d0867f328 100644
--- a/modules/node/node.install
+++ b/modules/node/node.install
@@ -264,7 +264,7 @@ function node_schema() {
         'default' => 0,
       ),
       'format' => array(
-        'description' => "The input format used by this version's body.",
+        'description' => "The text format used by this version's body.",
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0,
diff --git a/modules/node/node.pages.inc b/modules/node/node.pages.inc
index a989fa790..194b38551 100644
--- a/modules/node/node.pages.inc
+++ b/modules/node/node.pages.inc
@@ -297,7 +297,7 @@ function node_body_field(&$node, $label, $word_count) {
     '#default_value' => $include ? $node->body : ($node->teaser . $node->body),
     '#rows' => 20,
     '#required' => ($word_count > 0),
-    '#input_format' => isset($node->format) ? $node->format : FILTER_FORMAT_DEFAULT,
+    '#text_format' => isset($node->format) ? $node->format : FILTER_FORMAT_DEFAULT,
   );
 
   return $form;
diff --git a/modules/node/node.test b/modules/node/node.test
index 42294f721..420499c7f 100644
--- a/modules/node/node.test
+++ b/modules/node/node.test
@@ -210,7 +210,7 @@ class NodeTeaserTestCase extends DrupalWebTestCase {
 
     // The teasers we expect node_teaser() to return when $size is the index
     // of each array item.
-    // Using an input format with no line-break filter:
+    // Using an text format with no line-break filter:
     $teasers = array(
       "<p>\nHi\n</p>\n<p>\nfolks\n<br />\n!\n</p>",
       "<",
@@ -252,7 +252,7 @@ class NodeTeaserTestCase extends DrupalWebTestCase {
       "<p>\nHi\n</p>\n<p>\nfolks\n<br />\n!\n</p>",
     );
 
-    // And Using an input format WITH the line-break filter.
+    // And Using an text format WITH the line-break filter.
     $teasers_lb = array(
       "<p>\nHi\n</p>\n<p>\nfolks\n<br />\n!\n</p>",
       "<",