diff --git a/src/bp-xprofile/classes/class-bp-xprofile-field-type-checkbox.php b/src/bp-xprofile/classes/class-bp-xprofile-field-type-checkbox.php
index d986cd0..7267ad9 100644
--- a/src/bp-xprofile/classes/class-bp-xprofile-field-type-checkbox.php
+++ b/src/bp-xprofile/classes/class-bp-xprofile-field-type-checkbox.php
@@ -156,7 +156,7 @@ class BP_XProfile_Field_Type_Checkbox extends BP_XProfile_Field_Type {
 
 			$new_html = sprintf( '<label for="%3$s" class="option-label"><input %1$s type="checkbox" name="%2$s" id="%3$s" value="%4$s">%5$s</label>',
 				$selected,
-				esc_attr( "field_{$this->field_obj->id}[]" ),
+				esc_attr( bp_get_the_profile_field_input_name() . '[]' ),
 				esc_attr( "field_{$options[$k]->id}_{$k}" ),
 				esc_attr( stripslashes( $options[$k]->name ) ),
 				esc_html( stripslashes( $options[$k]->name ) )
diff --git a/src/bp-xprofile/classes/class-bp-xprofile-field-type-radiobutton.php b/src/bp-xprofile/classes/class-bp-xprofile-field-type-radiobutton.php
index f8e0d5d..6c039bb 100644
--- a/src/bp-xprofile/classes/class-bp-xprofile-field-type-radiobutton.php
+++ b/src/bp-xprofile/classes/class-bp-xprofile-field-type-radiobutton.php
@@ -134,7 +134,7 @@ class BP_XProfile_Field_Type_Radiobutton extends BP_XProfile_Field_Type {
 
 			$new_html = sprintf( '<label for="%3$s" class="option-label"><input %1$s type="radio" name="%2$s" id="%3$s" value="%4$s">%5$s</label>',
 				$selected,
-				esc_attr( "field_{$this->field_obj->id}" ),
+				esc_attr( bp_get_the_profile_field_input_name() ),
 				esc_attr( "option_{$options[$k]->id}" ),
 				esc_attr( stripslashes( $options[$k]->name ) ),
 				esc_html( stripslashes( $options[$k]->name ) )