diff --git a/rigify/__init__.py b/rigify/__init__.py
index afc3071fbd6fff6f0560dccf14114513dca4975b..21a33050f47b94d05fc9da3378624d5d9df439c7 100644
--- a/rigify/__init__.py
+++ b/rigify/__init__.py
@@ -262,7 +262,7 @@ def register():
     for cls in classes:
         register_class(cls)
 
-    #Properties.
+    # Properties.
     bpy.types.Armature.rigify_layers = CollectionProperty(type=RigifyArmatureLayer)
 
     bpy.types.PoseBone.rigify_type = StringProperty(name="Rigify Type", description="Rig type for this bone")
diff --git a/rigify/generate.py b/rigify/generate.py
index e2492708a00ae4735c11b84ff6bfc0dee6b89f6b..4888aedd05e43fab97ce15847815b82cd4c1f57c 100644
--- a/rigify/generate.py
+++ b/rigify/generate.py
@@ -553,7 +553,7 @@ def create_selection_sets(obj, metarig):
     pbones = obj.pose.bones
 
     for i, name in enumerate(metarig.data.rigify_layers.keys()):
-        if name == '' or not metarig.data.rigify_layers[i].set:
+        if name == '' or not metarig.data.rigify_layers[i].selset:
             continue
 
         bpy.ops.pose.select_all(action='DESELECT')
diff --git a/rigify/metarigs/Animals/bird.py b/rigify/metarigs/Animals/bird.py
index 15b75a116f9efc82c5e9eaa7c99c6582db012e00..f8ecd47de207e7e00f07a9665a78a1e1f8129115 100644
--- a/rigify/metarigs/Animals/bird.py
+++ b/rigify/metarigs/Animals/bird.py
@@ -48,119 +48,119 @@ def create(obj):
 
     arm.rigify_layers[0].name = "Face"
     arm.rigify_layers[0].row = 1
-    arm.rigify_layers[0].set = False
+    arm.rigify_layers[0].selset = False
     arm.rigify_layers[0].group = 6
     arm.rigify_layers[1].name = "Face (Tweak)"
     arm.rigify_layers[1].row = 2
-    arm.rigify_layers[1].set = False
+    arm.rigify_layers[1].selset = False
     arm.rigify_layers[1].group = 4
     arm.rigify_layers[2].name = " "
     arm.rigify_layers[2].row = 1
-    arm.rigify_layers[2].set = False
+    arm.rigify_layers[2].selset = False
     arm.rigify_layers[2].group = 0
     arm.rigify_layers[3].name = "Spine"
     arm.rigify_layers[3].row = 3
-    arm.rigify_layers[3].set = False
+    arm.rigify_layers[3].selset = False
     arm.rigify_layers[3].group = 3
     arm.rigify_layers[4].name = "Spine (Tweak)"
     arm.rigify_layers[4].row = 4
-    arm.rigify_layers[4].set = False
+    arm.rigify_layers[4].selset = False
     arm.rigify_layers[4].group = 4
     arm.rigify_layers[5].name = " "
     arm.rigify_layers[5].row = 1
-    arm.rigify_layers[5].set = False
+    arm.rigify_layers[5].selset = False
     arm.rigify_layers[5].group = 0
     arm.rigify_layers[6].name = " "
     arm.rigify_layers[6].row = 1
-    arm.rigify_layers[6].set = False
+    arm.rigify_layers[6].selset = False
     arm.rigify_layers[6].group = 0
     arm.rigify_layers[7].name = "Wing.L"
     arm.rigify_layers[7].row = 6
-    arm.rigify_layers[7].set = False
+    arm.rigify_layers[7].selset = False
     arm.rigify_layers[7].group = 5
     arm.rigify_layers[8].name = ""
     arm.rigify_layers[8].row = 8
-    arm.rigify_layers[8].set = False
+    arm.rigify_layers[8].selset = False
     arm.rigify_layers[8].group = 0
     arm.rigify_layers[9].name = "Wing.L (Tweak)"
     arm.rigify_layers[9].row = 7
-    arm.rigify_layers[9].set = False
+    arm.rigify_layers[9].selset = False
     arm.rigify_layers[9].group = 4
     arm.rigify_layers[10].name = "Wing.R"
     arm.rigify_layers[10].row = 6
-    arm.rigify_layers[10].set = False
+    arm.rigify_layers[10].selset = False
     arm.rigify_layers[10].group = 5
     arm.rigify_layers[11].name = ""
     arm.rigify_layers[11].row = 8
-    arm.rigify_layers[11].set = False
+    arm.rigify_layers[11].selset = False
     arm.rigify_layers[11].group = 0
     arm.rigify_layers[12].name = "Wing.R (Tweak)"
     arm.rigify_layers[12].row = 7
-    arm.rigify_layers[12].set = False
+    arm.rigify_layers[12].selset = False
     arm.rigify_layers[12].group = 4
     arm.rigify_layers[13].name = "Leg.L (IK)"
     arm.rigify_layers[13].row = 10
-    arm.rigify_layers[13].set = False
+    arm.rigify_layers[13].selset = False
     arm.rigify_layers[13].group = 2
     arm.rigify_layers[14].name = "Leg.L (FK)"
     arm.rigify_layers[14].row = 11
-    arm.rigify_layers[14].set = False
+    arm.rigify_layers[14].selset = False
     arm.rigify_layers[14].group = 5
     arm.rigify_layers[15].name = "Leg.L (Tweak)"
     arm.rigify_layers[15].row = 12
-    arm.rigify_layers[15].set = False
+    arm.rigify_layers[15].selset = False
     arm.rigify_layers[15].group = 4
     arm.rigify_layers[16].name = " Leg.R (IK)"
     arm.rigify_layers[16].row = 10
-    arm.rigify_layers[16].set = False
+    arm.rigify_layers[16].selset = False
     arm.rigify_layers[16].group = 2
     arm.rigify_layers[17].name = " Leg.R (FK)"
     arm.rigify_layers[17].row = 11
-    arm.rigify_layers[17].set = False
+    arm.rigify_layers[17].selset = False
     arm.rigify_layers[17].group = 5
     arm.rigify_layers[18].name = " Leg.R (Tweak)"
     arm.rigify_layers[18].row = 12
-    arm.rigify_layers[18].set = False
+    arm.rigify_layers[18].selset = False
     arm.rigify_layers[18].group = 4
     arm.rigify_layers[19].name = " "
     arm.rigify_layers[19].row = 1
-    arm.rigify_layers[19].set = False
+    arm.rigify_layers[19].selset = False
     arm.rigify_layers[19].group = 0
     arm.rigify_layers[20].name = " "
     arm.rigify_layers[20].row = 1
-    arm.rigify_layers[20].set = False
+    arm.rigify_layers[20].selset = False
     arm.rigify_layers[20].group = 0
     arm.rigify_layers[21].name = "Claws"
     arm.rigify_layers[21].row = 13
-    arm.rigify_layers[21].set = False
+    arm.rigify_layers[21].selset = False
     arm.rigify_layers[21].group = 6
     arm.rigify_layers[22].name = "Claws (Tweak)"
     arm.rigify_layers[22].row = 14
-    arm.rigify_layers[22].set = False
+    arm.rigify_layers[22].selset = False
     arm.rigify_layers[22].group = 4
     arm.rigify_layers[23].name = " "
     arm.rigify_layers[23].row = 1
-    arm.rigify_layers[23].set = False
+    arm.rigify_layers[23].selset = False
     arm.rigify_layers[23].group = 0
     arm.rigify_layers[24].name = "Feathers"
     arm.rigify_layers[24].row = 8
-    arm.rigify_layers[24].set = False
+    arm.rigify_layers[24].selset = False
     arm.rigify_layers[24].group = 6
     arm.rigify_layers[25].name = " "
     arm.rigify_layers[25].row = 1
