Python / Cleanup: rename INFO_MT to TOPBAR_MT to reflect actual location.

52 files changed, 207 insertions, 207 deletions

diff --git a/add_advanced_objects_menu/__init__.py b/add_advanced_objects_menu/__init__.py
index e0388bf7..32bbbd7f 100644
--- a/add_advanced_objects_menu/__init__.py
+++ b/add_advanced_objects_menu/__init__.py
@@ -92,8 +92,8 @@ from bpy.props import (
 
 
 # Define the "Scenes" menu
-class INFO_MT_scene_elements_add(Menu):
-    bl_idname = "INFO_MT_scene_elements"
+class VIEW3D_MT_scene_elements_add(Menu):
+    bl_idname = "VIEW3D_MT_scene_elements"
     bl_label = "Test Scenes"
 
     def draw(self, context):
@@ -108,8 +108,8 @@ class INFO_MT_scene_elements_add(Menu):
 
 
 # Define the "Lights" menu
-class INFO_MT_mesh_lights_add(Menu):
-    bl_idname = "INFO_MT_scene_lights"
+class VIEW3D_MT_mesh_lights_add(Menu):
+    bl_idname = "VIEW3D_MT_scene_lights"
     bl_label = "Lighting Sets"
 
     def draw(self, context):
@@ -122,8 +122,8 @@ class INFO_MT_mesh_lights_add(Menu):
 
 
 # Define the "Chains" menu
-class INFO_MT_mesh_chain_add(Menu):
-    bl_idname = "INFO_MT_mesh_chain"
+class VIEW3D_MT_mesh_chain_add(Menu):
+    bl_idname = "VIEW3D_MT_mesh_chain"
     bl_label = "Chains"
 
     def draw(self, context):
@@ -134,15 +134,15 @@ class INFO_MT_mesh_chain_add(Menu):
 
 
 # Define the "Array" Menu
-class INFO_MT_array_mods_add(Menu):
-    bl_idname = "INFO_MT_array_mods"
+class VIEW3D_MT_array_mods_add(Menu):
+    bl_idname = "VIEW3D_MT_array_mods"
     bl_label = "Array Mods"
 
     def draw(self, context):
         layout = self.layout
         layout.operator_context = 'INVOKE_REGION_WIN'
 
-        layout.menu("INFO_MT_mesh_chain", icon="LINKED")
+        layout.menu("VIEW3D_MT_mesh_chain", icon="LINKED")
 
         layout.operator("objects.circle_array_operator",
                         text="Circle Array", icon="MOD_ARRAY")
@@ -153,8 +153,8 @@ class INFO_MT_array_mods_add(Menu):
 
 
 # Define the "Blocks" Menu
-class INFO_MT_quick_blocks_add(Menu):
-    bl_idname = "INFO_MT_quick_tools"
+class VIEW3D_MT_quick_blocks_add(Menu):
+    bl_idname = "VIEW3D_MT_quick_tools"
     bl_label = "Block Tools"
 
     def draw(self, context):
@@ -171,8 +171,8 @@ class INFO_MT_quick_blocks_add(Menu):
 
 
 # Define the "Phsysics Tools" Menu
-class INFO_MT_Physics_tools_add(Menu):
-    bl_idname = "INFO_MT_physics_tools"
+class VIEW3D_MT_Physics_tools_add(Menu):
+    bl_idname = "VIEW3D_MT_physics_tools"
     bl_label = "Physics Tools"
 
     def draw(self, context):
@@ -190,12 +190,12 @@ def menu(self, context):
     layout = self.layout
     layout.operator_context = 'INVOKE_REGION_WIN'
     self.layout.separator()
-    self.layout.menu("INFO_MT_scene_elements", icon="SCENE_DATA")
-    self.layout.menu("INFO_MT_scene_lights", icon="LIGHT_SPOT")
+    self.layout.menu("VIEW3D_MT_scene_elements", icon="SCENE_DATA")
+    self.layout.menu("VIEW3D_MT_scene_lights", icon="LIGHT_SPOT")
     self.layout.separator()
-    self.layout.menu("INFO_MT_array_mods", icon="MOD_ARRAY")
-    self.layout.menu("INFO_MT_quick_tools", icon="MOD_BUILD")
-    self.layout.menu("INFO_MT_physics_tools", icon="PHYSICS")
+    self.layout.menu("VIEW3D_MT_array_mods", icon="MOD_ARRAY")
+    self.layout.menu("VIEW3D_MT_quick_tools", icon="MOD_BUILD")
+    self.layout.menu("VIEW3D_MT_physics_tools", icon="PHYSICS")
 
 
 # Addons Preferences
@@ -524,7 +524,7 @@ def register():
     )
 
     # Add "Extras" menu to the "Add" menu
-    bpy.types.INFO_MT_add.append(menu)
+    bpy.types.VIEW3D_MT_add.append(menu)
     try:
         bpy.types.VIEW3D_MT_AddMenu.append(menu)
     except:
@@ -533,7 +533,7 @@ def register():
 
 def unregister():
     # Remove "Extras" menu from the "Add" menu.
-    bpy.types.INFO_MT_add.remove(menu)
+    bpy.types.VIEW3D_MT_add.remove(menu)
     try:
         bpy.types.VIEW3D_MT_AddMenu.remove(menu)
     except:
diff --git a/add_curve_extra_objects/__init__.py b/add_curve_extra_objects/__init__.py
index 42ae2d44..5c093af4 100644
--- a/add_curve_extra_objects/__init__.py
+++ b/add_curve_extra_objects/__init__.py
@@ -225,9 +225,9 @@ class CurveExtraObjectsAddonPreferences(AddonPreferences):
                      icon="LAYER_USED")
 
 
-class INFO_MT_curve_knots_add(Menu):
+class VIEW3D_MT_curve_knots_add(Menu):
     # Define the "Extras" menu
-    bl_idname = "INFO_MT_curve_knots_add"
+    bl_idname = "VIEW3D_MT_curve_knots_add"
     bl_label = "Plants"
 
     def draw(self, context):
@@ -253,7 +253,7 @@ def menu_func(self, context):
                               icon='CURVE_DATA')
     layout.separator()
 
-    layout.menu(INFO_MT_curve_knots_add.bl_idname, text="Knots", icon='CURVE_DATA')
+    layout.menu(VIEW3D_MT_curve_knots_add.bl_idname, text="Knots", icon='CURVE_DATA')
     layout.separator()
     layout.operator("curve.curlycurve", text="Curly Curve",
                     icon='CURVE_DATA')
@@ -282,17 +282,17 @@ def register():
     bpy.utils.register_module(__name__)
 
     # Add "Extras" menu to the "Add Curve" menu
-    bpy.types.INFO_MT_curve_add.append(menu_func)
+    bpy.types.VIEW3D_MT_curve_add.append(menu_func)
     # Add "Extras" menu to the "Add Surface" menu
-    bpy.types.INFO_MT_surface_add.append(menu_surface)
+    bpy.types.VIEW3D_MT_surface_add.append(menu_surface)
 
 
 def unregister():
     add_curve_simple.unregister()
     # Remove "Extras" menu from the "Add Curve" menu.
-    bpy.types.INFO_MT_curve_add.remove(menu_func)
+    bpy.types.VIEW3D_MT_curve_add.remove(menu_func)
     # Remove "Extras" menu from the "Add Surface" menu.
-    bpy.types.INFO_MT_surface_add.remove(menu_surface)
+    bpy.types.VIEW3D_MT_surface_add.remove(menu_surface)
 
     bpy.utils.unregister_module(__name__)
 
diff --git a/add_curve_extra_objects/add_curve_curly.py b/add_curve_extra_objects/add_curve_curly.py
index 779689a9..d3950787 100644
--- a/add_curve_extra_objects/add_curve_curly.py
+++ b/add_curve_extra_objects/add_curve_curly.py
@@ -479,12 +479,12 @@ def add_curlycurve_button(self, context):
 
 def register():
     bpy.utils.register_class(add_curlycurve)
-    bpy.types.INFO_MT_curve_add.append(add_curlycurve_button)
+    bpy.types.VIEW3D_MT_curve_add.append(add_curlycurve_button)
 
 
 def unregister():
     bpy.utils.unregister_class(add_curlycurve)
