diff --git a/PROMS/Formats/fmtall/BVPSAOPall.xml b/PROMS/Formats/fmtall/BVPSAOPall.xml
index b2beda6f..eb9702ca 100644
Binary files a/PROMS/Formats/fmtall/BVPSAOPall.xml and b/PROMS/Formats/fmtall/BVPSAOPall.xml differ
diff --git a/PROMS/Formats/fmtall/BVPSSAMGall.xml b/PROMS/Formats/fmtall/BVPSSAMGall.xml
index cc6239ca..e9c68548 100644
Binary files a/PROMS/Formats/fmtall/BVPSSAMGall.xml and b/PROMS/Formats/fmtall/BVPSSAMGall.xml differ
diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/RODefFrm.cs b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/RODefFrm.cs
index 8c2a5c57..9efa06a8 100644
--- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/RODefFrm.cs
+++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/RODefFrm.cs
@@ -1251,6 +1251,9 @@ namespace ROEditor
 				{
 					tbMenuVal.Text = tbMenuVal.Text.Replace($"<{origname}>", $"<{newname}>");
 					tbRetVal.Text = tbRetVal.Text.Replace($"<{origname}>", $"<{newname}>");
+					//CSM-C2024-035 This is needed for items like Setpoint Value that may have commas with field lengths in them
+					tbMenuVal.Text = tbMenuVal.Text.Replace($"<{origname},", $"<{newname},");
+					tbRetVal.Text = tbRetVal.Text.Replace($"<{origname},", $"<{newname},");
 				}
 			}
 			else 
diff --git a/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs b/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs
index d80335e4..2a5d8c8b 100644
--- a/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs
+++ b/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs
@@ -2667,8 +2667,9 @@ namespace RODBInterface
 					bool isused = RODB_CheckForStandardName(oldname);
 					if (isused == true)
 					{
-						MessageBox.Show("The field name is used to define new Setpoints or Graphics Database.\n The update will be for this local (database) group only.", "Field name modification.");
+                        DialogResult result = MessageBox.Show($"The field name is used to define new Setpoints or Graphics Database.\n\n The update will be for this local (database) group only.\n\n Select OK to update local definition for all items in that table ({GetTopParentName(myelem)}).", "Field name modification.", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
 						changegeneric = false;
+						if(result == DialogResult.Cancel) return false;
 					}
 				}