http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelper.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelper.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelper.java
index b40e02c..f3852a9 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelper.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelper.java
@@ -70,7 +70,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * </pre>
  *
  * 
- * @since 6.0
+ * @since GemFire 6.0
  * @see FunctionService#onRegion(Region)
  */
 public final class PartitionRegionHelper {
@@ -84,7 +84,7 @@ public final class PartitionRegionHelper {
    * @param r a partitioned Region
    * @throws IllegalStateException if the Region is not a {@linkplain 
DataPolicy#PARTITION partitioned Region}
    * @return an unmodifiable map of {@linkplain Region#getFullPath() region 
name} to {@link Region}
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static Map<String, Region<?, ?>> getColocatedRegions(final Region<?, 
?> r) {
     Map ret;
@@ -119,7 +119,7 @@ public final class PartitionRegionHelper {
    * 
    * @param r
    * @return true if it is a partitioned Region
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static boolean isPartitionedRegion(final Region<?,?> r) {
     if (r == null) {
@@ -136,7 +136,7 @@ public final class PartitionRegionHelper {
    * @param r
    * @throws IllegalStateException
    * @return PartitionedRegion if it is a partitioned Region
-   * @since 6.0
+   * @since GemFire 6.0
    */
   private static PartitionedRegion isPartitionedCheck(final Region<?,?> r) {
     if (! isPartitionedRegion(r)) {
@@ -153,7 +153,7 @@ public final class PartitionRegionHelper {
    *
    * @param cache the cache which has the regions
    * @return set of details about all locally defined partitioned regions
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static Set<PartitionRegionInfo> getPartitionRegionInfo(
       final Cache cache) {
@@ -169,7 +169,7 @@ public final class PartitionRegionHelper {
    * 
    * @param region the region to get info about
    * @return details about the specified partitioned region
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static PartitionRegionInfo getPartitionRegionInfo(
       final Region<?,?> region) {
@@ -218,7 +218,7 @@ public final class PartitionRegionHelper {
    * @throws IllegalStateException
    *          if the provided region is something other than a
    *         {@linkplain DataPolicy#PARTITION partitioned Region}
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static void assignBucketsToPartitions(Region<?,?> region) {
     PartitionedRegion pr = isPartitionedCheck(region);
@@ -263,7 +263,7 @@ public final class PartitionRegionHelper {
    *         if the provided region is something other than a
    *        {@linkplain DataPolicy#PARTITION partitioned Region}
    * @return the primary member for the key, possibly null if a primary is not 
yet determined
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static <K,V> DistributedMember getPrimaryMemberForKey(final 
Region<K,V> r, final K key) {
     PartitionedRegion pr = isPartitionedCheck(r);
@@ -289,7 +289,7 @@ public final class PartitionRegionHelper {
    *        if the provided region is something other than a
    *        {@linkplain DataPolicy#PARTITION partitioned Region}
    * @return an unmodifiable set of members minus the primary
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static <K,V> Set<DistributedMember> getRedundantMembersForKey(final 
Region<K,V> r, final K key) {
     DistributedMember primary = getPrimaryMemberForKey(r, key);
@@ -312,7 +312,7 @@ public final class PartitionRegionHelper {
    *         if the provided region is something other than a
    *        {@linkplain DataPolicy#PARTITION partitioned Region}
    * @return an unmodifiable set of all members
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static <K,V> Set<DistributedMember> getAllMembersForKey(final 
Region<K,V> r, final K key) {
     return Collections.unmodifiableSet(getAllForKey(r, key));
@@ -335,7 +335,7 @@ public final class PartitionRegionHelper {
    * @param c the region function context
    * @throws IllegalStateException if the Region is not a {@linkplain 
DataPolicy#PARTITION partitioned Region}
    * @return an unmodifiable map of {@linkplain Region#getFullPath() region 
name} to {@link Region}
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static Map<String, Region<?, ?>> getLocalColocatedRegions(final 
RegionFunctionContext c) {
     final Region r = c.getDataSet();
@@ -364,7 +364,7 @@ public final class PartitionRegionHelper {
    *           if {@link RegionFunctionContext#getDataSet()} returns something
    *           other than a {@linkplain DataPolicy#PARTITION partitioned 
Region}
    * @return a Region for efficient reads
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static <K, V> Region<K, V> getLocalDataForContext(final 
RegionFunctionContext c) {
     final Region r = c.getDataSet();
@@ -384,7 +384,7 @@ public final class PartitionRegionHelper {
    *                 if the provided region is something other than a
    *                 {@linkplain DataPolicy#PARTITION partitioned Region}
    * @return a Region for efficient reads
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static <K,V> Region<K,V> getLocalData(final Region<K,V> r) {
     if (isPartitionedRegion(r)) {
@@ -415,7 +415,7 @@ public final class PartitionRegionHelper {
    *           if the provided region is something other than a
    *           {@linkplain DataPolicy#PARTITION partitioned Region}
    * @return a Region for efficient reads
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static <K,V> Region<K,V> getLocalPrimaryData(final Region<K,V> r) {
     if (isPartitionedRegion(r)) {
@@ -470,7 +470,7 @@ public final class PartitionRegionHelper {
    *           destination already hosts a copy of the bucket, or if the bucket
    *           does not exist.
    * 
-   * @since 7.1
+   * @since GemFire 7.1
    */
    public static <K> void moveBucketByKey(Region<K,?> region, 
DistributedMember source, DistributedMember destination, K key) {
      PartitionedRegion pr = isPartitionedCheck(region);
@@ -524,7 +524,7 @@ public final class PartitionRegionHelper {
    * @return A RebalanceResult object that contains information about what what
    *         data was actually moved.
    * 
-   * @since 7.1
+   * @since GemFire 7.1
    */
    public static RebalanceResults moveData(Region<?,?> region, 
DistributedMember source, DistributedMember destination, float percentage) {
      PartitionedRegion pr = isPartitionedCheck(region);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRegionInfo.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRegionInfo.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRegionInfo.java
index 90d9547..223e5cd 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRegionInfo.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRegionInfo.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.cache.control.ResourceManager;
  * <p>
  * This is an immutable snapshot of the information.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public interface PartitionRegionInfo {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/ConflictingPersistentDataException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/ConflictingPersistentDataException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/ConflictingPersistentDataException.java
index f9fa1b0..f65ffc8 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/ConflictingPersistentDataException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/ConflictingPersistentDataException.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.admin.AdminDistributedSystem;
  * persistent files are completely different. In that case, gemfire throws this
  * exception rather than discarding one of the sets of persistent files.
  * 
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class ConflictingPersistentDataException extends GemFireException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PartitionOfflineException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PartitionOfflineException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PartitionOfflineException.java
index c1ba16a..20d2a50 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PartitionOfflineException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PartitionOfflineException.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.GemFireException;
  * the region (such as a put), it is possible that the change was actually
  * persisted to disk before the member went offline.
  * 
- * @since 6.5
+ * @since GemFire 6.5
  *
  */
 public class PartitionOfflineException extends GemFireException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PersistentID.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PersistentID.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PersistentID.java
index 900dda4..d0169dc 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PersistentID.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PersistentID.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.cache.DataPolicy;
  * members are waiting for. See
  * {@link AdminDistributedSystem#getMissingPersistentMembers()}
  * 
- * @since 6.5
+ * @since GemFire 6.5
  *
  */
 public interface PersistentID extends DataSerializable {
@@ -52,7 +52,7 @@ public interface PersistentID extends DataSerializable {
   
   /**
    * The unique identifier for the persistent data.
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public abstract UUID getUUID();
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PersistentReplicatesOfflineException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PersistentReplicatesOfflineException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PersistentReplicatesOfflineException.java
index 4fcf911..f53ecb1 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PersistentReplicatesOfflineException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PersistentReplicatesOfflineException.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.GemFireException;
  * If you see this exception you should restart members that are
  * configured for hosting persistent replicates.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class PersistentReplicatesOfflineException extends GemFireException {
   private static final long serialVersionUID = 6209644027346609970L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/RevokeFailedException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/RevokeFailedException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/RevokeFailedException.java
index a1d2576..5d3bcde 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/RevokeFailedException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/RevokeFailedException.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.GemFireException;
  * with that persistent ID is currently running. You can only revoke
  * members which is not running.
  * 
- * @since 6.6.2
+ * @since GemFire 6.6.2
  */
 public class RevokeFailedException extends GemFireException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/RevokedPersistentDataException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/RevokedPersistentDataException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/RevokedPersistentDataException.java
index 305bc66..e9b0d11 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/RevokedPersistentDataException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/RevokedPersistentDataException.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.admin.AdminDistributedSystem;
  * persistent files are removed. See
  * {@link AdminDistributedSystem#revokePersistentMember(java.net.InetAddress, 
String)}
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class RevokedPersistentDataException extends GemFireException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/AmbiguousNameException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/AmbiguousNameException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/AmbiguousNameException.java
index 9995b56..3e54278 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/AmbiguousNameException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/AmbiguousNameException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache.query;
  * more than one object in scope or if there is more than one maximally 
specific
  * overridden method in a class.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public class AmbiguousNameException extends NameResolutionException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributes.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributes.java 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributes.java
index aaffb3f..7a70d61 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributes.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributes.java
@@ -24,7 +24,7 @@ package com.gemstone.gemfire.cache.query;
  * 
  * For compatibility rules and default values, see {@link CqAttributesFactory}.
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 
 public interface CqAttributes {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributesFactory.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributesFactory.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributesFactory.java
index 71988d5..101c9e6 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributesFactory.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributesFactory.java
@@ -45,7 +45,7 @@ import 
com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  *
  * @see CqAttributes
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class CqAttributesFactory {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributesMutator.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributesMutator.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributesMutator.java
index d065e76..05f64e4 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributesMutator.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributesMutator.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.cache.query;
  * Each CqQuery has an CqAttributesMutator interface which supports 
modification 
  * of certain CQ attributes after the CQ has been created. 
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public interface CqAttributesMutator {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqClosedException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqClosedException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqClosedException.java
index a1afc30..3adb761 100755
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqClosedException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqClosedException.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.CacheRuntimeException;
 /**
  * Thrown if the CqQuery on which the operation performed is closed.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqEvent.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqEvent.java 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqEvent.java
index 41e5c80..dccb383 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqEvent.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.cache.Operation;
  * event. 
  * The CqEvent is not an extension of CacheEvent. 
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public interface CqEvent {
   
@@ -85,7 +85,7 @@ public interface CqEvent {
    * If there is no delta, returns null. New value may still be available.
    * 
    * @return byte[] delta value.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public byte[] getDeltaValue();
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqException.java 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqException.java
index 28265f9..0f0f2fd 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqException.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.cache.query;
 /**
  * Thrown during continuous query creation, execution time.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqExistsException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqExistsException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqExistsException.java
index ba08436..66ffd08 100755
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqExistsException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqExistsException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache.query;
 
 /**
  * Thrown if a CQ by this name already exists on this client 
- * @since 5.5
+ * @since GemFire 5.5
  */
 
 public class CqExistsException extends QueryException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqListener.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqListener.java 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqListener.java
index 5dddcd2..b68d976 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqListener.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.CacheCallback;
  * is an event satisfied by the CQ and the other called when there is an 
  * error during CQ processing. 
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 
 public interface CqListener extends CacheCallback {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqQuery.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqQuery.java 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqQuery.java
index f7b694d..691a7d0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqQuery.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqQuery.java
@@ -24,7 +24,7 @@ package com.gemstone.gemfire.cache.query;
  * The methods allow you to retrieve CQ related information, operate on CQ
  * like execute, stop, close and get the state of the CQ.
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 
 public interface CqQuery {
@@ -147,7 +147,7 @@ public interface CqQuery {
   /**
    * This allows to check if the CQ is durable.
    * @return boolean true if durable, false otherwise
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public boolean isDurable();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqResults.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqResults.java 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqResults.java
index 2bd5c2b..f11e4e5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqResults.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqResults.java
@@ -44,7 +44,7 @@ package com.gemstone.gemfire.cache.query;
  * @see com.gemstone.gemfire.cache.query.Query#execute()
  * @see com.gemstone.gemfire.cache.query.CqQuery#executeWithInitialResults()
  * 
- * @since 6.5
+ * @since GemFire 6.5
  */
 public interface CqResults<E> extends SelectResults<E> {
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqServiceStatistics.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqServiceStatistics.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqServiceStatistics.java
index ccdc1a5..b1477f2 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqServiceStatistics.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqServiceStatistics.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache.query;
  * This class provides methods to get aggregate statistical information 
  * about the CQs of a client.
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 public interface CqServiceStatistics {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqState.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqState.java 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqState.java
index fab0579..0ade80d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqState.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqState.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache.query;
  * This interface gives information on the state of a CqQuery. 
  * It is provided by the getState method of the CqQuery instance. 
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 
 public interface CqState {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqStatistics.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqStatistics.java 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqStatistics.java
index f6ccf44..1189179 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqStatistics.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqStatistics.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache.query;
  * This class provides methods to get statistical information about a 
registered Continuous Query (CQ)
  * represented by the CqQuery object. 
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public interface CqStatistics {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqStatusListener.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqStatusListener.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqStatusListener.java
index 9e86130..0f1e372 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqStatusListener.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqStatusListener.java
@@ -24,7 +24,7 @@ package com.gemstone.gemfire.cache.query;
  *  the cq is disconnected
  * 
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 
 public interface CqStatusListener extends CqListener {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/FunctionDomainException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/FunctionDomainException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/FunctionDomainException.java
index 8b220ea..d6fe92d 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/FunctionDomainException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/FunctionDomainException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache.query;
 /**
  * Thrown if the domain of a function is not legal.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public class FunctionDomainException extends QueryException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Index.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Index.java 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Index.java
index 7d13aec..56593f4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Index.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Index.java
@@ -46,7 +46,7 @@ import com.gemstone.gemfire.cache.*;
  * @see QueryService#createIndex(String, IndexType, String, String)
  * @see IndexType
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public interface Index {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexExistsException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexExistsException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexExistsException.java
index c8972cf..5a0c317 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexExistsException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexExistsException.java
@@ -26,7 +26,7 @@ package com.gemstone.gemfire.cache.query;
  * Thrown while creating the new index if there exists an Index with
  * the same definition as new index.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public class IndexExistsException extends QueryException{

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexInvalidException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexInvalidException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexInvalidException.java
index d82c9ce..0426cd1 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexInvalidException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexInvalidException.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.GemFireException;
 /**
  * Thrown if the index definition is not valid.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public class IndexInvalidException extends GemFireException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexMaintenanceException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexMaintenanceException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexMaintenanceException.java
index 7a5329c..3dda5b4 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexMaintenanceException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexMaintenanceException.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.CacheRuntimeException;
  * Thrown if an error occurs while updating query indexes during
  * region modification.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class IndexMaintenanceException extends CacheRuntimeException {
 private static final long serialVersionUID = 3326023943226474039L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexNameConflictException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexNameConflictException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexNameConflictException.java
index 6b37fd7..a4b13ed 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexNameConflictException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexNameConflictException.java
@@ -26,7 +26,7 @@ package com.gemstone.gemfire.cache.query;
  * Thrown while creating the new index if there exists an Index with
  * the same name as new index.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public class IndexNameConflictException extends QueryException{

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexStatistics.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexStatistics.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexStatistics.java
index b105af4..1148b61 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexStatistics.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexStatistics.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache.query;
 /**
  * Provides statistics about a GemFire cache {@link Index}.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public interface IndexStatistics {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexType.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexType.java 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexType.java
index ab04a0f..362de5a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexType.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.cache.query;
  * 
  * Enumerated type for types of {@linkplain Index indexes}
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class IndexType {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/MultiIndexCreationException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/MultiIndexCreationException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/MultiIndexCreationException.java
index c592889..42563fc 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/MultiIndexCreationException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/MultiIndexCreationException.java
@@ -32,7 +32,7 @@ import 
com.gemstone.gemfire.cache.query.internal.DefaultQueryService;
  *   <li>{@link IndexInvalidException}</li>
  *   <li>{@link UnsupportedOperationException}</li>
  * </ul>
- * @since 8.1
+ * @since GemFire 8.1
  * 
  */
 public class MultiIndexCreationException extends Exception {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/NameNotFoundException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/NameNotFoundException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/NameNotFoundException.java
index 1da09e4..aad2ec3 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/NameNotFoundException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/NameNotFoundException.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.cache.query;
  * Thrown when an attribute or method name could not be resolved during query
  * execution because no matching method or field could be found.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public class NameNotFoundException extends NameResolutionException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/NameResolutionException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/NameResolutionException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/NameResolutionException.java
index 492892c..ffb5c16 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/NameResolutionException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/NameResolutionException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache.query;
 /**
  * Thrown if an attribute or method name in a query cannot be resolved.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public class NameResolutionException extends QueryException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/ParameterCountInvalidException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/ParameterCountInvalidException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/ParameterCountInvalidException.java
index 990cdae..c91dceb 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/ParameterCountInvalidException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/ParameterCountInvalidException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache.query;
  * Thrown when the number of bound paramters for a query does not match the
  * number of placeholders.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class ParameterCountInvalidException extends QueryException {
 private static final long serialVersionUID = -3249156440150789428L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Query.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Query.java 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Query.java
index 0329a70..fdd71b0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Query.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Query.java
@@ -27,7 +27,7 @@ import 
com.gemstone.gemfire.cache.execute.RegionFunctionContext;
  * Interface for query objects. Supports execution of queries with optional
  * parameters.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public interface Query {
@@ -188,7 +188,7 @@ public interface Query {
    *    Select * from /partitionRegion1 p1, /PartitionRegion2 p2 where
    *    p1.field = p2.field [AND .....]
    *    
-   * @since 6.2.2
+   * @since GemFire 6.2.2
    * @param context RegionFunctionContext which will target the query on subset
    *          of data if executed on PartitionedRegion.
    *
@@ -257,7 +257,7 @@ public interface Query {
    *    Select * from /partitionRegion1 p1, /PartitionRegion2 p2 where
    *    p1.field = p2.field [AND .....]
    *    
-   * @since 6.2.2        
+   * @since GemFire 6.2.2
    * @param context RegionFunctionContext which will target the query on subset
    *          of data if executed on PartitionedRegion.
    * @param params Values that are bound to parameters (such as 
<code>$1</code>)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryException.java 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryException.java
index a9638c7..3ddd320 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryException.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.GemFireCheckedException;
 /**
  * Thrown during by the query engine during parsing or execution.
  * Instances of subclasses are thrown for more specific exceptions.
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryExecutionLowMemoryException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryExecutionLowMemoryException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryExecutionLowMemoryException.java
index ab33482..c0ba18d 100755
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryExecutionLowMemoryException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryExecutionLowMemoryException.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.cache.control.ResourceManager;
  * from sending out QueryExecutionLowMemoryExeceptions at the risk of
  * a query exhausting all memory.
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class QueryExecutionLowMemoryException extends CacheRuntimeException {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryExecutionTimeoutException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryExecutionTimeoutException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryExecutionTimeoutException.java
index 9f91b21..a8689bb 100755
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryExecutionTimeoutException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryExecutionTimeoutException.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.cache.CacheRuntimeException;
  * The Max query execution time is set using the system  variable 
  * gemfire.Cache.MAX_QUERY_EXECUTION_TIME. 
  *
- * @since 6.0
+ * @since GemFire 6.0
  */
 public class QueryExecutionTimeoutException extends CacheRuntimeException {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryInvalidException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryInvalidException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryInvalidException.java
index b095973..0f6116e 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryInvalidException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryInvalidException.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.GemFireException;
 /**
  * Thrown if the query language syntax is not valid.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public class QueryInvalidException extends GemFireException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryInvocationTargetException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryInvocationTargetException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryInvocationTargetException.java
index d27494a..47aea3c 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryInvocationTargetException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryInvocationTargetException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache.query;
 /**
  * Thrown if an exception is thrown when a method is invoked during query 
execution.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public class QueryInvocationTargetException extends QueryException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryService.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryService.java 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryService.java
index 3a98a43..28646a4 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryService.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryService.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.cache.query.internal.Undefined;
  * using {@link Cache#getQueryService}.
  *
  * 
- * @since 4.0
+ * @since GemFire 4.0
  */
 public interface QueryService {
 
@@ -629,7 +629,7 @@ public interface QueryService {
    * Constructs a new continuous query, represented by an instance of
    * CqQuery. The CqQuery is not executed until the execute method
    * is invoked on the CqQuery.
-   * @since 5.5
+   * @since GemFire 5.5
    * @param queryString the OQL query
    * @param cqAttr the CqAttributes
    * @return the newly created CqQuery object
@@ -654,7 +654,7 @@ public interface QueryService {
    * CqQuery. The CqQuery is not executed until the execute method
    * is invoked on the CqQuery.
    *
-   * @since 5.5
+   * @since GemFire 5.5
    * @param queryString the OQL query
    * @param cqAttr the CqAttributes
    * @param isDurable true if the CQ is durable
@@ -680,7 +680,7 @@ public interface QueryService {
    * is invoked on the CqQuery. The name of the query will be used
    * to identify this query in statistics archival.
    *
-   * @since 5.5
+   * @since GemFire 5.5
    * @param name the String name for this query
    * @param queryString the OQL query
    * @param cqAttr the CqAttributes
@@ -711,7 +711,7 @@ public interface QueryService {
    * is invoked on the CqQuery. The name of the query will be used
    * to identify this query in statistics archival.
    *
-   * @since 5.5
+   * @since GemFire 5.5
    * @param name the String name for this query
    * @param queryString the OQL query
    * @param cqAttr the CqAttributes
@@ -741,7 +741,7 @@ public interface QueryService {
    * Any attempt to access closed CqQuery objects will result in the 
    * CqClosedException being thrown to the caller.
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public void closeCqs();
 
@@ -749,7 +749,7 @@ public interface QueryService {
    * Retrieve all registered Continuous Queries.
    * This is a collection of CqQuery objects.
    *
-   * @since 5.5
+   * @since GemFire 5.5
    * @return CqQuery[] list of registered CQs,
    *         null if there are no CQs.   
    */
@@ -759,7 +759,7 @@ public interface QueryService {
    * Retrieves all the registered Continuous Queries for a given region.
    * This is a collection of CqQuery objects. 
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    * @return CqQuery[] list of registered CQs on the specified region,
    *         null if there are no CQs.
    * @exception CqException
@@ -770,7 +770,7 @@ public interface QueryService {
   /**
    * Retrieves the Continuous Query specified by the name.
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    * @param  cqName - String, name of the CQ
    * @return  CqQuery object, 
    *          null if no CqQuery object is found.
@@ -782,7 +782,7 @@ public interface QueryService {
    * This is complementary to stopCqs.
    * @see QueryService#stopCqs()
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    * @throws CqException if failure to execute CQ.
    */
   public void executeCqs() throws CqException;
@@ -793,7 +793,7 @@ public interface QueryService {
    * bulk region operations.
    * @see QueryService#executeCqs()
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    * @throws CqException if failure to execute CQ.
    */
   public void stopCqs() throws CqException;
@@ -804,7 +804,7 @@ public interface QueryService {
    * This is complementary method to stopCQs().  
    * @see  QueryService#stopCqs()
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    * @throws CqException if failure to stop CQs.
    */
   public void executeCqs(String regionName) throws CqException;
@@ -816,7 +816,7 @@ public interface QueryService {
    * bulk region operations.
    * @see QueryService#executeCqs()
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    * @throws CqException if failure to execute CQs.
    */  
   public void stopCqs(String regionName) throws CqException;
@@ -824,7 +824,7 @@ public interface QueryService {
   /**
    * Retrieves all the durable CQs registered by the client calling this 
method. 
    *
-   * @since 7.0
+   * @since GemFire 7.0
    * @return List of names of registered durable CQs,
    *         empty list if no durable cqs.   
    */
@@ -842,7 +842,7 @@ public interface QueryService {
    *    
    * @see CqServiceStatistics
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    * @return CqServiceStatistics
    * 
    */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryStatistics.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryStatistics.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryStatistics.java
index 5c5dc04..c305573 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryStatistics.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryStatistics.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.cache.query;
  * Provides statistical information about a query performed on a
  * GemFire <code>Region</code>.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public interface QueryStatistics {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/RegionNotFoundException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/RegionNotFoundException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/RegionNotFoundException.java
index 56a8fe3..a52f54c 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/RegionNotFoundException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/RegionNotFoundException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache.query;
 /**
  * Thrown if a region referenced by name in a query cannot be found.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public class RegionNotFoundException extends NameResolutionException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/SelectResults.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/SelectResults.java 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/SelectResults.java
index 821d4a2..b7359e6 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/SelectResults.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/SelectResults.java
@@ -62,7 +62,7 @@ import com.gemstone.gemfire.cache.query.types.*;
  *
  * @see com.gemstone.gemfire.cache.query.Query#execute()
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public interface SelectResults<E> extends Collection<E> {  
   
@@ -81,7 +81,7 @@ public interface SelectResults<E> extends Collection<E> {
    * collection, then 0 is returned.
    * @param element the element
    * @return the number of occurrances of element
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public int occurrences(E element);
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Struct.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Struct.java 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Struct.java
index a844e4f..8ff6a15 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Struct.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Struct.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.cache.query.types.StructType;
  *
  * @see SelectResults
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public interface Struct {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/TypeMismatchException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/TypeMismatchException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/TypeMismatchException.java
index ca2c773..6c6e0aa 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/TypeMismatchException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/TypeMismatchException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache.query;
 /**
  * Thrown if type consistency is violated while a query is being executed.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public class TypeMismatchException extends QueryException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/Bag.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/Bag.java 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/Bag.java
index 7e88c1b..15ca6bb 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/Bag.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/Bag.java
@@ -53,7 +53,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * @see StructBag
  * @see SortedResultsBag
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public abstract class Bag<E> extends AbstractCollection<E> implements
     CqResults<E> {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledLike.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledLike.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledLike.java
index d214f09..241170f 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledLike.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledLike.java
@@ -486,7 +486,7 @@ public class CompiledLike extends CompiledComparison
   }
   
   /**
-   * @since 6.6
+   * @since GemFire 6.6
    */
   @Override
   protected PlanInfo protGetPlanInfo(ExecutionContext context)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledSelect.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledSelect.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledSelect.java
index 7c6de42..f01a6cb 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledSelect.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledSelect.java
@@ -665,7 +665,7 @@ public class CompiledSelect extends AbstractCompiledValue {
    * whereclause.
    * @param collExpr 
    * @throws RegionNotFoundException 
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   private int getRegionIteratorSize(ExecutionContext context,
       CompiledValue collExpr) throws RegionNotFoundException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqEntry.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqEntry.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqEntry.java
index 2b6aa63..bba284b 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqEntry.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqEntry.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.Version;
 /**
  * This represents the CQ key value pair for the CQ query results.
  *  
- * @since 6.5
+ * @since GemFire 6.5
  */
 
 public class CqEntry implements DataSerializableFixedID {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqQueryVsdStats.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqQueryVsdStats.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqQueryVsdStats.java
index 30af78d..e9d30d5 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqQueryVsdStats.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqQueryVsdStats.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.cache.tier.MessageType;
 /**
  * This class tracks GemFire statistics related to a {@link 
com.gemstone.gemfire.cache.query.CqQuery}.
  * 
- * @since 5.5 
+ * @since GemFire 5.5
  */
 public class CqQueryVsdStats
 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqStateImpl.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqStateImpl.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqStateImpl.java
index 173ac3d..17c7099 100755
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqStateImpl.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqStateImpl.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.query.CqState;
 /**
  * Offers methods to get CQ state.
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 
 public class CqStateImpl implements CqState {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/HashingStrategy.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/HashingStrategy.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/HashingStrategy.java
index 15c37f5..18514a1 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/HashingStrategy.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/HashingStrategy.java
@@ -26,7 +26,7 @@ import java.io.Serializable;
  * in a HashMap(OR HashSet) for calculation of hash-code for
  * custom objects and primitive types.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  *
  */
 public interface HashingStrategy extends Serializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/NullToken.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/NullToken.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/NullToken.java
index ccf4540..4d21d29 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/NullToken.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/NullToken.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.internal.Version;
 
 /**
  * A Token representing null.
- * @since cedar
+ * @since GemFire cedar
  *
  */
 public class NullToken implements DataSerializableFixedID, Comparable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/PlanInfo.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/PlanInfo.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/PlanInfo.java
index 1beb07c..f42416a 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/PlanInfo.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/PlanInfo.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.cache.query.internal;
  * Encapsulates evaluation info about compiled values
  * 
  * @version $Revision: 1.1 $
- * @since 4.1
+ * @since GemFire 4.1
  */
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ProxyQueryService.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ProxyQueryService.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ProxyQueryService.java
index 60ab9b4..21274c1 100755
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ProxyQueryService.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ProxyQueryService.java
@@ -53,7 +53,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * multiuser-authentication attribute is set to true.
  * 
  * @see ProxyCache
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class ProxyQueryService implements QueryService {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QRegion.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QRegion.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QRegion.java
index 4e98f3e..052200f 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QRegion.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QRegion.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
 /**
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class QRegion implements SelectResults {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutionCanceledException.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutionCanceledException.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutionCanceledException.java
index 8015a00..e863004 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutionCanceledException.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutionCanceledException.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.cache.control.ResourceManager;
  * Due to various threads using the method, access to the query object may not 
be available for certain threads
  * This exception is generically used and caught by DefaultQuery, which will 
then throw the appropriate exception
 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class QueryExecutionCanceledException extends CacheRuntimeException {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutionContext.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutionContext.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutionContext.java
index 7c97ca8..25ec088 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutionContext.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutionContext.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.pdx.internal.PdxString;
  * is a bit heavt-weight context whose life is longer in JVM than
  * {@link ExecutionContext} which will be used ONLY for index updates.
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class QueryExecutionContext extends ExecutionContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutor.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutor.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutor.java
index 0b1a465..6084d23 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutor.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutor.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.cache.query.TypeMismatchException;
  * An interface allowing different Region implementations to support 
  * querying. 
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public interface QueryExecutor {
   //TODO Yogesh , fix this signature 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryMonitor.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryMonitor.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryMonitor.java
index 2c6a0dd..d4ca1a9 100755
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryMonitor.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryMonitor.java
@@ -44,7 +44,7 @@ import 
com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * The QueryMonitor cancels a query-execution thread if its taking more than
  * the max time. 
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public class QueryMonitor implements Runnable {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsCollectionCopyOnReadWrapper.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsCollectionCopyOnReadWrapper.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsCollectionCopyOnReadWrapper.java
index 25b3129..f9ba2f7 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsCollectionCopyOnReadWrapper.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsCollectionCopyOnReadWrapper.java
@@ -44,7 +44,7 @@ import com.gemstone.gemfire.cache.query.types.ObjectType;
  * toSet, toList, toArray and toArray(Object[] a) will create new structures 
that will iterate through
  * the results using a SelectResultsCopyOnReadIterator.  The new structures 
will then have a copy of the values.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public class ResultsCollectionCopyOnReadWrapper implements SelectResults {
   SelectResults results;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsCollectionWrapper.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsCollectionWrapper.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsCollectionWrapper.java
index 7c01a94..6f35770 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsCollectionWrapper.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsCollectionWrapper.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.internal.Version;
  * collection is a List; duplicates allowed unless base collection is a Set.
  * Defaults to modifiable unless set otherwise.
  * 
- * @since 4.0
+ * @since GemFire 4.0
  */
 public final class ResultsCollectionWrapper
   implements SelectResults, DataSerializableFixedID {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsSet.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsSet.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsSet.java
index bea9e53..2d513bf 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsSet.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsSet.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * Implementation of SelectResults that extends HashSet
  * If the elements are Structs, then use a StructSet instead.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public final class ResultsSet  extends HashSet implements SelectResults,
  DataSerializableFixedID {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/SortedResultSet.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/SortedResultSet.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/SortedResultSet.java
index 0c31c45..f30e865 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/SortedResultSet.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/SortedResultSet.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.internal.Version;
  * version of ResultSet used for order by clause If the elements are Structs,
  * then use SortedStructSet instead.
  * 
- * @since 4.0
+ * @since GemFire 4.0
  */
 public final class SortedResultSet extends TreeSet implements SelectResults, 
Ordered, 
     DataSerializableFixedID {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/SortedStructSet.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/SortedStructSet.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/SortedStructSet.java
index 73f2109..b165e0e 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/SortedStructSet.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/SortedStructSet.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.internal.Version;
  * The values in this set are stored as Object[] and get wrapped in Structs as
  * necessary.
  * 
- * @since 4.0
+ * @since GemFire 4.0
  */
 public final class SortedStructSet extends TreeSet implements SelectResults,
     DataSerializableFixedID, Ordered, StructFields {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructBag.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructBag.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructBag.java
index 81d46a5..03439a7 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructBag.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructBag.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * The values in this set are stored as Object[] and get wrapped in Structs as
  * necessary.
  * 
- * @since 5.1
+ * @since GemFire 5.1
  */
 public final class StructBag extends ResultsBag implements StructFields {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructImpl.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructImpl.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructImpl.java
index 5afb90d..673a84e 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructImpl.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructImpl.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.pdx.internal.PdxString;
 
 /**
  * Implementation of Struct
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class StructImpl
   implements Struct, DataSerializableFixedID, Serializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructSet.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructSet.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructSet.java
index 9d95a98..af2dbe7 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructSet.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructSet.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * The values in this set are stored as Object[] and get wrapped in Structs as
  * necessary.
  * 
- * @since 4.0
+ * @since GemFire 4.0
  */
 public final class StructSet /*extends ObjectOpenCustomHashSet*/ implements 
Set, SelectResults, 
 DataSerializableFixedID, StructFields {
@@ -107,7 +107,7 @@ DataSerializableFixedID, StructFields {
 
   /** Creates a StructSet directly from a StructBag;
    *  (internal use) 
-   *  @since 5.1
+   *  @since GemFire 5.1
    */
   StructSet(StructBag bag) {
     this.contents = new ObjectOpenCustomHashSet(new 
ObjectArrayHashingStrategy());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndex.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndex.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndex.java
index de35699..d0a0ee5 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndex.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndex.java
@@ -83,7 +83,7 @@ import com.gemstone.gemfire.pdx.internal.PdxString;
  * 
  * Currently this implementation only supports an index on a region path.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public class CompactRangeIndex extends AbstractIndex {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexConcurrentHashSet.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexConcurrentHashSet.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexConcurrentHashSet.java
index fdb42e6..95a2613 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexConcurrentHashSet.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexConcurrentHashSet.java
@@ -30,7 +30,7 @@ import 
com.gemstone.gemfire.internal.concurrent.CompactConcurrentHashSet2;
  * segments for accurate count.
  * 
  * @param <E>
- * @since 7.0 
+ * @since GemFire 7.0
  */
 public class IndexConcurrentHashSet<E> extends CompactConcurrentHashSet2<E> {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexElemArray.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexElemArray.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexElemArray.java
index 9c5d8e6..3cf4cbf 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexElemArray.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexElemArray.java
@@ -25,7 +25,7 @@ import java.util.NoSuchElementException;
  * A wrapper around an object array for storing values in index data structure
  * with minimal set of operations supported and the maximum size of 128 
elements  
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class IndexElemArray implements Iterable, Collection {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexStats.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexStats.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexStats.java
index 6653d32..77941b6 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexStats.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexStats.java
@@ -196,7 +196,7 @@ public class IndexStats {
    * com.gemstone.gemfire.internal.cache.GemFireCacheImpl#close cache} 
    * is closed.
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   void close() {
     this.stats.close();
@@ -205,7 +205,7 @@ public class IndexStats {
   /**
    * Returns whether or not these stats have been closed
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public boolean isClosed() {
     return this.stats.isClosed();
@@ -214,7 +214,7 @@ public class IndexStats {
 
   /**
    * Returns the Statistics instance that stores the cache perf stats.
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public Statistics getStats() {
     return this.stats;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexStore.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexStore.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexStore.java
index fa425cf..795939a 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexStore.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexStore.java
@@ -23,7 +23,7 @@ import 
com.gemstone.gemfire.internal.cache.persistence.query.CloseableIterator;
 
 /**
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public interface IndexStore {
 
@@ -54,8 +54,8 @@ public interface IndexStore {
    */
   public void updateMapping(Object indexKey, Object oldKey, RegionEntry re, 
Object oldValue)
       throws IMQException;
-
-  public String printAll();
+
+  public String printAll();
   
   /**
    * Return all of the IndexStoreEntries that map to a given region key.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/MemoryIndexStore.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/MemoryIndexStore.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/MemoryIndexStore.java
index 3f9a538..83f8c02 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/MemoryIndexStore.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/MemoryIndexStore.java
@@ -49,7 +49,7 @@ import 
com.gemstone.gemfire.internal.cache.persistence.query.CloseableIterator;
 /**
  * The in-memory index storage
  * 
- * @since 8.0 
+ * @since GemFire 8.0
  */
 public class MemoryIndexStore implements IndexStore {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedIndex.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedIndex.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedIndex.java
index 255f79a..da25ee3 100755
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedIndex.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedIndex.java
@@ -50,7 +50,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * This class implements a Partitioned index over a group of partitioned region
  * buckets.
  * 
- * @since 5.1
+ * @since GemFire 5.1
  */
 
 public class PartitionedIndex extends AbstractIndex

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTHint.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTHint.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTHint.java
index 6b283d0..3fd3069 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTHint.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTHint.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.query.internal.QCompiler;
 
 /**
  * 
- * @since 8.1
+ * @since GemFire 8.1
  *
  */
 public class ASTHint extends GemFireAST {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTHintIdentifier.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTHintIdentifier.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTHintIdentifier.java
index 5587bb6..0b0182e 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTHintIdentifier.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTHintIdentifier.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.query.internal.QCompiler;
 
 /**
  * 
- * @since 8.1
+ * @since GemFire 8.1
  *
  */
 public class ASTHintIdentifier extends GemFireAST {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTTrace.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTTrace.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTTrace.java
index 6d52330..4528e8b 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTTrace.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTTrace.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.cache.query.internal.QCompiler;
 
 /**
  * 
- * @since 6.6.2
+ * @since GemFire 6.6.2
  *
  */
 public class ASTTrace extends GemFireAST {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/CollectionTypeImpl.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/CollectionTypeImpl.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/CollectionTypeImpl.java
index 682ae95..f8f4b50 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/CollectionTypeImpl.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/CollectionTypeImpl.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.cache.query.types.*;
 
 /**
  * Implementation of CollectionType
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class CollectionTypeImpl extends ObjectTypeImpl implements 
CollectionType {
   private static final long serialVersionUID = 892402666471396897L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/MapTypeImpl.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/MapTypeImpl.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/MapTypeImpl.java
index 9888104..4943e97 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/MapTypeImpl.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/MapTypeImpl.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.DataSerializer;
 
 /**
  * Implementation of CollectionType
- * @since 4.0
+ * @since GemFire 4.0
  */
 public final class MapTypeImpl extends CollectionTypeImpl
 implements MapType {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/ObjectTypeImpl.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/ObjectTypeImpl.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/ObjectTypeImpl.java
index b41da46..9ea5d63 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/ObjectTypeImpl.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/ObjectTypeImpl.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.Version;
 
 /**
  * Implementation of ObjectType
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class ObjectTypeImpl implements ObjectType, DataSerializableFixedID {
   private static final long serialVersionUID = 3327357282163564784L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/StructTypeImpl.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/StructTypeImpl.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/StructTypeImpl.java
index dfa9cc0..1b7aa50 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/StructTypeImpl.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/StructTypeImpl.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
 /**
  * Implementation of StructType
- * @since 4.0
+ * @since GemFire 4.0
  */
 public final class StructTypeImpl extends ObjectTypeImpl implements StructType 
{
   private static final long serialVersionUID = -6368710865627039204L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/CollectionType.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/CollectionType.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/CollectionType.java
index 2d865ce..ad2ddaf 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/CollectionType.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/CollectionType.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache.query.types;
  * Represents the type of a collection, an object that can contain element
  * objects.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public interface CollectionType extends ObjectType {
   


Reply via email to