-    arm.rigify_layers[25].set = False
+    arm.rigify_layers[25].selset = False
     arm.rigify_layers[25].group = 0
     arm.rigify_layers[26].name = " "
     arm.rigify_layers[26].row = 1
-    arm.rigify_layers[26].set = False
+    arm.rigify_layers[26].selset = False
     arm.rigify_layers[26].group = 0
     arm.rigify_layers[27].name = " "
     arm.rigify_layers[27].row = 1
-    arm.rigify_layers[27].set = False
+    arm.rigify_layers[27].selset = False
     arm.rigify_layers[27].group = 0
     arm.rigify_layers[28].name = "Root"
     arm.rigify_layers[28].row = 14
-    arm.rigify_layers[28].set = False
+    arm.rigify_layers[28].selset = False
     arm.rigify_layers[28].group = 1
 
     bones = {}
diff --git a/rigify/metarigs/Animals/cat.py b/rigify/metarigs/Animals/cat.py
index 2f9de8c8e3c331c682b2084f274279355a3619df..206b6f64832a8889a12df8c25ba4f359fb878129 100644
--- a/rigify/metarigs/Animals/cat.py
+++ b/rigify/metarigs/Animals/cat.py
@@ -48,119 +48,119 @@ def create(obj):
 
     arm.rigify_layers[0].name = "Face"
     arm.rigify_layers[0].row = 1
-    arm.rigify_layers[0].set = False
+    arm.rigify_layers[0].selset = False
     arm.rigify_layers[0].group = 5
     arm.rigify_layers[1].name = "Face (Primary)"
     arm.rigify_layers[1].row = 2
-    arm.rigify_layers[1].set = False
+    arm.rigify_layers[1].selset = False
     arm.rigify_layers[1].group = 2
     arm.rigify_layers[2].name = "Face (Secondary)"
     arm.rigify_layers[2].row = 2
-    arm.rigify_layers[2].set = False
+    arm.rigify_layers[2].selset = False
     arm.rigify_layers[2].group = 3
     arm.rigify_layers[3].name = "Spine"
     arm.rigify_layers[3].row = 3
-    arm.rigify_layers[3].set = False
+    arm.rigify_layers[3].selset = False
     arm.rigify_layers[3].group = 3
     arm.rigify_layers[4].name = "Spine (Tweak)"
     arm.rigify_layers[4].row = 4
-    arm.rigify_layers[4].set = False
+    arm.rigify_layers[4].selset = False
     arm.rigify_layers[4].group = 4
     arm.rigify_layers[5].name = "Paws"
     arm.rigify_layers[5].row = 5
-    arm.rigify_layers[5].set = False
+    arm.rigify_layers[5].selset = False
     arm.rigify_layers[5].group = 6
     arm.rigify_layers[6].name = "Paws (Tweak)"
     arm.rigify_layers[6].row = 6
-    arm.rigify_layers[6].set = False
+    arm.rigify_layers[6].selset = False
     arm.rigify_layers[6].group = 4
     arm.rigify_layers[7].name = "Arm.L (IK)"
     arm.rigify_layers[7].row = 7
-    arm.rigify_layers[7].set = False
+    arm.rigify_layers[7].selset = False
     arm.rigify_layers[7].group = 2
     arm.rigify_layers[8].name = "Arm.L (FK)"
     arm.rigify_layers[8].row = 8
-    arm.rigify_layers[8].set = False
+    arm.rigify_layers[8].selset = False
     arm.rigify_layers[8].group = 5
     arm.rigify_layers[9].name = "Arm,L (Tweak)"
     arm.rigify_layers[9].row = 9
-    arm.rigify_layers[9].set = False
+    arm.rigify_layers[9].selset = False
     arm.rigify_layers[9].group = 4
     arm.rigify_layers[10].name = "Arm.R (IK)"
     arm.rigify_layers[10].row = 7
-    arm.rigify_layers[10].set = False
+    arm.rigify_layers[10].selset = False
     arm.rigify_layers[10].group = 2
     arm.rigify_layers[11].name = "Arm.R (FK)"
     arm.rigify_layers[11].row = 8
-    arm.rigify_layers[11].set = False
+    arm.rigify_layers[11].selset = False
     arm.rigify_layers[11].group = 5
     arm.rigify_layers[12].name = "Arm.R (Tweak)"
     arm.rigify_layers[12].row = 9
-    arm.rigify_layers[12].set = False
+    arm.rigify_layers[12].selset = False
     arm.rigify_layers[12].group = 4
     arm.rigify_layers[13].name = "Leg.L (IK)"
     arm.rigify_layers[13].row = 10
-    arm.rigify_layers[13].set = False
+    arm.rigify_layers[13].selset = False
     arm.rigify_layers[13].group = 2
     arm.rigify_layers[14].name = "Leg.L (FK)"
     arm.rigify_layers[14].row = 11
-    arm.rigify_layers[14].set = False
+    arm.rigify_layers[14].selset = False
     arm.rigify_layers[14].group = 5
     arm.rigify_layers[15].name = "Leg.L (Tweak)"
     arm.rigify_layers[15].row = 12
-    arm.rigify_layers[15].set = False
+    arm.rigify_layers[15].selset = False
     arm.rigify_layers[15].group = 4
     arm.rigify_layers[16].name = "Leg.R (IK)"
     arm.rigify_layers[16].row = 10
-    arm.rigify_layers[16].set = False
+    arm.rigify_layers[16].selset = False
     arm.rigify_layers[16].group = 2
     arm.rigify_layers[17].name = "Leg.R (FK)"
     arm.rigify_layers[17].row = 11
-    arm.rigify_layers[17].set = False
+    arm.rigify_layers[17].selset = False
     arm.rigify_layers[17].group = 5
     arm.rigify_layers[18].name = "Leg.R (Tweak)"
     arm.rigify_layers[18].row = 12
-    arm.rigify_layers[18].set = False
+    arm.rigify_layers[18].selset = False
     arm.rigify_layers[18].group = 4
     arm.rigify_layers[19].name = "Tail"
     arm.rigify_layers[19].row = 13
-    arm.rigify_layers[19].set = False
+    arm.rigify_layers[19].selset = False
     arm.rigify_layers[19].group = 3
     arm.rigify_layers[20].name = "Tail (Tweaks)"
     arm.rigify_layers[20].row = 14
-    arm.rigify_layers[20].set = False
+    arm.rigify_layers[20].selset = False
     arm.rigify_layers[20].group = 4
     arm.rigify_layers[21].name = " "
     arm.rigify_layers[21].row = 1
-    arm.rigify_layers[21].set = False
+    arm.rigify_layers[21].selset = False
     arm.rigify_layers[21].group = 0
     arm.rigify_layers[22].name = " "
     arm.rigify_layers[22].row = 1
-    arm.rigify_layers[22].set = False
+    arm.rigify_layers[22].selset = False
     arm.rigify_layers[22].group = 0
     arm.rigify_layers[23].name = " "
     arm.rigify_layers[23].row = 1
-    arm.rigify_layers[23].set = False
+    arm.rigify_layers[23].selset = False
     arm.rigify_layers[23].group = 0
     arm.rigify_layers[24].name = " "
     arm.rigify_layers[24].row = 1
-    arm.rigify_layers[24].set = False
+    arm.rigify_layers[24].selset = False
     arm.rigify_layers[24].group = 0
     arm.rigify_layers[25].name = " "
     arm.rigify_layers[25].row = 1
-    arm.rigify_layers[25].set = False
+    arm.rigify_layers[25].selset = False
     arm.rigify_layers[25].group = 0
     arm.rigify_layers[26].name = " "
     arm.rigify_layers[26].row = 1
-    arm.rigify_layers[26].set = False
+    arm.rigify_layers[26].selset = False
     arm.rigify_layers[26].group = 0
     arm.rigify_layers[27].name = " "
     arm.rigify_layers[27].row = 1
