diff --git a/core/domain/draft_upgrade_services.py b/core/domain/draft_upgrade_services.py
index 0c00b742026a..49a9144074b3 100644
--- a/core/domain/draft_upgrade_services.py
+++ b/core/domain/draft_upgrade_services.py
@@ -82,6 +82,37 @@ def try_upgrading_draft_to_exp_version(
 class DraftUpgradeUtil(object):
     """Wrapper class that contains util functions to upgrade drafts."""
 
+    @classmethod
+    def _convert_states_v29_dict_to_v30_dict(cls, draft_change_list):
+        """Converts draft change list from state version 29 to 30. State
+        version 30 replaces tagged_misconception_id with
+        tagged_skill_misconception_id.
+
+        Args:
+            draft_change_list: list(ExplorationChange). The list of
+                ExplorationChange domain objects to upgrade.
+
+        Returns:
+            list(ExplorationChange). The converted draft_change_list.
+        """
+        for i, change in enumerate(draft_change_list):
+            if (change.cmd == exp_domain.CMD_EDIT_STATE_PROPERTY and
+                    change.property_name ==
+                    exp_domain.STATE_PROPERTY_INTERACTION_ANSWER_GROUPS):
+                draft_change_list[i] = exp_domain.ExplorationChange({
+                    'cmd': exp_domain.CMD_EDIT_STATE_PROPERTY,
+                    'property_name': (
+                        exp_domain.STATE_PROPERTY_INTERACTION_ANSWER_GROUPS),
+                    'state_name': change.state_name,
+                    'new_value': {
+                        'rule_specs': change.new_value['rule_specs'],
+                        'outcome': change.new_value['outcome'],
+                        'training_data': change.new_value['training_data'],
+                        'tagged_skill_misconception_id': None
+                    }
+                })
+        return draft_change_list
+
     @classmethod
     def _convert_states_v28_dict_to_v29_dict(cls, draft_change_list):
         """Converts draft change list from state version 28 to 29. State
diff --git a/core/domain/draft_upgrade_services_test.py b/core/domain/draft_upgrade_services_test.py
index 9f8b54648f04..fa0e0870e0fe 100644
--- a/core/domain/draft_upgrade_services_test.py
+++ b/core/domain/draft_upgrade_services_test.py
@@ -117,6 +117,74 @@ def test_convert_to_latest_schema_version_implemented(self):
             msg='Current schema version is %d but DraftUpgradeUtil.%s is '
             'unimplemented.' % (state_schema_version, conversion_fn_name))
 
+    def test_convert_states_v29_dict_to_v30_dict(self):
+        draft_change_list = [
+            exp_domain.ExplorationChange({
+                'cmd': exp_domain.CMD_EDIT_STATE_PROPERTY,
+                'property_name': 'answer_groups',
+                'state_name': 'State 1',
+                'new_value': {
+                    'rule_specs': [{
+                        'rule_type': 'Equals',
+                        'inputs': {'x': [
+                            '<p>This is value1 for ItemSelection</p>'
+                        ]}
+                    }, {
+                        'rule_type': 'Equals',
+                        'inputs': {'x': [
+                            '<p>This is value2 for ItemSelection</p>'
+                        ]}
+                    }],
+                    'outcome': {
+                        'dest': 'Introduction',
+                        'feedback': {
+                            'content_id': 'feedback',
+                            'html': '<p>Outcome for state1</p>'
+                        },
+                        'param_changes': [],
+                        'labelled_as_correct': False,
+                        'refresher_exploration_id': None,
+                        'missing_prerequisite_skill_id': None
+                    },
+                    'training_data': [],
+                    'tagged_misconception_id': None
+                }
+            })]
+        self.assertEqual(
+            draft_upgrade_services.DraftUpgradeUtil._convert_states_v29_dict_to_v30_dict(  # pylint: disable=protected-access,line-too-long
+                draft_change_list)[0].to_dict(),
+            exp_domain.ExplorationChange({
+                'cmd': exp_domain.CMD_EDIT_STATE_PROPERTY,
+                'property_name': 'answer_groups',
+                'state_name': 'State 1',
+                'new_value': {
+                    'rule_specs': [{
+                        'rule_type': 'Equals',
+                        'inputs': {'x': [
+                            '<p>This is value1 for ItemSelection</p>'
+                        ]}
+                    }, {
+                        'rule_type': 'Equals',
+                        'inputs': {'x': [
+                            '<p>This is value2 for ItemSelection</p>'
+                        ]}
+                    }],
+                    'outcome': {
+                        'dest': 'Introduction',
+                        'feedback': {
+                            'content_id': 'feedback',
+                            'html': '<p>Outcome for state1</p>'
+                        },
+                        'param_changes': [],
+                        'labelled_as_correct': False,
+                        'refresher_exploration_id': None,
+                        'missing_prerequisite_skill_id': None
+                    },
+                    'training_data': [],
+                    'tagged_skill_misconception_id': None
+                }
+            }).to_dict())
+
     def test_convert_states_v28_dict_to_v29_dict(self):
         draft_change_list = [
             exp_domain.ExplorationChange({
diff --git a/core/domain/exp_domain.py b/core/domain/exp_domain.py
index c0624a6eb828..050873d1133d 100644
--- a/core/domain/exp_domain.py
+++ b/core/domain/exp_domain.py
@@ -2176,7 +2176,7 @@ def _convert_states_v28_dict_to_v29_dict(cls, states_dict):
 
         Args:
             states_dict: dict. A dict where each key-value pair represents,
-                respectively, a state name and a dict used to initalize a
+                respectively, a state name and a dict used to initialize a
                 State domain object.
 
         Returns:
@@ -2186,6 +2186,28 @@ def _convert_states_v28_dict_to_v29_dict(cls, states_dict):
             state_dict['solicit_answer_details'] = False
         return states_dict
 
+    @classmethod
+    def _convert_states_v29_dict_to_v30_dict(cls, states_dict):
+        """Converts from version 29 to 30. Version 30 replaces
+        tagged_misconception_id with tagged_skill_misconception_id, which
+        contains the skill id and misconception id of the tagged misconception,
+        connected by '-'.
+
+        Args:
+            states_dict: dict. A dict where each key-value pair represents,
+                respectively, a state name and a dict used to initialize a
+                State domain object.
+
+        Returns:
+            dict. The converted states_dict.
+        """
+        for state_dict in states_dict.itervalues():
+            answer_groups = state_dict['interaction']['answer_groups']
+            for answer_group in answer_groups:
+                answer_group['tagged_skill_misconception_id'] = None
+                del answer_group['tagged_misconception_id']
+        return states_dict
+
     @classmethod
     def update_states_from_model(
             cls, versioned_exploration_states, current_states_schema_version,
@@ -2221,7 +2243,7 @@ def update_states_from_model(
     # incompatible changes are made to the exploration schema in the YAML
     # definitions, this version number must be changed and a migration process
     # put in place.
-    CURRENT_EXP_SCHEMA_VERSION = 34
+    CURRENT_EXP_SCHEMA_VERSION = 35
     LAST_UNTITLED_SCHEMA_VERSION = 9
 
     @classmethod
@@ -2835,6 +2857,29 @@ def _convert_v33_dict_to_v34_dict(cls, exploration_dict):
 
         return exploration_dict
 
+    @classmethod
+    def _convert_v34_dict_to_v35_dict(cls, exploration_dict):
+        """Converts a v34 exploration dict into a v35 exploration dict.
+        Replaces tagged_misconception_id with tagged_skill_misconception_id,
+        which contains the skill id and misconception id of the tagged
+        misconception, connected by '-'.
+
+        Args:
+            exploration_dict: dict. The dict representation of an exploration
+                with schema version v34.
+
+        Returns:
+            dict. The dict representation of the Exploration domain object,
+            following schema version v35.
+        """
+        exploration_dict['schema_version'] = 35
+
+        exploration_dict['states'] = cls._convert_states_v29_dict_to_v30_dict(
+            exploration_dict['states'])
+        exploration_dict['states_schema_version'] = 30
+
+        return exploration_dict
+
     @classmethod
     def _migrate_to_latest_yaml_version(
             cls, yaml_content, exp_id, title=None, category=None):
@@ -3038,6 +3083,11 @@ def _migrate_to_latest_yaml_version(
                 exploration_dict)
             exploration_schema_version = 34
 
+        if exploration_schema_version == 34:
+            exploration_dict = cls._convert_v34_dict_to_v35_dict(
+                exploration_dict)
+            exploration_schema_version = 35
+
         return (exploration_dict, initial_schema_version)
 
     @classmethod
diff --git a/core/domain/exp_domain_test.py b/core/domain/exp_domain_test.py
index 8fc15430eaa0..c5ae07196b24 100644
--- a/core/domain/exp_domain_test.py
+++ b/core/domain/exp_domain_test.py
@@ -521,7 +521,7 @@ def test_validation(self):
                 'rule_type': 'Contains'
             }],
             'training_data': [],
-            'tagged_misconception_id': None
+            'tagged_skill_misconception_id': None
         })
 
         init_state.update_interaction_answer_groups(old_answer_groups)
@@ -724,7 +724,7 @@ def test_validation(self):
             exploration,
             re.escape('Hint(s) must be specified if solution is specified'))
 
-        interaction.solution = None
+        init_state.update_interaction_solution(None)
         interaction.hints = {}
         self._assert_validation_error(
             exploration, 'Expected hints to be a list')
@@ -750,20 +750,49 @@ def test_validation(self):
                 'rule_type': 'Contains'
             }],
             'training_data': [],
-            'tagged_misconception_id': 'invalid_tagged_misconception_id'
+            'tagged_skill_misconception_id': 1
         }
         init_state.update_interaction_answer_groups([answer_groups_dict])
 
         self._assert_validation_error(
             exploration,
-            'Expected tagged misconception id to be an int, received '
-            'invalid_tagged_misconception_id')
+            'Expected tagged skill misconception id to be a str, received 1')
+
+        answer_groups_dict = {
+            'outcome': {
+                'dest': exploration.init_state_name,
+                'feedback': {
+                    'content_id': 'feedback_1',
+                    'html': 'Feedback'
+                },
+                'labelled_as_correct': False,
+                'param_changes': [],
+                'refresher_exploration_id': None,
+                'missing_prerequisite_skill_id': None
+            },
+            'rule_specs': [{
+                'inputs': {
+                    'x': 'Test'
+                },
+                'rule_type': 'Contains'
+            }],
+            'training_data': [],
+            'tagged_skill_misconception_id':
+                'invalid_tagged_skill_misconception_id'
+        }
+        init_state.update_interaction_answer_groups([answer_groups_dict])
+
+        self._assert_validation_error(
+            exploration,
+            'Expected the format of tagged skill misconception id '
+            'to be <skill_id>-<misconception_id>, received '
+            'invalid_tagged_skill_misconception_id')
 
         init_state.interaction.answer_groups[0].rule_specs = {}
         self._assert_validation_error(
             exploration, 'Expected answer group rules to be a list')
 
-        init_state.interaction.answer_groups[0].tagged_misconception_id = None
+        init_state.interaction.answer_groups[0].tagged_skill_misconception_id = None  # pylint: disable=line-too-long
         init_state.interaction.answer_groups[0].rule_specs = []
         self._assert_validation_error(
             exploration,
@@ -1298,7 +1327,7 @@ def test_validate_exploration_answer_group_parameter(self):
                 'rule_type': 'Contains'
             }],
             'training_data': [],
-            'tagged_misconception_id': None
+            'tagged_skill_misconception_id': None
         }]
 
         exploration.init_state.update_interaction_answer_groups(answer_groups)
@@ -4786,7 +4815,134 @@ class SchemaMigrationUnitTests(test_utils.GenericTestBase):
 title: Title
 """)
 
