Update for changes to Blender

15 files changed, 80 insertions, 80 deletions

diff --git a/add_curve_extra_objects/add_curve_simple.py b/add_curve_extra_objects/add_curve_simple.py
index 39a5f159..fae815d4 100644
--- a/add_curve_extra_objects/add_curve_simple.py
+++ b/add_curve_extra_objects/add_curve_simple.py
@@ -1476,7 +1476,7 @@ def register():
         register_class(cls)
 
     bpy.types.VIEW3D_MT_curve_add.append(menu)
-    bpy.types.VIEW3D_MT_edit_curve_specials.prepend(Simple_curve_edit_menu)
+    bpy.types.VIEW3D_MT_edit_curve_context_menu.prepend(Simple_curve_edit_menu)
 
 def unregister():
     from bpy.utils import unregister_class
@@ -1484,7 +1484,7 @@ def unregister():
         unregister_class(cls)
 
     bpy.types.VIEW3D_MT_curve_add.remove(menu)
-    bpy.types.VIEW3D_MT_edit_curve_specials.remove(Simple_curve_edit_menu)
+    bpy.types.VIEW3D_MT_edit_curve_context_menu.remove(Simple_curve_edit_menu)
 
 if __name__ == "__main__":
     register()
diff --git a/animation_add_corrective_shape_key.py b/animation_add_corrective_shape_key.py
index c18d3b89..ed72fcae 100644
--- a/animation_add_corrective_shape_key.py
+++ b/animation_add_corrective_shape_key.py
@@ -419,7 +419,7 @@ def modifiers_draw(self, context):
 def register():
     bpy.utils.register_module(__name__)
 
-    bpy.types.MESH_MT_shape_key_specials.append(vgroups_draw)
+    bpy.types.MESH_MT_shape_key_context_menu.append(vgroups_draw)
     bpy.types.DATA_PT_modifiers.append(modifiers_draw)
 
 
diff --git a/bone_selection_sets.py b/bone_selection_sets.py
index e91d5557..0278bd23 100644
--- a/bone_selection_sets.py
+++ b/bone_selection_sets.py
@@ -62,7 +62,7 @@ class SelectionSet(PropertyGroup):
 
 # UI Panel w/ UIList ##########################################################
 
-class POSE_MT_selection_sets_specials(Menu):
+class POSE_MT_selection_sets_context_menu(Menu):
     bl_label = "Selection Sets Specials"
 
     def draw(self, context):
@@ -107,7 +107,7 @@ class POSE_PT_selection_sets(Panel):
         col = row.column(align=True)
         col.operator("pose.selection_set_add", icon='ADD', text="")
         col.operator("pose.selection_set_remove", icon='REMOVE', text="")
-        col.menu("POSE_MT_selection_sets_specials", icon='DOWNARROW_HLT', text="")
+        col.menu("POSE_MT_selection_sets_context_menu", icon='DOWNARROW_HLT', text="")
 
         # move up/down arrows
         if len(arm.selection_sets) > 0:
