diff --git a/add_dimension.py b/add_dimension.py
index 1b95bbb96623aa21f4ee7f91c0c67c81a035d50c..6ec9bbf0151e5167e234be947f2c536470f19923 100644
--- a/add_dimension.py
+++ b/add_dimension.py
@@ -3182,14 +3182,14 @@ def Dimension_button(self, context):
 def register():
     bpy.utils.register_module(__name__)
 
-    bpy.types.INFO_MT_curve_add.append(Dimension_button)
+    bpy.types.VIEW3D_MT_curve_add.append(Dimension_button)
 
     DimensionVariables()
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
-    bpy.types.INFO_MT_curve_add.remove(Dimension_button)
+    bpy.types.VIEW3D_MT_curve_add.remove(Dimension_button)
 
 if __name__ == "__main__":
     register()
diff --git a/add_mesh_castle/__init__.py b/add_mesh_castle/__init__.py
index 13eaa4618afad94de87dd51f03ffe0f80f86f385..2638abb2e709685fc4f96be0a38a45301dc604a7 100644
--- a/add_mesh_castle/__init__.py
+++ b/add_mesh_castle/__init__.py
@@ -62,13 +62,13 @@ classes = (
 def register():
     for cls in classes:
         bpy.utils.register_class(cls)
-    bpy.types.INFO_MT_mesh_add.append(menu_func_castle)
+    bpy.types.VIEW3D_MT_mesh_add.append(menu_func_castle)
 
 
 def unregister():
     for cls in classes:
         bpy.utils.unregister_class(cls)
-    bpy.types.INFO_MT_mesh_add.remove(menu_func_castle)
+    bpy.types.VIEW3D_MT_mesh_add.remove(menu_func_castle)
 
 
 if __name__ == "__main__":
diff --git a/add_mesh_clusters/__init__.py b/add_mesh_clusters/__init__.py
index aac5a112d890c349efa36338d56eab3bffdad05e..f384f034e7c8205b5609fcf15880925bc5dcb077 100644
--- a/add_mesh_clusters/__init__.py
+++ b/add_mesh_clusters/__init__.py
@@ -513,11 +513,11 @@ def register():
     bpy.utils.register_module(__name__)
     bpy.types.Scene.atom_cluster = bpy.props.PointerProperty(type=
                                                   CLASS_atom_cluster_Properties)
-    bpy.types.INFO_MT_mesh_add.append(DEF_menu_func)
+    bpy.types.VIEW3D_MT_mesh_add.append(DEF_menu_func)
 
 def unregister():
     bpy.utils.unregister_module(__name__)
-    bpy.types.INFO_MT_mesh_add.remove(DEF_menu_func)
+    bpy.types.VIEW3D_MT_mesh_add.remove(DEF_menu_func)
 
 if __name__ == "__main__":
 
diff --git a/add_mesh_icicle_snowflake/__init__.py b/add_mesh_icicle_snowflake/__init__.py
index b44f6fe313a04bfdd24ad71d70c7af9a93965d35..8365d66632b681e14c37788850ee767c6691d4ce 100644
--- a/add_mesh_icicle_snowflake/__init__.py
+++ b/add_mesh_icicle_snowflake/__init__.py
@@ -44,9 +44,9 @@ else:
 import bpy
 
 
-class INFO_MT_mesh_icy_add(bpy.types.Menu):
+class VIEW3D_MT_mesh_icy_add(bpy.types.Menu):
     # Define the "Ice" menu
-    bl_idname = "INFO_MT_mesh_ice_add"
+    bl_idname = "VIEW3D_MT_mesh_ice_add"
     bl_label = "Ice & Snow"
 
     def draw(self, context):
@@ -62,21 +62,21 @@ class INFO_MT_mesh_icy_add(bpy.types.Menu):
 
 # Define "Extras" menu
 def menu_func(self, context):
-    self.layout.menu("INFO_MT_mesh_ice_add", text="Ice & Snow", icon="FREEZE")
+    self.layout.menu("VIEW3D_MT_mesh_ice_add", text="Ice & Snow", icon="FREEZE")
 
 
 def register():
     bpy.utils.register_module(__name__)
 
     # 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():
     bpy.utils.unregister_module(__name__)
 
     # 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)
 
 
 if __name__ == "__main__":
diff --git a/add_mesh_icicle_snowflake/add_mesh_icicle_gen.py b/add_mesh_icicle_snowflake/add_mesh_icicle_gen.py
index f0ee5468a87c76bf42ecaf0933f304077943e435..912a709073e05ffdf3b9f45e01839ce9e01a607d 100644
--- a/add_mesh_icicle_snowflake/add_mesh_icicle_gen.py
+++ b/add_mesh_icicle_snowflake/add_mesh_icicle_gen.py
@@ -391,12 +391,12 @@ def menu_func(self, context):
 
 def register():
     bpy.utils.register_class(IcicleGenerator)
-    bpy.types.INFO_MT_mesh_add.append(menu_func)
+    bpy.types.VIEW3D_MT_mesh_add.append(menu_func)
 
 
 def unregister():
     bpy.utils.unregister_class(IcicleGenerator)
-    bpy.types.INFO_MT_mesh_add.remove(menu_func)
+    bpy.types.VIEW3D_MT_mesh_add.remove(menu_func)
 
 
 if __name__ == "__main__":
diff --git a/add_mesh_icicle_snowflake/add_mesh_snowflake.py b/add_mesh_icicle_snowflake/add_mesh_snowflake.py
index b000a4368aeb87a289462f8dd3e4806d7df44506..7a567600f71999fe848943c1ba8c9e2b0884560f 100644
--- a/add_mesh_icicle_snowflake/add_mesh_snowflake.py
+++ b/add_mesh_icicle_snowflake/add_mesh_snowflake.py
@@ -585,14 +585,14 @@ def register():
     bpy.utils.register_class(SnowflakeGen)
     bpy.utils.register_class(MESH_MT_snowflakes_presets)
     bpy.utils.register_class(SnowflakeGen_presets)
-    bpy.types.INFO_MT_mesh_add.append(menu_func)
+    bpy.types.VIEW3D_MT_mesh_add.append(menu_func)
 
 
 def unregister():
     bpy.utils.unregister_class(SnowflakeGen)
     bpy.utils.unregister_class(MESH_MT_snowflakes_presets)
     bpy.utils.unregister_class(SnowflakeGen_presets)
-    bpy.types.INFO_MT_mesh_add.remove(menu_func)
+    bpy.types.VIEW3D_MT_mesh_add.remove(menu_func)
 
 
 if __name__ == "__main__":
diff --git a/add_mesh_rocks/__init__.py b/add_mesh_rocks/__init__.py
index 793049e9d64805fc4bdefb6bb7c40ac655c1f118..57bc9e8b6ed49a348d0584091d1a94c54f44f039 100644
--- a/add_mesh_rocks/__init__.py
+++ b/add_mesh_rocks/__init__.py
@@ -64,13 +64,13 @@ def menu_func_rocks(self, context):
 def register():
     bpy.utils.register_module(__name__)
 
-    bpy.types.INFO_MT_mesh_add.append(menu_func_rocks)
+    bpy.types.VIEW3D_MT_mesh_add.append(menu_func_rocks)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
-    bpy.types.INFO_MT_mesh_add.remove(menu_func_rocks)
+    bpy.types.VIEW3D_MT_mesh_add.remove(menu_func_rocks)
 
 
 if __name__ == "__main__":
diff --git a/add_mesh_space_tree/__init__.py b/add_mesh_space_tree/__init__.py
index 5b4d3ee28747df3034c762c645974494d99c9312..3f26e98ebc56656e8abb7b16474b2173c08a2e01 100644
--- a/add_mesh_space_tree/__init__.py
+++ b/add_mesh_space_tree/__init__.py
@@ -1110,11 +1110,11 @@ def menu_func(self, context):
 
 def register():
     bpy.utils.register_module(__name__)
-    bpy.types.INFO_MT_mesh_add.append(menu_func)
+    bpy.types.VIEW3D_MT_mesh_add.append(menu_func)
 
 
 def unregister():
-    bpy.types.INFO_MT_mesh_add.remove(menu_func)
+    bpy.types.VIEW3D_MT_mesh_add.remove(menu_func)
     bpy.utils.unregister_module(__name__)
 
 
diff --git a/amaranth/render/meshlight_add.py b/amaranth/render/meshlight_add.py
index a96db23cf34eb37b80a94425195c8aa34bd1bd66..39320cc247330fbe1a94282fea28c62003f3da98 100644
--- a/amaranth/render/meshlight_add.py
+++ b/amaranth/render/meshlight_add.py
@@ -186,9 +186,9 @@ def ui_menu_lamps_add(self, context):
 
 def register():
     bpy.utils.register_class(AMTH_OBJECT_OT_meshlight_add)
-    bpy.types.INFO_MT_mesh_add.append(ui_menu_lamps_add)
+    bpy.types.VIEW3D_MT_mesh_add.append(ui_menu_lamps_add)
 
 
 def unregister():
     bpy.utils.unregister_class(AMTH_OBJECT_OT_meshlight_add)
-    bpy.types.INFO_MT_mesh_add.remove(ui_menu_lamps_add)
+    bpy.types.VIEW3D_MT_mesh_add.remove(ui_menu_lamps_add)
diff --git a/amaranth/scene/save_reload.py b/amaranth/scene/save_reload.py
index 0698755b8507a2a5a579b470aa0a838a6e3c6406..4f588c3a9fdcd7a15c67c811a1a4c305019e841b 100644
--- a/amaranth/scene/save_reload.py
+++ b/amaranth/scene/save_reload.py
@@ -61,7 +61,7 @@ def button_save_reload(self, context):
 
 def register():
     bpy.utils.register_class(AMTH_WM_OT_save_reload)
-    bpy.types.INFO_MT_file.append(button_save_reload)
+    bpy.types.TOPBAR_MT_file.append(button_save_reload)
     wm = bpy.context.window_manager
     kc = wm.keyconfigs.addon
     km = kc.keymaps.new(name="Window")
@@ -72,7 +72,7 @@ def register():
 
 def unregister():
     bpy.utils.unregister_class(AMTH_WM_OT_save_reload)
-    bpy.types.INFO_MT_file.remove(button_save_reload)
+    bpy.types.TOPBAR_MT_file.remove(button_save_reload)
     for km, kmi in KEYMAPS:
         km.keymap_items.remove(kmi)
     KEYMAPS.clear()
diff --git a/automat/__init__.py b/automat/__init__.py
index 0d1582e1f9b838956d095d332a347e2bedad7e91..685e5351f2256d3e12a3e0dce2a4ca2aa274ae45 100644
--- a/automat/__init__.py
+++ b/automat/__init__.py
@@ -46,14 +46,14 @@ operator  and the AdjustableOperatorFromTexture operator.  """
 
 	bpy.utils.register_class(AutoOp.AutomatOperatorFromTexture)
 	bpy.utils.register_class(AdjOp.AdjustableOperatorFromTexture)
-	bpy.types.INFO_MT_file_import.append(menu_draw)
+	bpy.types.TOPBAR_MT_file_import.append(menu_draw)
 
 def unregister():
 
 	"""This method unregisters the AutomatOperatorFromTexture
 operator and the AdjustableOperatorFromTexture operator.  """
 
-	bpy.types.INFO_MT_file_import.remove(menu_draw)
+	bpy.types.TOPBAR_MT_file_import.remove(menu_draw)
 	bpy.utils.unregister_class(AutoOp.AutomatOperatorFromTexture)
 	bpy.utils.unregister_class(AdjOp.AdjustableOperatorFromTexture)
 
diff --git a/io_directx_bel/__init__.py b/io_directx_bel/__init__.py
index 8841e7275853ebc21397f0da6aa24e471b67810c..e9e736116ebbf20e3298cde671f3efdd78b1c7db 100644
--- a/io_directx_bel/__init__.py
+++ b/io_directx_bel/__init__.py
@@ -281,15 +281,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)
 
 if __name__ == "__main__":
     register()
\ No newline at end of file
diff --git a/io_export_marmalade.py b/io_export_marmalade.py
index d301c265ebb11b7845eecae58eecabf219d75223..60719866e6c9d4a9e8b4d53653af03db506f9b12 100644
--- a/io_export_marmalade.py
+++ b/io_export_marmalade.py
@@ -1460,13 +1460,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_export_md3.py b/io_export_md3.py
index 2a1c459748742882d875eace433e10cd6782023d..75d2d472b238dc093440ab9e280f6600090b7602 100644
--- a/io_export_md3.py
+++ b/io_export_md3.py
@@ -683,10 +683,10 @@ def menu_func(self, context):
   self.layout.operator(ExportMD3.bl_idname, text="Quake Model 3 (.md3)").filepath = newpath
 
 def register():
-  bpy.types.INFO_MT_file_export.append(menu_func)
+  bpy.types.TOPBAR_MT_file_export.append(menu_func)
 
 def unregister():
-  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_import_BrushSet.py b/io_import_BrushSet.py
index 0abe7edddd9ef76e11e24da9df8bc5bd73568ccc..cd1de6ef35cc27a4cde31fc5e7b99d32298f4a5b 100644
--- a/io_import_BrushSet.py
+++ b/io_import_BrushSet.py
@@ -161,11 +161,11 @@ class Brush_set_UI(bpy.types.Panel):
 
 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_sound_to_anim.py b/io_import_sound_to_anim.py
index 9c3b54605e2554b8f6e0d58d9c48576814f21a86..bfc90b9de3f4789994065598683661c274b3d72d 100644
--- a/io_import_sound_to_anim.py
+++ b/io_import_sound_to_anim.py
@@ -1906,7 +1906,7 @@ class ModalTimerOperator(bpy.types.Operator):
 def register():
     bpy.utils.register_module(__name__)
     bpy.types.Scene.imp_sound_to_anim = PointerProperty(type=ImpSoundtoAnim, name="Import: Sound to Animation", description="Extract movement from sound file. See the Object Panel at the end.")
-    bpy.types.INFO_MT_file_import.append(WavFileImport)
+    bpy.types.TOPBAR_MT_file_import.append(WavFileImport)
 
 def unregister():
 
@@ -1916,7 +1916,7 @@ def unregister():
         pass
 
     try:
-        bpy.types.INFO_MT_file_import.remove(WavFileImport)
+        bpy.types.TOPBAR_MT_file_import.remove(WavFileImport)
     except:
         pass
 
diff --git a/io_import_voodoo_camera.py b/io_import_voodoo_camera.py
index 0e586e975c0ed58efd927a9198cb751b0ec61238..f3fac30cae3dab2379f6100df89bedf4236c33bc 100644
--- a/io_import_voodoo_camera.py
+++ b/io_import_voodoo_camera.py
@@ -318,12 +318,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_mesh_gwyddion/__init__.py b/io_mesh_gwyddion/__init__.py
index 7f856ee05820cdb4942f02e245e9f405789e0488..a26a00402be78aac33a0510e1c357374d28fddae 100644
--- a/io_mesh_gwyddion/__init__.py
+++ b/io_mesh_gwyddion/__init__.py
@@ -172,11 +172,11 @@ 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.TOPBAR_MT_file_import.append(menu_func_import)
 
 def unregister():
     bpy.utils.unregister_module(__name__)
-    bpy.types.INFO_MT_file_import.remove(menu_func_import)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
 
 if __name__ == "__main__":
 
diff --git a/io_mesh_xyz/__init__.py b/io_mesh_xyz/__init__.py
index 5f548fc8ae418084bc894f4559b9f0d7504020f6..52143a14146b58a5b6548d511be066da1468cdaa 100644
--- a/io_mesh_xyz/__init__.py
+++ b/io_mesh_xyz/__init__.py
@@ -236,13 +236,13 @@ def menu_func_export(self, context):
 
 def register():
     bpy.utils.register_module(__name__)
-    bpy.types.INFO_MT_file_import.append(menu_func)
-    bpy.types.INFO_MT_file_export.append(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.append(menu_func)
+    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)
-    bpy.types.INFO_MT_file_export.remove(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_func)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
 
 if __name__ == "__main__":
 
diff --git a/io_points_pcd/__init__.py b/io_points_pcd/__init__.py
index 1cf1689a6c9a52bf9b7e6146bb1571c526e3a809..f2328aa9c193e1bc4968f5a049897411dd8b60e1 100644
--- a/io_points_pcd/__init__.py
+++ b/io_points_pcd/__init__.py
@@ -114,15 +114,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__":
diff --git a/io_scene_cod/__init__.py b/io_scene_cod/__init__.py
index db34a67ee55a1e9b0a17aba6120305fef0d0c936..20a45e0e36f3f52007decb91ebc2d0bbb16af071 100644
--- a/io_scene_cod/__init__.py
+++ b/io_scene_cod/__init__.py
@@ -459,18 +459,18 @@ def menu_func_xanim_export(self, context):
 def register():
     bpy.utils.register_module(__name__)
 
-    bpy.types.INFO_MT_file_import.append(menu_func_xmodel_import)
-    #bpy.types.INFO_MT_file_import.append(menu_func_xanim_import)
-    bpy.types.INFO_MT_file_export.append(menu_func_xmodel_export)
-    bpy.types.INFO_MT_file_export.append(menu_func_xanim_export)
+    bpy.types.TOPBAR_MT_file_import.append(menu_func_xmodel_import)
+    #bpy.types.TOPBAR_MT_file_import.append(menu_func_xanim_import)
+    bpy.types.TOPBAR_MT_file_export.append(menu_func_xmodel_export)
+    bpy.types.TOPBAR_MT_file_export.append(menu_func_xanim_export)
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
-    bpy.types.INFO_MT_file_import.remove(menu_func_xmodel_import)
-    #bpy.types.INFO_MT_file_import.remove(menu_func_xanim_import)
-    bpy.types.INFO_MT_file_export.remove(menu_func_xmodel_export)
-    bpy.types.INFO_MT_file_export.remove(menu_func_xanim_export)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_func_xmodel_import)
+    #bpy.types.TOPBAR_MT_file_import.remove(menu_func_xanim_import)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_func_xmodel_export)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_func_xanim_export)
 
 if __name__ == "__main__":
     register()
diff --git a/io_scene_fpx/__init__.py b/io_scene_fpx/__init__.py
index ff7507ef1c39bd51888100b1a44de52eb4337d36..9198bc7c4ecc4b4f9e5cfbf2f9feb98ad56d475f 100644
--- a/io_scene_fpx/__init__.py
+++ b/io_scene_fpx/__init__.py
@@ -110,8 +110,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,
         )
 
 
@@ -128,18 +128,18 @@ def register():
     fpx_ui.register()
 
     register_module(__name__)
-    INFO_MT_file_import.append(FpmImportOperator.menu_func)
-    INFO_MT_file_import.append(FplImportOperator.menu_func)
-    INFO_MT_file_import.append(FptImportOperator.menu_func)
+    TOPBAR_MT_file_import.append(FpmImportOperator.menu_func)
+    TOPBAR_MT_file_import.append(FplImportOperator.menu_func)
+    TOPBAR_MT_file_import.append(FptImportOperator.menu_func)
 
 
 def unregister():
     fpx_ui.unregister()
 
     unregister_module(__name__)
-    INFO_MT_file_import.remove(FpmImportOperator.menu_func)
-    INFO_MT_file_import.remove(FplImportOperator.menu_func)
-    INFO_MT_file_import.remove(FptImportOperator.menu_func)
+    TOPBAR_MT_file_import.remove(FpmImportOperator.menu_func)
+    TOPBAR_MT_file_import.remove(FplImportOperator.menu_func)
+    TOPBAR_MT_file_import.remove(FptImportOperator.menu_func)
 
 
 ###############################################################################
diff --git a/io_scene_map/__init__.py b/io_scene_map/__init__.py
index c8964ef1c075f75fddc5977a16d26e78007859dd..78dbc1986d6bb372b6de958c2253f11928751401 100644
--- a/io_scene_map/__init__.py
+++ b/io_scene_map/__init__.py
@@ -116,13 +116,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__":
     register()
diff --git a/io_scene_open_street_map.py b/io_scene_open_street_map.py
index 6f4b57a982185d9e63ae244491c8f56d757018a1..e835cd7ba35f905b23787950da990fa576e1aa9e 100644
--- a/io_scene_open_street_map.py
+++ b/io_scene_open_street_map.py
@@ -351,9 +351,9 @@ def menu_func_export(self, context):
 
 def register():
     bpy.utils.register_class(ImportOSM)
-    bpy.types.INFO_MT_file_import.append(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.append(menu_func_export)
 
 
 def unregister():
     bpy.utils.unregister_class(ImportOSM)
-    bpy.types.INFO_MT_file_import.remove(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_func_export)
diff --git a/io_vector/__init__.py b/io_vector/__init__.py
index 74696ee4fa4cb5e14b263761f75234d67a091659..43b101d79e4f34cc2751904240572666bcc9bbac 100644
--- a/io_vector/__init__.py
+++ b/io_vector/__init__.py
@@ -236,13 +236,13 @@ 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/object_creaprim.py b/object_creaprim.py
index 376c725fae669cb78f5aafefd06d54e70c677157..74b1d2fefce68c497b528e5a662921a94e18d7a5 100644
--- a/object_creaprim.py
+++ b/object_creaprim.py
@@ -340,12 +340,12 @@ def do_creaprim(self, mesh, objname, addondir):
     strlist.append("\n")
     strlist.append("def register():\n")
     strlist.append("    bpy.utils.register_module(__name__)\n")
-    strlist.append("    bpy.types.INFO_MT_mesh_add.append(menu_item)\n")
+    strlist.append("    bpy.types.VIEW3D_MT_mesh_add.append(menu_item)\n")
     strlist.append("\n")
     strlist.append("\n")
     strlist.append("def unregister():\n")
     strlist.append("    bpy.utils.unregister_module(__name__)\n")
-    strlist.append("    bpy.types.INFO_MT_mesh_add.remove(menu_item)\n")
+    strlist.append("    bpy.types.VIEW3D_MT_mesh_add.remove(menu_item)\n")
     strlist.append("\n")
     strlist.append("\n")
     strlist.append("if __name__ == \"__main__\":\n")
@@ -410,8 +410,8 @@ def makeinit(txtlist, namelist, groupname, addondir):
     strlist.append("import bpy\n")
     strlist.append("\n")
     strlist.append("\n")
-    strlist.append("class INFO_MT_mesh_" + str.lower(groupname) + "_add(bpy.types.Menu):\n")
-    strlist.append("    bl_idname = \"INFO_MT_mesh_" + str.lower(groupname) + "_add\"\n")
+    strlist.append("class VIEW3D_MT_mesh_" + str.lower(groupname) + "_add(bpy.types.Menu):\n")
+    strlist.append("    bl_idname = \"VIEW3D_MT_mesh_" + str.lower(groupname) + "_add\"\n")
     strlist.append("    bl_label = \"" + groupname + "\"\n")
     strlist.append("\n")
     strlist.append("    def draw(self, context):\n")
@@ -422,17 +422,17 @@ def makeinit(txtlist, namelist, groupname, addondir):
     strlist.append("\n")
     strlist.append("\n")
     strlist.append("def menu_item(self, context):\n")
-    strlist.append("    self.layout.menu(\"INFO_MT_mesh_" + str.lower(groupname) + "_add\", icon=\"PLUGIN\")\n")
+    strlist.append("    self.layout.menu(\"VIEW3D_MT_mesh_" + str.lower(groupname) + "_add\", icon=\"PLUGIN\")\n")
     strlist.append("\n")
     strlist.append("\n")
     strlist.append("def register():\n")
     strlist.append("    bpy.utils.register_module(__name__)\n")
-    strlist.append("    bpy.types.INFO_MT_mesh_add.append(menu_item)\n")
+    strlist.append("    bpy.types.VIEW3D_MT_mesh_add.append(menu_item)\n")
     strlist.append("\n")
     strlist.append("\n")
     strlist.append("def unregister():\n")
     strlist.append("    bpy.utils.unregister_module(__name__)\n")
-    strlist.append("    bpy.types.INFO_MT_mesh_add.remove(menu_item)\n")
+    strlist.append("    bpy.types.VIEW3D_MT_mesh_add.remove(menu_item)\n")
     strlist.append("\n")
     strlist.append("\n")
     strlist.append("if __name__ == \"__main__\":\n")
diff --git a/oscurart_mesh_thread.py b/oscurart_mesh_thread.py
index 079080b4fbacaa43a5b50079a9455cd6d62245d7..e742cd54fcb0bd31ee4441983a18de0c29dfdfdd 100644
--- a/oscurart_mesh_thread.py
+++ b/oscurart_mesh_thread.py
@@ -87,12 +87,12 @@ def add_screw_list(self, context):
         icon="PLUGIN")
 
 def register():
-    bpy.types.INFO_MT_mesh_add.append(add_screw_list)
+    bpy.types.VIEW3D_MT_mesh_add.append(add_screw_list)
     bpy.utils.register_class(oscMakeScrew)
 
 
 def unregister():
-    bpy.types.INFO_MT_mesh_add.remove(add_screw_list)
+    bpy.types.VIEW3D_MT_mesh_add.remove(add_screw_list)
     bpy.utils.unregister_class(oscMakeScrew)
 
 
diff --git a/space_view3d_render_settings.py b/space_view3d_render_settings.py
index e6daf06e1453c6ae59e802257f46223fd40855dc..3ee74d5d38b57e47e8532f332cdec9175ff64179 100644
--- a/space_view3d_render_settings.py
+++ b/space_view3d_render_settings.py
@@ -161,7 +161,7 @@ class SyncAllSubsurfRenderLevels(bpy.types.Operator):
 
 
 class RenderResolutionPercentageMenu(bpy.types.Menu):
-    bl_idname = "INFO_MT_render_resolution_percentage"
+    bl_idname = "TOPBAR_MT_render_resolution_percentage"
     bl_label = "Rendering size (%)"
     bl_description = "Setting is set to either rendered in what percent of the size of the resolution"
 
@@ -189,7 +189,7 @@ class RenderResolutionPercentageMenu(bpy.types.Menu):
 
 
 class SimplifyRenderMenu(bpy.types.Menu):
-    bl_idname = "INFO_MT_render_simplify"
+    bl_idname = "TOPBAR_MT_render_simplify"
     bl_label = "Simplify Render"
     bl_description = "I simplified set of rendering"
 
@@ -204,7 +204,7 @@ class SimplifyRenderMenu(bpy.types.Menu):
 
 
 class ShadeingMenu(bpy.types.Menu):
-    bl_idname = "INFO_MT_render_shadeing"
+    bl_idname = "TOPBAR_MT_render_shadeing"
     bl_label = "Use shading"
     bl_description = "Shading on / off"
 
@@ -217,7 +217,7 @@ class ShadeingMenu(bpy.types.Menu):
 
 
 class SubsurfMenu(bpy.types.Menu):
-    bl_idname = "INFO_MT_render_subsurf"
+    bl_idname = "TOPBAR_MT_render_subsurf"
     bl_label = "Subsurf Level All"
     bl_description = "Subsurf subdivision level of all objects"
 
@@ -330,7 +330,7 @@ def menu(self, context):
 
 
 class AnimateRenderMenu(bpy.types.Menu):
-    bl_idname = "INFO_MT_render_animate_menu"
+    bl_idname = "TOPBAR_MT_render_animate_menu"
     bl_label = "Animation"
     bl_description = "Set Frames & Animation Length"
 
@@ -424,12 +424,12 @@ class RenderSettingsPanel(bpy.types.Panel):
 
 def register():
     bpy.utils.register_module(__name__)
-    bpy.types.INFO_MT_render.append(menu)
+    bpy.types.TOPBAR_MT_render.append(menu)
 
 # unregister
 
 def unregister():
-    bpy.types.INFO_MT_render.remove(menu)
+    bpy.types.TOPBAR_MT_render.remove(menu)
     bpy.utils.unregister_module(__name__)
 
 if __name__ == "__main__":
diff --git a/space_view3d_toolshelf_menu.py b/space_view3d_toolshelf_menu.py
index 2cc51d7fd3da42e5c563516993daf5dbdb92b584..7b555a30f4adde4beb4a89fe0eb819d1b29f73d6 100644
--- a/space_view3d_toolshelf_menu.py
+++ b/space_view3d_toolshelf_menu.py
@@ -120,7 +120,7 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             layout.menu("VIEW3D_MT_Select_Edit_Mesh2", icon='RESTRICT_SELECT_OFF')
             layout.menu("VIEW3D_MT_Edit_Multi2", 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_Mesh2", text="Mesh", icon='MESH_DATA')
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_TransformMenuEdit2", icon='MANIPUL')
@@ -257,7 +257,7 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             layout.menu("VIEW3D_MT_Select_Edit_Curve2",
                         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_Curve2", icon='CURVE_DATA')
             UseSeparator(self, context)
@@ -318,7 +318,7 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             layout.menu("VIEW3D_MT_View_Menu2", icon='ZOOM_ALL')
             layout.menu("VIEW3D_MT_Select_Edit_Surface2", 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_TransformMenu2", icon='MANIPUL')
             layout.menu("VIEW3D_MT_MirrorMenu2", icon='MOD_MIRROR')
@@ -553,7 +553,7 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             layout.menu("VIEW3D_MT_Select_Edit_Armature2",
                         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_Armature2", text="Armature",
                         icon='OUTLINER_DATA_ARMATURE')
@@ -809,18 +809,18 @@ class VIEW3D_MT_AddMenu2(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_keyboard_svg.py b/system_keyboard_svg.py
index eb5ffcead0ea071ec42d1ec3cad0f56da50d66ac..aeb46be970d558436ca1d2690ca36c78ed88c885 100644
--- a/system_keyboard_svg.py
+++ b/system_keyboard_svg.py
@@ -296,11 +296,11 @@ def menu_func_help(self, context):
 def register():
     bpy.utils.register_class(WM_OT_keyboardlayout)
 
-    bpy.types.INFO_MT_help.append(menu_func_help)
+    bpy.types.TOPBAR_MT_help.append(menu_func_help)
 
 
 def unregister():
-    bpy.types.INFO_MT_help.remove(menu_func_help)
+    bpy.types.TOPBAR_MT_help.remove(menu_func_help)
 
     bpy.utils.unregister_class(WM_OT_keyboardlayout)
 
diff --git a/system_project_folder.py b/system_project_folder.py
index ec1ad6dfbef0e99b70f04a4a44e88f5d88f3bf13..4c915e75eab076aae7009d34e2f762378ce34391 100644
--- a/system_project_folder.py
+++ b/system_project_folder.py
@@ -72,11 +72,11 @@ def menu_func(self, context):
 
 def register():
     bpy.utils.register_class(ProjectFolder)
-    bpy.types.INFO_MT_file.prepend(menu_func)
+    bpy.types.TOPBAR_MT_file.prepend(menu_func)
 
 def unregister():
     bpy.utils.unregister_class(ProjectFolder)
-    bpy.types.INFO_MT_file.remove(menu_func)
+    bpy.types.TOPBAR_MT_file.remove(menu_func)
 
 if __name__ == "__main__":
     register()