diff --git a/VERSION-TODO.md b/VERSION-TODO.md
index a473fff00..4e5a034a1 100644
--- a/VERSION-TODO.md
+++ b/VERSION-TODO.md
@@ -228,6 +228,10 @@ Please give feedback on the upcoming changes if you have concerns about breaking
     unescape the text. **This is needed to properly handle anchor escaping.**
   * Fix: `PegdownOptionsAdapter` to set `WikiLinkExtension.ALLOW_ANCHORS` to `true` for pegdown
     compatibility
+* Fix: deprecate `CoreNodeFormatter.ATTRIBUTE_UNIQUIFICATION_ID_MAP` and move declaration to
+  `Formatter.ATTRIBUTE_UNIQUIFICATION_ID_MAP`
+* Fix: deprecate `CoreNodeFormatter.UNIQUIFICATION_ID_MAP` and move declaration to
+  `Formatter.UNIQUIFICATION_ID_MAP`
 * Fix: wiki links should not be wrapped during formatting.
   * Add: WikiLink formatter extension and tests
   * Add: WikiLink translating formatter functionality and tests
diff --git a/flexmark/src/main/java/com/vladsch/flexmark/formatter/internal/CoreNodeFormatter.java b/flexmark/src/main/java/com/vladsch/flexmark/formatter/internal/CoreNodeFormatter.java
index f96be5848..bc8d99ad2 100644
--- a/flexmark/src/main/java/com/vladsch/flexmark/formatter/internal/CoreNodeFormatter.java
+++ b/flexmark/src/main/java/com/vladsch/flexmark/formatter/internal/CoreNodeFormatter.java
@@ -39,6 +39,19 @@
 
 @SuppressWarnings("WeakerAccess")
 public class CoreNodeFormatter extends NodeRepositoryFormatter<ReferenceRepository, Reference, RefNode> {
+    /**
+     * 2020-04-10
+     * @deprecated use {@link Formatter#UNIQUIFICATION_MAP}
+     */
+    @Deprecated
+    final public static DataKey<Map<String, String>> UNIQUIFICATION_MAP = Formatter.UNIQUIFICATION_MAP;
+    /**
+     * 2020-04-10
+     * @deprecated use {@link Formatter#ATTRIBUTE_UNIQUIFICATION_ID_MAP}
+     */
+    @Deprecated
+    final public static DataKey<Map<String, String>> ATTRIBUTE_UNIQUIFICATION_ID_MAP = Formatter.ATTRIBUTE_UNIQUIFICATION_ID_MAP;
+    
     public static class Factory implements NodeFormatterFactory {
         @NotNull
         @Override