diff --git a/rigify/legacy/utils.py b/rigify/legacy/utils.py
index c718f146069756292d4fe5daef7118afcb298d7d..65838b7d751c85cb9d10b41b436d6bb0c9b9f51b 100644
--- a/rigify/legacy/utils.py
+++ b/rigify/legacy/utils.py
@@ -151,7 +151,7 @@ def copy_bone_simple(obj, bone_name, assign_name=''):
         edit_bone_1 = obj.data.edit_bones[bone_name]
         edit_bone_2 = obj.data.edit_bones.new(assign_name)
         bone_name_1 = bone_name
-        bone_name_2 = edit_bone_2.name    
+        bone_name_2 = edit_bone_2.name
 
         # Copy edit bone attributes
         edit_bone_2.layers = list(edit_bone_1.layers)
diff --git a/rigify/metarig_menu.py b/rigify/metarig_menu.py
index 5c8c2ee40c2711d6ba3fdf5790efba59307e777a..6b12abad49ef2619826d572b4ab2d966e9a548d0 100644
--- a/rigify/metarig_menu.py
+++ b/rigify/metarig_menu.py
@@ -86,6 +86,7 @@ def make_metarig_add_execute(m):
         bpy.ops.object.armature_add()
         obj = context.active_object
         obj.name = "metarig"
+        obj.data.name = "metarig"
 
         # Remove default bone
         bpy.ops.object.mode_set(mode='EDIT')