More or less done with naming

32 files changed, 253 insertions, 257 deletions

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/AccessSpecifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/AccessSpecifier.java
index f23f8631d..b3011a45c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/AccessSpecifier.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/AccessSpecifier.java
@@ -41,7 +41,7 @@ public enum AccessSpecifier {
         this.codeRepresenation = codeRepresentation;
     }
 
-    public String getCodeRepresenation(){
+    public String asString(){
         return this.codeRepresenation;
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayBracketPair.java b/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayBracketPair.java
index 64df15973..ce756bc62 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayBracketPair.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayBracketPair.java
@@ -15,7 +15,9 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
 /**
  * In, for example, <code>int[] a[];</code> there are two ArrayBracketPair objects,
  * one for the [] after int, one for the [] after a.
+ * @deprecated will be removed in 3.0
  */
+@Deprecated
 public class ArrayBracketPair extends Node implements NodeWithAnnotations<ArrayBracketPair> {
     private NodeList<AnnotationExpr> annotations = new NodeList<>();
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java b/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java
index 3eb331fcd..29206e8c0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java
@@ -60,7 +60,7 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
  */
 public final class CompilationUnit extends Node {
 
-    private PackageDeclaration pakage;
+    private PackageDeclaration packageDeclaration;
 
     private NodeList<ImportDeclaration> imports;
 
@@ -70,14 +70,14 @@ public final class CompilationUnit extends Node {
         this(null, null, new NodeList<>(), new NodeList<>());
     }
 
-    public CompilationUnit(PackageDeclaration pakage, NodeList<ImportDeclaration> imports, NodeList<TypeDeclaration<?>> types) {
-        this(null, pakage, imports, types);
+    public CompilationUnit(PackageDeclaration packageDeclaration, NodeList<ImportDeclaration> imports, NodeList<TypeDeclaration<?>> types) {
+        this(null, packageDeclaration, imports, types);
     }
 
-    public CompilationUnit(Range range, PackageDeclaration pakage, NodeList<ImportDeclaration> imports,
+    public CompilationUnit(Range range, PackageDeclaration packageDeclaration, NodeList<ImportDeclaration> imports,
                            NodeList<TypeDeclaration<?>> types) {
         super(range);
-        setPackage(pakage);
+        setPackage(packageDeclaration);
         setImports(imports);
         setTypes(types);
     }
@@ -129,7 +129,7 @@ public final class CompilationUnit extends Node {
      * @return the package declaration or <code>null</code>
      */
     public Optional<PackageDeclaration> getPackage() {
-        return Optional.ofNullable(pakage);
+        return Optional.ofNullable(packageDeclaration);
     }
 
     /**
@@ -174,13 +174,13 @@ public final class CompilationUnit extends Node {
      * Sets or clear the package declarations of this compilation unit.
      * 
      * @param pakage
-     *            the pakage declaration to set or <code>null</code> to default
+     *            the packageDeclaration declaration to set or <code>null</code> to default
      *            package
      */
     public CompilationUnit setPackage(PackageDeclaration pakage) {
-        notifyPropertyChange(ObservableProperty.PACKAGE, this.pakage, pakage);
-        this.pakage = pakage;
-        setAsParentNodeOf(this.pakage);
+        notifyPropertyChange(ObservableProperty.PACKAGE_DECLARATION, this.packageDeclaration, pakage);
+        this.packageDeclaration = pakage;
+        setAsParentNodeOf(this.packageDeclaration);
         return this;
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/Modifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/Modifier.java
index 383bf16ad..31d358646 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/Modifier.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/Modifier.java
@@ -15,17 +15,17 @@ public enum Modifier {
     NATIVE,

     STRICTFP;

 

-    String asString;

+    final String codeRepresentation;

 

     Modifier() {

-        this.asString = name().toLowerCase();

+        this.codeRepresentation = name().toLowerCase();

     }

 

     /**

      * @return the keyword represented by this modifier.

      */

     public String asString() {

-        return asString;

+        return codeRepresentation;

     }

 

     public EnumSet<Modifier> toEnumSet() {

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/Node.java b/javaparser-core/src/main/java/com/github/javaparser/ast/Node.java
index b8f900a66..a191a49d1 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/Node.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/Node.java
@@ -101,7 +101,7 @@ public abstract class Node implements Cloneable, HasParentNode<Node>, Visitable
 
     private Node parentNode;
 
-    private List<Node> childrenNodes = new LinkedList<>();
+    private List<Node> childNodes = new LinkedList<>();
     private List<Comment> orphanComments = new LinkedList<>();
 
     private IdentityHashMap<DataKey<?>, Object> data = null;
@@ -244,7 +244,7 @@ public abstract class Node implements Cloneable, HasParentNode<Node>, Visitable
      * @return all nodes that have this node as their parent.
      */
     public List<Node> getChildNodes() {
-        return unmodifiableList(childrenNodes);
+        return unmodifiableList(childNodes);
     }
 
     public <N extends Node> boolean containsWithin(N other) {
@@ -308,12 +308,12 @@ public abstract class Node implements Cloneable, HasParentNode<Node>, Visitable
 
         // remove from old parent, if any
         if (this.parentNode != null) {
-            this.parentNode.childrenNodes.remove(this);
+            this.parentNode.childNodes.remove(this);
         }
         this.parentNode = parentNode;
         // add to new parent, if any
         if (this.parentNode != null) {
-            this.parentNode.childrenNodes.add(this);
+            this.parentNode.childNodes.add(this);
         }
         return this;
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java
index 1b2871fd3..8d3d4339e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java
@@ -204,7 +204,7 @@ public final class ConstructorDeclaration extends BodyDeclaration<ConstructorDec
         StringBuilder sb = new StringBuilder();
         if (includingModifiers) {
             AccessSpecifier accessSpecifier = Modifier.getAccessSpecifier(getModifiers());
-            sb.append(accessSpecifier.getCodeRepresenation());
+            sb.append(accessSpecifier.asString());
             sb.append(accessSpecifier == AccessSpecifier.DEFAULT ? "" : " ");
         }
         sb.append(getName());
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java
index eade4c4a9..72fea6614 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java
@@ -346,7 +346,7 @@ public final class MethodDeclaration extends BodyDeclaration<MethodDeclaration>
         StringBuilder sb = new StringBuilder();
         if (includingModifiers) {
             AccessSpecifier accessSpecifier = Modifier.getAccessSpecifier(getModifiers());
-            sb.append(accessSpecifier.getCodeRepresenation());
+            sb.append(accessSpecifier.asString());
             sb.append(accessSpecifier == AccessSpecifier.DEFAULT ? "" : " ");
             if (getModifiers().contains(Modifier.STATIC)) {
                 sb.append("static ");
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/Parameter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/Parameter.java
index 59f24350b..1867228d0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/Parameter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/Parameter.java
@@ -190,7 +190,7 @@ public final class Parameter extends Node implements
             identifier.setName(name);
         } else {
             VariableDeclaratorId newId = new VariableDeclaratorId(name);
-            notifyPropertyChange(ObservableProperty.ID, this.identifier, newId);
+            notifyPropertyChange(ObservableProperty.IDENTIFIER, this.identifier, newId);
             identifier = newId;
         }
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java
index 3e5577f9c..8e3c53d2c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java
@@ -105,7 +105,7 @@ public final class VariableDeclarator extends Node implements
     }
 
     public VariableDeclarator setIdentifier(VariableDeclaratorId identifier) {
-        notifyPropertyChange(ObservableProperty.ID, this.identifier, identifier);
+        notifyPropertyChange(ObservableProperty.IDENTIFIER, this.identifier, identifier);
         this.identifier = assertNotNull(identifier);
         setAsParentNodeOf(this.identifier);
         return this;
@@ -118,7 +118,7 @@ public final class VariableDeclarator extends Node implements
      * @return this, the VariableDeclarator
      */
     public VariableDeclarator setInitializer(Expression initializer) {
-        notifyPropertyChange(ObservableProperty.INIT, this.initializer, initializer);
+        notifyPropertyChange(ObservableProperty.INITIALIZER, this.initializer, initializer);
         this.initializer = initializer;
         setAsParentNodeOf(this.initializer);
         return this;
@@ -132,7 +132,7 @@ public final class VariableDeclarator extends Node implements
      */
     public VariableDeclarator setInit(String init) {
         NameExpr newInit = new NameExpr(assertNotNull(init));
-        notifyPropertyChange(ObservableProperty.INIT, this.initializer, newInit);
+        notifyPropertyChange(ObservableProperty.INITIALIZER, this.initializer, newInit);
         this.initializer = newInit;
         setAsParentNodeOf(this.initializer);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java
index 4c7179c13..638610547 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java
@@ -80,7 +80,7 @@ public class Name extends Node implements NodeWithIdentifier<Name> {
     }
 
     public Name setIdentifier(final String identifier) {
-        notifyPropertyChange(ObservableProperty.ID, this.identifier, identifier);
+        notifyPropertyChange(ObservableProperty.IDENTIFIER, this.identifier, identifier);
         this.identifier = assertNotNull(identifier);
         return this;
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SimpleName.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SimpleName.java
index 8d91fe482..5365bd7a4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SimpleName.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SimpleName.java
@@ -47,7 +47,7 @@ public class SimpleName extends Node implements NodeWithIdentifier<SimpleName> {
 
     @Override
     public SimpleName setIdentifier(final String identifier) {
-        notifyPropertyChange(ObservableProperty.ID, this.identifier, identifier);
+        notifyPropertyChange(ObservableProperty.IDENTIFIER, this.identifier, identifier);
         this.identifier = assertNotNull(identifier);
         return this;
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithIdentifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithIdentifier.java
index 5f096ed2a..0f6b3f935 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithIdentifier.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithIdentifier.java
@@ -11,7 +11,7 @@ public interface NodeWithIdentifier<N extends Node> {
         return getIdentifier();
     }
 
-    default N setId(String id) {
-        return setIdentifier(id);
+    default N setId(String identifier) {
+        return setIdentifier(identifier);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithStatements.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithStatements.java
index 429954f0b..557d5eda8 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithStatements.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithStatements.java
@@ -9,24 +9,24 @@ import com.github.javaparser.ast.stmt.ExpressionStmt;
 import com.github.javaparser.ast.stmt.Statement;

 

 public interface NodeWithStatements<N extends Node> {

-    NodeList<Statement> getStmts();

+    NodeList<Statement> getStatements();

 

-    default Statement getStmt(int i) {

-        return getStmts().get(i);

+    default Statement getStatement(int i) {

+        return getStatements().get(i);

     }

 

-    N setStmts(final NodeList<Statement> stmts);

+    N setStatements(final NodeList<Statement> statements);

 

     @SuppressWarnings("unchecked")

     default N addStatement(Statement statement) {

-        getStmts().add(statement);

+        getStatements().add(statement);

         statement.setParentNode((Node) this);

         return (N) this;

     }

 

     @SuppressWarnings("unchecked")

     default N addStatement(int index, final Statement statement) {

-        getStmts().add(index, statement);

+        getStatements().add(index, statement);

         statement.setParentNode((Node) this);

         return (N) this;

     }

@@ -39,9 +39,6 @@ public interface NodeWithStatements<N extends Node> {
 

     /**

      * It will use {@link JavaParser#parseStatement(String)} inside, so it should end with a semi column

-     * 

-     * @param statement

-     * @return

      */

     default N addStatement(String statement) {

         return addStatement(JavaParser.parseStatement(statement));

@@ -54,13 +51,13 @@ public interface NodeWithStatements<N extends Node> {
     }

 

     default <A extends Statement> A addAndGetStatement(A statement) {

-        getStmts().add(statement);

+        getStatements().add(statement);

         statement.setParentNode((Node) this);

         return statement;

     }

 

     default Statement addAndGetStatement(int index, final Statement statement) {

-        getStmts().add(index, statement);

+        getStatements().add(index, statement);

         statement.setParentNode((Node) this);

         return statement;

     }

@@ -76,7 +73,7 @@ public interface NodeWithStatements<N extends Node> {
     }

 

     default boolean isEmpty() {

-        return getStmts().isEmpty();

+        return getStatements().isEmpty();

     }

 

     @SuppressWarnings("unchecked")

@@ -88,6 +85,6 @@ public interface NodeWithStatements<N extends Node> {
     }

 

     default N copyStatements(NodeWithStatements<?> other) {

-        return copyStatements(other.getStmts());

+        return copyStatements(other.getStatements());

     }

 }

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/observing/ObservableProperty.java b/javaparser-core/src/main/java/com/github/javaparser/ast/observing/ObservableProperty.java
index 063a4dca8..7548e0a6d 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/observing/ObservableProperty.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/observing/ObservableProperty.java
@@ -6,12 +6,14 @@ package com.github.javaparser.ast.observing;
 public enum ObservableProperty {
     ANNOTATIONS,
     ANONYMOUS_CLASS_BODY,
+    @Deprecated
     ARRAY_BRACKET_PAIRS_AFTER_ID,
+    @Deprecated
     ARRAY_BRACKET_PAIRS_AFTER_TYPE,
     ARGUMENTS,
     BLOCK,
     BODY,
-    CATCHS,
+    CATCH_CLAUSES,
     CATCH_BLOCK,
     CHECK,
     CLASS_BODY,
@@ -25,6 +27,7 @@ public enum ObservableProperty {
     DEFAULT_VALUE,
     DIMENSION,
     ELEMENTS,
+    @Deprecated
     ELEMENT_TYPE,
     ELSE_EXPR,
     ELSE_STMT,
@@ -33,12 +36,10 @@ public enum ObservableProperty {
     EXTENDED_TYPES,
     FIELD,
     FINALLY_BLOCK,
-    ID,
     IDENTIFIER,
     IMPLEMENTED_TYPES,
     IMPORTS,
     INDEX,
-    INIT,
     INITIALIZER,
     INNER,
     IS_INTERFACE,
@@ -50,12 +51,12 @@ public enum ObservableProperty {
     MEMBERS,
     MEMBER_VALUE,
     MODIFIERS,
-    MSG,
+    MESSAGE,
     NAME,
     OPERATOR,
-    PACKAGE,
+    PACKAGE_DECLARATION,
     PAIRS,
-    PARAM,
+    PARAMETER,
     PARAMETERS,
     PARAMETERS_ENCLOSED,
     QUALIFIER,
@@ -66,8 +67,8 @@ public enum ObservableProperty {
     SELECTOR,
     STATIC,
     STATIC_MEMBER,
-    STMT,
-    STMTS,
+    STATEMENT,
+    STATEMENTS,
     SUPER,
     TARGET,
     THEN_EXPR,
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java
index f89604fa5..9a6a369a3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java
@@ -39,7 +39,7 @@ public final class AssertStmt extends Statement {
 
     private Expression check;
 
-    private Expression msg;
+    private Expression message;
 
     public AssertStmt() {
         this(null, new BooleanLiteralExpr(), null);
@@ -49,14 +49,14 @@ public final class AssertStmt extends Statement {
         this(null, check, null);
     }
 
-    public AssertStmt(final Expression check, final Expression msg) {
-        this(null, check, msg);
+    public AssertStmt(final Expression check, final Expression message) {
+        this(null, check, message);
     }
 
-    public AssertStmt(final Range range, final Expression check, final Expression msg) {
+    public AssertStmt(final Range range, final Expression check, final Expression message) {
         super(range);
         setCheck(check);
-        setMessage(msg);
+        setMessage(message);
     }
 
     @Override
@@ -74,7 +74,7 @@ public final class AssertStmt extends Statement {
     }
 
     public Optional<Expression> getMessage() {
-        return Optional.ofNullable(msg);
+        return Optional.ofNullable(message);
     }
 
     public AssertStmt setCheck(final Expression check) {
@@ -91,9 +91,9 @@ public final class AssertStmt extends Statement {
      * @return this, the AssertStmt
      */
     public AssertStmt setMessage(final Expression msg) {
-        notifyPropertyChange(ObservableProperty.MSG, this.msg, msg);
-        this.msg = msg;
-        setAsParentNodeOf(this.msg);
+        notifyPropertyChange(ObservableProperty.MESSAGE, this.message, msg);
+        this.message = msg;
+        setAsParentNodeOf(this.message);
         return this;
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java
index d206d4eb0..45da38a5b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java
@@ -35,20 +35,20 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
  */
 public final class BlockStmt extends Statement implements NodeWithStatements<BlockStmt> {
 
-    private NodeList<Statement> stmts;
+    private NodeList<Statement> statements;
 
     public BlockStmt() {
         this(null, new NodeList<>());
     }
 
-    public BlockStmt(final NodeList<Statement> stmts) {
-        this(null, stmts);
+    public BlockStmt(final NodeList<Statement> statements) {
+        this(null, statements);
 
     }
 
-    public BlockStmt(final Range range, final NodeList<Statement> stmts) {
+    public BlockStmt(final Range range, final NodeList<Statement> statements) {
         super(range);
-        setStmts(stmts);
+        setStatements(statements);
     }
 
     @Override
@@ -61,16 +61,14 @@ public final class BlockStmt extends Statement implements NodeWithStatements<Blo
         v.visit(this, arg);
     }
 
-    @Override
-    public NodeList<Statement> getStmts() {
-        return stmts;
+    public NodeList<Statement> getStatements() {
+        return statements;
     }
 
-    @Override
-    public BlockStmt setStmts(final NodeList<Statement> stmts) {
-        notifyPropertyChange(ObservableProperty.STMTS, this.stmts, stmts);
-        this.stmts = assertNotNull(stmts);
-        setAsParentNodeOf(this.stmts);
+    public BlockStmt setStatements(final NodeList<Statement> statements) {
+        notifyPropertyChange(ObservableProperty.STATEMENTS, this.statements, statements);
+        this.statements = assertNotNull(statements);
+        setAsParentNodeOf(this.statements);
         return this;
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java
index bc560792e..ca5e4fdc3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java
@@ -35,7 +35,7 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
  */
 public final class BreakStmt extends Statement {
 
-    private String id;
+    private String identifier;
 
     public BreakStmt() {
         this(null, "empty");
@@ -47,7 +47,7 @@ public final class BreakStmt extends Statement {
 
     public BreakStmt(final Range range, final String id) {
         super(range);
-        this.id = id;
+        this.identifier = id;
     }
 
     @Override
@@ -60,19 +60,19 @@ public final class BreakStmt extends Statement {
         v.visit(this, arg);
     }
 
-    public Optional<String> getId() {
-        return Optional.ofNullable(id);
+    public Optional<String> getIdentifier() {
+        return Optional.ofNullable(identifier);
     }
 
     /**
-     * Sets the id
+     * Sets the identifier
      * 
-     * @param id the id, can be null
+     * @param identifier the identifier, can be null
      * @return this, the BreakStmt
      */
-    public BreakStmt setId(final String id) {
-        notifyPropertyChange(ObservableProperty.ID, this.id, id);
-        this.id = assertNotNull(id);
+    public BreakStmt setIdentifier(final String identifier) {
+        notifyPropertyChange(ObservableProperty.IDENTIFIER, this.identifier, identifier);
+        this.identifier = assertNotNull(identifier);
         return this;
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java
index 83dbc112a..2ec9ee952 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java
@@ -41,7 +41,7 @@ import java.util.EnumSet;
  */
 public final class CatchClause extends Node implements NodeWithBlockStmt<CatchClause> {
 
-    private Parameter param;
+    private Parameter parameter;
 
     private BlockStmt catchBlock;
 
@@ -49,8 +49,8 @@ public final class CatchClause extends Node implements NodeWithBlockStmt<CatchCl
         this(null, new Parameter(), new BlockStmt());         
     }
 
-    public CatchClause(final Parameter param, final BlockStmt catchBlock) {
-        this(null, param, catchBlock);
+    public CatchClause(final Parameter parameter, final BlockStmt catchBlock) {
+        this(null, parameter, catchBlock);
     }
 
     public CatchClause(final EnumSet<Modifier> exceptModifier,
@@ -73,7 +73,7 @@ public final class CatchClause extends Node implements NodeWithBlockStmt<CatchCl
                        final Parameter parameter,
                        final BlockStmt catchBlock) {
         super(range);
-        setParam(parameter);
+        setParameter(parameter);
         setBody(catchBlock);
     }
 
@@ -97,8 +97,8 @@ public final class CatchClause extends Node implements NodeWithBlockStmt<CatchCl
 	 * Note that the type of the Parameter can be a UnionType. In this case, any annotations found at the start of the catch(@X A a |...)
 	 * are found directly in the Parameter. Annotations that are on the second or later type - catch(A a | @X B b ...) are found on those types.
 	 */
-	public Parameter getParam() {
-		return param;
+	public Parameter getParameter() {
+		return parameter;
 	}
 
     /**
@@ -109,10 +109,10 @@ public final class CatchClause extends Node implements NodeWithBlockStmt<CatchCl
         return setBody(catchBlock);
 	}
 
-	public CatchClause setParam(final Parameter param) {
-        notifyPropertyChange(ObservableProperty.PARAM, this.param, param);
-		this.param = param;
-		setAsParentNodeOf(this.param);
+	public CatchClause setParameter(final Parameter parameter) {
+        notifyPropertyChange(ObservableProperty.PARAMETER, this.parameter, parameter);
+		this.parameter = parameter;
+		setAsParentNodeOf(this.parameter);
         return this;
 	}
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java
index 5dcb5869a..aad3208aa 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java
@@ -35,19 +35,19 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
  */
 public final class ContinueStmt extends Statement {
 
-	private String id;
+	private String identifier;
 
 	public ContinueStmt() {
         this(null, null);
 	}
 
-	public ContinueStmt(final String id) {
-		this(null, id);
+	public ContinueStmt(final String identifier) {
+		this(null, identifier);
 	}
 
-	public ContinueStmt(Range range, final String id) {
+	public ContinueStmt(Range range, final String identifier) {
 		super(range);
-		this.id = id;
+		this.identifier = identifier;
 	}
 
 	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
@@ -58,19 +58,19 @@ public final class ContinueStmt extends Statement {
 		v.visit(this, arg);
 	}
 
-    public Optional<String> getId() {
-        return Optional.ofNullable(id);
+    public Optional<String> getIdentifier() {
+        return Optional.ofNullable(identifier);
     }
 
     /**
-     * Sets the id
+     * Sets the identifier
      * 
-     * @param id the id, can be null
+     * @param identifier the identifier, can be null
      * @return this, the ContinueStmt
      */
-    public ContinueStmt setId(final String id) {
-	    notifyPropertyChange(ObservableProperty.ID, this.id, id);
-        this.id = assertNotNull(id);
+    public ContinueStmt setIdentifier(final String identifier) {
+	    notifyPropertyChange(ObservableProperty.IDENTIFIER, this.identifier, identifier);
+        this.identifier = assertNotNull(identifier);
         return this;
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java
index 4e6846037..68310a783 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java
@@ -39,7 +39,7 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
  */
 public final class ForStmt extends Statement implements NodeWithBody<ForStmt> {
 
-    private NodeList<Expression> init;
+    private NodeList<Expression> initialization;
 
     private Expression compare;
 
@@ -55,17 +55,17 @@ public final class ForStmt extends Statement implements NodeWithBody<ForStmt> {
                 new EmptyStmt());
     }
 
-    public ForStmt(final NodeList<Expression> init, final Expression compare,
+    public ForStmt(final NodeList<Expression> initialization, final Expression compare,
                    final NodeList<Expression> update, final Statement body) {
-        this(null, init, compare, update, body);
+        this(null, initialization, compare, update, body);
     }
 
     public ForStmt(Range range,
-                   final NodeList<Expression> init, final Expression compare,
+                   final NodeList<Expression> initialization, final Expression compare,
                    final NodeList<Expression> update, final Statement body) {
         super(range);
         setCompare(compare);
-        setInit(init);
+        setInitialization(initialization);
         setUpdate(update);
         setBody(body);
     }
@@ -89,8 +89,8 @@ public final class ForStmt extends Statement implements NodeWithBody<ForStmt> {
         return Optional.ofNullable(compare);
     }
 
-    public NodeList<Expression> getInit() {
-        return init;
+    public NodeList<Expression> getInitialization() {
+        return initialization;
     }
 
     public NodeList<Expression> getUpdate() {
@@ -118,10 +118,10 @@ public final class ForStmt extends Statement implements NodeWithBody<ForStmt> {
         return this;
     }
 
-    public ForStmt setInit(final NodeList<Expression> init) {
-        notifyPropertyChange(ObservableProperty.INIT, this.init, init);
-        this.init = assertNotNull(init);
-        setAsParentNodeOf(this.init);
+    public ForStmt setInitialization(final NodeList<Expression> initialization) {
+        notifyPropertyChange(ObservableProperty.INITIALIZER, this.initialization, initialization);
+        this.initialization = assertNotNull(initialization);
+        setAsParentNodeOf(this.initialization);
         return this;
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java
index 24c237a62..3d4e015e2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java
@@ -37,7 +37,7 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
  */
 public final class ForeachStmt extends Statement implements NodeWithBody<ForeachStmt> {
 
-    private VariableDeclarationExpr var;
+    private VariableDeclarationExpr variable;
 
     private Expression iterable;
 
@@ -50,22 +50,22 @@ public final class ForeachStmt extends Statement implements NodeWithBody<Foreach
                 new EmptyStmt());
     }
 
-    public ForeachStmt(final VariableDeclarationExpr var,
+    public ForeachStmt(final VariableDeclarationExpr variable,
                        final Expression iterable, final Statement body) {
-        this(null, var, iterable, body);
+        this(null, variable, iterable, body);
     }
 
     public ForeachStmt(Range range,
-                       final VariableDeclarationExpr var, final Expression iterable,
+                       final VariableDeclarationExpr variable, final Expression iterable,
                        final Statement body) {
         super(range);
-        setVariable(var);
+        setVariable(variable);
         setIterable(iterable);
         setBody(body);
     }
 
-    public ForeachStmt(VariableDeclarationExpr var, String iterable, BlockStmt body) {
-        this(null, var, new NameExpr(iterable), body);
+    public ForeachStmt(VariableDeclarationExpr variable, String iterable, BlockStmt body) {
+        this(null, variable, new NameExpr(iterable), body);
     }
 
     @Override
@@ -88,7 +88,7 @@ public final class ForeachStmt extends Statement implements NodeWithBody<Foreach
     }
 
     public VariableDeclarationExpr getVariable() {
-        return var;
+        return variable;
     }
 
     @Override
@@ -107,9 +107,9 @@ public final class ForeachStmt extends Statement implements NodeWithBody<Foreach
     }
 
     public ForeachStmt setVariable(final VariableDeclarationExpr var) {
-        notifyPropertyChange(ObservableProperty.VARIABLE, this.var, var);
-        this.var = assertNotNull(var);
-        setAsParentNodeOf(this.var);
+        notifyPropertyChange(ObservableProperty.VARIABLE, this.variable, var);
+        this.variable = assertNotNull(var);
+        setAsParentNodeOf(this.variable);
         return this;
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java
index b7e886596..182735066 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java
@@ -35,20 +35,20 @@ public final class LabeledStmt extends Statement {
 
 	private String label;
 
-	private Statement stmt;
+	private Statement statement;
 
 	public LabeledStmt() {
         this(null, "empty", new EmptyStmt());
 	}
 
-	public LabeledStmt(final String label, final Statement stmt) {
-        this(null, label, stmt);
+	public LabeledStmt(final String label, final Statement statement) {
+        this(null, label, statement);
 	}
 
-	public LabeledStmt(Range range, final String label, final Statement stmt) {
+	public LabeledStmt(Range range, final String label, final Statement statement) {
 		super(range);
 		setLabel(label);
-		setStmt(stmt);
+		setStatement(statement);
 	}
 
 	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
@@ -63,8 +63,8 @@ public final class LabeledStmt extends Statement {
 		return label;
 	}
 
-	public Statement getStmt() {
-		return stmt;
+	public Statement getStatement() {
+		return statement;
 	}
 
 	public LabeledStmt setLabel(final String label) {
@@ -73,10 +73,10 @@ public final class LabeledStmt extends Statement {
 		return this;
 	}
 
-	public LabeledStmt setStmt(final Statement stmt) {
-		notifyPropertyChange(ObservableProperty.STMT, this.stmt, stmt);
-		this.stmt = assertNotNull(stmt);
-		setAsParentNodeOf(this.stmt);
+	public LabeledStmt setStatement(final Statement statement) {
+		notifyPropertyChange(ObservableProperty.STATEMENT, this.statement, statement);
+		this.statement = assertNotNull(statement);
+		setAsParentNodeOf(this.statement);
 		return this;
 	}
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
index d4b29a546..c24182973 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
@@ -40,21 +40,21 @@ public final class SwitchEntryStmt extends Statement implements NodeWithStatemen
 
 	private Expression label;
 
-	private NodeList<Statement> stmts;
+	private NodeList<Statement> statements;
 
 	public SwitchEntryStmt() {
 		this(null, null, new NodeList<>());
 	}
 
-	public SwitchEntryStmt(final Expression label, final NodeList<Statement> stmts) {
-		this(null, label, stmts);
+	public SwitchEntryStmt(final Expression label, final NodeList<Statement> statements) {
+		this(null, label, statements);
 	}
 
 	public SwitchEntryStmt(Range range, final Expression label,
-	                       final NodeList<Statement> stmts) {
+	                       final NodeList<Statement> statements) {
 		super(range);
 		setLabel(label);
-		setStmts(stmts);
+		setStatements(statements);
 	}
 
 	@Override
@@ -71,9 +71,8 @@ public final class SwitchEntryStmt extends Statement implements NodeWithStatemen
         return Optional.ofNullable(label);
 	}
 
-	@Override
-    public NodeList<Statement> getStmts() {
-        return stmts;
+	public NodeList<Statement> getStatements() {
+        return statements;
 	}
 
     /**
@@ -89,11 +88,10 @@ public final class SwitchEntryStmt extends Statement implements NodeWithStatemen
 		return this;
 	}
 
-	@Override
-    public SwitchEntryStmt setStmts(final NodeList<Statement> stmts) {
-		notifyPropertyChange(ObservableProperty.STMTS, this.stmts, stmts);
-		this.stmts = assertNotNull(stmts);
-		setAsParentNodeOf(this.stmts);
+	public SwitchEntryStmt setStatements(final NodeList<Statement> statements) {
+		notifyPropertyChange(ObservableProperty.STATEMENTS, this.statements, statements);
+		this.statements = assertNotNull(statements);
+		setAsParentNodeOf(this.statements);
         return this;
 	}
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java
index 93314764b..83e8cc15a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java
@@ -40,7 +40,7 @@ public final class TryStmt extends Statement {
     // TODO can be null
 	private BlockStmt tryBlock;
 
-	private NodeList<CatchClause> catchs;
+	private NodeList<CatchClause> catchClauses;
 
     // TODO can be null
 	private BlockStmt finallyBlock;
@@ -53,21 +53,21 @@ public final class TryStmt extends Statement {
 				null);
 	}
 
-	public TryStmt(final BlockStmt tryBlock, final NodeList<CatchClause> catchs,
+	public TryStmt(final BlockStmt tryBlock, final NodeList<CatchClause> catchClauses,
 			final BlockStmt finallyBlock) {
 		this(null,
 				new NodeList<>(),
 				tryBlock,
-				catchs,
+                catchClauses,
 				finallyBlock);
 	}
 
 	public TryStmt(Range range, NodeList<VariableDeclarationExpr> resources,
-	               final BlockStmt tryBlock, final NodeList<CatchClause> catchs, final BlockStmt finallyBlock) {
+                   final BlockStmt tryBlock, final NodeList<CatchClause> catchClauses, final BlockStmt finallyBlock) {
 		super(range);
 		setResources(resources);
 		setTryBlock(tryBlock);
-		setCatchs(catchs);
+		setCatchClauses(catchClauses);
 		setFinallyBlock(finallyBlock);
 	}
 
@@ -81,8 +81,8 @@ public final class TryStmt extends Statement {
 		v.visit(this, arg);
 	}
 
-	public NodeList<CatchClause> getCatchs() {
-        return catchs;
+	public NodeList<CatchClause> getCatchClauses() {
+        return catchClauses;
 	}
 
 	public BlockStmt getFinallyBlock() {
@@ -97,10 +97,10 @@ public final class TryStmt extends Statement {
         return resources;
 	}
 
-	public TryStmt setCatchs(final NodeList<CatchClause> catchs) {
-		notifyPropertyChange(ObservableProperty.CATCHS, this.catchs, catchs);
-		this.catchs = assertNotNull(catchs);
-		setAsParentNodeOf(this.catchs);
+	public TryStmt setCatchClauses(final NodeList<CatchClause> catchClauses) {
+		notifyPropertyChange(ObservableProperty.CATCH_CLAUSES, this.catchClauses, catchClauses);
+		this.catchClauses = assertNotNull(catchClauses);
+		setAsParentNodeOf(this.catchClauses);
 		return this;
 	}
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/WildcardType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/WildcardType.java
index 010de5d98..41199bef3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/WildcardType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/WildcardType.java
@@ -35,27 +35,27 @@ import java.util.Optional;
  */
 public final class WildcardType extends Type<WildcardType> implements NodeWithAnnotations<WildcardType> {
 
-    private ReferenceType<?> ext;
+    private ReferenceType<?> extendedTypes;
 
-    private ReferenceType<?> sup;
+    private ReferenceType<?> superTypes;
 
 	public WildcardType() {
         this(null, null, null);
 	}
 
-	public WildcardType(final ReferenceType<?> ext) {
-		this(null, ext, null);
+	public WildcardType(final ReferenceType<?> extendedTypes) {
+		this(null, extendedTypes, null);
 	}
 
-	public WildcardType(final ReferenceType<?> ext, final ReferenceType<?> sup) {
-        this(null, ext, sup);
+	public WildcardType(final ReferenceType<?> extendedTypes, final ReferenceType<?> superTypes) {
+        this(null, extendedTypes, superTypes);
 	}
 
 	public WildcardType(final Range range,
-			final ReferenceType<?> ext, final ReferenceType<?> sup) {
+                        final ReferenceType<?> extendedTypes, final ReferenceType<?> superTypes) {
 		super(range, new NodeList<>());
-		setExtends(ext);
-		setSuper(sup);
+		setExtendedTypes(extendedTypes);
+		setSuperTypes(superTypes);
 	}
 
 	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
@@ -66,12 +66,12 @@ public final class WildcardType extends Type<WildcardType> implements NodeWithAn
 		v.visit(this, arg);
 	}
 
-    public Optional<ReferenceType<?>> getExtends() {
-        return Optional.ofNullable(ext);
+    public Optional<ReferenceType<?>> getExtendedTypes() {
+        return Optional.ofNullable(extendedTypes);
 	}
 
-    public Optional<ReferenceType<?>> getSuper() {
-        return Optional.ofNullable(sup);
+    public Optional<ReferenceType<?>> getSuperTypes() {
+        return Optional.ofNullable(superTypes);
 	}
 
     /**
@@ -80,10 +80,10 @@ public final class WildcardType extends Type<WildcardType> implements NodeWithAn
      * @param ext the extends, can be null
      * @return this, the WildcardType
      */
-    public WildcardType setExtends(final ReferenceType<?> ext) {
-	    notifyPropertyChange(ObservableProperty.EXTENDED_TYPES, this.ext, ext);
-		this.ext = ext;
-		setAsParentNodeOf(this.ext);
+    public WildcardType setExtendedTypes(final ReferenceType<?> ext) {
+	    notifyPropertyChange(ObservableProperty.EXTENDED_TYPES, this.extendedTypes, ext);
+		this.extendedTypes = ext;
+		setAsParentNodeOf(this.extendedTypes);
 		return this;
 	}
 
@@ -93,10 +93,10 @@ public final class WildcardType extends Type<WildcardType> implements NodeWithAn
      * @param sup the super, can be null
      * @return this, the WildcardType
      */
-    public WildcardType setSuper(final ReferenceType<?> sup) {
-	    notifyPropertyChange(ObservableProperty.SUPER, this.sup, sup);
-		this.sup = sup;
-		setAsParentNodeOf(this.sup);
+    public WildcardType setSuperTypes(final ReferenceType<?> sup) {
+	    notifyPropertyChange(ObservableProperty.SUPER, this.superTypes, sup);
+		this.superTypes = sup;
+		setAsParentNodeOf(this.superTypes);
 		return this;
 	}
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java
index e26536d9f..89c8ab7d9 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java
@@ -516,8 +516,8 @@ public class CloneVisitor implements GenericVisitor<Visitable, Object> {
 	@Override
 	public Visitable visit(WildcardType _n, Object _arg) {
 		NodeList<AnnotationExpr> annotations = cloneList(_n.getAnnotations(), _arg);
-		ReferenceType ext = cloneNode(_n.getExtends(), _arg);
-		ReferenceType sup = cloneNode(_n.getSuper(), _arg);
+		ReferenceType ext = cloneNode(_n.getExtendedTypes(), _arg);
+		ReferenceType sup = cloneNode(_n.getSuperTypes(), _arg);
 		Comment comment = cloneNode(_n.getComment(), _arg);
 
 		WildcardType r = new WildcardType(
@@ -1016,7 +1016,7 @@ public class CloneVisitor implements GenericVisitor<Visitable, Object> {
 
 	@Override
 	public Visitable visit(BlockStmt _n, Object _arg) {
-		NodeList<Statement> stmts = cloneList(_n.getStmts(), _arg);
+		NodeList<Statement> stmts = cloneList(_n.getStatements(), _arg);
 		Comment comment = cloneNode(_n.getComment(), _arg);
 
 		BlockStmt r = new BlockStmt(
@@ -1029,7 +1029,7 @@ public class CloneVisitor implements GenericVisitor<Visitable, Object> {
 
 	@Override
 	public Visitable visit(LabeledStmt _n, Object _arg) {
-		Statement stmt = cloneNode(_n.getStmt(), _arg);
+		Statement stmt = cloneNode(_n.getStatement(), _arg);
 		Comment comment = cloneNode(_n.getComment(), _arg);
 
 		LabeledStmt r = new LabeledStmt(
@@ -1079,7 +1079,7 @@ public class CloneVisitor implements GenericVisitor<Visitable, Object> {
 	@Override
 	public Visitable visit(SwitchEntryStmt _n, Object _arg) {
 		Expression label = cloneNode(_n.getLabel(), _arg);
-		NodeList<Statement> stmts = cloneList(_n.getStmts(), _arg);
+		NodeList<Statement> stmts = cloneList(_n.getStatements(), _arg);
 		Comment comment = cloneNode(_n.getComment(), _arg);
 
 		SwitchEntryStmt r = new SwitchEntryStmt(
@@ -1096,7 +1096,7 @@ public class CloneVisitor implements GenericVisitor<Visitable, Object> {
 
 		BreakStmt r = new BreakStmt(
 				_n.getRange().orElse(null),
-                _n.getId().orElse(null)
+                _n.getIdentifier().orElse(null)
 		);
 		r.setComment(comment);
 		return r;
@@ -1150,7 +1150,7 @@ public class CloneVisitor implements GenericVisitor<Visitable, Object> {
 
 		ContinueStmt r = new ContinueStmt(
 				_n.getRange().orElse(null),
-                _n.getId().orElse(null)
+                _n.getIdentifier().orElse(null)
 		);
 		r.setComment(comment);
 		return r;
@@ -1187,7 +1187,7 @@ public class CloneVisitor implements GenericVisitor<Visitable, Object> {
 
 	@Override
 	public Visitable visit(ForStmt _n, Object _arg) {
-		NodeList<Expression> init = cloneList(_n.getInit(), _arg);
+		NodeList<Expression> init = cloneList(_n.getInitialization(), _arg);
 		Expression compare = cloneNode(_n.getCompare(), _arg);
 		NodeList<Expression> update = cloneList(_n.getUpdate(), _arg);
 		Statement body = cloneNode(_n.getBody(), _arg);
@@ -1232,7 +1232,7 @@ public class CloneVisitor implements GenericVisitor<Visitable, Object> {
 	public Visitable visit(TryStmt _n, Object _arg) {
 		NodeList<VariableDeclarationExpr> resources = cloneList(_n.getResources(),_arg);
 		BlockStmt tryBlock = cloneNode(_n.getTryBlock(), _arg);
-		NodeList<CatchClause> catchs = cloneList(_n.getCatchs(), _arg);
+		NodeList<CatchClause> catchs = cloneList(_n.getCatchClauses(), _arg);
 		BlockStmt finallyBlock = cloneNode(_n.getFinallyBlock(), _arg);
 		Comment comment = cloneNode(_n.getComment(), _arg);
 
@@ -1246,7 +1246,7 @@ public class CloneVisitor implements GenericVisitor<Visitable, Object> {
 
 	@Override
 	public Visitable visit(CatchClause _n, Object _arg) {
-		Parameter param = cloneNode(_n.getParam(), _arg);
+		Parameter param = cloneNode(_n.getParameter(), _arg);
 		BlockStmt catchBlock = cloneNode(_n.getBody(), _arg);
 		Comment comment = cloneNode(_n.getComment(), _arg);
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java
index 1a9c09eb7..e88b53585 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java
@@ -763,11 +763,11 @@ public class EqualsVisitor implements GenericVisitor<Boolean, Visitable> {
 	@Override public Boolean visit(final WildcardType n1, final Visitable arg) {
 		final WildcardType n2 = (WildcardType) arg;
 
-        if (!nodeEquals(n1.getExtends().orElse(null), n2.getExtends().orElse(null))) {
+        if (!nodeEquals(n1.getExtendedTypes().orElse(null), n2.getExtendedTypes().orElse(null))) {
 			return false;
 		}
 
-        if (!nodeEquals(n1.getSuper().orElse(null), n2.getSuper().orElse(null))) {
+        if (!nodeEquals(n1.getSuperTypes().orElse(null), n2.getSuperTypes().orElse(null))) {
 			return false;
 		}
 		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
@@ -1262,7 +1262,7 @@ public class EqualsVisitor implements GenericVisitor<Boolean, Visitable> {
 	@Override public Boolean visit(final BlockStmt n1, final Visitable arg) {
 		final BlockStmt n2 = (BlockStmt) arg;
 
-		if (!nodesEquals(n1.getStmts(), n2.getStmts())) {
+		if (!nodesEquals(n1.getStatements(), n2.getStatements())) {
 			return false;
 		}
 
@@ -1272,7 +1272,7 @@ public class EqualsVisitor implements GenericVisitor<Boolean, Visitable> {
 	@Override public Boolean visit(final LabeledStmt n1, final Visitable arg) {
 		final LabeledStmt n2 = (LabeledStmt) arg;
 
-		if (!nodeEquals(n1.getStmt(), n2.getStmt())) {
+		if (!nodeEquals(n1.getStatement(), n2.getStatement())) {
 			return false;
 		}
 
@@ -1314,7 +1314,7 @@ public class EqualsVisitor implements GenericVisitor<Boolean, Visitable> {
 			return false;
 		}
 
-		if (!nodesEquals(n1.getStmts(), n2.getStmts())) {
+		if (!nodesEquals(n1.getStatements(), n2.getStatements())) {
 			return false;
 		}
 
@@ -1324,7 +1324,7 @@ public class EqualsVisitor implements GenericVisitor<Boolean, Visitable> {
 	@Override public Boolean visit(final BreakStmt n1, final Visitable arg) {
 		final BreakStmt n2 = (BreakStmt) arg;
 
-		if (!objEquals(n1.getId(), n2.getId())) {
+		if (!objEquals(n1.getIdentifier(), n2.getIdentifier())) {
 			return false;
 		}
 
@@ -1376,7 +1376,7 @@ public class EqualsVisitor implements GenericVisitor<Boolean, Visitable> {
 	@Override public Boolean visit(final ContinueStmt n1, final Visitable arg) {
 		final ContinueStmt n2 = (ContinueStmt) arg;
 
-		if (!objEquals(n1.getId(), n2.getId())) {
+		if (!objEquals(n1.getIdentifier(), n2.getIdentifier())) {
 			return false;
 		}
 
@@ -1418,7 +1418,7 @@ public class EqualsVisitor implements GenericVisitor<Boolean, Visitable> {
 	@Override public Boolean visit(final ForStmt n1, final Visitable arg) {
 		final ForStmt n2 = (ForStmt) arg;
 
-		if (!nodesEquals(n1.getInit(), n2.getInit())) {
+		if (!nodesEquals(n1.getInitialization(), n2.getInitialization())) {
 			return false;
 		}
 
@@ -1468,7 +1468,7 @@ public class EqualsVisitor implements GenericVisitor<Boolean, Visitable> {
 			return false;
 		}
 
-		if (!nodesEquals(n1.getCatchs(), n2.getCatchs())) {
+		if (!nodesEquals(n1.getCatchClauses(), n2.getCatchClauses())) {
 			return false;
 		}
 		
@@ -1486,7 +1486,7 @@ public class EqualsVisitor implements GenericVisitor<Boolean, Visitable> {
 	@Override public Boolean visit(final CatchClause n1, final Visitable arg) {
 		final CatchClause n2 = (CatchClause) arg;
 
-		if (!nodeEquals(n1.getParam(), n2.getParam())) {
+		if (!nodeEquals(n1.getParameter(), n2.getParameter())) {
 			return false;
 		}
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java
index 7c2a79ef8..32fa84247 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java
@@ -303,8 +303,8 @@ public abstract class GenericVisitorAdapter<R, A> implements GenericVisitor<R, A
     @Override
     public R visit(final BlockStmt n, final A arg) {
         visitComment(n, arg);
-        if (n.getStmts() != null) {
-            for (final Statement s : n.getStmts()) {
+        if (n.getStatements() != null) {
+            for (final Statement s : n.getStatements()) {
                 {
                     R result = s.accept(this, arg);
                     if (result != null) {
@@ -351,7 +351,7 @@ public abstract class GenericVisitorAdapter<R, A> implements GenericVisitor<R, A
     public R visit(final CatchClause n, final A arg) {
         visitComment(n, arg);
         {
-            R result = n.getParam().accept(this, arg);
+            R result = n.getParameter().accept(this, arg);
             if (result != null) {
                 return result;
             }
@@ -848,8 +848,8 @@ public abstract class GenericVisitorAdapter<R, A> implements GenericVisitor<R, A
     @Override
     public R visit(final ForStmt n, final A arg) {
         visitComment(n, arg);
-        if (n.getInit() != null) {
-            for (final Expression e : n.getInit()) {
+        if (n.getInitialization() != null) {
+            for (final Expression e : n.getInitialization()) {
                 {
                     R result = e.accept(this, arg);
                     if (result != null) {
@@ -962,7 +962,7 @@ public abstract class GenericVisitorAdapter<R, A> implements GenericVisitor<R, A
     public R visit(final LabeledStmt n, final A arg) {
         visitComment(n, arg);
         {
-            R result = n.getStmt().accept(this, arg);
+            R result = n.getStatement().accept(this, arg);
             if (result != null) {
                 return result;
             }
@@ -1401,8 +1401,8 @@ public abstract class GenericVisitorAdapter<R, A> implements GenericVisitor<R, A
                 }
             }
         }
-        if (n.getStmts() != null) {
-            for (final Statement s : n.getStmts()) {
+        if (n.getStatements() != null) {
+            for (final Statement s : n.getStatements()) {
                 {
                     R result = s.accept(this, arg);
                     if (result != null) {
@@ -1502,8 +1502,8 @@ public abstract class GenericVisitorAdapter<R, A> implements GenericVisitor<R, A
                 return result;
             }
         }
-        if (n.getCatchs() != null) {
-            for (final CatchClause c : n.getCatchs()) {
+        if (n.getCatchClauses() != null) {
+            for (final CatchClause c : n.getCatchClauses()) {
                 {
                     R result = c.accept(this, arg);
                     if (result != null) {
@@ -1660,17 +1660,17 @@ public abstract class GenericVisitorAdapter<R, A> implements GenericVisitor<R, A
                 return result;
             }
         }
-        if (n.getExtends().isPresent()) {
+        if (n.getExtendedTypes().isPresent()) {
             {
-                R result = n.getExtends().get().accept(this, arg);
+                R result = n.getExtendedTypes().get().accept(this, arg);
                 if (result != null) {
                     return result;
                 }
             }
         }
-        if (n.getSuper().isPresent()) {
+        if (n.getSuperTypes().isPresent()) {
             {
-                R result = n.getSuper().get().accept(this, arg);
+                R result = n.getSuperTypes().get().accept(this, arg);
                 if (result != null) {
                     return result;
                 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java
index 0657b4931..031db9207 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java
@@ -243,7 +243,7 @@ public class ModifierVisitorAdapter<A> implements GenericVisitor<Visitable, A> {
     @Override
     public Visitable visit(final BlockStmt n, final A arg) {
         visitComment(n, arg);
-        n.setStmts((NodeList<Statement>) n.getStmts().accept(this, arg));
+        n.setStatements((NodeList<Statement>) n.getStatements().accept(this, arg));
         return n;
     }
 
@@ -278,7 +278,7 @@ public class ModifierVisitorAdapter<A> implements GenericVisitor<Visitable, A> {
     @Override
     public Visitable visit(final CatchClause n, final A arg) {
         visitComment(n, arg);
-        n.setParam((Parameter) n.getParam().accept(this, arg));
+        n.setParameter((Parameter) n.getParameter().accept(this, arg));
         n.setBody((BlockStmt) n.getBody().accept(this, arg));
         return n;
 
@@ -486,7 +486,7 @@ public class ModifierVisitorAdapter<A> implements GenericVisitor<Visitable, A> {
     @Override
     public Visitable visit(final ForStmt n, final A arg) {
         visitComment(n, arg);
-        n.setInit((NodeList<Expression>) n.getInit().accept(this, arg));
+        n.setInitialization((NodeList<Expression>) n.getInitialization().accept(this, arg));
         if (n.getCompare().isPresent()) {
             n.setCompare((Expression) n.getCompare().get().accept(this, arg));
         }
@@ -552,7 +552,7 @@ public class ModifierVisitorAdapter<A> implements GenericVisitor<Visitable, A> {
     @Override
     public Visitable visit(final LabeledStmt n, final A arg) {
         visitComment(n, arg);
-        n.setStmt((Statement) n.getStmt().accept(this, arg));
+        n.setStatement((Statement) n.getStatement().accept(this, arg));
         return n;
     }
 
@@ -751,7 +751,7 @@ public class ModifierVisitorAdapter<A> implements GenericVisitor<Visitable, A> {
         if (n.getLabel().isPresent()) {
             n.setLabel((Expression) n.getLabel().get().accept(this, arg));
         }
-        n.setStmts((NodeList<Statement>) n.getStmts().accept(this, arg));
+        n.setStatements((NodeList<Statement>) n.getStatements().accept(this, arg));
         return n;
     }
 
@@ -793,7 +793,7 @@ public class ModifierVisitorAdapter<A> implements GenericVisitor<Visitable, A> {
         visitComment(n, arg);
         n.setResources((NodeList<VariableDeclarationExpr>) n.getResources().accept(this, arg));
         n.setTryBlock((BlockStmt) n.getTryBlock().accept(this, arg));
-        n.setCatchs((NodeList<CatchClause>) n.getCatchs().accept(this, arg));
+        n.setCatchClauses((NodeList<CatchClause>) n.getCatchClauses().accept(this, arg));
         if (n.getFinallyBlock() != null) {
             n.setFinallyBlock((BlockStmt) n.getFinallyBlock().accept(this, arg));
         }
@@ -882,11 +882,11 @@ public class ModifierVisitorAdapter<A> implements GenericVisitor<Visitable, A> {
     public Visitable visit(final WildcardType n, final A arg) {
         visitComment(n, arg);
         visitAnnotations(n, arg);
-        if (n.getExtends().isPresent()) {
-            n.setExtends((ReferenceType) n.getExtends().get().accept(this, arg));
+        if (n.getExtendedTypes().isPresent()) {
+            n.setExtendedTypes((ReferenceType) n.getExtendedTypes().get().accept(this, arg));
         }
-        if (n.getSuper().isPresent()) {
-            n.setSuper((ReferenceType) n.getSuper().get().accept(this, arg));
+        if (n.getSuperTypes().isPresent()) {
+            n.setSuperTypes((ReferenceType) n.getSuperTypes().get().accept(this, arg));
         }
         return n;
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java
index 646e18032..b4da7f913 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java
@@ -212,8 +212,8 @@ public abstract class VoidVisitorAdapter<A> implements VoidVisitor<A> {
     @Override
     public void visit(final BlockStmt n, final A arg) {
         visitComment(n.getComment(), arg);
-        if (n.getStmts() != null) {
-            for (final Statement s : n.getStmts()) {
+        if (n.getStatements() != null) {
+            for (final Statement s : n.getStatements()) {
                 s.accept(this, arg);
             }
         }
@@ -239,7 +239,7 @@ public abstract class VoidVisitorAdapter<A> implements VoidVisitor<A> {
     @Override
     public void visit(final CatchClause n, final A arg) {
         visitComment(n.getComment(), arg);
-        n.getParam().accept(this, arg);
+        n.getParameter().accept(this, arg);
         n.getBody().accept(this, arg);
     }
 
@@ -467,8 +467,8 @@ public abstract class VoidVisitorAdapter<A> implements VoidVisitor<A> {
     @Override
     public void visit(final ForStmt n, final A arg) {
         visitComment(n.getComment(), arg);
-        if (n.getInit() != null) {
-            for (final Expression e : n.getInit()) {
+        if (n.getInitialization() != null) {
+            for (final Expression e : n.getInitialization()) {
                 e.accept(this, arg);
             }
         }
@@ -523,7 +523,7 @@ public abstract class VoidVisitorAdapter<A> implements VoidVisitor<A> {
     @Override
     public void visit(final LabeledStmt n, final A arg) {
         visitComment(n.getComment(), arg);
-        n.getStmt().accept(this, arg);
+        n.getStatement().accept(this, arg);
     }
 
     @Override
@@ -744,8 +744,8 @@ public abstract class VoidVisitorAdapter<A> implements VoidVisitor<A> {
         if (n.getLabel().isPresent()) {
             n.getLabel().get().accept(this, arg);
         }
-        if (n.getStmts() != null) {
-            for (final Statement s : n.getStmts()) {
+        if (n.getStatements() != null) {
+            for (final Statement s : n.getStatements()) {
                 s.accept(this, arg);
             }
         }
@@ -792,8 +792,8 @@ public abstract class VoidVisitorAdapter<A> implements VoidVisitor<A> {
             }
         }
         n.getTryBlock().accept(this, arg);
-        if (n.getCatchs() != null) {
-            for (final CatchClause c : n.getCatchs()) {
+        if (n.getCatchClauses() != null) {
+            for (final CatchClause c : n.getCatchClauses()) {
                 c.accept(this, arg);
             }
         }
@@ -871,11 +871,11 @@ public abstract class VoidVisitorAdapter<A> implements VoidVisitor<A> {
     public void visit(final WildcardType n, final A arg) {
         visitComment(n.getComment(), arg);
         visitAnnotations(n, arg);
-        if (n.getExtends().isPresent()) {
-            n.getExtends().get().accept(this, arg);
+        if (n.getExtendedTypes().isPresent()) {
+            n.getExtendedTypes().get().accept(this, arg);
         }
-        if (n.getSuper().isPresent()) {
-            n.getSuper().get().accept(this, arg);
+        if (n.getSuperTypes().isPresent()) {
+            n.getSuperTypes().get().accept(this, arg);
         }
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java
index bf541aa87..3b8c707e6 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java
@@ -503,13 +503,13 @@ public class PrettyPrintVisitor implements VoidVisitor<Void> {
         printJavaComment(n.getComment(), arg);
         printAnnotations(n.getAnnotations(), false, arg);
         printer.print("?");
-        if (n.getExtends().isPresent()) {
+        if (n.getExtendedTypes().isPresent()) {
             printer.print(" extends ");
-            n.getExtends().get().accept(this, arg);
+            n.getExtendedTypes().get().accept(this, arg);
         }
-        if (n.getSuper().isPresent()) {
+        if (n.getSuperTypes().isPresent()) {
             printer.print(" super ");
-            n.getSuper().get().accept(this, arg);
+            n.getSuperTypes().get().accept(this, arg);
         }
     }
 
@@ -1107,9 +1107,9 @@ public class PrettyPrintVisitor implements VoidVisitor<Void> {
         printOrphanCommentsBeforeThisChildNode(n);
         printJavaComment(n.getComment(), arg);
         printer.println("{");
-        if (n.getStmts() != null) {
+        if (n.getStatements() != null) {
             printer.indent();
-            for (final Statement s : n.getStmts()) {
+            for (final Statement s : n.getStatements()) {
                 s.accept(this, arg);
                 printer.println();
             }
@@ -1125,7 +1125,7 @@ public class PrettyPrintVisitor implements VoidVisitor<Void> {
         printJavaComment(n.getComment(), arg);
         printer.print(n.getLabel());
         printer.print(": ");
-        n.getStmt().accept(this, arg);
+        n.getStatement().accept(this, arg);
     }
 
     @Override
@@ -1171,8 +1171,8 @@ public class PrettyPrintVisitor implements VoidVisitor<Void> {
         }
         printer.println();
         printer.indent();
-        if (n.getStmts() != null) {
-            for (final Statement s : n.getStmts()) {
+        if (n.getStatements() != null) {
+            for (final Statement s : n.getStatements()) {
                 s.accept(this, arg);
                 printer.println();
             }
@@ -1184,9 +1184,9 @@ public class PrettyPrintVisitor implements VoidVisitor<Void> {
     public void visit(final BreakStmt n, final Void arg) {
         printJavaComment(n.getComment(), arg);
         printer.print("break");
-        if (n.getId().isPresent()) {
+        if (n.getIdentifier().isPresent()) {
             printer.print(" ");
-            printer.print(n.getId().get());
+            printer.print(n.getIdentifier().get());
         }
         printer.print(";");
     }
@@ -1328,9 +1328,9 @@ public class PrettyPrintVisitor implements VoidVisitor<Void> {
     public void visit(final ContinueStmt n, final Void arg) {
         printJavaComment(n.getComment(), arg);
         printer.print("continue");
-        if (n.getId().isPresent()) {
+        if (n.getIdentifier().isPresent()) {
             printer.print(" ");
-            printer.print(n.getId().get());
+            printer.print(n.getIdentifier().get());
         }
         printer.print(";");
     }
@@ -1360,8 +1360,8 @@ public class PrettyPrintVisitor implements VoidVisitor<Void> {
     public void visit(final ForStmt n, final Void arg) {
         printJavaComment(n.getComment(), arg);
         printer.print("for (");
-        if (n.getInit() != null) {
-            for (final Iterator<Expression> i = n.getInit().iterator(); i.hasNext();) {
+        if (n.getInitialization() != null) {
+            for (final Iterator<Expression> i = n.getInitialization().iterator(); i.hasNext();) {
                 final Expression e = i.next();
                 e.accept(this, arg);
                 if (i.hasNext()) {
@@ -1429,8 +1429,8 @@ public class PrettyPrintVisitor implements VoidVisitor<Void> {
             printer.print(") ");
         }
         n.getTryBlock().accept(this, arg);
-        if (n.getCatchs() != null) {
-            for (final CatchClause c : n.getCatchs()) {
+        if (n.getCatchClauses() != null) {
+            for (final CatchClause c : n.getCatchClauses()) {
                 c.accept(this, arg);
             }
         }
@@ -1444,7 +1444,7 @@ public class PrettyPrintVisitor implements VoidVisitor<Void> {
     public void visit(final CatchClause n, final Void arg) {
         printJavaComment(n.getComment(), arg);
         printer.print(" catch (");
-        n.getParam().accept(this, arg);
+        n.getParameter().accept(this, arg);
         printer.print(") ");
         n.getBody().accept(this, arg);
 
diff --git a/javaparser-core/src/main/javacc/java_1_8.jj b/javaparser-core/src/main/javacc/java_1_8.jj
index 09a5eba9f..2fa895d4c 100644
--- a/javaparser-core/src/main/javacc/java_1_8.jj
+++ b/javaparser-core/src/main/javacc/java_1_8.jj
@@ -50,7 +50,7 @@ import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.body.*;
 import com.github.javaparser.ast.comments.*;
 import com.github.javaparser.ast.imports.*;
-import com.github.javaparser.ast.expression.*;
+import com.github.javaparser.ast.expr.*;
 import com.github.javaparser.ast.stmt.*;
 import com.github.javaparser.ast.type.*;
 import com.github.javaparser.utils.*;