diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5278973e3914f46b3c25b52d2d217fc857fcddd4..02696575bd22fb43bd2beff87c8ef0ae6439b40b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -110,8 +110,8 @@ Coq development, but not every API-breaking change is listed.  Changes marked
   `op_singleton` -> `singleton_op`, `core_singleton` -> `singleton_core`,
   `discrete_fun_op_singleton` -> `discrete_fun_singleton_op`,
   `discrete_fun_core_singleton` -> `discrete_fun_singleton_core`,
-  `list_core_singletonM` -> `list_singletonM_core`,
-  `list_op_singletonM` -> `list_singletonM_op`,
+  `list_core_singletonM` -> `list_singleton_core`,
+  `list_op_singletonM` -> `list_singleton_op`,
   `sts_op_auth_frag` -> `sts_auth_frag_op`,
   `sts_op_auth_frag_up` -> `sts_auth_frag_up_op`,
   `sts_op_frag` -> `sts_frag_op`,
@@ -124,11 +124,29 @@ Coq development, but not every API-breaking change is listed.  Changes marked
   `list_lookup_singletonM_ne` -> `list_lookup_singleton_ne`,
   `list_singletonM_validN` -> `list_singleton_validN`,
   `list_singletonM_length` -> `list_singleton_length`,
-  `list_singletonM_core` -> `list_singleton_core`,
-  `list_singletonM_op` -> `list_singleton_op`,
   `list_alter_singletonM` -> `list_alter_singleton`,
   `list_singletonM_included` -> `list_singleton_included`.
 
+The following `sed` script should perform most of the renaming (FIXME: incomplete)
+(on macOS, replace `sed` by `gsed`, installed via e.g. `brew install gnu-sed`):
+```
+sed -i -E '
+# f_op/f_core renames
+s/\b(op|core)_singleton\b/singleton_\1/g
+s/\bdiscrete_fun_(op|core)_singleton\b/discrete_fun_singleton_\1/g
+s/\blist_(op|core)_singletonM\b/list_singleton_\1/g
+s/\bsts_op_(auth_frag|auth_frag_up|frag)\b/sts_\1_op/g
+s/\blist_op_length\b/list_length_op/g
+# list singleton renames
+s/\belem_of_list_singletonM\b/elem_of_list_singleton/g
+s/\blist_lookup_singletonM(|_lt|_gt|_ne)\b/list_lookup_singleton\1/g
+s/\blist_singletonM_(validN|length)\b/list_singleton_\1/g
+s/\blist_alter_singletonM\b/list_alter_singleton/g
+s/\blist_singletonM_included\b/list_singleton_included/g
+' $(find theories -name "*.v")
+```
+
+
 **Changes in heap_lang:**
 
 * Added a fraction to the heap_lang `array` assertion.