-    bpy.types.INFO_MT_curve_add.remove(add_curlycurve_button)
+    bpy.types.VIEW3D_MT_curve_add.remove(add_curlycurve_button)
 
 
 if __name__ == "__main__":
diff --git a/add_curve_extra_objects/add_curve_simple.py b/add_curve_extra_objects/add_curve_simple.py
index c6908ce9..697e9d97 100644
--- a/add_curve_extra_objects/add_curve_simple.py
+++ b/add_curve_extra_objects/add_curve_simple.py
@@ -1645,8 +1645,8 @@ class SimpleVariables(PropertyGroup):
             )
 
 
-class INFO_MT_simple_menu(Menu):
-    bl_idname = "INFO_MT_simple_menu"
+class VIEW3D_MT_simple_menu(Menu):
+    bl_idname = "VIEW3D_MT_simple_menu"
     bl_label = "2D Objects"
 
     def draw(self, context):
@@ -1714,7 +1714,7 @@ class INFO_MT_simple_menu(Menu):
 def Simple_button(self, context):
     layout = self.layout
     layout.separator()
-    self.layout.menu("INFO_MT_simple_menu", icon="MOD_CURVE")
+    self.layout.menu("VIEW3D_MT_simple_menu", icon="MOD_CURVE")
 
 
 def register():
@@ -1723,10 +1723,10 @@ def register():
     bpy.utils.register_class(BezierDivide)
     bpy.utils.register_class(SimplePanel)
     bpy.utils.register_class(SimpleEdit)
-    bpy.utils.register_class(INFO_MT_simple_menu)
+    bpy.utils.register_class(VIEW3D_MT_simple_menu)
     bpy.utils.register_class(SimpleVariables)
 
-    bpy.types.INFO_MT_curve_add.append(Simple_button)
+    bpy.types.VIEW3D_MT_curve_add.append(Simple_button)
 
     bpy.types.Object.s_curve = PointerProperty(type=SimpleVariables)
 
@@ -1737,10 +1737,10 @@ def unregister():
     bpy.utils.unregister_class(BezierDivide)
     bpy.utils.unregister_class(SimplePanel)
     bpy.utils.unregister_class(SimpleEdit)
-    bpy.utils.unregister_class(INFO_MT_simple_menu)
+    bpy.utils.unregister_class(VIEW3D_MT_simple_menu)
     bpy.utils.unregister_class(SimpleVariables)
 
-    bpy.types.INFO_MT_curve_add.remove(Simple_button)
+    bpy.types.VIEW3D_MT_curve_add.remove(Simple_button)
     del bpy.types.Object.s_curve
 
 
diff --git a/add_curve_sapling/__init__.py b/add_curve_sapling/__init__.py
index 274c1fef..15cd7291 100644
--- a/add_curve_sapling/__init__.py
+++ b/add_curve_sapling/__init__.py
@@ -1126,13 +1126,13 @@ def menu_func(self, context):
 def register():
     bpy.utils.register_module(__name__)
 
-    bpy.types.INFO_MT_curve_add.append(menu_func)
+    bpy.types.VIEW3D_MT_curve_add.append(menu_func)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
-    bpy.types.INFO_MT_curve_add.remove(menu_func)
+    bpy.types.VIEW3D_MT_curve_add.remove(menu_func)
 
 
 if __name__ == "__main__":
diff --git a/add_mesh_BoltFactory/__init__.py b/add_mesh_BoltFactory/__init__.py
index 46d250de..d441a0e8 100644
--- a/add_mesh_BoltFactory/__init__.py
+++ b/add_mesh_BoltFactory/__init__.py
@@ -49,14 +49,14 @@ def add_mesh_bolt_button(self, context):
 def register():
     bpy.utils.register_module(__name__)
 
-    bpy.types.INFO_MT_mesh_add.append(add_mesh_bolt_button)
+    bpy.types.VIEW3D_MT_mesh_add.append(add_mesh_bolt_button)
     # bpy.types.VIEW3D_PT_tools_objectmode.prepend(add_mesh_bolt_button)  # just for testing
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
-    bpy.types.INFO_MT_mesh_add.remove(add_mesh_bolt_button)
+    bpy.types.VIEW3D_MT_mesh_add.remove(add_mesh_bolt_button)
     # bpy.types.VIEW3D_PT_tools_objectmode.remove(add_mesh_bolt_button)  # just for testing
 
 
diff --git a/add_mesh_extra_objects/__init__.py b/add_mesh_extra_objects/__init__.py
index ecc023df..1197738c 100644
--- a/add_mesh_extra_objects/__init__.py
+++ b/add_mesh_extra_objects/__init__.py
@@ -107,9 +107,9 @@ from bpy.props import (
                 )
 
 
-class INFO_MT_mesh_vert_add(Menu):
+class VIEW3D_MT_mesh_vert_add(Menu):
     # Define the "Single Vert" menu
-    bl_idname = "INFO_MT_mesh_vert_add"
+    bl_idname = "VIEW3D_MT_mesh_vert_add"
     bl_label = "Single Vert"
 
     def draw(self, context):
@@ -126,9 +126,9 @@ class INFO_MT_mesh_vert_add(Menu):
                         text="Object Origin Mirrored")
 
 
-class INFO_MT_mesh_gears_add(Menu):
+class VIEW3D_MT_mesh_gears_add(Menu):
     # Define the "Gears" menu
-    bl_idname = "INFO_MT_mesh_gears_add"
+    bl_idname = "VIEW3D_MT_mesh_gears_add"
     bl_label = "Gears"
 
     def draw(self, context):
@@ -140,9 +140,9 @@ class INFO_MT_mesh_gears_add(Menu):
                         text="Worm")
 
 
-class INFO_MT_mesh_diamonds_add(Menu):
+class VIEW3D_MT_mesh_diamonds_add(Menu):
     # Define the "Diamonds" menu
-    bl_idname = "INFO_MT_mesh_diamonds_add"
+    bl_idname = "VIEW3D_MT_mesh_diamonds_add"
     bl_label = "Diamonds"
 
     def draw(self, context):
@@ -156,9 +156,9 @@ class INFO_MT_mesh_diamonds_add(Menu):
                         text="Gem")
 
 
-class INFO_MT_mesh_math_add(Menu):
+class VIEW3D_MT_mesh_math_add(Menu):
     # Define the "Math Function" menu
-    bl_idname = "INFO_MT_mesh_math_add"
+    bl_idname = "VIEW3D_MT_mesh_math_add"
     bl_label = "Math Functions"
 
     def draw(self, context):
@@ -172,29 +172,29 @@ class INFO_MT_mesh_math_add(Menu):
         self.layout.operator("mesh.make_triangle", icon="MESH_DATA")
 
 
-class INFO_MT_mesh_mech(Menu):
+class VIEW3D_MT_mesh_mech(Menu):
     # Define the "Math Function" menu
-    bl_idname = "INFO_MT_mesh_mech_add"
+    bl_idname = "VIEW3D_MT_mesh_mech_add"
     bl_label = "Mechanical"
 
     def draw(self, context):
         layout = self.layout
         layout.operator_context = 'INVOKE_REGION_WIN'