-    _LATEST_YAML_CONTENT = YAML_CONTENT_V34
+    YAML_CONTENT_V35 = ("""author_notes: ''
+auto_tts_enabled: true
+blurb: ''
+category: Category
+correctness_feedback_enabled: false
+init_state_name: (untitled state)
+language_code: en
+objective: ''
+param_changes: []
+param_specs: {}
+schema_version: 35
+states:
+  (untitled state):
+    classifier_model_id: null
+    content:
+      content_id: content
+      html: ''
+    interaction:
+      answer_groups:
+      - outcome:
+          dest: END
+          feedback:
+            content_id: feedback_1
+            html: <p>Correct!</p>
+          labelled_as_correct: false
+          missing_prerequisite_skill_id: null
+          param_changes: []
+          refresher_exploration_id: null
+        rule_specs:
+        - inputs:
+            x: InputString
+          rule_type: Equals
+        tagged_skill_misconception_id: null
+        training_data: []
+      confirmed_unclassified_answers: []
+      customization_args:
+        placeholder:
+          value: ''
+        rows:
+          value: 1
+      default_outcome:
+        dest: (untitled state)
+        feedback:
+          content_id: default_outcome
+          html: ''
+        labelled_as_correct: false
+        missing_prerequisite_skill_id: null
+        param_changes: []
+        refresher_exploration_id: null
+      hints: []
+      id: TextInput
+      solution: null
+    param_changes: []
+    recorded_voiceovers:
+      voiceovers_mapping:
+        content: {}
+        default_outcome: {}
+        feedback_1: {}
+    solicit_answer_details: false
+    written_translations:
+      translations_mapping:
+        content: {}
+        default_outcome: {}
+        feedback_1: {}
+  END:
+    classifier_model_id: null
+    content:
+      content_id: content
+      html: <p>Congratulations, you have finished!</p>
+    interaction:
+      answer_groups: []
+      confirmed_unclassified_answers: []
+      customization_args:
+        recommendedExplorationIds:
+          value: []
+      default_outcome: null
+      hints: []
+      id: EndExploration
+      solution: null
+    param_changes: []
+    recorded_voiceovers:
+      voiceovers_mapping:
+        content: {}
+    solicit_answer_details: false
+    written_translations:
+      translations_mapping:
+        content: {}
+  New state:
+    classifier_model_id: null
+    content:
+      content_id: content
+      html: ''
+    interaction:
+      answer_groups: []
+      confirmed_unclassified_answers: []
+      customization_args:
+        placeholder:
+          value: ''
+        rows:
+          value: 1
+      default_outcome:
+        dest: END
+        feedback:
+          content_id: default_outcome
+          html: ''
+        labelled_as_correct: false
+        missing_prerequisite_skill_id: null
+        param_changes: []
+        refresher_exploration_id: null
+      hints: []
+      id: TextInput
+      solution: null
+    param_changes: []
+    recorded_voiceovers:
+      voiceovers_mapping:
+        content: {}
+        default_outcome: {}
+    solicit_answer_details: false
+    written_translations:
+      translations_mapping:
+        content: {}
+        default_outcome: {}
+states_schema_version: 30
+tags: []
+title: Title
+""")
+
+    _LATEST_YAML_CONTENT = YAML_CONTENT_V35
 
     def test_load_from_v1(self):
         """Test direct loading from a v1 yaml file."""
@@ -5221,7 +5377,7 @@ def test_load_from_v9(self):
 objective: ''
 param_changes: []
 param_specs: {}
-schema_version: 34
+schema_version: 35
 states:
   (untitled state):
     classifier_model_id: null
@@ -5243,7 +5399,7 @@ def test_load_from_v9(self):
         - inputs:
             x: InputString
           rule_type: Equals
-        tagged_misconception_id: null
+        tagged_skill_misconception_id: null
         training_data: []
       confirmed_unclassified_answers: []
       customization_args:
@@ -5339,7 +5495,7 @@ def test_load_from_v9(self):
       translations_mapping:
         content: {}
         default_outcome: {}
-states_schema_version: 29
+states_schema_version: 30
 tags: []
 title: Title
 """)
@@ -5371,7 +5527,7 @@ def test_load_from_v12(self):
 objective: ''
 param_changes: []
 param_specs: {}
-schema_version: 34
+schema_version: 35
 states:
   (untitled state):
     classifier_model_id: null
@@ -5393,7 +5549,7 @@ def test_load_from_v12(self):
         - inputs:
             x: InputString
           rule_type: Equals
-        tagged_misconception_id: null
+        tagged_skill_misconception_id: null
         training_data: []
       confirmed_unclassified_answers: []
       customization_args:
@@ -5488,7 +5644,7 @@ def test_load_from_v12(self):
         content: {}
         default_outcome: {}
         hint_1: {}
-states_schema_version: 29
+states_schema_version: 30
 tags: []
 title: Title
 """)
@@ -5538,7 +5694,7 @@ def test_load_from_v18(self):
 objective: ''
 param_changes: []
 param_specs: {}
-schema_version: 34
+schema_version: 35
 states:
   (untitled state):
     classifier_model_id: null
@@ -5560,7 +5716,7 @@ def test_load_from_v18(self):
         - inputs:
             x: InputString
           rule_type: Equals
-        tagged_misconception_id: null
+        tagged_skill_misconception_id: null
         training_data: []
       confirmed_unclassified_answers: []
       customization_args:
@@ -5662,7 +5818,7 @@ def test_load_from_v18(self):
         default_outcome: {}
         hint_1: {}
         solution: {}
-states_schema_version: 29
+states_schema_version: 30
 tags: []
 title: Title
 """)
@@ -5694,7 +5850,7 @@ def test_load_from_v21(self):
 objective: ''
 param_changes: []
 param_specs: {}
-schema_version: 34
+schema_version: 35
 states:
   (untitled state):
     classifier_model_id: null
@@ -5716,7 +5872,7 @@ def test_load_from_v21(self):
         - inputs:
             x: InputString
           rule_type: Equals
-        tagged_misconception_id: null
+        tagged_skill_misconception_id: null
         training_data: []
       confirmed_unclassified_answers: []
       customization_args:
@@ -5814,7 +5970,7 @@ def test_load_from_v21(self):
       translations_mapping:
         content: {}
         default_outcome: {}
-states_schema_version: 29
+states_schema_version: 30
 tags: []
 title: Title
 """)
@@ -5876,7 +6032,7 @@ def test_load_from_v29(self):
 objective: ''
 param_changes: []
 param_specs: {}
-schema_version: 34
+schema_version: 35
 states:
   (untitled state):
     classifier_model_id: null
@@ -5898,7 +6054,7 @@ def test_load_from_v29(self):
         - inputs:
             x: InputString
           rule_type: Equals
-        tagged_misconception_id: null
+        tagged_skill_misconception_id: null
         training_data: []
       confirmed_unclassified_answers: []
       customization_args:
@@ -5993,7 +6149,7 @@ def test_load_from_v29(self):
       translations_mapping:
         content: {}
         default_outcome: {}
