EPA : Rename AddApiAnn to AddEpAnn

As port of the process of migrating naming from API Annotations to
exact print annotations (EPA)

Follow-up from !2418, see #19579

5 files changed, 121 insertions, 121 deletions

diff --git a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
index 9c6885620d..49f96bb5ba 100644
--- a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
@@ -9,8 +9,8 @@
     { DumpParsedAst.hs:1:1 }
     (UnchangedAnchor))
    (AnnsModule
-    [(AddApiAnn AnnModule (AR { DumpParsedAst.hs:5:1-6 }))
-    ,(AddApiAnn AnnWhere (AR { DumpParsedAst.hs:5:22-26 }))]
+    [(AddEpAnn AnnModule (AR { DumpParsedAst.hs:5:1-6 }))
+    ,(AddEpAnn AnnWhere (AR { DumpParsedAst.hs:5:22-26 }))]
     (AnnList
      (Nothing)
      (Nothing)
@@ -76,8 +76,8 @@
        (Anchor
         { DumpParsedAst.hs:8:1-30 }
         (UnchangedAnchor))
-       [(AddApiAnn AnnData (AR { DumpParsedAst.hs:8:1-4 }))
-       ,(AddApiAnn AnnEqual (AR { DumpParsedAst.hs:8:12 }))]
+       [(AddEpAnn AnnData (AR { DumpParsedAst.hs:8:1-4 }))
+       ,(AddEpAnn AnnEqual (AR { DumpParsedAst.hs:8:12 }))]
        (AnnComments
         []))
       (L
@@ -93,8 +93,8 @@
         (Anchor
          { DumpParsedAst.hs:8:1-30 }
          (UnchangedAnchor))
-        [(AddApiAnn AnnData (AR { DumpParsedAst.hs:8:1-4 }))
-        ,(AddApiAnn AnnEqual (AR { DumpParsedAst.hs:8:12 }))]
+        [(AddEpAnn AnnData (AR { DumpParsedAst.hs:8:1-4 }))
+        ,(AddEpAnn AnnEqual (AR { DumpParsedAst.hs:8:12 }))]
         (AnnComments
          []))
        (DataType)
@@ -188,12 +188,12 @@
         (Anchor
          { DumpParsedAst.hs:10:1-45 }
          (UnchangedAnchor))
-        [(AddApiAnn AnnType (AR { DumpParsedAst.hs:10:1-4 }))
-        ,(AddApiAnn AnnFamily (AR { DumpParsedAst.hs:10:6-11 }))
-        ,(AddApiAnn AnnDcolon (AR { DumpParsedAst.hs:10:32-33 }))
-        ,(AddApiAnn AnnWhere (AR { DumpParsedAst.hs:10:41-45 }))
-        ,(AddApiAnn AnnCloseP (AR { DumpParsedAst.hs:10:30 }))
-        ,(AddApiAnn AnnOpenP (AR { DumpParsedAst.hs:10:20 }))]
+        [(AddEpAnn AnnType (AR { DumpParsedAst.hs:10:1-4 }))
+        ,(AddEpAnn AnnFamily (AR { DumpParsedAst.hs:10:6-11 }))
+        ,(AddEpAnn AnnDcolon (AR { DumpParsedAst.hs:10:32-33 }))
+        ,(AddEpAnn AnnWhere (AR { DumpParsedAst.hs:10:41-45 }))
+        ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:10:30 }))
+        ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:10:20 }))]
         (AnnComments
          []))
        (ClosedTypeFamily
@@ -205,7 +205,7 @@
              (Anchor
               { DumpParsedAst.hs:11:3-36 }
               (UnchangedAnchor))
-             [(AddApiAnn AnnEqual (AR { DumpParsedAst.hs:11:19 }))]
+             [(AddEpAnn AnnEqual (AR { DumpParsedAst.hs:11:19 }))]
              (AnnComments
               []))
             (L
@@ -340,7 +340,7 @@
              (Anchor
               { DumpParsedAst.hs:12:3-24 }
               (UnchangedAnchor))
-             [(AddApiAnn AnnEqual (AR { DumpParsedAst.hs:12:19 }))]
+             [(AddEpAnn AnnEqual (AR { DumpParsedAst.hs:12:19 }))]
              (AnnComments
               []))
             (L
@@ -357,9 +357,9 @@
                  (Anchor
                   { DumpParsedAst.hs:12:10 }
                   (UnchangedAnchor))
-                 [(AddApiAnn AnnSimpleQuote (AR { DumpParsedAst.hs:12:10 }))
-                 ,(AddApiAnn AnnOpenS (AR { DumpParsedAst.hs:12:11 }))
-                 ,(AddApiAnn AnnCloseS (AR { DumpParsedAst.hs:12:12 }))]
+                 [(AddEpAnn AnnSimpleQuote (AR { DumpParsedAst.hs:12:10 }))
+                 ,(AddEpAnn AnnOpenS (AR { DumpParsedAst.hs:12:11 }))
+                 ,(AddEpAnn AnnCloseS (AR { DumpParsedAst.hs:12:12 }))]
                  (AnnComments
                   []))
                 (IsPromoted)