-        layout.menu("INFO_MT_mesh_pipe_joints_add",
+        layout.menu("VIEW3D_MT_mesh_pipe_joints_add",
                 text="Pipe Joints", icon="SNAP_PEEL_OBJECT")
-        layout.menu("INFO_MT_mesh_gears_add",
+        layout.menu("VIEW3D_MT_mesh_gears_add",
                 text="Gears", icon="SCRIPTWIN")
 
 
-class INFO_MT_mesh_extras_add(Menu):
+class VIEW3D_MT_mesh_extras_add(Menu):
     # Define the "Extra Objects" menu
-    bl_idname = "INFO_MT_mesh_extras_add"
+    bl_idname = "VIEW3D_MT_mesh_extras_add"
     bl_label = "Extras"
 
     def draw(self, context):
         layout = self.layout
         layout.operator_context = 'INVOKE_REGION_WIN'
-        layout.menu("INFO_MT_mesh_diamonds_add", text="Diamonds",
+        layout.menu("VIEW3D_MT_mesh_diamonds_add", text="Diamonds",
                     icon="PMARKER_SEL")
         layout.separator()
         layout.operator("mesh.add_beam",
@@ -214,9 +214,9 @@ class INFO_MT_mesh_extras_add(Menu):
                         text="Menger Sponge")
 
 
-class INFO_MT_mesh_torus_add(Menu):
+class VIEW3D_MT_mesh_torus_add(Menu):
     # Define the "Torus Objects" menu
-    bl_idname = "INFO_MT_mesh_torus_add"
+    bl_idname = "VIEW3D_MT_mesh_torus_add"
     bl_label = "Torus Objects"
 
     def draw(self, context):
@@ -230,9 +230,9 @@ class INFO_MT_mesh_torus_add(Menu):
                         text="Torus Knot")
 
 
-class INFO_MT_mesh_pipe_joints_add(Menu):
+class VIEW3D_MT_mesh_pipe_joints_add(Menu):
     # Define the "Pipe Joints" menu
-    bl_idname = "INFO_MT_mesh_pipe_joints_add"
+    bl_idname = "VIEW3D_MT_mesh_pipe_joints_add"
     bl_label = "Pipe Joints"
 
     def draw(self, context):
@@ -355,15 +355,15 @@ def menu_func(self, context):
     lay_out.operator_context = 'INVOKE_REGION_WIN'
 
     lay_out.separator()
-    lay_out.menu("INFO_MT_mesh_vert_add",
+    lay_out.menu("VIEW3D_MT_mesh_vert_add",
                 text="Single Vert", icon="LAYER_ACTIVE")
     lay_out.operator("mesh.primitive_round_cube_add",
                     text="Round Cube", icon="MOD_SUBSURF")
-    lay_out.menu("INFO_MT_mesh_math_add",
+    lay_out.menu("VIEW3D_MT_mesh_math_add",
                 text="Math Function", icon="PACKAGE")
-    lay_out.menu("INFO_MT_mesh_mech_add",
+    lay_out.menu("VIEW3D_MT_mesh_mech_add",
                 text="Mechanical", icon="SCRIPTWIN")
-    lay_out.menu("INFO_MT_mesh_torus_add",
+    lay_out.menu("VIEW3D_MT_mesh_torus_add",
                 text="Torus Objects", icon="MESH_TORUS")
     lay_out.separator()
     lay_out.operator("mesh.generate_geodesic_dome",
@@ -371,7 +371,7 @@ def menu_func(self, context):
     lay_out.operator("discombobulate.ops",
                     text="Discombobulator", icon="RETOPO")
     lay_out.separator()
-    lay_out.menu("INFO_MT_mesh_extras_add",
+    lay_out.menu("VIEW3D_MT_mesh_extras_add",
                 text="Extras", icon="MESH_DATA")
     lay_out.separator()
     lay_out.operator("object.parent_to_empty",
@@ -402,12 +402,12 @@ def register():
                                         )
 
     # Add "Extras" menu to the "Add Mesh" menu
-    bpy.types.INFO_MT_mesh_add.append(menu_func)
+    bpy.types.VIEW3D_MT_mesh_add.append(menu_func)
 
 
 def unregister():
     # Remove "Extras" menu from the "Add Mesh" menu.
-    bpy.types.INFO_MT_mesh_add.remove(menu_func)
+    bpy.types.VIEW3D_MT_mesh_add.remove(menu_func)
 
     del bpy.types.Scene.discomb
     del bpy.types.Scene.error_message
diff --git a/ant_landscape/__init__.py b/ant_landscape/__init__.py
index ba6e8b6f..448993d0 100644
--- a/ant_landscape/__init__.py
+++ b/ant_landscape/__init__.py
@@ -938,14 +938,14 @@ class AntLandscapePropertiesGroup(bpy.types.PropertyGroup):
 
 def register():
     bpy.utils.register_module(__name__)
-    bpy.types.INFO_MT_mesh_add.append(menu_func_landscape)
+    bpy.types.VIEW3D_MT_mesh_add.append(menu_func_landscape)
     bpy.types.Object.ant_landscape = PointerProperty(type=AntLandscapePropertiesGroup, name="ANT_Landscape", description="Landscape properties")
     bpy.types.VIEW3D_MT_paint_weight.append(menu_func_eroder)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
-    bpy.types.INFO_MT_mesh_add.remove(menu_func_landscape)
+    bpy.types.VIEW3D_MT_mesh_add.remove(menu_func_landscape)
     bpy.types.VIEW3D_MT_paint_weight.remove(menu_func_eroder)
 
 
diff --git a/archimesh/__init__.py b/archimesh/__init__.py
index b1a70a3a..07049ff2 100644
--- a/archimesh/__init__.py
+++ b/archimesh/__init__.py
@@ -92,7 +92,7 @@ from bpy.types import (
         AddonPreferences,
         Menu,
         Scene,
-        INFO_MT_mesh_add,
+        VIEW3D_MT_mesh_add,
         WindowManager,
         )
 
@@ -102,7 +102,7 @@ from bpy.types import (
 
 
 class AchmInfoMtMeshDecorationAdd(Menu):
-    bl_idname = "INFO_MT_mesh_decoration_add"
+    bl_idname = "VIEW3D_MT_mesh_decoration_add"
     bl_label = "Decoration assets"
 
     # noinspection PyUnusedLocal
@@ -119,7 +119,7 @@ class AchmInfoMtMeshDecorationAdd(Menu):
 
 
 class AchmInfoMtMeshCustomMenuAdd(Menu):
-    bl_idname = "INFO_MT_mesh_custom_menu_add"
+    bl_idname = "VIEW3D_MT_mesh_custom_menu_add"
     bl_label = "Archimesh"
 
     # noinspection PyUnusedLocal
@@ -134,7 +134,7 @@ class AchmInfoMtMeshCustomMenuAdd(Menu):
         self.layout.operator("mesh.archimesh_column", text="Add Column")
         self.layout.operator("mesh.archimesh_stairs", text="Add Stairs")
         self.layout.operator("mesh.archimesh_roof", text="Add Roof")
-        self.layout.menu("INFO_MT_mesh_decoration_add", text="Decoration props", icon="GROUP")
+        self.layout.menu("VIEW3D_MT_mesh_decoration_add", text="Decoration props", icon="GROUP")
 
 # --------------------------------------------------------------
 # Register all operators and panels
@@ -189,7 +189,7 @@ class Archi_Pref(AddonPreferences):
 # Define menu
 # noinspection PyUnusedLocal
 def AchmMenu_func(self, context):
-    self.layout.menu("INFO_MT_mesh_custom_menu_add", icon="GROUP")
+    self.layout.menu("VIEW3D_MT_mesh_custom_menu_add", icon="GROUP")
 
 
 def register():
@@ -222,7 +222,7 @@ def register():
     bpy.utils.register_class(achm_window_panel.AchmWinPanel)
     bpy.utils.register_class(achm_window_panel.AchmWindowEditPanel)
     bpy.utils.register_class(Archi_Pref)
-    INFO_MT_mesh_add.append(AchmMenu_func)
+    VIEW3D_MT_mesh_add.append(AchmMenu_func)
     update_panel(None, bpy.context)
     # Define properties
     Scene.archimesh_select_only = BoolProperty(
@@ -333,7 +333,7 @@ def unregister():
     bpy.utils.unregister_class(achm_window_panel.AchmWinPanel)
     bpy.utils.unregister_class(achm_window_panel.AchmWindowEditPanel)
     bpy.utils.unregister_class(Archi_Pref)
-    INFO_MT_mesh_add.remove(AchmMenu_func)
+    VIEW3D_MT_mesh_add.remove(AchmMenu_func)
 
     # Remove properties
     del Scene.archimesh_select_only
diff --git a/archipack/__init__.py b/archipack/__init__.py
index 0f5d3a86..8b87585b 100644
--- a/archipack/__init__.py
+++ b/archipack/__init__.py
@@ -504,12 +504,12 @@ def register():
     bpy.utils.register_class(Archipack_Pref)
     update_panel(None, bpy.context)
     bpy.utils.register_class(ARCHIPACK_MT_create)
-    bpy.types.INFO_MT_mesh_add.append(menu_func)
+    bpy.types.VIEW3D_MT_mesh_add.append(menu_func)
 
 
 def unregister():
     global icons_collection
-    bpy.types.INFO_MT_mesh_add.remove(menu_func)
+    bpy.types.VIEW3D_MT_mesh_add.remove(menu_func)
     bpy.utils.unregister_class(ARCHIPACK_MT_create)
 
     bpy.utils.unregister_class(TOOLS_PT_Archipack_Tools)
diff --git a/camera_dolly_crane_rigs.py b/camera_dolly_crane_rigs.py
index 16443675..c3f40de9 100644
--- a/camera_dolly_crane_rigs.py
+++ b/camera_dolly_crane_rigs.py
@@ -966,7 +966,7 @@ def register():
     bpy.utils.register_class(MakeCameraActive)
     bpy.utils.register_class(AddMarkerBind)
     bpy.utils.register_class(AddDofEmpty)
-    bpy.types.INFO_MT_camera_add.append(add_dolly_crane_buttons)
+    bpy.types.VIEW3D_MT_camera_add.append(add_dolly_crane_buttons)
 
 
 def unregister():
@@ -977,7 +977,7 @@ def unregister():
     bpy.utils.unregister_class(MakeCameraActive)
     bpy.utils.unregister_class(AddMarkerBind)
     bpy.utils.unregister_class(AddDofEmpty)
-    bpy.types.INFO_MT_camera_add.remove(add_dolly_crane_buttons)
+    bpy.types.VIEW3D_MT_camera_add.remove(add_dolly_crane_buttons)
 
 
 if __name__ == "__main__":
diff --git a/curve_simplify.py b/curve_simplify.py
index b053a4b9..e84cdc6e 100644
--- a/curve_simplify.py
+++ b/curve_simplify.py
@@ -597,13 +597,13 @@ def register():
 
     bpy.types.GRAPH_MT_channel.append(menu_func)
     bpy.types.DOPESHEET_MT_channel.append(menu_func)
-    bpy.types.INFO_MT_curve_add.append(menu)
+    bpy.types.VIEW3D_MT_curve_add.append(menu)
 
 
 def unregister():
     bpy.types.GRAPH_MT_channel.remove(menu_func)
     bpy.types.DOPESHEET_MT_channel.remove(menu_func)
-    bpy.types.INFO_MT_curve_add.remove(menu)
+    bpy.types.VIEW3D_MT_curve_add.remove(menu)
 
     bpy.utils.unregister_module(__name__)
 
diff --git a/io_anim_acclaim/__init__.py b/io_anim_acclaim/__init__.py
index 620c1fc4..b65d945c 100644
--- a/io_anim_acclaim/__init__.py
+++ b/io_anim_acclaim/__init__.py
@@ -530,16 +530,16 @@ def menu_func_me(self, context):
 
 def register():
     bpy.utils.register_module(__name__)
-    bpy.types.INFO_MT_file_import.append(menu_func_s)
-    bpy.types.INFO_MT_file_import.append(menu_func_mi)
-    bpy.types.INFO_MT_file_export.append(menu_func_me)
+    bpy.types.TOPBAR_MT_file_import.append(menu_func_s)
+    bpy.types.TOPBAR_MT_file_import.append(menu_func_mi)
+    bpy.types.TOPBAR_MT_file_export.append(menu_func_me)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
-    bpy.types.INFO_MT_file_import.remove(menu_func_s)
-    bpy.types.INFO_MT_file_import.remove(menu_func_mi)
-    bpy.types.INFO_MT_file_export.remove(menu_func_me)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_func_s)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_func_mi)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_func_me)
 
 
 if __name__ == "__main__":
diff --git a/io_anim_bvh/__init__.py b/io_anim_bvh/__init__.py
index 8a63fbbc..1655a783 100644
--- a/io_anim_bvh/__init__.py
+++ b/io_anim_bvh/__init__.py
@@ -222,15 +222,15 @@ def menu_func_export(self, context):
 def register():
     bpy.utils.register_module(__name__)
 
-    bpy.types.INFO_MT_file_import.append(menu_func_import)
-    bpy.types.INFO_MT_file_export.append(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.append(menu_func_import)
+    bpy.types.TOPBAR_MT_file_export.append(menu_func_export)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
-    bpy.types.INFO_MT_file_import.remove(menu_func_import)
-    bpy.types.INFO_MT_file_export.remove(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
 
 if __name__ == "__main__":
     register()
diff --git a/io_anim_c3d/__init__.py b/io_anim_c3d/__init__.py
index 2c9cd0d6..dfa5238d 100644
--- a/io_anim_c3d/__init__.py
+++ b/io_anim_c3d/__init__.py
@@ -354,12 +354,12 @@ def menu_func(self, context):
 
 def register():
     bpy.utils.register_module(__name__)
-    bpy.types.INFO_MT_file_import.append(menu_func)
+    bpy.types.TOPBAR_MT_file_import.append(menu_func)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
-    bpy.types.INFO_MT_file_import.remove(menu_func)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_func)
 
 
 if __name__ == "__main__":
diff --git a/io_anim_camera.py b/io_anim_camera.py
index 20cb5395..374e88f4 100644
--- a/io_anim_camera.py
+++ b/io_anim_camera.py
@@ -167,13 +167,13 @@ def menu_export(self, context):
 def register():
     bpy.utils.register_module(__name__)
 
-    bpy.types.INFO_MT_file_export.append(menu_export)
+    bpy.types.TOPBAR_MT_file_export.append(menu_export)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
-    bpy.types.INFO_MT_file_export.remove(menu_export)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_export)
 
 
 if __name__ == "__main__":
diff --git a/io_anim_nuke_chan/__init__.py b/io_anim_nuke_chan/__init__.py
index b3102329..9266c439 100644
--- a/io_anim_nuke_chan/__init__.py
+++ b/io_anim_nuke_chan/__init__.py
@@ -143,15 +143,15 @@ def menu_func_export(self, context):
 def register():
     bpy.utils.register_class(ImportChan)
     bpy.utils.register_class(ExportChan)
-    bpy.types.INFO_MT_file_import.append(menu_func_import)
-    bpy.types.INFO_MT_file_export.append(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.append(menu_func_import)
+    bpy.types.TOPBAR_MT_file_export.append(menu_func_export)
 
 
 def unregister():
     bpy.utils.unregister_class(ImportChan)
     bpy.utils.unregister_class(ExportChan)
-    bpy.types.INFO_MT_file_import.remove(menu_func_import)
-    bpy.types.INFO_MT_file_export.remove(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
 
 
 if __name__ == "__main__":
diff --git a/io_blend_utils/__init__.py b/io_blend_utils/__init__.py
index d44d4754..9d102102 100644
--- a/io_blend_utils/__init__.py
+++ b/io_blend_utils/__init__.py
@@ -135,14 +135,14 @@ def register():
     for cls in classes:
         bpy.utils.register_class(cls)
 
-    bpy.types.INFO_MT_file_external_data.append(menu_func)
+    bpy.types.TOPBAR_MT_file_external_data.append(menu_func)
 
 
 def unregister():
     for cls in classes:
         bpy.utils.unregister_class(cls)
 
-    bpy.types.INFO_MT_file_external_data.remove(menu_func)
+    bpy.types.TOPBAR_MT_file_external_data.remove(menu_func)
 
 
 if __name__ == "__main__":
diff --git a/io_convert_image_to_mesh_img/__init__.py b/io_convert_image_to_mesh_img/__init__.py
index 1e5bdddf..a884fb90 100644
--- a/io_convert_image_to_mesh_img/__init__.py
+++ b/io_convert_image_to_mesh_img/__init__.py
@@ -51,12 +51,12 @@ def menu_import(self, context):
 
 def register():
     bpy.utils.register_module(__name__)
-    bpy.types.INFO_MT_file_import.append(menu_import)
+    bpy.types.TOPBAR_MT_file_import.append(menu_import)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
-    bpy.types.INFO_MT_file_import.remove(menu_import)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_import)
 
 
 if __name__ == '__main__':
diff --git a/io_curve_svg/__init__.py b/io_curve_svg/__init__.py
index db03b3f2..bab43e51 100644
--- a/io_curve_svg/__init__.py
+++ b/io_curve_svg/__init__.py
@@ -69,13 +69,13 @@ def menu_func_import(self, context):
 def register():
     bpy.utils.register_class(ImportSVG)
 
-    bpy.types.INFO_MT_file_import.append(menu_func_import)
+    bpy.types.TOPBAR_MT_file_import.append(menu_func_import)
 
 
 def unregister():
     bpy.utils.unregister_class(ImportSVG)
 
-    bpy.types.INFO_MT_file_import.remove(menu_func_import)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
 
 # NOTES
 # - blender version is hardcoded
diff --git a/io_export_after_effects.py b/io_export_after_effects.py
index 6f29c2fd..b483ae15 100644
--- a/io_export_after_effects.py
+++ b/io_export_after_effects.py
@@ -768,12 +768,12 @@ def menu_func(self, context):
 
 def register():
     bpy.utils.register_class(ExportJsx)
-    bpy.types.INFO_MT_file_export.append(menu_func)
+    bpy.types.TOPBAR_MT_file_export.append(menu_func)
 
 
 def unregister():
     bpy.utils.unregister_class(ExportJsx)
-    bpy.types.INFO_MT_file_export.remove(menu_func)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_func)
 
 if __name__ == "__main__":
     register()
diff --git a/io_export_dxf/__init__.py b/io_export_dxf/__init__.py
index 254ffdae..41fd79e6 100644
--- a/io_export_dxf/__init__.py
+++ b/io_export_dxf/__init__.py
@@ -45,7 +45,7 @@ classes = (
 )
 
 def register():
-    bpy.types.INFO_MT_file_export.append(menu_func)
+    bpy.types.TOPBAR_MT_file_export.append(menu_func)
 
     from bpy.utils import register_class
     for cls in classes:
@@ -53,7 +53,7 @@ def register():
 
 
 def unregister():
-    bpy.types.INFO_MT_file_export.remove(menu_func)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_func)
 
     from bpy.utils import unregister_class
     for cls in reversed(classes):
diff --git a/io_export_paper_model.py b/io_export_paper_model.py
index 5ddcc11c..624dbde2 100644
--- a/io_export_paper_model.py
+++ b/io_export_paper_model.py
@@ -2582,12 +2582,12 @@ def register():
     bpy.types.Mesh.paper_island_index = bpy.props.IntProperty(
         name="Island List Index",
         default=-1, min=-1, max=100, options={'SKIP_SAVE'})
-    bpy.types.INFO_MT_file_export.append(menu_func)
+    bpy.types.TOPBAR_MT_file_export.append(menu_func)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
-    bpy.types.INFO_MT_file_export.remove(menu_func)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_func)
     if display_islands.handle:
         bpy.types.SpaceView3D.draw_handler_remove(display_islands.handle, 'WINDOW')
         display_islands.handle = None
diff --git a/io_export_pc2.py b/io_export_pc2.py
index 752df5c4..86a1b3c1 100644
--- a/io_export_pc2.py
+++ b/io_export_pc2.py
@@ -205,13 +205,13 @@ def menu_func(self, context):
 def register():
     bpy.utils.register_module(__name__)
 
-    bpy.types.INFO_MT_file_export.append(menu_func)
+    bpy.types.TOPBAR_MT_file_export.append(menu_func)
     #bpy.types.VIEW3D_PT_tools_objectmode.prepend(menu_func)
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
-    bpy.types.INFO_MT_file_export.remove(menu_func)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_func)
     #bpy.types.VIEW3D_PT_tools_objectmode.remove(menu_func)
 
 if __name__ == "__main__":
diff --git a/io_export_unreal_psk_psa.py b/io_export_unreal_psk_psa.py
index ca331912..cc4d068c 100644
--- a/io_export_unreal_psk_psa.py
+++ b/io_export_unreal_psk_psa.py
@@ -2865,7 +2865,7 @@ class PskAddonPreferences(AddonPreferences):
 def register():
 
     bpy.utils.register_module(__name__)
-    bpy.types.INFO_MT_file_export.append(menu_func)
+    bpy.types.TOPBAR_MT_file_export.append(menu_func)
     update_panel(None, bpy.context)
 
     # Added by [MGVS]
@@ -2972,7 +2972,7 @@ def register():
 
 def unregister():
     bpy.utils.unregister_module(__name__)
-    bpy.types.INFO_MT_file_export.remove(menu_func)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_func)
 
     del bpy.types.Scene.udk_option_filename_src
     del bpy.types.Scene.udk_option_export_psk
diff --git a/io_import_dxf/__init__.py b/io_import_dxf/__init__.py
index d768d624..46e84fd5 100644
--- a/io_import_dxf/__init__.py
+++ b/io_import_dxf/__init__.py
@@ -559,12 +559,12 @@ def menu_func(self, context):
 
 def register():
     bpy.utils.register_module(__name__)
-    bpy.types.INFO_MT_file_import.append(menu_func)
+    bpy.types.TOPBAR_MT_file_import.append(menu_func)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
-    bpy.types.INFO_MT_file_import.remove(menu_func)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_func)
 
 
 if __name__ == "__main__":
diff --git a/io_import_gimp_image_to_scene.py b/io_import_gimp_image_to_scene.py
index c554e518..7db9ef71 100644
--- a/io_import_gimp_image_to_scene.py
+++ b/io_import_gimp_image_to_scene.py
@@ -680,13 +680,13 @@ def menu_func(self, context):
 def register():
     bpy.utils.register_module(__name__)
 
-    bpy.types.INFO_MT_file_import.append(menu_func)
+    bpy.types.TOPBAR_MT_file_import.append(menu_func)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
-    bpy.types.INFO_MT_file_import.remove(menu_func)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_func)
 
 
 if __name__ == "__main__":
diff --git a/io_import_images_as_planes.py b/io_import_images_as_planes.py
index 292d4158..3e8b816a 100644
--- a/io_import_images_as_planes.py
+++ b/io_import_images_as_planes.py
@@ -1209,16 +1209,16 @@ def register():
     for cls in classes:
         bpy.utils.register_class(cls)
 
-    bpy.types.INFO_MT_file_import.append(import_images_button)
-    bpy.types.INFO_MT_mesh_add.append(import_images_button)
+    bpy.types.TOPBAR_MT_file_import.append(import_images_button)
+    bpy.types.VIEW3D_MT_mesh_add.append(import_images_button)
 
     bpy.app.handlers.load_post.append(register_driver)
     register_driver()
 
 
 def unregister():
-    bpy.types.INFO_MT_file_import.remove(import_images_button)
-    bpy.types.INFO_MT_mesh_add.remove(import_images_button)
+    bpy.types.TOPBAR_MT_file_import.remove(import_images_button)
+    bpy.types.VIEW3D_MT_mesh_add.remove(import_images_button)
 
     # This will only exist if drivers are active
     if check_drivers in bpy.app.handlers.scene_update_post:
diff --git a/io_import_scene_lwo.py b/io_import_scene_lwo.py
index 8f1bbbac..5bd24bd9 100644
--- a/io_import_scene_lwo.py
+++ b/io_import_scene_lwo.py
@@ -1251,13 +1251,13 @@ def menu_func(self, context):
 def register():
     bpy.utils.register_module(__name__)
 
-    bpy.types.INFO_MT_file_import.append(menu_func)
+    bpy.types.TOPBAR_MT_file_import.append(menu_func)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
-    bpy.types.INFO_MT_file_import.remove(menu_func)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_func)
 
 if __name__ == "__main__":
     register()