-    arm.rigify_layers[27].set = False
+    arm.rigify_layers[27].selset = False
     arm.rigify_layers[27].group = 0
     arm.rigify_layers[28].name = "Root"
     arm.rigify_layers[28].row = 16
-    arm.rigify_layers[28].set = False
+    arm.rigify_layers[28].selset = False
     arm.rigify_layers[28].group = 1
 
     bones = {}
diff --git a/rigify/metarigs/Animals/horse.py b/rigify/metarigs/Animals/horse.py
index e85be5fd3915477e93d0615d5749befb0f752907..f7ebc68f854d6b63ecff8f9c85a55b58e83c34db 100644
--- a/rigify/metarigs/Animals/horse.py
+++ b/rigify/metarigs/Animals/horse.py
@@ -48,119 +48,119 @@ def create(obj):
 
     arm.rigify_layers[0].name = "Face"
     arm.rigify_layers[0].row = 1
-    arm.rigify_layers[0].set = False
+    arm.rigify_layers[0].selset = False
     arm.rigify_layers[0].group = 5
     arm.rigify_layers[1].name = "Face (Primary)"
     arm.rigify_layers[1].row = 2
-    arm.rigify_layers[1].set = False
+    arm.rigify_layers[1].selset = False
     arm.rigify_layers[1].group = 4
     arm.rigify_layers[2].name = " "
     arm.rigify_layers[2].row = 3
-    arm.rigify_layers[2].set = False
+    arm.rigify_layers[2].selset = False
     arm.rigify_layers[2].group = 0
     arm.rigify_layers[3].name = "Spine"
     arm.rigify_layers[3].row = 4
-    arm.rigify_layers[3].set = False
+    arm.rigify_layers[3].selset = False
     arm.rigify_layers[3].group = 3
     arm.rigify_layers[4].name = "Spine (Tweak)"
     arm.rigify_layers[4].row = 5
-    arm.rigify_layers[4].set = False
+    arm.rigify_layers[4].selset = False
     arm.rigify_layers[4].group = 4
     arm.rigify_layers[5].name = " "
     arm.rigify_layers[5].row = 1
-    arm.rigify_layers[5].set = False
+    arm.rigify_layers[5].selset = False
     arm.rigify_layers[5].group = 0
     arm.rigify_layers[6].name = " "
     arm.rigify_layers[6].row = 1
-    arm.rigify_layers[6].set = False
+    arm.rigify_layers[6].selset = False
     arm.rigify_layers[6].group = 0
     arm.rigify_layers[7].name = "Arm.L (IK)"
     arm.rigify_layers[7].row = 7
-    arm.rigify_layers[7].set = False
+    arm.rigify_layers[7].selset = False
     arm.rigify_layers[7].group = 2
     arm.rigify_layers[8].name = "Arm.L (FK)"
     arm.rigify_layers[8].row = 8
-    arm.rigify_layers[8].set = False
+    arm.rigify_layers[8].selset = False
     arm.rigify_layers[8].group = 5
     arm.rigify_layers[9].name = "Arm.L (Tweak)"
     arm.rigify_layers[9].row = 9
-    arm.rigify_layers[9].set = False
+    arm.rigify_layers[9].selset = False
     arm.rigify_layers[9].group = 4
     arm.rigify_layers[10].name = "Arm.R (IK)"
     arm.rigify_layers[10].row = 7
-    arm.rigify_layers[10].set = False
+    arm.rigify_layers[10].selset = False
     arm.rigify_layers[10].group = 2
     arm.rigify_layers[11].name = "Arm.R (FK)"
     arm.rigify_layers[11].row = 8
-    arm.rigify_layers[11].set = False
+    arm.rigify_layers[11].selset = False
     arm.rigify_layers[11].group = 5
     arm.rigify_layers[12].name = "Arm.R (Tweak)"
     arm.rigify_layers[12].row = 9
-    arm.rigify_layers[12].set = False
+    arm.rigify_layers[12].selset = False
     arm.rigify_layers[12].group = 4
     arm.rigify_layers[13].name = "Leg.L (IK)"
     arm.rigify_layers[13].row = 10
-    arm.rigify_layers[13].set = False
+    arm.rigify_layers[13].selset = False
     arm.rigify_layers[13].group = 2
     arm.rigify_layers[14].name = "Leg.L (FK)"
     arm.rigify_layers[14].row = 11
-    arm.rigify_layers[14].set = False
+    arm.rigify_layers[14].selset = False
     arm.rigify_layers[14].group = 5
     arm.rigify_layers[15].name = "Leg.L (Tweak)"
     arm.rigify_layers[15].row = 12
-    arm.rigify_layers[15].set = False
+    arm.rigify_layers[15].selset = False
     arm.rigify_layers[15].group = 4
     arm.rigify_layers[16].name = "Leg.R (IK)"
     arm.rigify_layers[16].row = 10
-    arm.rigify_layers[16].set = False
+    arm.rigify_layers[16].selset = False
     arm.rigify_layers[16].group = 2
     arm.rigify_layers[17].name = "Leg.R (FK)"
     arm.rigify_layers[17].row = 11
-    arm.rigify_layers[17].set = False
+    arm.rigify_layers[17].selset = False
     arm.rigify_layers[17].group = 5
     arm.rigify_layers[18].name = "Leg.R (Tweak)"
     arm.rigify_layers[18].row = 12
-    arm.rigify_layers[18].set = False
+    arm.rigify_layers[18].selset = False
     arm.rigify_layers[18].group = 4
     arm.rigify_layers[19].name = "Tail"
     arm.rigify_layers[19].row = 13
-    arm.rigify_layers[19].set = False
+    arm.rigify_layers[19].selset = False
     arm.rigify_layers[19].group = 6
     arm.rigify_layers[20].name = " "
     arm.rigify_layers[20].row = 1
-    arm.rigify_layers[20].set = False
+    arm.rigify_layers[20].selset = False
     arm.rigify_layers[20].group = 4
     arm.rigify_layers[21].name = "Hair"
     arm.rigify_layers[21].row = 14
-    arm.rigify_layers[21].set = False
+    arm.rigify_layers[21].selset = False
     arm.rigify_layers[21].group = 6
     arm.rigify_layers[22].name = " "
     arm.rigify_layers[22].row = 1
-    arm.rigify_layers[22].set = False
+    arm.rigify_layers[22].selset = False
     arm.rigify_layers[22].group = 0
     arm.rigify_layers[23].name = " "
     arm.rigify_layers[23].row = 1
-    arm.rigify_layers[23].set = False
+    arm.rigify_layers[23].selset = False
     arm.rigify_layers[23].group = 0
     arm.rigify_layers[24].name = " "
     arm.rigify_layers[24].row = 1
-    arm.rigify_layers[24].set = False
+    arm.rigify_layers[24].selset = False
     arm.rigify_layers[24].group = 0
     arm.rigify_layers[25].name = " "
     arm.rigify_layers[25].row = 1
-    arm.rigify_layers[25].set = False
+    arm.rigify_layers[25].selset = False
     arm.rigify_layers[25].group = 0
     arm.rigify_layers[26].name = " "
     arm.rigify_layers[26].row = 1
-    arm.rigify_layers[26].set = False
+    arm.rigify_layers[26].selset = False
     arm.rigify_layers[26].group = 0
     arm.rigify_layers[27].name = " "
     arm.rigify_layers[27].row = 1
-    arm.rigify_layers[27].set = False
+    arm.rigify_layers[27].selset = False
     arm.rigify_layers[27].group = 0
     arm.rigify_layers[28].name = "Root"
     arm.rigify_layers[28].row = 14
-    arm.rigify_layers[28].set = False
+    arm.rigify_layers[28].selset = False
     arm.rigify_layers[28].group = 1
 
 