-states_schema_version: 29
+states_schema_version: 30
 tags: []
 title: Title
 """)
@@ -6447,7 +6603,7 @@ class HTMLMigrationUnitTests(test_utils.GenericTestBase):
 """)
 
 # pylint: disable=line-too-long
-    YAML_CONTENT_V34_IMAGE_DIMENSIONS = ("""author_notes: ''
+    YAML_CONTENT_V35_IMAGE_DIMENSIONS = ("""author_notes: ''
 auto_tts_enabled: true
 blurb: ''
 category: category
@@ -6457,7 +6613,7 @@ class HTMLMigrationUnitTests(test_utils.GenericTestBase):
 objective: ''
 param_changes: []
 param_specs: {}
-schema_version: 34
+schema_version: 35
 states:
   Introduction:
     classifier_model_id: null
@@ -6555,7 +6711,7 @@ class HTMLMigrationUnitTests(test_utils.GenericTestBase):
         - inputs:
             x: 1
           rule_type: Equals
-        tagged_misconception_id: null
+        tagged_skill_misconception_id: null
         training_data: []
       - outcome:
           dest: state3
@@ -6570,7 +6726,7 @@ class HTMLMigrationUnitTests(test_utils.GenericTestBase):
         - inputs:
             x: 0
           rule_type: Equals
-        tagged_misconception_id: null
+        tagged_skill_misconception_id: null
         training_data: []
       confirmed_unclassified_answers: []
       customization_args:
@@ -6646,7 +6802,7 @@ class HTMLMigrationUnitTests(test_utils.GenericTestBase):
             x:
             - <p>This is value3 for ItemSelectionInput</p>
           rule_type: Equals
-        tagged_misconception_id: null
+        tagged_skill_misconception_id: null
         training_data: []
       confirmed_unclassified_answers: []
       customization_args:
@@ -6683,7 +6839,7 @@ class HTMLMigrationUnitTests(test_utils.GenericTestBase):
         content: {}
         default_outcome: {}
         feedback_1: {}
-states_schema_version: 29
+states_schema_version: 30
 tags: []
 title: title
 """)
@@ -6798,7 +6954,7 @@ class HTMLMigrationUnitTests(test_utils.GenericTestBase):
 title: Title
 """)
 
