diff --git a/toolkit/featureforms/src/main/java/com/arcgismaps/toolkit/featureforms/FeatureForm.kt b/toolkit/featureforms/src/main/java/com/arcgismaps/toolkit/featureforms/FeatureForm.kt
index 0f81ba378..b3e804d32 100644
--- a/toolkit/featureforms/src/main/java/com/arcgismaps/toolkit/featureforms/FeatureForm.kt
+++ b/toolkit/featureforms/src/main/java/com/arcgismaps/toolkit/featureforms/FeatureForm.kt
@@ -44,7 +44,7 @@ import com.arcgismaps.mapping.featureforms.SwitchFormInput
 import com.arcgismaps.mapping.featureforms.TextAreaFormInput
 import com.arcgismaps.mapping.featureforms.TextBoxFormInput
 import com.arcgismaps.toolkit.featureforms.components.base.BaseFieldState
-import com.arcgismaps.toolkit.featureforms.components.base.MutableStateCollection
+import com.arcgismaps.toolkit.featureforms.components.base.MutableFormStateCollection
 import com.arcgismaps.toolkit.featureforms.components.base.FormStateCollection
 import com.arcgismaps.toolkit.featureforms.components.base.getState
 import com.arcgismaps.toolkit.featureforms.components.base.rememberBaseGroupState
@@ -204,7 +204,7 @@ internal fun rememberStates(
     context: Context,
     scope: CoroutineScope
 ): FormStateCollection {
-    val states = MutableStateCollection()
+    val states = MutableFormStateCollection()
     form.elements.forEach { element ->
         when (element) {
             is FieldFormElement -> {
@@ -215,7 +215,7 @@ internal fun rememberStates(
             }
 
             is GroupFormElement -> {
-                val fieldStateCollection = MutableStateCollection()
+                val fieldStateCollection = MutableFormStateCollection()
                 element.formElements.forEach {
                     if (it is FieldFormElement) {
                         val state = rememberFieldState(
diff --git a/toolkit/featureforms/src/main/java/com/arcgismaps/toolkit/featureforms/components/formelement/GroupElement.kt b/toolkit/featureforms/src/main/java/com/arcgismaps/toolkit/featureforms/components/formelement/GroupElement.kt
index ea2405c19..095b8edca 100644
--- a/toolkit/featureforms/src/main/java/com/arcgismaps/toolkit/featureforms/components/formelement/GroupElement.kt
+++ b/toolkit/featureforms/src/main/java/com/arcgismaps/toolkit/featureforms/components/formelement/GroupElement.kt
@@ -45,7 +45,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.arcgismaps.toolkit.featureforms.components.base.BaseFieldState
 import com.arcgismaps.toolkit.featureforms.components.base.BaseGroupState
-import com.arcgismaps.toolkit.featureforms.components.base.MutableStateCollection
+import com.arcgismaps.toolkit.featureforms.components.base.MutableFormStateCollection
 import com.arcgismaps.toolkit.featureforms.components.base.FormStateCollection
 import com.arcgismaps.toolkit.featureforms.components.base.getState
 
@@ -158,7 +158,7 @@ private fun GroupElementPreview() {
         label = "Title",
         description = "Description",
         expanded = false,
-        fieldStates = MutableStateCollection(),
+        fieldStates = MutableFormStateCollection(),
         modifier = Modifier.padding(start = 15.dp, end = 15.dp, top = 10.dp, bottom = 10.dp),
         colors = GroupElementDefaults.colors(),
         onClick = {}