diff --git a/gson/src/main/java/com/google/gson/JavaFieldNamingPolicy.java b/gson/src/main/java/com/google/gson/JavaFieldNamingPolicy.java
index 83f16809..d93a1331 100644
--- a/gson/src/main/java/com/google/gson/JavaFieldNamingPolicy.java
+++ b/gson/src/main/java/com/google/gson/JavaFieldNamingPolicy.java
@@ -21,7 +21,7 @@ import java.lang.reflect.Type;
 import java.util.Collection;
 
 /**
- * A simple implementation of the {@link FieldNamingStrategy} interface such that it does not
+ * A simple implementation of the {@link FieldNamingStrategy2} interface such that it does not
  * perform any string translation of the incoming field name.
  *
  * <p>The following is an example:</p>
@@ -38,7 +38,7 @@ import java.util.Collection;
  * assert("integerField".equals(translatedFieldName));
  * </pre>
  *
- * <p>This is the default {@link FieldNamingStrategy} used by Gson.</p>
+ * <p>This is the default {@link FieldNamingStrategy2} used by Gson.</p>
  *
  * @author Joel Leitch
  */
diff --git a/gson/src/main/java/com/google/gson/LowerCaseNamingPolicy.java b/gson/src/main/java/com/google/gson/LowerCaseNamingPolicy.java
index 3a3ce58a..04ddace9 100644
--- a/gson/src/main/java/com/google/gson/LowerCaseNamingPolicy.java
+++ b/gson/src/main/java/com/google/gson/LowerCaseNamingPolicy.java
@@ -21,7 +21,7 @@ import java.lang.reflect.Type;
 import java.util.Collection;
 
 /**
- * A {@link FieldNamingStrategy} that ensures the JSON field names consist of only
+ * A {@link FieldNamingStrategy2} that ensures the JSON field names consist of only
  * lower case letters.
  *
  * <p>The following is an example:</p>
diff --git a/gson/src/main/java/com/google/gson/ModifyFirstLetterNamingPolicy.java b/gson/src/main/java/com/google/gson/ModifyFirstLetterNamingPolicy.java
index f611bdc6..7d123262 100644
--- a/gson/src/main/java/com/google/gson/ModifyFirstLetterNamingPolicy.java
+++ b/gson/src/main/java/com/google/gson/ModifyFirstLetterNamingPolicy.java
@@ -21,7 +21,7 @@ import java.lang.reflect.Type;
 import java.util.Collection;
 
 /**
- * A {@link FieldNamingStrategy} that ensures the JSON field names begins with
+ * A {@link FieldNamingStrategy2} that ensures the JSON field names begins with
  * an upper case letter.
  *
  *<p>The following is an example:</p>
diff --git a/gson/src/main/java/com/google/gson/SerializedNameAnnotationInterceptingNamingPolicy.java b/gson/src/main/java/com/google/gson/SerializedNameAnnotationInterceptingNamingPolicy.java
index bf898d3f..4f1de30f 100644
--- a/gson/src/main/java/com/google/gson/SerializedNameAnnotationInterceptingNamingPolicy.java
+++ b/gson/src/main/java/com/google/gson/SerializedNameAnnotationInterceptingNamingPolicy.java
@@ -19,10 +19,10 @@ package com.google.gson;
 import com.google.gson.annotations.SerializedName;
 
 /**
- * A {@link FieldNamingStrategy} that acts as a chain of responsibility.  If the
+ * A {@link FieldNamingStrategy2} that acts as a chain of responsibility.  If the
  * {@link com.google.gson.annotations.SerializedName} annotation is applied to a field then this
  * strategy will translate the name to the {@code serializedName.value()}; otherwise it delegates
- * to the wrapped {@link FieldNamingStrategy}.
+ * to the wrapped {@link FieldNamingStrategy2}.
  *
  * <p>NOTE: this class performs JSON field name validation for any of the fields marked with
  * an {@code @SerializedName} annotation.</p>
diff --git a/gson/src/main/java/com/google/gson/UpperCaseNamingPolicy.java b/gson/src/main/java/com/google/gson/UpperCaseNamingPolicy.java
index 1bb33f2e..a118750c 100644
--- a/gson/src/main/java/com/google/gson/UpperCaseNamingPolicy.java
+++ b/gson/src/main/java/com/google/gson/UpperCaseNamingPolicy.java
@@ -21,7 +21,7 @@ import java.lang.reflect.Type;
 import java.util.Collection;
 
 /**
- * A {@link FieldNamingStrategy} that ensures the JSON field names consist of only
+ * A {@link FieldNamingStrategy2} that ensures the JSON field names consist of only
  * upper case letters.
  *
  * <p>The following is an example:</p>