-    YAML_CONTENT_V34_WITH_IMAGE_CAPTION = ("""author_notes: ''
+    YAML_CONTENT_V35_WITH_IMAGE_CAPTION = ("""author_notes: ''
 auto_tts_enabled: true
 blurb: ''
 category: Category
@@ -6808,7 +6964,7 @@ class HTMLMigrationUnitTests(test_utils.GenericTestBase):
 objective: ''
 param_changes: []
 param_specs: {}
-schema_version: 34
+schema_version: 35
 states:
   (untitled state):
     classifier_model_id: null
@@ -6832,7 +6988,7 @@ class HTMLMigrationUnitTests(test_utils.GenericTestBase):
         - inputs:
             x: InputString
           rule_type: Equals
-        tagged_misconception_id: null
+        tagged_skill_misconception_id: null
         training_data: []
       confirmed_unclassified_answers: []
       customization_args:
@@ -6922,7 +7078,7 @@ class HTMLMigrationUnitTests(test_utils.GenericTestBase):
       translations_mapping:
         content: {}
         default_outcome: {}
-states_schema_version: 29
+states_schema_version: 30
 tags: []
 title: Title
 """)
@@ -6940,7 +7096,7 @@ def test_load_from_v26_textangular(self):
             exploration = exp_domain.Exploration.from_yaml(
                 'eid', self.YAML_CONTENT_V26_TEXTANGULAR)
         self.assertEqual(
-            exploration.to_yaml(), self.YAML_CONTENT_V34_IMAGE_DIMENSIONS)
+            exploration.to_yaml(), self.YAML_CONTENT_V35_IMAGE_DIMENSIONS)
 
 
     def test_load_from_v27_without_image_caption(self):
@@ -6953,7 +7109,7 @@ def test_load_from_v27_without_image_caption(self):
             exploration = exp_domain.Exploration.from_yaml(
                 'eid', self.YAML_CONTENT_V27_WITHOUT_IMAGE_CAPTION)
         self.assertEqual(
-            exploration.to_yaml(), self.YAML_CONTENT_V34_WITH_IMAGE_CAPTION)
+            exploration.to_yaml(), self.YAML_CONTENT_V35_WITH_IMAGE_CAPTION)
 
 
 class ConversionUnitTests(test_utils.GenericTestBase):
@@ -7173,7 +7329,7 @@ def test_all_html_strings_are_collected(self):
                 'missing_prerequisite_skill_id': None
             },
             'training_data': [],
-            'tagged_misconception_id': None
+            'tagged_skill_misconception_id': None
         }, {
             'rule_specs': [{
                 'rule_type': 'Equals',
@@ -7191,7 +7347,7 @@ def test_all_html_strings_are_collected(self):
                 'missing_prerequisite_skill_id': None
             },
             'training_data': [],
-            'tagged_misconception_id': None
+            'tagged_skill_misconception_id': None
         }]
         answer_group_list3 = [{
             'rule_specs': [{
@@ -7217,7 +7373,7 @@ def test_all_html_strings_are_collected(self):
                 'missing_prerequisite_skill_id': None
             },
             'training_data': [],
-            'tagged_misconception_id': None
+            'tagged_skill_misconception_id': None
         }]
         state2.update_interaction_answer_groups(answer_group_list2)
         state3.update_interaction_answer_groups(answer_group_list3)
diff --git a/core/domain/exp_jobs_one_off_test.py b/core/domain/exp_jobs_one_off_test.py
index 635f27089f38..d523eb178715 100644
--- a/core/domain/exp_jobs_one_off_test.py
+++ b/core/domain/exp_jobs_one_off_test.py
@@ -1262,7 +1262,7 @@ def test_exp_state_pairs_are_produced_only_for_desired_interactions(self):
                 'missing_prerequisite_skill_id': None
             },
             'training_data': [],
-            'tagged_misconception_id': None
+            'tagged_skill_misconception_id': None
         }]
 
         state1.update_interaction_customization_args(customization_args_dict1)
@@ -1310,7 +1310,7 @@ def test_exp_state_pairs_are_produced_only_for_desired_interactions(self):
                 'missing_prerequisite_skill_id': None
             },
             'training_data': [],
-            'tagged_misconception_id': None
+            'tagged_skill_misconception_id': None
         }]
 
         state2.update_interaction_customization_args(customization_args_dict2)
@@ -1375,7 +1375,7 @@ def test_no_action_is_performed_for_deleted_exploration(self):
                 'missing_prerequisite_skill_id': None
             },
             'training_data': [],
-            'tagged_misconception_id': None
+            'tagged_skill_misconception_id': None
         }]
 
         state1.update_interaction_customization_args(customization_args_dict)
diff --git a/core/domain/exp_services_test.py b/core/domain/exp_services_test.py
index 158a0b67241d..3c570048e467 100644
--- a/core/domain/exp_services_test.py
+++ b/core/domain/exp_services_test.py
@@ -130,7 +130,7 @@ def test_reverting_an_exploration_maintains_classifier_models(self):
                 'missing_prerequisite_skill_id': None
             },
             'training_data': ['answer1', 'answer2', 'answer3'],
-            'tagged_misconception_id': None
+            'tagged_skill_misconception_id': None
         }]
 
         change_list = [exp_domain.ExplorationChange({
@@ -1311,7 +1311,7 @@ def test_get_image_filenames_from_exploration(self):
                 'missing_prerequisite_skill_id': None
             },
             'training_data': [],
-            'tagged_misconception_id': None
+            'tagged_skill_misconception_id': None
         }, {
             'rule_specs': [{
                 'rule_type': 'Equals',
@@ -1329,7 +1329,7 @@ def test_get_image_filenames_from_exploration(self):
                 'missing_prerequisite_skill_id': None
             },
             'training_data': [],
-            'tagged_misconception_id': None
+            'tagged_skill_misconception_id': None
         }]
         answer_group_list3 = [{
             'rule_specs': [{
@@ -1367,7 +1367,7 @@ def test_get_image_filenames_from_exploration(self):
                 'missing_prerequisite_skill_id': None
             },
             'training_data': [],
-            'tagged_misconception_id': None
+            'tagged_skill_misconception_id': None
         }]
         state2.update_interaction_answer_groups(answer_group_list2)
         state3.update_interaction_answer_groups(answer_group_list3)
@@ -2083,7 +2083,7 @@ def setUp(self):
                 'missing_prerequisite_skill_id': None
             },
             'training_data': [],
-            'tagged_misconception_id': None
+            'tagged_skill_misconception_id': None
         }]
         # Default outcome specification for an interaction.
         self.interaction_default_outcome = {
diff --git a/core/domain/question_domain.py b/core/domain/question_domain.py
index c88ff3c542e1..5906c2139272 100644
--- a/core/domain/question_domain.py
+++ b/core/domain/question_domain.py
@@ -203,6 +203,27 @@ def _convert_state_v28_dict_to_v29_dict(cls, question_state_dict):
         question_state_dict['solicit_answer_details'] = False
         return question_state_dict
 
+    @classmethod
+    def _convert_state_v29_dict_to_v30_dict(cls, question_state_dict):
+        """Converts from version 29 to 30. Version 30 replaces
+        tagged_misconception_id with tagged_skill_misconception_id, which
+        is default to None.
+
+        Args:
+            question_state_dict: dict. A dict where each key-value pair
+                represents respectively, a state name and a dict used to
+                initalize a State domain object.
+
+        Returns:
+            dict. The converted question_state_dict.
+        """
+        answer_groups = question_state_dict['interaction']['answer_groups']
+        for answer_group in answer_groups:
+            answer_group['tagged_skill_misconception_id'] = None
+            del answer_group['tagged_misconception_id']
+
+        return question_state_dict
+
     @classmethod
     def update_state_from_model(
             cls, versioned_question_state, current_state_schema_version):
@@ -226,6 +247,7 @@ def update_state_from_model(
 
         conversion_fn = getattr(cls, '_convert_state_v%s_dict_to_v%s_dict' % (
             current_state_schema_version, current_state_schema_version + 1))
+
         versioned_question_state['state'] = conversion_fn(
             versioned_question_state['state'])
 
diff --git a/core/domain/question_domain_test.py b/core/domain/question_domain_test.py
index 66e835cbb95b..27c4226c7ee5 100644
--- a/core/domain/question_domain_test.py
+++ b/core/domain/question_domain_test.py
@@ -328,7 +328,7 @@ def test_strict_validation_for_answer_groups(self):
                     'rule_type': 'Contains'
                 }],
                 'training_data': [],
-                'tagged_misconception_id': None
+                'tagged_skill_misconception_id': None
             })
         ]
 
diff --git a/core/domain/question_jobs_one_off_test.py b/core/domain/question_jobs_one_off_test.py
index e7a58fb4feb9..0a54f4c4f45e 100644
--- a/core/domain/question_jobs_one_off_test.py
+++ b/core/domain/question_jobs_one_off_test.py
@@ -120,7 +120,7 @@ def test_migration_job_converts_old_question(self):
             self.QUESTION_ID, self.albert_id, [self.skill_id])
         question = (
             question_services.get_question_by_id(self.QUESTION_ID))
-        self.assertEqual(question.question_state_data_schema_version, 29)
+        self.assertEqual(question.question_state_data_schema_version, 30)
 
         # Start migration job.
         job_id = (
diff --git a/core/domain/question_services_test.py b/core/domain/question_services_test.py
index b63060550fa2..1e2180e212f8 100644
--- a/core/domain/question_services_test.py
+++ b/core/domain/question_services_test.py
@@ -609,3 +609,101 @@ def test_get_skills_of_question(self):
         skill_ids = [skill.id for skill in skills]
         self.assertItemsEqual(
             skill_ids, ['skill_1', 'skill_2'])
+
+
+class QuestionMigrationTests(test_utils.GenericTestBase):
+
+    def test_migrate_question_state_from_v29_to_v30(self):
+        answer_group = {
+            'outcome': {
+                'dest': 'abc',
+                'feedback': {
+                    'content_id': 'feedback_1',
+                    'html': '<p>Feedback</p>'
+                },
+                'labelled_as_correct': True,
+                'param_changes': [],
+                'refresher_exploration_id': None,
+                'missing_prerequisite_skill_id': None
+            },
+            'rule_specs': [{
+                'inputs': {
+                    'x': 'Test'
+                },
+                'rule_type': 'Contains'
+            }],
+            'training_data': [],
+            'tagged_misconception_id': None
+        }
+        question_state_dict = {
+            'content': {
+                'content_id': 'content_1',
+                'html': 'Question 1'
+            },
+            'recorded_voiceovers': {
+                'voiceovers_mapping': {}
+            },
+            'written_translations': {
+                'translations_mapping': {
+                    'explanation': {}
+                }
+            },
+            'interaction': {
+                'answer_groups': [answer_group],
+                'confirmed_unclassified_answers': [],
+                'customization_args': {},
+                'default_outcome': {
+                    'dest': None,
+                    'feedback': {
+                        'content_id': 'feedback_1',
+                        'html': 'Correct Answer'
+                    },
+                    'param_changes': [],
+                    'refresher_exploration_id': None,
+                    'labelled_as_correct': True,
+                    'missing_prerequisite_skill_id': None
+                },
+                'hints': [{
+                    'hint_content': {
+                        'content_id': 'hint_1',
+                        'html': 'Hint 1'
+                    }
+                }],
+                'solution': {
+                    'correct_answer': 'This is the correct answer',
+                    'answer_is_exclusive': False,
+                    'explanation': {
+                        'content_id': 'explanation_1',
+                        'html': 'Solution explanation'
+                    }
+                },
+                'id': 'TextInput'
+            },
+            'param_changes': [],
+            'solicit_answer_details': False,
+            'classifier_model_id': None
+        }
+        question_model = question_models.QuestionModel(
+            id='question_id',
+            question_state_data=question_state_dict,
+            language_code='en',
+            version=0,
+            linked_skill_ids=['skill_id'],
+            question_state_data_schema_version=29)
+        commit_cmd = question_domain.QuestionChange({
+            'cmd': question_domain.CMD_CREATE_NEW
+        })
+        commit_cmd_dicts = [commit_cmd.to_dict()]
+        question_model.commit(
+            'user_id_admin', 'question model created', commit_cmd_dicts)
+
+        current_schema_version_swap = self.swap(
+            feconf, 'CURRENT_STATE_SCHEMA_VERSION', 30)
+
+        with current_schema_version_swap:
+            question = question_services.get_question_from_model(question_model)
+
+        self.assertEqual(question.question_state_data_schema_version, 30)
+
+        answer_groups = question.question_state_data.interaction.answer_groups
+        self.assertEqual(answer_groups[0].tagged_skill_misconception_id, None)
diff --git a/core/domain/skill_services.py b/core/domain/skill_services.py
index e58cccdd90c3..44e553beab4d 100644
--- a/core/domain/skill_services.py
+++ b/core/domain/skill_services.py
@@ -68,7 +68,7 @@ def _migrate_misconceptions_to_latest_schema(versioned_misconceptions):
     function to account for that new version.
 
     Args:
-        versioned_misconceptions: A dict with two keys:
+        versioned_misconceptions: dict. A dict with two keys:
           - schema_version: int. The schema version for the misconceptions dict.
           - misconceptions: list(dict). The list of dicts comprising the skill
               misconceptions.
diff --git a/core/domain/state_domain.py b/core/domain/state_domain.py
index e5a17f8debba..dc40ef772c86 100644
--- a/core/domain/state_domain.py
+++ b/core/domain/state_domain.py
@@ -47,7 +47,7 @@ def to_dict(self):
                            for rule_spec in self.rule_specs],
             'outcome': self.outcome.to_dict(),
             'training_data': self.training_data,
-            'tagged_misconception_id': self.tagged_misconception_id
+            'tagged_skill_misconception_id': self.tagged_skill_misconception_id
         }
 
     @classmethod
@@ -65,11 +65,12 @@ def from_dict(cls, answer_group_dict):
             Outcome.from_dict(answer_group_dict['outcome']),
             [RuleSpec.from_dict(rs) for rs in answer_group_dict['rule_specs']],
             answer_group_dict['training_data'],
-            answer_group_dict['tagged_misconception_id']
+            answer_group_dict['tagged_skill_misconception_id']
         )
 
     def __init__(
-            self, outcome, rule_specs, training_data, tagged_misconception_id):
+            self, outcome, rule_specs, training_data,
+            tagged_skill_misconception_id):
         """Initializes a AnswerGroup domain object.
 
         Args:
@@ -77,9 +78,12 @@ def __init__(
             rule_specs: list(RuleSpec). List of rule specifications.
             training_data: list(*). List of answers belonging to training
                 data of this answer group.
-            tagged_misconception_id: int or None. The id of the tagged
-                misconception for the answer group, when a state is part of a
-                Question object that tests a particular skill.
+            tagged_skill_misconception_id: str or None. The format is
+                '<skill_id>-<misconeption_id>', where skill_id is the skill ID
+                of the tagged misconception and misconeption_id is the id of
+                the tagged misconception for the answer group. It is not None
+                only when a state is part of a Question object that
+                tests a particular skill.
         """
         self.rule_specs = [RuleSpec(
             rule_spec.rule_type, rule_spec.inputs
@@ -87,7 +91,7 @@ def __init__(
 
         self.outcome = outcome
         self.training_data = training_data
-        self.tagged_misconception_id = tagged_misconception_id
+        self.tagged_skill_misconception_id = tagged_skill_misconception_id
 
     def validate(self, interaction, exp_param_specs_dict):
         """Verifies that all rule classes are valid, and that the AnswerGroup
@@ -110,11 +114,16 @@ def validate(self, interaction, exp_param_specs_dict):
                 'Expected answer group rules to be a list, received %s'
                 % self.rule_specs)
 
-        if self.tagged_misconception_id is not None:
-            if not isinstance(self.tagged_misconception_id, int):
+        if self.tagged_skill_misconception_id is not None:
+            if not isinstance(self.tagged_skill_misconception_id, basestring):
                 raise utils.ValidationError(
-                    'Expected tagged misconception id to be an int, '
-                    'received %s' % self.tagged_misconception_id)
+                    'Expected tagged skill misconception id to be a str, '
+                    'received %s' % self.tagged_skill_misconception_id)
+            if self.tagged_skill_misconception_id.count('-') != 1:
+                raise utils.ValidationError(
+                    'Expected the format of tagged skill misconception id '
+                    'to be <skill_id>-<misconception_id>, received %s'
+                    % self.tagged_skill_misconception_id)
 
         if len(self.rule_specs) == 0 and len(self.training_data) == 0:
             raise utils.ValidationError(
@@ -1540,7 +1549,7 @@ def update_interaction_answer_groups(self, answer_groups_list):
             answer_group = AnswerGroup(
                 Outcome.from_dict(answer_group_dict['outcome']), [],
                 answer_group_dict['training_data'],
-                answer_group_dict['tagged_misconception_id'])
+                answer_group_dict['tagged_skill_misconception_id'])
             for rule_dict in rule_specs_list:
                 rule_spec = RuleSpec.from_dict(rule_dict)
 