diff --git a/rigify/metarigs/Animals/shark.py b/rigify/metarigs/Animals/shark.py
index dc3fb8bf5ca7ab124eb669944f953b242d6ee9e0..355e8197102247a8bce06f01049079c804905e3d 100644
--- a/rigify/metarigs/Animals/shark.py
+++ b/rigify/metarigs/Animals/shark.py
@@ -48,119 +48,119 @@ def create(obj):
 
     arm.rigify_layers[0].name = "Face"
     arm.rigify_layers[0].row = 1
-    arm.rigify_layers[0].set = False
+    arm.rigify_layers[0].selset = False
     arm.rigify_layers[0].group = 5
     arm.rigify_layers[1].name = "Face (Tweak)"
     arm.rigify_layers[1].row = 2
-    arm.rigify_layers[1].set = False
+    arm.rigify_layers[1].selset = False
     arm.rigify_layers[1].group = 4
     arm.rigify_layers[2].name = " "
     arm.rigify_layers[2].row = 1
-    arm.rigify_layers[2].set = False
+    arm.rigify_layers[2].selset = False
     arm.rigify_layers[2].group = 0
     arm.rigify_layers[3].name = "Spine"
     arm.rigify_layers[3].row = 3
-    arm.rigify_layers[3].set = False
+    arm.rigify_layers[3].selset = False
     arm.rigify_layers[3].group = 3
     arm.rigify_layers[4].name = "Spine (Tweak)"
     arm.rigify_layers[4].row = 4
-    arm.rigify_layers[4].set = False
+    arm.rigify_layers[4].selset = False
     arm.rigify_layers[4].group = 4
     arm.rigify_layers[5].name = "Tail"
     arm.rigify_layers[5].row = 5
-    arm.rigify_layers[5].set = False
+    arm.rigify_layers[5].selset = False
     arm.rigify_layers[5].group = 6
     arm.rigify_layers[6].name = "Fins.L"
     arm.rigify_layers[6].row = 6
-    arm.rigify_layers[6].set = False
+    arm.rigify_layers[6].selset = False
     arm.rigify_layers[6].group = 5
     arm.rigify_layers[7].name = "Fins.L (Tweak)"
     arm.rigify_layers[7].row = 7
-    arm.rigify_layers[7].set = False
+    arm.rigify_layers[7].selset = False
     arm.rigify_layers[7].group = 4
     arm.rigify_layers[8].name = "Fins.R"
     arm.rigify_layers[8].row = 6
-    arm.rigify_layers[8].set = False
+    arm.rigify_layers[8].selset = False
     arm.rigify_layers[8].group = 5
     arm.rigify_layers[9].name = "Fins.R (Tweak)"
     arm.rigify_layers[9].row = 7
-    arm.rigify_layers[9].set = False
+    arm.rigify_layers[9].selset = False
     arm.rigify_layers[9].group = 4
     arm.rigify_layers[10].name = "Fins"
     arm.rigify_layers[10].row = 8
-    arm.rigify_layers[10].set = False
+    arm.rigify_layers[10].selset = False
     arm.rigify_layers[10].group = 3
     arm.rigify_layers[11].name = "Fins (Tweak)"
     arm.rigify_layers[11].row = 9
-    arm.rigify_layers[11].set = False
+    arm.rigify_layers[11].selset = False
     arm.rigify_layers[11].group = 4
     arm.rigify_layers[12].name = " "
     arm.rigify_layers[12].row = 1
-    arm.rigify_layers[12].set = False
+    arm.rigify_layers[12].selset = False
     arm.rigify_layers[12].group = 0
     arm.rigify_layers[13].name = " "
     arm.rigify_layers[13].row = 1
-    arm.rigify_layers[13].set = False
+    arm.rigify_layers[13].selset = False
     arm.rigify_layers[13].group = 6
     arm.rigify_layers[14].name = " "
     arm.rigify_layers[14].row = 1
-    arm.rigify_layers[14].set = False
+    arm.rigify_layers[14].selset = False
     arm.rigify_layers[14].group = 0
     arm.rigify_layers[15].name = " "
     arm.rigify_layers[15].row = 1
-    arm.rigify_layers[15].set = False
+    arm.rigify_layers[15].selset = False
     arm.rigify_layers[15].group = 0
     arm.rigify_layers[16].name = " "
     arm.rigify_layers[16].row = 1
-    arm.rigify_layers[16].set = False
+    arm.rigify_layers[16].selset = False
     arm.rigify_layers[16].group = 0
     arm.rigify_layers[17].name = " "
     arm.rigify_layers[17].row = 1
-    arm.rigify_layers[17].set = False
+    arm.rigify_layers[17].selset = False
     arm.rigify_layers[17].group = 0
     arm.rigify_layers[18].name = " "
     arm.rigify_layers[18].row = 1
-    arm.rigify_layers[18].set = False
+    arm.rigify_layers[18].selset = False
     arm.rigify_layers[18].group = 0
     arm.rigify_layers[19].name = " "
     arm.rigify_layers[19].row = 1
-    arm.rigify_layers[19].set = False
+    arm.rigify_layers[19].selset = False
     arm.rigify_layers[19].group = 0
     arm.rigify_layers[20].name = " "
     arm.rigify_layers[20].row = 1
-    arm.rigify_layers[20].set = False
+    arm.rigify_layers[20].selset = False
     arm.rigify_layers[20].group = 0
     arm.rigify_layers[21].name = " "
     arm.rigify_layers[21].row = 1
-    arm.rigify_layers[21].set = False
+    arm.rigify_layers[21].selset = False
     arm.rigify_layers[21].group = 0
     arm.rigify_layers[22].name = " "
     arm.rigify_layers[22].row = 1
-    arm.rigify_layers[22].set = False
+    arm.rigify_layers[22].selset = False
     arm.rigify_layers[22].group = 0
     arm.rigify_layers[23].name = " "
     arm.rigify_layers[23].row = 1
-    arm.rigify_layers[23].set = False
+    arm.rigify_layers[23].selset = False
     arm.rigify_layers[23].group = 0
     arm.rigify_layers[24].name = " "
     arm.rigify_layers[24].row = 1
-    arm.rigify_layers[24].set = False
+    arm.rigify_layers[24].selset = False
     arm.rigify_layers[24].group = 0
     arm.rigify_layers[25].name = " "
     arm.rigify_layers[25].row = 1
-    arm.rigify_layers[25].set = False
+    arm.rigify_layers[25].selset = False
     arm.rigify_layers[25].group = 0
     arm.rigify_layers[26].name = " "
     arm.rigify_layers[26].row = 1
-    arm.rigify_layers[26].set = False
+    arm.rigify_layers[26].selset = False
     arm.rigify_layers[26].group = 0
     arm.rigify_layers[27].name = " "
     arm.rigify_layers[27].row = 1
-    arm.rigify_layers[27].set = False
+    arm.rigify_layers[27].selset = False
     arm.rigify_layers[27].group = 0
     arm.rigify_layers[28].name = "Root"
     arm.rigify_layers[28].row = 14
-    arm.rigify_layers[28].set = False
+    arm.rigify_layers[28].selset = False
     arm.rigify_layers[28].group = 1
 
     bones = {}
diff --git a/rigify/metarigs/Animals/wolf.py b/rigify/metarigs/Animals/wolf.py
index e1a8ea5495e6f54141a21ddd0c921bf5677e7575..e156421bb24c3c8097fb55b96550c9f9c3f9ef1a 100644
--- a/rigify/metarigs/Animals/wolf.py
+++ b/rigify/metarigs/Animals/wolf.py
@@ -48,119 +48,119 @@ def create(obj):
 
     arm.rigify_layers[0].name = "Face"
     arm.rigify_layers[0].row = 1
-    arm.rigify_layers[0].set = False
+    arm.rigify_layers[0].selset = False
     arm.rigify_layers[0].group = 5
     arm.rigify_layers[1].name = "Face (Primary)"
     arm.rigify_layers[1].row = 2
-    arm.rigify_layers[1].set = False
+    arm.rigify_layers[1].selset = False
     arm.rigify_layers[1].group = 2
     arm.rigify_layers[2].name = "Face (Secondary)"
     arm.rigify_layers[2].row = 2