@@ -512,7 +512,7 @@ def uniqify(name: str, other_names: list) -> str:
 
 classes = (
     POSE_MT_selection_set_create,
-    POSE_MT_selection_sets_specials,
+    POSE_MT_selection_sets_context_menu,
     POSE_MT_selection_sets_select,
     POSE_PT_selection_sets,
     POSE_UL_selection_set,
diff --git a/materials_utils/__init__.py b/materials_utils/__init__.py
index 8c606742..6c2c1349 100644
--- a/materials_utils/__init__.py
+++ b/materials_utils/__init__.py
@@ -949,7 +949,7 @@ class VIEW3D_OT_set_new_material_name(Operator):
 
     def draw(self, context):
         layout = self.layout
-        scene = context.scene.mat_specials
+        scene = context.scene.mat_context_menu
 
         box = layout.box()
         box.label(text="Base name:")
@@ -1004,7 +1004,7 @@ class VIEW3D_OT_assign_material(Operator):
 
     def execute(self, context):
         actob = context.active_object
-        scene = context.scene.mat_specials
+        scene = context.scene.mat_context_menu
         mn = self.matname
         tweak = scene.use_tweak
 
@@ -1206,7 +1206,7 @@ class VIEW3D_OT_select_material_by_name(Operator):
     def execute(self, context):
         if use_mat_menu_type() == 'POPUP':
             mats_col = context.scene.mat_specials_mats
-            scene = context.scene.mat_specials
+            scene = context.scene.mat_context_menu
             len_mats = len(mats_col)
             mat_index = scene.index_mat
 
@@ -1579,7 +1579,7 @@ class MATERIAL_OT_check_converter_path(Operator):
 
     def check_valid_path(self, context):
         sc = context.scene
-        paths = bpy.path.abspath(sc.mat_specials.conv_path)
+        paths = bpy.path.abspath(sc.mat_context_menu.conv_path)
 
         if bpy.data.filepath == "":
             warning_messages(self, "DIR_PATH_EMPTY", override=True)
@@ -1665,10 +1665,10 @@ def draw_ui_list_popups(self, context, obj_data=False):
 
     col.template_list(
         "VIEW3D_UL_assign_material_popup_ui",
-        'mat_specials',
+        'mat_context_menu',
         context.scene,
         'mat_specials_mats',
-        context.scene.mat_specials,
+        context.scene.mat_context_menu,
         'index_mat',
         rows=10
     )
@@ -1689,7 +1689,7 @@ class VIEW3D_MT_assign_material(Menu):
             layout.label(text="*No active Object in the Scene*", icon="INFO")
             use_separator(self, context)
 
-        mat_prop_name = context.scene.mat_specials.set_material_name
+        mat_prop_name = context.scene.mat_context_menu.set_material_name
         add_new = layout.operator(
                         "view3d.assign_material",
                         text="Add New", icon='ZOOMIN'
@@ -1975,7 +1975,7 @@ class MATERIAL_MT_scenemassive_opt(Menu):
 
     def draw(self, context):
         layout = self.layout
-        scene = context.scene.mat_specials
+        scene = context.scene.mat_context_menu
 
         layout.prop(scene, "EXTRACT_ALPHA",
                     text="Extract Alpha Textures (slow)")
@@ -2037,7 +2037,7 @@ class MATERIAL_PT_scenemassive(Panel):
         box = col.box()
         box.label(text="Save Directory")
         split = box.split(0.85)
-        split.prop(sc.mat_specials, "conv_path", text="", icon="RENDER_RESULT")
+        split.prop(sc.mat_context_menu, "conv_path", text="", icon="RENDER_RESULT")
         split.operator("material.check_converter_path",
                        text="", icon="EXTERNAL_DATA")
 
@@ -2378,7 +2378,7 @@ class VIEW3D_MT_material_utils_pref(AddonPreferences):
         box = col_m.box()
         box.label(text="Save Directory")
         split = box.split(0.85)
-        split.prop(sc.mat_specials, "conv_path", text="", icon="RENDER_RESULT")
+        split.prop(sc.mat_context_menu, "conv_path", text="", icon="RENDER_RESULT")
         split.operator(
             "material.check_converter_path",
             text="", icon="EXTERNAL_DATA"
@@ -2664,7 +2664,7 @@ def register():
     warning_messages_utils.MAT_SPEC_NAME = __name__
 
     # Register Scene Properties
-    bpy.types.Scene.mat_specials = PointerProperty(
+    bpy.types.Scene.mat_context_menu = PointerProperty(
         type=material_specials_scene_props
     )
     bpy.types.Scene.mat_specials_mats = CollectionProperty(
@@ -2678,8 +2678,8 @@ def register():
         kmi = km.keymap_items.new('wm.call_menu', 'Q', 'PRESS', shift=True)
         kmi.properties.name = "VIEW3D_MT_master_material"
 
-    bpy.types.MATERIAL_MT_specials.prepend(menu_move)
-    bpy.types.MATERIAL_MT_specials.append(menu_func)
+    bpy.types.MATERIAL_MT_context_menu.prepend(menu_move)
+    bpy.types.MATERIAL_MT_context_menu.append(menu_func)
 
 
 def unregister():
@@ -2692,10 +2692,10 @@ def unregister():
                     km.keymap_items.remove(kmi)
                     break
 
-    bpy.types.MATERIAL_MT_specials.remove(menu_move)
-    bpy.types.MATERIAL_MT_specials.remove(menu_func)
+    bpy.types.MATERIAL_MT_context_menu.remove(menu_move)
+    bpy.types.MATERIAL_MT_context_menu.remove(menu_func)
 
-    del bpy.types.Scene.mat_specials
+    del bpy.types.Scene.mat_context_menu
     del bpy.types.Scene.mat_specials_mats
 
     bpy.utils.unregister_module(__name__)
diff --git a/materials_utils/materials_cycles_converter.py b/materials_utils/materials_cycles_converter.py
index 11d2affa..573e4309 100644
--- a/materials_utils/materials_cycles_converter.py
+++ b/materials_utils/materials_cycles_converter.py
@@ -117,8 +117,8 @@ def BakingText(tex, mode, tex_type=None):
         sizeX = tex.texture.image.size[0]
         sizeY = tex.texture.image.size[1]
     else:
-        bake_size = (int(sc.mat_specials.img_bake_size) if
-                     sc.mat_specials.img_bake_size else 1024)
+        bake_size = (int(sc.mat_context_menu.img_bake_size) if
+                     sc.mat_context_menu.img_bake_size else 1024)
         sizeX = bake_size
         sizeY = bake_size
 
@@ -143,7 +143,7 @@ def BakingText(tex, mode, tex_type=None):
         check_area = False
 
     if check_area:
-        paths = bpy.path.abspath(sc.mat_specials.conv_path)
+        paths = bpy.path.abspath(sc.mat_context_menu.conv_path)
         tex_name = getattr(getattr(tex.texture, "image", None), "name", None)
         texture_name = (tex_name.rpartition(".")[0] if tex_name else tex.texture.name)
         new_tex_name = "baked"
@@ -207,7 +207,7 @@ def AutoNodeInitiate(active=False, operator=None):
         CHECK_AUTONODE = True
         collect_report("_______________________", True, False)
         AutoNode(active, operator)
-        if sc.mat_specials.SET_FAKE_USER:
+        if sc.mat_context_menu.SET_FAKE_USER:
             SetFakeUserTex()
     else:
         warning_messages(operator, 'DIR_PATH_CONVERT', override=True)
@@ -281,7 +281,7 @@ def AutoNode(active=False, operator=None):
                 link_fail = True
 
             # Create other shader types only sculpt/texture paint mode is False
-            sculpt_paint = sc.mat_specials.SCULPT_PAINT
+            sculpt_paint = sc.mat_context_menu.SCULPT_PAINT
             if sculpt_paint is False:
 
                 cmat_is_transp = cmat.use_transparency and cmat.alpha < 1
@@ -451,10 +451,10 @@ def AutoNode(active=False, operator=None):
                         img = None
 
                         if tex.texture.type == 'IMAGE':
-                            if sc.mat_specials.EXTRACT_ALPHA and tex.texture.use_alpha:
+                            if sc.mat_context_menu.EXTRACT_ALPHA and tex.texture.use_alpha:
                                 if (not
                                    os_path.exists(bpy.path.abspath(tex.texture.image.filepath + "_BAKING.png")) or
-                                   sc.mat_specials.EXTRACT_OW):
+                                   sc.mat_context_menu.EXTRACT_OW):
                                     baked_path = BakingText(tex, 'ALPHA')
 
                                     if baked_path:
@@ -488,9 +488,9 @@ def AutoNode(active=False, operator=None):
                                 collect_report("ERROR: A problem occurred with loading an image for {} "
                                                "(possibly missing)".format(tex.texture.name))
                         else:
-                            if sc.mat_specials.EXTRACT_PTEX or (sc.mat_specials.EXTRACT_ALPHA and ma_alpha):
+                            if sc.mat_context_menu.EXTRACT_PTEX or (sc.mat_context_menu.EXTRACT_ALPHA and ma_alpha):
                                 if (not os_path.exists(bpy.path.abspath(tex.texture.name + "_PTEXT.jpg")) or
-                                   sc.mat_specials.EXTRACT_OW):
+                                   sc.mat_context_menu.EXTRACT_OW):
                                     tex_type = tex.texture.type.lower()
                                     collect_report("Attempting to Extract Procedural Texture type: " + tex_type)
                                     baked_path = BakingText(tex, 'PTEX', tex_type)
@@ -673,8 +673,8 @@ def AutoNode(active=False, operator=None):
                 if sculpt_paint:
                     try:
                         # create a new image for texture painting and make it active
-                        img_size = (int(sc.mat_specials.img_bake_size) if
-                                    sc.mat_specials.img_bake_size else 1024)
+                        img_size = (int(sc.mat_context_menu.img_bake_size) if
+                                    sc.mat_context_menu.img_bake_size else 1024)
                         paint_mat_name = getattr(cmat, "name", "NO NAME")
                         paint_img_name = "Paint Base Image {}".format(paint_mat_name)
                         bpy.ops.image.new(name=paint_img_name, width=img_size, height=img_size,
@@ -848,7 +848,7 @@ def create_mix_node(TreeNodes, links, nodes, loc, start, median_point, row, fram
 
 
 def unwrap_active_object(context):
-    enable_unwrap = context.scene.mat_specials.UV_UNWRAP
+    enable_unwrap = context.scene.mat_context_menu.UV_UNWRAP
     if enable_unwrap:
         obj_name = getattr(context.active_object, "name", "UNNAMED OBJECT")
         try:
diff --git a/materials_utils/warning_messages_utils.py b/materials_utils/warning_messages_utils.py
index 435bcdfd..1ce12d9d 100644
--- a/materials_utils/warning_messages_utils.py
+++ b/materials_utils/warning_messages_utils.py
@@ -6,7 +6,7 @@ import bpy
 # Globals #
 
 # change the name for the properties settings
-MAT_SPEC_NAME = "materials_specials"
+MAT_SPEC_NAME = "materials_context_menu"
 
 # collect messages for the report operator
 COLLECT_REPORT = []
@@ -139,7 +139,7 @@ def collect_report(collection="", is_start=False, is_final=False):
     # collection passes a string for appending to COLLECT_REPORT global
     # is_final switches to the final report with the operator in __init__
     global COLLECT_REPORT
-    scene = bpy.context.scene.mat_specials
+    scene = bpy.context.scene.mat_context_menu
     use_report = scene.enable_report
 
     if is_start:
diff --git a/mesh_extra_tools/__init__.py b/mesh_extra_tools/__init__.py
index 3685079e..c1b9d388 100644
--- a/mesh_extra_tools/__init__.py
+++ b/mesh_extra_tools/__init__.py
@@ -53,7 +53,7 @@ if "bpy" in locals():
     importlib.reload(mesh_fastloop)
     importlib.reload(mesh_edgetools)
     importlib.reload(mesh_pen_tool)
-    importlib.reload(vfe_specials)
+    importlib.reload(vfe_context_menu)
     importlib.reload(mesh_help)
     importlib.reload(mesh_select_by_direction)
     importlib.reload(mesh_select_by_edge_length)
@@ -83,7 +83,7 @@ else:
     from . import mesh_fastloop
     from . import mesh_edgetools
     from . import mesh_pen_tool
-    from . import vfe_specials
+    from . import vfe_context_menu
     from . import mesh_help
     from . import mesh_extrude_and_reshape
     from . import mesh_check
@@ -678,7 +678,7 @@ class VIEW3D_MT_selectvert_edit_mesh_add(Menu):
         layout.operator("mesh.v2v_facewise", text="Neighbors by Face - Edge")
 
 
-class VIEW3D_MT_utils_specials(Menu):
+class VIEW3D_MT_utils_context_menu(Menu):
     bl_label = "Specials Menu"
     bl_idname = "mesh.utils specials"
     bl_description = "Utils Quick Specials"
@@ -857,7 +857,7 @@ class mesh_extra_tools_pref(AddonPreferences):
 
 def register():
     mesh_pen_tool.register()
-    vfe_specials.register()
+    vfe_context_menu.register()
     mesh_extrude_and_reshape.register()
     mesh_check.register()
 
@@ -871,7 +871,7 @@ def register():
     bpy.types.Object.tkkey = IntVectorProperty(size=4)
 
     # Add "Extras" menu to the "W-key Specials" menu
-    bpy.types.VIEW3D_MT_edit_mesh_specials.prepend(menu_func)
+    bpy.types.VIEW3D_MT_edit_mesh_context_menu.prepend(menu_func)
     bpy.types.VIEW3D_MT_select_edit_mesh.prepend(menu_select)
 
     try:
@@ -882,7 +882,7 @@ def register():
 
 def unregister():
     mesh_pen_tool.unregister()
-    vfe_specials.unregister()
+    vfe_context_menu.unregister()
     mesh_extrude_and_reshape.unregister()
     mesh_check.unregister()
 
@@ -892,7 +892,7 @@ def unregister():
     bpy.utils.unregister_module(__name__)
 
     # Remove "Extras" menu from the "" menu.
-    bpy.types.VIEW3D_MT_edit_mesh_specials.remove(menu_func)
+    bpy.types.VIEW3D_MT_edit_mesh_context_menu.remove(menu_func)
     bpy.types.VIEW3D_MT_select_edit_mesh.remove(menu_select)
 
     try:
diff --git a/mesh_looptools.py b/mesh_looptools.py
index a555a3eb..096fb516 100644
--- a/mesh_looptools.py
+++ b/mesh_looptools.py
@@ -5117,7 +5117,7 @@ classes = (
 def register():
     for cls in classes:
         bpy.utils.register_class(cls)
-    bpy.types.VIEW3D_MT_edit_mesh_specials.prepend(menu_func)
+    bpy.types.VIEW3D_MT_edit_mesh_context_menu.prepend(menu_func)
     bpy.types.WindowManager.looptools = PointerProperty(type=LoopToolsProps)
     update_panel(None, bpy.context)
 
@@ -5126,7 +5126,7 @@ def register():
 def unregister():
     for cls in reversed(classes):
         bpy.utils.unregister_class(cls)
-    bpy.types.VIEW3D_MT_edit_mesh_specials.remove(menu_func)
+    bpy.types.VIEW3D_MT_edit_mesh_context_menu.remove(menu_func)
     try:
         del bpy.types.WindowManager.looptools
     except Exception as e:
diff --git a/mesh_relax.py b/mesh_relax.py
index 876c3b01..6ace534e 100644
--- a/mesh_relax.py
+++ b/mesh_relax.py
@@ -118,13 +118,13 @@ def menu_func(self, context):
 def register():
     bpy.utils.register_class(Relax)
 
-    bpy.types.VIEW3D_MT_edit_mesh_specials.append(menu_func)
+    bpy.types.VIEW3D_MT_edit_mesh_context_menu.append(menu_func)
     bpy.types.VIEW3D_MT_edit_mesh_vertices.append(menu_func)
 
 def unregister():
     bpy.utils.unregister_class(Relax)
 
-    bpy.types.VIEW3D_MT_edit_mesh_specials.remove(menu_func)
+    bpy.types.VIEW3D_MT_edit_mesh_context_menu.remove(menu_func)
     bpy.types.VIEW3D_MT_edit_mesh_vertices.remove(menu_func)
 
 if __name__ == "__main__":
diff --git a/mesh_tiny_cad/__init__.py b/mesh_tiny_cad/__init__.py
index 8905baa8..e72a919a 100644
--- a/mesh_tiny_cad/__init__.py
+++ b/mesh_tiny_cad/__init__.py
@@ -75,11 +75,11 @@ def register():
         bpy.utils.register_class(cls)
     bpy.types.Scene.tinycad_props = bpy.props.PointerProperty(
         name="TinyCAD props", type=TinyCADProperties)
-    bpy.types.VIEW3D_MT_edit_mesh_specials.prepend(menu_func)
+    bpy.types.VIEW3D_MT_edit_mesh_context_menu.prepend(menu_func)
 
 
 def unregister():
-    bpy.types.VIEW3D_MT_edit_mesh_specials.remove(menu_func)
+    bpy.types.VIEW3D_MT_edit_mesh_context_menu.remove(menu_func)
     for cls in reversed(classes):
         bpy.utils.unregister_class(cls)
     del bpy.types.Scene.tinycad_props
diff --git a/oscurart_tools/__init__.py b/oscurart_tools/__init__.py
index f3a162e8..60e4d34e 100644
--- a/oscurart_tools/__init__.py
+++ b/oscurart_tools/__init__.py
@@ -163,9 +163,9 @@ classes = (
 def register():   
     from bpy.types import Scene
     Scene.multimeshedit = StringProperty()
-    bpy.types.VIEW3D_MT_edit_mesh_specials.prepend(menu_funcMesh)
-    bpy.types.IMAGE_MT_uvs_specials.prepend(menu_funcImage)
-    bpy.types.VIEW3D_MT_object_specials.prepend(menu_funcObject)
+    bpy.types.VIEW3D_MT_edit_mesh_context_menu.prepend(menu_funcMesh)
+    bpy.types.IMAGE_MT_uvs_context_menu.prepend(menu_funcImage)
+    bpy.types.VIEW3D_MT_object_context_menu.prepend(menu_funcObject)
     bpy.app.handlers.render_pre.append(render_tokens.replaceTokens)
     bpy.app.handlers.render_cancel.append(render_tokens.restoreTokens) 
     bpy.app.handlers.render_post.append(render_tokens.restoreTokens) 
@@ -179,9 +179,9 @@ def register():
                                                                               
 
 def unregister():
-    bpy.types.VIEW3D_MT_edit_mesh_specials.remove(menu_funcMesh)
-    bpy.types.IMAGE_MT_uvs_specials.remove(menu_funcImage)
-    bpy.types.VIEW3D_MT_object_specials.remove(menu_funcObject)
+    bpy.types.VIEW3D_MT_edit_mesh_context_menu.remove(menu_funcMesh)
+    bpy.types.IMAGE_MT_uvs_context_menu.remove(menu_funcImage)
+    bpy.types.VIEW3D_MT_object_context_menu.remove(menu_funcObject)
 
     from bpy.utils import unregister_class
     for cls in reversed(classes):
diff --git a/rigify/legacy/rigs/pitchipoy/super_face.py b/rigify/legacy/rigs/pitchipoy/super_face.py
index 32097d43..ce593f55 100644
--- a/rigify/legacy/rigs/pitchipoy/super_face.py
+++ b/rigify/legacy/rigs/pitchipoy/super_face.py
@@ -733,7 +733,7 @@ class Rig:
     def constraints( self, all_bones ):
         ## Def bone constraints
 
-        def_specials = {
+        def_context_menu = {
             # 'bone'             : 'target'
             'DEF-jaw'               : 'chin',
             'DEF-chin.L'            : 'lips.L',
@@ -771,9 +771,9 @@ class Rig:
         pattern = r'^DEF-(\w+\.?\w?\.?\w?)(\.?)(\d*?)(\d?)$'
 
         for bone in [ bone for bone in all_bones['deform']['all'] if 'lid' not in bone ]:
-            if bone in def_specials:
-                if def_specials[bone] is not None:
-                    self.make_constraits('def_tweak', bone, def_specials[bone] )
+            if bone in def_context_menu:
+                if def_context_menu[bone] is not None:
+                    self.make_constraits('def_tweak', bone, def_context_menu[bone] )
             else:
                 matches = re.match( pattern, bone ).groups()
                 if len( matches ) > 1 and matches[-1]:
diff --git a/rigify/rigs/faces/super_face.py b/rigify/rigs/faces/super_face.py
index b899c0b2..c097cbb9 100644
--- a/rigify/rigs/faces/super_face.py
+++ b/rigify/rigs/faces/super_face.py
@@ -750,7 +750,7 @@ class Rig:
     def constraints( self, all_bones ):
         ## Def bone constraints
 
-        def_specials = {
+        def_context_menu = {
             # 'bone'             : 'target'
             'DEF-jaw'               : 'chin',
             'DEF-chin.L'            : 'lips.L',
@@ -788,9 +788,9 @@ class Rig:
         pattern = r'^DEF-(\w+\.?\w?\.?\w?)(\.?)(\d*?)(\d?)$'
 
         for bone in [ bone for bone in all_bones['deform']['all'] if 'lid' not in bone ]:
-            if bone in def_specials:
-                if def_specials[bone] is not None:
-                    self.make_constraits('def_tweak', bone, def_specials[bone] )
+            if bone in def_context_menu:
+                if def_context_menu[bone] is not None:
+                    self.make_constraits('def_tweak', bone, def_context_menu[bone] )
             else:
                 matches = re.match( pattern, bone ).groups()
                 if len( matches ) > 1 and matches[-1]:
diff --git a/rigify/ui.py b/rigify/ui.py
index a8a25103..3d2a1efa 100644
--- a/rigify/ui.py
+++ b/rigify/ui.py
@@ -514,7 +514,7 @@ class DATA_UL_rigify_bone_groups(bpy.types.UIList):
         row2.enabled = not bpy.context.object.data.rigify_colors_lock
 
 
-class DATA_MT_rigify_bone_groups_specials(bpy.types.Menu):
+class DATA_MT_rigify_bone_groups_context_menu(bpy.types.Menu):
     bl_label = 'Rigify Bone Groups Specials'
 
     def draw(self, context):
@@ -556,7 +556,7 @@ class DATA_PT_rigify_bone_groups(bpy.types.Panel):
         col = row.column(align=True)
         col.operator("armature.rigify_bone_group_add", icon='ZOOM_IN', text="")
         col.operator("armature.rigify_bone_group_remove", icon='ZOOM_OUT', text="").idx = obj.data.rigify_colors_index
-        col.menu("DATA_MT_rigify_bone_groups_specials", icon='DOWNARROW_HLT', text="")
+        col.menu("DATA_MT_rigify_bone_groups_context_menu", icon='DOWNARROW_HLT', text="")
         row = layout.row()
         row.prop(armature, 'rigify_theme_to_add', text = 'Theme')
         op = row.operator("armature.rigify_bone_group_add_theme", text="Add From Theme")
@@ -1333,7 +1333,7 @@ classes = (
     DATA_OT_rigify_bone_group_remove,
     DATA_OT_rigify_bone_group_remove_all,
     DATA_UL_rigify_bone_groups,
-    DATA_MT_rigify_bone_groups_specials,
+    DATA_MT_rigify_bone_groups_context_menu,
     DATA_PT_rigify_bone_groups,
     DATA_PT_rigify_layer_names,
     DATA_PT_rigify_buttons,
diff --git a/space_view3d_spacebar_menu.py b/space_view3d_spacebar_menu.py
index be900c42..a29f5437 100644
--- a/space_view3d_spacebar_menu.py
+++ b/space_view3d_spacebar_menu.py
@@ -96,7 +96,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
             layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
             layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
             UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_object_specials", text="Specials", icon='SOLO_OFF')
+            layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
             if context.gpencil_data and context.gpencil_data.use_stroke_edit_mode:
                 layout.menu("VIEW3D_MT_Edit_Gpencil", icon='GREASEPENCIL')
             layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
@@ -129,7 +129,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
             layout.menu("VIEW3D_MT_EditCursorMenu", icon='PIVOT_CURSOR')
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_UV_Map", icon='MOD_UVPROJECT')
-            layout.menu("VIEW3D_MT_edit_mesh_specials", icon='SOLO_OFF')
+            layout.menu("VIEW3D_MT_edit_mesh_context_menu", icon='SOLO_OFF')
             layout.menu("VIEW3D_MT_edit_mesh_extrude", icon='XRAY')
             UseSeparator(self, context)
             layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER')
@@ -235,7 +235,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
             layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
             layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
             UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_object_specials", text="Specials", icon='SOLO_OFF')
+            layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
             layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
             UseSeparator(self, context)
             layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER')
@@ -299,7 +299,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
             layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
             layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
             UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_object_specials", text="Specials", icon='SOLO_OFF')
+            layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
             layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
             layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER')
             layout.operator_menu_enum("object.constraint_add",
@@ -362,7 +362,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
             layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
             layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
             UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_object_specials", text="Specials", icon='SOLO_OFF')
+            layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
             layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
             UseSeparator(self, context)
             layout.operator_menu_enum("object.constraint_add",
@@ -423,7 +423,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
             layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
             layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
             UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_object_specials", text="Specials", icon='SOLO_OFF')
+            layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
             layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
             UseSeparator(self, context)
             layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER')
@@ -475,7 +475,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
             layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
             layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
             UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_object_specials", text="Specials", icon='SOLO_OFF')
+            layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
             layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
             UseSeparator(self, context)
             layout.operator_menu_enum("object.constraint_add",
@@ -506,7 +506,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
             layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
             layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
             UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_object_specials", text="Specials", icon='SOLO_OFF')
+            layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
             layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
             UseSeparator(self, context)
             layout.operator_menu_enum("object.constraint_add",
@@ -538,7 +538,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
             layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
             layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
             UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_object_specials", text="Specials", icon='SOLO_OFF')
+            layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
             layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
             UseSeparator(self, context)
             layout.operator_menu_enum("object.constraint_add",
@@ -572,7 +572,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
             layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
             layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR')
             layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
-            layout.menu("VIEW3D_MT_armature_specials", icon='SOLO_OFF')
+            layout.menu("VIEW3D_MT_armature_context_menu", icon='SOLO_OFF')
             layout.menu("VIEW3D_MT_edit_armature_roll",
                         icon='BONE_DATA')
             UseSeparator(self, context)
@@ -609,7 +609,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
             layout.menu("VIEW3D_MT_pose_apply", icon='AUTO')
             layout.operator("pose.relax", icon='ARMATURE_DATA')
             layout.menu("VIEW3D_MT_KeyframeMenu", icon='KEY_HLT')
-            layout.menu("VIEW3D_MT_pose_specials", icon='SOLO_OFF')
+            layout.menu("VIEW3D_MT_pose_context_menu", icon='SOLO_OFF')
             layout.menu("VIEW3D_MT_pose_group", icon='GROUP_BONE')
             UseSeparator(self, context)
             layout.operator_menu_enum("pose.constraint_add",
@@ -640,7 +640,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
             layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
             layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
             UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_object_specials", text="Specials", icon='SOLO_OFF')
+            layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
             layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
             UseSeparator(self, context)
             layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER')
@@ -700,7 +700,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
             layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
             layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
             UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_object_specials", text="Specials", icon='SOLO_OFF')
+            layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
             layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
             UseSeparator(self, context)
             layout.operator_menu_enum("object.constraint_add",
@@ -762,7 +762,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
                                   icon="SMOOTHCURVE")
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_particle", icon='PARTICLEMODE')
-            layout.menu("VIEW3D_MT_particle_specials", text="Hair Specials", icon='HAIR')
+            layout.menu("VIEW3D_MT_particle_context_menu", text="Hair Specials", icon='HAIR')
             UseSeparator(self, context)
             layout.operator("object.delete", text="Delete Object", icon='X')
             UseSeparator(self, context)