diff --git a/io_import_scene_unreal_psa_psk.py b/io_import_scene_unreal_psa_psk.py
index c210b771..2d2ab604 100644
--- a/io_import_scene_unreal_psa_psk.py
+++ b/io_import_scene_unreal_psa_psk.py
@@ -1275,11 +1275,11 @@ def menu_func(self, context):
 
 def register():
     bpy.utils.register_module(__name__)
-    bpy.types.INFO_MT_file_import.append(menu_func)
+    bpy.types.TOPBAR_MT_file_import.append(menu_func)
 
 def unregister():
     bpy.utils.unregister_module(__name__)
-    bpy.types.INFO_MT_file_import.remove(menu_func)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_func)
 
 if __name__ == "__main__":
     register()
diff --git a/io_mesh_pdb/__init__.py b/io_mesh_pdb/__init__.py
index 7ad7d39f..ebe620a2 100644
--- a/io_mesh_pdb/__init__.py
+++ b/io_mesh_pdb/__init__.py
@@ -301,13 +301,13 @@ def menu_func_export(self, context):
 
 def register():
     bpy.utils.register_module(__name__)
-    bpy.types.INFO_MT_file_import.append(menu_func_import)
-    bpy.types.INFO_MT_file_export.append(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.append(menu_func_import)
+    bpy.types.TOPBAR_MT_file_export.append(menu_func_export)
 
 def unregister():
     bpy.utils.unregister_module(__name__)
-    bpy.types.INFO_MT_file_import.remove(menu_func_import)
-    bpy.types.INFO_MT_file_export.remove(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
 
 if __name__ == "__main__":
 
diff --git a/io_mesh_ply/__init__.py b/io_mesh_ply/__init__.py
index 77259690..c0fcc8dc 100644
--- a/io_mesh_ply/__init__.py
+++ b/io_mesh_ply/__init__.py
@@ -191,16 +191,16 @@ def register():
     for cls in classes:
         bpy.utils.register_class(cls)
 
-    bpy.types.INFO_MT_file_import.append(menu_func_import)
-    bpy.types.INFO_MT_file_export.append(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.append(menu_func_import)
+    bpy.types.TOPBAR_MT_file_export.append(menu_func_export)
 
 
 def unregister():
     for cls in classes:
         bpy.utils.unregister_class(cls)
 
-    bpy.types.INFO_MT_file_import.remove(menu_func_import)
-    bpy.types.INFO_MT_file_export.remove(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
 
 if __name__ == "__main__":
     register()
diff --git a/io_mesh_raw/__init__.py b/io_mesh_raw/__init__.py
index 69640932..5ad4c6f5 100644
--- a/io_mesh_raw/__init__.py
+++ b/io_mesh_raw/__init__.py
@@ -107,15 +107,15 @@ def menu_export(self, context):
 def register():
     bpy.utils.register_module(__name__)
 
-    bpy.types.INFO_MT_file_import.append(menu_import)
-    bpy.types.INFO_MT_file_export.append(menu_export)
+    bpy.types.TOPBAR_MT_file_import.append(menu_import)
+    bpy.types.TOPBAR_MT_file_export.append(menu_export)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
-    bpy.types.INFO_MT_file_import.remove(menu_import)
-    bpy.types.INFO_MT_file_export.remove(menu_export)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_import)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_export)
 
 if __name__ == "__main__":
     register()
diff --git a/io_mesh_stl/__init__.py b/io_mesh_stl/__init__.py
index fc8bced2..0f3de86e 100644
--- a/io_mesh_stl/__init__.py
+++ b/io_mesh_stl/__init__.py
@@ -259,15 +259,15 @@ def menu_export(self, context):
 def register():
     bpy.utils.register_module(__name__)
 
-    bpy.types.INFO_MT_file_import.append(menu_import)
-    bpy.types.INFO_MT_file_export.append(menu_export)
+    bpy.types.TOPBAR_MT_file_import.append(menu_import)
+    bpy.types.TOPBAR_MT_file_export.append(menu_export)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
-    bpy.types.INFO_MT_file_import.remove(menu_import)
-    bpy.types.INFO_MT_file_export.remove(menu_export)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_import)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_export)
 
 
 if __name__ == "__main__":
