diff --git a/media/system/js/subform-repeatable-uncompressed.js b/media/system/js/subform-repeatable-uncompressed.js
index cb5df969d1cf0..ec6e78640bb0b 100644
--- a/media/system/js/subform-repeatable-uncompressed.js
+++ b/media/system/js/subform-repeatable-uncompressed.js
@@ -154,52 +154,55 @@
 		this.lastRowNum = countnew;
 		$row.attr('data-group', groupnew);
 
-		// fix inputs that have a "name" attribute
-		var haveName = $row.find('*[name]'),
-			ids = {}; // collect existing id`s for fix checkboxes and radio
-		for(var i=0, l = haveName.length; i<l; i++){
-				var $el = $(haveName[i]),
-				name = $el.attr('name'),
-				id = name.replace(/(\]|\[\]$)/g, '').replace(/\[/g, '_'), // count id from name, cause we lost it after cloning
-				nameNew = name.replace('[' + group + '][', '['+ groupnew +']['),// count new name
-				idNew = id.replace(group, groupnew),// count new id
-				forOldAttr = id; // for fix "for" in the labels
-
-			if($el.prop('type') === 'checkbox'){// <input type="checkbox"> fix
-				//check if multiple
-				if(name.match(/\[\]$/)){
-					// replace a group label "for"
-					var groupLbl = $row.find('label[for="' + id + '"]');
-					if(groupLbl.length){
-						groupLbl.attr('for', idNew);
-						$el.parents('fieldset.checkboxes').attr('id', idNew);
-					}
-					// recount id
-					var count = ids[id] ? ids[id].length : 0;
-					forOldAttr = forOldAttr + count;
-					idNew = idNew + count;
+		// Fix inputs that have a "name" attribute
+		var haveName = $row.find('[name]'),
+			ids = {}; // Collect id for fix checkboxes and radio
+
+		for (var i = 0, l = haveName.length; i < l; i++) {
+			var $el     = $(haveName[i]),
+				name    = $el.attr('name'),
+				id      = name.replace(/(\[\]$)/g, '').replace(/(\]\[)/g, '__').replace(/\[/g, '_').replace(/\]/g, ''), // id from name
+				nameNew = name.replace('[' + group + '][', '['+ groupnew +']['), // New name
+				idNew   = id.replace(group, groupnew), // Count new id
+				countMulti = 0, // count for multiple radio/checkboxes
+				forOldAttr = id; // Fix "for" in the labels
+
+			if ($el.prop('type') === 'checkbox' && name.match(/\[\]$/)) { // <input type="checkbox" name="name[]"> fix
+				// Recount id
+				countMulti = ids[id] ? ids[id].length : 0;
+				if (!countMulti) {
+					// Set the id for fieldset and group label
+					$el.closest('fieldset.checkboxes').attr('id', idNew);
+					$row.find('label[for="' + id + '"]').attr('for', idNew).attr('id', idNew + '-lbl');
 				}
+				forOldAttr = forOldAttr + countMulti;
+				idNew = idNew + countMulti;
 			}
-			else if($el.prop('type') === 'radio'){// <input type="radio"> fix
-				// recount id
-				var count = ids[id] ? ids[id].length : 0;
-				forOldAttr = forOldAttr + count;
-				idNew = idNew + count;
+			else if ($el.prop('type') === 'radio') { // <input type="radio"> fix
+				// Recount id
+				countMulti = ids[id] ? ids[id].length : 0;
+				if (!countMulti) {
+					// Set the id for fieldset and group label
+					$el.closest('fieldset.radio').attr('id', idNew);
+					$row.find('label[for="' + id + '"]').attr('for', idNew).attr('id', idNew + '-lbl');
+				}
+				forOldAttr = forOldAttr + countMulti;
+				idNew = idNew + countMulti;
 			}
 
-			//cache ids
-			if(ids[id]){
+			// Cache already used id
+			if (ids[id]) {
 				ids[id].push(true);
 			} else {
 				ids[id] = [true];
 			}
 
-			// replace name to new
+			// Replace the name to new one
 			$el.attr('name', nameNew);
-			// set new id
+			// Set new id
 			$el.attr('id', idNew);
-			// guess there a label for this input
-			$row.find('label[for="' + forOldAttr + '"]').attr('for', idNew);
+			// Guess there a label for this input
+			$row.find('label[for="' + forOldAttr + '"]').attr('for', idNew).attr('id', idNew + '-lbl');
 		}
 	};
 
diff --git a/media/system/js/subform-repeatable.js b/media/system/js/subform-repeatable.js
index 9bc3f3ea82751..5410427d14ac1 100644
--- a/media/system/js/subform-repeatable.js
+++ b/media/system/js/subform-repeatable.js
@@ -1 +1 @@
-(function($){"use strict";$.subformRepeatable=function(container,options){this.$container=$(container);if(this.$container.data("subformRepeatable")){return self}this.$container.data("subformRepeatable",self);this.options=$.extend({},$.subformRepeatable.defaults,options);this.template="";this.prepareTemplate();this.$containerRows=this.options.rowsContainer?this.$container.find(this.options.rowsContainer):this.$container;this.lastRowNum=this.$containerRows.find(this.options.repeatableElement).length;var self=this;this.$container.on("click",this.options.btAdd,function(e){e.preventDefault();var after=$(this).parents(self.options.repeatableElement);if(!after.length){after=null}self.addRow(after)});this.$container.on("click",this.options.btRemove,function(e){e.preventDefault();var $row=$(this).parents(self.options.repeatableElement);self.removeRow($row)});if(this.options.btMove){this.$containerRows.sortable({items:this.options.repeatableElement,handle:this.options.btMove,tolerance:"pointer"})}this.$container.trigger("subform-ready")};$.subformRepeatable.prototype.prepareTemplate=function(){if(this.options.rowTemplateSelector){var tmplElement=this.$container.find(this.options.rowTemplateSelector)[0]||{};this.template=$.trim(tmplElement.text||tmplElement.textContent)}else{var row=this.$container.find(this.options.repeatableElement).get(0),$row=$(row).clone();try{this.clearScripts($row)}catch(e){if(window.console){console.log(e)}}this.template=$row.prop("outerHTML")}};$.subformRepeatable.prototype.addRow=function(after){var count=this.$containerRows.find(this.options.repeatableElement).length;if(count>=this.options.maximum){return null}var row=$.parseHTML(this.template);if(after){$(after).after(row)}else{this.$containerRows.append(row)}var $row=$(row);$row.attr("data-new","true");this.fixUniqueAttributes($row,count);try{this.fixScripts($row)}catch(e){if(window.console){console.log(e)}}this.$container.trigger("subform-row-add",$row);return $row};$.subformRepeatable.prototype.removeRow=function($row){var count=this.$containerRows.find(this.options.repeatableElement).length;if(count<=this.options.minimum){return}this.$container.trigger("subform-row-remove",$row);$row.remove()};$.subformRepeatable.prototype.fixUniqueAttributes=function($row,count){this.lastRowNum++;var group=$row.attr("data-group"),basename=$row.attr("data-base-name"),count=count||0,countnew=Math.max(this.lastRowNum,count+1),groupnew=basename+countnew;this.lastRowNum=countnew;$row.attr("data-group",groupnew);var haveName=$row.find("*[name]"),ids={};for(var i=0,l=haveName.length;i<l;i++){var $el=$(haveName[i]),name=$el.attr("name"),id=name.replace(/(\]|\[\]$)/g,"").replace(/\[/g,"_"),nameNew=name.replace("["+group+"][","["+groupnew+"]["),idNew=id.replace(group,groupnew),forOldAttr=id;if($el.prop("type")==="checkbox"){if(name.match(/\[\]$/)){var groupLbl=$row.find('label[for="'+id+'"]');if(groupLbl.length){groupLbl.attr("for",idNew);$el.parents("fieldset.checkboxes").attr("id",idNew)}var count=ids[id]?ids[id].length:0;forOldAttr=forOldAttr+count;idNew=idNew+count}}else if($el.prop("type")==="radio"){var count=ids[id]?ids[id].length:0;forOldAttr=forOldAttr+count;idNew=idNew+count}if(ids[id]){ids[id].push(true)}else{ids[id]=[true]}$el.attr("name",nameNew);$el.attr("id",idNew);$row.find('label[for="'+forOldAttr+'"]').attr("for",idNew)}};$.subformRepeatable.prototype.clearScripts=function($row){if($.fn.chosen){$row.find("select.chzn-done").each(function(){var $el=$(this);$el.next(".chzn-container").remove();$el.show().addClass("fix-chosen")})}};$.subformRepeatable.prototype.fixScripts=function($row){$row.find('a[onclick*="jInsertFieldValue"]').each(function(){var $el=$(this),inputId=$el.siblings('input[type="text"]').attr("id"),$select=$el.prev(),oldHref=$select.attr("href");$el.attr("onclick","jInsertFieldValue('', '"+inputId+"');return false;");$select.attr("href",oldHref.replace(/&fieldid=(.+)&/,"&fieldid="+inputId+"&"))});if($.fn.fieldMedia){$row.find(".field-media-wrapper").fieldMedia()}if($.fn.tooltip){$row.find(".hasTooltip").tooltip({html:true,container:"body"})}if($.fn.fieldUser){$row.find(".field-user-wrapper").fieldUser()}if(window.SqueezeBox&&window.SqueezeBox.assign){SqueezeBox.assign($row.find("a.modal").get(),{parse:"rel"})}};$.subformRepeatable.defaults={btAdd:".group-add",btRemove:".group-remove",btMove:".group-move",minimum:0,maximum:10,repeatableElement:".subform-repeatable-group",rowTemplateSelector:"script.subform-repeatable-template-section",rowsContainer:null};$.fn.subformRepeatable=function(options){return this.each(function(){var options=options||{},data=$(this).data();if(data.subformRepeatable){return}for(var p in data){if(data.hasOwnProperty(p)){options[p]=data[p]}}var inst=new $.subformRepeatable(this,options);$(this).data("subformRepeatable",inst)})};$(window).on("load",function(){$("div.subform-repeatable").subformRepeatable()})})(jQuery);
\ No newline at end of file
+(function($){"use strict";$.subformRepeatable=function(container,options){this.$container=$(container);if(this.$container.data("subformRepeatable")){return self}this.$container.data("subformRepeatable",self);this.options=$.extend({},$.subformRepeatable.defaults,options);this.template="";this.prepareTemplate();this.$containerRows=this.options.rowsContainer?this.$container.find(this.options.rowsContainer):this.$container;this.lastRowNum=this.$containerRows.find(this.options.repeatableElement).length;var self=this;this.$container.on("click",this.options.btAdd,function(e){e.preventDefault();var after=$(this).parents(self.options.repeatableElement);if(!after.length){after=null}self.addRow(after)});this.$container.on("click",this.options.btRemove,function(e){e.preventDefault();var $row=$(this).parents(self.options.repeatableElement);self.removeRow($row)});if(this.options.btMove){this.$containerRows.sortable({items:this.options.repeatableElement,handle:this.options.btMove,tolerance:"pointer"})}this.$container.trigger("subform-ready")};$.subformRepeatable.prototype.prepareTemplate=function(){if(this.options.rowTemplateSelector){var tmplElement=this.$container.find(this.options.rowTemplateSelector)[0]||{};this.template=$.trim(tmplElement.text||tmplElement.textContent)}else{var row=this.$container.find(this.options.repeatableElement).get(0),$row=$(row).clone();try{this.clearScripts($row)}catch(e){if(window.console){console.log(e)}}this.template=$row.prop("outerHTML")}};$.subformRepeatable.prototype.addRow=function(after){var count=this.$containerRows.find(this.options.repeatableElement).length;if(count>=this.options.maximum){return null}var row=$.parseHTML(this.template);if(after){$(after).after(row)}else{this.$containerRows.append(row)}var $row=$(row);$row.attr("data-new","true");this.fixUniqueAttributes($row,count);try{this.fixScripts($row)}catch(e){if(window.console){console.log(e)}}this.$container.trigger("subform-row-add",$row);return $row};$.subformRepeatable.prototype.removeRow=function($row){var count=this.$containerRows.find(this.options.repeatableElement).length;if(count<=this.options.minimum){return}this.$container.trigger("subform-row-remove",$row);$row.remove()};$.subformRepeatable.prototype.fixUniqueAttributes=function($row,count){this.lastRowNum++;var group=$row.attr("data-group"),basename=$row.attr("data-base-name"),count=count||0,countnew=Math.max(this.lastRowNum,count+1),groupnew=basename+countnew;this.lastRowNum=countnew;$row.attr("data-group",groupnew);var haveName=$row.find("[name]"),ids={};for(var i=0,l=haveName.length;i<l;i++){var $el=$(haveName[i]),name=$el.attr("name"),id=name.replace(/(\[\]$)/g,"").replace(/(\]\[)/g,"__").replace(/\[/g,"_").replace(/\]/g,""),nameNew=name.replace("["+group+"][","["+groupnew+"]["),idNew=id.replace(group,groupnew),countMulti=0,forOldAttr=id;if($el.prop("type")==="checkbox"&&name.match(/\[\]$/)){countMulti=ids[id]?ids[id].length:0;if(!countMulti){$el.closest("fieldset.checkboxes").attr("id",idNew);$row.find('label[for="'+id+'"]').attr("for",idNew).attr("id",idNew+"-lbl")}forOldAttr=forOldAttr+countMulti;idNew=idNew+countMulti}else if($el.prop("type")==="radio"){countMulti=ids[id]?ids[id].length:0;if(!countMulti){$el.closest("fieldset.radio").attr("id",idNew);$row.find('label[for="'+id+'"]').attr("for",idNew).attr("id",idNew+"-lbl")}forOldAttr=forOldAttr+countMulti;idNew=idNew+countMulti}if(ids[id]){ids[id].push(true)}else{ids[id]=[true]}$el.attr("name",nameNew);$el.attr("id",idNew);$row.find('label[for="'+forOldAttr+'"]').attr("for",idNew).attr("id",idNew+"-lbl")}};$.subformRepeatable.prototype.clearScripts=function($row){if($.fn.chosen){$row.find("select.chzn-done").each(function(){var $el=$(this);$el.next(".chzn-container").remove();$el.show().addClass("fix-chosen")})}};$.subformRepeatable.prototype.fixScripts=function($row){$row.find('a[onclick*="jInsertFieldValue"]').each(function(){var $el=$(this),inputId=$el.siblings('input[type="text"]').attr("id"),$select=$el.prev(),oldHref=$select.attr("href");$el.attr("onclick","jInsertFieldValue('', '"+inputId+"');return false;");$select.attr("href",oldHref.replace(/&fieldid=(.+)&/,"&fieldid="+inputId+"&"))});if($.fn.fieldMedia){$row.find(".field-media-wrapper").fieldMedia()}if($.fn.tooltip){$row.find(".hasTooltip").tooltip({html:true,container:"body"})}if($.fn.fieldUser){$row.find(".field-user-wrapper").fieldUser()}if(window.SqueezeBox&&window.SqueezeBox.assign){SqueezeBox.assign($row.find("a.modal").get(),{parse:"rel"})}};$.subformRepeatable.defaults={btAdd:".group-add",btRemove:".group-remove",btMove:".group-move",minimum:0,maximum:10,repeatableElement:".subform-repeatable-group",rowTemplateSelector:"script.subform-repeatable-template-section",rowsContainer:null};$.fn.subformRepeatable=function(options){return this.each(function(){var options=options||{},data=$(this).data();if(data.subformRepeatable){return}for(var p in data){if(data.hasOwnProperty(p)){options[p]=data[p]}}var inst=new $.subformRepeatable(this,options);$(this).data("subformRepeatable",inst)})};$(window).on("load",function(){$("div.subform-repeatable").subformRepeatable()})})(jQuery);
\ No newline at end of file
diff --git a/tests/javascript/subform-repeatable/fixtures/fixture.html b/tests/javascript/subform-repeatable/fixtures/fixture.html
index 0af51f3b740ea..b2fc30b7a02b2 100644
--- a/tests/javascript/subform-repeatable/fixtures/fixture.html
+++ b/tests/javascript/subform-repeatable/fixtures/fixture.html
@@ -5,15 +5,15 @@
 		 data-rows-container="tbody" data-minimum="1" data-maximum="2">
 		<table>
 			<tbody>
-				<tr class="subform-repeatable-group" data-base-name="base-name" data-group="group">
+				<tr class="subform-repeatable-group" data-base-name="group" data-group="group0">
 					<td>Data 1</td>
 					<td>Data 2</td>
 					<td>
-						<input type="checkbox" id="original-input-checkbox" name="input">
-						<label for="original-input-checkbox">Checkbox label</label>
+						<input type="checkbox" id="jform_group__group0__checkbox" name="jform[group][group0][checkbox]">
+						<label for="jform_group__group0__checkbox">Checkbox label</label>
 					</td>
 					<td>
-						<input type="radio" id="original-input-radio" name="input">
+						<input type="radio" id="jform_group__group0__radio" name="jform[group][group0][radio]">
 					</td>
 					<td>
 						<div class="btn-group">
@@ -26,15 +26,15 @@
 			</tbody>
 		</table>
 		<script type="text/subform-repeatable-template-section" class="subform-repeatable-template-section">
-			<tr class="subform-repeatable-group" data-base-name="base-name" data-group="group">
+			<tr class="subform-repeatable-group" data-base-name="group" data-group="groupX">
 				<td>Data 3</td>
 				<td>Data 4</td>
 				<td>
-					<input type="checkbox" id="input_checkbox_group_test" name="input_checkbox[group][test]">
-					<label for="input_checkbox_group_test">Checkbox label</label>
+					<input type="checkbox" id="jform_group__groupX__checkbox" name="jform[group][groupX][checkbox]">
+					<label for="jform_group__groupX__checkbox">Checkbox label</label>
 				</td>
 				<td>
-					<input type="radio" id="input_radio_group_test" name="input_radio[group][test]">
+					<input type="radio" id="jform_group__groupX__radio0" name="jform[group][groupX][radio]">
 				</td>
 				<td>
 					<div class="btn-group">
diff --git a/tests/javascript/subform-repeatable/spec.js b/tests/javascript/subform-repeatable/spec.js
index 14a4872a3340e..4a72c0ed1d4ed 100644
--- a/tests/javascript/subform-repeatable/spec.js
+++ b/tests/javascript/subform-repeatable/spec.js
@@ -39,31 +39,31 @@ define(['jquery', 'testsRoot/subform-repeatable/spec-setup', 'jasmineJquery'], f
 				expect($container.find('tbody').children().length).toEqual(2);
 			});
 
-			it('Should fix the id of the template input checkbox element to "input_checkbox_base-name2_test"', function () {
-				expect($container.find('#input_checkbox_group_test')).not.toExist();
-				expect($container.find('#input_checkbox_base-name2_test')).toExist();
+			it('Should fix the id of the template input checkbox element to "jform_group__group2__checkbox"', function () {
+				expect($container.find('#jform_group__groupX__checkbox')).not.toExist();
+				expect($container.find('#jform_group__group2__checkbox')).toExist();
 			});
 
 			it('Should fix the for attribute of the checkbox label element to match the changed input id', function () {
-				expect($container.find('label[for="input_checkbox_base-name2_test"]')).toExist();
+				expect($container.find('label[for="jform_group__group2__checkbox"]')).toExist();
 			});
 
-			it('Should fix the name of the template input checkbox element to "input_checkbox[base-name2][test]"', function () {
-				expect($container.find('#input_checkbox_base-name2_test')).toHaveAttr('name','input_checkbox[base-name2][test]');
+			it('Should fix the name of the template input checkbox element to "jform[group][group2][checkbox]"', function () {
+				expect($container.find('#jform_group__group2__checkbox')).toHaveAttr('name','jform[group][group2][checkbox]');
 			});
 
-			it('Should fix the id of the template input radio element to "input_radio_base-name2_test0"', function () {
-				expect($container.find('#input_radio_group_test')).not.toExist();
-				expect($container.find('#input_radio_base-name2_test0')).toExist();
+			it('Should fix the id of the template input radio element to "jform_group__group2__radio0"', function () {
+				expect($container.find('#jform_group__groupX__radio0')).not.toExist();
+				expect($container.find('#jform_group__group2__radio0')).toExist();
 			});
 
-			it('Should fix the name of the template input radio element to "input_radio[base-name2][test]"', function () {
-				expect($container.find('#input_radio_base-name2_test0')).toHaveAttr('name','input_radio[base-name2][test]');
+			it('Should fix the name of the template input radio element to "jform[group][group2][radio]"', function () {
+				expect($container.find('#jform_group__group2__radio0')).toHaveAttr('name','jform[group][group2][radio]');
 			});
 
 			it('Should have captured the template correctly', function () {
 				var $newElement = $container.find('tbody').children().last();
-				
+
 				expect($newElement).toContainText('Data 3');
 				expect($newElement).toContainText('Data 4');
 				expect($newElement).toContainText('Checkbox label');
@@ -76,8 +76,8 @@ define(['jquery', 'testsRoot/subform-repeatable/spec-setup', 'jasmineJquery'], f
 				expect($container.find('tbody').children().last()).toHaveAttr('data-new', 'true');
 			});
 
-			it('Should set data-group attribute to "base-name2" in the new element', function () {
-				expect($container.find('tbody').children().last()).toHaveAttr('data-group', 'base-name2');
+			it('Should set data-group attribute to "group2" in the new element', function () {
+				expect($container.find('tbody').children().last()).toHaveAttr('data-group', 'group2');
 			});
 
 			it('Should trigger subform-row-add event', function () {
@@ -88,7 +88,7 @@ define(['jquery', 'testsRoot/subform-repeatable/spec-setup', 'jasmineJquery'], f
 		describe('Remove existing row', function () {
 			beforeAll(function () {
 				$container.find('a.group-remove.generated').click();
-				$container.find('subform-original-remove').click();
+				$container.find('#subform-original-remove').click();
 			});
 
 			it('Should remove the added row from the table', function () {