diff --git a/release/scripts/modules/rigify/arm_biped_generic.py b/release/scripts/modules/rigify/arm_biped_generic.py
index dedbc27ad2a..af6c4880954 100644
--- a/release/scripts/modules/rigify/arm_biped_generic.py
+++ b/release/scripts/modules/rigify/arm_biped_generic.py
@@ -57,7 +57,7 @@ def metarig_template():
 
     bpy.ops.object.mode_set(mode='OBJECT')
     pbone = obj.pose.bones['upper_arm']
-    pbone['type'] = 'arm'
+    pbone['type'] = 'arm_biped_generic'
 
 
 def metarig_definition(obj, orig_bone_name):
diff --git a/release/scripts/modules/rigify/finger_curl.py b/release/scripts/modules/rigify/finger_curl.py
index eb5a5d7149a..9cba1810fc9 100644
--- a/release/scripts/modules/rigify/finger_curl.py
+++ b/release/scripts/modules/rigify/finger_curl.py
@@ -51,7 +51,7 @@ def metarig_template():
 
     bpy.ops.object.mode_set(mode='OBJECT')
     pbone = obj.pose.bones['finger.01']
-    pbone['type'] = 'finger'
+    pbone['type'] = 'finger_curl'
 
 
 def metarig_definition(obj, orig_bone_name):
diff --git a/release/scripts/modules/rigify/leg_biped_generic.py b/release/scripts/modules/rigify/leg_biped_generic.py
index 66edc7bc1c1..c6fb57dd6f5 100644
--- a/release/scripts/modules/rigify/leg_biped_generic.py
+++ b/release/scripts/modules/rigify/leg_biped_generic.py
@@ -68,7 +68,7 @@ def metarig_template():
 
     bpy.ops.object.mode_set(mode='OBJECT')
     pbone = obj.pose.bones['thigh']
-    pbone['type'] = 'leg'
+    pbone['type'] = 'leg_biped_generic'
 
 
 def metarig_definition(obj, orig_bone_name):
diff --git a/release/scripts/modules/rigify/neck_flex.py b/release/scripts/modules/rigify/neck_flex.py
index 088d8566cbc..68015b3ebd3 100644
--- a/release/scripts/modules/rigify/neck_flex.py
+++ b/release/scripts/modules/rigify/neck_flex.py
@@ -75,7 +75,7 @@ def metarig_template():
 
     bpy.ops.object.mode_set(mode='OBJECT')
     pbone = obj.pose.bones['head']
-    pbone['type'] = 'neck'
+    pbone['type'] = 'neck_flex'
 
 
 def metarig_definition(obj, orig_bone_name):
diff --git a/release/scripts/modules/rigify/palm_spread.py b/release/scripts/modules/rigify/palm_curl.py
similarity index 99%
rename from release/scripts/modules/rigify/palm_spread.py
rename to release/scripts/modules/rigify/palm_curl.py
index 2970dab8566..78a3d1fb73f 100644
--- a/release/scripts/modules/rigify/palm_spread.py
+++ b/release/scripts/modules/rigify/palm_curl.py
@@ -74,7 +74,7 @@ def metarig_template():
 
     bpy.ops.object.mode_set(mode='OBJECT')
     pbone = obj.pose.bones['palm.01']
-    pbone['type'] = 'palm'
+    pbone['type'] = 'palm_curl'
 
 
 def metarig_definition(obj, orig_bone_name):
diff --git a/release/scripts/modules/rigify/spine_pivot_flex.py b/release/scripts/modules/rigify/spine_pivot_flex.py
index 2674d920cc8..37a350bb3be 100644
--- a/release/scripts/modules/rigify/spine_pivot_flex.py
+++ b/release/scripts/modules/rigify/spine_pivot_flex.py
@@ -87,7 +87,7 @@ def metarig_template():
 
     bpy.ops.object.mode_set(mode='OBJECT')
     pbone = obj.pose.bones['rib_cage']
-    pbone['type'] = 'spine.fk'
+    pbone['type'] = 'spine_pivot_flex'
 
 
 def metarig_definition(obj, orig_bone_name):