@@ -394,9 +394,9 @@
             (Anchor
              { DumpParsedAst.hs:10:20-30 }
              (UnchangedAnchor))
-            [(AddApiAnn AnnDcolon (AR { DumpParsedAst.hs:10:24-25 }))
-            ,(AddApiAnn AnnOpenP (AR { DumpParsedAst.hs:10:20 }))
-            ,(AddApiAnn AnnCloseP (AR { DumpParsedAst.hs:10:30 }))]
+            [(AddEpAnn AnnDcolon (AR { DumpParsedAst.hs:10:24-25 }))
+            ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:10:20 }))
+            ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:10:30 }))]
             (AnnComments
              []))
            (())
@@ -469,10 +469,10 @@
        (Anchor
         { DumpParsedAst.hs:15:1-29 }
         (UnchangedAnchor))
-       [(AddApiAnn AnnData (AR { DumpParsedAst.hs:15:1-4 }))
-       ,(AddApiAnn AnnEqual (AR { DumpParsedAst.hs:15:19 }))
-       ,(AddApiAnn AnnCloseP (AR { DumpParsedAst.hs:15:17 }))
-       ,(AddApiAnn AnnOpenP (AR { DumpParsedAst.hs:15:10 }))]
+       [(AddEpAnn AnnData (AR { DumpParsedAst.hs:15:1-4 }))
+       ,(AddEpAnn AnnEqual (AR { DumpParsedAst.hs:15:19 }))
+       ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:15:17 }))
+       ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:15:10 }))]
        (AnnComments
         []))
       (L
@@ -503,9 +503,9 @@
            (Anchor
             { DumpParsedAst.hs:15:10-17 }
             (UnchangedAnchor))
-           [(AddApiAnn AnnDcolon (AR { DumpParsedAst.hs:15:13-14 }))
-           ,(AddApiAnn AnnOpenP (AR { DumpParsedAst.hs:15:10 }))
-           ,(AddApiAnn AnnCloseP (AR { DumpParsedAst.hs:15:17 }))]
+           [(AddEpAnn AnnDcolon (AR { DumpParsedAst.hs:15:13-14 }))
+           ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:15:10 }))
+           ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:15:17 }))]
            (AnnComments
             []))
           (())
@@ -534,10 +534,10 @@
         (Anchor
          { DumpParsedAst.hs:15:1-29 }
          (UnchangedAnchor))
-        [(AddApiAnn AnnData (AR { DumpParsedAst.hs:15:1-4 }))
-        ,(AddApiAnn AnnEqual (AR { DumpParsedAst.hs:15:19 }))
-        ,(AddApiAnn AnnCloseP (AR { DumpParsedAst.hs:15:17 }))
-        ,(AddApiAnn AnnOpenP (AR { DumpParsedAst.hs:15:10 }))]
+        [(AddEpAnn AnnData (AR { DumpParsedAst.hs:15:1-4 }))
+        ,(AddEpAnn AnnEqual (AR { DumpParsedAst.hs:15:19 }))
+        ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:15:17 }))
+        ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:15:10 }))]
         (AnnComments
          []))
        (DataType)
@@ -634,14 +634,14 @@
         (Anchor
          { DumpParsedAst.hs:17:1-54 }
          (UnchangedAnchor))
