diff --git a/cms/templates/widgets/problem-edit.html b/cms/templates/widgets/problem-edit.html
index 4ff9d299ab..4218178d8e 100644
--- a/cms/templates/widgets/problem-edit.html
+++ b/cms/templates/widgets/problem-edit.html
@@ -8,13 +8,13 @@
                         class="problem-editor-icon heading1"></span></a></li>
                 <li><a href="#" class="multiple-choice-button" data-tooltip="Multiple Choice"><span
                         class="problem-editor-icon multiple-choice"></span></a></li>
-                <li><a href="#" class="checks-button" data-tooltip="Check Multiple"><span
+                <li><a href="#" class="checks-button" data-tooltip="Checkboxes"><span
                         class="problem-editor-icon checks"></span></a></li>
-                <li><a href="#" class="string-button" data-tooltip="String Response"><span
+                <li><a href="#" class="string-button" data-tooltip="Text Input"><span
                         class="problem-editor-icon string"></span></a></li>
-                <li><a href="#" class="number-button" data-tooltip="Numerical Response"><span
+                <li><a href="#" class="number-button" data-tooltip="Numerical Input"><span
                         class="problem-editor-icon number"></span></a></li>
-                <li><a href="#" class="dropdown-button" data-tooltip="Option Response"><span
+                <li><a href="#" class="dropdown-button" data-tooltip="Dropdown"><span
                         class="problem-editor-icon dropdown"></span></a></li>
                 <li><a href="#" class="explanation-button" data-tooltip="Explanation"><span
                         class="problem-editor-icon explanation"></span></a></li>
@@ -56,7 +56,7 @@
                 </div>
             </div>
             <div class="row">
-                <h6>Check Multiple</h6>
+                <h6>Checkboxes</h6>
                 <div class="col sample check-multiple">
                     <img src="/static/img/multi-example.png" />
                 </div>
@@ -67,7 +67,7 @@
                 </div>
             </div>
             <div class="row">
-                <h6>String Response</h6>
+                <h6>Text Input</h6>
                 <div class="col sample string-response">
                     <img src="/static/img/string-example.png" />
                 </div>
@@ -76,7 +76,7 @@
                 </div>
             </div>
             <div class="row">
-                <h6>Numerical Response</h6>
+                <h6>Numerical Input</h6>
                 <div class="col sample numerical-response">
                     <img src="/static/img/number-example.png" />
                 </div>
@@ -85,7 +85,7 @@
                 </div>
             </div>
             <div class="row">
-                <h6>Option Response</h6>
+                <h6>Dropdown</h6>
                 <div class="col sample option-reponse">
                     <img src="/static/img/select-example.png" />
                 </div>
diff --git a/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml b/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml
index 9e61324ae1..3a35a35199 100644
--- a/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml
@@ -26,10 +26,6 @@ metadata:
             
             ( ) The vegetable peeler
             
-            ( ) Android
-            
-            ( ) The Beatles
-            
             
        [explanation]
        The release of the iPod allowed consumers to carry their entire music library with them in a 
@@ -51,8 +47,6 @@ data: |
            <choice correct="false" name="beatles">Napster</choice>
            <choice correct="true" name="ipod">The iPod</choice>
            <choice correct="false" name="peeler">The vegetable peeler</choice>
-           <choice correct="false" name="android">Android</choice>
-           <choice correct="false" name="beatles">The Beatles</choice>
         </choicegroup>
        </multiplechoiceresponse>
        <solution>
diff --git a/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml b/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml
index e0a5776222..1dc46f5f51 100644
--- a/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml
@@ -1,12 +1,12 @@
 ---
 metadata:
-    display_name: Numerical Response
+    display_name: Numerical Input
     rerandomize: never
     showanswer: always
     weight: ""
     attempts: ""
     markdown: 
-       "A numerical response problem accepts a line of text input from the
+       "A numerical input problem accepts a line of text input from the
        student, and evaluates the input for correctness based on its
        numerical value.
        