-    arm.rigify_layers[2].set = False
+    arm.rigify_layers[2].selset = False
     arm.rigify_layers[2].group = 3
     arm.rigify_layers[3].name = "Spine"
     arm.rigify_layers[3].row = 3
-    arm.rigify_layers[3].set = False
+    arm.rigify_layers[3].selset = False
     arm.rigify_layers[3].group = 3
     arm.rigify_layers[4].name = "Spine (Tweak)"
     arm.rigify_layers[4].row = 4
-    arm.rigify_layers[4].set = False
+    arm.rigify_layers[4].selset = False
     arm.rigify_layers[4].group = 4
     arm.rigify_layers[5].name = "Paws"
     arm.rigify_layers[5].row = 5
-    arm.rigify_layers[5].set = False
+    arm.rigify_layers[5].selset = False
     arm.rigify_layers[5].group = 6
     arm.rigify_layers[6].name = "Paws (Tweak)"
     arm.rigify_layers[6].row = 6
-    arm.rigify_layers[6].set = False
+    arm.rigify_layers[6].selset = False
     arm.rigify_layers[6].group = 4
     arm.rigify_layers[7].name = "Arm.L (IK)"
     arm.rigify_layers[7].row = 7
-    arm.rigify_layers[7].set = False
+    arm.rigify_layers[7].selset = False
     arm.rigify_layers[7].group = 2
     arm.rigify_layers[8].name = "Arm.L (FK)"
     arm.rigify_layers[8].row = 8
-    arm.rigify_layers[8].set = False
+    arm.rigify_layers[8].selset = False
     arm.rigify_layers[8].group = 5
     arm.rigify_layers[9].name = "Arm.L (Tweak)"
     arm.rigify_layers[9].row = 9
-    arm.rigify_layers[9].set = False
+    arm.rigify_layers[9].selset = False
     arm.rigify_layers[9].group = 4
     arm.rigify_layers[10].name = "Arm.R (IK)"
     arm.rigify_layers[10].row = 7
-    arm.rigify_layers[10].set = False
+    arm.rigify_layers[10].selset = False
     arm.rigify_layers[10].group = 2
     arm.rigify_layers[11].name = "Arm.R (FK)"
     arm.rigify_layers[11].row = 8
-    arm.rigify_layers[11].set = False
+    arm.rigify_layers[11].selset = False
     arm.rigify_layers[11].group = 5
     arm.rigify_layers[12].name = "Arm.R (Tweak)"
     arm.rigify_layers[12].row = 9
-    arm.rigify_layers[12].set = False
+    arm.rigify_layers[12].selset = False
     arm.rigify_layers[12].group = 4
     arm.rigify_layers[13].name = "Leg.L (IK)"
     arm.rigify_layers[13].row = 10
-    arm.rigify_layers[13].set = False
+    arm.rigify_layers[13].selset = False
     arm.rigify_layers[13].group = 2
     arm.rigify_layers[14].name = "Leg.L (FK)"
     arm.rigify_layers[14].row = 11
-    arm.rigify_layers[14].set = False
+    arm.rigify_layers[14].selset = False
     arm.rigify_layers[14].group = 5
     arm.rigify_layers[15].name = "Leg.L (Tweak)"
     arm.rigify_layers[15].row = 12
-    arm.rigify_layers[15].set = False
+    arm.rigify_layers[15].selset = False
     arm.rigify_layers[15].group = 4
     arm.rigify_layers[16].name = "Leg.R (IK)"
     arm.rigify_layers[16].row = 10
-    arm.rigify_layers[16].set = False
+    arm.rigify_layers[16].selset = False
     arm.rigify_layers[16].group = 2
     arm.rigify_layers[17].name = "Leg.R (FK)"
     arm.rigify_layers[17].row = 11
-    arm.rigify_layers[17].set = False
+    arm.rigify_layers[17].selset = False
     arm.rigify_layers[17].group = 5
     arm.rigify_layers[18].name = "Leg.R (Tweak)"
     arm.rigify_layers[18].row = 12
-    arm.rigify_layers[18].set = False
+    arm.rigify_layers[18].selset = False
     arm.rigify_layers[18].group = 4
     arm.rigify_layers[19].name = "Tail"
     arm.rigify_layers[19].row = 13
-    arm.rigify_layers[19].set = False
+    arm.rigify_layers[19].selset = False
     arm.rigify_layers[19].group = 6
     arm.rigify_layers[20].name = ""
     arm.rigify_layers[20].row = 1
-    arm.rigify_layers[20].set = False
+    arm.rigify_layers[20].selset = False
     arm.rigify_layers[20].group = 0
     arm.rigify_layers[21].name = ""
     arm.rigify_layers[21].row = 13
-    arm.rigify_layers[21].set = False
+    arm.rigify_layers[21].selset = False
     arm.rigify_layers[21].group = 0
     arm.rigify_layers[22].name = ""
     arm.rigify_layers[22].row = 13
-    arm.rigify_layers[22].set = False
+    arm.rigify_layers[22].selset = False
     arm.rigify_layers[22].group = 0
     arm.rigify_layers[23].name = ""
     arm.rigify_layers[23].row = 1
-    arm.rigify_layers[23].set = False
+    arm.rigify_layers[23].selset = False
     arm.rigify_layers[23].group = 0
     arm.rigify_layers[24].name = ""
     arm.rigify_layers[24].row = 1
-    arm.rigify_layers[24].set = False
+    arm.rigify_layers[24].selset = False
     arm.rigify_layers[24].group = 0
     arm.rigify_layers[25].name = ""
     arm.rigify_layers[25].row = 1
-    arm.rigify_layers[25].set = False
+    arm.rigify_layers[25].selset = False
     arm.rigify_layers[25].group = 0
     arm.rigify_layers[26].name = ""
     arm.rigify_layers[26].row = 1
-    arm.rigify_layers[26].set = False
+    arm.rigify_layers[26].selset = False
     arm.rigify_layers[26].group = 0
     arm.rigify_layers[27].name = ""
     arm.rigify_layers[27].row = 1
-    arm.rigify_layers[27].set = False
+    arm.rigify_layers[27].selset = False
     arm.rigify_layers[27].group = 0
     arm.rigify_layers[28].name = "Root"
     arm.rigify_layers[28].row = 14
-    arm.rigify_layers[28].set = False
+    arm.rigify_layers[28].selset = False
     arm.rigify_layers[28].group = 1
 
     bones = {}
diff --git a/rigify/metarigs/Basic/basic_human.py b/rigify/metarigs/Basic/basic_human.py
index 221809e7a9e86b1ea6f5156df3a4a63147d41920..6492509b129d1a6e62ef5aa8536cb5a662880cb2 100644
--- a/rigify/metarigs/Basic/basic_human.py
+++ b/rigify/metarigs/Basic/basic_human.py
@@ -48,119 +48,119 @@ def create(obj):
 
     arm.rigify_layers[0].name = " "
     arm.rigify_layers[0].row = 1
-    arm.rigify_layers[0].set = False
+    arm.rigify_layers[0].selset = False
     arm.rigify_layers[0].group = 0
     arm.rigify_layers[1].name = " "
     arm.rigify_layers[1].row = 1
-    arm.rigify_layers[1].set = False
+    arm.rigify_layers[1].selset = False
     arm.rigify_layers[1].group = 0
     arm.rigify_layers[2].name = " "
     arm.rigify_layers[2].row = 1
-    arm.rigify_layers[2].set = False
+    arm.rigify_layers[2].selset = False
     arm.rigify_layers[2].group = 0
     arm.rigify_layers[3].name = "Torso"
     arm.rigify_layers[3].row = 3
-    arm.rigify_layers[3].set = False
+    arm.rigify_layers[3].selset = False
     arm.rigify_layers[3].group = 3
     arm.rigify_layers[4].name = "Torso (Tweak)"
     arm.rigify_layers[4].row = 4
