Repository: PennLINC/CuBIDS

Issue:
Place datatype at beginning, and acquisition at end, of entity strings
## Summary
<!--What would you like changed/added and why?-->
Request by @sattertt to improve readability of the TSVs.


Discussion:

Patch:
diff --git a/cubids/utils.py b/cubids/utils.py
index 3f1e416..128b0fa 100644
--- a/cubids/utils.py
+++ b/cubids/utils.py
@@ -112,8 +112,35 @@ def _entities_to_entity_set(entities):
     This is a set of entities to ignore in the entity set.
     The constant may be modified by the CuBIDS class, which will remove "session"
     if is_longitudinal is True and acq_group_level is "session".
+
+    Examples
+    --------
+    >>> _entities_to_entity_set(
+    ...     {"subject": "01", "session": "02", "task": "rest",
+    ...      "datatype": "fmap", "acquisition": "x"}
+    ... )
+    'datatype-fmap_session-02_task-rest_acquisition-x'
+
+    >>> _entities_to_entity_set(
+    ...     {"subject": "01", "session": "02", "task": "rest", "acquisition": "x"}
+    ... )
+    'session-02_task-rest_acquisition-x'
+
+    >>> _entities_to_entity_set(
+    ...     {"datatype": "fmap", "subject": "01", "session": "02", "task": "rest"}
+    ... )
+    'datatype-fmap_session-02_task-rest'
     """
     group_keys = sorted(set(entities.keys()) - NON_KEY_ENTITIES)
+    # Put datatype at the beginning and acquisition at the end
+    if "datatype" in group_keys:
+        group_keys.remove("datatype")
+        group_keys.insert(0, "datatype")
+
+    if "acquisition" in group_keys:
+        group_keys.remove("acquisition")
+        group_keys.append("acquisition")
+
     return "_".join([f"{key}-{entities[key]}" for key in group_keys])
 
 
@@ -993,7 +1020,7 @@ def assign_variants(summary, rename_cols):
                 )
             else:
                 acq = f"acquisition-{acq_str}"
-                new_name = acq + "_" + summary.loc[row, "EntitySet"]
+                new_name = summary.loc[row, "EntitySet"] + "_" + acq
 
             summary.at[row, "RenameEntitySet"] = new_name
 
diff --git a/docs/_static/PNC_example_edited.csv b/docs/_static/PNC_example_edited.csv
index 0de4817..0af15eb 100644
--- a/docs/_static/PNC_example_edited.csv
+++ b/docs/_static/PNC_example_edited.csv
@@ -1,9 +1,9 @@
 RenameEntitySet,MergeInto,EntitySet,ParamGroup,Counts,FieldmapKey00,NSliceTimes,RepetitionTime
 ,,datatype-dwi_run-1_suffix-dwi,1,1361,datatype-fmap_fmap-phase1_suffix-phase1,70,8.1
-acquisition-VariantTr_datatype-dwi_run-1_suffix-dwi,,datatype-dwi_run-1_suffix-dwi,2,1,datatype-fmap_fmap-phase1_suffix-phase1,70,8.4
+datatype-dwi_run-1_suffix-dwi_acquisition-VariantTr,,datatype-dwi_run-1_suffix-dwi,2,1,datatype-fmap_fmap-phase1_suffix-phase1,70,8.4
 ,,datatype-dwi_run-1_suffix-dwi,3,15,datatype-fmap_fmap-phasediff_suffix-phasediff,70,8.1
-acquisition-VariantTr_datatype-dwi_run-1_suffix-dwi,,datatype-dwi_run-1_suffix-dwi,4,1,datatype-fmap_fmap-phase1_suffix-phase1,70,9
+datatype-dwi_run-1_suffix-dwi_acquisition-VariantTr,,datatype-dwi_run-1_suffix-dwi,4,1,datatype-fmap_fmap-phase1_suffix-phase1,70,9
 ,3,datatype-dwi_run-1_suffix-dwi,5,2,datatype-fmap_fmap-phasediff_suffix-phasediff,70,8.1
-acquisition-NoSDC_datatype-dwi_run-1_suffix-dwi,,datatype-dwi_run-1_suffix-dwi,6,16,,70,8.1
+datatype-dwi_run-1_suffix-dwi_acquisition-NoSDC,,datatype-dwi_run-1_suffix-dwi,6,16,,70,8.1
 ,0,datatype-dwi_run-1_suffix-dwi,7,2,datatype-fmap_fmap-phase1_suffix-phase1,46,8.1
-acquisition-VariantTr_datatype-dwi_run-1_suffix-dwi,,datatype-dwi_run-1_suffix-dwi,8,1,datatype-fmap_fmap-phase1_suffix-phase1,70,12.3
\ No newline at end of file
+datatype-dwi_run-1_suffix-dwi_acquisition-VariantTr,,datatype-dwi_run-1_suffix-dwi,8,1,datatype-fmap_fmap-phase1_suffix-phase1,70,12.3
\ No newline at end of file
diff --git a/docs/_static/PNC_post_apply_summary.csv b/docs/_static/PNC_post_apply_summary.csv
index f4a30b5..c2ca309 100644
--- a/docs/_static/PNC_post_apply_summary.csv
+++ b/docs/_static/PNC_post_apply_summary.csv
@@ -1,8 +1,8 @@
 Notes,ManualCheck,MergeInto,RenameEntitySet,KeyParamGroup,EntitySet,ParamGroup,Counts,Dim1Size,Dim2Size,Dim3Size,EchoTime,EffectiveEchoSpacing,FlipAngle,HasFieldmap,EntitySetCount,Modality,NSliceTimes,NumVolumes,Obliquity,ParallelReductionFactorInPlane,PartialFourier,PhaseEncodingDirection,RepetitionTime,TotalReadoutTime,UsedAsFieldmap,VoxelSizeDim1,VoxelSizeDim2,VoxelSizeDim3
 ,,,,datatype-dwi_run-1_suffix-dwi__1,datatype-dwi_run-1_suffix-dwi,1,1388,128,128,70,0.082,0.000267,90,TRUE,1388,dwi,70,35.0,FALSE,3.0,0.75,j-,8.1,0.034,FALSE,1.875,1.875,2.0
-,,,,acquisition-VARIANTNoFmap_datatype-dwi_run-1_suffix-dwi__1,acquisition-VARIANTNoFmap_datatype-dwi_run-1_suffix-dwi,1,25,128,128,70,0.082,0.000267,90,FALSE,25,dwi,70,35.0,FALSE,3.0,0.75,j-,8.1,0.034,FALSE,1.875,1.875,2.0
-,,,,acquisition-VARIANTRepetitionTime_datatype-dwi_run-1_suffix-dwi__1,acquisition-VARIANTRepetitionTime_datatype-dwi_run-1_suffix-dwi,1,6,128,128,70,0.082,0.000267,90,TRUE,9,dwi,70,35.0,FALSE,3.0,0.75,j-,9.0,0.034,FALSE,1.875,1.875,2.0
-,,,,acquisition-VARIANTRepetitionTime_datatype-dwi_run-1_suffix-dwi__2,acquisition-VARIANTRepetitionTime_datatype-dwi_run-1_suffix-dwi,2,3,128,128,70,0.082,0.000267,90,TRUE,9,dwi,70,35.0,FALSE,3.0,0.75,j-,9.8,0.034,FALSE,1.875,1.875,2.0
-,,,,acquisition-VARIANTDim3SizeVoxelSizeDim3_datatype-dwi_run-1_suffix-dwi__1,acquisition-VARIANTDim3SizeVoxelSizeDim3_datatype-dwi_run-1_suffix-dwi,1,2,128,128,46,0.082,0.000267,90,TRUE,2,dwi,46,35.0,FALSE,3.0,0.75,j-,8.1,0.034,FALSE,1.875,1.875,3.0
-,,,,acquisition-VARIANTEchoTimeEffectiveEchoSpacingRepetitionTimeTotalReadoutTime_datatype-dwi_run-1_suffix-dwi__1,acquisition-VARIANTEchoTimeEffectiveEchoSpacingRepetitionTimeTotalReadoutTime_datatype-dwi_run-1_suffix-dwi,1,1,128,128,70,0.102,0.0008,90,TRUE,1,dwi,70,35.0,FALSE,3.0,0.75,j-,12.3,0.102,FALSE,1.875,1.875,2.0
-,,,,acquisition-VARIANTObliquity_datatype-dwi_run-1_suffix-dwi__1,acquisition-VARIANTObliquity_datatype-dwi_run-1_suffix-dwi,1,1,128,128,70,0.082,0.000267,90,TRUE,1,dwi,70,35.0,TRUE,3.0,0.75,j-,8.1,0.034,FALSE,1.875,1.875,2.0
\ No newline at end of file
+,,,,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTNoFmap__1,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTNoFmap,1,25,128,128,70,0.082,0.000267,90,FALSE,25,dwi,70,35.0,FALSE,3.0,0.75,j-,8.1,0.034,FALSE,1.875,1.875,2.0
+,,,,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTRepetitionTime__1,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTRepetitionTime,1,6,128,128,70,0.082,0.000267,90,TRUE,9,dwi,70,35.0,FALSE,3.0,0.75,j-,9.0,0.034,FALSE,1.875,1.875,2.0
+,,,,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTRepetitionTime__2,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTRepetitionTime,2,3,128,128,70,0.082,0.000267,90,TRUE,9,dwi,70,35.0,FALSE,3.0,0.75,j-,9.8,0.034,FALSE,1.875,1.875,2.0
+,,,,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTDim3SizeVoxelSizeDim3__1,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTDim3SizeVoxelSizeDim3,1,2,128,128,46,0.082,0.000267,90,TRUE,2,dwi,46,35.0,FALSE,3.0,0.75,j-,8.1,0.034,FALSE,1.875,1.875,3.0
+,,,,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTEchoTimeEffectiveEchoSpacingRepetitionTimeTotalReadoutTime__1,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTEchoTimeEffectiveEchoSpacingRepetitionTimeTotalReadoutTime,1,1,128,128,70,0.102,0.0008,90,TRUE,1,dwi,70,35.0,FALSE,3.0,0.75,j-,12.3,0.102,FALSE,1.875,1.875,2.0
+,,,,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTObliquity__1,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTObliquity,1,1,128,128,70,0.082,0.000267,90,TRUE,1,dwi,70,35.0,TRUE,3.0,0.75,j-,8.1,0.034,FALSE,1.875,1.875,2.0
\ No newline at end of file
diff --git a/docs/_static/PNC_pre_apply_summary_dwi_run1.csv b/docs/_static/PNC_pre_apply_summary_dwi_run1.csv
index cb02df2..398c130 100644
--- a/docs/_static/PNC_pre_apply_summary_dwi_run1.csv
+++ b/docs/_static/PNC_pre_apply_summary_dwi_run1.csv
@@ -1,7 +1,7 @@
 Notes,ManualCheck,MergeInto,RenameEntitySet,KeyParamGroup,EntitySet,ParamGroup,Counts,Dim1Size,Dim2Size,Dim3Size,EchoTime,EffectiveEchoSpacing,FlipAngle,HasFieldmap,EntitySetCount,Modality,NSliceTimes,NumVolumes,Obliquity,ParallelReductionFactorInPlane,PartialFourier,PhaseEncodingDirection,RepetitionTime,TotalReadoutTime,UsedAsFieldmap,VoxelSizeDim1,VoxelSizeDim2,VoxelSizeDim3
-,,,acquisition-VARIANTNoFmap_datatype-dwi_run-1_suffix-dwi,datatype-dwi_run-1_suffix-dwi__2,datatype-dwi_run-1_suffix-dwi,2,25,128,128,70,0.082,0.000267,90,FALSE,1426,dwi,70,35.0,FALSE,3.0,0.75,j-,8.1,0.034,FALSE,1.875,1.875,2.0
-,,,acquisition-VARIANTRepetitionTime_datatype-dwi_run-1_suffix-dwi,datatype-dwi_run-1_suffix-dwi__3,datatype-dwi_run-1_suffix-dwi,3,6,128,128,70,0.082,0.000267,90,TRUE,1426,dwi,70,35.0,FALSE,3.0,0.75,j-,9.0,0.034,FALSE,1.875,1.875,2.0
-,,,acquisition-VARIANTRepetitionTime_datatype-dwi_run-1_suffix-dwi,datatype-dwi_run-1_suffix-dwi__4,datatype-dwi_run-1_suffix-dwi,4,3,128,128,70,0.082,0.000267,90,TRUE,1426,dwi,70,35.0,FALSE,3.0,0.75,j-,9.8,0.034,FALSE,1.875,1.875,2.0
-,,,acquisition-VARIANTDim3SizeVoxelSizeDim3_datatype-dwi_run-1_suffix-dwi,datatype-dwi_run-1_suffix-dwi__5,datatype-dwi_run-1_suffix-dwi,5,2,128,128,46,0.082,0.000267,90,TRUE,1426,dwi,46,35.0,FALSE,3.0,0.75,j-,8.1,0.034,FALSE,1.875,1.875,3.0
-,,,acquisition-VARIANTEchoTimeEffectiveEchoSpacingRepetitionTimeTotalReadoutTime_datatype-dwi_run-1_suffix-dwi,datatype-dwi_run-1_suffix-dwi__6,datatype-dwi_run-1_suffix-dwi,6,1,128,128,70,0.102,0.0008,90,TRUE,1426,dwi,70,35.0,FALSE,3.0,0.75,j-,12.3,0.102,FALSE,1.875,1.875,2.0
-,,,acquisition-VARIANTObliquity_datatype-dwi_run-1_suffix-dwi,datatype-dwi_run-1_suffix-dwi__7,datatype-dwi_run-1_suffix-dwi,7,1,128,128,70,0.082,0.000267,90,TRUE,1426,dwi,70,35.0,TRUE,3.0,0.75,j-,8.1,0.034,FALSE,1.875,1.875,2.0
\ No newline at end of file
+,,,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTNoFmap,datatype-dwi_run-1_suffix-dwi__2,datatype-dwi_run-1_suffix-dwi,2,25,128,128,70,0.082,0.000267,90,FALSE,1426,dwi,70,35.0,FALSE,3.0,0.75,j-,8.1,0.034,FALSE,1.875,1.875,2.0
+,,,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTRepetitionTime,datatype-dwi_run-1_suffix-dwi__3,datatype-dwi_run-1_suffix-dwi,3,6,128,128,70,0.082,0.000267,90,TRUE,1426,dwi,70,35.0,FALSE,3.0,0.75,j-,9.0,0.034,FALSE,1.875,1.875,2.0
+,,,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTRepetitionTime,datatype-dwi_run-1_suffix-dwi__4,datatype-dwi_run-1_suffix-dwi,4,3,128,128,70,0.082,0.000267,90,TRUE,1426,dwi,70,35.0,FALSE,3.0,0.75,j-,9.8,0.034,FALSE,1.875,1.875,2.0
+,,,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTDim3SizeVoxelSizeDim3,datatype-dwi_run-1_suffix-dwi__5,datatype-dwi_run-1_suffix-dwi,5,2,128,128,46,0.082,0.000267,90,TRUE,1426,dwi,46,35.0,FALSE,3.0,0.75,j-,8.1,0.034,FALSE,1.875,1.875,3.0
+,,,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTEchoTimeEffectiveEchoSpacingRepetitionTimeTotalReadoutTime,datatype-dwi_run-1_suffix-dwi__6,datatype-dwi_run-1_suffix-dwi,6,1,128,128,70,0.102,0.0008,90,TRUE,1426,dwi,70,35.0,FALSE,3.0,0.75,j-,12.3,0.102,FALSE,1.875,1.875,2.0
+,,,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTObliquity,datatype-dwi_run-1_suffix-dwi__7,datatype-dwi_run-1_suffix-dwi,7,1,128,128,70,0.082,0.000267,90,TRUE,1426,dwi,70,35.0,TRUE,3.0,0.75,j-,8.1,0.034,FALSE,1.875,1.875,2.0
\ No newline at end of file
diff --git a/docs/_static/PNC_pre_apply_summary_dwi_run1_deletion.csv b/docs/_static/PNC_pre_apply_summary_dwi_run1_deletion.csv
index b304633..4f00591 100644
--- a/docs/_static/PNC_pre_apply_summary_dwi_run1_deletion.csv
+++ b/docs/_static/PNC_pre_apply_summary_dwi_run1_deletion.csv
@@ -1,7 +1,7 @@
 Notes,ManualCheck,MergeInto,RenameEntitySet,KeyParamGroup,EntitySet,ParamGroup,Counts,Dim1Size,Dim2Size,Dim3Size,EchoTime,EffectiveEchoSpacing,FlipAngle,HasFieldmap,EntitySetCount,Modality,NSliceTimes,NumVolumes,Obliquity,ParallelReductionFactorInPlane,PartialFourier,PhaseEncodingDirection,RepetitionTime,TotalReadoutTime,UsedAsFieldmap,VoxelSizeDim1,VoxelSizeDim2,VoxelSizeDim3
-,,,acquisition-VARIANTNoFmap_datatype-dwi_run-1_suffix-dwi,datatype-dwi_run-1_suffix-dwi__2,datatype-dwi_run-1_suffix-dwi,2,25,128,128,70,0.082,0.000267,90,FALSE,1426,dwi,70,35.0,FALSE,3.0,0.75,j-,8.1,0.034,FALSE,1.875,1.875,2.0
-,,,acquisition-VARIANTRepetitionTime_datatype-dwi_run-1_suffix-dwi,datatype-dwi_run-1_suffix-dwi__3,datatype-dwi_run-1_suffix-dwi,3,6,128,128,70,0.082,0.000267,90,TRUE,1426,dwi,70,35.0,FALSE,3.0,0.75,j-,9.0,0.034,FALSE,1.875,1.875,2.0
-,,,acquisition-VARIANTRepetitionTime_datatype-dwi_run-1_suffix-dwi,datatype-dwi_run-1_suffix-dwi__4,datatype-dwi_run-1_suffix-dwi,4,3,128,128,70,0.082,0.000267,90,TRUE,1426,dwi,70,35.0,FALSE,3.0,0.75,j-,9.8,0.034,FALSE,1.875,1.875,2.0
-,,,acquisition-VARIANTDim3SizeVoxelSizeDim3_datatype-dwi_run-1_suffix-dwi,datatype-dwi_run-1_suffix-dwi__5,datatype-dwi_run-1_suffix-dwi,5,2,128,128,46,0.082,0.000267,90,TRUE,1426,dwi,46,35.0,FALSE,3.0,0.75,j-,8.1,0.034,FALSE,1.875,1.875,3.0
-,,0,acquisition-VARIANTEchoTimeEffectiveEchoSpacingRepetitionTimeTotalReadoutTime_datatype-dwi_run-1_suffix-dwi,datatype-dwi_run-1_suffix-dwi__6,datatype-dwi_run-1_suffix-dwi,6,1,128,128,70,0.102,0.0008,90,TRUE,1426,dwi,70,35.0,FALSE,3.0,0.75,j-,12.3,0.102,FALSE,1.875,1.875,2.0
-,,,acquisition-VARIANTObliquity_datatype-dwi_run-1_suffix-dwi,datatype-dwi_run-1_suffix-dwi__7,datatype-dwi_run-1_suffix-dwi,7,1,128,128,70,0.082,0.000267,90,TRUE,1426,dwi,70,35.0,TRUE,3.0,0.75,j-,8.1,0.034,FALSE,1.875,1.875,2.0
\ No newline at end of file
+,,,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTNoFmap,datatype-dwi_run-1_suffix-dwi__2,datatype-dwi_run-1_suffix-dwi,2,25,128,128,70,0.082,0.000267,90,FALSE,1426,dwi,70,35.0,FALSE,3.0,0.75,j-,8.1,0.034,FALSE,1.875,1.875,2.0
+,,,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTRepetitionTime,datatype-dwi_run-1_suffix-dwi__3,datatype-dwi_run-1_suffix-dwi,3,6,128,128,70,0.082,0.000267,90,TRUE,1426,dwi,70,35.0,FALSE,3.0,0.75,j-,9.0,0.034,FALSE,1.875,1.875,2.0
+,,,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTRepetitionTime,datatype-dwi_run-1_suffix-dwi__4,datatype-dwi_run-1_suffix-dwi,4,3,128,128,70,0.082,0.000267,90,TRUE,1426,dwi,70,35.0,FALSE,3.0,0.75,j-,9.8,0.034,FALSE,1.875,1.875,2.0
+,,,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTDim3SizeVoxelSizeDim3,datatype-dwi_run-1_suffix-dwi__5,datatype-dwi_run-1_suffix-dwi,5,2,128,128,46,0.082,0.000267,90,TRUE,1426,dwi,46,35.0,FALSE,3.0,0.75,j-,8.1,0.034,FALSE,1.875,1.875,3.0
+,,0,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTEchoTimeEffectiveEchoSpacingRepetitionTimeTotalReadoutTime,datatype-dwi_run-1_suffix-dwi__6,datatype-dwi_run-1_suffix-dwi,6,1,128,128,70,0.102,0.0008,90,TRUE,1426,dwi,70,35.0,FALSE,3.0,0.75,j-,12.3,0.102,FALSE,1.875,1.875,2.0
+,,,datatype-dwi_run-1_suffix-dwi_acquisition-VARIANTObliquity,datatype-dwi_run-1_suffix-dwi__7,datatype-dwi_run-1_suffix-dwi,7,1,128,128,70,0.082,0.000267,90,TRUE,1426,dwi,70,35.0,TRUE,3.0,0.75,j-,8.1,0.034,FALSE,1.875,1.875,2.0
\ No newline at end of file
diff --git a/docs/_static/v0_edited_summary.csv b/docs/_static/v0_edited_summary.csv
index 947f19f..194aef2 100644
--- a/docs/_static/v0_edited_summary.csv
+++ b/docs/_static/v0_edited_summary.csv
@@ -1,12 +1,12 @@
 Notes,ManualCheck,MergeInto,RenameEntitySet,KeyParamGroup,EntitySet,ParamGroup,Counts,Dim1Size,Dim2Size,Dim3Size,EchoTime,EffectiveEchoSpacing,FlipAngle,HasFieldmap,EntitySetCount,Modality,NSliceTimes,NumVolumes,Obliquity,PartialFourier,PhaseEncodingDirection,RepetitionTime,TotalReadoutTime,UsedAsFieldmap,VoxelSizeDim1,VoxelSizeDim2,VoxelSizeDim3
 ,,,,datatype-anat_suffix-T1w__1,datatype-anat_suffix-T1w,1,4,180,216,180,0.0029,,8,FALSE,4,anat,0,1.0,FALSE,,i-,2.5,,FALSE,1.0,1.0,1.0
-,,,,acquisition-HASC55AP_datatype-dwi_suffix-dwi__1,acquisition-HASC55AP_datatype-dwi_suffix-dwi,1,2,36,43,36,0.089,0.00069,90,TRUE,4,dwi,36,61.0,FALSE,,j,4.2,0.072,FALSE,5.0,5.0,5.0
-,,0,acquisition-HASC55APVARIANTNumVolumes10_datatype-dwi_suffix-dwi,acquisition-HASC55AP_datatype-dwi_suffix-dwi__2,acquisition-HASC55AP_datatype-dwi_suffix-dwi,2,1,36,43,36,0.089,0.00069,90,TRUE,4,dwi,36,10.0,FALSE,,j,4.2,0.072,FALSE,5.0,5.0,5.0
-,,,acquisition-HASC55APVARIANTEchoTime2_datatype-dwi_suffix-dwi,acquisition-HASC55AP_datatype-dwi_suffix-dwi__3,acquisition-HASC55AP_datatype-dwi_suffix-dwi,3,1,36,43,36,0.07,0.00069,90,TRUE,4,dwi,36,61.0,FALSE,,j,4.2,0.072,FALSE,5.0,5.0,5.0
-,,,,acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1__1,acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1,1,4,36,43,36,0.004,,60,FALSE,4,fmap,0,1.0,FALSE,0.75,j-,1.5,,FALSE,5.0,5.0,5.0
-,,,,acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2__1,acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2,1,4,36,43,36,0.006,,60,FALSE,4,fmap,0,1.0,FALSE,0.75,j-,1.5,,FALSE,5.0,5.0,5.0
-,,,,acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff__1,acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff,1,4,36,43,36,,,60,FALSE,4,fmap,0,1.0,FALSE,0.75,j-,1.5,,TRUE,5.0,5.0,5.0
+,,,,datatype-dwi_suffix-dwi_acquisition-HASC55AP__1,datatype-dwi_suffix-dwi_acquisition-HASC55AP,1,2,36,43,36,0.089,0.00069,90,TRUE,4,dwi,36,61.0,FALSE,,j,4.2,0.072,FALSE,5.0,5.0,5.0
+,,0,datatype-dwi_suffix-dwi_acquisition-HASC55APVARIANTNumVolumes10,datatype-dwi_suffix-dwi_acquisition-HASC55AP__2,datatype-dwi_suffix-dwi_acquisition-HASC55AP,2,1,36,43,36,0.089,0.00069,90,TRUE,4,dwi,36,10.0,FALSE,,j,4.2,0.072,FALSE,5.0,5.0,5.0
+,,,datatype-dwi_suffix-dwi_acquisition-HASC55APVARIANTEchoTime2,datatype-dwi_suffix-dwi_acquisition-HASC55AP__3,datatype-dwi_suffix-dwi_acquisition-HASC55AP,3,1,36,43,36,0.07,0.00069,90,TRUE,4,dwi,36,61.0,FALSE,,j,4.2,0.072,FALSE,5.0,5.0,5.0
+,,,,datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4__1,datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4,1,4,36,43,36,0.004,,60,FALSE,4,fmap,0,1.0,FALSE,0.75,j-,1.5,,FALSE,5.0,5.0,5.0
+,,,,datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4__1,datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4,1,4,36,43,36,0.006,,60,FALSE,4,fmap,0,1.0,FALSE,0.75,j-,1.5,,FALSE,5.0,5.0,5.0
+,,,,datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4__1,datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4,1,4,36,43,36,,,60,FALSE,4,fmap,0,1.0,FALSE,0.75,j-,1.5,,TRUE,5.0,5.0,5.0
 ,,,,datatype-fmap_direction-PA_fmap-epi_suffix-epi__1,datatype-fmap_direction-PA_fmap-epi_suffix-epi,1,3,36,43,36,0.089,0.00069,90,FALSE,4,fmap,36,1.0,FALSE,,j-,4.2,0.072,TRUE,5.0,5.0,5.0
-,,,acquisition-VARIANTUnused_datatype-fmap_direction-PA_fmap-epi_suffix-epi,datatype-fmap_direction-PA_fmap-epi_suffix-epi__2,datatype-fmap_direction-PA_fmap-epi_suffix-epi,2,1,36,43,36,0.089,0.00069,90,FALSE,4,fmap,36,1.0,FALSE,,j-,4.2,0.072,FALSE,5.0,5.0,5.0
+,,,datatype-fmap_direction-PA_fmap-epi_suffix-epi_acquisition-VARIANTUnused,datatype-fmap_direction-PA_fmap-epi_suffix-epi__2,datatype-fmap_direction-PA_fmap-epi_suffix-epi,2,1,36,43,36,0.089,0.00069,90,FALSE,4,fmap,36,1.0,FALSE,,j-,4.2,0.072,FALSE,5.0,5.0,5.0
 ,,,,datatype-func_suffix-bold_task-rest__1,datatype-func_suffix-bold_task-rest,1,2,36,43,36,0.089,0.00069,70,TRUE,3,func,36,61.0,FALSE,,j,1.0,0.072,FALSE,5.0,5.0,5.0
-,,,acquisition-VARIANTFlipAngle90_datatype-func_suffix-bold_task-rest,datatype-func_suffix-bold_task-rest__2,datatype-func_suffix-bold_task-rest,2,1,36,43,36,0.089,0.00069,90,TRUE,3,func,36,61.0,FALSE,,j,1.0,0.072,FALSE,5.0,5.0,5.0
\ No newline at end of file
+,,,datatype-func_suffix-bold_task-rest_acquisition-VARIANTFlipAngle90,datatype-func_suffix-bold_task-rest__2,datatype-func_suffix-bold_task-rest,2,1,36,43,36,0.089,0.00069,90,TRUE,3,func,36,61.0,FALSE,,j,1.0,0.072,FALSE,5.0,5.0,5.0
\ No newline at end of file
diff --git a/docs/_static/v0_summary.csv b/docs/_static/v0_summary.csv
index 3d492b4..8bcaa64 100644
--- a/docs/_static/v0_summary.csv
+++ b/docs/_static/v0_summary.csv
@@ -1,12 +1,12 @@
 Notes,ManualCheck,MergeInto,RenameEntitySet,KeyParamGroup,EntitySet,ParamGroup,Counts,Dim1Size,Dim2Size,Dim3Size,EchoTime,EffectiveEchoSpacing,FlipAngle,HasFieldmap,EntitySetCount,Modality,NSliceTimes,NumVolumes,Obliquity,PartialFourier,PhaseEncodingDirection,RepetitionTime,TotalReadoutTime,UsedAsFieldmap,VoxelSizeDim1,VoxelSizeDim2,VoxelSizeDim3
 ,,,,datatype-anat_suffix-T1w__1,datatype-anat_suffix-T1w,1,4,180,216,180,0.0029,,8,False,4,anat,0,1.0,False,,i-,2.5,,False,1.0,1.0,1.0
-,,,,acquisition-HASC55AP_datatype-dwi_suffix-dwi__1,acquisition-HASC55AP_datatype-dwi_suffix-dwi,1,2,36,43,36,0.089,0.00069,90,True,4,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0
-,,,acquisition-HASC55APVARIANTNumVolumes10_datatype-dwi_suffix-dwi,acquisition-HASC55AP_datatype-dwi_suffix-dwi__2,acquisition-HASC55AP_datatype-dwi_suffix-dwi,2,1,36,43,36,0.089,0.00069,90,True,4,dwi,36,10.0,False,,j,4.2,0.072,False,5.0,5.0,5.0
-,,,acquisition-HASC55APVARIANTEchoTime2_datatype-dwi_suffix-dwi,acquisition-HASC55AP_datatype-dwi_suffix-dwi__3,acquisition-HASC55AP_datatype-dwi_suffix-dwi,3,1,36,43,36,0.07,0.00069,90,True,4,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0
-,,,,acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1__1,acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1,1,4,36,43,36,0.004,,60,False,4,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0
-,,,,acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2__1,acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2,1,4,36,43,36,0.006,,60,False,4,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0
-,,,,acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff__1,acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff,1,4,36,43,36,,,60,False,4,fmap,0,1.0,False,0.75,j-,1.5,,True,5.0,5.0,5.0
+,,,,datatype-dwi_suffix-dwi_acquisition-HASC55AP__1,datatype-dwi_suffix-dwi_acquisition-HASC55AP,1,2,36,43,36,0.089,0.00069,90,True,4,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0
+,,,datatype-dwi_suffix-dwi_acquisition-HASC55APVARIANTNumVolumes10,datatype-dwi_suffix-dwi_acquisition-HASC55AP__2,datatype-dwi_suffix-dwi_acquisition-HASC55AP,2,1,36,43,36,0.089,0.00069,90,True,4,dwi,36,10.0,False,,j,4.2,0.072,False,5.0,5.0,5.0
+,,,datatype-dwi_suffix-dwi_acquisition-HASC55APVARIANTEchoTime2,datatype-dwi_suffix-dwi_acquisition-HASC55AP__3,datatype-dwi_suffix-dwi_acquisition-HASC55AP,3,1,36,43,36,0.07,0.00069,90,True,4,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0
+,,,,datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4__1,datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4,1,4,36,43,36,0.004,,60,False,4,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0
+,,,,datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4__1,datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4,1,4,36,43,36,0.006,,60,False,4,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0
+,,,,datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4__1,datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4,1,4,36,43,36,,,60,False,4,fmap,0,1.0,False,0.75,j-,1.5,,True,5.0,5.0,5.0
 ,,,,datatype-fmap_direction-PA_fmap-epi_suffix-epi__1,datatype-fmap_direction-PA_fmap-epi_suffix-epi,1,3,36,43,36,0.089,0.00069,90,False,4,fmap,36,1.0,False,,j-,4.2,0.072,True,5.0,5.0,5.0
-,,,acquisition-VARIANTUnused_datatype-fmap_direction-PA_fmap-epi_suffix-epi,datatype-fmap_direction-PA_fmap-epi_suffix-epi__2,datatype-fmap_direction-PA_fmap-epi_suffix-epi,2,1,36,43,36,0.089,0.00069,90,False,4,fmap,36,1.0,False,,j-,4.2,0.072,False,5.0,5.0,5.0
+,,,datatype-fmap_direction-PA_fmap-epi_suffix-epi_acquisition-VARIANTUnused,datatype-fmap_direction-PA_fmap-epi_suffix-epi__2,datatype-fmap_direction-PA_fmap-epi_suffix-epi,2,1,36,43,36,0.089,0.00069,90,False,4,fmap,36,1.0,False,,j-,4.2,0.072,False,5.0,5.0,5.0
 ,,,,datatype-func_suffix-bold_task-rest__1,datatype-func_suffix-bold_task-rest,1,2,36,43,36,0.089,0.00069,70,True,3,func,36,61.0,False,,j,1.0,0.072,False,5.0,5.0,5.0
-,,,acquisition-VARIANTFlipAngle90_datatype-func_suffix-bold_task-rest,datatype-func_suffix-bold_task-rest__2,datatype-func_suffix-bold_task-rest,2,1,36,43,36,0.089,0.00069,90,True,3,func,36,61.0,False,,j,1.0,0.072,False,5.0,5.0,5.0
+,,,datatype-func_suffix-bold_task-rest_acquisition-VARIANTFlipAngle90,datatype-func_suffix-bold_task-rest__2,datatype-func_suffix-bold_task-rest,2,1,36,43,36,0.089,0.00069,90,True,3,func,36,61.0,False,,j,1.0,0.072,False,5.0,5.0,5.0
diff --git a/docs/about.rst b/docs/about.rst
index 4dd44b4..17371b3 100644
--- a/docs/about.rst
+++ b/docs/about.rst
@@ -56,15 +56,15 @@ Examples
 Dominant Group resting state BOLD:
 
     *   Example Filename: ``sub-01_ses-A_task-rest_acq-singleband_bold.nii.gz``
-    *   Entity Set: ``acquisition-singleband_datatype-func_suffix-bold_task-rest``
+    *   Entity Set: ``datatype-func_suffix-bold_task-rest_acquisition-singleband``
     *   Param Group: ``1`` (Dominant Group)
 
 Variant Group resting state BOLD (all scans in this Param Group are missing a fieldmap)
 
     *   Example Filename: ``sub-02_ses-A_task-rest_acq-singleband_bold.nii.gz``
-    *   Entity Set: ``acquisition-singleband_datatype-func_suffix-bold_task-rest``
+    *   Entity Set: ``datatype-func_suffix-bold_task-rest_acquisition-singleband``
     *   Param Group: ``2`` (Variant Group)
-    *   Rename Entity Set: ``acquisition-singlebandVARIANTNoFmap_datatype-func_suffix-bold_task-rest``
+    *   Rename Entity Set: ``datatype-func_suffix-bold_task-rest_acquisition-singlebandVARIANTNoFmap``
 
 These definitions are described in more detail in :doc:`glossary` and :doc:`usage`.
 
diff --git a/docs/example.rst b/docs/example.rst
index 0ec27a9..5ee3a69 100644
--- a/docs/example.rst
+++ b/docs/example.rst
@@ -340,7 +340,7 @@ which may impact successful execution of BIDS Apps.
    :header-rows: 1
 
 Examining ``v0_summary.tsv`` we can see that one DWI Parameter Group —
-``acquisition-HASC55AP_datatype-dwi_suffix-dwi__2`` —
+``datatype-dwi_suffix-dwi_acquisition-HASC55AP__2`` —
 contains only one scan (see "Counts" column) with only 10 volumes
 (see "NumVolumes" column).
 Since the majority of DWI scans in this dataset have 61 volumes,
@@ -351,7 +351,7 @@ with a suggested name.
 .. note::
    CuBIDS now uses a more explicit variant naming format. In this case, since NumVolumes is a regular
    (non-clustered) parameter, the actual value is included in the variant name:
-   ``acquisition-HASC55APVARIANTNumVolumes10_datatype-dwi_suffix-dwi``.
+   ``datatype-dwi_suffix-dwi_acquisition-HASC55APVARIANTNumVolumes10``.
 
 This time, though,
 we elect to remove this scan because it does not have enough volumes to be usable for most analyses.
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 95624f3..7d666fd 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -9,7 +9,7 @@ Glossary
         A set of scans whose filenames share all `BIDS filename key-value pairs`_,
         excluding subject and session.
         The entity set is derived from the common BIDS filename elements.
-        For example, ``acquisition-*_datatype-*_run-*_task-*_suffix``.
+        For example, ``datatype-*_run-*_task-*_suffix-*_acquisition-*``.
 
     Parameter Group
         A set of scans with identical metadata parameters in their sidecars.


Test patch:
diff --git a/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v0_AcqGroupInfo.txt b/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v0_AcqGroupInfo.txt
index 75d44c3..24c8f87 100644
--- a/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v0_AcqGroupInfo.txt
+++ b/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v0_AcqGroupInfo.txt
@@ -1,3 +1,3 @@
-1 1 ('acquisition-HASC55AP_datatype-dwi_suffix-dwi', 3) ('acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1', 1) ('acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2', 1) ('acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff', 1) ('datatype-anat_suffix-T1w', 1) ('datatype-fmap_direction-PA_fmap-epi_suffix-epi', 2) ('datatype-func_suffix-bold_task-rest', 2)
-2 1 ('acquisition-HASC55AP_datatype-dwi_suffix-dwi', 2) ('acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1', 1) ('acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2', 1) ('acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff', 1) ('datatype-anat_suffix-T1w', 1) ('datatype-fmap_direction-PA_fmap-epi_suffix-epi', 1)
-3 1 ('acquisition-HASC55AP_datatype-dwi_suffix-dwi', 1) ('acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1', 1) ('acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2', 1) ('acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff', 1) ('datatype-anat_suffix-T1w', 1) ('datatype-fmap_direction-PA_fmap-epi_suffix-epi', 1) ('datatype-func_suffix-bold_task-rest', 1)
\ No newline at end of file
+1 1 ('datatype-dwi_suffix-dwi_acquisition-HASC55AP', 3) ('datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4', 1) ('datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4', 1) ('datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4', 1) ('datatype-anat_suffix-T1w', 1) ('datatype-fmap_direction-PA_fmap-epi_suffix-epi', 2) ('datatype-func_suffix-bold_task-rest', 2)
+2 1 ('datatype-dwi_suffix-dwi_acquisition-HASC55AP', 2) ('datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4', 1) ('datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4', 1) ('datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4', 1) ('datatype-anat_suffix-T1w', 1) ('datatype-fmap_direction-PA_fmap-epi_suffix-epi', 1)
+3 1 ('datatype-dwi_suffix-dwi_acquisition-HASC55AP', 1) ('datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4', 1) ('datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4', 1) ('datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4', 1) ('datatype-anat_suffix-T1w', 1) ('datatype-fmap_direction-PA_fmap-epi_suffix-epi', 1) ('datatype-func_suffix-bold_task-rest', 1)
\ No newline at end of file
diff --git a/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v0_files.csv b/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v0_files.csv
index 68ea3dc..50bbde8 100644
--- a/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v0_files.csv
+++ b/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v0_files.csv
@@ -2,18 +2,18 @@ KeyParamGroup,EntitySet,ParamGroup,Counts,Dim1Size,Dim2Size,Dim3Size,EchoTime,Ef
 datatype-anat_suffix-T1w__1,datatype-anat_suffix-T1w,1,3,180,216,180,0.0029,,8.0,FALSE,3,anat,0,1.0,FALSE,,i-,2.5,,FALSE,1.0,1.0,1.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/anat/sub-01_ses-phdiff_T1w.nii.gz
 datatype-anat_suffix-T1w__1,datatype-anat_suffix-T1w,1,3,180,216,180,0.0029,,8.0,FALSE,3,anat,0,1.0,FALSE,,i-,2.5,,FALSE,1.0,1.0,1.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/anat/sub-02_ses-phdiff_T1w.nii.gz
 datatype-anat_suffix-T1w__1,datatype-anat_suffix-T1w,1,3,180,216,180,0.0029,,8.0,FALSE,3,anat,0,1.0,FALSE,,i-,2.5,,FALSE,1.0,1.0,1.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/anat/sub-03_ses-phdiff_T1w.nii.gz
-acquisition-HASC55AP_datatype-dwi_suffix-dwi__1,acquisition-HASC55AP_datatype-dwi_suffix-dwi,1,1,36,43,36,0.04,0.00069,90.0,TRUE,3,dwi,36,61.0,FALSE,,j,4.2,0.072,FALSE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/dwi/sub-01_ses-phdiff_acq-HASC55AP_dwi.nii.gz
-acquisition-HASC55AP_datatype-dwi_suffix-dwi__2,acquisition-HASC55AP_datatype-dwi_suffix-dwi,2,1,36,43,36,0.089,0.00069,,TRUE,3,dwi,36,61.0,FALSE,,j,4.2,0.072,FALSE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/dwi/sub-02_ses-phdiff_acq-HASC55AP_dwi.nii.gz
-acquisition-HASC55AP_datatype-dwi_suffix-dwi__3,acquisition-HASC55AP_datatype-dwi_suffix-dwi,3,1,36,43,36,0.089,0.00069,90.0,TRUE,3,dwi,36,61.0,FALSE,,j,4.2,0.072,FALSE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/dwi/sub-03_ses-phdiff_acq-HASC55AP_dwi.nii.gz
-acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1__1,acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1,1,3,36,43,36,0.004,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,FALSE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/fmap/sub-01_ses-phdiff_acq-v4_magnitude1.nii.gz
-acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1__1,acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1,1,3,36,43,36,0.004,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,FALSE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/fmap/sub-02_ses-phdiff_acq-v4_magnitude1.nii.gz
-acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1__1,acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1,1,3,36,43,36,0.004,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,FALSE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/fmap/sub-03_ses-phdiff_acq-v4_magnitude1.nii.gz
-acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2__1,acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2,1,3,36,43,36,0.006,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,FALSE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/fmap/sub-01_ses-phdiff_acq-v4_magnitude2.nii.gz
-acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2__1,acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2,1,3,36,43,36,0.006,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,FALSE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/fmap/sub-02_ses-phdiff_acq-v4_magnitude2.nii.gz
-acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2__1,acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2,1,3,36,43,36,0.006,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,FALSE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/fmap/sub-03_ses-phdiff_acq-v4_magnitude2.nii.gz
-acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff__1,acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff,1,3,36,43,36,,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,TRUE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/fmap/sub-01_ses-phdiff_acq-v4_phasediff.nii.gz
-acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff__1,acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff,1,3,36,43,36,,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,TRUE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/fmap/sub-02_ses-phdiff_acq-v4_phasediff.nii.gz
-acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff__1,acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff,1,3,36,43,36,,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,TRUE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/fmap/sub-03_ses-phdiff_acq-v4_phasediff.nii.gz
+datatype-dwi_suffix-dwi_acquisition-HASC55AP__1,datatype-dwi_suffix-dwi_acquisition-HASC55AP,1,1,36,43,36,0.04,0.00069,90.0,TRUE,3,dwi,36,61.0,FALSE,,j,4.2,0.072,FALSE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/dwi/sub-01_ses-phdiff_acq-HASC55AP_dwi.nii.gz
+datatype-dwi_suffix-dwi_acquisition-HASC55AP__2,datatype-dwi_suffix-dwi_acquisition-HASC55AP,2,1,36,43,36,0.089,0.00069,,TRUE,3,dwi,36,61.0,FALSE,,j,4.2,0.072,FALSE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/dwi/sub-02_ses-phdiff_acq-HASC55AP_dwi.nii.gz
+datatype-dwi_suffix-dwi_acquisition-HASC55AP__3,datatype-dwi_suffix-dwi_acquisition-HASC55AP,3,1,36,43,36,0.089,0.00069,90.0,TRUE,3,dwi,36,61.0,FALSE,,j,4.2,0.072,FALSE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/dwi/sub-03_ses-phdiff_acq-HASC55AP_dwi.nii.gz
+datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4__1,datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4,1,3,36,43,36,0.004,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,FALSE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/fmap/sub-01_ses-phdiff_acq-v4_magnitude1.nii.gz
+datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4__1,datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4,1,3,36,43,36,0.004,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,FALSE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/fmap/sub-02_ses-phdiff_acq-v4_magnitude1.nii.gz
+datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4__1,datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4,1,3,36,43,36,0.004,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,FALSE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/fmap/sub-03_ses-phdiff_acq-v4_magnitude1.nii.gz
+datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4__1,datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4,1,3,36,43,36,0.006,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,FALSE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/fmap/sub-01_ses-phdiff_acq-v4_magnitude2.nii.gz
+datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4__1,datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4,1,3,36,43,36,0.006,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,FALSE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/fmap/sub-02_ses-phdiff_acq-v4_magnitude2.nii.gz
+datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4__1,datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4,1,3,36,43,36,0.006,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,FALSE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/fmap/sub-03_ses-phdiff_acq-v4_magnitude2.nii.gz
+datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4__1,datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4,1,3,36,43,36,,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,TRUE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/fmap/sub-01_ses-phdiff_acq-v4_phasediff.nii.gz
+datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4__1,datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4,1,3,36,43,36,,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,TRUE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/fmap/sub-02_ses-phdiff_acq-v4_phasediff.nii.gz
+datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4__1,datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4,1,3,36,43,36,,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,TRUE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/fmap/sub-03_ses-phdiff_acq-v4_phasediff.nii.gz
 datatype-fmap_direction-PA_fmap-epi_suffix-epi__1,datatype-fmap_direction-PA_fmap-epi_suffix-epi,1,2,36,43,36,0.089,0.00069,90.0,FALSE,3,fmap,36,1.0,FALSE,,j-,4.2,0.072,FALSE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/fmap/sub-01_ses-phdiff_dir-PA_epi.nii.gz
 datatype-fmap_direction-PA_fmap-epi_suffix-epi__1,datatype-fmap_direction-PA_fmap-epi_suffix-epi,1,2,36,43,36,0.089,0.00069,90.0,FALSE,3,fmap,36,1.0,FALSE,,j-,4.2,0.072,FALSE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/fmap/sub-02_ses-phdiff_dir-PA_epi.nii.gz
 datatype-fmap_direction-PA_fmap-epi_suffix-epi__2,datatype-fmap_direction-PA_fmap-epi_suffix-epi,2,1,36,43,36,0.089,0.00069,90.0,FALSE,3,fmap,36,1.0,FALSE,,j-,4.2,0.072,TRUE,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/fmap/sub-03_ses-phdiff_dir-PA_epi.nii.gz
diff --git a/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v0_summary.csv b/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v0_summary.csv
index 7f77a4c..ac8915d 100644
--- a/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v0_summary.csv
+++ b/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v0_summary.csv
@@ -1,12 +1,12 @@
 Notes,ManualCheck,MergeInto,RenameEntitySet,KeyParamGroup,EntitySet,ParamGroup,Counts,Dim1Size,Dim2Size,Dim3Size,EchoTime,EffectiveEchoSpacing,FlipAngle,HasFieldmap,EntitySetCount,Modality,NSliceTimes,NumVolumes,Obliquity,PartialFourier,PhaseEncodingDirection,RepetitionTime,TotalReadoutTime,UsedAsFieldmap,VoxelSizeDim1,VoxelSizeDim2,VoxelSizeDim3
 ,,,,datatype-anat_suffix-T1w__1,datatype-anat_suffix-T1w,1,3,180,216,180,0.0029,,8.0,FALSE,3,anat,0,1.0,FALSE,,i-,2.5,,FALSE,1.0,1.0,1.0
-,,,,acquisition-HASC55AP_datatype-dwi_suffix-dwi__1,acquisition-HASC55AP_datatype-dwi_suffix-dwi,1,1,36,43,36,0.04,0.00069,90.0,TRUE,3,dwi,36,61.0,FALSE,,j,4.2,0.072,FALSE,5.0,5.0,5.0
-,,,acquisition-HASC55APVARIANTEchoTimeFlipAngle_datatype-dwi_suffix-dwi,acquisition-HASC55AP_datatype-dwi_suffix-dwi__2,acquisition-HASC55AP_datatype-dwi_suffix-dwi,2,1,36,43,36,0.089,0.00069,,TRUE,3,dwi,36,61.0,FALSE,,j,4.2,0.072,FALSE,5.0,5.0,5.0
-,,,acquisition-HASC55APVARIANTEchoTime_datatype-dwi_suffix-dwi,acquisition-HASC55AP_datatype-dwi_suffix-dwi__3,acquisition-HASC55AP_datatype-dwi_suffix-dwi,3,1,36,43,36,0.089,0.00069,90.0,TRUE,3,dwi,36,61.0,FALSE,,j,4.2,0.072,FALSE,5.0,5.0,5.0
-,,,,acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1__1,acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1,1,3,36,43,36,0.004,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,FALSE,5.0,5.0,5.0
-,,,,acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2__1,acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2,1,3,36,43,36,0.006,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,FALSE,5.0,5.0,5.0
-,,,,acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff__1,acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff,1,3,36,43,36,,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,TRUE,5.0,5.0,5.0
+,,,,datatype-dwi_suffix-dwi_acquisition-HASC55AP__1,datatype-dwi_suffix-dwi_acquisition-HASC55AP,1,1,36,43,36,0.04,0.00069,90.0,TRUE,3,dwi,36,61.0,FALSE,,j,4.2,0.072,FALSE,5.0,5.0,5.0
+,,,datatype-dwi_suffix-dwi_acquisition-HASC55APVARIANTEchoTimeFlipAngle,datatype-dwi_suffix-dwi_acquisition-HASC55AP__2,acquisition-HASC55AP_datatype-dwi_suffix-dwi,2,1,36,43,36,0.089,0.00069,,TRUE,3,dwi,36,61.0,FALSE,,j,4.2,0.072,FALSE,5.0,5.0,5.0
+,,,datatype-dwi_suffix-dwi_acquisition-HASC55APVARIANTEchoTime,datatype-dwi_suffix-dwi_acquisition-HASC55AP__3,acquisition-HASC55AP_datatype-dwi_suffix-dwi,3,1,36,43,36,0.089,0.00069,90.0,TRUE,3,dwi,36,61.0,FALSE,,j,4.2,0.072,FALSE,5.0,5.0,5.0
+,,,,datatype-fmap_fmap-magnitude1_suffix-magnitude1__1,datatype-fmap_fmap-magnitude1_suffix-magnitude1,1,3,36,43,36,0.004,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,FALSE,5.0,5.0,5.0
+,,,,datatype-fmap_fmap-magnitude2_suffix-magnitude2__1,datatype-fmap_fmap-magnitude2_suffix-magnitude2,1,3,36,43,36,0.006,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,FALSE,5.0,5.0,5.0
+,,,,datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4__1,datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4,1,3,36,43,36,,,60.0,FALSE,3,fmap,0,1.0,FALSE,0.75,j-,1.5,,TRUE,5.0,5.0,5.0
 ,,,,datatype-fmap_direction-PA_fmap-epi_suffix-epi__1,datatype-fmap_direction-PA_fmap-epi_suffix-epi,1,2,36,43,36,0.089,0.00069,90.0,FALSE,3,fmap,36,1.0,FALSE,,j-,4.2,0.072,FALSE,5.0,5.0,5.0
-,,,acquisition-VARIANTIsUsed_datatype-fmap_direction-PA_fmap-epi_suffix-epi,datatype-fmap_direction-PA_fmap-epi_suffix-epi__2,datatype-fmap_direction-PA_fmap-epi_suffix-epi,2,1,36,43,36,0.089,0.00069,90.0,FALSE,3,fmap,36,1.0,FALSE,,j-,4.2,0.072,TRUE,5.0,5.0,5.0
+,,,datatype-fmap_direction-PA_fmap-epi_suffix-epi_acquisition-VARIANTIsUsed,datatype-fmap_direction-PA_fmap-epi_suffix-epi__2,datatype-fmap_direction-PA_fmap-epi_suffix-epi,2,1,36,43,36,0.089,0.00069,90.0,FALSE,3,fmap,36,1.0,FALSE,,j-,4.2,0.072,TRUE,5.0,5.0,5.0
 ,,,,datatype-func_suffix-bold_task-rest__1,datatype-func_suffix-bold_task-rest,1,1,36,43,36,0.089,0.00069,90.0,FALSE,2,func,36,61.0,FALSE,,j,1.0,0.072,FALSE,5.0,5.0,5.0
-,,,acquisition-VARIANTNumVolumesHasFmap_datatype-func_suffix-bold_task-rest,datatype-func_suffix-bold_task-rest__2,datatype-func_suffix-bold_task-rest,2,1,36,43,36,0.089,0.00069,90.0,TRUE,2,func,36,10.0,FALSE,,j,1.0,0.072,FALSE,5.0,5.0,5.0
\ No newline at end of file
+,,,datatype-func_suffix-bold_task-rest_acquisition-VARIANTNumVolumesHasFmap,datatype-func_suffix-bold_task-rest__2,datatype-func_suffix-bold_task-rest,2,1,36,43,36,0.089,0.00069,90.0,TRUE,2,func,36,10.0,FALSE,,j,1.0,0.072,FALSE,5.0,5.0,5.0
\ No newline at end of file
diff --git a/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v1_AcqGroupInfo.txt b/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v1_AcqGroupInfo.txt
index e91b8f3..08e7150 100644
--- a/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v1_AcqGroupInfo.txt
+++ b/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v1_AcqGroupInfo.txt
@@ -1,3 +1,3 @@
-1 1 ('acquisition-HASC55AP_datatype-dwi_suffix-dwi', 3) ('acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1', 1) ('acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2', 1) ('acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff', 1) ('datatype-anat_suffix-T1w', 1) ('datatype-fmap_direction-PA_fmap-epi_suffix-epi', 2) ('datatype-func_suffix-bold_task-rest', 1)
-2 1 ('acquisition-HASC55AP_datatype-dwi_suffix-dwi', 2) ('acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1', 1) ('acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2', 1) ('acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff', 1) ('datatype-anat_suffix-T1w', 1) ('datatype-fmap_direction-PA_fmap-epi_suffix-epi', 1)
-3 1 ('acquisition-HASC55AP_datatype-dwi_suffix-dwi', 1) ('acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1', 1) ('acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2', 1) ('acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff', 1) ('datatype-anat_suffix-T1w', 1) ('datatype-fmap_direction-PA_fmap-epi_suffix-epi', 1)
\ No newline at end of file
+1 1 ('datatype-dwi_suffix-dwi_acquisition-HASC55AP', 3) ('datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4', 1) ('datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4', 1) ('datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4', 1) ('datatype-anat_suffix-T1w', 1) ('datatype-fmap_direction-PA_fmap-epi_suffix-epi', 2) ('datatype-func_suffix-bold_task-rest', 1)
+2 1 ('datatype-dwi_suffix-dwi_acquisition-HASC55AP', 2) ('datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4', 1) ('datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4', 1) ('datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4', 1) ('datatype-anat_suffix-T1w', 1) ('datatype-fmap_direction-PA_fmap-epi_suffix-epi', 1)
+3 1 ('datatype-dwi_suffix-dwi_acquisition-HASC55AP', 1) ('datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4', 1) ('datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4', 1) ('datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4', 1) ('datatype-anat_suffix-T1w', 1) ('datatype-fmap_direction-PA_fmap-epi_suffix-epi', 1) ('datatype-func_suffix-bold_task-rest', 1)
\ No newline at end of file
diff --git a/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v1_files.csv b/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v1_files.csv
index 047809e..ca8f998 100644
--- a/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v1_files.csv
+++ b/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v1_files.csv
@@ -2,18 +2,18 @@ KeyParamGroup,EntitySet,ParamGroup,Counts,Dim1Size,Dim2Size,Dim3Size,EchoTime,Ef
 datatype-anat_suffix-T1w__1,datatype-anat_suffix-T1w,1,3,180,216,180,0.0029,,8.0,False,3,anat,0,1.0,False,,i-,2.5,,False,1.0,1.0,1.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/anat/sub-01_ses-phdiff_T1w.nii.gz
 datatype-anat_suffix-T1w__1,datatype-anat_suffix-T1w,1,3,180,216,180,0.0029,,8.0,False,3,anat,0,1.0,False,,i-,2.5,,False,1.0,1.0,1.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/anat/sub-02_ses-phdiff_T1w.nii.gz
 datatype-anat_suffix-T1w__1,datatype-anat_suffix-T1w,1,3,180,216,180,0.0029,,8.0,False,3,anat,0,1.0,False,,i-,2.5,,False,1.0,1.0,1.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/anat/sub-03_ses-phdiff_T1w.nii.gz
-acquisition-HASC55AP_datatype-dwi_suffix-dwi__1,acquisition-HASC55AP_datatype-dwi_suffix-dwi,1,1,36,43,36,0.04,0.00069,90.0,True,3,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/dwi/sub-01_ses-phdiff_acq-HASC55AP_dwi.nii.gz
-acquisition-HASC55AP_datatype-dwi_suffix-dwi__2,acquisition-HASC55AP_datatype-dwi_suffix-dwi,2,1,36,43,36,0.089,0.00069,,True,3,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/dwi/sub-02_ses-phdiff_acq-HASC55AP_dwi.nii.gz
-acquisition-HASC55AP_datatype-dwi_suffix-dwi__3,acquisition-HASC55AP_datatype-dwi_suffix-dwi,3,1,36,43,36,0.089,0.00069,90.0,True,3,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/dwi/sub-03_ses-phdiff_acq-HASC55AP_dwi.nii.gz
-acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1__1,acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1,1,3,36,43,36,0.004,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/fmap/sub-01_ses-phdiff_acq-v4_magnitude1.nii.gz
-acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1__1,acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1,1,3,36,43,36,0.004,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/fmap/sub-02_ses-phdiff_acq-v4_magnitude1.nii.gz
-acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1__1,acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1,1,3,36,43,36,0.004,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/fmap/sub-03_ses-phdiff_acq-v4_magnitude1.nii.gz
-acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2__1,acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2,1,3,36,43,36,0.006,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/fmap/sub-01_ses-phdiff_acq-v4_magnitude2.nii.gz
-acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2__1,acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2,1,3,36,43,36,0.006,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/fmap/sub-02_ses-phdiff_acq-v4_magnitude2.nii.gz
-acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2__1,acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2,1,3,36,43,36,0.006,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/fmap/sub-03_ses-phdiff_acq-v4_magnitude2.nii.gz
-acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff__1,acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff,1,3,36,43,36,,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,True,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/fmap/sub-01_ses-phdiff_acq-v4_phasediff.nii.gz
-acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff__1,acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff,1,3,36,43,36,,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,True,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/fmap/sub-02_ses-phdiff_acq-v4_phasediff.nii.gz
-acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff__1,acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff,1,3,36,43,36,,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,True,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/fmap/sub-03_ses-phdiff_acq-v4_phasediff.nii.gz
+datatype-dwi_suffix-dwi_acquisition-HASC55AP__1,datatype-dwi_suffix-dwi_acquisition-HASC55AP,1,1,36,43,36,0.04,0.00069,90.0,True,3,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/dwi/sub-01_ses-phdiff_acq-HASC55AP_dwi.nii.gz
+datatype-dwi_suffix-dwi_acquisition-HASC55AP__2,datatype-dwi_suffix-dwi_acquisition-HASC55AP,2,1,36,43,36,0.089,0.00069,,True,3,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/dwi/sub-02_ses-phdiff_acq-HASC55AP_dwi.nii.gz
+datatype-dwi_suffix-dwi_acquisition-HASC55AP__3,datatype-dwi_suffix-dwi_acquisition-HASC55AP,3,1,36,43,36,0.089,0.00069,90.0,True,3,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/dwi/sub-03_ses-phdiff_acq-HASC55AP_dwi.nii.gz
+datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4__1,datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4,1,3,36,43,36,0.004,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/fmap/sub-01_ses-phdiff_acq-v4_magnitude1.nii.gz
+datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4__1,datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4,1,3,36,43,36,0.004,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/fmap/sub-02_ses-phdiff_acq-v4_magnitude1.nii.gz
+datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4__1,datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4,1,3,36,43,36,0.004,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/fmap/sub-03_ses-phdiff_acq-v4_magnitude1.nii.gz
+datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4__1,datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4,1,3,36,43,36,0.006,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/fmap/sub-01_ses-phdiff_acq-v4_magnitude2.nii.gz
+datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4__1,datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4,1,3,36,43,36,0.006,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/fmap/sub-02_ses-phdiff_acq-v4_magnitude2.nii.gz
+datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4__1,datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4,1,3,36,43,36,0.006,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/fmap/sub-03_ses-phdiff_acq-v4_magnitude2.nii.gz
+datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4__1,datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4,1,3,36,43,36,,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,True,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/fmap/sub-01_ses-phdiff_acq-v4_phasediff.nii.gz
+datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4__1,datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4,1,3,36,43,36,,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,True,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/fmap/sub-02_ses-phdiff_acq-v4_phasediff.nii.gz
+datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4__1,datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4,1,3,36,43,36,,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,True,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/fmap/sub-03_ses-phdiff_acq-v4_phasediff.nii.gz
 datatype-fmap_direction-PA_fmap-epi_suffix-epi__1,datatype-fmap_direction-PA_fmap-epi_suffix-epi,1,2,36,43,36,0.089,0.00069,90.0,False,3,fmap,36,1.0,False,,j-,4.2,0.072,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/fmap/sub-01_ses-phdiff_dir-PA_epi.nii.gz
 datatype-fmap_direction-PA_fmap-epi_suffix-epi__1,datatype-fmap_direction-PA_fmap-epi_suffix-epi,1,2,36,43,36,0.089,0.00069,90.0,False,3,fmap,36,1.0,False,,j-,4.2,0.072,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/fmap/sub-02_ses-phdiff_dir-PA_epi.nii.gz
 datatype-fmap_direction-PA_fmap-epi_suffix-epi__2,datatype-fmap_direction-PA_fmap-epi_suffix-epi,2,1,36,43,36,0.089,0.00069,90.0,False,3,fmap,36,1.0,False,,j-,4.2,0.072,True,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/fmap/sub-03_ses-phdiff_dir-PA_epi.nii.gz
diff --git a/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v1_summary.csv b/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v1_summary.csv
index 000b64f..3e677eb 100644
--- a/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v1_summary.csv
+++ b/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v1_summary.csv
@@ -1,11 +1,11 @@
 Notes,ManualCheck,MergeInto,RenameEntitySet,KeyParamGroup,EntitySet,ParamGroup,Counts,Dim1Size,Dim2Size,Dim3Size,EchoTime,EffectiveEchoSpacing,FlipAngle,HasFieldmap,EntitySetCount,Modality,NSliceTimes,NumVolumes,Obliquity,PartialFourier,PhaseEncodingDirection,RepetitionTime,TotalReadoutTime,UsedAsFieldmap,VoxelSizeDim1,VoxelSizeDim2,VoxelSizeDim3
 ,,,,datatype-anat_suffix-T1w__1,datatype-anat_suffix-T1w,1,3,180,216,180,0.0029,,8.0,False,3,anat,0,1.0,False,,i-,2.5,,False,1.0,1.0,1.0
-,,,,acquisition-HASC55AP_datatype-dwi_suffix-dwi__1,acquisition-HASC55AP_datatype-dwi_suffix-dwi,1,1,36,43,36,0.04,0.00069,90.0,True,3,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0
-,,,acquisition-HASC55APVARIANTEchoTimeFlipAngle_datatype-dwi_suffix-dwi,acquisition-HASC55AP_datatype-dwi_suffix-dwi__2,acquisition-HASC55AP_datatype-dwi_suffix-dwi,2,1,36,43,36,0.089,0.00069,,True,3,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0
-,,,acquisition-HASC55APVARIANTEchoTime_datatype-dwi_suffix-dwi,acquisition-HASC55AP_datatype-dwi_suffix-dwi__3,acquisition-HASC55AP_datatype-dwi_suffix-dwi,3,1,36,43,36,0.089,0.00069,90.0,True,3,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0
-,,,,acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1__1,acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1,1,3,36,43,36,0.004,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0
-,,,,acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2__1,acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2,1,3,36,43,36,0.006,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0
-,,,,acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff__1,acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff,1,3,36,43,36,,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,True,5.0,5.0,5.0
+,,,,datatype-dwi_suffix-dwi_acquisition-HASC55AP__1,datatype-dwi_suffix-dwi_acquisition-HASC55AP,1,1,36,43,36,0.04,0.00069,90.0,True,3,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0
+,,,,datatype-dwi_suffix-dwi_acquisition-HASC55AP__2,datatype-dwi_suffix-dwi_acquisition-HASC55AP,2,1,36,43,36,0.089,0.00069,,True,3,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0
+,,,,datatype-dwi_suffix-dwi_acquisition-HASC55AP__3,datatype-dwi_suffix-dwi_acquisition-HASC55AP,3,1,36,43,36,0.089,0.00069,90.0,True,3,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0
+,,,,datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4__1,datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4,1,3,36,43,36,0.004,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0
+,,,,datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4__1,datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4,1,3,36,43,36,0.006,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0
+,,,,datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4__1,datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4,1,3,36,43,36,,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,True,5.0,5.0,5.0
 ,,,,datatype-fmap_direction-PA_fmap-epi_suffix-epi__1,datatype-fmap_direction-PA_fmap-epi_suffix-epi,1,2,36,43,36,0.089,0.00069,90.0,False,3,fmap,36,1.0,False,,j-,4.2,0.072,False,5.0,5.0,5.0
-,,,acquisition-VARIANTIsUsed_datatype-fmap_direction-PA_fmap-epi_suffix-epi,datatype-fmap_direction-PA_fmap-epi_suffix-epi__2,datatype-fmap_direction-PA_fmap-epi_suffix-epi,2,1,36,43,36,0.089,0.00069,90.0,False,3,fmap,36,1.0,False,,j-,4.2,0.072,True,5.0,5.0,5.0
+,,,,datatype-fmap_direction-PA_fmap-epi_suffix-epi__2,datatype-fmap_direction-PA_fmap-epi_suffix-epi,2,1,36,43,36,0.089,0.00069,90.0,False,3,fmap,36,1.0,False,,j-,4.2,0.072,True,5.0,5.0,5.0
 ,,,,datatype-func_suffix-bold_task-rest__1,datatype-func_suffix-bold_task-rest,1,1,36,43,36,0.089,0.00069,70.0,True,1,func,36,61.0,False,,j,1.0,,False,5.0,5.0,5.0
diff --git a/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v2_AcqGroupInfo.txt b/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v2_AcqGroupInfo.txt
index 4243255..a4667ce 100644
--- a/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v2_AcqGroupInfo.txt
+++ b/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v2_AcqGroupInfo.txt
@@ -1,3 +1,3 @@
-1 1 ('acquisition-HASC55APVARIANTEchoTime_datatype-dwi_suffix-dwi', 1) ('acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1', 1) ('acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2', 1) ('acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff', 1) ('datatype-anat_suffix-T1w', 1) ('datatype-fmap_direction-PA_fmap-epi_suffix-epi', 2) ('datatype-func_suffix-bold_task-rest', 1)
-2 1 ('acquisition-HASC55APVARIANTEchoTimeFlipAngle_datatype-dwi_suffix-dwi', 1) ('acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1', 1) ('acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2', 1) ('acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff', 1) ('datatype-anat_suffix-T1w', 1) ('datatype-fmap_direction-PA_fmap-epi_suffix-epi', 1)
-3 1 ('acquisition-HASC55AP_datatype-dwi_suffix-dwi', 1) ('acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1', 1) ('acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2', 1) ('acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff', 1) ('datatype-anat_suffix-T1w', 1) ('datatype-fmap_direction-PA_fmap-epi_suffix-epi', 1)
\ No newline at end of file
+1 1 ('datatype-dwi_suffix-dwi_acquisition-HASC55APVARIANTEchoTime', 1) ('datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4', 1) ('datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4', 1) ('datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4', 1) ('datatype-anat_suffix-T1w', 1) ('datatype-fmap_direction-PA_fmap-epi_suffix-epi', 2) ('datatype-func_suffix-bold_task-rest', 1)
+2 1 ('datatype-dwi_suffix-dwi_acquisition-HASC55APVARIANTEchoTimeFlipAngle', 1) ('datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4', 1) ('datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4', 1) ('datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4', 1) ('datatype-anat_suffix-T1w', 1) ('datatype-fmap_direction-PA_fmap-epi_suffix-epi', 1)
+3 1 ('datatype-dwi_suffix-dwi_acquisition-HASC55AP', 1) ('datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4', 1) ('datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4', 1) ('datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4', 1) ('datatype-anat_suffix-T1w', 1) ('datatype-fmap_direction-PA_fmap-epi_suffix-epi', 1)
\ No newline at end of file
diff --git a/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v2_files.csv b/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v2_files.csv
index dfde4ae..83e7e8e 100644
--- a/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v2_files.csv
+++ b/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v2_files.csv
@@ -1,20 +1,11 @@
 KeyParamGroup,EntitySet,ParamGroup,Counts,Dim1Size,Dim2Size,Dim3Size,EchoTime,EffectiveEchoSpacing,FlipAngle,HasFieldmap,EntitySetCount,Modality,NSliceTimes,NumVolumes,Obliquity,PartialFourier,PhaseEncodingDirection,RepetitionTime,TotalReadoutTime,UsedAsFieldmap,VoxelSizeDim1,VoxelSizeDim2,VoxelSizeDim3,FilePath
 datatype-anat_suffix-T1w__1,datatype-anat_suffix-T1w,1,3,180,216,180,0.0029,,8.0,False,3,anat,0,1.0,False,,i-,2.5,,False,1.0,1.0,1.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/anat/sub-01_ses-phdiff_T1w.nii.gz
-datatype-anat_suffix-T1w__1,datatype-anat_suffix-T1w,1,3,180,216,180,0.0029,,8.0,False,3,anat,0,1.0,False,,i-,2.5,,False,1.0,1.0,1.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/anat/sub-02_ses-phdiff_T1w.nii.gz
-datatype-anat_suffix-T1w__1,datatype-anat_suffix-T1w,1,3,180,216,180,0.0029,,8.0,False,3,anat,0,1.0,False,,i-,2.5,,False,1.0,1.0,1.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/anat/sub-03_ses-phdiff_T1w.nii.gz
-acquisition-HASC55APVARIANTEchoTimeFlipAngle_datatype-dwi_suffix-dwi__1,acquisition-HASC55APVARIANTEchoTimeFlipAngle_datatype-dwi_suffix-dwi,1,1,36,43,36,0.089,0.00069,,True,1,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/dwi/sub-02_ses-phdiff_acq-HASC55APVARIANTEchoTimeFlipAngle_dwi.nii.gz
-acquisition-HASC55APVARIANTEchoTime_datatype-dwi_suffix-dwi__1,acquisition-HASC55APVARIANTEchoTime_datatype-dwi_suffix-dwi,1,1,36,43,36,0.089,0.00069,90.0,True,1,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/dwi/sub-03_ses-phdiff_acq-HASC55APVARIANTEchoTime_dwi.nii.gz
-acquisition-HASC55AP_datatype-dwi_suffix-dwi__1,acquisition-HASC55AP_datatype-dwi_suffix-dwi,1,1,36,43,36,0.04,0.00069,90.0,True,1,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/dwi/sub-01_ses-phdiff_acq-HASC55AP_dwi.nii.gz
-acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1__1,acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1,1,3,36,43,36,0.004,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/fmap/sub-01_ses-phdiff_acq-v4_magnitude1.nii.gz
-acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1__1,acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1,1,3,36,43,36,0.004,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/fmap/sub-02_ses-phdiff_acq-v4_magnitude1.nii.gz
-acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1__1,acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1,1,3,36,43,36,0.004,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/fmap/sub-03_ses-phdiff_acq-v4_magnitude1.nii.gz
-acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2__1,acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2,1,3,36,43,36,0.006,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/fmap/sub-01_ses-phdiff_acq-v4_magnitude2.nii.gz
-acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2__1,acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2,1,3,36,43,36,0.006,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/fmap/sub-02_ses-phdiff_acq-v4_magnitude2.nii.gz
-acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2__1,acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2,1,3,36,43,36,0.006,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/fmap/sub-03_ses-phdiff_acq-v4_magnitude2.nii.gz
-acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff__1,acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff,1,3,36,43,36,,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,True,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/fmap/sub-01_ses-phdiff_acq-v4_phasediff.nii.gz
-acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff__1,acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff,1,3,36,43,36,,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,True,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/fmap/sub-02_ses-phdiff_acq-v4_phasediff.nii.gz
-acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff__1,acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff,1,3,36,43,36,,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,True,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/fmap/sub-03_ses-phdiff_acq-v4_phasediff.nii.gz
+datatype-dwi_suffix-dwi_acquisition-HASC55APVARIANTEchoTimeFlipAngle__1,datatype-dwi_suffix-dwi_acquisition-HASC55APVARIANTEchoTimeFlipAngle,1,1,36,43,36,0.089,0.00069,,True,1,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/dwi/sub-02_ses-phdiff_acq-HASC55APVARIANTEchoTimeFlipAngle_dwi.nii.gz
+datatype-dwi_suffix-dwi_acquisition-HASC55APVARIANTEchoTime__1,datatype-dwi_suffix-dwi_acquisition-HASC55APVARIANTEchoTime,1,1,36,43,36,0.089,0.00069,90.0,True,1,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/dwi/sub-03_ses-phdiff_acq-HASC55APVARIANTEchoTime_dwi.nii.gz
+datatype-dwi_suffix-dwi_acquisition-HASC55AP__1,datatype-dwi_suffix-dwi_acquisition-HASC55AP,1,1,36,43,36,0.04,0.00069,90.0,True,1,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/dwi/sub-01_ses-phdiff_acq-HASC55AP_dwi.nii.gz
+datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4__1,datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4,1,3,36,43,36,0.004,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/fmap/sub-01_ses-phdiff_acq-v4_magnitude1.nii.gz
+datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4__1,datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4,1,3,36,43,36,0.006,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/fmap/sub-01_ses-phdiff_acq-v4_magnitude2.nii.gz
+datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4__1,datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4,1,3,36,43,36,,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,True,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/fmap/sub-01_ses-phdiff_acq-v4_phasediff.nii.gz
 datatype-fmap_direction-PA_fmap-epi_suffix-epi__1,datatype-fmap_direction-PA_fmap-epi_suffix-epi,1,2,36,43,36,0.089,0.00069,90.0,False,3,fmap,36,1.0,False,,j-,4.2,0.072,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-01/ses-phdiff/fmap/sub-01_ses-phdiff_dir-PA_epi.nii.gz
-datatype-fmap_direction-PA_fmap-epi_suffix-epi__1,datatype-fmap_direction-PA_fmap-epi_suffix-epi,1,2,36,43,36,0.089,0.00069,90.0,False,3,fmap,36,1.0,False,,j-,4.2,0.072,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-02/ses-phdiff/fmap/sub-02_ses-phdiff_dir-PA_epi.nii.gz
 datatype-fmap_direction-PA_fmap-epi_suffix-epi__2,datatype-fmap_direction-PA_fmap-epi_suffix-epi,2,1,36,43,36,0.089,0.00069,90.0,False,3,fmap,36,1.0,False,,j-,4.2,0.072,True,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/fmap/sub-03_ses-phdiff_dir-PA_epi.nii.gz
 datatype-func_suffix-bold_task-rest__1,datatype-func_suffix-bold_task-rest,1,1,36,43,36,0.089,0.00069,70.0,True,1,func,36,61.0,False,,j,1.0,,False,5.0,5.0,5.0,/Users/scovitz/BIDS_Dataset_Datalad/sub-03/ses-phdiff/func/sub-03_ses-phdiff_task-rest_bold.nii.gz
diff --git a/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v2_summary.csv b/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v2_summary.csv
index a2a1c74..41e4900 100644
--- a/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v2_summary.csv
+++ b/cubids/tests/data/CuBIDS_Toy_Dataset_Curation/v2_summary.csv
@@ -1,11 +1,11 @@
 Notes,ManualCheck,MergeInto,RenameEntitySet,KeyParamGroup,EntitySet,ParamGroup,Counts,Dim1Size,Dim2Size,Dim3Size,EchoTime,EffectiveEchoSpacing,FlipAngle,HasFieldmap,EntitySetCount,Modality,NSliceTimes,NumVolumes,Obliquity,PartialFourier,PhaseEncodingDirection,RepetitionTime,TotalReadoutTime,UsedAsFieldmap,VoxelSizeDim1,VoxelSizeDim2,VoxelSizeDim3
 ,,,,datatype-anat_suffix-T1w__1,datatype-anat_suffix-T1w,1,3,180,216,180,0.0029,,8.0,False,3,anat,0,1.0,False,,i-,2.5,,False,1.0,1.0,1.0
-,,,,acquisition-HASC55APVARIANTEchoTimeFlipAngle_datatype-dwi_suffix-dwi__1,acquisition-HASC55APVARIANTEchoTimeFlipAngle_datatype-dwi_suffix-dwi,1,1,36,43,36,0.089,0.00069,,True,1,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0
-,,,,acquisition-HASC55APVARIANTEchoTime_datatype-dwi_suffix-dwi__1,acquisition-HASC55APVARIANTEchoTime_datatype-dwi_suffix-dwi,1,1,36,43,36,0.089,0.00069,90.0,True,1,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0
-,,,,acquisition-HASC55AP_datatype-dwi_suffix-dwi__1,acquisition-HASC55AP_datatype-dwi_suffix-dwi,1,1,36,43,36,0.04,0.00069,90.0,True,1,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0
-,,,,acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1__1,acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1,1,3,36,43,36,0.004,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0
-,,,,acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2__1,acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2,1,3,36,43,36,0.006,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0
-,,,,acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff__1,acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff,1,3,36,43,36,,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,True,5.0,5.0,5.0
+,,,,datatype-dwi_suffix-dwi_acquisition-HASC55APVARIANTEchoTimeFlipAngle__1,datatype-dwi_suffix-dwi_acquisition-HASC55APVARIANTEchoTimeFlipAngle,1,1,36,43,36,0.089,0.00069,,True,1,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0
+,,,,datatype-dwi_suffix-dwi_acquisition-HASC55APVARIANTEchoTime__1,datatype-dwi_suffix-dwi_acquisition-HASC55APVARIANTEchoTime,1,1,36,43,36,0.089,0.00069,90.0,True,1,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0
+,,,,datatype-dwi_suffix-dwi_acquisition-HASC55AP__1,datatype-dwi_suffix-dwi_acquisition-HASC55AP,1,1,36,43,36,0.04,0.00069,90.0,True,1,dwi,36,61.0,False,,j,4.2,0.072,False,5.0,5.0,5.0
+,,,,datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4__1,datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4,1,3,36,43,36,0.004,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0
+,,,,datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4__1,datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4,1,3,36,43,36,0.006,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,False,5.0,5.0,5.0
+,,,,datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4__1,datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4,1,3,36,43,36,,,60.0,False,3,fmap,0,1.0,False,0.75,j-,1.5,,True,5.0,5.0,5.0
 ,,,,datatype-fmap_direction-PA_fmap-epi_suffix-epi__1,datatype-fmap_direction-PA_fmap-epi_suffix-epi,1,2,36,43,36,0.089,0.00069,90.0,False,3,fmap,36,1.0,False,,j-,4.2,0.072,False,5.0,5.0,5.0
-,,,acquisition-VARIANTIsUsed_datatype-fmap_direction-PA_fmap-epi_suffix-epi,datatype-fmap_direction-PA_fmap-epi_suffix-epi__2,datatype-fmap_direction-PA_fmap-epi_suffix-epi,2,1,36,43,36,0.089,0.00069,90.0,False,3,fmap,36,1.0,False,,j-,4.2,0.072,True,5.0,5.0,5.0
+,,,datatype-fmap_direction-PA_fmap-epi_suffix-epi_acquisition-VARIANTIsUsed,datatype-fmap_direction-PA_fmap-epi_suffix-epi__2,datatype-fmap_direction-PA_fmap-epi_suffix-epi,2,1,36,43,36,0.089,0.00069,90.0,False,3,fmap,36,1.0,False,,j-,4.2,0.072,True,5.0,5.0,5.0
 ,,,,datatype-func_suffix-bold_task-rest__1,datatype-func_suffix-bold_task-rest,1,1,36,43,36,0.089,0.00069,70.0,True,1,func,36,61.0,False,,j,1.0,,False,5.0,5.0,5.0
diff --git a/cubids/tests/test_apply.py b/cubids/tests/test_apply.py
index b4c0754..991954e 100644
--- a/cubids/tests/test_apply.py
+++ b/cubids/tests/test_apply.py
@@ -212,7 +212,7 @@ def summary_data():
     dict_ = {
         "RenameEntitySet": [
             None,
-            "acquisition-VAR_datatype-dwi_direction-AP_run-01_suffix-dwi",
+            "datatype-dwi_direction-AP_run-01_suffix-dwi_acquisition-VAR",
             None,
             None,
         ],
diff --git a/cubids/tests/test_bond.py b/cubids/tests/test_bond.py
index 26a44b0..68f4d4a 100644
--- a/cubids/tests/test_bond.py
+++ b/cubids/tests/test_bond.py
@@ -24,22 +24,20 @@ from cubids.tests.utils import (
     get_data,
 )
 from cubids.validator import (
-    bids_validator_version,
     build_validator_call,
     extract_summary_info,
     get_bids_validator_version,
     parse_validator_output,
     run_validator,
-    update_dataset_description,
 )
 
 COMPLETE_KEY_GROUPS = [
-    "acquisition-HASC55AP_datatype-dwi_suffix-dwi",
-    "acquisition-v4_datatype-fmap_fmap-magnitude1_suffix-magnitude1",
-    "acquisition-v4_datatype-fmap_fmap-magnitude2_suffix-magnitude2",
-    "acquisition-v4_datatype-fmap_fmap-phasediff_suffix-phasediff",
     "datatype-anat_suffix-T1w",
+    "datatype-dwi_suffix-dwi_acquisition-HASC55AP",
     "datatype-fmap_direction-PA_fmap-epi_suffix-epi",
+    "datatype-fmap_fmap-magnitude1_suffix-magnitude1_acquisition-v4",
+    "datatype-fmap_fmap-magnitude2_suffix-magnitude2_acquisition-v4",
+    "datatype-fmap_fmap-phasediff_suffix-phasediff_acquisition-v4",
     "datatype-func_suffix-bold_task-rest",
 ]
 
@@ -440,16 +438,16 @@ def test_tsv_merge_no_datalad(tmp_path):
     summary_df = pd.read_table(original_summary_tsv)
     (fa_nan_dwi_row,) = np.flatnonzero(
         np.isnan(summary_df.FlipAngle)
-        & summary_df.EntitySet.str.fullmatch("acquisition-HASC55AP_datatype-dwi_suffix-dwi")
+        & summary_df.EntitySet.str.fullmatch("datatype-dwi_suffix-dwi_acquisition-HASC55AP")
     )
     # Find the dwi with and EchoTime ==
     (complete_dwi_row,) = np.flatnonzero(
-        summary_df.EntitySet.str.fullmatch("acquisition-HASC55AP_datatype-dwi_suffix-dwi")
+        summary_df.EntitySet.str.fullmatch("datatype-dwi_suffix-dwi_acquisition-HASC55AP")
         & (summary_df.FlipAngle == 90.0)
         & (summary_df.EchoTime > 0.05)
     )
     (cant_merge_echotime_dwi_row,) = np.flatnonzero(
-        summary_df.EntitySet.str.fullmatch("acquisition-HASC55AP_datatype-dwi_suffix-dwi")
+        summary_df.EntitySet.str.fullmatch("datatype-dwi_suffix-dwi_acquisition-HASC55AP")
         & (summary_df.FlipAngle == 90.0)
         & (summary_df.EchoTime < 0.05)
     )
@@ -508,45 +506,41 @@ def test_tsv_merge_changes(tmp_path):
             assert str(orig.loc[row, "RenameEntitySet"]) != "nan"
 
     # TESTING RENAMES GOT APPLIED
-    applied = pd.read_table(str(tmp_path / "unmodified_summary.tsv"))
-    applied_f = pd.read_table(str(tmp_path / "unmodified_files.tsv"))
+    applied_summary_df = pd.read_table(str(tmp_path / "unmodified_summary.tsv"))
+    applied_files_df = pd.read_table(str(tmp_path / "unmodified_files.tsv"))
 
     # Check for inconsistencies between FilePath and KeyParamGroup
     odd = []
-    for row in range(len(applied_f)):
-        if (
-            "VARIANT" in applied_f.loc[row, "FilePath"]
-            and "VARIANT" not in applied_f.loc[row, "KeyParamGroup"]
-        ):
-            odd.append((applied_f.loc[row, "FilePath"]))
+    for _, row in applied_files_df.iterrows():
+        if "VARIANT" in row["FilePath"] and "VARIANT" not in row["KeyParamGroup"]:
+            odd.append(row["FilePath"])
 
     # Track KeyParamGroups for files with inconsistencies
     occurrences = {}
-    for row in range(len(applied_f)):
-        if applied_f.loc[row, "FilePath"] in odd:
-            if applied_f.loc[row, "FilePath"] in occurrences.keys():
-                occurrences[applied_f.loc[row, "FilePath"]].append(
-                    applied_f.loc[row, "KeyParamGroup"]
-                )
+    for _, row in applied_files_df.iterrows():
+        fp = row["FilePath"]
+        if fp in odd:
+            if fp in occurrences.keys():
+                occurrences[fp].append(row["KeyParamGroup"])
             else:
-                occurrences[applied_f.loc[row, "FilePath"]] = [applied_f.loc[row, "KeyParamGroup"]]
+                occurrences[fp] = [row["KeyParamGroup"]]
 
     # Ensure no rows were lost
-    assert len(orig) == len(applied)
+    assert len(orig) == len(applied_summary_df)
 
-    # Check for exact matches in EntitySet
+    # Check that all the RenameEntitySet values are in the renamed entity sets
     renamed = True
-    new_keys = applied["EntitySet"].tolist()
-    for row in range(len(orig)):
-        if orig.loc[row, "Modality"] != "fmap":
-            if (
-                str(orig.loc[row, "RenameEntitySet"]) != "nan"
-                and str(orig.loc[row, "RenameEntitySet"]) not in new_keys
-            ):
-                print(orig.loc[row, "RenameEntitySet"])
-                renamed = False
+    new_keys = applied_summary_df["EntitySet"].tolist()
+    for _, row in orig.iterrows():
+        if row["Modality"] == "fmap":
+            # Ignore field map renaming
+            continue
+
+        res = row["RenameEntitySet"]
+        if isinstance(res, str) and (res != "nan") and (res not in new_keys):
+            renamed = False
 
-    assert renamed
+    assert renamed, orig["RenameEntitySet"].tolist()
 
     # will no longer be equal because of auto rename!
     assert file_hash(original_summary_tsv) != file_hash(tmp_path / "unmodified_summary.tsv")
@@ -555,16 +549,16 @@ def test_tsv_merge_changes(tmp_path):
     summary_df = pd.read_table(original_summary_tsv)
     (fa_nan_dwi_row,) = np.flatnonzero(
         np.isnan(summary_df.FlipAngle)
-        & summary_df.EntitySet.str.fullmatch("acquisition-HASC55AP_datatype-dwi_suffix-dwi")
+        & summary_df.EntitySet.str.fullmatch("datatype-dwi_suffix-dwi_acquisition-HASC55AP")
     )
     # Find the dwi with and EchoTime ==
     (complete_dwi_row,) = np.flatnonzero(
-        summary_df.EntitySet.str.fullmatch("acquisition-HASC55AP_datatype-dwi_suffix-dwi")
+        summary_df.EntitySet.str.fullmatch("datatype-dwi_suffix-dwi_acquisition-HASC55AP")
         & (summary_df.FlipAngle == 90.0)
         & (summary_df.EchoTime > 0.05)
     )
     (cant_merge_echotime_dwi_row,) = np.flatnonzero(
-        summary_df.EntitySet.str.fullmatch("acquisition-HASC55AP_datatype-dwi_suffix-dwi")
+        summary_df.EntitySet.str.fullmatch("datatype-dwi_suffix-dwi_acquisition-HASC55AP")
         & (summary_df.FlipAngle == 90.0)
         & (summary_df.EchoTime < 0.05)
     )
@@ -635,9 +629,9 @@ def test_merge_without_overwrite():
         "DwellTime": 2.6e-06,
         "EchoTime": 0.03,
         "EffectiveEchoSpacing": 0.000580013,
-        "FieldmapKey00": "acquisition-fMRI_datatype-fmap_direction-AP_fmap-epi_suffix-epi",
-        "FieldmapKey01": "acquisition-fMRI_datatype-fmap_direction-PA_fmap-epi_run-1_suffix-epi",
-        "FieldmapKey02": "acquisition-fMRI_datatype-fmap_direction-PA_fmap-epi_run-2_suffix-epi",
+        "FieldmapKey00": "datatype-fmap_direction-AP_fmap-epi_suffix-epi_acquisition-fMRI",
+        "FieldmapKey01": "datatype-fmap_direction-PA_fmap-epi_run-1_suffix-epi_acquisition-fMRI",
+        "FieldmapKey02": "datatype-fmap_direction-PA_fmap-epi_run-2_suffix-epi_acquisition-fMRI",
         "FieldmapKey03": np.nan,
         "FieldmapKey04": np.nan,
         "FieldmapKey05": np.nan,
diff --git a/cubids/tests/test_variants.py b/cubids/tests/test_variants.py
index c7f2b64..ef9aac7 100644
--- a/cubids/tests/test_variants.py
+++ b/cubids/tests/test_variants.py
@@ -49,8 +49,8 @@ def test_assign_variants_with_cluster_values(base_df):
     result = assign_variants(base_df, ["EchoTime"])
 
     # Check that variant names include cluster values
-    assert "acquisition-VARIANTEchoTimeC2_" in result.loc[1, "RenameEntitySet"]
-    assert "acquisition-VARIANTEchoTimeC3_" in result.loc[2, "RenameEntitySet"]
+    assert result.loc[1, "RenameEntitySet"].endswith("acquisition-VARIANTEchoTimeC2")
+    assert result.loc[2, "RenameEntitySet"].endswith("acquisition-VARIANTEchoTimeC3")
 
 
 def test_assign_variants_mixed_parameters(base_df):
@@ -64,8 +64,8 @@ def test_assign_variants_mixed_parameters(base_df):
     result = assign_variants(base_df, ["EchoTime", "FlipAngle"])
 
     # Check variant names include both cluster values and actual values
-    assert "acquisition-VARIANTEchoTimeC2FlipAngle75_" in result.loc[1, "RenameEntitySet"]
-    assert "acquisition-VARIANTEchoTimeC3FlipAngle60_" in result.loc[2, "RenameEntitySet"]
+    assert result.loc[1, "RenameEntitySet"].endswith("acquisition-VARIANTEchoTimeC2FlipAngle75")
+    assert result.loc[2, "RenameEntitySet"].endswith("acquisition-VARIANTEchoTimeC3FlipAngle60")
 
 
 def test_assign_variants_special_parameters(base_df):
@@ -78,6 +78,6 @@ def test_assign_variants_special_parameters(base_df):
     result = assign_variants(base_df, ["HasFieldmap", "UsedAsFieldmap"])
 
     # Check special parameter handling
-    assert "acquisition-VARIANTOther_" in result.loc[0, "RenameEntitySet"]
-    assert "acquisition-VARIANTNoFmapIsUsed_" in result.loc[1, "RenameEntitySet"]
-    assert "acquisition-VARIANTNoFmap_" in result.loc[2, "RenameEntitySet"]
+    assert result.loc[0, "RenameEntitySet"].endswith("acquisition-VARIANTOther")
+    assert result.loc[1, "RenameEntitySet"].endswith("acquisition-VARIANTNoFmapIsUsed")
+    assert result.loc[2, "RenameEntitySet"].endswith("acquisition-VARIANTNoFmap")