diff --git a/io_scene_3ds/__init__.py b/io_scene_3ds/__init__.py
index 9236c07e..4377674d 100644
--- a/io_scene_3ds/__init__.py
+++ b/io_scene_3ds/__init__.py
@@ -149,15 +149,15 @@ def menu_func_import(self, context):
 def register():
     bpy.utils.register_module(__name__)
 
-    bpy.types.INFO_MT_file_import.append(menu_func_import)
-    bpy.types.INFO_MT_file_export.append(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.append(menu_func_import)
+    bpy.types.TOPBAR_MT_file_export.append(menu_func_export)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
-    bpy.types.INFO_MT_file_import.remove(menu_func_import)
-    bpy.types.INFO_MT_file_export.remove(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
 
 # NOTES:
 # why add 1 extra vertex? and remove it when done? -
diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py
index 819aec0c..523d3a29 100644
--- a/io_scene_fbx/__init__.py
+++ b/io_scene_fbx/__init__.py
@@ -641,13 +641,13 @@ def register():
     for cls in classes:
         bpy.utils.register_class(cls)
 
-    bpy.types.INFO_MT_file_import.append(menu_func_import)
-    bpy.types.INFO_MT_file_export.append(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.append(menu_func_import)
+    bpy.types.TOPBAR_MT_file_export.append(menu_func_export)
 
 
 def unregister():
-    bpy.types.INFO_MT_file_import.remove(menu_func_import)
-    bpy.types.INFO_MT_file_export.remove(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
 
     for cls in classes:
         bpy.utils.unregister_class(cls)
diff --git a/io_scene_ms3d/__init__.py b/io_scene_ms3d/__init__.py
index 794aae6b..805b1d83 100644
--- a/io_scene_ms3d/__init__.py
+++ b/io_scene_ms3d/__init__.py
@@ -64,8 +64,8 @@ from bpy.utils import (
         unregister_module,
         )
 from bpy.types import (
-        INFO_MT_file_export,
-        INFO_MT_file_import,
+        TOPBAR_MT_file_export,
+        TOPBAR_MT_file_import,
         )
 
 
@@ -82,16 +82,16 @@ def register():
     ms3d_ui.register()
 
     register_module(__name__)
-    INFO_MT_file_export.append(Ms3dExportOperator.menu_func)
-    INFO_MT_file_import.append(Ms3dImportOperator.menu_func)
+    TOPBAR_MT_file_export.append(Ms3dExportOperator.menu_func)
+    TOPBAR_MT_file_import.append(Ms3dImportOperator.menu_func)
 
 
 def unregister():
     ms3d_ui.unregister()
 
     unregister_module(__name__)
-    INFO_MT_file_export.remove(Ms3dExportOperator.menu_func)
-    INFO_MT_file_import.remove(Ms3dImportOperator.menu_func)
+    TOPBAR_MT_file_export.remove(Ms3dExportOperator.menu_func)
+    TOPBAR_MT_file_import.remove(Ms3dImportOperator.menu_func)
 
 
 ###############################################################################
diff --git a/io_scene_obj/__init__.py b/io_scene_obj/__init__.py
index b362c0a6..66329447 100644
--- a/io_scene_obj/__init__.py
+++ b/io_scene_obj/__init__.py
@@ -330,13 +330,13 @@ def register():
     for cls in classes:
         bpy.utils.register_class(cls)
 
-    bpy.types.INFO_MT_file_import.append(menu_func_import)
-    bpy.types.INFO_MT_file_export.append(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.append(menu_func_import)
+    bpy.types.TOPBAR_MT_file_export.append(menu_func_export)
 
 
 def unregister():
-    bpy.types.INFO_MT_file_import.remove(menu_func_import)
-    bpy.types.INFO_MT_file_export.remove(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
 
     for cls in classes:
         bpy.utils.unregister_class(cls)
diff --git a/io_scene_vrml2/__init__.py b/io_scene_vrml2/__init__.py
index d6c0da2f..18821623 100644
--- a/io_scene_vrml2/__init__.py
+++ b/io_scene_vrml2/__init__.py
@@ -151,13 +151,13 @@ def menu_func_export(self, context):
 def register():
     bpy.utils.register_module(__name__)
 
-    bpy.types.INFO_MT_file_export.append(menu_func_export)
+    bpy.types.TOPBAR_MT_file_export.append(menu_func_export)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
-    bpy.types.INFO_MT_file_export.remove(menu_func_export)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
 
 if __name__ == "__main__":
     register()
diff --git a/io_scene_x/__init__.py b/io_scene_x/__init__.py
index 001dca61..404d9dc2 100644
--- a/io_scene_x/__init__.py
+++ b/io_scene_x/__init__.py
@@ -176,13 +176,13 @@ def menu_func(self, context):
 def register():
     bpy.utils.register_module(__name__)
 
-    bpy.types.INFO_MT_file_export.append(menu_func)
+    bpy.types.TOPBAR_MT_file_export.append(menu_func)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
-    bpy.types.INFO_MT_file_export.remove(menu_func)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_func)
 
 
 if __name__ == "__main__":
diff --git a/io_scene_x3d/__init__.py b/io_scene_x3d/__init__.py
index d5c555a1..f3db0e15 100644
--- a/io_scene_x3d/__init__.py
+++ b/io_scene_x3d/__init__.py
@@ -172,15 +172,15 @@ def menu_func_export(self, context):
 def register():
     bpy.utils.register_module(__name__)
 
-    bpy.types.INFO_MT_file_import.append(menu_func_import)
-    bpy.types.INFO_MT_file_export.append(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.append(menu_func_import)
+    bpy.types.TOPBAR_MT_file_export.append(menu_func_export)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
-    bpy.types.INFO_MT_file_import.remove(menu_func_import)
-    bpy.types.INFO_MT_file_export.remove(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
 
 # NOTES
 # - blender version is hardcoded
diff --git a/io_shape_mdd/__init__.py b/io_shape_mdd/__init__.py
index 99623241..786df7fd 100644
--- a/io_shape_mdd/__init__.py
+++ b/io_shape_mdd/__init__.py
@@ -167,15 +167,15 @@ def menu_func_export(self, context):
 def register():
     bpy.utils.register_module(__name__)
 
-    bpy.types.INFO_MT_file_import.append(menu_func_import)
-    bpy.types.INFO_MT_file_export.append(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.append(menu_func_import)
+    bpy.types.TOPBAR_MT_file_export.append(menu_func_export)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
-    bpy.types.INFO_MT_file_import.remove(menu_func_import)
-    bpy.types.INFO_MT_file_export.remove(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
 
 if __name__ == "__main__":
     register()
diff --git a/object_fracture/__init__.py b/object_fracture/__init__.py
index 0ac9f403..5dad8801 100644
--- a/object_fracture/__init__.py
+++ b/object_fracture/__init__.py
@@ -40,8 +40,8 @@ else:
 import bpy
 
 
-class INFO_MT_add_fracture_objects(bpy.types.Menu):
-    bl_idname = "INFO_MT_add_fracture_objects"
+class VIEW3D_MT_add_fracture_objects(bpy.types.Menu):
+    bl_idname = "VIEW3D_MT_add_fracture_objects"
     bl_label = "Fracture Helper Objects"
 
     def draw(self, context):
@@ -57,21 +57,21 @@ class INFO_MT_add_fracture_objects(bpy.types.Menu):
 
 
 def menu_func(self, context):
-    self.layout.menu("INFO_MT_add_fracture_objects")
+    self.layout.menu("VIEW3D_MT_add_fracture_objects")
 
 
 def register():
     bpy.utils.register_module(__name__)
 
     # Add the "add fracture objects" menu to the "Add" menu
-    bpy.types.INFO_MT_add.append(menu_func)
+    bpy.types.VIEW3D_MT_add.append(menu_func)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
     # Remove "add fracture objects" menu from the "Add" menu.
-    bpy.types.INFO_MT_add.remove(menu_func)
+    bpy.types.VIEW3D_MT_add.remove(menu_func)
 
 
 if __name__ == "__main__":
diff --git a/object_grease_scatter.py b/object_grease_scatter.py
index 105b40ea..df1c7cce 100644
--- a/object_grease_scatter.py
+++ b/object_grease_scatter.py
@@ -390,12 +390,12 @@ def menu_func(self, context):
 
 def register():
     bpy.utils.register_class(Scatter)
-    bpy.types.INFO_MT_mesh_add.append(menu_func)
+    bpy.types.VIEW3D_MT_mesh_add.append(menu_func)
 
 
 def unregister():
     bpy.utils.unregister_class(Scatter)
-    bpy.types.INFO_MT_mesh_add.remove(menu_func)
+    bpy.types.VIEW3D_MT_mesh_add.remove(menu_func)
 
 #if __name__ == "__main__":
 #    _main()
diff --git a/render_povray/__init__.py b/render_povray/__init__.py
index c1f6c539..d55512cb 100644
--- a/render_povray/__init__.py
+++ b/render_povray/__init__.py
@@ -2274,8 +2274,8 @@ class PovrayPreferences(AddonPreferences):
 
 def register():
     bpy.utils.register_module(__name__)
-    bpy.types.INFO_MT_add.prepend(ui.menu_func_add)
-    bpy.types.INFO_MT_file_import.append(ui.menu_func_import)
+    bpy.types.VIEW3D_MT_add.prepend(ui.menu_func_add)
+    bpy.types.TOPBAR_MT_file_import.append(ui.menu_func_import)
     bpy.types.TEXT_MT_templates.append(ui.menu_func_templates)
     bpy.types.RENDER_PT_povray_radiosity.prepend(ui.rad_panel_func)
     bpy.types.LIGHT_PT_POV_light.prepend(ui.light_panel_func)
@@ -2315,8 +2315,8 @@ def unregister():
     bpy.types.LIGHT_PT_POV_light.remove(ui.light_panel_func)    
     bpy.types.RENDER_PT_povray_radiosity.remove(ui.rad_panel_func)
     bpy.types.TEXT_MT_templates.remove(ui.menu_func_templates)
-    bpy.types.INFO_MT_file_import.remove(ui.menu_func_import)
-    bpy.types.INFO_MT_add.remove(ui.menu_func_add)
+    bpy.types.TOPBAR_MT_file_import.remove(ui.menu_func_import)
+    bpy.types.VIEW3D_MT_add.remove(ui.menu_func_add)
     bpy.utils.unregister_module(__name__)
 
 
diff --git a/rigify/legacy/metarig_menu.py b/rigify/legacy/metarig_menu.py
index 4bdf2701..c0c20955 100644
--- a/rigify/legacy/metarig_menu.py
+++ b/rigify/legacy/metarig_menu.py
@@ -114,7 +114,7 @@ def register():
         bpy.utils.register_class(mop)
 
     for mf in menu_funcs:
-        bpy.types.INFO_MT_armature_add.append(mf)
+        bpy.types.VIEW3D_MT_armature_add.append(mf)
 
 
 def unregister():
@@ -122,4 +122,4 @@ def unregister():
         bpy.utils.unregister_class(mop)
 
     for mf in menu_funcs:
-        bpy.types.INFO_MT_armature_add.remove(mf)
+        bpy.types.VIEW3D_MT_armature_add.remove(mf)
diff --git a/rigify/legacy/ui.py b/rigify/legacy/ui.py
index 033d6516..30018d85 100644
--- a/rigify/legacy/ui.py
+++ b/rigify/legacy/ui.py
@@ -221,8 +221,8 @@ class VIEW3D_PT_tools_rigify_dev(bpy.types.Panel):
                 r = self.layout.row()
                 r.operator("mesh.rigify_encode_mesh_widget", text="Encode Mesh Widget to Python")
 
-#~ class INFO_MT_armature_metarig_add(bpy.types.Menu):
-    #~ bl_idname = "INFO_MT_armature_metarig_add"
+#~ class VIEW3D_MT_armature_metarig_add(bpy.types.Menu):
+    #~ bl_idname = "VIEW3D_MT_armature_metarig_add"
     #~ bl_label = "Meta-Rig"
 
     #~ def draw(self, context):
@@ -410,7 +410,7 @@ class EncodeWidget(bpy.types.Operator):
         return {'FINISHED'}
 
 
-#menu_func = (lambda self, context: self.layout.menu("INFO_MT_armature_metarig_add", icon='OUTLINER_OB_ARMATURE'))
+#menu_func = (lambda self, context: self.layout.menu("VIEW3D_MT_armature_metarig_add", icon='OUTLINER_OB_ARMATURE'))
 
 #from bl_ui import space_info  # ensure the menu is loaded first
 
@@ -425,7 +425,7 @@ def register():
     bpy.utils.register_class(EncodeMetarig)
     bpy.utils.register_class(EncodeMetarigSample)
     bpy.utils.register_class(EncodeWidget)
-    #space_info.INFO_MT_armature_add.append(ui.menu_func)
+    #space_info.VIEW3D_MT_armature_add.append(ui.menu_func)
 
 
 def unregister():
diff --git a/rigify/metarig_menu.py b/rigify/metarig_menu.py
index 153c2cb9..c1610553 100644
--- a/rigify/metarig_menu.py
+++ b/rigify/metarig_menu.py
@@ -174,7 +174,7 @@ def register():
         register_class(arm_sub)
 
     for mf in menu_funcs:
-        bpy.types.INFO_MT_armature_add.append(mf)
+        bpy.types.VIEW3D_MT_armature_add.append(mf)
 
 
 def unregister():
@@ -188,4 +188,4 @@ def unregister():
         unregister_class(arm_sub)
 
     for mf in menu_funcs:
-        bpy.types.INFO_MT_armature_add.remove(mf)
+        bpy.types.VIEW3D_MT_armature_add.remove(mf)
diff --git a/space_view3d_pie_menus/pie_editor_switch_menu.py b/space_view3d_pie_menus/pie_editor_switch_menu.py
index 67f40ff8..5002fa7e 100644
--- a/space_view3d_pie_menus/pie_editor_switch_menu.py
+++ b/space_view3d_pie_menus/pie_editor_switch_menu.py
@@ -41,7 +41,7 @@ from bpy.props import (
 
 
 class AreaPieMenu(Menu):
-    bl_idname = "INFO_MT_window_pie"
+    bl_idname = "TOPBAR_MT_window_pie"
     bl_label = "Pie Menu"
     bl_description = "Window Pie Menus"
 
@@ -87,7 +87,7 @@ class AreaPieEditor(Menu):
 
 
 class AreaTypePieOther(Menu):
-    bl_idname = "INFO_MT_window_pie_area_type_other"
+    bl_idname = "TOPBAR_MT_window_pie_area_type_other"
     bl_label = "Editor Type (other)"
     bl_description = "Is pie menu change editor type (other)"
 
@@ -122,7 +122,7 @@ class SetAreaType(Operator):
 
 
 class AreaTypePieAnim(Menu):
-    bl_idname = "INFO_MT_window_pie_area_type_anim"
+    bl_idname = "TOPBAR_MT_window_pie_area_type_anim"
     bl_label = "Editor Type (Animation)"
     bl_description = "Menu for changing editor type (animation related)"
 
diff --git a/space_view3d_pie_menus/pie_save_open_menu.py b/space_view3d_pie_menus/pie_save_open_menu.py
index bdd9b63c..8b7e56e0 100644
--- a/space_view3d_pie_menus/pie_save_open_menu.py
+++ b/space_view3d_pie_menus/pie_save_open_menu.py
@@ -97,9 +97,9 @@ class pie_fileio(Menu):
         layout = self.layout
         pie = layout.menu_pie()
         box = pie.split().column()
-        box.menu("INFO_MT_file_import", icon='IMPORT')
+        box.menu("TOPBAR_MT_file_import", icon='IMPORT')
         box.separator()
-        box.menu("INFO_MT_file_export", icon='EXPORT')
+        box.menu("TOPBAR_MT_file_export", icon='EXPORT')
 
 
 class ExternalData(Menu):
diff --git a/space_view3d_spacebar_menu.py b/space_view3d_spacebar_menu.py
index 228d0bb9..eaa7f0fd 100644
--- a/space_view3d_spacebar_menu.py
+++ b/space_view3d_spacebar_menu.py
@@ -121,7 +121,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
             layout.menu("VIEW3D_MT_Select_Edit_Mesh", icon='RESTRICT_SELECT_OFF')
             layout.menu("VIEW3D_MT_Edit_Multi", icon='VERTEXSEL')
             UseSeparator(self, context)
-            layout.menu("INFO_MT_mesh_add", text="Add Mesh", icon='OUTLINER_OB_MESH')
+            layout.menu("VIEW3D_MT_mesh_add", text="Add Mesh", icon='OUTLINER_OB_MESH')
             layout.menu("VIEW3D_MT_Edit_Mesh", text="Mesh", icon='MESH_DATA')
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_TransformMenuEdit", icon='MANIPUL')
@@ -259,7 +259,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
             layout.menu("VIEW3D_MT_Select_Edit_Curve",
                         icon='RESTRICT_SELECT_OFF')
             UseSeparator(self, context)
-            layout.menu("INFO_MT_curve_add", text="Add Curve",
+            layout.menu("VIEW3D_MT_curve_add", text="Add Curve",
                         icon='OUTLINER_OB_CURVE')
             layout.menu("VIEW3D_MT_Edit_Curve", icon='CURVE_DATA')
             UseSeparator(self, context)
@@ -321,7 +321,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
             layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
             layout.menu("VIEW3D_MT_Select_Edit_Surface", icon='RESTRICT_SELECT_OFF')
             UseSeparator(self, context)
-            layout.menu("INFO_MT_surface_add", text="Add Surface",
+            layout.menu("VIEW3D_MT_surface_add", text="Add Surface",
                         icon='OUTLINER_OB_SURFACE')
             layout.menu("VIEW3D_MT_TransformMenu", icon='MANIPUL')
             layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
@@ -561,7 +561,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
             layout.menu("VIEW3D_MT_Select_Edit_Armature",
                         icon='RESTRICT_SELECT_OFF')
             UseSeparator(self, context)
-            layout.menu("INFO_MT_armature_add", text="Add Armature",
+            layout.menu("VIEW3D_MT_armature_add", text="Add Armature",
                         icon='OUTLINER_OB_ARMATURE')
             layout.menu("VIEW3D_MT_Edit_Armature", text="Armature",
                         icon='OUTLINER_DATA_ARMATURE')
@@ -820,18 +820,18 @@ class VIEW3D_MT_AddMenu(Menu):
         layout = self.layout
         layout.operator_context = 'INVOKE_REGION_WIN'
 
-        layout.menu("INFO_MT_mesh_add", text="Add Mesh",
+        layout.menu("VIEW3D_MT_mesh_add", text="Add Mesh",
                     icon='OUTLINER_OB_MESH')
-        layout.menu("INFO_MT_curve_add", text="Add Curve",
+        layout.menu("VIEW3D_MT_curve_add", text="Add Curve",
                     icon='OUTLINER_OB_CURVE')
-        layout.menu("INFO_MT_surface_add", text="Add Surface",
+        layout.menu("VIEW3D_MT_surface_add", text="Add Surface",
                     icon='OUTLINER_OB_SURFACE')
         layout.operator_menu_enum("object.metaball_add", "type",
                                   icon='OUTLINER_OB_META')
         layout.operator("object.text_add", text="Add Text",
                         icon='OUTLINER_OB_FONT')
         UseSeparator(self, context)
-        layout.menu("INFO_MT_armature_add", text="Add Armature",
+        layout.menu("VIEW3D_MT_armature_add", text="Add Armature",
                     icon='OUTLINER_OB_ARMATURE')
         layout.operator("object.add", text="Lattice",
                         icon='OUTLINER_OB_LATTICE').type = 'LATTICE'
diff --git a/system_demo_mode/__init__.py b/system_demo_mode/__init__.py
index 55557134..178fd0e2 100644
--- a/system_demo_mode/__init__.py
+++ b/system_demo_mode/__init__.py
@@ -248,7 +248,7 @@ def register():
     bpy.utils.register_class(DemoModeSetup)
     bpy.utils.register_class(DemoModeRun)
 
-    bpy.types.INFO_MT_file.prepend(menu_func)
+    bpy.types.TOPBAR_MT_file.prepend(menu_func)
 
     extern_demo_mode_register()
 
@@ -257,7 +257,7 @@ def unregister():
     bpy.utils.unregister_class(DemoModeSetup)
     bpy.utils.unregister_class(DemoModeRun)
 
-    bpy.types.INFO_MT_file.remove(menu_func)
+    bpy.types.TOPBAR_MT_file.remove(menu_func)
 
     extern_demo_mode_unregister()