-    arm.rigify_layers[4].set = False
+    arm.rigify_layers[4].selset = False
     arm.rigify_layers[4].group = 4
     arm.rigify_layers[5].name = " "
     arm.rigify_layers[5].row = 1
-    arm.rigify_layers[5].set = False
+    arm.rigify_layers[5].selset = False
     arm.rigify_layers[5].group = 0
     arm.rigify_layers[6].name = " "
     arm.rigify_layers[6].row = 1
-    arm.rigify_layers[6].set = False
+    arm.rigify_layers[6].selset = False
     arm.rigify_layers[6].group = 0
     arm.rigify_layers[7].name = "Arm.L (IK)"
     arm.rigify_layers[7].row = 7
-    arm.rigify_layers[7].set = False
+    arm.rigify_layers[7].selset = False
     arm.rigify_layers[7].group = 2
     arm.rigify_layers[8].name = "Arm.L (FK)"
     arm.rigify_layers[8].row = 8
-    arm.rigify_layers[8].set = False
+    arm.rigify_layers[8].selset = False
     arm.rigify_layers[8].group = 5
     arm.rigify_layers[9].name = "Arm.L (Tweak)"
     arm.rigify_layers[9].row = 9
-    arm.rigify_layers[9].set = False
+    arm.rigify_layers[9].selset = False
     arm.rigify_layers[9].group = 4
     arm.rigify_layers[10].name = "Arm.R (IK)"
     arm.rigify_layers[10].row = 7
-    arm.rigify_layers[10].set = False
+    arm.rigify_layers[10].selset = False
     arm.rigify_layers[10].group = 2
     arm.rigify_layers[11].name = "Arm.R (FK)"
     arm.rigify_layers[11].row = 8
-    arm.rigify_layers[11].set = False
+    arm.rigify_layers[11].selset = False
     arm.rigify_layers[11].group = 5
     arm.rigify_layers[12].name = "Arm.R (Tweak)"
     arm.rigify_layers[12].row = 9
-    arm.rigify_layers[12].set = False
+    arm.rigify_layers[12].selset = False
     arm.rigify_layers[12].group = 4
     arm.rigify_layers[13].name = "Leg.L (IK)"
     arm.rigify_layers[13].row = 10
-    arm.rigify_layers[13].set = False
+    arm.rigify_layers[13].selset = False
     arm.rigify_layers[13].group = 2
     arm.rigify_layers[14].name = "Leg.L (FK)"
     arm.rigify_layers[14].row = 11
-    arm.rigify_layers[14].set = False
+    arm.rigify_layers[14].selset = False
     arm.rigify_layers[14].group = 5
     arm.rigify_layers[15].name = "Leg.L (Tweak)"
     arm.rigify_layers[15].row = 12
-    arm.rigify_layers[15].set = False
+    arm.rigify_layers[15].selset = False
     arm.rigify_layers[15].group = 4
     arm.rigify_layers[16].name = "Leg.R (IK)"
     arm.rigify_layers[16].row = 10
-    arm.rigify_layers[16].set = False
+    arm.rigify_layers[16].selset = False
     arm.rigify_layers[16].group = 2
     arm.rigify_layers[17].name = "Leg.R (FK)"
     arm.rigify_layers[17].row = 11
-    arm.rigify_layers[17].set = False
+    arm.rigify_layers[17].selset = False
     arm.rigify_layers[17].group = 5
     arm.rigify_layers[18].name = "Leg.R (Tweak)"
     arm.rigify_layers[18].row = 12
-    arm.rigify_layers[18].set = False
+    arm.rigify_layers[18].selset = False
     arm.rigify_layers[18].group = 4
     arm.rigify_layers[19].name = ""
     arm.rigify_layers[19].row = 1
-    arm.rigify_layers[19].set = False
+    arm.rigify_layers[19].selset = False
     arm.rigify_layers[19].group = 0
     arm.rigify_layers[20].name = ""
     arm.rigify_layers[20].row = 1
-    arm.rigify_layers[20].set = False
+    arm.rigify_layers[20].selset = False
     arm.rigify_layers[20].group = 0
     arm.rigify_layers[21].name = ""
     arm.rigify_layers[21].row = 1
-    arm.rigify_layers[21].set = False
+    arm.rigify_layers[21].selset = False
     arm.rigify_layers[21].group = 0
     arm.rigify_layers[22].name = ""
     arm.rigify_layers[22].row = 1
-    arm.rigify_layers[22].set = False
+    arm.rigify_layers[22].selset = False
     arm.rigify_layers[22].group = 0
     arm.rigify_layers[23].name = ""
     arm.rigify_layers[23].row = 1
-    arm.rigify_layers[23].set = False
+    arm.rigify_layers[23].selset = False
     arm.rigify_layers[23].group = 0
     arm.rigify_layers[24].name = ""
     arm.rigify_layers[24].row = 1
-    arm.rigify_layers[24].set = False
+    arm.rigify_layers[24].selset = False
     arm.rigify_layers[24].group = 0
     arm.rigify_layers[25].name = ""
     arm.rigify_layers[25].row = 1
-    arm.rigify_layers[25].set = False
+    arm.rigify_layers[25].selset = False
     arm.rigify_layers[25].group = 0
     arm.rigify_layers[26].name = ""
     arm.rigify_layers[26].row = 1
-    arm.rigify_layers[26].set = False
+    arm.rigify_layers[26].selset = False
     arm.rigify_layers[26].group = 0
     arm.rigify_layers[27].name = ""
     arm.rigify_layers[27].row = 1
-    arm.rigify_layers[27].set = False
+    arm.rigify_layers[27].selset = False
     arm.rigify_layers[27].group = 0
     arm.rigify_layers[28].name = "Root"
     arm.rigify_layers[28].row = 14
-    arm.rigify_layers[28].set = False
+    arm.rigify_layers[28].selset = False
     arm.rigify_layers[28].group = 1
 
     bones = {}
diff --git a/rigify/metarigs/Basic/basic_quadruped.py b/rigify/metarigs/Basic/basic_quadruped.py
index fe3449e1f34eb55148c6f6d8c514d113204da300..46143b36d84bd0f9238639052a273d79aba45d85 100644
--- a/rigify/metarigs/Basic/basic_quadruped.py
+++ b/rigify/metarigs/Basic/basic_quadruped.py
@@ -48,119 +48,119 @@ def create(obj):
 
     arm.rigify_layers[0].name = " "
     arm.rigify_layers[0].row = 1
-    arm.rigify_layers[0].set = False
+    arm.rigify_layers[0].selset = False
     arm.rigify_layers[0].group = 0
     arm.rigify_layers[1].name = " "
     arm.rigify_layers[1].row = 2
-    arm.rigify_layers[1].set = False
+    arm.rigify_layers[1].selset = False
     arm.rigify_layers[1].group = 0
     arm.rigify_layers[2].name = " "
     arm.rigify_layers[2].row = 2
-    arm.rigify_layers[2].set = False
+    arm.rigify_layers[2].selset = False
     arm.rigify_layers[2].group = 0
     arm.rigify_layers[3].name = "Spine"
     arm.rigify_layers[3].row = 3
-    arm.rigify_layers[3].set = False
+    arm.rigify_layers[3].selset = False
     arm.rigify_layers[3].group = 3
     arm.rigify_layers[4].name = "Spine (Tweak)"
     arm.rigify_layers[4].row = 4
-    arm.rigify_layers[4].set = False
+    arm.rigify_layers[4].selset = False
     arm.rigify_layers[4].group = 4
     arm.rigify_layers[5].name = " "
     arm.rigify_layers[5].row = 5
-    arm.rigify_layers[5].set = False
+    arm.rigify_layers[5].selset = False
     arm.rigify_layers[5].group = 0
     arm.rigify_layers[6].name = " "
     arm.rigify_layers[6].row = 6