-        [(AddApiAnn AnnType (AR { DumpParsedAst.hs:17:1-4 }))
-        ,(AddApiAnn AnnFamily (AR { DumpParsedAst.hs:17:6-11 }))
-        ,(AddApiAnn AnnDcolon (AR { DumpParsedAst.hs:17:42-43 }))
-        ,(AddApiAnn AnnWhere (AR { DumpParsedAst.hs:17:50-54 }))
-        ,(AddApiAnn AnnCloseP (AR { DumpParsedAst.hs:17:23 }))
-        ,(AddApiAnn AnnOpenP (AR { DumpParsedAst.hs:17:16 }))
-        ,(AddApiAnn AnnCloseP (AR { DumpParsedAst.hs:17:40 }))
-        ,(AddApiAnn AnnOpenP (AR { DumpParsedAst.hs:17:25 }))]
+        [(AddEpAnn AnnType (AR { DumpParsedAst.hs:17:1-4 }))
+        ,(AddEpAnn AnnFamily (AR { DumpParsedAst.hs:17:6-11 }))
+        ,(AddEpAnn AnnDcolon (AR { DumpParsedAst.hs:17:42-43 }))
+        ,(AddEpAnn AnnWhere (AR { DumpParsedAst.hs:17:50-54 }))
+        ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:17:23 }))
+        ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:17:16 }))
+        ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:17:40 }))
+        ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:17:25 }))]
         (AnnComments
          []))
        (ClosedTypeFamily
@@ -653,7 +653,7 @@
              (Anchor
               { DumpParsedAst.hs:18:3-30 }
               (UnchangedAnchor))
-             [(AddApiAnn AnnEqual (AR { DumpParsedAst.hs:18:17 }))]
+             [(AddEpAnn AnnEqual (AR { DumpParsedAst.hs:18:17 }))]
              (AnnComments
               []))
             (L
@@ -798,9 +798,9 @@
             (Anchor
              { DumpParsedAst.hs:17:16-23 }
              (UnchangedAnchor))
-            [(AddApiAnn AnnDcolon (AR { DumpParsedAst.hs:17:19-20 }))
-            ,(AddApiAnn AnnOpenP (AR { DumpParsedAst.hs:17:16 }))
-            ,(AddApiAnn AnnCloseP (AR { DumpParsedAst.hs:17:23 }))]
+            [(AddEpAnn AnnDcolon (AR { DumpParsedAst.hs:17:19-20 }))
+            ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:17:16 }))
+            ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:17:23 }))]
             (AnnComments
              []))
            (())
@@ -830,9 +830,9 @@
             (Anchor
              { DumpParsedAst.hs:17:25-40 }
              (UnchangedAnchor))
-            [(AddApiAnn AnnDcolon (AR { DumpParsedAst.hs:17:28-29 }))
-            ,(AddApiAnn AnnOpenP (AR { DumpParsedAst.hs:17:25 }))
-            ,(AddApiAnn AnnCloseP (AR { DumpParsedAst.hs:17:40 }))]
+            [(AddEpAnn AnnDcolon (AR { DumpParsedAst.hs:17:28-29 }))
+            ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:17:25 }))
+            ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:17:40 }))]
             (AnnComments
              []))
            (())
@@ -954,7 +954,7 @@
                  (UnchangedAnchor))
                 (GrhsAnn
                  (Nothing)
-                 (AddApiAnn AnnEqual (AR { DumpParsedAst.hs:20:6 })))
+                 (AddEpAnn AnnEqual (AR { DumpParsedAst.hs:20:6 })))
                 (AnnComments
                  []))
                []
diff --git a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
index cbed41c027..81e618572e 100644
--- a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
@@ -293,9 +293,9 @@
               (Anchor
                { DumpRenamedAst.hs:12:20-30 }
                (UnchangedAnchor))
-              [(AddApiAnn AnnDcolon (AR { DumpRenamedAst.hs:12:24-25 }))
-              ,(AddApiAnn AnnOpenP (AR { DumpRenamedAst.hs:12:20 }))
-              ,(AddApiAnn AnnCloseP (AR { DumpRenamedAst.hs:12:30 }))]
+              [(AddEpAnn AnnDcolon (AR { DumpRenamedAst.hs:12:24-25 }))
+              ,(AddEpAnn AnnOpenP (AR { DumpRenamedAst.hs:12:20 }))
+              ,(AddEpAnn AnnCloseP (AR { DumpRenamedAst.hs:12:30 }))]
               (AnnComments
                []))
              (())
@@ -453,7 +453,7 @@
                  (Anchor
                   { DumpRenamedAst.hs:19:23 }
                   (UnchangedAnchor))
