diff --git a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/macro/InsertParameterMiniHelperAnnoProcessor.java b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/macro/InsertParameterMiniHelperAnnoProcessor.java
index 9ef253e9e11..9583489c20c 100644
--- a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/macro/InsertParameterMiniHelperAnnoProcessor.java
+++ b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/macro/InsertParameterMiniHelperAnnoProcessor.java
@@ -8,7 +8,7 @@
  */
 package org.eclipse.xtend.core.tests.macro;
 
-import com.google.common.base.Objects;
+import java.util.Objects;
 import org.eclipse.xtend.lib.macro.AbstractClassProcessor;
 import org.eclipse.xtend.lib.macro.TransformationContext;
 import org.eclipse.xtend.lib.macro.declaration.AnnotationReference;
@@ -24,7 +24,7 @@ public class InsertParameterMiniHelperAnnoProcessor extends AbstractClassProcess
   @Override
   public void doTransform(final MutableClassDeclaration clazz, @Extension final TransformationContext context) {
     final Function1<AnnotationReference, Boolean> _function = (AnnotationReference a) -> {
-      return Boolean.valueOf((Objects.equal(a.getAnnotationTypeDeclaration().getSimpleName(), InsertParameterMiniHelperAnno.class.getSimpleName()) && (a.getClassValue("classRef") != null)));
+      return Boolean.valueOf((Objects.equals(a.getAnnotationTypeDeclaration().getSimpleName(), InsertParameterMiniHelperAnno.class.getSimpleName()) && (a.getClassValue("classRef") != null)));
     };
     AnnotationReference _findFirst = IterableExtensions.findFirst(clazz.getAnnotations(), _function);
     TypeReference _classValue = null;
@@ -35,7 +35,7 @@ public void doTransform(final MutableClassDeclaration clazz, @Extension final Tr
     final Function1<AnnotationReference, Boolean> _function_1 = (AnnotationReference a) -> {
       String _simpleName = a.getAnnotationTypeDeclaration().getSimpleName();
       String _simpleName_1 = InsertParameterMiniHelperAnno.class.getSimpleName();
-      return Boolean.valueOf(Objects.equal(_simpleName, _simpleName_1));
+      return Boolean.valueOf(Objects.equals(_simpleName, _simpleName_1));
     };
     final int position = IterableExtensions.findFirst(clazz.getAnnotations(), _function_1).getIntValue("position");
     Iterable<? extends MutableMethodDeclaration> _declaredMethods = clazz.getDeclaredMethods();
diff --git a/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/TransformationContextImpl.java b/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/TransformationContextImpl.java
index 341dc505f62..aa3a98c201f 100644
--- a/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/TransformationContextImpl.java
+++ b/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/TransformationContextImpl.java
@@ -106,8 +106,8 @@ public List<? extends Problem> getProblems(final Element element) {
     return this.getProblemSupport().getProblems(element);
   }
 
-  public void validateLater(final Procedure0 validationCallback) {
-    this.getProblemSupport().validateLater(validationCallback);
+  public void validateLater(final Procedure0 arg0) {
+    this.getProblemSupport().validateLater(arg0);
   }
 
   public MutableAnnotationTypeDeclaration findAnnotationType(final String qualifiedName) {
@@ -226,32 +226,32 @@ public AnnotationReference newAnnotationReference(final AnnotationReference anno
     return this.getAnnotationReferenceProvider().newAnnotationReference(annotationReference);
   }
 
-  public AnnotationReference newAnnotationReference(final AnnotationReference annotationReference, final Procedure1<AnnotationReferenceBuildContext> initializer) {
-    return this.getAnnotationReferenceProvider().newAnnotationReference(annotationReference, initializer);
+  public AnnotationReference newAnnotationReference(final AnnotationReference arg0, final Procedure1<AnnotationReferenceBuildContext> arg1) {
+    return this.getAnnotationReferenceProvider().newAnnotationReference(arg0, arg1);
   }
 
   public AnnotationReference newAnnotationReference(final Class<?> annotationClass) {
     return this.getAnnotationReferenceProvider().newAnnotationReference(annotationClass);
   }
 
-  public AnnotationReference newAnnotationReference(final Class<?> annotationClass, final Procedure1<AnnotationReferenceBuildContext> initializer) {
-    return this.getAnnotationReferenceProvider().newAnnotationReference(annotationClass, initializer);
+  public AnnotationReference newAnnotationReference(final Class<?> arg0, final Procedure1<AnnotationReferenceBuildContext> arg1) {
+    return this.getAnnotationReferenceProvider().newAnnotationReference(arg0, arg1);
   }
 
   public AnnotationReference newAnnotationReference(final String annotationTypeName) {
     return this.getAnnotationReferenceProvider().newAnnotationReference(annotationTypeName);
   }
 
-  public AnnotationReference newAnnotationReference(final String annotationTypeName, final Procedure1<AnnotationReferenceBuildContext> initializer) {
-    return this.getAnnotationReferenceProvider().newAnnotationReference(annotationTypeName, initializer);
+  public AnnotationReference newAnnotationReference(final String arg0, final Procedure1<AnnotationReferenceBuildContext> arg1) {
+    return this.getAnnotationReferenceProvider().newAnnotationReference(arg0, arg1);
   }
 
   public AnnotationReference newAnnotationReference(final Type annotationTypeDelcaration) {
     return this.getAnnotationReferenceProvider().newAnnotationReference(annotationTypeDelcaration);
   }
 
-  public AnnotationReference newAnnotationReference(final Type annotationTypeDelcaration, final Procedure1<AnnotationReferenceBuildContext> initializer) {
-    return this.getAnnotationReferenceProvider().newAnnotationReference(annotationTypeDelcaration, initializer);
+  public AnnotationReference newAnnotationReference(final Type arg0, final Procedure1<AnnotationReferenceBuildContext> arg1) {
+    return this.getAnnotationReferenceProvider().newAnnotationReference(arg0, arg1);
   }
 
   public boolean exists(final Path path) {
diff --git a/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/ValidationContextImpl.java b/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/ValidationContextImpl.java
index e6ad97b2ace..af52f5c746a 100644
--- a/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/ValidationContextImpl.java
+++ b/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/ValidationContextImpl.java
@@ -99,8 +99,8 @@ public List<? extends Problem> getProblems(final Element element) {
     return this.getProblemSupport().getProblems(element);
   }
 
-  public void validateLater(final Procedure0 validationCallback) {
-    this.getProblemSupport().validateLater(validationCallback);
+  public void validateLater(final Procedure0 arg0) {
+    this.getProblemSupport().validateLater(arg0);
   }
 
   public MutableAnnotationTypeDeclaration findAnnotationType(final String qualifiedName) {
@@ -219,32 +219,32 @@ public AnnotationReference newAnnotationReference(final AnnotationReference anno
     return this.getAnnotationReferenceProvider().newAnnotationReference(annotationReference);
   }
 
-  public AnnotationReference newAnnotationReference(final AnnotationReference annotationReference, final Procedure1<AnnotationReferenceBuildContext> initializer) {
-    return this.getAnnotationReferenceProvider().newAnnotationReference(annotationReference, initializer);
+  public AnnotationReference newAnnotationReference(final AnnotationReference arg0, final Procedure1<AnnotationReferenceBuildContext> arg1) {
+    return this.getAnnotationReferenceProvider().newAnnotationReference(arg0, arg1);
   }
 
   public AnnotationReference newAnnotationReference(final Class<?> annotationClass) {
     return this.getAnnotationReferenceProvider().newAnnotationReference(annotationClass);
   }
 
-  public AnnotationReference newAnnotationReference(final Class<?> annotationClass, final Procedure1<AnnotationReferenceBuildContext> initializer) {
-    return this.getAnnotationReferenceProvider().newAnnotationReference(annotationClass, initializer);
+  public AnnotationReference newAnnotationReference(final Class<?> arg0, final Procedure1<AnnotationReferenceBuildContext> arg1) {
+    return this.getAnnotationReferenceProvider().newAnnotationReference(arg0, arg1);
   }
 
   public AnnotationReference newAnnotationReference(final String annotationTypeName) {
     return this.getAnnotationReferenceProvider().newAnnotationReference(annotationTypeName);
   }
 
-  public AnnotationReference newAnnotationReference(final String annotationTypeName, final Procedure1<AnnotationReferenceBuildContext> initializer) {
-    return this.getAnnotationReferenceProvider().newAnnotationReference(annotationTypeName, initializer);
+  public AnnotationReference newAnnotationReference(final String arg0, final Procedure1<AnnotationReferenceBuildContext> arg1) {
+    return this.getAnnotationReferenceProvider().newAnnotationReference(arg0, arg1);
   }
 
   public AnnotationReference newAnnotationReference(final Type annotationTypeDelcaration) {
     return this.getAnnotationReferenceProvider().newAnnotationReference(annotationTypeDelcaration);
   }
 
-  public AnnotationReference newAnnotationReference(final Type annotationTypeDelcaration, final Procedure1<AnnotationReferenceBuildContext> initializer) {
-    return this.getAnnotationReferenceProvider().newAnnotationReference(annotationTypeDelcaration, initializer);
+  public AnnotationReference newAnnotationReference(final Type arg0, final Procedure1<AnnotationReferenceBuildContext> arg1) {
+    return this.getAnnotationReferenceProvider().newAnnotationReference(arg0, arg1);
   }
 
   public boolean exists(final Path path) {