diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultVariableNameFunction.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultVariableNameFunction.java
index 1f6bdc9cb..4acce5da0 100644
--- a/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultVariableNameFunction.java
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultVariableNameFunction.java
@@ -1,8 +1,9 @@
 package com.querydsl.codegen;
 
+import javax.lang.model.SourceVersion;
+
 import com.google.common.base.Function;
 import com.mysema.codegen.StringUtils;
-import com.querydsl.core.util.JavaSyntaxUtils;
 
 /**
  * Default variable name generation strategy which un-capitalizes the first letter of the class name.
@@ -15,7 +16,7 @@ public final class DefaultVariableNameFunction implements Function<EntityType, S
     @Override
     public String apply(EntityType entity) {
         String uncapSimpleName = StringUtils.uncapitalize(entity.getInnerType().getSimpleName());
-        if (JavaSyntaxUtils.isReserved(uncapSimpleName)) {
+        if (SourceVersion.isKeyword(uncapSimpleName)) {
             uncapSimpleName = uncapSimpleName + "$";
         }
         return uncapSimpleName;
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/Property.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/Property.java
index 3334a52e6..d99226b54 100644
--- a/querydsl-codegen/src/main/java/com/querydsl/codegen/Property.java
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/Property.java
@@ -16,9 +16,10 @@ package com.querydsl.codegen;
 import java.lang.annotation.Annotation;
 import java.util.*;
 
+import javax.lang.model.SourceVersion;
+
 import com.google.common.base.Objects;
 import com.mysema.codegen.model.Type;
-import com.querydsl.core.util.JavaSyntaxUtils;
 
 /**
  * {@code Property} represents a property in a query domain type.
@@ -65,7 +66,7 @@ public final class Property implements Comparable<Property> {
     }
 
     private static String escapeName(String name) {
-        if (JavaSyntaxUtils.isReserved(name)) {
+        if (SourceVersion.isKeyword(name)) {
             name = name + "$";
         } else if (!Character.isJavaIdentifierStart(name.charAt(0))) {
             name = "_" + name;
diff --git a/querydsl-core/src/main/java/com/querydsl/core/util/JavaSyntaxUtils.java b/querydsl-core/src/main/java/com/querydsl/core/util/JavaSyntaxUtils.java
index ebe5d6e13..51e0dbb45 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/util/JavaSyntaxUtils.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/util/JavaSyntaxUtils.java
@@ -19,8 +19,10 @@ import javax.lang.model.SourceVersion;
  * JavaSyntaxUtils defines reserved keywords for Java
  *
  * @author tiwe
+ * @deprecated use the built-in {@link SourceVersion#isKeyword(CharSequence) keyword list} instead.
  *
  */
+@Deprecated
 public final class JavaSyntaxUtils {
 
     private JavaSyntaxUtils() { }
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/AbstractNamingStrategy.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/AbstractNamingStrategy.java
index dc81b6ae6..9203b6b2c 100644
--- a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/AbstractNamingStrategy.java
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/AbstractNamingStrategy.java
@@ -13,8 +13,9 @@
  */
 package com.querydsl.sql.codegen;
 
+import javax.lang.model.SourceVersion;
+
 import com.querydsl.codegen.EntityType;
-import com.querydsl.core.util.JavaSyntaxUtils;
 import com.querydsl.sql.SchemaAndTable;
 import com.querydsl.sql.codegen.support.ForeignKeyData;
 
@@ -42,7 +43,7 @@ public abstract class AbstractNamingStrategy implements NamingStrategy {
           return packageName;
         }
         String suffix = schemaName.toLowerCase();
-        if (JavaSyntaxUtils.isReserved(suffix)) {
+        if (SourceVersion.isKeyword(suffix)) {
             suffix += "_";
         }
         return packageName + "." + suffix;
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/Naming.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/Naming.java
index 7e904c464..3400e4c7f 100644
--- a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/Naming.java
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/Naming.java
@@ -13,7 +13,7 @@
  */
 package com.querydsl.sql.codegen;
 
-import static com.querydsl.core.util.JavaSyntaxUtils.isReserved;
+import static javax.lang.model.SourceVersion.isKeyword;
 
 /**
  * {@code Naming} provides name normalization functionality
@@ -24,7 +24,7 @@ import static com.querydsl.core.util.JavaSyntaxUtils.isReserved;
 public final class Naming {
 
     public static String normalize(String s, String reservedSuffix) {
-        if (isReserved(s)) {
+        if (isKeyword(s)) {
             return s + reservedSuffix;
         } else {
             StringBuilder sb = new StringBuilder(s.length() + 1);