-                 [(AddApiAnn AnnDcolon (AR { DumpRenamedAst.hs:19:25-26 }))]
+                 [(AddEpAnn AnnDcolon (AR { DumpRenamedAst.hs:19:25-26 }))]
                  (AnnComments
                   []))
                 (L
@@ -733,9 +733,9 @@
              (Anchor
               { DumpRenamedAst.hs:22:10-17 }
               (UnchangedAnchor))
-             [(AddApiAnn AnnDcolon (AR { DumpRenamedAst.hs:22:13-14 }))
-             ,(AddApiAnn AnnOpenP (AR { DumpRenamedAst.hs:22:10 }))
-             ,(AddApiAnn AnnCloseP (AR { DumpRenamedAst.hs:22:17 }))]
+             [(AddEpAnn AnnDcolon (AR { DumpRenamedAst.hs:22:13-14 }))
+             ,(AddEpAnn AnnOpenP (AR { DumpRenamedAst.hs:22:10 }))
+             ,(AddEpAnn AnnCloseP (AR { DumpRenamedAst.hs:22:17 }))]
              (AnnComments
               []))
             (())
@@ -915,9 +915,9 @@
               (Anchor
                { DumpRenamedAst.hs:24:16-23 }
                (UnchangedAnchor))
-              [(AddApiAnn AnnDcolon (AR { DumpRenamedAst.hs:24:19-20 }))
-              ,(AddApiAnn AnnOpenP (AR { DumpRenamedAst.hs:24:16 }))
-              ,(AddApiAnn AnnCloseP (AR { DumpRenamedAst.hs:24:23 }))]
+              [(AddEpAnn AnnDcolon (AR { DumpRenamedAst.hs:24:19-20 }))
+              ,(AddEpAnn AnnOpenP (AR { DumpRenamedAst.hs:24:16 }))
+              ,(AddEpAnn AnnCloseP (AR { DumpRenamedAst.hs:24:23 }))]
               (AnnComments
                []))
              (())
@@ -939,9 +939,9 @@
               (Anchor
                { DumpRenamedAst.hs:24:25-40 }
                (UnchangedAnchor))
-              [(AddApiAnn AnnDcolon (AR { DumpRenamedAst.hs:24:28-29 }))
-              ,(AddApiAnn AnnOpenP (AR { DumpRenamedAst.hs:24:25 }))
-              ,(AddApiAnn AnnCloseP (AR { DumpRenamedAst.hs:24:40 }))]
+              [(AddEpAnn AnnDcolon (AR { DumpRenamedAst.hs:24:28-29 }))
+              ,(AddEpAnn AnnOpenP (AR { DumpRenamedAst.hs:24:25 }))
+              ,(AddEpAnn AnnCloseP (AR { DumpRenamedAst.hs:24:40 }))]
               (AnnComments
                []))
              (())
