space_view3d_pie_menus: fix class names

18 files changed, 205 insertions, 205 deletions

diff --git a/space_view3d_pie_menus/__init__.py b/space_view3d_pie_menus/__init__.py
index bfb5d3fa..d139217d 100644
--- a/space_view3d_pie_menus/__init__.py
+++ b/space_view3d_pie_menus/__init__.py
@@ -33,7 +33,7 @@ from bpy.types import (
 bl_info = {
     "name": "3D Viewport Pie Menus",
     "author": "meta-androcto, pitiwazou, chromoly, italic",
-    "version": (1, 1, 8),
+    "version": (1, 1, 9),
     "blender": (2, 80, 0),
     "description": "Individual Pie Menu Activation List",
     "location": "Addons Preferences",
diff --git a/space_view3d_pie_menus/pie_align_menu.py b/space_view3d_pie_menus/pie_align_menu.py
index 792d4d12..0223be53 100644
--- a/space_view3d_pie_menus/pie_align_menu.py
+++ b/space_view3d_pie_menus/pie_align_menu.py
@@ -39,7 +39,7 @@ from bpy.props import EnumProperty
 
 
 # Pie Align - Alt + X
-class PieAlign(Menu):
+class PIE_MT_Align(Menu):
     bl_idname = "PIE_MT_align"
     bl_label = "Pie Align"
 
@@ -96,7 +96,7 @@ class PieAlign(Menu):
 
 
 # Align to X, Y, Z
-class AlignSelectedXYZ(Operator):
+class PIE_OT_AlignSelectedXYZ(Operator):
     bl_idname = "align.selected2xyz"
     bl_label = "Align to X, Y, Z"
     bl_description = "Align Selected Along the chosen axis"
@@ -140,7 +140,7 @@ class AlignSelectedXYZ(Operator):
 #    Align To 0     #
 # ################# #
 
-class AlignToXYZ0(Operator):
+class PIE_OT_AlignToXYZ0(Operator):
     bl_idname = "align.2xyz"
     bl_label = "Align To X, Y or Z = 0"
     bl_description = "Align Active Object To a chosen X, Y or Z equals 0 Location"
@@ -174,7 +174,7 @@ class AlignToXYZ0(Operator):
 
 
 # Align X Left
-class AlignXYZAll(Operator):
+class PIE_OT_AlignXYZAll(Operator):
     bl_idname = "alignxyz.all"
     bl_label = "Align to Front/Back Axis"
     bl_description = "Align to a Front or Back along the chosen Axis"
@@ -235,10 +235,10 @@ class AlignXYZAll(Operator):
 
 
 classes = (
-    PieAlign,
-    AlignSelectedXYZ,
-    AlignToXYZ0,
-    AlignXYZAll,
+    PIE_MT_Align,
+    PIE_OT_AlignSelectedXYZ,
+    PIE_OT_AlignToXYZ0,
+    PIE_OT_AlignXYZAll,
     )
 
 addon_keymaps = []
diff --git a/space_view3d_pie_menus/pie_animation_menu.py b/space_view3d_pie_menus/pie_animation_menu.py
index 443605a8..73c68964 100644
--- a/space_view3d_pie_menus/pie_animation_menu.py
+++ b/space_view3d_pie_menus/pie_animation_menu.py
@@ -39,7 +39,7 @@ from bpy.types import (
 # Pie Animation
 
 
-class PieAnimation(Menu):
+class PIE_MT_PieAnimation(Menu):
     bl_idname = "PIE_MT_animation"
     bl_label = "Pie Animation"
 
@@ -68,7 +68,7 @@ class PieAnimation(Menu):
 
 
 # Insert Auto Keyframe
-class InsertAutoKeyframe(Operator):
+class PIE_OT_InsertAutoKeyframe(Operator):
     bl_idname = "insert.autokeyframe"
     bl_label = "Insert Auto Keyframe"
     bl_description = "Toggle Insert Auto Keyframe"
@@ -87,8 +87,8 @@ class InsertAutoKeyframe(Operator):
 
 
 classes = (
-    PieAnimation,
-    InsertAutoKeyframe
+    PIE_MT_PieAnimation,
+    PIE_OT_InsertAutoKeyframe
     )
 
 addon_keymaps = []
diff --git a/space_view3d_pie_menus/pie_apply_transform_menu.py b/space_view3d_pie_menus/pie_apply_transform_menu.py
index 35f99c52..d5faf646 100644
--- a/space_view3d_pie_menus/pie_apply_transform_menu.py
+++ b/space_view3d_pie_menus/pie_apply_transform_menu.py
@@ -39,7 +39,7 @@ from bpy.props import EnumProperty
 
 
 # Pie Apply Transforms - Ctrl + A
-class PieApplyTransforms(Menu):
+class PIE_MT_PieApplyTransforms(Menu):
     bl_idname = "PIE_MT_applytransforms"
     bl_label = "Pie Apply Transforms"
 
@@ -65,7 +65,7 @@ class PieApplyTransforms(Menu):
 
 
 # Apply Transforms
-class ApplyTransLocRotPie(Operator):
+class PIE_OT_ApplyTransLocRotPie(Operator):
     bl_idname = "apply.transformlocrotscale"
     bl_label = "Apply Transforms"
     bl_description = "Apply Transform: Location, Rotation or Scale"
@@ -91,7 +91,7 @@ class ApplyTransLocRotPie(Operator):
 
 
 # Apply Transforms
-class ApplyTransformAll(Operator):
+class PIE_OT_ApplyTransformAll(Operator):
     bl_idname = "apply.transformall"
     bl_label = "Apply All Transforms"
     bl_description = "Apply Transform All"
@@ -103,7 +103,7 @@ class ApplyTransformAll(Operator):
 
 
 # Clear Menu
-class ClearMenu(Menu):
+class PIE_OT_ClearMenu(Menu):
     bl_idname = "PIE_MT_clear_menu"
     bl_label = "Clear Menu"
 
@@ -116,7 +116,7 @@ class ClearMenu(Menu):
 
 
 # Clear all
-class ClearAll(Operator):
+class PIE_OT_ClearAll(Operator):
     bl_idname = "clear.all"
     bl_label = "Clear All"
     bl_description = "Clear All Transforms"
@@ -130,11 +130,11 @@ class ClearAll(Operator):
 
 
 classes = (
-    PieApplyTransforms,
-    ApplyTransLocRotPie,
-    ApplyTransformAll,
-    ClearMenu,
-    ClearAll,
+    PIE_MT_PieApplyTransforms,
+    PIE_OT_ApplyTransLocRotPie,
+    PIE_OT_ApplyTransformAll,
+    PIE_OT_ClearMenu,
+    PIE_OT_ClearAll,
     )
 
 addon_keymaps = []
diff --git a/space_view3d_pie_menus/pie_cursor.py b/space_view3d_pie_menus/pie_cursor.py
index 3e6225dd..6d60c47e 100644
--- a/space_view3d_pie_menus/pie_cursor.py
+++ b/space_view3d_pie_menus/pie_cursor.py
@@ -38,7 +38,7 @@ from bpy.types import (
 
 
 # SnapCursSelToCenter1 thanks to Isaac Weaver (wisaac) D1963
-class Snap_CursSelToCenter1(Operator):
+class PIE_OT_Snap_CursSelToCenter1(Operator):
     bl_idname = "view3d.snap_cursor_selected_to_center1"
     bl_label = "Snap Cursor & Selection to Center"
     bl_description = ("Snap 3D cursor and selected objects to the center \n"
@@ -57,7 +57,7 @@ class Snap_CursSelToCenter1(Operator):
 
 
 # Origin/Pivot menu1  - Shift + S
-class Snap_CursorMenu(Menu):
+class PIE_MT_Snap_CursorMenu(Menu):
     bl_idname = "SNAP_MT_cursormenu"
     bl_label = "Cursor Menu"
 
@@ -86,8 +86,8 @@ class Snap_CursorMenu(Menu):
 
 
 classes = (
-    Snap_CursorMenu,
-    Snap_CursSelToCenter1,
+    PIE_MT_Snap_CursorMenu,
+    PIE_OT_Snap_CursSelToCenter1,
     )
 
 addon_keymaps = []
diff --git a/space_view3d_pie_menus/pie_delete_menu.py b/space_view3d_pie_menus/pie_delete_menu.py
index 00cec262..ad8e2ddb 100644
--- a/space_view3d_pie_menus/pie_delete_menu.py
+++ b/space_view3d_pie_menus/pie_delete_menu.py
@@ -35,7 +35,7 @@ from bpy.types import Menu
 
 
 # Pie Delete - X
-class PieDelete(Menu):
+class PIE_MT_PieDelete(Menu):
     bl_idname = "PIE_MT_delete"
     bl_label = "Pie Delete"
 
@@ -67,7 +67,7 @@ class PieDelete(Menu):
 
 
 classes = (
-    PieDelete,
+    PIE_MT_PieDelete,
     )
 
 
diff --git a/space_view3d_pie_menus/pie_editor_switch_menu.py b/space_view3d_pie_menus/pie_editor_switch_menu.py
index 2465c1b9..6fb2df28 100644
--- a/space_view3d_pie_menus/pie_editor_switch_menu.py
+++ b/space_view3d_pie_menus/pie_editor_switch_menu.py
@@ -40,28 +40,28 @@ from bpy.props import (
         )
 
 
-class AreaPieMenu(Menu):
+class PIE_MT_AreaPieMenu(Menu):
     bl_idname = "TOPBAR_MT_window_pie"
     bl_label = "Pie Menu"
     bl_description = "Window Pie Menus"
 
     def draw(self, context):
-        self.layout.operator(AreaTypePieOperator.bl_idname, icon="PLUGIN")
+        self.layout.operator(PIE_OT_AreaTypePieOperator.bl_idname, icon="PLUGIN")
 
 
-class AreaTypePieOperator(Operator):
+class PIE_OT_AreaTypePieOperator(Operator):
     bl_idname = "wm.area_type_pie_operator"
     bl_label = "Editor Type"
     bl_description = "This is pie menu of editor type change"
     bl_options = {'REGISTER', 'UNDO'}
 
     def execute(self, context):
-        bpy.ops.wm.call_menu_pie(name=AreaPieEditor.bl_idname)
+        bpy.ops.wm.call_menu_pie(name=PIE_MT_AreaPieEditor.bl_idname)
 
         return {'FINISHED'}
 
 
-class AreaPieEditor(Menu):
+class PIE_MT_AreaPieEditor(Menu):
     bl_idname = "PIE_MT_editor"
     bl_label = "Editor Switch"
 
@@ -69,37 +69,37 @@ class AreaPieEditor(Menu):
         layout = self.layout
         pie = layout.menu_pie()
         # 4 - LEFT
-        pie.operator(SetAreaType.bl_idname, text="Text Editor", icon="TEXT").types = "TEXT_EDITOR"
+        pie.operator(PIE_OT_SetAreaType.bl_idname, text="Text Editor", icon="TEXT").types = "TEXT_EDITOR"
         # 6 - RIGHT
-        pie.menu(AreaTypePieAnim.bl_idname, text="Animation Editors", icon="ACTION")
+        pie.menu(PIE_MT_AreaTypePieAnim.bl_idname, text="Animation Editors", icon="ACTION")
         # 2 - BOTTOM
-        pie.operator(SetAreaType.bl_idname, text="Property", icon="PROPERTIES").types = "PROPERTIES"
+        pie.operator(PIE_OT_SetAreaType.bl_idname, text="Property", icon="PROPERTIES").types = "PROPERTIES"
         # 8 - TOP
-        pie.operator(SetAreaType.bl_idname, text="3D View", icon="MESH_CUBE").types = "VIEW_3D"
+        pie.operator(PIE_OT_SetAreaType.bl_idname, text="3D View", icon="MESH_CUBE").types = "VIEW_3D"
         # 7 - TOP - LEFT
-        pie.operator(SetAreaType.bl_idname, text="UV/Image Editor", icon="UV").types = "IMAGE_EDITOR"
+        pie.operator(PIE_OT_SetAreaType.bl_idname, text="UV/Image Editor", icon="UV").types = "IMAGE_EDITOR"
         # 9 - TOP - RIGHT
-        pie.operator(SetAreaType.bl_idname, text="Node Editor", icon="NODETREE").types = "NODE_EDITOR"
+        pie.operator(PIE_OT_SetAreaType.bl_idname, text="Node Editor", icon="NODETREE").types = "NODE_EDITOR"
         # 1 - BOTTOM - LEFT
-        pie.operator(SetAreaType.bl_idname, text="Outliner", icon="OUTLINER").types = "OUTLINER"
+        pie.operator(PIE_OT_SetAreaType.bl_idname, text="Outliner", icon="OUTLINER").types = "OUTLINER"
         # 3 - BOTTOM - RIGHT
-        pie.menu(AreaTypePieOther.bl_idname, text="More Editors", icon="QUESTION")
+        pie.menu(PIE_MT_AreaTypePieOther.bl_idname, text="More Editors", icon="QUESTION")
 
 
-class AreaTypePieOther(Menu):
+class PIE_MT_AreaTypePieOther(Menu):
     bl_idname = "TOPBAR_MT_window_pie_area_type_other"
     bl_label = "Editor Type (other)"
     bl_description = "Is pie menu change editor type (other)"
 
     def draw(self, context):
-        self.layout.operator(SetAreaType.bl_idname, text="File Browser", icon="FILEBROWSER").types = "FILE_BROWSER"
-        self.layout.operator(SetAreaType.bl_idname, text="Python Console", icon="CONSOLE").types = "CONSOLE"
-        self.layout.operator(SetAreaType.bl_idname, text="User Preferences",
+        self.layout.operator(PIE_OT_SetAreaType.bl_idname, text="File Browser", icon="FILEBROWSER").types = "FILE_BROWSER"
+        self.layout.operator(PIE_OT_SetAreaType.bl_idname, text="Python Console", icon="CONSOLE").types = "CONSOLE"
+        self.layout.operator(PIE_OT_SetAreaType.bl_idname, text="User Preferences",
                              icon="PREFERENCES").types = "USER_PREFERENCES"
-        self.layout.operator(SetAreaType.bl_idname, text="Info", icon="INFO").types = "INFO"
+        self.layout.operator(PIE_OT_SetAreaType.bl_idname, text="Info", icon="INFO").types = "INFO"
 
 
-class SetAreaType(Operator):
+class PIE_OT_SetAreaType(Operator):
     bl_idname = "wm.set_area_type"
     bl_label = "Change Editor Type"
     bl_description = "Change Editor Type"
@@ -112,29 +112,29 @@ class SetAreaType(Operator):
         return {'FINISHED'}
 
 
-class AreaTypePieAnim(Menu):
+class PIE_MT_AreaTypePieAnim(Menu):
     bl_idname = "TOPBAR_MT_window_pie_area_type_anim"
     bl_label = "Editor Type (Animation)"
     bl_description = "Menu for changing editor type (animation related)"
 
     def draw(self, context):
-        self.layout.operator(SetAreaType.bl_idname, text="NLA Editor", icon="NLA").types = "NLA_EDITOR"
-        self.layout.operator(SetAreaType.bl_idname, text="DopeSheet", icon="ACTION").types = "DOPESHEET_EDITOR"
-        self.layout.operator(SetAreaType.bl_idname, text="Graph Editor", icon="GRAPH").types = "GRAPH_EDITOR"
-        self.layout.operator(SetAreaType.bl_idname, text="Timeline", icon="TIME").types = "TIMELINE"
-        self.layout.operator(SetAreaType.bl_idname,
+        self.layout.operator(PIE_OT_SetAreaType.bl_idname, text="NLA Editor", icon="NLA").types = "NLA_EDITOR"
+        self.layout.operator(PIE_OT_SetAreaType.bl_idname, text="DopeSheet", icon="ACTION").types = "DOPESHEET_EDITOR"
+        self.layout.operator(PIE_OT_SetAreaType.bl_idname, text="Graph Editor", icon="GRAPH").types = "GRAPH_EDITOR"
+        self.layout.operator(PIE_OT_SetAreaType.bl_idname, text="Timeline", icon="TIME").types = "TIMELINE"
+        self.layout.operator(PIE_OT_SetAreaType.bl_idname,
                              text="Video Sequence Editor", icon="SEQUENCE").types = "SEQUENCE_EDITOR"
-        self.layout.operator(SetAreaType.bl_idname,
+        self.layout.operator(PIE_OT_SetAreaType.bl_idname,
                              text="Video Clip Editor", icon="RENDER_ANIMATION").types = "CLIP_EDITOR"
 
 
 classes = (
-    AreaPieMenu,
-    AreaTypePieOperator,
-    AreaPieEditor,
-    AreaTypePieOther,
-    SetAreaType,
-    AreaTypePieAnim,
+    PIE_MT_AreaPieMenu,
+    PIE_OT_AreaTypePieOperator,
+    PIE_MT_AreaPieEditor,
+    PIE_MT_AreaTypePieOther,
+    PIE_OT_SetAreaType,
+    PIE_MT_AreaTypePieAnim,
     )
 
 addon_keymaps = []
diff --git a/space_view3d_pie_menus/pie_manipulator_menu.py b/space_view3d_pie_menus/pie_manipulator_menu.py
index 2c0af6a5..8a8b10cb 100644
--- a/space_view3d_pie_menus/pie_manipulator_menu.py
+++ b/space_view3d_pie_menus/pie_manipulator_menu.py
@@ -41,7 +41,7 @@ from bpy.props import (
 )
 
 
-class WManupulators(Operator):
+class PIE_OT_WManupulators(Operator):
     bl_idname = "w.manipulators"
     bl_label = "W Manupulators"
     bl_options = {'REGISTER', 'UNDO'}
@@ -84,7 +84,7 @@ class WManupulators(Operator):
 
 
 # Pie Manipulators - Ctrl + Space
-class PieManipulator(Menu):
+class PIE_MT_Manipulator(Menu):
     bl_idname = "PIE_MT_manipulator"
     bl_label = "Pie Manipulator"
 
@@ -103,8 +103,8 @@ class PieManipulator(Menu):
 
 
 classes = (
-    PieManipulator,
-    WManupulators,
+    PIE_OT_WManupulators,
+    PIE_MT_Manipulator,
     )
 
 addon_keymaps = []
diff --git a/space_view3d_pie_menus/pie_modes_menu.py b/space_view3d_pie_menus/pie_modes_menu.py
index f288041b..566c3cc3 100644
--- a/space_view3d_pie_menus/pie_modes_menu.py
+++ b/space_view3d_pie_menus/pie_modes_menu.py
@@ -37,7 +37,7 @@ from bpy.types import (
 )
 
 
-class ClassObject(Operator):
+class PIE_OT_ClassObject(Operator):
     bl_idname = "class.object"
     bl_label = "Class Object"
     bl_description = "Edit/Object Mode Switch"
@@ -51,7 +51,7 @@ class ClassObject(Operator):
         return {'FINISHED'}
 
 
-class ClassVertex(Operator):
+class PIE_OT_ClassVertex(Operator):
     bl_idname = "class.vertex"
     bl_label = "Class Vertex"
     bl_description = "Vert Select"
@@ -66,7 +66,7 @@ class ClassVertex(Operator):
             return {'FINISHED'}
 
 
-class ClassEdge(Operator):
+class PIE_OT_ClassEdge(Operator):
     bl_idname = "class.edge"
     bl_label = "Class Edge"
     bl_description = "Edge Select"
@@ -81,7 +81,7 @@ class ClassEdge(Operator):
             return {'FINISHED'}
 
 
-class ClassFace(Operator):
+class PIE_OT_ClassFace(Operator):
     bl_idname = "class.face"
     bl_label = "Class Face"
     bl_description = "Face Select"
@@ -96,7 +96,7 @@ class ClassFace(Operator):
             return {'FINISHED'}
 
 
-class ClassTexturePaint(Operator):
+class PIE_OT_ClassTexturePaint(Operator):
     bl_idname = "class.pietexturepaint"
     bl_label = "Class Texture Paint"
     bl_description = "Texture Paint"
@@ -111,7 +111,7 @@ class ClassTexturePaint(Operator):
         return {'FINISHED'}
 
 
-class ClassWeightPaint(Operator):
+class PIE_OT_ClassWeightPaint(Operator):
     bl_idname = "class.pieweightpaint"
     bl_label = "Class Weight Paint"
     bl_description = "Weight Paint"
@@ -126,7 +126,7 @@ class ClassWeightPaint(Operator):
         return {'FINISHED'}
 
 
-class ClassVertexPaint(Operator):
+class PIE_OT_ClassVertexPaint(Operator):
     bl_idname = "class.pievertexpaint"
     bl_label = "Class Vertex Paint"
     bl_description = "Vertex Paint"
@@ -141,7 +141,7 @@ class ClassVertexPaint(Operator):
         return {'FINISHED'}
 
 
-class ClassParticleEdit(Operator):
+class PIE_OT_ClassParticleEdit(Operator):
     bl_idname = "class.pieparticleedit"
     bl_label = "Class Particle Edit"
     bl_description = "Particle Edit (must have active particle system)"
@@ -157,7 +157,7 @@ class ClassParticleEdit(Operator):
 
 
 # Set Mode Operator #
-class SetObjectModePie(Operator):
+class PIE_OT_SetObjectModePie(Operator):
     bl_idname = "object.set_object_mode_pie"
     bl_label = "Set the object interactive mode"
     bl_description = "I set the interactive mode of object"
@@ -178,7 +178,7 @@ class SetObjectModePie(Operator):
 
 
 # Components Selection Mode
-class VertsEdges(Operator):
+class PIE_OT_VertsEdges(Operator):
     bl_idname = "verts.edges"
     bl_label = "Verts Edges"
     bl_description = "Vert/Edge Select"
@@ -193,7 +193,7 @@ class VertsEdges(Operator):
             return {'FINISHED'}
 
 
-class EdgesFaces(Operator):
+class PIE_OT_EdgesFaces(Operator):
     bl_idname = "edges.faces"
     bl_label = "EdgesFaces"
     bl_description = "Edge/Face Select"
@@ -208,7 +208,7 @@ class EdgesFaces(Operator):
             return {'FINISHED'}
 
 
-class VertsFaces(Operator):
+class PIE_OT_VertsFaces(Operator):
     bl_idname = "verts.faces"
     bl_label = "Verts Faces"
     bl_description = "Vert/Face Select"
@@ -223,7 +223,7 @@ class VertsFaces(Operator):
             return {'FINISHED'}
 
 
-class VertsEdgesFaces(Operator):
+class PIE_OT_VertsEdgesFaces(Operator):
     bl_idname = "verts.edgesfaces"
     bl_label = "Verts Edges Faces"
     bl_description = "Vert/Edge/Face Select"
@@ -239,7 +239,7 @@ class VertsEdgesFaces(Operator):
 
 
 # Grease Pencil Interactive Mode
-class PieInteractiveModeGreasePencil(Operator):
+class PIE_OT_InteractiveModeGreasePencil(Operator):
     bl_idname = "view3d.pie_interactive_mode_grease_pencil"
     bl_label = "Edit Strokes"
     bl_description = "Toggle Edit Strokes for Grease Pencil"
@@ -258,7 +258,7 @@ class PieInteractiveModeGreasePencil(Operator):
 
 
 # Menus
-class PieObjectEditotherModes(Menu):
+class PIE_MT_ObjectEditotherModes(Menu):
     """Edit/Object Others modes"""
     bl_idname = "MENU_MT_objecteditmodeothermodes"
     bl_label = "Edit Selection Modes"
@@ -277,7 +277,7 @@ class PieObjectEditotherModes(Menu):
         box.operator("verts.edgesfaces", text="Vertex/Edges/Faces", icon='OBJECT_DATAMODE')
 
 
-class PieObjectEditMode(Menu):
+class PIE_MT_ObjectEditMode(Menu):
     """Modes Switch"""
     bl_idname = "PIE_MT_objecteditmode"
     bl_label = "Modes Menu (Tab)"
@@ -438,22 +438,22 @@ class PieObjectEditMode(Menu):
 
 
 classes = (
-    PieObjectEditMode,
-    ClassObject,
-    ClassVertex,
-    ClassEdge,
-    ClassFace,
-    PieObjectEditotherModes,
-    ClassTexturePaint,
-    ClassWeightPaint,
-    ClassVertexPaint,
-    ClassParticleEdit,
-    PieInteractiveModeGreasePencil,
-    VertsEdges,
-    EdgesFaces,
-    VertsFaces,
-    VertsEdgesFaces,
-    SetObjectModePie,
+    PIE_MT_ObjectEditMode,
+    PIE_OT_ClassObject,
+    PIE_OT_ClassVertex,
+    PIE_OT_ClassEdge,
+    PIE_OT_ClassFace,
+    PIE_MT_ObjectEditotherModes,
+    PIE_OT_ClassTexturePaint,
+    PIE_OT_ClassWeightPaint,
+    PIE_OT_ClassVertexPaint,
+    PIE_OT_ClassParticleEdit,
+    PIE_OT_InteractiveModeGreasePencil,
+    PIE_OT_VertsEdges,
+    PIE_OT_EdgesFaces,
+    PIE_OT_VertsFaces,
+    PIE_OT_VertsEdgesFaces,
+    PIE_OT_SetObjectModePie,
     )
 
 addon_keymaps = []
diff --git a/space_view3d_pie_menus/pie_orientation_menu.py b/space_view3d_pie_menus/pie_orientation_menu.py
index afcbee42..2b8dd844 100644
--- a/space_view3d_pie_menus/pie_orientation_menu.py
+++ b/space_view3d_pie_menus/pie_orientation_menu.py
@@ -39,7 +39,7 @@ from bpy.props import (
         )
 
 
-class OrientPie(Menu):
+class PIE_MT_OrientPie(Menu):
     bl_label = "Transform Orientation"
     bl_idname = "PIE_MT_orient"
 
@@ -54,7 +54,7 @@ class OrientPie(Menu):
 addon_keymaps = []
 
 classes = (
-    OrientPie,
+    PIE_MT_OrientPie,
     )
 
 
diff --git a/space_view3d_pie_menus/pie_origin.py b/space_view3d_pie_menus/pie_origin.py
index f99a2e4c..377be27f 100644
--- a/space_view3d_pie_menus/pie_origin.py
+++ b/space_view3d_pie_menus/pie_origin.py
@@ -38,7 +38,7 @@ from bpy.types import (
 
 
 # Pivot to selection
-class PivotToSelection(Operator):
+class PIE_OT_PivotToSelection(Operator):
     bl_idname = "object.pivot2selection"
     bl_label = "Pivot To Selection"
     bl_description = "Pivot Point To Selection"
@@ -59,7 +59,7 @@ class PivotToSelection(Operator):
 
 
 # Pivot to Bottom
-class PivotBottom(Operator):
+class PIE_OT_PivotBottom(Operator):
     bl_idname = "object.pivotobottom"
     bl_label = "Pivot To Bottom"
     bl_description = ("Set the Pivot Point To Lowest Point\n"
@@ -94,7 +94,7 @@ class PivotBottom(Operator):
 
 
 # Pie Origin/Pivot - Shift + S
-class PieOriginPivot(Menu):
+class PIE_MT_OriginPivot(Menu):
     bl_idname = "ORIGIN_MT_pivotmenu"
     bl_label = "Origin Menu"
 
@@ -141,9 +141,9 @@ class PieOriginPivot(Menu):
 
 
 classes = (
-    PieOriginPivot,
-    PivotToSelection,
-    PivotBottom,
+    PIE_MT_OriginPivot,
+    PIE_OT_PivotToSelection,
+    PIE_OT_PivotBottom,
     )
 
 addon_keymaps = []
diff --git a/space_view3d_pie_menus/pie_proportional_menu.py b/space_view3d_pie_menus/pie_proportional_menu.py
index 3a6d053b..0350d829 100644
--- a/space_view3d_pie_menus/pie_proportional_menu.py
+++ b/space_view3d_pie_menus/pie_proportional_menu.py
@@ -38,7 +38,7 @@ from bpy.types import (
 
 
 # Proportional Edit Object
-class ProportionalEditObj(Operator):
+class PIE_OT_ProportionalEditObj(Operator):
     bl_idname = "proportional_obj.active"
     bl_label = "Proportional Edit Object"
     bl_options = {'REGISTER', 'UNDO'}
@@ -55,7 +55,7 @@ class ProportionalEditObj(Operator):
         return {'FINISHED'}
 
 
-class ProportionalSmoothObj(Operator):
+class PIE_OT_ProportionalSmoothObj(Operator):
     bl_idname = "proportional_obj.smooth"
     bl_label = "Proportional Smooth Object"
     bl_options = {'REGISTER', 'UNDO'}
@@ -71,7 +71,7 @@ class ProportionalSmoothObj(Operator):
         return {'FINISHED'}
 
 
-class ProportionalSphereObj(Operator):
+class PIE_OT_ProportionalSphereObj(Operator):
     bl_idname = "proportional_obj.sphere"
     bl_label = "Proportional Sphere Object"
     bl_options = {'REGISTER', 'UNDO'}
@@ -87,7 +87,7 @@ class ProportionalSphereObj(Operator):
         return {'FINISHED'}
 
 
-class ProportionalRootObj(Operator):
+class PIE_OT_ProportionalRootObj(Operator):
     bl_idname = "proportional_obj.root"
     bl_label = "Proportional Root Object"
     bl_options = {'REGISTER', 'UNDO'}
@@ -103,7 +103,7 @@ class ProportionalRootObj(Operator):
         return {'FINISHED'}
 
 
-class ProportionalSharpObj(Operator):
+class PIE_OT_ProportionalSharpObj(Operator):
     bl_idname = "proportional_obj.sharp"
     bl_label = "Proportional Sharp Object"
     bl_options = {'REGISTER', 'UNDO'}
@@ -119,7 +119,7 @@ class ProportionalSharpObj(Operator):
         return {'FINISHED'}
 
 
-class ProportionalLinearObj(Operator):
+class PIE_OT_ProportionalLinearObj(Operator):
     bl_idname = "proportional_obj.linear"
     bl_label = "Proportional Linear Object"
     bl_options = {'REGISTER', 'UNDO'}
@@ -135,7 +135,7 @@ class ProportionalLinearObj(Operator):
         return {'FINISHED'}
 
 
-class ProportionalConstantObj(Operator):
+class PIE_OT_ProportionalConstantObj(Operator):
     bl_idname = "proportional_obj.constant"
     bl_label = "Proportional Constant Object"
     bl_options = {'REGISTER', 'UNDO'}
@@ -151,7 +151,7 @@ class ProportionalConstantObj(Operator):
         return {'FINISHED'}
 
 
-class ProportionalRandomObj(Operator):
+class PIE_OT_ProportionalRandomObj(Operator):
     bl_idname = "proportional_obj.random"
     bl_label = "Proportional Random Object"
     bl_options = {'REGISTER', 'UNDO'}
@@ -168,7 +168,7 @@ class ProportionalRandomObj(Operator):
 
 
 # Proportional Edit Edit Mode
-class ProportionalEditEdt(Operator):
+class PIE_OT_ProportionalEditEdt(Operator):
     bl_idname = "proportional_edt.active"
     bl_label = "Proportional Edit EditMode"
     bl_options = {'REGISTER', 'UNDO'}
@@ -179,7 +179,7 @@ class ProportionalEditEdt(Operator):
         return {'FINISHED'}
 
 
-class ProportionalConnectedEdt(Operator):
+class PIE_OT_ProportionalConnectedEdt(Operator):
     bl_idname = "proportional_edt.connected"
     bl_label = "Proportional Connected EditMode"
     bl_options = {'REGISTER', 'UNDO'}
@@ -190,7 +190,7 @@ class ProportionalConnectedEdt(Operator):
         return {'FINISHED'}
 
 
-class ProportionalProjectedEdt(Operator):
+class PIE_OT_ProportionalProjectedEdt(Operator):
     bl_idname = "proportional_edt.projected"
     bl_label = "Proportional projected EditMode"
     bl_options = {'REGISTER', 'UNDO'}
@@ -203,7 +203,7 @@ class ProportionalProjectedEdt(Operator):
         return {'FINISHED'}
 
 
-class ProportionalSmoothEdt(Operator):
+class PIE_OT_ProportionalSmoothEdt(Operator):
     bl_idname = "proportional_edt.smooth"
     bl_label = "Proportional Smooth EditMode"
     bl_options = {'REGISTER', 'UNDO'}
@@ -215,7 +215,7 @@ class ProportionalSmoothEdt(Operator):
         return {'FINISHED'}
 
 
-class ProportionalSphereEdt(Operator):
+class PIE_OT_ProportionalSphereEdt(Operator):
     bl_idname = "proportional_edt.sphere"
     bl_label = "Proportional Sphere EditMode"
     bl_options = {'REGISTER', 'UNDO'}
@@ -227,7 +227,7 @@ class ProportionalSphereEdt(Operator):
         return {'FINISHED'}
 
 
-class ProportionalRootEdt(Operator):
+class PIE_OT_ProportionalRootEdt(Operator):
     bl_idname = "proportional_edt.root"
     bl_label = "Proportional Root EditMode"
     bl_options = {'REGISTER', 'UNDO'}
@@ -239,7 +239,7 @@ class ProportionalRootEdt(Operator):
         return {'FINISHED'}
 
 
-class ProportionalSharpEdt(Operator):
+class PIE_OT_ProportionalSharpEdt(Operator):
     bl_idname = "proportional_edt.sharp"
     bl_label = "Proportional Sharp EditMode"
     bl_options = {'REGISTER', 'UNDO'}
@@ -251,7 +251,7 @@ class ProportionalSharpEdt(Operator):
         return {'FINISHED'}
 
 
-class ProportionalLinearEdt(Operator):
+class PIE_OT_ProportionalLinearEdt(Operator):
     bl_idname = "proportional_edt.linear"
     bl_label = "Proportional Linear EditMode"
     bl_options = {'REGISTER', 'UNDO'}
@@ -263,7 +263,7 @@ class ProportionalLinearEdt(Operator):
         return {'FINISHED'}
 
 
-class ProportionalConstantEdt(Operator):
+class PIE_OT_ProportionalConstantEdt(Operator):
     bl_idname = "proportional_edt.constant"
     bl_label = "Proportional Constant EditMode"
     bl_options = {'REGISTER', 'UNDO'}
@@ -275,7 +275,7 @@ class ProportionalConstantEdt(Operator):
         return {'FINISHED'}
 
 
-class ProportionalRandomEdt(Operator):
+class PIE_OT_ProportionalRandomEdt(Operator):
     bl_idname = "proportional_edt.random"
     bl_label = "Proportional Random EditMode"
     bl_options = {'REGISTER', 'UNDO'}
@@ -288,7 +288,7 @@ class ProportionalRandomEdt(Operator):
 
 
 # Pie ProportionalEditObj - O
-class PieProportionalObj(Menu):
+class PIE_MT_ProportionalObj(Menu):
     bl_idname = "PIE_MT_proportional_obj"
     bl_label = "Pie Proportional Obj"
 
@@ -314,7 +314,7 @@ class PieProportionalObj(Menu):
 
 
 # Pie ProportionalEditEdt - O
-class PieProportionalEdt(Menu):
+class PIE_MT_ProportionalEdt(Menu):
     bl_idname = "PIE_MT_proportional_edt"
     bl_label = "Pie Proportional Edit"
 
@@ -340,7 +340,7 @@ class PieProportionalEdt(Menu):
 
 
 # Pie ProportionalEditEdt - O
-class PieProportionalMore(Menu):
+class PIE_MT_ProportionalMore(Menu):
     bl_idname = "PIE_MT_proportional_more"
     bl_label = "Pie Proportional More"
 
@@ -354,27 +354,27 @@ class PieProportionalMore(Menu):
 
 
 classes = (
-    ProportionalEditObj,
-    ProportionalSmoothObj,
-    ProportionalSphereObj,
-    ProportionalRootObj,
-    ProportionalSharpObj,
-    ProportionalLinearObj,
-    ProportionalConstantObj,
-    ProportionalRandomObj,
-    ProportionalEditEdt,
-    ProportionalConnectedEdt,
-    ProportionalProjectedEdt,
-    ProportionalSmoothEdt,
-    ProportionalSphereEdt,
-    ProportionalRootEdt,
-    ProportionalSharpEdt,
-    ProportionalLinearEdt,
-    ProportionalConstantEdt,
-    ProportionalRandomEdt,
-    PieProportionalObj,
-    PieProportionalEdt,
-    PieProportionalMore,
+    PIE_OT_ProportionalEditObj,
+    PIE_OT_ProportionalSmoothObj,
+    PIE_OT_ProportionalSphereObj,
+    PIE_OT_ProportionalRootObj,
+    PIE_OT_ProportionalSharpObj,
+    PIE_OT_ProportionalLinearObj,
+    PIE_OT_ProportionalConstantObj,
+    PIE_OT_ProportionalRandomObj,
+    PIE_OT_ProportionalEditEdt,
+    PIE_OT_ProportionalConnectedEdt,
+    PIE_OT_ProportionalProjectedEdt,
+    PIE_OT_ProportionalSmoothEdt,
+    PIE_OT_ProportionalSphereEdt,
+    PIE_OT_ProportionalRootEdt,
+    PIE_OT_ProportionalSharpEdt,
+    PIE_OT_ProportionalLinearEdt,
+    PIE_OT_ProportionalConstantEdt,
+    PIE_OT_ProportionalRandomEdt,
+    PIE_MT_ProportionalObj,
+    PIE_MT_ProportionalEdt,
+    PIE_MT_ProportionalMore,
     )
 
 addon_keymaps = []
diff --git a/space_view3d_pie_menus/pie_save_open_menu.py b/space_view3d_pie_menus/pie_save_open_menu.py
index aacead9f..354c40e6 100644
--- a/space_view3d_pie_menus/pie_save_open_menu.py
+++ b/space_view3d_pie_menus/pie_save_open_menu.py
@@ -38,7 +38,7 @@ import os
 # Pie Save/Open
 
 
-class PieSaveOpen(Menu):
+class PIE_MT_SaveOpen(Menu):
     bl_idname = "PIE_MT_saveopen"
     bl_label = "Pie Save/Open"
 
@@ -63,7 +63,7 @@ class PieSaveOpen(Menu):
         pie.menu("PIE_MT_recover", text="Recovery Menu", icon='RECOVER_LAST')
 
 
-class pie_link(Menu):
+class PIE_MT_link(Menu):
     bl_idname = "PIE_MT_link"
     bl_label = "Link"
 
@@ -76,7 +76,7 @@ class pie_link(Menu):
         box.menu("EXTERNAL_MT_data", text="External Data")
 
 
-class pie_recover(Menu):
+class PIE_MT_recover(Menu):
     bl_idname = "PIE_MT_recover"
     bl_label = "Recovery"
 
@@ -89,7 +89,7 @@ class pie_recover(Menu):
         box.operator("wm.revert_mainfile", text="Revert", icon='FILE_REFRESH')
 
 
-class pie_fileio(Menu):
+class PIE_MT_fileio(Menu):
     bl_idname = "PIE_MT_fileio"
     bl_label = "Import/Export"
 
@@ -102,7 +102,7 @@ class pie_fileio(Menu):
         box.menu("TOPBAR_MT_file_export", icon='EXPORT')
 
 
-class ExternalData(Menu):
+class PIE_MT_ExternalData(Menu):
     bl_idname = "EXTERNAL_MT_data"
     bl_label = "External Data"
 
@@ -122,7 +122,7 @@ class ExternalData(Menu):
 
 # Save Incremental
 
-class FileIncrementalSave(Operator):
+class PIE_OT_FileIncrementalSave(Operator):
     bl_idname = "file.save_incremental"
     bl_label = "Save Incremental"
     bl_description = "Save First! then Incremental, .blend will get _001 extension"
@@ -173,12 +173,12 @@ class FileIncrementalSave(Operator):
 
 
 classes = (
-    PieSaveOpen,
-    ExternalData,
-    FileIncrementalSave,
-    pie_fileio,
-    pie_recover,
-    pie_link,
+    PIE_MT_SaveOpen,
+    PIE_MT_ExternalData,
+    PIE_OT_FileIncrementalSave,
+    PIE_MT_fileio,
+    PIE_MT_recover,
+    PIE_MT_link,
     )
 
 addon_keymaps = []
diff --git a/space_view3d_pie_menus/pie_sculpt_menu.py b/space_view3d_pie_menus/pie_sculpt_menu.py
index 93e03955..d80d0a37 100644
--- a/space_view3d_pie_menus/pie_sculpt_menu.py
+++ b/space_view3d_pie_menus/pie_sculpt_menu.py
@@ -38,7 +38,7 @@ from bpy.types import (
 
 
 # Sculpt Draw
-class SculptSculptDraw(Operator):
+class PIE_OT_SculptSculptDraw(Operator):
     bl_idname = "sculpt.sculptraw"
     bl_label = "Sculpt SculptDraw"
     bl_options = {'REGISTER', 'UNDO'}
@@ -49,7 +49,7 @@ class SculptSculptDraw(Operator):
 
 
 # Pie Sculp Pie Menus - W
-class PieSculptPie(Menu):
+class PIE_MT_SculptPie(Menu):
     bl_idname = "PIE_MT_sculpt"
     bl_label = "Pie Sculpt"
 
@@ -83,7 +83,7 @@ class PieSculptPie(Menu):
 
 
 # Pie Sculpt 2
-class PieSculpttwo(Menu):
+class PIE_MT_Sculpttwo(Menu):
     bl_idname = "PIE_MT_sculpttwo"
     bl_label = "Pie Sculpt 2"
 
@@ -107,7 +107,7 @@ class PieSculpttwo(Menu):
 
 
 # Pie Sculpt Three
-class PieSculptthree(Menu):
+class PIE_MT_Sculptthree(Menu):
     bl_idname = "PIE_MT_sculptthree"
     bl_label = "Pie Sculpt 3"
 
@@ -127,10 +127,10 @@ class PieSculptthree(Menu):
 
 
 classes = (
-    PieSculptPie,
-    PieSculpttwo,
-    PieSculptthree,
-    SculptSculptDraw,
+    PIE_MT_SculptPie,
+    PIE_MT_Sculpttwo,
+    PIE_MT_Sculptthree,
+    PIE_OT_SculptSculptDraw,
     )
 
 addon_keymaps = []
diff --git a/space_view3d_pie_menus/pie_select_menu.py b/space_view3d_pie_menus/pie_select_menu.py
index 44e86c40..4f5f8c0b 100644
--- a/space_view3d_pie_menus/pie_select_menu.py
+++ b/space_view3d_pie_menus/pie_select_menu.py
@@ -35,7 +35,7 @@ from bpy.types import Menu
 
 
 # Pie Selection Object Mode - A
-class PieSelectionsMore(Menu):
+class PIE_MT_SelectionsMore(Menu):
     bl_idname = "PIE_MT_selectionsmore"
     bl_label = "Pie Selections Object Mode"
 
@@ -50,7 +50,7 @@ class PieSelectionsMore(Menu):
 
 
 # Pie Selection Object Mode - A
-class PieSelectionsOM(Menu):
+class PIE_MT_SelectionsOM(Menu):
     bl_idname = "PIE_MT_selectionsom"
     bl_label = "Pie Selections Object Mode"
 
@@ -78,7 +78,7 @@ class PieSelectionsOM(Menu):
 
 
 # Pie Selection Edit Mode
-class PieSelectionsEM(Menu):
+class PIE_MT_SelectionsEM(Menu):
     bl_idname = "PIE_MT_selectionsem"
     bl_label = "Pie Selections Edit Mode"
 
@@ -110,7 +110,7 @@ class PieSelectionsEM(Menu):
 
 
 # Select All By Selection
-class SelectAllBySelection(Menu):
+class PIE_MT_SelectAllBySelection(Menu):
     bl_idname = "PIE_MT_selectallbyselection"
     bl_label = "Verts Edges Faces"
     bl_options = {'REGISTER', 'UNDO'}
@@ -141,7 +141,7 @@ class SelectAllBySelection(Menu):
         prop.data_path = "tool_settings.mesh_select_mode"
 
 
-class SelectLoopSelection(Menu):
+class PIE_MT_SelectLoopSelection(Menu):
     bl_idname = "OBJECT_MT_selectloopselection"
     bl_label = "Verts Edges Faces"
     bl_options = {'REGISTER', 'UNDO'}
@@ -156,11 +156,11 @@ class SelectLoopSelection(Menu):
 
 
 classes = (
-    PieSelectionsOM,
-    PieSelectionsEM,
-    SelectAllBySelection,
-    PieSelectionsMore,
-    SelectLoopSelection,
+    PIE_MT_SelectionsOM,
+    PIE_MT_SelectionsEM,
+    PIE_MT_SelectAllBySelection,
+    PIE_MT_SelectionsMore,
+    PIE_MT_SelectLoopSelection,
     )
 
 addon_keymaps = []
diff --git a/space_view3d_pie_menus/pie_shading_menu.py b/space_view3d_pie_menus/pie_shading_menu.py
index 0cdbc8f9..ec6c3fbb 100644
--- a/space_view3d_pie_menus/pie_shading_menu.py
+++ b/space_view3d_pie_menus/pie_shading_menu.py
@@ -35,7 +35,7 @@ from bpy.types import Menu
 
 
 # Pie Shading - Z
-class PieShadingView(Menu):
+class PIE_MT_ShadingView(Menu):
     bl_idname = "PIE_MT_shadingview"
     bl_label = "Pie Shading"
 
@@ -55,7 +55,7 @@ class PieShadingView(Menu):
 
 
 classes = (
-    PieShadingView,
+    PIE_MT_ShadingView,
     )
 
 addon_keymaps = []
diff --git a/space_view3d_pie_menus/pie_snap_menu.py b/space_view3d_pie_menus/pie_snap_menu.py
index d8179150..11058861 100644
--- a/space_view3d_pie_menus/pie_snap_menu.py
+++ b/space_view3d_pie_menus/pie_snap_menu.py
@@ -38,7 +38,7 @@ from bpy.types import (
 
 
 # Pie Snap - Shift + Tab
-class PieSnaping(Menu):
+class PIE_MT_Snaping(Menu):
     bl_idname = "PIE_MT_snapping"
     bl_label = "Pie Snapping"
 
@@ -63,7 +63,7 @@ class PieSnaping(Menu):
         pie.operator("wm.call_menu_pie", text="Snap Target", icon='NONE').name = "SNAP_MT_targetmenu"
 
 
-class SnapActive(Operator):
+class PIE_OT_SnapActive(Operator):
     bl_idname = "snap.active"
     bl_label = "Snap Active"
     bl_options = {'REGISTER', 'UNDO'}
@@ -80,7 +80,7 @@ class SnapActive(Operator):
         return {'FINISHED'}
 
 
-class SnapVolume(Operator):
+class PIE_OT_SnapVolume(Operator):
     bl_idname = "snap.volume"
     bl_label = "Snap Volume"
     bl_options = {'REGISTER', 'UNDO'}
@@ -95,7 +95,7 @@ class SnapVolume(Operator):
         return {'FINISHED'}
 
 
-class SnapFace(Operator):
+class PIE_OT_SnapFace(Operator):
     bl_idname = "snap.face"
     bl_label = "Snap Face"
     bl_options = {'REGISTER', 'UNDO'}
@@ -112,7 +112,7 @@ class SnapFace(Operator):
         return {'FINISHED'}
 
 
-class SnapEdge(Operator):
+class PIE_OT_SnapEdge(Operator):
     bl_idname = "snap.edge"
     bl_label = "Snap Edge"
     bl_options = {'REGISTER', 'UNDO'}
@@ -129,7 +129,7 @@ class SnapEdge(Operator):
         return {'FINISHED'}
 
 
-class SnapVertex(Operator):
+class PIE_OT_SnapVertex(Operator):
     bl_idname = "snap.vertex"
     bl_label = "Snap Vertex"
     bl_options = {'REGISTER', 'UNDO'}
@@ -146,7 +146,7 @@ class SnapVertex(Operator):
         return {'FINISHED'}
 
 
-class SnapIncrement(Operator):
+class PIE_OT_SnapIncrement(Operator):
     bl_idname = "snap.increment"
     bl_label = "Snap Increment"
     bl_options = {'REGISTER', 'UNDO'}
@@ -163,7 +163,7 @@ class SnapIncrement(Operator):
         return {'FINISHED'}
 
 
-class SnapAlignRotation(Operator):
+class PIE_OT_SnapAlignRotation(Operator):
     bl_idname = "snap.alignrotation"
     bl_label = "Snap Align rotation"
     bl_options = {'REGISTER', 'UNDO'}
@@ -180,7 +180,7 @@ class SnapAlignRotation(Operator):
         return {'FINISHED'}
 
 
-class SnapTargetVariable(Operator):
+class PIE_OT_SnapTargetVariable(Operator):
     bl_idname = "object.snaptargetvariable"
     bl_label = "Snap Target Variable"
     bl_options = {'REGISTER', 'UNDO'}
@@ -200,7 +200,7 @@ class SnapTargetVariable(Operator):
 # Menu Snap Target - Shift + Tab
 
 
-class SnapTargetMenu(Menu):
+class PIE_MT_SnapTargetMenu(Menu):
     bl_idname = "SNAP_MT_targetmenu"
     bl_label = "Snap Target Menu"
 
@@ -224,16 +224,16 @@ class SnapTargetMenu(Menu):
 # Pie Snapping - Shift + Tab
 
 classes = (
-    PieSnaping,
-    SnapTargetMenu,
-    SnapActive,
-    SnapVolume,
-    SnapFace,
-    SnapEdge,
-    SnapVertex,
-    SnapIncrement,
-    SnapAlignRotation,
-    SnapTargetVariable
+    PIE_MT_Snaping,
+    PIE_MT_SnapTargetMenu,
+    PIE_OT_SnapActive,
+    PIE_OT_SnapVolume,
+    PIE_OT_SnapFace,
+    PIE_OT_SnapEdge,
+    PIE_OT_SnapVertex,
+    PIE_OT_SnapIncrement,
+    PIE_OT_SnapAlignRotation,
+    PIE_OT_SnapTargetVariable
     )
 
 addon_keymaps = []
diff --git a/space_view3d_pie_menus/pie_views_numpad_menu.py b/space_view3d_pie_menus/pie_views_numpad_menu.py
index 19e72bdd..62ddeb6b 100644
--- a/space_view3d_pie_menus/pie_views_numpad_menu.py
+++ b/space_view3d_pie_menus/pie_views_numpad_menu.py
@@ -38,7 +38,7 @@ from bpy.types import (
 
 
 # Lock Camera Transforms
-class LockTransforms(Operator):
+class PIE_OT_LockTransforms(Operator):
     bl_idname = "object.locktransforms"
     bl_label = "Lock Object Transforms"
     bl_description = ("Enable or disable the editing of objects transforms in the 3D View\n"
@@ -71,7 +71,7 @@ class LockTransforms(Operator):
 
 
 # Pie View All Sel Glob Etc - Q
-class PieViewallSelGlobEtc(Menu):
+class PIE_MT_ViewallSelGlobEtc(Menu):
     bl_idname = "PIE_MT_vieallselglobetc"
     bl_label = "Pie View All Sel Glob..."
 
@@ -96,7 +96,7 @@ class PieViewallSelGlobEtc(Menu):
 
 
 # Pie views numpad - Q
-class PieViewNumpad(Menu):
+class PIE_MT_ViewNumpad(Menu):
     bl_idname = "PIE_MT_viewnumpad"
     bl_label = "Pie Views Ortho"
 
@@ -147,9 +147,9 @@ class PieViewNumpad(Menu):
 
 
 classes = (
-    PieViewNumpad,
-    LockTransforms,
-    PieViewallSelGlobEtc,
+    PIE_MT_ViewNumpad,
+    PIE_OT_LockTransforms,
+    PIE_MT_ViewallSelGlobEtc,
     )
 
 addon_keymaps = []