-    arm.rigify_layers[6].set = False
+    arm.rigify_layers[6].selset = False
     arm.rigify_layers[6].group = 0
     arm.rigify_layers[7].name = "Arm.L (IK)"
     arm.rigify_layers[7].row = 7
-    arm.rigify_layers[7].set = False
+    arm.rigify_layers[7].selset = False
     arm.rigify_layers[7].group = 2
     arm.rigify_layers[8].name = "Arm.L (FK)"
     arm.rigify_layers[8].row = 8
-    arm.rigify_layers[8].set = False
+    arm.rigify_layers[8].selset = False
     arm.rigify_layers[8].group = 5
     arm.rigify_layers[9].name = "Arm.L (Tweak)"
     arm.rigify_layers[9].row = 9
-    arm.rigify_layers[9].set = False
+    arm.rigify_layers[9].selset = False
     arm.rigify_layers[9].group = 4
     arm.rigify_layers[10].name = "Arm.R (IK)"
     arm.rigify_layers[10].row = 7
-    arm.rigify_layers[10].set = False
+    arm.rigify_layers[10].selset = False
     arm.rigify_layers[10].group = 2
     arm.rigify_layers[11].name = "Arm.R (FK)"
     arm.rigify_layers[11].row = 8
-    arm.rigify_layers[11].set = False
+    arm.rigify_layers[11].selset = False
     arm.rigify_layers[11].group = 5
     arm.rigify_layers[12].name = "Arm.R (Tweak)"
     arm.rigify_layers[12].row = 9
-    arm.rigify_layers[12].set = False
+    arm.rigify_layers[12].selset = False
     arm.rigify_layers[12].group = 4
     arm.rigify_layers[13].name = "Leg.L (IK)"
     arm.rigify_layers[13].row = 10
-    arm.rigify_layers[13].set = False
+    arm.rigify_layers[13].selset = False
     arm.rigify_layers[13].group = 2
     arm.rigify_layers[14].name = "Leg.L (FK)"
     arm.rigify_layers[14].row = 11
-    arm.rigify_layers[14].set = False
+    arm.rigify_layers[14].selset = False
     arm.rigify_layers[14].group = 5
     arm.rigify_layers[15].name = "Leg.L (Tweak)"
     arm.rigify_layers[15].row = 12
-    arm.rigify_layers[15].set = False
+    arm.rigify_layers[15].selset = False
     arm.rigify_layers[15].group = 4
     arm.rigify_layers[16].name = "Leg.R (IK)"
     arm.rigify_layers[16].row = 10
-    arm.rigify_layers[16].set = False
+    arm.rigify_layers[16].selset = False
     arm.rigify_layers[16].group = 2
     arm.rigify_layers[17].name = "Leg.R (FK)"
     arm.rigify_layers[17].row = 11
-    arm.rigify_layers[17].set = False
+    arm.rigify_layers[17].selset = False
     arm.rigify_layers[17].group = 5
     arm.rigify_layers[18].name = "Leg.R (Tweak)"
     arm.rigify_layers[18].row = 12
-    arm.rigify_layers[18].set = False
+    arm.rigify_layers[18].selset = False
     arm.rigify_layers[18].group = 4
     arm.rigify_layers[19].name = "Tail"
     arm.rigify_layers[19].row = 13
-    arm.rigify_layers[19].set = False
+    arm.rigify_layers[19].selset = False
     arm.rigify_layers[19].group = 6
     arm.rigify_layers[20].name = ""
     arm.rigify_layers[20].row = 1
-    arm.rigify_layers[20].set = False
+    arm.rigify_layers[20].selset = False
     arm.rigify_layers[20].group = 0
     arm.rigify_layers[21].name = ""
     arm.rigify_layers[21].row = 13
-    arm.rigify_layers[21].set = False
+    arm.rigify_layers[21].selset = False
     arm.rigify_layers[21].group = 0
     arm.rigify_layers[22].name = ""
     arm.rigify_layers[22].row = 13
-    arm.rigify_layers[22].set = False
+    arm.rigify_layers[22].selset = False
     arm.rigify_layers[22].group = 0
     arm.rigify_layers[23].name = ""
     arm.rigify_layers[23].row = 1
-    arm.rigify_layers[23].set = False
+    arm.rigify_layers[23].selset = False
     arm.rigify_layers[23].group = 0
     arm.rigify_layers[24].name = ""
     arm.rigify_layers[24].row = 1
-    arm.rigify_layers[24].set = False
+    arm.rigify_layers[24].selset = False
     arm.rigify_layers[24].group = 0
     arm.rigify_layers[25].name = ""
     arm.rigify_layers[25].row = 1
-    arm.rigify_layers[25].set = False
+    arm.rigify_layers[25].selset = False
     arm.rigify_layers[25].group = 0
     arm.rigify_layers[26].name = ""
     arm.rigify_layers[26].row = 1
-    arm.rigify_layers[26].set = False
+    arm.rigify_layers[26].selset = False
     arm.rigify_layers[26].group = 0
     arm.rigify_layers[27].name = ""
     arm.rigify_layers[27].row = 1
-    arm.rigify_layers[27].set = False
+    arm.rigify_layers[27].selset = False
     arm.rigify_layers[27].group = 0
     arm.rigify_layers[28].name = "Root"
     arm.rigify_layers[28].row = 14
-    arm.rigify_layers[28].set = False
+    arm.rigify_layers[28].selset = False
     arm.rigify_layers[28].group = 1
 
     bones = {}
diff --git a/rigify/metarigs/human.py b/rigify/metarigs/human.py
index cf301cd26df6ed5a5847704dd20dd511ef9201be..337180a5c9741600f3f1c9eb480251bcbaf0e49a 100644
--- a/rigify/metarigs/human.py
+++ b/rigify/metarigs/human.py
@@ -48,119 +48,119 @@ def create(obj):
 
     arm.rigify_layers[0].name = "Face"
     arm.rigify_layers[0].row = 1
-    arm.rigify_layers[0].set = False
+    arm.rigify_layers[0].selset = False
     arm.rigify_layers[0].group = 5
     arm.rigify_layers[1].name = "Face (Primary)"
     arm.rigify_layers[1].row = 2
-    arm.rigify_layers[1].set = False
+    arm.rigify_layers[1].selset = False
     arm.rigify_layers[1].group = 2
     arm.rigify_layers[2].name = "Face (Secondary)"
     arm.rigify_layers[2].row = 2
-    arm.rigify_layers[2].set = False
+    arm.rigify_layers[2].selset = False
     arm.rigify_layers[2].group = 3
     arm.rigify_layers[3].name = "Torso"
     arm.rigify_layers[3].row = 3
-    arm.rigify_layers[3].set = False
+    arm.rigify_layers[3].selset = False
     arm.rigify_layers[3].group = 3
     arm.rigify_layers[4].name = "Torso (Tweak)"
     arm.rigify_layers[4].row = 4
-    arm.rigify_layers[4].set = False
+    arm.rigify_layers[4].selset = False
     arm.rigify_layers[4].group = 4
     arm.rigify_layers[5].name = "Fingers"
     arm.rigify_layers[5].row = 5
-    arm.rigify_layers[5].set = False
+    arm.rigify_layers[5].selset = False
     arm.rigify_layers[5].group = 6
     arm.rigify_layers[6].name = "Fingers (Tweak)"
     arm.rigify_layers[6].row = 6
-    arm.rigify_layers[6].set = False
+    arm.rigify_layers[6].selset = False
     arm.rigify_layers[6].group = 4
     arm.rigify_layers[7].name = "Arm.L (IK)"
     arm.rigify_layers[7].row = 7
-    arm.rigify_layers[7].set = False
+    arm.rigify_layers[7].selset = False
     arm.rigify_layers[7].group = 2
     arm.rigify_layers[8].name = "Arm.L (FK)"
     arm.rigify_layers[8].row = 8