@@ -1057,9 +1057,9 @@
                      (AnnList
                       (Nothing)
                       (Just
-                       (AddApiAnn AnnOpenP (AR { DumpRenamedAst.hs:8:18 })))
+                       (AddEpAnn AnnOpenP (AR { DumpRenamedAst.hs:8:18 })))
                       (Just
-                       (AddApiAnn AnnCloseP (AR { DumpRenamedAst.hs:8:23 })))
+                       (AddEpAnn AnnCloseP (AR { DumpRenamedAst.hs:8:23 })))
                       []
                       [])
                      (AnnComments
diff --git a/testsuite/tests/parser/should_compile/KindSigs.stderr b/testsuite/tests/parser/should_compile/KindSigs.stderr
index 12a15b02f1..ca63447f51 100644
--- a/testsuite/tests/parser/should_compile/KindSigs.stderr
+++ b/testsuite/tests/parser/should_compile/KindSigs.stderr
@@ -9,8 +9,8 @@
     { KindSigs.hs:1:1 }
     (UnchangedAnchor))
    (AnnsModule
-    [(AddApiAnn AnnModule (AR { KindSigs.hs:6:1-6 }))
-    ,(AddApiAnn AnnWhere (AR { KindSigs.hs:6:17-21 }))]
+    [(AddEpAnn AnnModule (AR { KindSigs.hs:6:1-6 }))
+    ,(AddEpAnn AnnWhere (AR { KindSigs.hs:6:17-21 }))]
     (AnnList
      (Nothing)
      (Nothing)
@@ -78,9 +78,9 @@
         (Anchor
          { KindSigs.hs:11:1-23 }
          (UnchangedAnchor))
-        [(AddApiAnn AnnType (AR { KindSigs.hs:11:1-4 }))
-        ,(AddApiAnn AnnFamily (AR { KindSigs.hs:11:6-11 }))
-        ,(AddApiAnn AnnWhere (AR { KindSigs.hs:11:19-23 }))]
+        [(AddEpAnn AnnType (AR { KindSigs.hs:11:1-4 }))
+        ,(AddEpAnn AnnFamily (AR { KindSigs.hs:11:6-11 }))
+        ,(AddEpAnn AnnWhere (AR { KindSigs.hs:11:19-23 }))]
         (AnnComments
          []))
        (ClosedTypeFamily
@@ -92,7 +92,7 @@
              (Anchor
               { KindSigs.hs:12:3-21 }
               (UnchangedAnchor))
-             [(AddApiAnn AnnEqual (AR { KindSigs.hs:12:9 }))]
+             [(AddEpAnn AnnEqual (AR { KindSigs.hs:12:9 }))]
              (AnnComments
               []))
             (L
@@ -125,7 +125,7 @@
                (Anchor
                 { KindSigs.hs:12:11-13 }
                 (UnchangedAnchor))
-               [(AddApiAnn AnnDcolon (AR { KindSigs.hs:12:15-16 }))]
+               [(AddEpAnn AnnDcolon (AR { KindSigs.hs:12:15-16 }))]
                (AnnComments
                 []))
               (L
@@ -202,8 +202,8 @@
        (Anchor
         { KindSigs.hs:15:1-51 }
         (UnchangedAnchor))
-       [(AddApiAnn AnnType (AR { KindSigs.hs:15:1-4 }))
-       ,(AddApiAnn AnnEqual (AR { KindSigs.hs:15:12 }))]
+       [(AddEpAnn AnnType (AR { KindSigs.hs:15:1-4 }))
+       ,(AddEpAnn AnnEqual (AR { KindSigs.hs:15:12 }))]
        (AnnComments
         []))
       (L
@@ -257,7 +257,7 @@
             (Anchor
              { KindSigs.hs:15:16-18 }
              (UnchangedAnchor))
-            [(AddApiAnn AnnDcolon (AR { KindSigs.hs:15:20-21 }))]
+            [(AddEpAnn AnnDcolon (AR { KindSigs.hs:15:20-21 }))]
             (AnnComments
              []))
            (L
@@ -320,7 +320,7 @@
             (Anchor
              { KindSigs.hs:15:35-41 }
              (UnchangedAnchor))
-            [(AddApiAnn AnnDcolon (AR { KindSigs.hs:15:43-44 }))]
+            [(AddEpAnn AnnDcolon (AR { KindSigs.hs:15:43-44 }))]
             (AnnComments
              []))
            (L
@@ -388,8 +388,8 @@
        (Anchor
         { KindSigs.hs:16:1-54 }
         (UnchangedAnchor))
-       [(AddApiAnn AnnType (AR { KindSigs.hs:16:1-4 }))
-       ,(AddApiAnn AnnEqual (AR { KindSigs.hs:16:13 }))]
+       [(AddEpAnn AnnType (AR { KindSigs.hs:16:1-4 }))
+       ,(AddEpAnn AnnEqual (AR { KindSigs.hs:16:13 }))]
        (AnnComments
         []))
       (L
@@ -443,7 +443,7 @@
             (Anchor
              { KindSigs.hs:16:18-20 }
              (UnchangedAnchor))
-            [(AddApiAnn AnnDcolon (AR { KindSigs.hs:16:22-23 }))]
+            [(AddEpAnn AnnDcolon (AR { KindSigs.hs:16:22-23 }))]
             (AnnComments
              []))
            (L
@@ -506,7 +506,7 @@
             (Anchor
              { KindSigs.hs:16:37-43 }
              (UnchangedAnchor))
-            [(AddApiAnn AnnDcolon (AR { KindSigs.hs:16:45-46 }))]
+            [(AddEpAnn AnnDcolon (AR { KindSigs.hs:16:45-46 }))]
             (AnnComments
              []))
            (L
@@ -574,8 +574,8 @@
        (Anchor
         { KindSigs.hs:19:1-26 }
         (UnchangedAnchor))
-       [(AddApiAnn AnnType (AR { KindSigs.hs:19:1-4 }))
-       ,(AddApiAnn AnnEqual (AR { KindSigs.hs:19:10 }))]
+       [(AddEpAnn AnnType (AR { KindSigs.hs:19:1-4 }))
+       ,(AddEpAnn AnnEqual (AR { KindSigs.hs:19:10 }))]
        (AnnComments
         []))
       (L
@@ -606,7 +606,7 @@
            (Anchor
             { KindSigs.hs:19:14-16 }
             (UnchangedAnchor))
-           [(AddApiAnn AnnDcolon (AR { KindSigs.hs:19:18-19 }))]
+           [(AddEpAnn AnnDcolon (AR { KindSigs.hs:19:18-19 }))]
            (AnnComments
             []))
           (L
@@ -656,7 +656,7 @@
         { KindSigs.hs:22:1-3 }
         (UnchangedAnchor))
        (AnnSig
-        (AddApiAnn AnnDcolon (AR { KindSigs.hs:22:5-6 }))
+        (AddEpAnn AnnDcolon (AR { KindSigs.hs:22:5-6 }))
         [])
        (AnnComments
         []))
