diff --git a/question/type/essay/db/install.xml b/question/type/essay/db/install.xml
index eb1fc2d54a3..b7abfbd2995 100644
--- a/question/type/essay/db/install.xml
+++ b/question/type/essay/db/install.xml
@@ -9,7 +9,7 @@
         <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/>
         <FIELD NAME="questionid" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false" COMMENT="Foreign key linking to the question table."/>
         <FIELD NAME="responseformat" TYPE="char" LENGTH="16" NOTNULL="true" DEFAULT="editor" SEQUENCE="false" COMMENT="The type of input area students should be given for their response."/>
-        <FIELD NAME="responserequired" TYPE="int" LENGTH="2" NOTNULL="true" DEFAULT="1" SEQUENCE="false" COMMENT="Nonzero if an inline text response is optional"/>
+        <FIELD NAME="responserequired" TYPE="int" LENGTH="2" NOTNULL="true" DEFAULT="1" SEQUENCE="false" COMMENT="Nonzero if an online text response is optional"/>
         <FIELD NAME="responsefieldlines" TYPE="int" LENGTH="4" NOTNULL="true" DEFAULT="15" SEQUENCE="false" COMMENT="Approximate height, in lines, of the input box the students should be given for their response."/>
         <FIELD NAME="attachments" TYPE="int" LENGTH="4" NOTNULL="true" DEFAULT="0" SEQUENCE="false" COMMENT="Whether, and how many, attachments a student is allowed to include with their response. -1 means unlimited."/>
         <FIELD NAME="attachmentsrequired" TYPE="int" LENGTH="4" NOTNULL="true" DEFAULT="0" SEQUENCE="false" COMMENT="The number of attachments that should be required"/>
diff --git a/question/type/essay/question.php b/question/type/essay/question.php
index a14b06ab759..2720e1505bf 100644
--- a/question/type/essay/question.php
+++ b/question/type/essay/question.php
@@ -91,7 +91,7 @@ class qtype_essay_question extends question_with_responses {
     }
 
     public function is_complete_response(array $response) {
-        // Determine if the given response has inline text and attachments.
+        // Determine if the given response has online text and attachments.
         $hasinlinetext = array_key_exists('answer', $response) && ($response['answer'] !== '');
         $hasattachments = array_key_exists('attachments', $response)
             && $response['attachments'] instanceof question_response_files;
diff --git a/question/type/essay/tests/behat/edit.feature b/question/type/essay/tests/behat/edit.feature
index 709e51af7a5..52b022237a0 100644
--- a/question/type/essay/tests/behat/edit.feature
+++ b/question/type/essay/tests/behat/edit.feature
@@ -34,9 +34,9 @@ Feature: Test editing an Essay question
     Then I should see "You must supply a value here."
     When I set the following fields to these values:
       | Question name   | Edited essay-001 name |
-      | Response format | No inline text        |
+      | Response format | No online text        |
     And I press "id_submitbutton"
-    Then I should see "When \"no inline text\" is selected, or responses are optional, you must allow at least one attachment."
+    Then I should see "When \"No online text\" is selected, or responses are optional, you must allow at least one attachment."
     When I set the following fields to these values:
       | Response format | Plain text |
     And I press "id_submitbutton"
diff --git a/question/type/essay/tests/helper.php b/question/type/essay/tests/helper.php
index c63668495eb..07dd4e06ca7 100644
--- a/question/type/essay/tests/helper.php
+++ b/question/type/essay/tests/helper.php
@@ -183,7 +183,7 @@ class qtype_essay_test_helper extends question_test_helper {
     }
 
     /**
-     * Makes an essay question without an inline text editor.
+     * Makes an essay question without an online text editor.
      * @return qtype_essay_question
      */
     public function make_essay_question_noinline() {
diff --git a/question/type/essay/tests/question_test.php b/question/type/essay/tests/question_test.php
index 6ab9635e382..2ac7e1661dd 100644
--- a/question/type/essay/tests/question_test.php
+++ b/question/type/essay/tests/question_test.php
@@ -200,7 +200,7 @@ class qtype_essay_question_test extends advanced_testcase {
         $this->assertTrue($essay->is_complete_response(
                 array('answer' => '', 'attachments' => $attachments[2])));
 
-        // Test the case in which both the response and inline text are optional.
+        // Test the case in which both the response and online text are optional.
         $essay->attachmentsrequired = 0;
 
         // Providing no answer and no attachment should result in an incomplete