diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCase.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCase.java
index 34c63bcac0..b431fd4524 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCase.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCase.java
@@ -11,11 +11,9 @@ import scala.meta.Case;
 /**
  * The ASTCase node implementation.
  */
-public class ASTCase extends AbstractScalaNode<Case> {
+public final class ASTCase extends AbstractScalaNode<Case> {
 
-    @Deprecated
-    @InternalApi
-    public ASTCase(Case scalaNode) {
+    ASTCase(Case scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorPrimary.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorPrimary.java
index 9624dfd0ab..521fdace5f 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorPrimary.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorPrimary.java
@@ -11,11 +11,9 @@ import scala.meta.Ctor;
 /**
  * The ASTCtorPrimary node implementation.
  */
-public class ASTCtorPrimary extends AbstractScalaNode<Ctor.Primary> {
+public final class ASTCtorPrimary extends AbstractScalaNode<Ctor.Primary> {
 
-    @Deprecated
-    @InternalApi
-    public ASTCtorPrimary(Ctor.Primary scalaNode) {
+    ASTCtorPrimary(Ctor.Primary scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorSecondary.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorSecondary.java
index e0dfe99b27..6808a541b4 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorSecondary.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorSecondary.java
@@ -4,18 +4,14 @@
 
 package net.sourceforge.pmd.lang.scala.ast;
 
-import net.sourceforge.pmd.annotation.InternalApi;
-
 import scala.meta.Ctor;
 
 /**
  * The ASTCtorSecondary node implementation.
  */
-public class ASTCtorSecondary extends AbstractScalaNode<Ctor.Secondary> {
+public final class ASTCtorSecondary extends AbstractScalaNode<Ctor.Secondary> {
 
-    @Deprecated
-    @InternalApi
-    public ASTCtorSecondary(Ctor.Secondary scalaNode) {
+    ASTCtorSecondary(Ctor.Secondary scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclDef.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclDef.java
index 484a1655ce..235509719f 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclDef.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclDef.java
@@ -11,11 +11,9 @@ import scala.meta.Decl;
 /**
  * The ASTDeclDef node implementation.
  */
-public class ASTDeclDef extends AbstractScalaNode<Decl.Def> {
+public final class ASTDeclDef extends AbstractScalaNode<Decl.Def> {
 
-    @Deprecated
-    @InternalApi
-    public ASTDeclDef(Decl.Def scalaNode) {
+    ASTDeclDef(Decl.Def scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclType.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclType.java
index f4a263f67e..a7fb04c919 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclType.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclType.java
@@ -11,11 +11,9 @@ import scala.meta.Decl;
 /**
  * The ASTDeclType node implementation.
  */
-public class ASTDeclType extends AbstractScalaNode<Decl.Type> {
+public final class ASTDeclType extends AbstractScalaNode<Decl.Type> {
 
-    @Deprecated
-    @InternalApi
-    public ASTDeclType(Decl.Type scalaNode) {
+    ASTDeclType(Decl.Type scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVal.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVal.java
index 10fe896f5b..0d45990ad5 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVal.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVal.java
@@ -11,11 +11,9 @@ import scala.meta.Decl;
 /**
  * The ASTDeclVal node implementation.
  */
-public class ASTDeclVal extends AbstractScalaNode<Decl.Val> {
+public final class ASTDeclVal extends AbstractScalaNode<Decl.Val> {
 
-    @Deprecated
-    @InternalApi
-    public ASTDeclVal(Decl.Val scalaNode) {
+    ASTDeclVal(Decl.Val scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVar.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVar.java
index 2cccf00c01..cdb844c3cc 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVar.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVar.java
@@ -11,11 +11,9 @@ import scala.meta.Decl;
 /**
  * The ASTDeclVar node implementation.
  */
-public class ASTDeclVar extends AbstractScalaNode<Decl.Var> {
+public final class ASTDeclVar extends AbstractScalaNode<Decl.Var> {
 
-    @Deprecated
-    @InternalApi
-    public ASTDeclVar(Decl.Var scalaNode) {
+    ASTDeclVar(Decl.Var scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnClass.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnClass.java
index 65969b9c28..e2a912bac0 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnClass.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnClass.java
@@ -11,11 +11,9 @@ import scala.meta.Defn;
 /**
  * The ASTDefnClass node implementation.
  */
-public class ASTDefnClass extends AbstractScalaNode<Defn.Class> {
+public final class ASTDefnClass extends AbstractScalaNode<Defn.Class> {
 
-    @Deprecated
-    @InternalApi
-    public ASTDefnClass(Defn.Class scalaNode) {
+    ASTDefnClass(Defn.Class scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnDef.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnDef.java
index caa6294927..cb66300a3f 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnDef.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnDef.java
@@ -11,11 +11,9 @@ import scala.meta.Defn;
 /**
  * The ASTDefnDef node implementation.
  */
-public class ASTDefnDef extends AbstractScalaNode<Defn.Def> {
+public final class ASTDefnDef extends AbstractScalaNode<Defn.Def> {
 
-    @Deprecated
-    @InternalApi
-    public ASTDefnDef(Defn.Def scalaNode) {
+    ASTDefnDef(Defn.Def scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnMacro.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnMacro.java
index 13508733e4..b8b87c44dd 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnMacro.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnMacro.java
@@ -11,11 +11,9 @@ import scala.meta.Defn;
 /**
  * The ASTDefnMacro node implementation.
  */
-public class ASTDefnMacro extends AbstractScalaNode<Defn.Macro> {
+public final class ASTDefnMacro extends AbstractScalaNode<Defn.Macro> {
 
-    @Deprecated
-    @InternalApi
-    public ASTDefnMacro(Defn.Macro scalaNode) {
+    ASTDefnMacro(Defn.Macro scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnObject.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnObject.java
index 6651143784..203b33781b 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnObject.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnObject.java
@@ -11,11 +11,9 @@ import scala.meta.Defn;
 /**
  * The ASTDefnObject node implementation.
  */
-public class ASTDefnObject extends AbstractScalaNode<Defn.Object> {
+public final class ASTDefnObject extends AbstractScalaNode<Defn.Object> {
 
-    @Deprecated
-    @InternalApi
-    public ASTDefnObject(Defn.Object scalaNode) {
+    ASTDefnObject(Defn.Object scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnTrait.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnTrait.java
index 6888e75228..1fcda2eb9f 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnTrait.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnTrait.java
@@ -11,11 +11,9 @@ import scala.meta.Defn;
 /**
  * The ASTDefnTrait node implementation.
  */
-public class ASTDefnTrait extends AbstractScalaNode<Defn.Trait> {
+public final class ASTDefnTrait extends AbstractScalaNode<Defn.Trait> {
 
-    @Deprecated
-    @InternalApi
-    public ASTDefnTrait(Defn.Trait scalaNode) {
+    ASTDefnTrait(Defn.Trait scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnType.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnType.java
index 64b1300c18..f40995168c 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnType.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnType.java
@@ -11,11 +11,9 @@ import scala.meta.Defn;
 /**
  * The ASTDefnType node implementation.
  */
-public class ASTDefnType extends AbstractScalaNode<Defn.Type> {
+public final class ASTDefnType extends AbstractScalaNode<Defn.Type> {
 
-    @Deprecated
-    @InternalApi
-    public ASTDefnType(Defn.Type scalaNode) {
+    ASTDefnType(Defn.Type scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVal.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVal.java
index f7bfa97ecf..7284cb40c0 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVal.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVal.java
@@ -11,11 +11,9 @@ import scala.meta.Defn;
 /**
  * The ASTDefnVal node implementation.
  */
-public class ASTDefnVal extends AbstractScalaNode<Defn.Val> {
+public final class ASTDefnVal extends AbstractScalaNode<Defn.Val> {
 
-    @Deprecated
-    @InternalApi
-    public ASTDefnVal(Defn.Val scalaNode) {
+    ASTDefnVal(Defn.Val scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVar.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVar.java
index ef70b0aaa2..b0c0a9fdbf 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVar.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVar.java
@@ -11,11 +11,9 @@ import scala.meta.Defn;
 /**
  * The ASTDefnVar node implementation.
  */
-public class ASTDefnVar extends AbstractScalaNode<Defn.Var> {
+public final class ASTDefnVar extends AbstractScalaNode<Defn.Var> {
 
-    @Deprecated
-    @InternalApi
-    public ASTDefnVar(Defn.Var scalaNode) {
+    ASTDefnVar(Defn.Var scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGenerator.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGenerator.java
index 0899610fb6..9b2933ee11 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGenerator.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGenerator.java
@@ -11,11 +11,9 @@ import scala.meta.Enumerator;
 /**
  * The ASTEnumeratorGenerator node implementation.
  */
-public class ASTEnumeratorGenerator extends AbstractScalaNode<Enumerator.Generator> {
+public final class ASTEnumeratorGenerator extends AbstractScalaNode<Enumerator.Generator> {
 
-    @Deprecated
-    @InternalApi
-    public ASTEnumeratorGenerator(Enumerator.Generator scalaNode) {
+    ASTEnumeratorGenerator(Enumerator.Generator scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGuard.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGuard.java
index 9e06d7b743..5ff7eeaacb 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGuard.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGuard.java
@@ -11,11 +11,9 @@ import scala.meta.Enumerator;
 /**
  * The ASTEnumeratorGuard node implementation.
  */
-public class ASTEnumeratorGuard extends AbstractScalaNode<Enumerator.Guard> {
+public final class ASTEnumeratorGuard extends AbstractScalaNode<Enumerator.Guard> {
 
-    @Deprecated
-    @InternalApi
-    public ASTEnumeratorGuard(Enumerator.Guard scalaNode) {
+    ASTEnumeratorGuard(Enumerator.Guard scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorVal.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorVal.java
index b7c2852988..f832fc475e 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorVal.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorVal.java
@@ -11,11 +11,9 @@ import scala.meta.Enumerator;
 /**
  * The ASTEnumeratorVal node implementation.
  */
-public class ASTEnumeratorVal extends AbstractScalaNode<Enumerator.Val> {
+public final class ASTEnumeratorVal extends AbstractScalaNode<Enumerator.Val> {
 
-    @Deprecated
-    @InternalApi
-    public ASTEnumeratorVal(Enumerator.Val scalaNode) {
+    ASTEnumeratorVal(Enumerator.Val scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImport.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImport.java
index b126267bed..b9b70caf3c 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImport.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImport.java
@@ -11,11 +11,9 @@ import scala.meta.Import;
 /**
  * The ASTImport node implementation.
  */
-public class ASTImport extends AbstractScalaNode<Import> {
+public final class ASTImport extends AbstractScalaNode<Import> {
 
-    @Deprecated
-    @InternalApi
-    public ASTImport(Import scalaNode) {
+    ASTImport(Import scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeName.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeName.java
index 93d818a0b3..7cd84cfef9 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeName.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeName.java
@@ -11,11 +11,9 @@ import scala.meta.Importee;
 /**
  * The ASTImporteeName node implementation.
  */
-public class ASTImporteeName extends AbstractScalaNode<Importee.Name> {
+public final class ASTImporteeName extends AbstractScalaNode<Importee.Name> {
 
-    @Deprecated
-    @InternalApi
-    public ASTImporteeName(Importee.Name scalaNode) {
+    ASTImporteeName(Importee.Name scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeRename.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeRename.java
index cdcc429ce8..0d1e9c0a96 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeRename.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeRename.java
@@ -11,11 +11,9 @@ import scala.meta.Importee;
 /**
  * The ASTImporteeRename node implementation.
  */
-public class ASTImporteeRename extends AbstractScalaNode<Importee.Rename> {
+public final class ASTImporteeRename extends AbstractScalaNode<Importee.Rename> {
 
-    @Deprecated
-    @InternalApi
-    public ASTImporteeRename(Importee.Rename scalaNode) {
+    ASTImporteeRename(Importee.Rename scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeUnimport.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeUnimport.java
index 4204085d66..ddf1497363 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeUnimport.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeUnimport.java
@@ -11,11 +11,9 @@ import scala.meta.Importee;
 /**
  * The ASTImporteeUnimport node implementation.
  */
-public class ASTImporteeUnimport extends AbstractScalaNode<Importee.Unimport> {
+public final class ASTImporteeUnimport extends AbstractScalaNode<Importee.Unimport> {
 
-    @Deprecated
-    @InternalApi
-    public ASTImporteeUnimport(Importee.Unimport scalaNode) {
+    ASTImporteeUnimport(Importee.Unimport scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeWildcard.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeWildcard.java
index b3bc14dfae..7d61618de9 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeWildcard.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeWildcard.java
@@ -11,11 +11,9 @@ import scala.meta.Importee;
 /**
  * The ASTImporteeWildcard node implementation.
  */
-public class ASTImporteeWildcard extends AbstractScalaNode<Importee.Wildcard> {
+public final class ASTImporteeWildcard extends AbstractScalaNode<Importee.Wildcard> {
 
-    @Deprecated
-    @InternalApi
-    public ASTImporteeWildcard(Importee.Wildcard scalaNode) {
+    ASTImporteeWildcard(Importee.Wildcard scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporter.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporter.java
index 3d3683050a..652063b973 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporter.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporter.java
@@ -11,11 +11,9 @@ import scala.meta.Importer;
 /**
  * The ASTImporter node implementation.
  */
-public class ASTImporter extends AbstractScalaNode<Importer> {
+public final class ASTImporter extends AbstractScalaNode<Importer> {
 
-    @Deprecated
-    @InternalApi
-    public ASTImporter(Importer scalaNode) {
+    ASTImporter(Importer scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTInit.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTInit.java
index 99039a87da..275d7ac830 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTInit.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTInit.java
@@ -11,11 +11,9 @@ import scala.meta.Init;
 /**
  * The ASTInit node implementation.
  */
-public class ASTInit extends AbstractScalaNode<Init> {
+public final class ASTInit extends AbstractScalaNode<Init> {
 
-    @Deprecated
-    @InternalApi
-    public ASTInit(Init scalaNode) {
+    ASTInit(Init scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitBoolean.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitBoolean.java
index e71780f401..7b28d8ab88 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitBoolean.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitBoolean.java
@@ -11,11 +11,9 @@ import scala.meta.Lit;
 /**
  * The ASTLitBoolean node implementation.
  */
-public class ASTLitBoolean extends AbstractScalaNode<Lit.Boolean> {
+public final class ASTLitBoolean extends AbstractScalaNode<Lit.Boolean> {
 
-    @Deprecated
-    @InternalApi
-    public ASTLitBoolean(Lit.Boolean scalaNode) {
+    ASTLitBoolean(Lit.Boolean scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitByte.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitByte.java
index ebe2844b28..462f8b0fe4 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitByte.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitByte.java
@@ -11,11 +11,9 @@ import scala.meta.Lit;
 /**
  * The ASTLitByte node implementation.
  */
-public class ASTLitByte extends AbstractScalaNode<Lit.Byte> {
+public final class ASTLitByte extends AbstractScalaNode<Lit.Byte> {
 
-    @Deprecated
-    @InternalApi
-    public ASTLitByte(Lit.Byte scalaNode) {
+    ASTLitByte(Lit.Byte scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitChar.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitChar.java
index 803ff8e513..f1003aa9c4 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitChar.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitChar.java
@@ -11,11 +11,9 @@ import scala.meta.Lit;
 /**
  * The ASTLitChar node implementation.
  */
-public class ASTLitChar extends AbstractScalaNode<Lit.Char> {
+public final class ASTLitChar extends AbstractScalaNode<Lit.Char> {
 
-    @Deprecated
-    @InternalApi
-    public ASTLitChar(Lit.Char scalaNode) {
+    ASTLitChar(Lit.Char scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitDouble.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitDouble.java
index 6cbe646a19..30bf81c98d 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitDouble.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitDouble.java
@@ -11,11 +11,9 @@ import scala.meta.Lit;
 /**
  * The ASTLitDouble node implementation.
  */
-public class ASTLitDouble extends AbstractScalaNode<Lit.Double> {
+public final class ASTLitDouble extends AbstractScalaNode<Lit.Double> {
 
-    @Deprecated
-    @InternalApi
-    public ASTLitDouble(Lit.Double scalaNode) {
+    ASTLitDouble(Lit.Double scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitFloat.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitFloat.java
index 5efefe31fb..227ab3cf18 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitFloat.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitFloat.java
@@ -11,11 +11,9 @@ import scala.meta.Lit;
 /**
  * The ASTLitFloat node implementation.
  */
-public class ASTLitFloat extends AbstractScalaNode<Lit.Float> {
+public final class ASTLitFloat extends AbstractScalaNode<Lit.Float> {
 
-    @Deprecated
-    @InternalApi
-    public ASTLitFloat(Lit.Float scalaNode) {
+    ASTLitFloat(Lit.Float scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitInt.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitInt.java
index d6b8275f5d..00694175b2 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitInt.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitInt.java
@@ -11,11 +11,9 @@ import scala.meta.Lit;
 /**
  * The ASTLitInt node implementation.
  */
-public class ASTLitInt extends AbstractScalaNode<Lit.Int> {
+public final class ASTLitInt extends AbstractScalaNode<Lit.Int> {
 
-    @Deprecated
-    @InternalApi
-    public ASTLitInt(Lit.Int scalaNode) {
+    ASTLitInt(Lit.Int scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitLong.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitLong.java
index 49c46dde1c..76d2a4e70d 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitLong.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitLong.java
@@ -11,11 +11,9 @@ import scala.meta.Lit;
 /**
  * The ASTLitLong node implementation.
  */
-public class ASTLitLong extends AbstractScalaNode<Lit.Long> {
+public final class ASTLitLong extends AbstractScalaNode<Lit.Long> {
 
-    @Deprecated
-    @InternalApi
-    public ASTLitLong(Lit.Long scalaNode) {
+    ASTLitLong(Lit.Long scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitNull.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitNull.java
index 666d32e8db..165fde1d3b 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitNull.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitNull.java
@@ -11,11 +11,9 @@ import scala.meta.Lit;
 /**
  * The ASTLitNull node implementation.
  */
-public class ASTLitNull extends AbstractScalaNode<Lit.Null> {
+public final class ASTLitNull extends AbstractScalaNode<Lit.Null> {
 
-    @Deprecated
-    @InternalApi
-    public ASTLitNull(Lit.Null scalaNode) {
+    ASTLitNull(Lit.Null scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitShort.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitShort.java
index ad04661b6c..69c60f73f8 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitShort.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitShort.java
@@ -11,11 +11,9 @@ import scala.meta.Lit;
 /**
  * The ASTLitShort node implementation.
  */
-public class ASTLitShort extends AbstractScalaNode<Lit.Short> {
+public final class ASTLitShort extends AbstractScalaNode<Lit.Short> {
 
-    @Deprecated
-    @InternalApi
-    public ASTLitShort(Lit.Short scalaNode) {
+    ASTLitShort(Lit.Short scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitString.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitString.java
index 5d606fbf03..541b896fc2 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitString.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitString.java
@@ -11,11 +11,9 @@ import scala.meta.Lit;
 /**
  * The ASTLitString node implementation.
  */
-public class ASTLitString extends AbstractScalaNode<Lit.String> {
+public final class ASTLitString extends AbstractScalaNode<Lit.String> {
 
-    @Deprecated
-    @InternalApi
-    public ASTLitString(Lit.String scalaNode) {
+    ASTLitString(Lit.String scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitSymbol.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitSymbol.java
index 8b593abd11..774f2e8605 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitSymbol.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitSymbol.java
@@ -11,11 +11,9 @@ import scala.meta.Lit;
 /**
  * The ASTLitSymbol node implementation.
  */
-public class ASTLitSymbol extends AbstractScalaNode<Lit.Symbol> {
+public final class ASTLitSymbol extends AbstractScalaNode<Lit.Symbol> {
 
-    @Deprecated
-    @InternalApi
-    public ASTLitSymbol(Lit.Symbol scalaNode) {
+    ASTLitSymbol(Lit.Symbol scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitUnit.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitUnit.java
index 06a6dbd211..3411ccad0b 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitUnit.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitUnit.java
@@ -11,11 +11,9 @@ import scala.meta.Lit;
 /**
  * The ASTLitUnit node implementation.
  */
-public class ASTLitUnit extends AbstractScalaNode<Lit.Unit> {
+public final class ASTLitUnit extends AbstractScalaNode<Lit.Unit> {
 
-    @Deprecated
-    @InternalApi
-    public ASTLitUnit(Lit.Unit scalaNode) {
+    ASTLitUnit(Lit.Unit scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAbstract.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAbstract.java
index d1c173d04a..837992d990 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAbstract.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAbstract.java
@@ -11,11 +11,9 @@ import scala.meta.Mod;
 /**
  * The ASTModAbstract node implementation.
  */
-public class ASTModAbstract extends AbstractScalaNode<Mod.Abstract> {
+public final class ASTModAbstract extends AbstractScalaNode<Mod.Abstract> {
 
-    @Deprecated
-    @InternalApi
-    public ASTModAbstract(Mod.Abstract scalaNode) {
+    ASTModAbstract(Mod.Abstract scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAnnot.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAnnot.java
index acb002b557..a7d1bf53f3 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAnnot.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAnnot.java
@@ -11,11 +11,9 @@ import scala.meta.Mod;
 /**
  * The ASTModAnnot node implementation.
  */
-public class ASTModAnnot extends AbstractScalaNode<Mod.Annot> {
+public final class ASTModAnnot extends AbstractScalaNode<Mod.Annot> {
 
-    @Deprecated
-    @InternalApi
-    public ASTModAnnot(Mod.Annot scalaNode) {
+    ASTModAnnot(Mod.Annot scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCase.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCase.java
index 652335da05..d13010818f 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCase.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCase.java
@@ -11,11 +11,9 @@ import scala.meta.Mod;
 /**
  * The ASTModCase node implementation.
  */
-public class ASTModCase extends AbstractScalaNode<Mod.Case> {
+public final class ASTModCase extends AbstractScalaNode<Mod.Case> {
 
-    @Deprecated
-    @InternalApi
-    public ASTModCase(Mod.Case scalaNode) {
+    ASTModCase(Mod.Case scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModContravariant.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModContravariant.java
index 9d36b19774..cbe00d76bc 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModContravariant.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModContravariant.java
@@ -11,11 +11,9 @@ import scala.meta.Mod;
 /**
  * The ASTModContravariant node implementation.
  */
-public class ASTModContravariant extends AbstractScalaNode<Mod.Contravariant> {
+public final class ASTModContravariant extends AbstractScalaNode<Mod.Contravariant> {
 
-    @Deprecated
-    @InternalApi
-    public ASTModContravariant(Mod.Contravariant scalaNode) {
+    ASTModContravariant(Mod.Contravariant scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCovariant.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCovariant.java
index 0c0bb5691e..9060eb97e4 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCovariant.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCovariant.java
@@ -11,11 +11,9 @@ import scala.meta.Mod;
 /**
  * The ASTModCovariant node implementation.
  */
-public class ASTModCovariant extends AbstractScalaNode<Mod.Covariant> {
+public final class ASTModCovariant extends AbstractScalaNode<Mod.Covariant> {
 
-    @Deprecated
-    @InternalApi
-    public ASTModCovariant(Mod.Covariant scalaNode) {
+    ASTModCovariant(Mod.Covariant scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModFinal.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModFinal.java
index af888a1ca5..c9fbf639ed 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModFinal.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModFinal.java
@@ -11,11 +11,9 @@ import scala.meta.Mod;
 /**
  * The ASTModFinal node implementation.
  */
-public class ASTModFinal extends AbstractScalaNode<Mod.Final> {
+public final class ASTModFinal extends AbstractScalaNode<Mod.Final> {
 
-    @Deprecated
-    @InternalApi
-    public ASTModFinal(Mod.Final scalaNode) {
+    ASTModFinal(Mod.Final scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModImplicit.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModImplicit.java
index 3a155bc3d4..b451c57458 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModImplicit.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModImplicit.java
@@ -11,11 +11,9 @@ import scala.meta.Mod;
 /**
  * The ASTModImplicit node implementation.
  */
-public class ASTModImplicit extends AbstractScalaNode<Mod.Implicit> {
+public final class ASTModImplicit extends AbstractScalaNode<Mod.Implicit> {
 
-    @Deprecated
-    @InternalApi
-    public ASTModImplicit(Mod.Implicit scalaNode) {
+    ASTModImplicit(Mod.Implicit scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModInline.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModInline.java
index fc7b1b54b9..514ea31025 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModInline.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModInline.java
@@ -11,11 +11,9 @@ import scala.meta.Mod;
 /**
  * The ASTModInline node implementation.
  */
-public class ASTModInline extends AbstractScalaNode<Mod.Inline> {
+public final class ASTModInline extends AbstractScalaNode<Mod.Inline> {
 
-    @Deprecated
-    @InternalApi
-    public ASTModInline(Mod.Inline scalaNode) {
+    ASTModInline(Mod.Inline scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModLazy.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModLazy.java
index 085db34017..230c6b656a 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModLazy.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModLazy.java
@@ -11,11 +11,9 @@ import scala.meta.Mod;
 /**
  * The ASTModLazy node implementation.
  */
-public class ASTModLazy extends AbstractScalaNode<Mod.Lazy> {
+public final class ASTModLazy extends AbstractScalaNode<Mod.Lazy> {
 
-    @Deprecated
-    @InternalApi
-    public ASTModLazy(Mod.Lazy scalaNode) {
+    ASTModLazy(Mod.Lazy scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModOverride.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModOverride.java
index e039566f80..ada4eb2873 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModOverride.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModOverride.java
@@ -11,11 +11,9 @@ import scala.meta.Mod;
 /**
  * The ASTModOverride node implementation.
  */
-public class ASTModOverride extends AbstractScalaNode<Mod.Override> {
+public final class ASTModOverride extends AbstractScalaNode<Mod.Override> {
 
-    @Deprecated
-    @InternalApi
-    public ASTModOverride(Mod.Override scalaNode) {
+    ASTModOverride(Mod.Override scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModPrivate.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModPrivate.java
index 84dcb8fac3..32a8623927 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModPrivate.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModPrivate.java
@@ -11,11 +11,9 @@ import scala.meta.Mod;
 /**
  * The ASTModPrivate node implementation.
  */
-public class ASTModPrivate extends AbstractScalaNode<Mod.Private> {
+public final class ASTModPrivate extends AbstractScalaNode<Mod.Private> {
 
-    @Deprecated
-    @InternalApi
-    public ASTModPrivate(Mod.Private scalaNode) {
+    ASTModPrivate(Mod.Private scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModProtected.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModProtected.java
index b1191b927d..b76d5a4d22 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModProtected.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModProtected.java
@@ -11,11 +11,9 @@ import scala.meta.Mod;
 /**
  * The ASTModProtected node implementation.
  */
-public class ASTModProtected extends AbstractScalaNode<Mod.Protected> {
+public final class ASTModProtected extends AbstractScalaNode<Mod.Protected> {
 
-    @Deprecated
-    @InternalApi
-    public ASTModProtected(Mod.Protected scalaNode) {
+    ASTModProtected(Mod.Protected scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModSealed.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModSealed.java
index 30d5430973..ec2eceab7d 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModSealed.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModSealed.java
@@ -11,11 +11,9 @@ import scala.meta.Mod;
 /**
  * The ASTModSealed node implementation.
  */
-public class ASTModSealed extends AbstractScalaNode<Mod.Sealed> {
+public final class ASTModSealed extends AbstractScalaNode<Mod.Sealed> {
 
-    @Deprecated
-    @InternalApi
-    public ASTModSealed(Mod.Sealed scalaNode) {
+    ASTModSealed(Mod.Sealed scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModValParam.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModValParam.java
index 9154a5017c..e23a9e77d8 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModValParam.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModValParam.java
@@ -11,11 +11,9 @@ import scala.meta.Mod;
 /**
  * The ASTModValParam node implementation.
  */
-public class ASTModValParam extends AbstractScalaNode<Mod.ValParam> {
+public final class ASTModValParam extends AbstractScalaNode<Mod.ValParam> {
 
-    @Deprecated
-    @InternalApi
-    public ASTModValParam(Mod.ValParam scalaNode) {
+    ASTModValParam(Mod.ValParam scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModVarParam.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModVarParam.java
index 91d841ccc5..d974146f2f 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModVarParam.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModVarParam.java
@@ -11,11 +11,9 @@ import scala.meta.Mod;
 /**
  * The ASTModVarParam node implementation.
  */
-public class ASTModVarParam extends AbstractScalaNode<Mod.VarParam> {
+public final class ASTModVarParam extends AbstractScalaNode<Mod.VarParam> {
 
-    @Deprecated
-    @InternalApi
-    public ASTModVarParam(Mod.VarParam scalaNode) {
+    ASTModVarParam(Mod.VarParam scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameAnonymous.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameAnonymous.java
index ca4aa94358..c590124ec4 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameAnonymous.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameAnonymous.java
@@ -11,11 +11,9 @@ import scala.meta.Name;
 /**
  * The ASTNameAnonymous node implementation.
  */
-public class ASTNameAnonymous extends AbstractScalaNode<Name.Anonymous> {
+public final class ASTNameAnonymous extends AbstractScalaNode<Name.Anonymous> {
 
-    @Deprecated
-    @InternalApi
-    public ASTNameAnonymous(Name.Anonymous scalaNode) {
+    ASTNameAnonymous(Name.Anonymous scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameIndeterminate.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameIndeterminate.java
index da53fdf8e3..0fcc0d2706 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameIndeterminate.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameIndeterminate.java
@@ -11,11 +11,9 @@ import scala.meta.Name;
 /**
  * The ASTNameIndeterminate node implementation.
  */
-public class ASTNameIndeterminate extends AbstractScalaNode<Name.Indeterminate> {
+public final class ASTNameIndeterminate extends AbstractScalaNode<Name.Indeterminate> {
 
-    @Deprecated
-    @InternalApi
-    public ASTNameIndeterminate(Name.Indeterminate scalaNode) {
+    ASTNameIndeterminate(Name.Indeterminate scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatAlternative.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatAlternative.java
index 05f98e2e12..ab507e0b7c 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatAlternative.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatAlternative.java
@@ -11,11 +11,9 @@ import scala.meta.Pat;
 /**
  * The ASTPatAlternative node implementation.
  */
-public class ASTPatAlternative extends AbstractScalaNode<Pat.Alternative> {
+public final class ASTPatAlternative extends AbstractScalaNode<Pat.Alternative> {
 
-    @Deprecated
-    @InternalApi
-    public ASTPatAlternative(Pat.Alternative scalaNode) {
+    ASTPatAlternative(Pat.Alternative scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatBind.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatBind.java
index 37cb5c299a..9d7b6a0b23 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatBind.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatBind.java
@@ -11,11 +11,9 @@ import scala.meta.Pat;
 /**
  * The ASTPatBind node implementation.
  */
-public class ASTPatBind extends AbstractScalaNode<Pat.Bind> {
+public final class ASTPatBind extends AbstractScalaNode<Pat.Bind> {
 
-    @Deprecated
-    @InternalApi
-    public ASTPatBind(Pat.Bind scalaNode) {
+    ASTPatBind(Pat.Bind scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtract.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtract.java
index 357dd91c23..77133f4254 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtract.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtract.java
@@ -11,11 +11,9 @@ import scala.meta.Pat;
 /**
  * The ASTPatExtract node implementation.
  */
-public class ASTPatExtract extends AbstractScalaNode<Pat.Extract> {
+public final class ASTPatExtract extends AbstractScalaNode<Pat.Extract> {
 
-    @Deprecated
-    @InternalApi
-    public ASTPatExtract(Pat.Extract scalaNode) {
+    ASTPatExtract(Pat.Extract scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtractInfix.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtractInfix.java
index 5d7736646f..fb5ef4679f 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtractInfix.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtractInfix.java
@@ -11,11 +11,9 @@ import scala.meta.Pat;
 /**
  * The ASTPatExtractInfix node implementation.
  */
-public class ASTPatExtractInfix extends AbstractScalaNode<Pat.ExtractInfix> {
+public final class ASTPatExtractInfix extends AbstractScalaNode<Pat.ExtractInfix> {
 
-    @Deprecated
-    @InternalApi
-    public ASTPatExtractInfix(Pat.ExtractInfix scalaNode) {
+    ASTPatExtractInfix(Pat.ExtractInfix scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatInterpolate.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatInterpolate.java
index 175b9b94dd..954f274b3b 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatInterpolate.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatInterpolate.java
@@ -11,11 +11,9 @@ import scala.meta.Pat;
 /**
  * The ASTPatInterpolate node implementation.
  */
-public class ASTPatInterpolate extends AbstractScalaNode<Pat.Interpolate> {
+public final class ASTPatInterpolate extends AbstractScalaNode<Pat.Interpolate> {
 
-    @Deprecated
-    @InternalApi
-    public ASTPatInterpolate(Pat.Interpolate scalaNode) {
+    ASTPatInterpolate(Pat.Interpolate scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatSeqWildcard.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatSeqWildcard.java
index 06e0270576..2e2717b930 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatSeqWildcard.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatSeqWildcard.java
@@ -11,11 +11,9 @@ import scala.meta.Pat;
 /**
  * The ASTPatSeqWildcard node implementation.
  */
-public class ASTPatSeqWildcard extends AbstractScalaNode<Pat.SeqWildcard> {
+public final class ASTPatSeqWildcard extends AbstractScalaNode<Pat.SeqWildcard> {
 
-    @Deprecated
-    @InternalApi
-    public ASTPatSeqWildcard(Pat.SeqWildcard scalaNode) {
+    ASTPatSeqWildcard(Pat.SeqWildcard scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTuple.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTuple.java
index dda1cc779b..3df73474a0 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTuple.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTuple.java
@@ -11,11 +11,9 @@ import scala.meta.Pat;
 /**
  * The ASTPatTuple node implementation.
  */
-public class ASTPatTuple extends AbstractScalaNode<Pat.Tuple> {
+public final class ASTPatTuple extends AbstractScalaNode<Pat.Tuple> {
 
-    @Deprecated
-    @InternalApi
-    public ASTPatTuple(Pat.Tuple scalaNode) {
+    ASTPatTuple(Pat.Tuple scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTyped.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTyped.java
index ba8d255b1c..e2ebbc1d9c 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTyped.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTyped.java
@@ -11,11 +11,9 @@ import scala.meta.Pat;
 /**
  * The ASTPatTyped node implementation.
  */
-public class ASTPatTyped extends AbstractScalaNode<Pat.Typed> {
+public final class ASTPatTyped extends AbstractScalaNode<Pat.Typed> {
 
-    @Deprecated
-    @InternalApi
-    public ASTPatTyped(Pat.Typed scalaNode) {
+    ASTPatTyped(Pat.Typed scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatVar.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatVar.java
index b100cb2e47..c5823b1616 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatVar.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatVar.java
@@ -11,11 +11,9 @@ import scala.meta.Pat;
 /**
  * The ASTPatVar node implementation.
  */
-public class ASTPatVar extends AbstractScalaNode<Pat.Var> {
+public final class ASTPatVar extends AbstractScalaNode<Pat.Var> {
 
-    @Deprecated
-    @InternalApi
-    public ASTPatVar(Pat.Var scalaNode) {
+    ASTPatVar(Pat.Var scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatWildcard.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatWildcard.java
index 8f98784cf4..c45248e2e1 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatWildcard.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatWildcard.java
@@ -11,11 +11,9 @@ import scala.meta.Pat;
 /**
  * The ASTPatWildcard node implementation.
  */
-public class ASTPatWildcard extends AbstractScalaNode<Pat.Wildcard> {
+public final class ASTPatWildcard extends AbstractScalaNode<Pat.Wildcard> {
 
-    @Deprecated
-    @InternalApi
-    public ASTPatWildcard(Pat.Wildcard scalaNode) {
+    ASTPatWildcard(Pat.Wildcard scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatXml.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatXml.java
index ec57f57526..f721208cbf 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatXml.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatXml.java
@@ -11,11 +11,9 @@ import scala.meta.Pat;
 /**
  * The ASTPatXml node implementation.
  */
-public class ASTPatXml extends AbstractScalaNode<Pat.Xml> {
+public final class ASTPatXml extends AbstractScalaNode<Pat.Xml> {
 
-    @Deprecated
-    @InternalApi
-    public ASTPatXml(Pat.Xml scalaNode) {
+    ASTPatXml(Pat.Xml scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkg.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkg.java
index 8995df7314..c33d5346e3 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkg.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkg.java
@@ -11,11 +11,9 @@ import scala.meta.Pkg;
 /**
  * The ASTPkg node implementation.
  */
-public class ASTPkg extends AbstractScalaNode<Pkg> {
+public final class ASTPkg extends AbstractScalaNode<Pkg> {
 
-    @Deprecated
-    @InternalApi
-    public ASTPkg(Pkg scalaNode) {
+    ASTPkg(Pkg scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkgObject.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkgObject.java
index 9142ae82fa..7ac639cc76 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkgObject.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkgObject.java
@@ -4,18 +4,14 @@
 
 package net.sourceforge.pmd.lang.scala.ast;
 
-import net.sourceforge.pmd.annotation.InternalApi;
-
 import scala.meta.Pkg;
 
 /**
  * The ASTPkgObject node implementation.
  */
-public class ASTPkgObject extends AbstractScalaNode<Pkg.Object> {
+public final class ASTPkgObject extends AbstractScalaNode<Pkg.Object> {
 
-    @Deprecated
-    @InternalApi
-    public ASTPkgObject(Pkg.Object scalaNode) {
+    ASTPkgObject(Pkg.Object scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTQuasi.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTQuasi.java
index 5f9448517d..1d8a5709d3 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTQuasi.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTQuasi.java
@@ -11,11 +11,9 @@ import scala.meta.Tree.Quasi;
 /**
  * The ASTQuasi node implementation.
  */
-public class ASTQuasi extends AbstractScalaNode<Quasi> {
+public final class ASTQuasi extends AbstractScalaNode<Quasi> {
 
-    @Deprecated
-    @InternalApi
-    public ASTQuasi(Quasi scalaNode) {
+    ASTQuasi(Quasi scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSelf.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSelf.java
index 5818e46ee6..9d0a731e0e 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSelf.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSelf.java
@@ -11,11 +11,9 @@ import scala.meta.Self;
 /**
  * The ASTSelf node implementation.
  */
-public class ASTSelf extends AbstractScalaNode<Self> {
+public final class ASTSelf extends AbstractScalaNode<Self> {
 
-    @Deprecated
-    @InternalApi
-    public ASTSelf(Self scalaNode) {
+    ASTSelf(Self scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSource.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSource.java
index 35382cb15c..8012f57a0a 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSource.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSource.java
@@ -12,11 +12,9 @@ import scala.meta.Source;
 /**
  * The ASTSource node implementation.
  */
-public class ASTSource extends AbstractScalaNode<Source> implements RootNode {
+public final class ASTSource extends AbstractScalaNode<Source> implements RootNode {
 
-    @Deprecated
-    @InternalApi
-    public ASTSource(Source scalaNode) {
+    ASTSource(Source scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTemplate.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTemplate.java
index be1a14fad2..62729eef95 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTemplate.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTemplate.java
@@ -11,11 +11,9 @@ import scala.meta.Template;
 /**
  * The ASTTemplate node implementation.
  */
-public class ASTTemplate extends AbstractScalaNode<Template> {
+public final class ASTTemplate extends AbstractScalaNode<Template> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTemplate(Template scalaNode) {
+    ASTTemplate(Template scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAnnotate.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAnnotate.java
index e33d05c1fe..2f635b9405 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAnnotate.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAnnotate.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermAnnotate node implementation.
  */
-public class ASTTermAnnotate extends AbstractScalaNode<Term.Annotate> {
+public final class ASTTermAnnotate extends AbstractScalaNode<Term.Annotate> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermAnnotate(Term.Annotate scalaNode) {
+    ASTTermAnnotate(Term.Annotate scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApply.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApply.java
index f8cbb2ad9b..1260f4551b 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApply.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApply.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermApply node implementation.
  */
-public class ASTTermApply extends AbstractScalaNode<Term.Apply> {
+public final class ASTTermApply extends AbstractScalaNode<Term.Apply> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermApply(Term.Apply scalaNode) {
+    ASTTermApply(Term.Apply scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyInfix.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyInfix.java
index 05c9609e02..3be1ef5b94 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyInfix.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyInfix.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermApplyInfix node implementation.
  */
-public class ASTTermApplyInfix extends AbstractScalaNode<Term.ApplyInfix> {
+public final class ASTTermApplyInfix extends AbstractScalaNode<Term.ApplyInfix> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermApplyInfix(Term.ApplyInfix scalaNode) {
+    ASTTermApplyInfix(Term.ApplyInfix scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyType.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyType.java
index c1de3aa730..0f4269318c 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyType.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyType.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermApplyType node implementation.
  */
-public class ASTTermApplyType extends AbstractScalaNode<Term.ApplyType> {
+public final class ASTTermApplyType extends AbstractScalaNode<Term.ApplyType> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermApplyType(Term.ApplyType scalaNode) {
+    ASTTermApplyType(Term.ApplyType scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyUnary.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyUnary.java
index 8ef1adec28..9e8e86692f 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyUnary.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyUnary.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermApplyUnary node implementation.
  */
-public class ASTTermApplyUnary extends AbstractScalaNode<Term.ApplyUnary> {
+public final class ASTTermApplyUnary extends AbstractScalaNode<Term.ApplyUnary> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermApplyUnary(Term.ApplyUnary scalaNode) {
+    ASTTermApplyUnary(Term.ApplyUnary scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAscribe.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAscribe.java
index bdd3701f1b..20292f59c6 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAscribe.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAscribe.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermAscribe node implementation.
  */
-public class ASTTermAscribe extends AbstractScalaNode<Term.Ascribe> {
+public final class ASTTermAscribe extends AbstractScalaNode<Term.Ascribe> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermAscribe(Term.Ascribe scalaNode) {
+    ASTTermAscribe(Term.Ascribe scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAssign.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAssign.java
index ae8f971bf5..9504e50683 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAssign.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAssign.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermAssign node implementation.
  */
-public class ASTTermAssign extends AbstractScalaNode<Term.Assign> {
+public final class ASTTermAssign extends AbstractScalaNode<Term.Assign> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermAssign(Term.Assign scalaNode) {
+    ASTTermAssign(Term.Assign scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermBlock.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermBlock.java
index 4c7fb32a32..b2cf9c4265 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermBlock.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermBlock.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermBlock node implementation.
  */
-public class ASTTermBlock extends AbstractScalaNode<Term.Block> {
+public final class ASTTermBlock extends AbstractScalaNode<Term.Block> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermBlock(Term.Block scalaNode) {
+    ASTTermBlock(Term.Block scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermDo.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermDo.java
index 5aebd65b4f..a843676a0d 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermDo.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermDo.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermDo node implementation.
  */
-public class ASTTermDo extends AbstractScalaNode<Term.Do> {
+public final class ASTTermDo extends AbstractScalaNode<Term.Do> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermDo(Term.Do scalaNode) {
+    ASTTermDo(Term.Do scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermEta.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermEta.java
index 720d165dbd..40878464d6 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermEta.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermEta.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermEta node implementation.
  */
-public class ASTTermEta extends AbstractScalaNode<Term.Eta> {
+public final class ASTTermEta extends AbstractScalaNode<Term.Eta> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermEta(Term.Eta scalaNode) {
+    ASTTermEta(Term.Eta scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFor.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFor.java
index 6a67d78ca1..bd94aea950 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFor.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFor.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermFor node implementation.
  */
-public class ASTTermFor extends AbstractScalaNode<Term.For> {
+public final class ASTTermFor extends AbstractScalaNode<Term.For> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermFor(Term.For scalaNode) {
+    ASTTermFor(Term.For scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermForYield.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermForYield.java
index 5a9a49ff58..716ab67d09 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermForYield.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermForYield.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermForYield node implementation.
  */
-public class ASTTermForYield extends AbstractScalaNode<Term.ForYield> {
+public final class ASTTermForYield extends AbstractScalaNode<Term.ForYield> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermForYield(Term.ForYield scalaNode) {
+    ASTTermForYield(Term.ForYield scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFunction.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFunction.java
index be97ee5657..0ba4047203 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFunction.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFunction.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermFunction node implementation.
  */
-public class ASTTermFunction extends AbstractScalaNode<Term.Function> {
+public final class ASTTermFunction extends AbstractScalaNode<Term.Function> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermFunction(Term.Function scalaNode) {
+    ASTTermFunction(Term.Function scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermIf.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermIf.java
index e46c5f9232..83ed20f4d9 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermIf.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermIf.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermIf node implementation.
  */
-public class ASTTermIf extends AbstractScalaNode<Term.If> {
+public final class ASTTermIf extends AbstractScalaNode<Term.If> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermIf(Term.If scalaNode) {
+    ASTTermIf(Term.If scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermInterpolate.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermInterpolate.java
index 4ca85814e9..0542f5f8cc 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermInterpolate.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermInterpolate.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermInterpolate node implementation.
  */
-public class ASTTermInterpolate extends AbstractScalaNode<Term.Interpolate> {
+public final class ASTTermInterpolate extends AbstractScalaNode<Term.Interpolate> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermInterpolate(Term.Interpolate scalaNode) {
+    ASTTermInterpolate(Term.Interpolate scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermMatch.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermMatch.java
index dac0d0e73e..402ba7f637 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermMatch.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermMatch.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermMatch node implementation.
  */
-public class ASTTermMatch extends AbstractScalaNode<Term.Match> {
+public final class ASTTermMatch extends AbstractScalaNode<Term.Match> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermMatch(Term.Match scalaNode) {
+    ASTTermMatch(Term.Match scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermName.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermName.java
index 6c4622804e..67aebb2866 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermName.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermName.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermName node implementation.
  */
-public class ASTTermName extends AbstractScalaNode<Term.Name> {
+public final class ASTTermName extends AbstractScalaNode<Term.Name> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermName(Term.Name scalaNode) {
+    ASTTermName(Term.Name scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNew.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNew.java
index 91b4be392c..eb1294df86 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNew.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNew.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermNew node implementation.
  */
-public class ASTTermNew extends AbstractScalaNode<Term.New> {
+public final class ASTTermNew extends AbstractScalaNode<Term.New> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermNew(Term.New scalaNode) {
+    ASTTermNew(Term.New scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNewAnonymous.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNewAnonymous.java
index ab9f6a8a93..acf3b33917 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNewAnonymous.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNewAnonymous.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermNewAnonymous node implementation.
  */
-public class ASTTermNewAnonymous extends AbstractScalaNode<Term.NewAnonymous> {
+public final class ASTTermNewAnonymous extends AbstractScalaNode<Term.NewAnonymous> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermNewAnonymous(Term.NewAnonymous scalaNode) {
+    ASTTermNewAnonymous(Term.NewAnonymous scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermParam.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermParam.java
index f47c6d2e76..c1845f00d6 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermParam.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermParam.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermParam node implementation.
  */
-public class ASTTermParam extends AbstractScalaNode<Term.Param> {
+public final class ASTTermParam extends AbstractScalaNode<Term.Param> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermParam(Term.Param scalaNode) {
+    ASTTermParam(Term.Param scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPartialFunction.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPartialFunction.java
index 709acd4edd..f970a6ff21 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPartialFunction.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPartialFunction.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermPartialFunction node implementation.
  */
-public class ASTTermPartialFunction extends AbstractScalaNode<Term.PartialFunction> {
+public final class ASTTermPartialFunction extends AbstractScalaNode<Term.PartialFunction> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermPartialFunction(Term.PartialFunction scalaNode) {
+    ASTTermPartialFunction(Term.PartialFunction scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPlaceholder.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPlaceholder.java
index c81d600064..19690fb038 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPlaceholder.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPlaceholder.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermPlaceholder node implementation.
  */
-public class ASTTermPlaceholder extends AbstractScalaNode<Term.Placeholder> {
+public final class ASTTermPlaceholder extends AbstractScalaNode<Term.Placeholder> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermPlaceholder(Term.Placeholder scalaNode) {
+    ASTTermPlaceholder(Term.Placeholder scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermRepeated.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermRepeated.java
index 5384bec322..ab239de388 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermRepeated.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermRepeated.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermRepeated node implementation.
  */
-public class ASTTermRepeated extends AbstractScalaNode<Term.Repeated> {
+public final class ASTTermRepeated extends AbstractScalaNode<Term.Repeated> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermRepeated(Term.Repeated scalaNode) {
+    ASTTermRepeated(Term.Repeated scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermReturn.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermReturn.java
index 2613f732dd..ddab76e28a 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermReturn.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermReturn.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermReturn node implementation.
  */
-public class ASTTermReturn extends AbstractScalaNode<Term.Return> {
+public final class ASTTermReturn extends AbstractScalaNode<Term.Return> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermReturn(Term.Return scalaNode) {
+    ASTTermReturn(Term.Return scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSelect.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSelect.java
index 75c5773aa8..40171662ee 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSelect.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSelect.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermSelect node implementation.
  */
-public class ASTTermSelect extends AbstractScalaNode<Term.Select> {
+public final class ASTTermSelect extends AbstractScalaNode<Term.Select> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermSelect(Term.Select scalaNode) {
+    ASTTermSelect(Term.Select scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSuper.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSuper.java
index 34047ed63f..d26da8c8e3 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSuper.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSuper.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermSuper node implementation.
  */
-public class ASTTermSuper extends AbstractScalaNode<Term.Super> {
+public final class ASTTermSuper extends AbstractScalaNode<Term.Super> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermSuper(Term.Super scalaNode) {
+    ASTTermSuper(Term.Super scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThis.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThis.java
index cc5ff16979..b41dfc901b 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThis.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThis.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermThis node implementation.
  */
-public class ASTTermThis extends AbstractScalaNode<Term.This> {
+public final class ASTTermThis extends AbstractScalaNode<Term.This> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermThis(Term.This scalaNode) {
+    ASTTermThis(Term.This scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThrow.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThrow.java
index c218d47d77..2b1e73d433 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThrow.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThrow.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermThrow node implementation.
  */
-public class ASTTermThrow extends AbstractScalaNode<Term.Throw> {
+public final class ASTTermThrow extends AbstractScalaNode<Term.Throw> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermThrow(Term.Throw scalaNode) {
+    ASTTermThrow(Term.Throw scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTry.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTry.java
index 4d32fe3135..ff2e423766 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTry.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTry.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermTry node implementation.
  */
-public class ASTTermTry extends AbstractScalaNode<Term.Try> {
+public final class ASTTermTry extends AbstractScalaNode<Term.Try> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermTry(Term.Try scalaNode) {
+    ASTTermTry(Term.Try scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTryWithHandler.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTryWithHandler.java
index 2fde38b988..7ba174cd9a 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTryWithHandler.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTryWithHandler.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermTryWithHandler node implementation.
  */
-public class ASTTermTryWithHandler extends AbstractScalaNode<Term.TryWithHandler> {
+public final class ASTTermTryWithHandler extends AbstractScalaNode<Term.TryWithHandler> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermTryWithHandler(Term.TryWithHandler scalaNode) {
+    ASTTermTryWithHandler(Term.TryWithHandler scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTuple.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTuple.java
index 2e5a440569..e48a0d10e3 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTuple.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTuple.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermTuple node implementation.
  */
-public class ASTTermTuple extends AbstractScalaNode<Term.Tuple> {
+public final class ASTTermTuple extends AbstractScalaNode<Term.Tuple> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermTuple(Term.Tuple scalaNode) {
+    ASTTermTuple(Term.Tuple scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermWhile.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermWhile.java
index 82888c8316..632235adca 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermWhile.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermWhile.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermWhile node implementation.
  */
-public class ASTTermWhile extends AbstractScalaNode<Term.While> {
+public final class ASTTermWhile extends AbstractScalaNode<Term.While> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermWhile(Term.While scalaNode) {
+    ASTTermWhile(Term.While scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermXml.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermXml.java
index 72cffecbb1..6b5fdec6ba 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermXml.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermXml.java
@@ -11,11 +11,9 @@ import scala.meta.Term;
 /**
  * The ASTTermXml node implementation.
  */
-public class ASTTermXml extends AbstractScalaNode<Term.Xml> {
+public final class ASTTermXml extends AbstractScalaNode<Term.Xml> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTermXml(Term.Xml scalaNode) {
+    ASTTermXml(Term.Xml scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnd.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnd.java
index 84fe5f2a65..4de781cd36 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnd.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnd.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypeAnd node implementation.
  */
-public class ASTTypeAnd extends AbstractScalaNode<Type.And> {
+public final class ASTTypeAnd extends AbstractScalaNode<Type.And> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypeAnd(Type.And scalaNode) {
+    ASTTypeAnd(Type.And scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnnotate.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnnotate.java
index 28d4b1ad01..22d44efed8 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnnotate.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnnotate.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypeAnnotate node implementation.
  */
-public class ASTTypeAnnotate extends AbstractScalaNode<Type.Annotate> {
+public final class ASTTypeAnnotate extends AbstractScalaNode<Type.Annotate> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypeAnnotate(Type.Annotate scalaNode) {
+    ASTTypeAnnotate(Type.Annotate scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApply.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApply.java
index e523be4726..046ffb1095 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApply.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApply.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypeApply node implementation.
  */
-public class ASTTypeApply extends AbstractScalaNode<Type.Apply> {
+public final class ASTTypeApply extends AbstractScalaNode<Type.Apply> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypeApply(Type.Apply scalaNode) {
+    ASTTypeApply(Type.Apply scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApplyInfix.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApplyInfix.java
index 692dddd9d1..fe4f0bd336 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApplyInfix.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApplyInfix.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypeApplyInfix node implementation.
  */
-public class ASTTypeApplyInfix extends AbstractScalaNode<Type.ApplyInfix> {
+public final class ASTTypeApplyInfix extends AbstractScalaNode<Type.ApplyInfix> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypeApplyInfix(Type.ApplyInfix scalaNode) {
+    ASTTypeApplyInfix(Type.ApplyInfix scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeBounds.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeBounds.java
index 0d73d0bd6d..4c42385de6 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeBounds.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeBounds.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypeBounds node implementation.
  */
-public class ASTTypeBounds extends AbstractScalaNode<Type.Bounds> {
+public final class ASTTypeBounds extends AbstractScalaNode<Type.Bounds> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypeBounds(Type.Bounds scalaNode) {
+    ASTTypeBounds(Type.Bounds scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeByName.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeByName.java
index 8729198773..ccce034988 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeByName.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeByName.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypeByName node implementation.
  */
-public class ASTTypeByName extends AbstractScalaNode<Type.ByName> {
+public final class ASTTypeByName extends AbstractScalaNode<Type.ByName> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypeByName(Type.ByName scalaNode) {
+    ASTTypeByName(Type.ByName scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeExistential.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeExistential.java
index 52fae17300..2d297a7e20 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeExistential.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeExistential.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypeExistential node implementation.
  */
-public class ASTTypeExistential extends AbstractScalaNode<Type.Existential> {
+public final class ASTTypeExistential extends AbstractScalaNode<Type.Existential> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypeExistential(Type.Existential scalaNode) {
+    ASTTypeExistential(Type.Existential scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeFunction.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeFunction.java
index 7ae1a22def..bb77bef802 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeFunction.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeFunction.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypeFunction node implementation.
  */
-public class ASTTypeFunction extends AbstractScalaNode<Type.Function> {
+public final class ASTTypeFunction extends AbstractScalaNode<Type.Function> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypeFunction(Type.Function scalaNode) {
+    ASTTypeFunction(Type.Function scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeImplicitFunction.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeImplicitFunction.java
index e875b25ad3..e75464d3ad 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeImplicitFunction.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeImplicitFunction.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypeImplicitFunction node implementation.
  */
-public class ASTTypeImplicitFunction extends AbstractScalaNode<Type.ImplicitFunction> {
+public final class ASTTypeImplicitFunction extends AbstractScalaNode<Type.ImplicitFunction> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypeImplicitFunction(Type.ImplicitFunction scalaNode) {
+    ASTTypeImplicitFunction(Type.ImplicitFunction scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeLambda.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeLambda.java
index 9caaa6eb7b..135394001f 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeLambda.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeLambda.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypeLambda node implementation.
  */
-public class ASTTypeLambda extends AbstractScalaNode<Type.Lambda> {
+public final class ASTTypeLambda extends AbstractScalaNode<Type.Lambda> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypeLambda(Type.Lambda scalaNode) {
+    ASTTypeLambda(Type.Lambda scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeMethod.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeMethod.java
index 42f8eff1de..43471bbca6 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeMethod.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeMethod.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypeMethod node implementation.
  */
-public class ASTTypeMethod extends AbstractScalaNode<Type.Method> {
+public final class ASTTypeMethod extends AbstractScalaNode<Type.Method> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypeMethod(Type.Method scalaNode) {
+    ASTTypeMethod(Type.Method scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeName.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeName.java
index b20e873493..a394ca935d 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeName.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeName.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypeName node implementation.
  */
-public class ASTTypeName extends AbstractScalaNode<Type.Name> {
+public final class ASTTypeName extends AbstractScalaNode<Type.Name> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypeName(Type.Name scalaNode) {
+    ASTTypeName(Type.Name scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeOr.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeOr.java
index 742394cbc8..1ce7e726fa 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeOr.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeOr.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypeOr node implementation.
  */
-public class ASTTypeOr extends AbstractScalaNode<Type.Or> {
+public final class ASTTypeOr extends AbstractScalaNode<Type.Or> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypeOr(Type.Or scalaNode) {
+    ASTTypeOr(Type.Or scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeParam.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeParam.java
index fcb64d555c..702c4c563a 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeParam.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeParam.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypeParam node implementation.
  */
-public class ASTTypeParam extends AbstractScalaNode<Type.Param> {
+public final class ASTTypeParam extends AbstractScalaNode<Type.Param> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypeParam(Type.Param scalaNode) {
+    ASTTypeParam(Type.Param scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypePlaceholder.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypePlaceholder.java
index 599fb3eb9b..3e253a0d79 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypePlaceholder.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypePlaceholder.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypePlaceholder node implementation.
  */
-public class ASTTypePlaceholder extends AbstractScalaNode<Type.Placeholder> {
+public final class ASTTypePlaceholder extends AbstractScalaNode<Type.Placeholder> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypePlaceholder(Type.Placeholder scalaNode) {
+    ASTTypePlaceholder(Type.Placeholder scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeProject.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeProject.java
index ca4c3d25fb..6070b42610 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeProject.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeProject.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypeProject node implementation.
  */
-public class ASTTypeProject extends AbstractScalaNode<Type.Project> {
+public final class ASTTypeProject extends AbstractScalaNode<Type.Project> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypeProject(Type.Project scalaNode) {
+    ASTTypeProject(Type.Project scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRefine.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRefine.java
index 8420e0c154..e11d9c0166 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRefine.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRefine.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypeRefine node implementation.
  */
-public class ASTTypeRefine extends AbstractScalaNode<Type.Refine> {
+public final class ASTTypeRefine extends AbstractScalaNode<Type.Refine> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypeRefine(Type.Refine scalaNode) {
+    ASTTypeRefine(Type.Refine scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRepeated.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRepeated.java
index 9443839da1..2d48331849 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRepeated.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRepeated.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypeRepeated node implementation.
  */
-public class ASTTypeRepeated extends AbstractScalaNode<Type.Repeated> {
+public final class ASTTypeRepeated extends AbstractScalaNode<Type.Repeated> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypeRepeated(Type.Repeated scalaNode) {
+    ASTTypeRepeated(Type.Repeated scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSelect.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSelect.java
index e2a8159780..e8cf026f92 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSelect.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSelect.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypeSelect node implementation.
  */
-public class ASTTypeSelect extends AbstractScalaNode<Type.Select> {
+public final class ASTTypeSelect extends AbstractScalaNode<Type.Select> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypeSelect(Type.Select scalaNode) {
+    ASTTypeSelect(Type.Select scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSingleton.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSingleton.java
index 6e48577a81..8708abdbfa 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSingleton.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSingleton.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypeSingleton node implementation.
  */
-public class ASTTypeSingleton extends AbstractScalaNode<Type.Singleton> {
+public final class ASTTypeSingleton extends AbstractScalaNode<Type.Singleton> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypeSingleton(Type.Singleton scalaNode) {
+    ASTTypeSingleton(Type.Singleton scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeTuple.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeTuple.java
index 125555e424..cfa997e9a4 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeTuple.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeTuple.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypeTuple node implementation.
  */
-public class ASTTypeTuple extends AbstractScalaNode<Type.Tuple> {
+public final class ASTTypeTuple extends AbstractScalaNode<Type.Tuple> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypeTuple(Type.Tuple scalaNode) {
+    ASTTypeTuple(Type.Tuple scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeVar.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeVar.java
index e1db18abb0..e3ac8216cb 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeVar.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeVar.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypeVar node implementation.
  */
-public class ASTTypeVar extends AbstractScalaNode<Type.Var> {
+public final class ASTTypeVar extends AbstractScalaNode<Type.Var> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypeVar(Type.Var scalaNode) {
+    ASTTypeVar(Type.Var scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeWith.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeWith.java
index 43adda96f5..baf501da7e 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeWith.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeWith.java
@@ -11,11 +11,9 @@ import scala.meta.Type;
 /**
  * The ASTTypeWith node implementation.
  */
-public class ASTTypeWith extends AbstractScalaNode<Type.With> {
+public final class ASTTypeWith extends AbstractScalaNode<Type.With> {
 
-    @Deprecated
-    @InternalApi
-    public ASTTypeWith(Type.With scalaNode) {
+    ASTTypeWith(Type.With scalaNode) {
         super(scalaNode);
     }
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java
index cc9dd86242..6772031ae6 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java
@@ -4,7 +4,6 @@
 
 package net.sourceforge.pmd.lang.scala.ast;
 
-import net.sourceforge.pmd.annotation.InternalApi;
 import net.sourceforge.pmd.lang.ast.AbstractNode;
 import net.sourceforge.pmd.lang.ast.NodeStream;
 
@@ -18,7 +17,6 @@ import scala.meta.inputs.Position;
  * @param <T>
  *            the type of the Scala tree node
  */
-@InternalApi
 abstract class AbstractScalaNode<T extends Tree> extends AbstractNode implements ScalaNode<T> {
     protected final T node;
     private final Position pos;