@@ -705,7 +705,7 @@
                 (Anchor
                  { KindSigs.hs:22:9-11 }
                  (UnchangedAnchor))
-                [(AddApiAnn AnnDcolon (AR { KindSigs.hs:22:13-14 }))]
+                [(AddEpAnn AnnDcolon (AR { KindSigs.hs:22:13-14 }))]
                 (AnnComments
                  []))
                (L
@@ -786,7 +786,7 @@
                   (Anchor
                    { KindSigs.hs:22:34-35 }
                    (UnchangedAnchor))
-                  [(AddApiAnn AnnDcolon (AR { KindSigs.hs:22:37-38 }))]
+                  [(AddEpAnn AnnDcolon (AR { KindSigs.hs:22:37-38 }))]
                   (AnnComments
                    []))
                  (L
@@ -876,7 +876,7 @@
                  (UnchangedAnchor))
                 (GrhsAnn
                  (Nothing)
-                 (AddApiAnn AnnEqual (AR { KindSigs.hs:23:9 })))
+                 (AddEpAnn AnnEqual (AR { KindSigs.hs:23:9 })))
                 (AnnComments
                  []))
                []
@@ -918,8 +918,8 @@
        (Anchor
         { KindSigs.hs:26:1-29 }
         (UnchangedAnchor))
-       [(AddApiAnn AnnType (AR { KindSigs.hs:26:1-4 }))
-       ,(AddApiAnn AnnEqual (AR { KindSigs.hs:26:11 }))]
+       [(AddEpAnn AnnType (AR { KindSigs.hs:26:1-4 }))
+       ,(AddEpAnn AnnEqual (AR { KindSigs.hs:26:11 }))]
        (AnnComments
         []))
       (L
@@ -937,9 +937,9 @@
          (Anchor
           { KindSigs.hs:26:13 }
           (UnchangedAnchor))
-         [(AddApiAnn AnnSimpleQuote (AR { KindSigs.hs:26:13 }))
-         ,(AddApiAnn AnnOpenS (AR { KindSigs.hs:26:14 }))
-         ,(AddApiAnn AnnCloseS (AR { KindSigs.hs:26:29 }))]
+         [(AddEpAnn AnnSimpleQuote (AR { KindSigs.hs:26:13 }))
+         ,(AddEpAnn AnnOpenS (AR { KindSigs.hs:26:14 }))
+         ,(AddEpAnn AnnCloseS (AR { KindSigs.hs:26:29 }))]
          (AnnComments
           []))
         (IsPromoted)
@@ -950,7 +950,7 @@
             (Anchor
              { KindSigs.hs:26:16-19 }
              (UnchangedAnchor))
-            [(AddApiAnn AnnDcolon (AR { KindSigs.hs:26:21-22 }))]
+            [(AddEpAnn AnnDcolon (AR { KindSigs.hs:26:21-22 }))]
             (AnnComments
              []))
            (L
@@ -999,8 +999,8 @@
        (Anchor
         { KindSigs.hs:27:1-45 }
         (UnchangedAnchor))
-       [(AddApiAnn AnnType (AR { KindSigs.hs:27:1-4 }))
-       ,(AddApiAnn AnnEqual (AR { KindSigs.hs:27:12 }))]
+       [(AddEpAnn AnnType (AR { KindSigs.hs:27:1-4 }))
+       ,(AddEpAnn AnnEqual (AR { KindSigs.hs:27:12 }))]
        (AnnComments
         []))
       (L
@@ -1018,8 +1018,8 @@
          (Anchor
           { KindSigs.hs:27:14 }
           (UnchangedAnchor))
-         [(AddApiAnn AnnOpenS (AR { KindSigs.hs:27:14 }))
-         ,(AddApiAnn AnnCloseS (AR { KindSigs.hs:27:45 }))]
+         [(AddEpAnn AnnOpenS (AR { KindSigs.hs:27:14 }))
+         ,(AddEpAnn AnnCloseS (AR { KindSigs.hs:27:45 }))]
          (AnnComments
           []))
         (NotPromoted)