-    arm.rigify_layers[8].set = False
+    arm.rigify_layers[8].selset = False
     arm.rigify_layers[8].group = 5
     arm.rigify_layers[9].name = "Arm.L (Tweak)"
     arm.rigify_layers[9].row = 9
-    arm.rigify_layers[9].set = False
+    arm.rigify_layers[9].selset = False
     arm.rigify_layers[9].group = 4
     arm.rigify_layers[10].name = "Arm.R (IK)"
     arm.rigify_layers[10].row = 7
-    arm.rigify_layers[10].set = False
+    arm.rigify_layers[10].selset = False
     arm.rigify_layers[10].group = 2
     arm.rigify_layers[11].name = "Arm.R (FK)"
     arm.rigify_layers[11].row = 8
-    arm.rigify_layers[11].set = False
+    arm.rigify_layers[11].selset = False
     arm.rigify_layers[11].group = 5
     arm.rigify_layers[12].name = "Arm.R (Tweak)"
     arm.rigify_layers[12].row = 9
-    arm.rigify_layers[12].set = False
+    arm.rigify_layers[12].selset = False
     arm.rigify_layers[12].group = 4
     arm.rigify_layers[13].name = "Leg.L (IK)"
     arm.rigify_layers[13].row = 10
-    arm.rigify_layers[13].set = False
+    arm.rigify_layers[13].selset = False
     arm.rigify_layers[13].group = 2
     arm.rigify_layers[14].name = "Leg.L (FK)"
     arm.rigify_layers[14].row = 11
-    arm.rigify_layers[14].set = False
+    arm.rigify_layers[14].selset = False
     arm.rigify_layers[14].group = 5
     arm.rigify_layers[15].name = "Leg.L (Tweak)"
     arm.rigify_layers[15].row = 12
-    arm.rigify_layers[15].set = False
+    arm.rigify_layers[15].selset = False
     arm.rigify_layers[15].group = 4
     arm.rigify_layers[16].name = "Leg.R (IK)"
     arm.rigify_layers[16].row = 10
-    arm.rigify_layers[16].set = False
+    arm.rigify_layers[16].selset = False
     arm.rigify_layers[16].group = 2
     arm.rigify_layers[17].name = "Leg.R (FK)"
     arm.rigify_layers[17].row = 11
-    arm.rigify_layers[17].set = False
+    arm.rigify_layers[17].selset = False
     arm.rigify_layers[17].group = 5
     arm.rigify_layers[18].name = "Leg.R (Tweak)"
     arm.rigify_layers[18].row = 12
-    arm.rigify_layers[18].set = False
+    arm.rigify_layers[18].selset = False
     arm.rigify_layers[18].group = 4
     arm.rigify_layers[19].name = ""
     arm.rigify_layers[19].row = 1
-    arm.rigify_layers[19].set = False
+    arm.rigify_layers[19].selset = False
     arm.rigify_layers[19].group = 0
     arm.rigify_layers[20].name = ""
     arm.rigify_layers[20].row = 1
-    arm.rigify_layers[20].set = False
+    arm.rigify_layers[20].selset = False
     arm.rigify_layers[20].group = 0
     arm.rigify_layers[21].name = ""
     arm.rigify_layers[21].row = 1
-    arm.rigify_layers[21].set = False
+    arm.rigify_layers[21].selset = False
     arm.rigify_layers[21].group = 0
     arm.rigify_layers[22].name = ""
     arm.rigify_layers[22].row = 1
-    arm.rigify_layers[22].set = False
+    arm.rigify_layers[22].selset = False
     arm.rigify_layers[22].group = 0
     arm.rigify_layers[23].name = ""
     arm.rigify_layers[23].row = 1
-    arm.rigify_layers[23].set = False
+    arm.rigify_layers[23].selset = False
     arm.rigify_layers[23].group = 0
     arm.rigify_layers[24].name = ""
     arm.rigify_layers[24].row = 1
-    arm.rigify_layers[24].set = False
+    arm.rigify_layers[24].selset = False
     arm.rigify_layers[24].group = 0
     arm.rigify_layers[25].name = ""
     arm.rigify_layers[25].row = 1
-    arm.rigify_layers[25].set = False
+    arm.rigify_layers[25].selset = False
     arm.rigify_layers[25].group = 0
     arm.rigify_layers[26].name = ""
     arm.rigify_layers[26].row = 1
-    arm.rigify_layers[26].set = False
+    arm.rigify_layers[26].selset = False
     arm.rigify_layers[26].group = 0
     arm.rigify_layers[27].name = ""
     arm.rigify_layers[27].row = 1
-    arm.rigify_layers[27].set = False
+    arm.rigify_layers[27].selset = False
     arm.rigify_layers[27].group = 0
     arm.rigify_layers[28].name = "Root"
     arm.rigify_layers[28].row = 14
-    arm.rigify_layers[28].set = False
+    arm.rigify_layers[28].selset = False
     arm.rigify_layers[28].group = 1
 
     bones = {}
diff --git a/rigify/ui.py b/rigify/ui.py
index 3a155c0dcf190d61cacfd595ddc77195cec9784c..c8a7e98a628d718e5c10a81d8bf5272cbc77b02e 100644
--- a/rigify/ui.py
+++ b/rigify/ui.py
@@ -240,8 +240,8 @@ class DATA_PT_rigify_layer_names(bpy.types.Panel):
                 #row.prop(arm, "layers", index=i, text="Layer %d" % (i + 1), toggle=True, icon=icon)
                 row.prop(rigify_layer, "name", text="")
                 row.prop(rigify_layer, "row", text="UI Row")
-                icon = 'RADIOBUT_ON' if rigify_layer.set else 'RADIOBUT_OFF'
-                row.prop(rigify_layer, "set", text="", toggle=True, icon=icon)
+                icon = 'RADIOBUT_ON' if rigify_layer.selset else 'RADIOBUT_OFF'
+                row.prop(rigify_layer, "selset", text="", toggle=True, icon=icon)
                 row.prop(rigify_layer, "group", text="Bone Group")
             else:
                 row = col.row(align=True)
@@ -253,8 +253,8 @@ class DATA_PT_rigify_layer_names(bpy.types.Panel):
                 row1.prop(rigify_layer, "name", text="")
                 row1.prop(rigify_layer, "row", text="UI Row")
                 row1.enabled = False
-                icon = 'RADIOBUT_ON' if rigify_layer.set else 'RADIOBUT_OFF'
-                row.prop(rigify_layer, "set", text="", toggle=True, icon=icon)
+                icon = 'RADIOBUT_ON' if rigify_layer.selset else 'RADIOBUT_OFF'
+                row.prop(rigify_layer, "selset", text="", toggle=True, icon=icon)
                 row.prop(rigify_layer, "group", text="Bone Group")
             if rigify_layer.group == 0:
                 row.label(text='None')
diff --git a/rigify/utils.py b/rigify/utils.py
index 876ee0d33d8f028de472fd12585363b4d187f061..51b432b995e988c35f6de68160855844f24fcff8 100644
--- a/rigify/utils.py
+++ b/rigify/utils.py
@@ -1026,11 +1026,11 @@ def write_metarig(obj, layers=False, func_name="create", groups=False):
         for i in range(len(arm.rigify_layers)):
             name = arm.rigify_layers[i].name
             row = arm.rigify_layers[i].row
-            set = arm.rigify_layers[i].set
+            selset = arm.rigify_layers[i].selset
             group = arm.rigify_layers[i].group
             code.append('    arm.rigify_layers[' + str(i) + '].name = "' + name + '"')
             code.append('    arm.rigify_layers[' + str(i) + '].row = ' + str(row))
-            code.append('    arm.rigify_layers[' + str(i) + '].set = ' + str(set))
+            code.append('    arm.rigify_layers[' + str(i) + '].selset = ' + str(selset))
             code.append('    arm.rigify_layers[' + str(i) + '].group = ' + str(group))
 
     # write parents first