Replace 'tonytv' with full name in author tags

55 files changed, 55 insertions, 55 deletions

diff --git a/container-search/src/main/java/com/yahoo/fs4/HexByteIterator.java b/container-search/src/main/java/com/yahoo/fs4/HexByteIterator.java
index 5df9e260c15..78ba857c475 100644
--- a/container-search/src/main/java/com/yahoo/fs4/HexByteIterator.java
+++ b/container-search/src/main/java/com/yahoo/fs4/HexByteIterator.java
@@ -8,7 +8,7 @@ import java.util.Iterator;
  * Provides sequential access to each byte of a buffer
  * as a hexadecimal string of length 2.
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public final class HexByteIterator implements Iterator<String> {
     private final ByteBuffer buffer;
diff --git a/container-search/src/main/java/com/yahoo/fs4/PacketDumper.java b/container-search/src/main/java/com/yahoo/fs4/PacketDumper.java
index 123403a1c8d..6b2c792837a 100644
--- a/container-search/src/main/java/com/yahoo/fs4/PacketDumper.java
+++ b/container-search/src/main/java/com/yahoo/fs4/PacketDumper.java
@@ -20,7 +20,7 @@ import com.yahoo.search.Query;
 /**
  * Responsible for dumping query &amp; query result packets
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class PacketDumper implements PacketListener {
     /** High level representation of packet types (e.g. query, result, ...) */
diff --git a/container-search/src/main/java/com/yahoo/fs4/PacketListener.java b/container-search/src/main/java/com/yahoo/fs4/PacketListener.java
index a876caf9699..113da03b420 100644
--- a/container-search/src/main/java/com/yahoo/fs4/PacketListener.java
+++ b/container-search/src/main/java/com/yahoo/fs4/PacketListener.java
@@ -8,7 +8,7 @@ import com.yahoo.fs4.mplex.FS4Channel;
 /**
  * Interface for recieving notifications of packets sent or recieved.
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public interface PacketListener {
     void packetSent(FS4Channel channel, BasicPacket packet, ByteBuffer serializedForm);
diff --git a/container-search/src/main/java/com/yahoo/fs4/PacketNotificationsBroadcaster.java b/container-search/src/main/java/com/yahoo/fs4/PacketNotificationsBroadcaster.java
index 06c908cac4b..1be79031d1b 100644
--- a/container-search/src/main/java/com/yahoo/fs4/PacketNotificationsBroadcaster.java
+++ b/container-search/src/main/java/com/yahoo/fs4/PacketNotificationsBroadcaster.java
@@ -8,7 +8,7 @@ import com.yahoo.fs4.mplex.FS4Channel;
 /**
  * Broadcasts packet notifications to a list of listeners.
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class PacketNotificationsBroadcaster implements PacketListener {
 
diff --git a/container-search/src/main/java/com/yahoo/fs4/PacketQueryTracer.java b/container-search/src/main/java/com/yahoo/fs4/PacketQueryTracer.java
index ded5db99594..b577ef31ad8 100644
--- a/container-search/src/main/java/com/yahoo/fs4/PacketQueryTracer.java
+++ b/container-search/src/main/java/com/yahoo/fs4/PacketQueryTracer.java
@@ -9,7 +9,7 @@ import com.yahoo.search.Query;
 /**
  * Adds packets to the query context
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class PacketQueryTracer implements PacketListener {
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/textualrepresentation/Discloser.java b/container-search/src/main/java/com/yahoo/prelude/query/textualrepresentation/Discloser.java
index 7bced128ac5..1d7372a2497 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/textualrepresentation/Discloser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/textualrepresentation/Discloser.java
@@ -6,7 +6,7 @@ import com.yahoo.prelude.query.Item;
 /**
  * Allows an item to disclose its properties and children/value.
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public interface Discloser {
     void addProperty(String key, Object value);
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/textualrepresentation/TextualQueryRepresentation.java b/container-search/src/main/java/com/yahoo/prelude/query/textualrepresentation/TextualQueryRepresentation.java
index f00219122c4..56f106a43f4 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/textualrepresentation/TextualQueryRepresentation.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/textualrepresentation/TextualQueryRepresentation.java
@@ -10,7 +10,7 @@ import java.util.regex.Pattern;
 /**
  * Creates a detailed, QED inspired representation of a query tree.
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class TextualQueryRepresentation {
     private Map<Item, Integer> itemReferences = new IdentityHashMap<>();
diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/MultipleResultsSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/MultipleResultsSearcher.java
index 3b2fd596cfa..75066a424fc 100644
--- a/container-search/src/main/java/com/yahoo/prelude/searcher/MultipleResultsSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/searcher/MultipleResultsSearcher.java
@@ -17,7 +17,7 @@ import java.util.*;
  *
  * <p> For each group, the desired number of hits can be specified. </p>
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class MultipleResultsSearcher extends Searcher {
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/templates/HitContext.java b/container-search/src/main/java/com/yahoo/prelude/templates/HitContext.java
index 4d1daa97306..14b05f5e2a6 100644
--- a/container-search/src/main/java/com/yahoo/prelude/templates/HitContext.java
+++ b/container-search/src/main/java/com/yahoo/prelude/templates/HitContext.java
@@ -16,7 +16,7 @@ import java.util.Set;
 /**
  * A context providing all the fields of a hit, and falls back to MapContext behavior for all other keys.
  *
- * @author tonytv
+ * @author Tony Vaagenes
  * @deprecated use a Renderer instead
  */
 @SuppressWarnings("deprecation")
diff --git a/container-search/src/main/java/com/yahoo/prelude/templates/LogExceptionUserTemplateDelegator.java b/container-search/src/main/java/com/yahoo/prelude/templates/LogExceptionUserTemplateDelegator.java
index b9272ac4c3d..f9ad3ebf86e 100644
--- a/container-search/src/main/java/com/yahoo/prelude/templates/LogExceptionUserTemplateDelegator.java
+++ b/container-search/src/main/java/com/yahoo/prelude/templates/LogExceptionUserTemplateDelegator.java
@@ -12,7 +12,7 @@ import java.util.logging.Logger;
 /**
  * Delegates to another UserTemplate, but handles any exceptions(except IOException) by logging them.
  * 
- * @author tonytv
+ * @author Tony Vaagenes
  * @deprecated use a renderer instead
  */
 @SuppressWarnings("deprecation")
diff --git a/container-search/src/main/java/com/yahoo/prelude/templates/SearchRendererAdaptor.java b/container-search/src/main/java/com/yahoo/prelude/templates/SearchRendererAdaptor.java
index a639a6b97ec..8439dd105a8 100644
--- a/container-search/src/main/java/com/yahoo/prelude/templates/SearchRendererAdaptor.java
+++ b/container-search/src/main/java/com/yahoo/prelude/templates/SearchRendererAdaptor.java
@@ -20,7 +20,7 @@ import java.util.Iterator;
 /**
  * Renders a search result using the old templates API.
  *
- * @author tonytv
+ * @author Tony Vaagenes
  * @deprecated do not use
  */
 @SuppressWarnings({ "rawtypes", "deprecation", "unchecked" })
diff --git a/container-search/src/main/java/com/yahoo/search/config/dispatchprototype/package-info.java b/container-search/src/main/java/com/yahoo/search/config/dispatchprototype/package-info.java
index 60bd4fd71ab..3b1a3b3bd05 100644
--- a/container-search/src/main/java/com/yahoo/search/config/dispatchprototype/package-info.java
+++ b/container-search/src/main/java/com/yahoo/search/config/dispatchprototype/package-info.java
@@ -1,7 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
  * Package for dispatchprototype config.
- * @author tonytv
+ * @author Tony Vaagenes
  */
 @ExportPackage
 package com.yahoo.search.config.dispatchprototype;
diff --git a/container-search/src/main/java/com/yahoo/search/federation/selection/FederationTarget.java b/container-search/src/main/java/com/yahoo/search/federation/selection/FederationTarget.java
index 32a5644f29f..7ade9a0eaf9 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/selection/FederationTarget.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/selection/FederationTarget.java
@@ -13,7 +13,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
  * along with a timeout and
  * custom data reserved for use by the TargetSelector.
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public final class FederationTarget<T> {
 
diff --git a/container-search/src/main/java/com/yahoo/search/federation/selection/TargetSelector.java b/container-search/src/main/java/com/yahoo/search/federation/selection/TargetSelector.java
index d4ae147eae7..465ddedbecf 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/selection/TargetSelector.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/selection/TargetSelector.java
@@ -18,7 +18,7 @@ import java.util.Collection;
  * 1) call modifyTargetQuery(target, query)
  * 2) call modifyTargetResult(target, result)
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public interface TargetSelector<T> {
 
diff --git a/container-search/src/main/java/com/yahoo/search/federation/sourceref/SearchChainInvocationSpec.java b/container-search/src/main/java/com/yahoo/search/federation/sourceref/SearchChainInvocationSpec.java
index 4fe41d16d35..6cb8d2ef174 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/sourceref/SearchChainInvocationSpec.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/sourceref/SearchChainInvocationSpec.java
@@ -12,7 +12,7 @@ import java.util.Objects;
  * Specifices which search chain should be run and how it should be run.
  * This is a value object.
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class SearchChainInvocationSpec implements Cloneable {
 
diff --git a/container-search/src/main/java/com/yahoo/search/federation/sourceref/SearchChainResolver.java b/container-search/src/main/java/com/yahoo/search/federation/sourceref/SearchChainResolver.java
index 66874f1a2f1..97ceee96dfc 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/sourceref/SearchChainResolver.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/sourceref/SearchChainResolver.java
@@ -37,7 +37,7 @@ import java.util.TreeSet;
  *                    o: SearchChainInvocationSpec
  * </pre>
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class SearchChainResolver {
 
diff --git a/container-search/src/main/java/com/yahoo/search/federation/sourceref/SingleTarget.java b/container-search/src/main/java/com/yahoo/search/federation/sourceref/SingleTarget.java
index 6e08fa2f966..f4c98075a5a 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/sourceref/SingleTarget.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/sourceref/SingleTarget.java
@@ -7,7 +7,7 @@ import com.yahoo.processing.request.Properties;
 /**
  * TODO: What is this?
  *
-* @author tonytv
+* @author Tony Vaagenes
 */
 public class SingleTarget extends Target {
     private final SearchChainInvocationSpec searchChainInvocationSpec;
diff --git a/container-search/src/main/java/com/yahoo/search/federation/sourceref/SourceRefResolver.java b/container-search/src/main/java/com/yahoo/search/federation/sourceref/SourceRefResolver.java
index e14c46056b7..ee98d033440 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/sourceref/SourceRefResolver.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/sourceref/SourceRefResolver.java
@@ -15,7 +15,7 @@ import com.yahoo.processing.request.Properties;
 /**
  * Maps a source reference to search chain invocation specs.
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class SourceRefResolver {
 
diff --git a/container-search/src/main/java/com/yahoo/search/federation/sourceref/Target.java b/container-search/src/main/java/com/yahoo/search/federation/sourceref/Target.java
index cf7276d767e..f23e24525bb 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/sourceref/Target.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/sourceref/Target.java
@@ -8,7 +8,7 @@ import com.yahoo.processing.request.Properties;
 /**
  * TODO: What's this?
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public abstract class Target extends AbstractComponent {
 
diff --git a/container-search/src/main/java/com/yahoo/search/federation/sourceref/UnresolvedProviderException.java b/container-search/src/main/java/com/yahoo/search/federation/sourceref/UnresolvedProviderException.java
index 087fa0825ff..5075b05454b 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/sourceref/UnresolvedProviderException.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/sourceref/UnresolvedProviderException.java
@@ -7,7 +7,7 @@ import com.yahoo.component.ComponentSpecification;
 import static com.yahoo.container.util.Util.quote;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 @SuppressWarnings("serial")
 class UnresolvedProviderException extends UnresolvedSearchChainException {
diff --git a/container-search/src/main/java/com/yahoo/search/federation/sourceref/UnresolvedSearchChainException.java b/container-search/src/main/java/com/yahoo/search/federation/sourceref/UnresolvedSearchChainException.java
index 2763bf52b22..dceae0318b4 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/sourceref/UnresolvedSearchChainException.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/sourceref/UnresolvedSearchChainException.java
@@ -3,7 +3,7 @@ package com.yahoo.search.federation.sourceref;
 
 /**
  * Thrown if a search chain can not be resolved from one or more ids.
- * @author tonytv
+ * @author Tony Vaagenes
  */
 @SuppressWarnings("serial")
 public class UnresolvedSearchChainException extends Exception {
diff --git a/container-search/src/main/java/com/yahoo/search/federation/sourceref/UnresolvedSourceRefException.java b/container-search/src/main/java/com/yahoo/search/federation/sourceref/UnresolvedSourceRefException.java
index 44569a55e22..233e92c1699 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/sourceref/UnresolvedSourceRefException.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/sourceref/UnresolvedSourceRefException.java
@@ -6,7 +6,7 @@ import com.yahoo.component.ComponentSpecification;
 import static com.yahoo.container.util.Util.quote;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 @SuppressWarnings("serial")
 class UnresolvedSourceRefException extends UnresolvedSearchChainException {
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/TextSerialize.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/TextSerialize.java
index ccf343889a0..f44dab92fc7 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/TextSerialize.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/TextSerialize.java
@@ -12,7 +12,7 @@ import com.yahoo.search.query.textserialize.serializer.QueryTreeSerializer;
 import java.io.StringReader;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  * Facade
  * Allows serializing/deserializing  a query to the programmatic format.
  */
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/AndNotRestConverter.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/AndNotRestConverter.java
index d60979d7820..243596f2b2d 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/AndNotRestConverter.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/AndNotRestConverter.java
@@ -10,7 +10,7 @@ import static com.yahoo.search.query.textserialize.item.ListUtil.butFirst;
 import static com.yahoo.search.query.textserialize.item.ListUtil.first;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class AndNotRestConverter extends CompositeConverter<NotItem> {
     static final String andNotRest = "AND-NOT-REST";
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/CompositeConverter.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/CompositeConverter.java
index 77b9bf45494..332f03c896c 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/CompositeConverter.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/CompositeConverter.java
@@ -9,7 +9,7 @@ import com.yahoo.search.query.textserialize.serializer.ItemIdMapper;
 import java.util.ListIterator;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class CompositeConverter<T extends CompositeItem> implements ItemFormConverter {
     private final Class<T> itemClass;
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/IntConverter.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/IntConverter.java
index d01e80393b7..520d6eb7ec5 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/IntConverter.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/IntConverter.java
@@ -5,7 +5,7 @@ import com.yahoo.prelude.query.IntItem;
 import com.yahoo.prelude.query.TermItem;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class IntConverter extends TermConverter {
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemArguments.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemArguments.java
index d4bf0a1a412..4d998f3553c 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemArguments.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemArguments.java
@@ -8,7 +8,7 @@ import java.util.Map;
 import static com.yahoo.search.query.textserialize.item.ListUtil.firstInstanceOf;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class ItemArguments {
     public final Map<?, ?> properties;
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemContext.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemContext.java
index c34b1434366..e739608387d 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemContext.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemContext.java
@@ -9,7 +9,7 @@ import java.util.IdentityHashMap;
 import java.util.Map;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class ItemContext {
     private class Connectivity {
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemExecutorRegistry.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemExecutorRegistry.java
index 8f1d557aadb..4f18232df24 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemExecutorRegistry.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemExecutorRegistry.java
@@ -15,7 +15,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class ItemExecutorRegistry {
 
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemFormConverter.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemFormConverter.java
index 929f31a0e92..1c101943326 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemFormConverter.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemFormConverter.java
@@ -6,7 +6,7 @@ import com.yahoo.search.query.textserialize.serializer.DispatchForm;
 import com.yahoo.search.query.textserialize.serializer.ItemIdMapper;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public interface ItemFormConverter {
     Object formToItem(String name, ItemArguments arguments, ItemContext context);
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemFormHandler.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemFormHandler.java
index faf03c1f9df..34841564c68 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemFormHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemFormHandler.java
@@ -6,7 +6,7 @@ import com.yahoo.search.query.textserialize.parser.DispatchFormHandler;
 import java.util.List;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class ItemFormHandler implements DispatchFormHandler{
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java
index 43bec08b3f5..a1a240b9bfb 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java
@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class ItemInitializer {
 
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ListUtil.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ListUtil.java
index 7119669b0ca..71ac07fe2ea 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ListUtil.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ListUtil.java
@@ -4,7 +4,7 @@ package com.yahoo.search.query.textserialize.item;
 import java.util.*;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class ListUtil {
     public static <T> List<T> rest(List<T> list) {
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/NearConverter.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/NearConverter.java
index 26829a70491..d622068b384 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/NearConverter.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/NearConverter.java
@@ -7,7 +7,7 @@ import com.yahoo.search.query.textserialize.serializer.DispatchForm;
 import com.yahoo.search.query.textserialize.serializer.ItemIdMapper;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 @SuppressWarnings("rawtypes")
 public class NearConverter extends CompositeConverter {
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/PrefixConverter.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/PrefixConverter.java
index 0bfb69463ec..bbf87ef8532 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/PrefixConverter.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/PrefixConverter.java
@@ -4,7 +4,7 @@ package com.yahoo.search.query.textserialize.item;
 import com.yahoo.prelude.query.PrefixItem;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class PrefixConverter extends WordConverter {
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/SubStringConverter.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/SubStringConverter.java
index d99ef575597..d7e6aa3900c 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/SubStringConverter.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/SubStringConverter.java
@@ -4,7 +4,7 @@ package com.yahoo.search.query.textserialize.item;
 import com.yahoo.prelude.query.SubstringItem;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class SubStringConverter extends WordConverter {
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/SuffixConverter.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/SuffixConverter.java
index 3002ec39e48..c2de4772806 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/SuffixConverter.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/SuffixConverter.java
@@ -4,7 +4,7 @@ package com.yahoo.search.query.textserialize.item;
 import com.yahoo.prelude.query.SuffixItem;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class SuffixConverter extends WordConverter {
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/TermConverter.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/TermConverter.java
index 3a6bbf77d5e..04c01d7acc1 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/TermConverter.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/TermConverter.java
@@ -7,7 +7,7 @@ import com.yahoo.search.query.textserialize.serializer.DispatchForm;
 import com.yahoo.search.query.textserialize.serializer.ItemIdMapper;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public abstract class TermConverter implements ItemFormConverter {
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/TypeCheck.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/TypeCheck.java
index ebfcc8aa54c..b7843a300dc 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/TypeCheck.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/TypeCheck.java
@@ -4,7 +4,7 @@ package com.yahoo.search.query.textserialize.item;
 import com.yahoo.protect.Validator;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class TypeCheck {
     public static void ensureInstanceOf(Object object, Class<?> c) {
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/WordConverter.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/WordConverter.java
index b4d40f26a1d..f37059cfe1d 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/WordConverter.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/WordConverter.java
@@ -5,7 +5,7 @@ import com.yahoo.prelude.query.TermItem;
 import com.yahoo.prelude.query.WordItem;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class WordConverter extends TermConverter {
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/parser/DispatchFormHandler.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/parser/DispatchFormHandler.java
index e196952c903..d3d3b030d7a 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/parser/DispatchFormHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/parser/DispatchFormHandler.java
@@ -4,7 +4,7 @@ package com.yahoo.search.query.textserialize.parser;
 import java.util.List;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public interface DispatchFormHandler {
     Object dispatch(String name, List<Object> arguments, Object dispatchContext);
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/serializer/DispatchForm.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/serializer/DispatchForm.java
index 27032065e6b..11ec6e4b020 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/serializer/DispatchForm.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/serializer/DispatchForm.java
@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class DispatchForm {
     private final String name;
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/serializer/ItemIdMapper.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/serializer/ItemIdMapper.java
index e5473d77574..df589fcd76a 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/serializer/ItemIdMapper.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/serializer/ItemIdMapper.java
@@ -7,7 +7,7 @@ import java.util.IdentityHashMap;
 import java.util.Map;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class ItemIdMapper {
     private final Map<Item, String> idByItem = new IdentityHashMap<>();
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/serializer/QueryTreeSerializer.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/serializer/QueryTreeSerializer.java
index 337c1d4a59e..7cdeb9f9597 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/serializer/QueryTreeSerializer.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/serializer/QueryTreeSerializer.java
@@ -6,7 +6,7 @@ import com.yahoo.search.query.textserialize.item.ItemExecutorRegistry;
 
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class QueryTreeSerializer {
     public String serialize(Item root) {
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/serializer/Serializer.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/serializer/Serializer.java
index 828fb6ce415..d4e499bab79 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/serializer/Serializer.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/serializer/Serializer.java
@@ -11,7 +11,7 @@ import static com.yahoo.search.query.textserialize.item.ListUtil.butFirst;
 import static com.yahoo.search.query.textserialize.item.ListUtil.first;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 class Serializer {
     static String serialize(Object child, ItemIdMapper itemIdMapper) {
diff --git a/container-search/src/main/java/com/yahoo/search/rendering/DefaultRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/DefaultRenderer.java
index 2d69a262f15..aa825149bb7 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/DefaultRenderer.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/DefaultRenderer.java
@@ -42,7 +42,7 @@ import java.util.stream.Collectors;
 /**
  * XML rendering of search results. This is NOT the default (but it once was).
  *
- * @author tonytv
+ * @author Tony Vaagenes
  * @deprecated use JsonRenderer instead
  */
 @SuppressWarnings({ "rawtypes", "deprecation" })
diff --git a/container-search/src/main/java/com/yahoo/search/rendering/Renderer.java b/container-search/src/main/java/com/yahoo/search/rendering/Renderer.java
index a5ade01b1be..a61c657b709 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/Renderer.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/Renderer.java
@@ -26,7 +26,7 @@ import java.nio.charset.CharsetEncoder;
  * <li>State mutated during rendering shall be initialized in the init method.</li>
  * </ol>
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 abstract public class Renderer extends com.yahoo.processing.rendering.Renderer<Result> {
 
diff --git a/container-search/src/main/java/com/yahoo/search/rendering/SectionedRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/SectionedRenderer.java
index c35a4efc50c..bd647bd74f0 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/SectionedRenderer.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/SectionedRenderer.java
@@ -29,7 +29,7 @@ import java.util.List;
  *   <li>State mutated during rendering shall be initialized in the init method.
  * </ol>
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 abstract public class SectionedRenderer<WRITER> extends Renderer {
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/rendering/SyncDefaultRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/SyncDefaultRenderer.java
index 08599540cb1..6919f6bd3f8 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/SyncDefaultRenderer.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/SyncDefaultRenderer.java
@@ -35,7 +35,7 @@ import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 @SuppressWarnings({ "rawtypes", "deprecation" })
 public final class SyncDefaultRenderer extends Renderer {
diff --git a/container-search/src/main/java/com/yahoo/search/result/MetaHitsFirstComparator.java b/container-search/src/main/java/com/yahoo/search/result/MetaHitsFirstComparator.java
index 389222f6cec..a15cd30d664 100644
--- a/container-search/src/main/java/com/yahoo/search/result/MetaHitsFirstComparator.java
+++ b/container-search/src/main/java/com/yahoo/search/result/MetaHitsFirstComparator.java
@@ -7,7 +7,7 @@ import java.util.Comparator;
  * Ensures that meta hits are sorted before normal hits. All meta hits are
  * considered equal.
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class MetaHitsFirstComparator extends ChainableComparator {
 
diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java b/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java
index cfef91ee0ec..1657b45b1b4 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java
@@ -17,7 +17,7 @@ import java.util.*;
 /**
  * Defines the searcher models used in the vespa and native search chains, except for federation.
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 @SuppressWarnings({"rawtypes", "deprecation", "unchecked"})
 public class VespaSearchers {
diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationOptions.java b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationOptions.java
index a24b13a6d17..0843ec074b6 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationOptions.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationOptions.java
@@ -9,7 +9,7 @@ import java.util.Objects;
  * Options for controlling federation to a single source.
  * This is a value object.
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 @Immutable
 public class FederationOptions implements Cloneable {
diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationSearcherModel.java b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationSearcherModel.java
index 9088575b881..e1c95e9478e 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationSearcherModel.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationSearcherModel.java
@@ -15,7 +15,7 @@ import com.yahoo.search.federation.FederationSearcher;
 /**
  * Specifies how a federation searcher is to be set up.
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 @Immutable
 public class FederationSearcherModel extends ChainedComponentModel {
diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/HttpProviderSpec.java b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/HttpProviderSpec.java
index 4495ec25908..4103514c103 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/HttpProviderSpec.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/HttpProviderSpec.java
@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * Specifies how a http provider is to be set up.
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 @Immutable
 public class HttpProviderSpec {
diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java
index ef2bf65895f..a18b93b8a6f 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java
@@ -16,7 +16,7 @@ import net.jcip.annotations.Immutable;
 /**
  * Specifies how a local provider is to be set up.
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 @Immutable
 public class LocalProviderSpec {