diff --git a/typo3/sysext/form/Classes/Utility/TypoScriptToJsonConverter.php b/typo3/sysext/form/Classes/Utility/TypoScriptToJsonConverter.php
index 7b36426f4d735b892d04ab16f6ffc86b2f0242e1..6e3b776357c2f7d4473d4f41b5d108a869831fb2 100644
--- a/typo3/sysext/form/Classes/Utility/TypoScriptToJsonConverter.php
+++ b/typo3/sysext/form/Classes/Utility/TypoScriptToJsonConverter.php
@@ -46,6 +46,14 @@ class TypoScriptToJsonConverter {
 		'TEXTLINE'
 	);
 
+	/**
+	 * @var array
+	 */
+	protected $nameMapping = array(
+		'checkboxgroup' => 'CheckboxGroup',
+		'radiogroup' => 'RadioGroup',
+	);
+
 	/**
 	 * @var array
 	 */
@@ -74,6 +82,9 @@ class TypoScriptToJsonConverter {
 	 */
 	public function createElement($class, array $arguments = array()) {
 		$class = strtolower((string)$class);
+		if (!empty($this->nameMapping[$class])) {
+			$class = $this->nameMapping[$class];
+		}
 		$className = 'TYPO3\\CMS\\Form\\Domain\\Model\Json\\' . ucfirst($class) . 'JsonElement';
 		$this->addValidationRules($arguments);