@@ -45,7 +45,7 @@ metadata:
 data: |
    <problem>
    <p>
-   A numerical response problem accepts a line of text input from the
+   A numerical input problem accepts a line of text input from the
    student, and evaluates the input for correctness based on its
    numerical value.  
    </p>
diff --git a/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml b/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml
index 1a42a5a009..7bbcb5ee3f 100644
--- a/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml
@@ -1,12 +1,12 @@
 ---
 metadata:
-    display_name: Option Response
+    display_name: Dropdown
     rerandomize: never
     showanswer: always
     weight: ""
     attempts: ""
     markdown: 
-        "OptionResponse gives a limited set of options for students to respond with, and presents those options
+        "Dropdown problems give a limited set of options for students to respond with, and present those options
         in a format that encourages them to search for a specific answer rather than being immediately presented 
         with options from which to recognize the correct answer.
         
@@ -14,30 +14,30 @@ metadata:
         The answer options and the identification of the correct answer is defined in the <b>optioninput</b> tag.
         
 
-        Translation between Option Response and __________ is extremely straightforward:
+        Translation between Dropdown and __________ is extremely straightforward:
         
-        [[(Multiple Choice), String Response, Numerical Response, External Response, Image Response]]
+        [[(Multiple Choice), Text Input, Numerical Input, External Response, Image Response]]
 
 
         [explanation]
         Multiple Choice also allows students to select from a variety of pre-written responses, although the 
-        format makes it easier for students to read very long response options. Optionresponse also differs 
+        format makes it easier for students to read very long response options. Dropdowns also differ
         slightly because students are more likely to think of an answer and then search for it rather than 
         relying purely on recognition to answer the question.
         [explanation]
         "
 data: |
   <problem>
-  <p>OptionResponse gives a limited set of options for students to respond with, and presents those options
+  <p>Dropdown problems gives a limited set of options for students to respond with, and present those options
   in a format that encourages them to search for a specific answer rather than being immediately presented with options from which to recognize the correct answer.</p>
 
   <p>
   The answer options and the identification of the correct answer is defined in the <b>optioninput</b> tag. 
   </p>
-  <p>Translation between Option Response and __________ is extremely straightforward:
+  <p>Translation between Dropdowns and __________ is extremely straightforward:
       
   <optionresponse>
-        <optioninput options="('Multiple Choice','String Response','Numerical Response','External Response','Image Response')" correct="Multiple Choice"></optioninput>
+        <optioninput options="('Multiple Choice','Text Input','Numerical Input','External Response','Image Response')" correct="Multiple Choice"></optioninput>
   </optionresponse>
   </p>
       <solution>
diff --git a/common/lib/xmodule/xmodule/templates/problem/string_response.yaml b/common/lib/xmodule/xmodule/templates/problem/string_response.yaml
index 1761ea8f67..c018d3f6cf 100644
--- a/common/lib/xmodule/xmodule/templates/problem/string_response.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/string_response.yaml
@@ -1,15 +1,15 @@
 ---
 metadata:
-    display_name: String Response
+    display_name: Text Input
     rerandomize: never
     showanswer: always
     weight: ""
     attempts: ""
     # Note, the extra newlines are needed to make the yaml parser add blank lines instead of folding
     markdown: 
-        "A string response problem accepts a line of text input from the 
+        "A text input problem accepts a line of text from the 
         student, and evaluates the input for correctness based on an expected 
-        answer within each input box. 
+        answer.
         
     
         The answer is correct if it matches every character of the expected answer. This can be a problem with  
@@ -30,9 +30,9 @@ data: |
     <problem showanswer="always">
     <p>
 
-    A string response problem accepts a line of text input from the
+    A text input problem accepts a line of text from the
     student, and evaluates the input for correctness based on an expected
-    answer within each input box. 
+    answer.
 
     The answer is correct if it matches every character of the expected answer. This can be a problem with international spelling, dates, or anything where the format of the answer is not clear. 
     </p>