@@ -1038,7 +1038,7 @@
             (Anchor
              { KindSigs.hs:27:16-19 }
              (UnchangedAnchor))
-            [(AddApiAnn AnnDcolon (AR { KindSigs.hs:27:21-22 }))]
+            [(AddEpAnn AnnDcolon (AR { KindSigs.hs:27:21-22 }))]
             (AnnComments
              []))
            (L
@@ -1078,7 +1078,7 @@
             (Anchor
              { KindSigs.hs:27:30-34 }
              (UnchangedAnchor))
-            [(AddApiAnn AnnDcolon (AR { KindSigs.hs:27:36-37 }))]
+            [(AddEpAnn AnnDcolon (AR { KindSigs.hs:27:36-37 }))]
             (AnnComments
              []))
            (L
@@ -1127,8 +1127,8 @@
        (Anchor
         { KindSigs.hs:28:1-44 }
         (UnchangedAnchor))
-       [(AddApiAnn AnnType (AR { KindSigs.hs:28:1-4 }))
-       ,(AddApiAnn AnnEqual (AR { KindSigs.hs:28:14 }))]
+       [(AddEpAnn AnnType (AR { KindSigs.hs:28:1-4 }))
+       ,(AddEpAnn AnnEqual (AR { KindSigs.hs:28:14 }))]
        (AnnComments
         []))
       (L
@@ -1160,9 +1160,9 @@
          (Anchor
           { KindSigs.hs:28:16 }
           (UnchangedAnchor))
-         [(AddApiAnn AnnSimpleQuote (AR { KindSigs.hs:28:16 }))
-         ,(AddApiAnn AnnOpenP (AR { KindSigs.hs:28:17 }))
-         ,(AddApiAnn AnnCloseP (AR { KindSigs.hs:28:44 }))]
+         [(AddEpAnn AnnSimpleQuote (AR { KindSigs.hs:28:16 }))
+         ,(AddEpAnn AnnOpenP (AR { KindSigs.hs:28:17 }))
+         ,(AddEpAnn AnnCloseP (AR { KindSigs.hs:28:44 }))]
          (AnnComments
           []))
         [(L
@@ -1180,7 +1180,7 @@
             (Anchor
              { KindSigs.hs:28:19-29 }
              (UnchangedAnchor))
-            [(AddApiAnn AnnDcolon (AR { KindSigs.hs:28:31-32 }))]
+            [(AddEpAnn AnnDcolon (AR { KindSigs.hs:28:31-32 }))]
             (AnnComments
              []))
            (L
@@ -1190,8 +1190,8 @@
               (Anchor
                { KindSigs.hs:28:19 }
                (UnchangedAnchor))
-              [(AddApiAnn AnnOpenS (AR { KindSigs.hs:28:19 }))
-              ,(AddApiAnn AnnCloseS (AR { KindSigs.hs:28:29 }))]
+              [(AddEpAnn AnnOpenS (AR { KindSigs.hs:28:19 }))
+              ,(AddEpAnn AnnCloseS (AR { KindSigs.hs:28:29 }))]
               (AnnComments
                []))
              (NotPromoted)
@@ -1292,8 +1292,8 @@
        (Anchor
         { KindSigs.hs:31:1-31 }
         (UnchangedAnchor))
-       [(AddApiAnn AnnType (AR { KindSigs.hs:31:1-4 }))
-       ,(AddApiAnn AnnEqual (AR { KindSigs.hs:31:19 }))]
+       [(AddEpAnn AnnType (AR { KindSigs.hs:31:1-4 }))
+       ,(AddEpAnn AnnEqual (AR { KindSigs.hs:31:19 }))]
        (AnnComments
         []))
       (L
@@ -1311,7 +1311,7 @@
          (Anchor
           { KindSigs.hs:31:21-23 }
           (UnchangedAnchor))
-         [(AddApiAnn AnnDcolon (AR { KindSigs.hs:31:25-26 }))]
+         [(AddEpAnn AnnDcolon (AR { KindSigs.hs:31:25-26 }))]
          (AnnComments
           []))
         (L
@@ -1361,7 +1361,7 @@
         { KindSigs.hs:34:1-4 }
         (UnchangedAnchor))
        (AnnSig
-        (AddApiAnn AnnDcolon (AR { KindSigs.hs:34:6-7 }))
+        (AddEpAnn AnnDcolon (AR { KindSigs.hs:34:6-7 }))
         [])
        (AnnComments
         []))