diff --git a/core/domain/state_domain_test.py b/core/domain/state_domain_test.py
index cbb6ff432d26..9fa4cf3b21ae 100644
--- a/core/domain/state_domain_test.py
+++ b/core/domain/state_domain_test.py
@@ -674,7 +674,7 @@ def test_validate_duplicate_content_id_with_answer_groups(self):
                 'rule_type': 'Contains'
             }],
             'training_data': [],
-            'tagged_misconception_id': None
+            'tagged_skill_misconception_id': None
         }
 
         exploration.init_state.update_interaction_answer_groups(
@@ -1029,7 +1029,7 @@ def test_update_interaction_confirmed_unclassified_answers(self):
                 'rule_type': 'Contains'
             }],
             'training_data': [],
-            'tagged_misconception_id': None
+            'tagged_skill_misconception_id': None
         }]
 
         self.assertEqual(
@@ -1081,7 +1081,7 @@ def test_cannot_update_answer_groups_with_non_dict_rule_inputs(self):
                 'rule_type': 'Contains'
             }],
             'training_data': [],
-            'tagged_misconception_id': None
+            'tagged_skill_misconception_id': None
         }]
 
         with self.assertRaisesRegexp(
@@ -1105,7 +1105,7 @@ def test_cannot_update_answer_groups_with_non_list_rule_specs(self):
             },
             'rule_specs': {},
             'training_data': [],
-            'tagged_misconception_id': None
+            'tagged_skill_misconception_id': None
         }]
 
         with self.assertRaisesRegexp(
@@ -1134,7 +1134,7 @@ def test_cannot_update_answer_groups_with_invalid_rule_input_value(self):
                 'rule_type': 'Contains'
             }],
             'training_data': [],
-            'tagged_misconception_id': None
+            'tagged_skill_misconception_id': None
         }]
 
         with self.assertRaisesRegexp(
@@ -1173,7 +1173,7 @@ def _mock_logging_function(msg, *args):
                 'rule_type': 'Contains'
             }],
             'training_data': [],
-            'tagged_misconception_id': None
+            'tagged_skill_misconception_id': None
         }]
         exploration.init_state.update_interaction_answer_groups(answer_groups)
 
diff --git a/core/templates/dev/head/components/question-directives/modal-templates/question-editor-modal.directive.html b/core/templates/dev/head/components/question-directives/modal-templates/question-editor-modal.directive.html
index c4c1d27398af..19aa34d4dfe6 100644
--- a/core/templates/dev/head/components/question-directives/modal-templates/question-editor-modal.directive.html
+++ b/core/templates/dev/head/components/question-directives/modal-templates/question-editor-modal.directive.html
@@ -5,7 +5,7 @@ <h3>
 </div>
 <div class="modal-body" style="width: 96%; margin-left: 2%;">
   <question-editor question-id="questionId"
-                   misconceptions="misconceptions"
+                   misconceptions-by-skill="misconceptionsBySkill"
                    question-state-data="questionStateData"
                    question="question"
                    can-edit-question="canEditQuestion"