@@ -1397,7 +1397,7 @@
               (Anchor
                { KindSigs.hs:34:10-13 }
                (UnchangedAnchor))
-              [(AddApiAnn AnnDcolon (AR { KindSigs.hs:34:15-16 }))]
+              [(AddEpAnn AnnDcolon (AR { KindSigs.hs:34:15-16 }))]
               (AnnComments
                []))
              (L
@@ -1480,7 +1480,7 @@
                  (UnchangedAnchor))
                 (GrhsAnn
                  (Nothing)
-                 (AddApiAnn AnnEqual (AR { KindSigs.hs:35:6 })))
+                 (AddEpAnn AnnEqual (AR { KindSigs.hs:35:6 })))
                 (AnnComments
                  []))
                []
diff --git a/testsuite/tests/parser/should_compile/T14189.stderr b/testsuite/tests/parser/should_compile/T14189.stderr
index d76f449c03..60e89f7aa7 100644
--- a/testsuite/tests/parser/should_compile/T14189.stderr
+++ b/testsuite/tests/parser/should_compile/T14189.stderr
@@ -116,9 +116,9 @@
                               { T14189.hs:6:33-40 }
                               (UnchangedAnchor)))
                             (Just
-                             (AddApiAnn AnnOpenC (AR { T14189.hs:6:31 })))
+                             (AddEpAnn AnnOpenC (AR { T14189.hs:6:31 })))
                             (Just
-                             (AddApiAnn AnnCloseC (AR { T14189.hs:6:42 })))
+                             (AddEpAnn AnnCloseC (AR { T14189.hs:6:42 })))
                             []
                             [])
                            (AnnComments
diff --git a/testsuite/tests/parser/should_compile/T15323.stderr b/testsuite/tests/parser/should_compile/T15323.stderr
index 1c7fdc68c6..938f603ac9 100644
--- a/testsuite/tests/parser/should_compile/T15323.stderr
+++ b/testsuite/tests/parser/should_compile/T15323.stderr
@@ -9,8 +9,8 @@
     { T15323.hs:1:1 }
     (UnchangedAnchor))
    (AnnsModule
-    [(AddApiAnn AnnModule (AR { T15323.hs:3:1-6 }))
-    ,(AddApiAnn AnnWhere (AR { T15323.hs:3:15-19 }))]
+    [(AddEpAnn AnnModule (AR { T15323.hs:3:1-6 }))
+    ,(AddEpAnn AnnWhere (AR { T15323.hs:3:15-19 }))]
     (AnnList
      (Nothing)
      (Nothing)
@@ -50,8 +50,8 @@
        (Anchor
         { T15323.hs:(5,1)-(6,54) }
         (UnchangedAnchor))
-       [(AddApiAnn AnnData (AR { T15323.hs:5:1-4 }))
-       ,(AddApiAnn AnnWhere (AR { T15323.hs:5:21-25 }))]
+       [(AddEpAnn AnnData (AR { T15323.hs:5:1-4 }))
+       ,(AddEpAnn AnnWhere (AR { T15323.hs:5:21-25 }))]
        (AnnComments
         []))
       (L
@@ -81,8 +81,8 @@
         (Anchor
          { T15323.hs:(5,1)-(6,54) }
          (UnchangedAnchor))
-        [(AddApiAnn AnnData (AR { T15323.hs:5:1-4 }))
-        ,(AddApiAnn AnnWhere (AR { T15323.hs:5:21-25 }))]
+        [(AddEpAnn AnnData (AR { T15323.hs:5:1-4 }))
+        ,(AddEpAnn AnnWhere (AR { T15323.hs:5:21-25 }))]
         (AnnComments
          []))
        (DataType)
@@ -96,7 +96,7 @@
            (Anchor
             { T15323.hs:6:5-54 }
             (UnchangedAnchor))
-           [(AddApiAnn AnnDcolon (AR { T15323.hs:6:17-18 }))]
+           [(AddEpAnn AnnDcolon (AR { T15323.hs:6:17-18 }))]
            (AnnComments
             []))
           [(L
@@ -111,8 +111,8 @@
               { T15323.hs:6:20-25 }
               (UnchangedAnchor))
              ((,)
-              (AddApiAnn AnnForall (AR { T15323.hs:6:20-25 }))
-              (AddApiAnn AnnDot (AR { T15323.hs:6:29 })))
+              (AddEpAnn AnnForall (AR { T15323.hs:6:20-25 }))
+              (AddEpAnn AnnDot (AR { T15323.hs:6:29 })))
              (AnnComments
               []))
             [(L