diff --git a/core/templates/dev/head/components/question-directives/question-editor/question-editor.directive.ts b/core/templates/dev/head/components/question-directives/question-editor/question-editor.directive.ts
index c2039308f001..c711cd823686 100644
--- a/core/templates/dev/head/components/question-directives/question-editor/question-editor.directive.ts
+++ b/core/templates/dev/head/components/question-directives/question-editor/question-editor.directive.ts
@@ -46,7 +46,7 @@ oppia.directive('questionEditor', [
       scope: {},
       bindToController: {
         getQuestionId: '&questionId',
-        getMisconceptions: '&misconceptions',
+        getMisconceptionsBySkill: '&misconceptionsBySkill',
         canEditQuestion: '&',
         question: '=',
         questionStateData: '=',
@@ -77,7 +77,8 @@ oppia.directive('questionEditor', [
             EditabilityService.markNotEditable();
           }
           StateEditorService.setActiveStateName('question');
-          StateEditorService.setMisconceptions(ctrl.getMisconceptions());
+          StateEditorService.setMisconceptionsBySkill(
+            ctrl.getMisconceptionsBySkill());
           ctrl.oppiaBlackImgUrl = UrlInterpolationService.getStaticImageUrl(
             '/avatar/oppia_avatar_100px.svg');
 
diff --git a/core/templates/dev/head/components/question-directives/questions-list/questions-list.directive.ts b/core/templates/dev/head/components/question-directives/questions-list/questions-list.directive.ts
index d7bc0bd906fc..86c5dba4d7e5 100644
--- a/core/templates/dev/head/components/question-directives/questions-list/questions-list.directive.ts
+++ b/core/templates/dev/head/components/question-directives/questions-list/questions-list.directive.ts
@@ -93,7 +93,7 @@ oppia.directive('questionsList', [
             ctrl.truncatedQuestionSummaries = [];
             ctrl.populateTruncatedQuestionSummaries();
             ctrl.questionIsBeingUpdated = false;
-            ctrl.misconceptions = [];
+            ctrl.misconceptionsBySkill = {};
           };
 
           ctrl.getQuestionIndex = function(index) {
@@ -134,7 +134,7 @@ oppia.directive('questionsList', [
 
           ctrl.saveAndPublishQuestion = function() {
             var validationErrors = ctrl.question.validate(
-              ctrl.misconceptions);
+              ctrl.misconceptionsBySkill);
             if (validationErrors) {
               AlertsService.addWarning(validationErrors);
               return;
@@ -273,16 +273,17 @@ oppia.directive('questionsList', [
           };
 
           ctrl.populateMisconceptions = function(skillIds) {
+            ctrl.misconceptionsBySkill = {};
             EditableSkillBackendApiService.fetchMultiSkills(
               skillIds).then(
               function(skillDicts) {
                 skillDicts.forEach(function(skillDict) {
-                  ctrl.misconceptions = ctrl.misconceptions.concat(
+                  ctrl.misconceptionsBySkill[skillDict.id] =
                     skillDict.misconceptions.map(
                       function(misconceptionsBackendDict) {
                         return MisconceptionObjectFactory
                           .createFromBackendDict(misconceptionsBackendDict);
-                      }));
+                      });
                 });
               }, function(error) {
                 AlertsService.addWarning();
@@ -290,16 +291,16 @@ oppia.directive('questionsList', [
           };
 
           ctrl.editQuestion = function(questionSummary) {
-            ctrl.misconceptions = [];
+            ctrl.misconceptionsBySkill = {};
             EditableQuestionBackendApiService.fetchQuestion(
               questionSummary.id).then(function(response) {
               if (response.associated_skill_dicts) {
                 response.associated_skill_dicts.forEach(function(skillDict) {
-                  skillDict.misconceptions.forEach(function(misconception) {
-                    ctrl.misconceptions.push(
-                      MisconceptionObjectFactory.createFromBackendDict(
-                        misconception));
-                  });
+                  ctrl.misconceptionsBySkill[skillDict.id] =
+                    skillDict.misconceptions.map(function(misconception) {
+                      return MisconceptionObjectFactory.createFromBackendDict(
+                        misconception);
+                    });
                 });
               }
               ctrl.question =
@@ -321,7 +322,7 @@ oppia.directive('questionsList', [
             var questionStateData = ctrl.questionStateData;
             var questionId = ctrl.questionId;
             var canEditQuestion = ctrl.canEditQuestion();
-            var misconceptions = ctrl.misconceptions;
+            var misconceptionsBySkill = ctrl.misconceptionsBySkill;
             QuestionUndoRedoService.clearChanges();
 
             var modalInstance = $uibModal.open({
@@ -339,7 +340,7 @@ oppia.directive('questionsList', [
                   $scope.question = question;
                   $scope.questionStateData = questionStateData;
                   $scope.questionId = questionId;
-                  $scope.misconceptions = misconceptions;
+                  $scope.misconceptionsBySkill = misconceptionsBySkill;
                   $scope.canEditQuestion = canEditQuestion;
                   $scope.removeErrors = function() {
                     $scope.validationError = null;
@@ -349,7 +350,7 @@ oppia.directive('questionsList', [
                   };
                   $scope.done = function() {
                     $scope.validationError = $scope.question.validate(
-                      $scope.misconceptions);
+                      $scope.misconceptionsBySkill);
                     if ($scope.validationError) {
                       return;
                     }
diff --git a/core/templates/dev/head/components/state-directives/answer-group-editor/answer-group-editor.directive.html b/core/templates/dev/head/components/state-directives/answer-group-editor/answer-group-editor.directive.html
index db19e019f3ca..91f64c8db960 100644
--- a/core/templates/dev/head/components/state-directives/answer-group-editor/answer-group-editor.directive.html
+++ b/core/templates/dev/head/components/state-directives/answer-group-editor/answer-group-editor.directive.html
@@ -117,11 +117,15 @@
                   show-mark-all-audio-as-needing-update-modal-if-required="$ctrl.showMarkAllAudioAsNeedingUpdateModalIfRequired">
   </outcome-editor>
 
-  <div ng-if="$ctrl.isInQuestionMode() && $ctrl.getTaggedMisconceptionId() !== null && !$ctrl.outcome.labelledAsCorrect">
+  <div ng-if="$ctrl.isInQuestionMode() && $ctrl.getTaggedSkillMisconceptionId() !== null && !$ctrl.outcome.labelledAsCorrect">
     <label> Tagged Misconception: </label>
     <[$ctrl.misconceptionName]>
   </div>
-  <button type="button" ng-if="$ctrl.isEditable && $ctrl.isInQuestionMode() && $ctrl.rules && !$ctrl.outcome.labelledAsCorrect && $ctrl.misconceptions.length > 0" class="btn btn-default btn-lg oppia-add-rule-button protractor-test-add-answer" style="padding-top: 5px;" ng-click="$ctrl.tagAnswerGroupWithMisconception()">
+  <button type="button"
+          ng-if="$ctrl.isEditable && $ctrl.isInQuestionMode() && $ctrl.rules && !$ctrl.outcome.labelledAsCorrect && $ctrl.containsMisconceptions()"
+          class="btn btn-default btn-lg oppia-add-rule-button protractor-test-add-answer"
+          style="padding-top: 5px;"
+          ng-click="$ctrl.tagAnswerGroupWithMisconception()">
     Tag with misconception
   </button>
 </div>
diff --git a/core/templates/dev/head/components/state-directives/answer-group-editor/answer-group-editor.directive.ts b/core/templates/dev/head/components/state-directives/answer-group-editor/answer-group-editor.directive.ts
index cde9f7273a2f..1c6e6aa205ad 100644
--- a/core/templates/dev/head/components/state-directives/answer-group-editor/answer-group-editor.directive.ts
+++ b/core/templates/dev/head/components/state-directives/answer-group-editor/answer-group-editor.directive.ts
@@ -53,7 +53,7 @@ oppia.directive('answerGroupEditor', [
         getOnSaveAnswerGroupRulesFn: '&onSaveAnswerGroupRules',
         getOnSaveAnswerGroupCorrectnessLabelFn: (
           '&onSaveAnswerGroupCorrectnessLabel'),
-        getTaggedMisconceptionId: '&taggedMisconceptionId',
+        getTaggedSkillMisconceptionId: '&taggedSkillMisconceptionId',
         isEditable: '=',
         outcome: '=',
         rules: '=',
@@ -81,23 +81,46 @@ oppia.directive('answerGroupEditor', [
           ctrl.activeRuleIndex = ResponsesService.getActiveRuleIndex();
           ctrl.editAnswerGroupForm = {};
           ctrl.misconceptionName = null;
-          ctrl.misconceptions = StateEditorService.getMisconceptions();
-
-          var _getTaggedMisconceptionName = function(misconceptionId) {
-            for (var i = 0; i < ctrl.misconceptions.length; i++) {
-              if (
-                ctrl.misconceptions[i].getId() === misconceptionId) {
-                ctrl.misconceptionName = ctrl.misconceptions[i].getName();
+          ctrl.misconceptionsBySkill =
+            StateEditorService.getMisconceptionsBySkill();
+
+          var _getTaggedMisconceptionName = function(skillMisconceptionId) {
+            if (skillMisconceptionId !== null) {
+              if (typeof skillMisconceptionId === 'string' &&
+                  skillMisconceptionId.split('-').length === 2) {
+                var skillId = skillMisconceptionId.split('-')[0];
+                var misconceptionId = skillMisconceptionId.split('-')[1];
+                var misconceptions = ctrl.misconceptionsBySkill[skillId];
+
+                for (var i = 0; i < misconceptions.length; i++) {
+                  if (misconceptions[i].getId().toString() ===
+                    misconceptionId) {
+                    ctrl.misconceptionName = misconceptions[i].getName();
+                  }
+                }
+              } else {
+                throw Error('Expected skillMisconceptionId to be ' +
+                  '<skillId>-<misconceptionId>.');
               }
             }
           };
 
-          _getTaggedMisconceptionName(ctrl.getTaggedMisconceptionId());
+          _getTaggedMisconceptionName(ctrl.getTaggedSkillMisconceptionId());
 
           ctrl.isInQuestionMode = function() {
             return StateEditorService.isInQuestionMode();
           };
 
+          ctrl.containsMisconceptions = function() {
+            var containsMisconceptions = false;
+            Object.keys(ctrl.misconceptionsBySkill).forEach(function(skillId) {
+              if (ctrl.misconceptionsBySkill[skillId].length > 0) {
+                containsMisconceptions = true;
+              }
+            });
+            return containsMisconceptions;
+          };
+
           ctrl.tagAnswerGroupWithMisconception = function() {
             var modalInstance = $uibModal.open({
               templateUrl: UrlInterpolationService.getDirectiveTemplateUrl(
@@ -107,13 +130,16 @@ oppia.directive('answerGroupEditor', [
               controller: [
                 '$scope', '$uibModalInstance', 'StateEditorService',
                 function($scope, $uibModalInstance, StateEditorService) {
-                  $scope.misconceptions =
-                    StateEditorService.getMisconceptions();
+                  $scope.misconceptionsBySkill =
+                    StateEditorService.getMisconceptionsBySkill();
                   $scope.selectedMisconception = null;
+                  $scope.selectedMisconceptionSkillId = null;
                   $scope.misconceptionFeedbackIsUsed = false;
 
-                  $scope.selectMisconception = function(misconception) {
+                  $scope.selectMisconception = function(
+                      misconception, skillId) {
                     $scope.selectedMisconception = angular.copy(misconception);
+                    $scope.selectedMisconceptionSkillId = skillId;
                   };
 
                   $scope.toggleMisconceptionFeedbackUsage = function() {
@@ -124,6 +150,7 @@ oppia.directive('answerGroupEditor', [
                   $scope.done = function() {
                     $uibModalInstance.close({
                       misconception: $scope.selectedMisconception,
+                      misconceptionSkillId: $scope.selectedMisconceptionSkillId,
                       feedbackIsUsed: $scope.misconceptionFeedbackIsUsed
                     });
                   };
@@ -137,6 +164,7 @@ oppia.directive('answerGroupEditor', [
 
             modalInstance.result.then(function(returnObject) {
               var misconception = returnObject.misconception;
+              var misconceptionSkillId = returnObject.misconceptionSkillId;
               var feedbackIsUsed = returnObject.feedbackIsUsed;
               var outcome = angular.copy(ctrl.outcome);
               if (feedbackIsUsed) {
@@ -144,8 +172,10 @@ oppia.directive('answerGroupEditor', [
                 ctrl.getOnSaveAnswerGroupFeedbackFn()(outcome);
                 $rootScope.$broadcast('externalSave');
               }
-              ctrl.getOnSaveTaggedMisconception()(misconception.getId());
-              _getTaggedMisconceptionName(misconception.getId());
+              ctrl.getOnSaveTaggedMisconception()(
+                misconception.getId(), misconceptionSkillId);
+              _getTaggedMisconceptionName(
+                misconceptionSkillId + '-' + misconception.getId());
             });
           };
 
diff --git a/core/templates/dev/head/components/state-editor/state-editor-properties-services/state-editor.service.spec.ts b/core/templates/dev/head/components/state-editor/state-editor-properties-services/state-editor.service.spec.ts
index 77c651108228..8f79d5e185db 100644
--- a/core/templates/dev/head/components/state-editor/state-editor-properties-services/state-editor.service.spec.ts
+++ b/core/templates/dev/head/components/state-editor/state-editor-properties-services/state-editor.service.spec.ts
@@ -51,6 +51,16 @@ describe('Editor state service', function() {
       expect(ecs.getSolicitAnswerDetails()).toEqual(true);
     });
 
+    it('should correctly set and get misconceptionsBySkill', function() {
+      var misconceptionsBySkill = {
+        skillId1: [0],
+        skillId2: [1, 2]
+      };
+      expect(ecs.getMisconceptionsBySkill()).toEqual({});
+      ecs.setMisconceptionsBySkill(misconceptionsBySkill);
+      expect(ecs.getMisconceptionsBySkill()).toEqual(misconceptionsBySkill);
+    });
+
     it('should correctly return answer choices for interaction', function() {
       var customizationArgsForMultipleChoiceInput = {
         choices: {
diff --git a/core/templates/dev/head/components/state-editor/state-editor-properties-services/state-editor.service.ts b/core/templates/dev/head/components/state-editor/state-editor-properties-services/state-editor.service.ts
index 38e94641d841..1c7ac4e8d767 100644
--- a/core/templates/dev/head/components/state-editor/state-editor-properties-services/state-editor.service.ts
+++ b/core/templates/dev/head/components/state-editor/state-editor-properties-services/state-editor.service.ts
@@ -36,7 +36,7 @@ oppia.factory('StateEditorService', [
     // service, the given solutions would be automatically verified for the set
     // interaction.
     var interaction = null;
-    var misconceptions = [];
+    var misconceptionsBySkill = {};
     var explorationIsWhitelisted = false;
     var solicitAnswerDetails = null;
 
@@ -57,11 +57,11 @@ oppia.factory('StateEditorService', [
       updateExplorationWhitelistedStatus: function(value) {
         explorationIsWhitelisted = value;
       },
-      setMisconceptions: function(newMisconceptions) {
-        misconceptions = newMisconceptions;
+      setMisconceptionsBySkill: function(newMisconceptionsBySkill) {
+        misconceptionsBySkill = newMisconceptionsBySkill;
       },
-      getMisconceptions: function() {
-        return angular.copy(misconceptions);
+      getMisconceptionsBySkill: function() {
+        return misconceptionsBySkill;
       },
       setInteraction: function(newInteraction) {
         interaction = newInteraction;
diff --git a/core/templates/dev/head/components/state-editor/state-responses-editor/state-responses.directive.html b/core/templates/dev/head/components/state-editor/state-responses-editor/state-responses.directive.html
index 58a8019e4fed..fad8c74d7a84 100644
--- a/core/templates/dev/head/components/state-editor/state-responses-editor/state-responses.directive.html
+++ b/core/templates/dev/head/components/state-editor/state-responses-editor/state-responses.directive.html
@@ -44,7 +44,7 @@
                 <div class="oppia-rule-body-container protractor-test-response-body-<[$index]>">
                   <answer-group-editor rules="answerGroup.rules"
                                        outcome="answerGroup.outcome"
-                                       tagged-misconception-id="answerGroup.taggedMisconceptionId"
+                                       tagged-skill-misconception-id="answerGroup.taggedSkillMisconceptionId"
                                        on-save-answer-group-feedback="saveActiveAnswerGroupFeedback"
                                        on-save-answer-group-dest="saveActiveAnswerGroupDest"
                                        on-save-answer-group-correctness-label="saveActiveAnswerGroupCorrectnessLabel"
@@ -88,7 +88,7 @@
                 <div class="oppia-rule-body-container protractor-test-response-body-default">
                   <answer-group-editor rules="null"
                                        outcome="defaultOutcome"
-                                       tagged-misconception-id="null"
+                                       tagged-skill-misconception-id="null"
                                        on-save-answer-group-feedback="saveDefaultOutcomeFeedback"
                                        on-save-answer-group-dest="saveDefaultOutcomeDest"
                                        on-save-answer-group-correctness-label="saveDefaultOutcomeCorrectnessLabel"
diff --git a/core/templates/dev/head/components/state-editor/state-responses-editor/state-responses.directive.ts b/core/templates/dev/head/components/state-editor/state-responses-editor/state-responses.directive.ts
index 297a37723524..87ef81012c71 100644
--- a/core/templates/dev/head/components/state-editor/state-responses-editor/state-responses.directive.ts
+++ b/core/templates/dev/head/components/state-editor/state-responses-editor/state-responses.directive.ts
@@ -504,9 +504,9 @@ oppia.directive('stateResponses', [
             });
           };
 
-          $scope.saveTaggedMisconception = function(misconceptionId) {
+          $scope.saveTaggedMisconception = function(misconceptionId, skillId) {
             ResponsesService.updateActiveAnswerGroup({
-              taggedMisconceptionId: misconceptionId
+              taggedSkillMisconceptionId: skillId + '-' + misconceptionId
             }, function(newAnswerGroups) {
               $scope.onSaveInteractionAnswerGroups(newAnswerGroups);
               $scope.refreshWarnings()();
diff --git a/core/templates/dev/head/domain/exploration/AnswerGroupObjectFactory.ts b/core/templates/dev/head/domain/exploration/AnswerGroupObjectFactory.ts
index 7038b89cb645..1e87d7ad18f0 100644
--- a/core/templates/dev/head/domain/exploration/AnswerGroupObjectFactory.ts
+++ b/core/templates/dev/head/domain/exploration/AnswerGroupObjectFactory.ts
@@ -26,11 +26,11 @@ oppia.factory('AnswerGroupObjectFactory', [
   'OutcomeObjectFactory', 'RuleObjectFactory',
   function(OutcomeObjectFactory, RuleObjectFactory) {
     var AnswerGroup = function(
-        rules, outcome, trainingData, taggedMisconceptionId) {
+        rules, outcome, trainingData, taggedSkillMisconceptionId) {
       this.rules = rules;
       this.outcome = outcome;
       this.trainingData = trainingData;
-      this.taggedMisconceptionId = taggedMisconceptionId;
+      this.taggedSkillMisconceptionId = taggedSkillMisconceptionId;
     };
 
     AnswerGroup.prototype.toBackendDict = function() {
@@ -40,7 +40,7 @@ oppia.factory('AnswerGroupObjectFactory', [
         }),
         outcome: this.outcome.toBackendDict(),
         training_data: this.trainingData,
-        tagged_misconception_id: this.taggedMisconceptionId
+        tagged_skill_misconception_id: this.taggedSkillMisconceptionId
       };
     };
 
@@ -50,9 +50,9 @@ oppia.factory('AnswerGroupObjectFactory', [
     /* eslint-disable dot-notation */
     AnswerGroup['createNew'] = function(
     /* eslint-enable dot-notation */
-        rules, outcome, trainingData, taggedMisconceptionId) {
+        rules, outcome, trainingData, taggedSkillMisconceptionId) {
       return new AnswerGroup(
-        rules, outcome, trainingData, taggedMisconceptionId);
+        rules, outcome, trainingData, taggedSkillMisconceptionId);
     };
 
     // TODO(ankita240796): Remove the bracket notation once Angular2 gets in.
@@ -64,7 +64,7 @@ oppia.factory('AnswerGroupObjectFactory', [
         OutcomeObjectFactory.createFromBackendDict(
           answerGroupBackendDict.outcome),
         answerGroupBackendDict.training_data,
-        answerGroupBackendDict.tagged_misconception_id);
+        answerGroupBackendDict.tagged_skill_misconception_id);
     };
 
     var generateRulesFromBackend = function(ruleBackendDicts) {
diff --git a/core/templates/dev/head/domain/exploration/InteractionObjectFactorySpec.ts b/core/templates/dev/head/domain/exploration/InteractionObjectFactorySpec.ts
index 2745801c1d20..e4c863deff36 100644
--- a/core/templates/dev/head/domain/exploration/InteractionObjectFactorySpec.ts
+++ b/core/templates/dev/head/domain/exploration/InteractionObjectFactorySpec.ts
@@ -76,7 +76,7 @@ describe('Interaction object factory', function() {
         missing_prerequisite_skill_id: null
       },
       training_data: ['training_data'],
-      tagged_misconception_id: 1
+      tagged_skill_misconception_id: 'skill_id-1'
     }];
     hintsDict = [
       {
@@ -140,7 +140,7 @@ describe('Interaction object factory', function() {
         missing_prerequisite_skill_id: null
       },
       training_data: ['training_data'],
-      tagged_misconception_id: 1
+      tagged_skill_misconception_id: 'skill_id-1'
     };
     expect(testInteraction.answerGroups).toEqual([agof.createFromBackendDict({
       rule_specs: [],
@@ -156,7 +156,7 @@ describe('Interaction object factory', function() {
         missing_prerequisite_skill_id: null
       },
       training_data: ['training_data'],
-      tagged_misconception_id: 1
+      tagged_skill_misconception_id: 'skill_id-1'
     })]);
     newAnswerGroup = agof.createFromBackendDict(newAnswerGroup);
     testInteraction.setAnswerGroups([newAnswerGroup]);
@@ -260,7 +260,7 @@ describe('Interaction object factory', function() {
         missing_prerequisite_skill_id: null
       },
       training_data: ['training_data_new'],
-      tagged_misconception_id: 2
+      tagged_skill_misconception_id: 'skill_id-2'
     }];
     var newDefaultOutcome = {
       dest: 'dest_default_new',
diff --git a/core/templates/dev/head/domain/question/QuestionObjectFactory.ts b/core/templates/dev/head/domain/question/QuestionObjectFactory.ts
index 87f1a1f31d30..57384f0e4654 100644
--- a/core/templates/dev/head/domain/question/QuestionObjectFactory.ts
+++ b/core/templates/dev/head/domain/question/QuestionObjectFactory.ts
@@ -76,7 +76,7 @@ oppia.factory('QuestionObjectFactory', [
         constants.DEFAULT_LANGUAGE_CODE, 1, skillIds);
     };
 
-    Question.prototype.validate = function(misconceptions) {
+    Question.prototype.validate = function(misconceptionsBySkill) {
       var interaction = this._stateData.interaction;
       if (interaction.id === null) {
         return 'An interaction must be specified';
@@ -90,26 +90,33 @@ oppia.factory('QuestionObjectFactory', [
         return 'A solution must be specified';
       }
       var answerGroups = this._stateData.interaction.answerGroups;
-      var taggedMisconceptionIds = {};
+      var taggedSkillMisconceptionIds = {};
       var atLeastOneAnswerCorrect = false;
       for (var i = 0; i < answerGroups.length; i++) {
         if (answerGroups[i].outcome.labelledAsCorrect) {
           atLeastOneAnswerCorrect = true;
           continue;
         }
-        if (answerGroups[i].taggedMisconceptionId !== null) {
-          taggedMisconceptionIds[answerGroups[i].taggedMisconceptionId] = true;
+        if (answerGroups[i].taggedSkillMisconceptionId !== null) {
+          taggedSkillMisconceptionIds[
+            answerGroups[i].taggedSkillMisconceptionId] = true;
         }
       }
       if (!atLeastOneAnswerCorrect) {
         return 'At least one answer should be marked correct';
       }
       var pendingMisconceptionNamesToTag = [];
-      for (var i = 0; i < misconceptions.length; i++) {
-        if (!taggedMisconceptionIds[misconceptions[i].getId()]) {
-          pendingMisconceptionNamesToTag.push(misconceptions[i].getName());
+      Object.keys(misconceptionsBySkill).forEach(function(skillId) {
+        for (var i = 0; i < misconceptionsBySkill[skillId].length; i++) {
+          var skillMisconceptionId =
+            skillId + '-' + misconceptionsBySkill[skillId][i].getId();
+          if (
+            !taggedSkillMisconceptionIds.hasOwnProperty(skillMisconceptionId)) {
+            pendingMisconceptionNamesToTag.push(
+              misconceptionsBySkill[skillId][i].getName());
+          }
         }
-      }
+      });
       if (pendingMisconceptionNamesToTag.length > 0) {
         var returnString =
           'The following misconceptions should also be caught:';
diff --git a/core/templates/dev/head/domain/question/QuestionObjectFactorySpec.ts b/core/templates/dev/head/domain/question/QuestionObjectFactorySpec.ts
index f09d16a5d692..19181c6132c5 100644
--- a/core/templates/dev/head/domain/question/QuestionObjectFactorySpec.ts
+++ b/core/templates/dev/head/domain/question/QuestionObjectFactorySpec.ts
@@ -166,12 +166,18 @@ describe('Question object factory', function() {
       'id', 'name', 'notes', 'feedback');
     var misconception2 = MisconceptionObjectFactory.create(
       'id_2', 'name_2', 'notes', 'feedback');
+    var misconception3 = MisconceptionObjectFactory.create(
+      'id_3', 'name_3', 'notes', 'feedback');
+    var misconceptionsDict = {
+      skillId1: [misconception1],
+      skillId2: [misconception2, misconception3]
+    };
     expect(
-      _sampleQuestion.validate([misconception1, misconception2])).toEqual(
-      'The following misconceptions should also be caught: name, name_2.' +
-      ' Click on (or create) an answer that is neither marked correct nor ' +
-      'is a default answer (marked above as [All other answers]) to tag a ' +
-      'misconception to that answer group.');
+      _sampleQuestion.validate(misconceptionsDict)).toEqual(
+      'The following misconceptions should also be caught: name, name_2, ' +
+      'name_3. Click on (or create) an answer that is neither marked correct ' +
+      'nor is a default answer (marked above as [All other answers]) to tag ' +
+      'a misconception to that answer group.');
 
     interaction.answerGroups[0].outcome.labelledAsCorrect = false;
     expect(_sampleQuestion.validate([])).toEqual(
diff --git a/core/templates/dev/head/pages/exploration-editor-page/editor-tab/services/responses.service.ts b/core/templates/dev/head/pages/exploration-editor-page/editor-tab/services/responses.service.ts
index b6be21ba5b19..4f033b270ce0 100644
--- a/core/templates/dev/head/pages/exploration-editor-page/editor-tab/services/responses.service.ts
+++ b/core/templates/dev/head/pages/exploration-editor-page/editor-tab/services/responses.service.ts
@@ -126,8 +126,9 @@ oppia.factory('ResponsesService', [
       if (updates.hasOwnProperty('rules')) {
         answerGroup.rules = updates.rules;
       }
-      if (updates.hasOwnProperty('taggedMisconceptionId')) {
-        answerGroup.taggedMisconceptionId = updates.taggedMisconceptionId;
+      if (updates.hasOwnProperty('taggedSkillMisconceptionId')) {
+        answerGroup.taggedSkillMisconceptionId =
+          updates.taggedSkillMisconceptionId;
       }
       if (updates.hasOwnProperty('feedback')) {
         answerGroup.outcome.feedback = updates.feedback;
diff --git a/core/templates/dev/head/pages/exploration-editor-page/editor-tab/training-panel/training-data.service.spec.ts b/core/templates/dev/head/pages/exploration-editor-page/editor-tab/training-panel/training-data.service.spec.ts
index 0e38243fb15b..7e4209fd5de7 100644
--- a/core/templates/dev/head/pages/exploration-editor-page/editor-tab/training-panel/training-data.service.spec.ts
+++ b/core/templates/dev/head/pages/exploration-editor-page/editor-tab/training-panel/training-data.service.spec.ts
@@ -134,7 +134,7 @@ describe('TrainingDataService', function() {
               missing_prerequisite_skill_id: null
             },
             training_data: [],
-            tagged_misconception_id: null
+            tagged_skill_misconception_id: null
           }],
           default_outcome: {
             dest: 'State',
diff --git a/core/templates/dev/head/pages/exploration-editor-page/translation-tab/services/translation-status.service.spec.ts b/core/templates/dev/head/pages/exploration-editor-page/translation-tab/services/translation-status.service.spec.ts
index f944c4c7fe1c..0fff9c759165 100644
--- a/core/templates/dev/head/pages/exploration-editor-page/translation-tab/services/translation-status.service.spec.ts
+++ b/core/templates/dev/head/pages/exploration-editor-page/translation-tab/services/translation-status.service.spec.ts
@@ -144,7 +144,7 @@ describe('Translation status service', function() {
           },
           interaction: {
             answer_groups: [{
-              tagged_misconception_id: null,
+              tagged_skill_misconception_id: null,
               outcome: {
                 refresher_exploration_id: null,
                 param_changes: [],
@@ -165,7 +165,7 @@ describe('Translation status service', function() {
               training_data: []
             },
             {
-              tagged_misconception_id: null,
+              tagged_skill_misconception_id: null,
               outcome: {
                 refresher_exploration_id: null,
                 param_changes: [],
@@ -231,7 +231,7 @@ describe('Translation status service', function() {
           },
           interaction: {
             answer_groups: [{
-              tagged_misconception_id: null,
+              tagged_skill_misconception_id: null,
               outcome: {
                 refresher_exploration_id: null,
                 param_changes: [],
diff --git a/core/templates/dev/head/pages/topic-editor-page/modal-templates/tag-misconception-modal.template.html b/core/templates/dev/head/pages/topic-editor-page/modal-templates/tag-misconception-modal.template.html
index 66ebd215b8a9..827f52cd411b 100644
--- a/core/templates/dev/head/pages/topic-editor-page/modal-templates/tag-misconception-modal.template.html
+++ b/core/templates/dev/head/pages/topic-editor-page/modal-templates/tag-misconception-modal.template.html
@@ -5,17 +5,19 @@ <h3>
 </div>
 <div class="modal-body new-subtopic-title-editor">
   Selected Misconception: <[selectedMisconception.getName()]>
-  <div ng-repeat="misconception in misconceptions track by $index">
-    <button class="btn btn-default" style="width: 100%" ng-click="selectMisconception(misconception)">
-      <[misconception.getName()]>
-    </button>
-    <div ng-if="selectedMisconception.getId() === misconception.getId()">
-      <label class="misconception-label"> Note to creators: </label>
-      <angular-html-bind html-data="misconception.getNotes()">
-      </angular-html-bind>
-      <label class="misconception-label"> Misconception Feedback: </label>
-      <angular-html-bind html-data="misconception.getFeedback()">
-      </angular-html-bind>
+  <div ng-repeat="(skillId, misconceptions) in misconceptionsBySkill">
+    <div ng-repeat="misconception in misconceptions">
+      <button class="btn btn-default" style="width: 100%" ng-click="selectMisconception(misconception, skillId)">
+        <[misconception.getName()]>
+      </button>
+      <div ng-if="selectedMisconceptionSkillId === skillId && selectedMisconception.getId() === misconception.getId()">
+        <label class="misconception-label"> Note to creators: </label>
+        <angular-html-bind html-data="misconception.getNotes()">
+        </angular-html-bind>
+        <label class="misconception-label"> Misconception Feedback: </label>
+        <angular-html-bind html-data="misconception.getFeedback()">
+        </angular-html-bind>
+      </div>
     </div>
   </div>
   <span ng-click="toggleMisconceptionFeedbackUsage()" aria-hidden="true">
diff --git a/core/tests/data/oppia-ThetitleforZIPdownloadhandlertest!-v2-gold.zip b/core/tests/data/oppia-ThetitleforZIPdownloadhandlertest!-v2-gold.zip
index a43275f03fb9..f5e38a687532 100644
Binary files a/core/tests/data/oppia-ThetitleforZIPdownloadhandlertest!-v2-gold.zip and b/core/tests/data/oppia-ThetitleforZIPdownloadhandlertest!-v2-gold.zip differ
diff --git a/core/tests/protractor_desktop/explorationHistoryTab.js b/core/tests/protractor_desktop/explorationHistoryTab.js
index dd0ad23f3372..7e4bfa23c6f4 100644
--- a/core/tests/protractor_desktop/explorationHistoryTab.js
+++ b/core/tests/protractor_desktop/explorationHistoryTab.js
@@ -149,7 +149,7 @@ describe('Exploration history', function() {
         highlighted: true
       },
       20: {
-        text: '    tagged_misconception_id: null',
+        text: '    tagged_skill_misconception_id: null',
         highlighted: true
       },
       21: {
diff --git a/feconf.py b/feconf.py
index 78421ef089e9..6cc2c630b899 100644
--- a/feconf.py
+++ b/feconf.py
@@ -169,7 +169,7 @@
 # incompatible changes are made to the states blob schema in the data store,
 # this version number must be changed and the exploration migration job
 # executed.
-CURRENT_STATE_SCHEMA_VERSION = 29
+CURRENT_STATE_SCHEMA_VERSION = 30
 
 # The current version of the all collection blob schemas (such as the nodes
 # structure within the Collection domain object). If any backward-incompatible