SONAR-7665 Deprecate @BatchSide and introduce @ScannerSide

58 files changed, 116 insertions, 114 deletions

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/ProjectConfigurator.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/ProjectConfigurator.java
index 997cae744f2..1ba17667560 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/ProjectConfigurator.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/ProjectConfigurator.java
@@ -24,7 +24,7 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.CoreProperties;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.config.Settings;
 import org.sonar.api.resources.Project;
@@ -35,7 +35,7 @@ import org.sonar.api.utils.System2;
  * Used by views !!
  *
  */
-@BatchSide
+@ScannerSide
 public class ProjectConfigurator {
 
   private static final Logger LOG = LoggerFactory.getLogger(ProjectConfigurator.class);
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginJarExploder.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginJarExploder.java
index a91a6b38cbc..b1ee308a926 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginJarExploder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginJarExploder.java
@@ -20,7 +20,7 @@
 package org.sonar.batch.bootstrap;
 
 import org.apache.commons.io.FileUtils;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.utils.ZipUtils;
 import org.sonar.core.platform.ExplodedPlugin;
 import org.sonar.core.platform.PluginJarExploder;
@@ -33,7 +33,7 @@ import java.io.IOException;
 
 import static org.sonar.core.util.FileUtils.deleteQuietly;
 
-@BatchSide
+@ScannerSide
 public class BatchPluginJarExploder extends PluginJarExploder {
 
   private final FileCache fileCache;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginPredicate.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginPredicate.java
index ea4380c44da..6aa3fe77320 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginPredicate.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginPredicate.java
@@ -31,7 +31,7 @@ import javax.annotation.Nonnull;
 
 import org.apache.commons.lang.StringUtils;
 import org.sonar.api.CoreProperties;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.config.Settings;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
@@ -40,7 +40,7 @@ import static com.google.common.collect.Sets.newHashSet;
 /**
  * Filters the plugins to be enabled during analysis
  */
-@BatchSide
+@ScannerSide
 public class BatchPluginPredicate implements Predicate<String> {
 
   private static final Logger LOG = Loggers.get(BatchPluginPredicate.class);
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchWsClientProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchWsClientProvider.java
index 5cd52b3419c..ea6ad1e9139 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchWsClientProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchWsClientProvider.java
@@ -21,7 +21,7 @@ package org.sonar.batch.bootstrap;
 
 import org.picocontainer.injectors.ProviderAdapter;
 import org.sonar.api.CoreProperties;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.batch.bootstrapper.EnvironmentInformation;
 import org.sonarqube.ws.client.HttpConnector;
 import org.sonarqube.ws.client.WsClientFactories;
@@ -30,7 +30,7 @@ import static java.lang.Integer.parseInt;
 import static java.lang.String.valueOf;
 import static org.apache.commons.lang.StringUtils.defaultIfBlank;
 
-@BatchSide
+@ScannerSide
 public class BatchWsClientProvider extends ProviderAdapter {
 
   static final int CONNECT_TIMEOUT_MS = 5_000;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/ExtensionMatcher.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/ExtensionMatcher.java
index d38581f572d..d5bd2516af0 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/ExtensionMatcher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/ExtensionMatcher.java
@@ -19,12 +19,12 @@
  */
 package org.sonar.batch.bootstrap;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 
 /**
  * @since 3.6
  */
-@BatchSide
+@ScannerSide
 public interface ExtensionMatcher {
   boolean accept(Object extension);
 }
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/ExtensionUtils.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/ExtensionUtils.java
index adf16a40315..9d6882420f6 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/ExtensionUtils.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/ExtensionUtils.java
@@ -21,6 +21,7 @@ package org.sonar.batch.bootstrap;
 
 import org.sonar.api.batch.BatchSide;
 import org.sonar.api.batch.InstantiationStrategy;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.utils.AnnotationUtils;
 
 public class ExtensionUtils {
@@ -36,9 +37,10 @@ public class ExtensionUtils {
     }
     return InstantiationStrategy.PER_PROJECT.equals(strategy);
   }
-
-  public static boolean isBatchSide(Object extension) {
-    return AnnotationUtils.getAnnotation(extension, BatchSide.class) != null;
+  
+  public static boolean isScannerSide(Object extension) {
+    return AnnotationUtils.getAnnotation(extension, BatchSide.class) != null ||
+      AnnotationUtils.getAnnotation(extension, ScannerSide.class) != null;
   }
 
   public static boolean isType(Object extension, Class<?> extensionClass) {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/MetricProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/MetricProvider.java
index 1735ab4a79b..735eeb4089f 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/MetricProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/MetricProvider.java
@@ -20,7 +20,7 @@
 package org.sonar.batch.bootstrap;
 
 import com.google.common.collect.Lists;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.ExtensionProvider;
 import org.sonar.api.batch.InstantiationStrategy;
 import org.sonar.api.measures.CoreMetrics;
@@ -29,7 +29,7 @@ import org.sonar.api.measures.Metrics;
 
 import java.util.List;
 
-@BatchSide
+@ScannerSide
 @InstantiationStrategy(InstantiationStrategy.PER_BATCH)
 public class MetricProvider extends ExtensionProvider {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/PluginInstaller.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/PluginInstaller.java
index 4525027dbaa..fc07d4c2a77 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/PluginInstaller.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/PluginInstaller.java
@@ -21,10 +21,10 @@ package org.sonar.batch.bootstrap;
 
 import java.util.Map;
 import org.sonar.api.Plugin;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.core.platform.PluginInfo;
 
-@BatchSide
+@ScannerSide
 public interface PluginInstaller {
 
   /**
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/EnvironmentInformation.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/EnvironmentInformation.java
index a04da9df40a..75f9620ecc3 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/EnvironmentInformation.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/EnvironmentInformation.java
@@ -19,14 +19,14 @@
  */
 package org.sonar.batch.bootstrapper;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 
 /**
  * Describes execution environment.
  * 
  * @since 2.6
  */
-@BatchSide
+@ScannerSide
 public class EnvironmentInformation {
 
   private String key;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/deprecated/CpdBlockIndexer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/deprecated/CpdBlockIndexer.java
index fe58cb6558b..b210e2f488c 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/deprecated/CpdBlockIndexer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/deprecated/CpdBlockIndexer.java
@@ -20,9 +20,9 @@
 package org.sonar.batch.cpd.deprecated;
 
 import org.slf4j.Logger;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 
-@BatchSide
+@ScannerSide
 public abstract class CpdBlockIndexer {
 
   abstract boolean isLanguageSupported(String language);
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/deprecated/CpdMappings.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/deprecated/CpdMappings.java
index ad2275e399c..abeb4e64ef7 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/deprecated/CpdMappings.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/deprecated/CpdMappings.java
@@ -19,12 +19,12 @@
  */
 package org.sonar.batch.cpd.deprecated;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.CpdMapping;
 
 import javax.annotation.CheckForNull;
 
-@BatchSide
+@ScannerSide
 public class CpdMappings {
 
   private final CpdMapping[] mappings;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/perspectives/PerspectiveBuilder.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/perspectives/PerspectiveBuilder.java
index 0f38dc2ed41..f3db5fb259f 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/perspectives/PerspectiveBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/perspectives/PerspectiveBuilder.java
@@ -20,11 +20,11 @@
 package org.sonar.batch.deprecated.perspectives;
 
 import javax.annotation.CheckForNull;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.component.Perspective;
 import org.sonar.batch.index.BatchComponent;
 
-@BatchSide
+@ScannerSide
 public abstract class PerspectiveBuilder<T extends Perspective> {
 
   private final Class<T> perspectiveClass;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/index/BatchComponentCache.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/index/BatchComponentCache.java
index 68c29f69c95..e858112e8b2 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/index/BatchComponentCache.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/index/BatchComponentCache.java
@@ -26,11 +26,11 @@ import java.util.Collection;
 import java.util.Map;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.fs.InputComponent;
 import org.sonar.api.resources.Resource;
 
-@BatchSide
+@ScannerSide
 public class BatchComponentCache {
   // components by key
   private final Map<String, BatchComponent> components = Maps.newLinkedHashMap();
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/index/Caches.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/index/Caches.java
index ddddb271dfd..a16d409bd56 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/index/Caches.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/index/Caches.java
@@ -33,9 +33,9 @@ import com.persistit.encoding.ValueCoder;
 import com.persistit.exception.PersistitException;
 import com.persistit.Volume;
 import org.picocontainer.Startable;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 
-@BatchSide
+@ScannerSide
 public class Caches implements Startable {
   private final Map<String, Exchange> cacheMap = Maps.newHashMap();
   private Persistit persistit;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/index/CachesManager.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/index/CachesManager.java
index 010375a84eb..33d85c5ed24 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/index/CachesManager.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/index/CachesManager.java
@@ -26,7 +26,7 @@ import java.io.File;
 import java.util.Properties;
 import org.picocontainer.Startable;
 import org.slf4j.LoggerFactory;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.utils.TempFolder;
 
 import static org.sonar.core.util.FileUtils.deleteQuietly;
@@ -36,7 +36,7 @@ import static org.sonar.core.util.FileUtils.deleteQuietly;
  *
  * @since 3.6
  */
-@BatchSide
+@ScannerSide
 public class CachesManager implements Startable {
   private File tempDir;
   private Persistit persistit;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueCache.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueCache.java
index ac1bc6826a5..f7a0b7f5b36 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueCache.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueCache.java
@@ -21,7 +21,7 @@ package org.sonar.batch.issue;
 
 import org.sonar.batch.issue.tracking.TrackedIssue;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.batch.index.Cache;
 import org.sonar.batch.index.Caches;
 
@@ -30,7 +30,7 @@ import java.util.Collection;
 /**
  * Shared issues among all project modules
  */
-@BatchSide
+@ScannerSide
 public class IssueCache {
 
   // component key -> issue key -> issue
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueFilters.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueFilters.java
index ef542d551ab..5b233dfbdee 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueFilters.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueFilters.java
@@ -23,12 +23,12 @@ import org.sonar.api.scan.issue.filter.FilterableIssue;
 
 import org.sonar.api.scan.issue.filter.IssueFilterChain;
 import org.sonar.scanner.protocol.output.ScannerReport;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.issue.Issue;
 import org.sonar.api.scan.issue.filter.IssueFilter;
 import org.sonar.api.resources.Project;
 
-@BatchSide
+@ScannerSide
 public class IssueFilters {
   private final IssueFilter[] filters;
   private final org.sonar.api.issue.batch.IssueFilter[] deprecatedFilters;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/AbstractPatternInitializer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/AbstractPatternInitializer.java
index af6a0efe228..8144a878c86 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/AbstractPatternInitializer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/AbstractPatternInitializer.java
@@ -22,14 +22,14 @@ package org.sonar.batch.issue.ignore.pattern;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang.StringUtils;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.config.Settings;
 
 import java.util.List;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
 
-@BatchSide
+@ScannerSide
 public abstract class AbstractPatternInitializer {
 
   private Settings settings;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScanner.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScanner.java
index de465ad4dc5..462fea53575 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScanner.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScanner.java
@@ -25,7 +25,7 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.batch.issue.ignore.pattern.IssueExclusionPatternInitializer;
 import org.sonar.batch.issue.ignore.pattern.IssuePattern;
 import org.sonar.batch.issue.ignore.pattern.LineRange;
@@ -36,7 +36,7 @@ import java.nio.charset.Charset;
 import java.util.List;
 import java.util.Set;
 
-@BatchSide
+@ScannerSide
 public class IssueExclusionsRegexpScanner {
 
   private static final Logger LOG = LoggerFactory.getLogger(IssueExclusionsRegexpScanner.class);
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/IssueTransition.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/IssueTransition.java
index bff1974a99d..0b398f59cee 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/IssueTransition.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/IssueTransition.java
@@ -21,7 +21,7 @@ package org.sonar.batch.issue.tracking;
 
 import org.sonar.batch.util.ProgressReport;
 import org.sonar.batch.issue.IssueTransformer;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.resources.Project;
 import org.sonar.batch.index.BatchComponent;
 import org.sonar.batch.index.BatchComponentCache;
@@ -38,7 +38,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-@BatchSide
+@ScannerSide
 public class IssueTransition {
   private final IssueCache issueCache;
   private final BatchComponentCache componentCache;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/LocalIssueTracking.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/LocalIssueTracking.java
index 13f5a774405..56ac7eabe92 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/LocalIssueTracking.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/LocalIssueTracking.java
@@ -29,7 +29,7 @@ import java.util.List;
 import java.util.Map;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.fs.InputFile.Status;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.batch.rule.ActiveRule;
@@ -44,7 +44,7 @@ import org.sonar.core.issue.tracking.Tracker;
 import org.sonar.core.issue.tracking.Tracking;
 import org.sonar.scanner.protocol.output.ScannerReport;
 
-@BatchSide
+@ScannerSide
 public class LocalIssueTracking {
   private final Tracker<TrackedIssue, ServerIssueFromWs> tracker;
   private final ServerLineHashesLoader lastLineHashes;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/ServerIssueRepository.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/ServerIssueRepository.java
index 040ce776b9f..7106de46e02 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/ServerIssueRepository.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/ServerIssueRepository.java
@@ -21,7 +21,7 @@ package org.sonar.batch.issue.tracking;
 
 import com.google.common.base.Function;
 import javax.annotation.Nullable;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.InstantiationStrategy;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
@@ -36,7 +36,7 @@ import org.sonar.core.component.ComponentKeys;
 import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
 
 @InstantiationStrategy(InstantiationStrategy.PER_BATCH)
-@BatchSide
+@ScannerSide
 public class ServerIssueRepository {
 
   private static final Logger LOG = Loggers.get(ServerIssueRepository.class);
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/ServerLineHashesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/ServerLineHashesLoader.java
index 23edcc430d4..a09064b80b7 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/ServerLineHashesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/ServerLineHashesLoader.java
@@ -19,9 +19,9 @@
  */
 package org.sonar.batch.issue.tracking;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 
-@BatchSide
+@ScannerSide
 public interface ServerLineHashesLoader {
 
   String[] getLineHashes(String fileKey);
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/ScanTaskObserver.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/ScanTaskObserver.java
index 05b9f338eef..bd07b1cee7a 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/ScanTaskObserver.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/ScanTaskObserver.java
@@ -19,11 +19,11 @@
  */
 package org.sonar.batch.mediumtest;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.ExtensionPoint;
 import org.sonar.batch.scan.ProjectScanContainer;
 
-@BatchSide
+@ScannerSide
 @ExtensionPoint
 public interface ScanTaskObserver {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PostJobsExecutor.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PostJobsExecutor.java
index 277b45b8d3c..dbca5779152 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PostJobsExecutor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PostJobsExecutor.java
@@ -25,7 +25,7 @@ import com.google.common.collect.Lists;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.PostJob;
 import org.sonar.api.batch.SensorContext;
 import org.sonar.api.resources.Project;
@@ -34,7 +34,7 @@ import org.sonar.batch.events.EventBus;
 
 import java.util.Collection;
 
-@BatchSide
+@ScannerSide
 public class PostJobsExecutor {
   private static final Logger LOG = LoggerFactory.getLogger(PostJobsExecutor.class);
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/ProjectInitializer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/ProjectInitializer.java
index 8dac11520e5..b9a4b45ff8a 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/ProjectInitializer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/ProjectInitializer.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.batch.phases;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.apache.commons.lang.StringUtils;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.config.Settings;
@@ -31,7 +31,7 @@ import org.sonar.api.utils.MessageException;
 /**
  * Should be dropped when org.sonar.api.resources.Project is fully refactored.
  */
-@BatchSide
+@ScannerSide
 public class ProjectInitializer {
 
   private Languages languages;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/SensorsExecutor.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/SensorsExecutor.java
index 3af1cf2b6ee..d5682e02743 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/SensorsExecutor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/SensorsExecutor.java
@@ -20,7 +20,7 @@
 package org.sonar.batch.phases;
 
 import com.google.common.collect.Lists;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.Sensor;
 import org.sonar.api.batch.SensorContext;
 import org.sonar.api.resources.Project;
@@ -29,7 +29,7 @@ import org.sonar.batch.events.EventBus;
 
 import java.util.Collection;
 
-@BatchSide
+@ScannerSide
 public class SensorsExecutor {
 
   private EventBus eventBus;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/platform/DefaultServer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/platform/DefaultServer.java
index 60ad445afa7..0243846664e 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/platform/DefaultServer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/platform/DefaultServer.java
@@ -27,14 +27,14 @@ import javax.annotation.CheckForNull;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.CoreProperties;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.config.Settings;
 import org.sonar.api.platform.Server;
 import org.sonar.batch.bootstrap.BatchWsClient;
 
 import static org.apache.commons.lang.StringUtils.trimToEmpty;
 
-@BatchSide
+@ScannerSide
 public class DefaultServer extends Server {
 
   private Settings settings;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/postjob/PostJobOptimizer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/postjob/PostJobOptimizer.java
index e1b0cca1c1e..8aedf095fc9 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/postjob/PostJobOptimizer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/postjob/PostJobOptimizer.java
@@ -21,11 +21,11 @@ package org.sonar.batch.postjob;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.postjob.internal.DefaultPostJobDescriptor;
 import org.sonar.api.config.Settings;
 
-@BatchSide
+@ScannerSide
 public class PostJobOptimizer {
 
   private static final Logger LOG = LoggerFactory.getLogger(PostJobOptimizer.class);
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/AnalysisContextReportPublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/AnalysisContextReportPublisher.java
index 38706664ff8..5d739cf56cf 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/AnalysisContextReportPublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/AnalysisContextReportPublisher.java
@@ -31,7 +31,7 @@ import java.util.Properties;
 import java.util.TreeSet;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.batch.AnalysisMode;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.log.Logger;
@@ -42,7 +42,7 @@ import org.sonar.core.platform.PluginInfo;
 import org.sonar.scanner.protocol.input.GlobalRepositories;
 import org.sonar.scanner.protocol.output.ScannerReportWriter;
 
-@BatchSide
+@ScannerSide
 public class AnalysisContextReportPublisher {
 
   private static final String KEY_VALUE_FORMAT = "  - %s=%s";
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ReportPublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ReportPublisher.java
index b47217b8859..7775deccabb 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ReportPublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ReportPublisher.java
@@ -34,7 +34,7 @@ import java.util.Map;
 import javax.annotation.Nullable;
 import org.apache.commons.io.FileUtils;
 import org.picocontainer.Startable;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.config.Settings;
 import org.sonar.api.platform.Server;
@@ -54,7 +54,7 @@ import org.sonarqube.ws.client.WsResponse;
 
 import static org.sonar.core.util.FileUtils.deleteQuietly;
 
-@BatchSide
+@ScannerSide
 public class ReportPublisher implements Startable {
 
   private static final Logger LOG = Loggers.get(ReportPublisher.class);
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/language/LanguagesRepository.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/language/LanguagesRepository.java
index da1bab7993f..732b6705087 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/language/LanguagesRepository.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/language/LanguagesRepository.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.batch.repository.language;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 
 import javax.annotation.CheckForNull;
 
@@ -29,7 +29,7 @@ import java.util.Collection;
  * Languages repository
  * @since 4.4
  */
-@BatchSide
+@ScannerSide
 public interface LanguagesRepository {
 
   /**
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/ModuleQProfiles.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/ModuleQProfiles.java
index 5a671de840f..29763f4edc0 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/ModuleQProfiles.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/ModuleQProfiles.java
@@ -23,7 +23,7 @@ import org.sonar.api.utils.DateUtils;
 
 import org.sonarqube.ws.QualityProfiles.SearchWsResponse.QualityProfile;
 import com.google.common.collect.ImmutableMap;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 
 import javax.annotation.CheckForNull;
 
@@ -33,7 +33,7 @@ import java.util.Map;
 /**
  * Lists the Quality profiles enabled on the current module.
  */
-@BatchSide
+@ScannerSide
 public class ModuleQProfiles {
 
   public static final String SONAR_PROFILE_PROP = "sonar.profile";
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/QProfileVerifier.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/QProfileVerifier.java
index 6206a289f17..f37fcd0adac 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/QProfileVerifier.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/QProfileVerifier.java
@@ -23,14 +23,14 @@ import com.google.common.annotations.VisibleForTesting;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.config.Settings;
 import org.sonar.api.utils.MessageException;
 
 import static org.apache.commons.lang.StringUtils.isNotEmpty;
 
-@BatchSide
+@ScannerSide
 public class QProfileVerifier {
 
   private static final Logger LOG = LoggerFactory.getLogger(QProfileVerifier.class);
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ImmutableProjectReactor.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ImmutableProjectReactor.java
index 4bfa99c6da2..8d070a34254 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ImmutableProjectReactor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ImmutableProjectReactor.java
@@ -23,13 +23,13 @@ import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import javax.annotation.CheckForNull;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 
 /**
  * Immutable copy of project reactor after all modifications have been applied (see {@link ImmutableProjectReactorProvider}).
  */
-@BatchSide
+@ScannerSide
 public class ImmutableProjectReactor {
 
   private ProjectDefinition root;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java
index 194de4c363f..2da9c9e4967 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java
@@ -179,7 +179,7 @@ public class ModuleScanContainer extends ComponentContainer {
     installer.install(this, new ExtensionMatcher() {
       @Override
       public boolean accept(Object extension) {
-        return ExtensionUtils.isBatchSide(extension) && ExtensionUtils.isInstantiationStrategy(extension, InstantiationStrategy.PER_PROJECT);
+        return ExtensionUtils.isScannerSide(extension) && ExtensionUtils.isInstantiationStrategy(extension, InstantiationStrategy.PER_PROJECT);
       }
     });
   }
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java
index 91c383d55c6..f91461fa86b 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java
@@ -244,7 +244,7 @@ public class ProjectScanContainer extends ComponentContainer {
   static class BatchExtensionFilter implements ExtensionMatcher {
     @Override
     public boolean accept(Object extension) {
-      return ExtensionUtils.isBatchSide(extension)
+      return ExtensionUtils.isScannerSide(extension)
         && ExtensionUtils.isInstantiationStrategy(extension, InstantiationStrategy.PER_BATCH);
     }
   }
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ComponentIndexer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ComponentIndexer.java
index 761f6d15823..6c0d4893b19 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ComponentIndexer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ComponentIndexer.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.batch.scan.filesystem;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.SonarIndex;
 import org.sonar.api.batch.fs.InputDir;
 import org.sonar.api.batch.fs.InputFile;
@@ -35,7 +35,7 @@ import org.sonar.batch.index.BatchComponentCache;
  *
  * @since 4.2
  */
-@BatchSide
+@ScannerSide
 public class ComponentIndexer {
 
   private final Languages languages;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ExclusionFilters.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ExclusionFilters.java
index 256688ef364..4a82d9fb933 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ExclusionFilters.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ExclusionFilters.java
@@ -22,12 +22,12 @@ package org.sonar.batch.scan.filesystem;
 import org.apache.commons.lang.ArrayUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.internal.PathPattern;
 import org.sonar.api.scan.filesystem.FileExclusions;
 
-@BatchSide
+@ScannerSide
 public class ExclusionFilters {
 
   private static final Logger LOG = LoggerFactory.getLogger(ExclusionFilters.class);
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java
index b9d6c47bcf8..21cb362a7ad 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java
@@ -22,7 +22,7 @@ package org.sonar.batch.scan.filesystem;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.InputFile.Type;
@@ -58,7 +58,7 @@ import java.util.concurrent.TimeUnit;
 /**
  * Index input files into {@link InputPathCache}.
  */
-@BatchSide
+@ScannerSide
 public class FileIndexer {
 
   private static final Logger LOG = LoggerFactory.getLogger(FileIndexer.class);
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/FileSystemLogger.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/FileSystemLogger.java
index 0d717301283..44a2600773e 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/FileSystemLogger.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/FileSystemLogger.java
@@ -28,10 +28,10 @@ import java.util.Locale;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.scan.filesystem.PathResolver;
 
-@BatchSide
+@ScannerSide
 public class FileSystemLogger {
 
   private final DefaultModuleFileSystem fs;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/InputFileBuilderFactory.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/InputFileBuilderFactory.java
index 46dc2b2fbcd..42eed0e4653 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/InputFileBuilderFactory.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/InputFileBuilderFactory.java
@@ -19,13 +19,13 @@
  */
 package org.sonar.batch.scan.filesystem;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.batch.fs.internal.FileMetadata;
 import org.sonar.api.config.Settings;
 import org.sonar.api.scan.filesystem.PathResolver;
 
-@BatchSide
+@ScannerSide
 public class InputFileBuilderFactory {
 
   private final String moduleKey;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/InputPathCache.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/InputPathCache.java
index 3375f92c7ff..4797b24e922 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/InputPathCache.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/InputPathCache.java
@@ -21,7 +21,7 @@ package org.sonar.batch.scan.filesystem;
 
 import com.google.common.collect.Table;
 import com.google.common.collect.TreeBasedTable;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.fs.InputDir;
 import org.sonar.api.batch.fs.InputFile;
 
@@ -31,7 +31,7 @@ import javax.annotation.CheckForNull;
  * Cache of all files and dirs. This cache is shared amongst all project modules. Inclusion and
  * exclusion patterns are already applied.
  */
-@BatchSide
+@ScannerSide
 public class InputPathCache {
 
   private final Table<String, String, InputFile> inputFileCache = TreeBasedTable.create();
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/LanguageDetectionFactory.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/LanguageDetectionFactory.java
index b25a0038c64..0503497663d 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/LanguageDetectionFactory.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/LanguageDetectionFactory.java
@@ -19,11 +19,11 @@
  */
 package org.sonar.batch.scan.filesystem;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.config.Settings;
 import org.sonar.batch.repository.language.LanguagesRepository;
 
-@BatchSide
+@ScannerSide
 public class LanguageDetectionFactory {
   private final Settings settings;
   private final LanguagesRepository languages;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializer.java
index faab666579a..86d3b08cbbc 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializer.java
@@ -21,7 +21,7 @@ package org.sonar.batch.scan.filesystem;
 
 import com.google.common.collect.Lists;
 import org.apache.commons.io.FileUtils;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.scan.filesystem.PathResolver;
 import org.sonar.api.utils.TempFolder;
@@ -34,7 +34,7 @@ import java.util.List;
 /**
  * @since 3.5
  */
-@BatchSide
+@ScannerSide
 public class ModuleFileSystemInitializer {
 
   private File baseDir;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ModuleInputFileCache.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ModuleInputFileCache.java
index 5326b3fda4b..0788e4fff27 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ModuleInputFileCache.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ModuleInputFileCache.java
@@ -19,13 +19,13 @@
  */
 package org.sonar.batch.scan.filesystem;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.batch.fs.InputDir;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.internal.DefaultFileSystem;
 
-@BatchSide
+@ScannerSide
 public class ModuleInputFileCache extends DefaultFileSystem.Cache {
 
   private final String moduleKey;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/StatusDetectionFactory.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/StatusDetectionFactory.java
index b1a75c228c0..419611095ef 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/StatusDetectionFactory.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/StatusDetectionFactory.java
@@ -21,9 +21,9 @@ package org.sonar.batch.scan.filesystem;
 
 import org.sonar.batch.repository.ProjectRepositories;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 
-@BatchSide
+@ScannerSide
 public class StatusDetectionFactory {
 
   private final ProjectRepositories projectReferentials;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/MeasureCache.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/MeasureCache.java
index 4b400323e55..28ac18e9f15 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/MeasureCache.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/MeasureCache.java
@@ -21,7 +21,7 @@ package org.sonar.batch.scan.measure;
 
 import com.google.common.base.Preconditions;
 import javax.annotation.CheckForNull;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.measure.MetricFinder;
 import org.sonar.api.measures.Measure;
 import org.sonar.api.resources.Resource;
@@ -32,7 +32,7 @@ import org.sonar.batch.index.Caches;
 /**
  * Cache of all measures. This cache is shared amongst all project modules.
  */
-@BatchSide
+@ScannerSide
 public class MeasureCache {
 
   private final Cache<Measure> cache;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/IssuesReportBuilder.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/IssuesReportBuilder.java
index 079dabc2ceb..a87b043bfb8 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/IssuesReportBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/IssuesReportBuilder.java
@@ -25,7 +25,7 @@ import javax.annotation.CheckForNull;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.rule.Rule;
 import org.sonar.api.batch.rule.Rules;
 import org.sonar.api.resources.Project;
@@ -36,7 +36,7 @@ import org.sonar.batch.index.BatchComponentCache;
 import org.sonar.batch.issue.IssueCache;
 import org.sonar.batch.scan.filesystem.InputPathCache;
 
-@BatchSide
+@ScannerSide
 public class IssuesReportBuilder {
 
   private static final Logger LOG = LoggerFactory.getLogger(IssuesReportBuilder.class);
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/IssuesReports.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/IssuesReports.java
index ac4a5abb375..a35b32262b4 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/IssuesReports.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/IssuesReports.java
@@ -19,9 +19,9 @@
  */
 package org.sonar.batch.scan.report;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 
-@BatchSide
+@ScannerSide
 public class IssuesReports {
 
   private final Reporter[] reporters;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/Reporter.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/Reporter.java
index 9cb91dc2fad..8a5b3972067 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/Reporter.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/Reporter.java
@@ -19,9 +19,9 @@
  */
 package org.sonar.batch.scan.report;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 
-@BatchSide
+@ScannerSide
 public interface Reporter {
 
   void execute();
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/RuleNameProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/RuleNameProvider.java
index 90981fea342..e4c39188731 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/RuleNameProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/RuleNameProvider.java
@@ -23,12 +23,12 @@ import org.sonar.api.batch.rule.Rule;
 
 import org.sonar.api.batch.rule.Rules;
 import org.apache.commons.lang.StringEscapeUtils;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.rule.RuleKey;
 
 import javax.annotation.CheckForNull;
 
-@BatchSide
+@ScannerSide
 public class RuleNameProvider {
   private Rules rules;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/SourceProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/SourceProvider.java
index 8017dbd753e..c3b72b6907d 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/SourceProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/SourceProvider.java
@@ -27,12 +27,12 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.batch.index.BatchComponent;
 
-@BatchSide
+@ScannerSide
 public class SourceProvider {
 
   private static final Logger LOG = LoggerFactory.getLogger(SourceProvider.class);
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/ScmConfiguration.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/ScmConfiguration.java
index f6a88bf4465..c5997efa864 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/ScmConfiguration.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/ScmConfiguration.java
@@ -29,7 +29,7 @@ import org.sonar.api.Properties;
 import org.sonar.api.Property;
 import org.sonar.api.PropertyType;
 import org.sonar.api.batch.AnalysisMode;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.InstantiationStrategy;
 import org.sonar.api.batch.scm.ScmProvider;
 import org.sonar.api.config.Settings;
@@ -50,7 +50,7 @@ import org.sonar.batch.scan.ImmutableProjectReactor;
     type = PropertyType.BOOLEAN)
 })
 @InstantiationStrategy(InstantiationStrategy.PER_BATCH)
-@BatchSide
+@ScannerSide
 public final class ScmConfiguration implements Startable {
   private static final Logger LOG = Loggers.get(ScmConfiguration.class);
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/SensorOptimizer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/SensorOptimizer.java
index 7e8dd63e93a..19ad9cbeab0 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/SensorOptimizer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/SensorOptimizer.java
@@ -21,14 +21,14 @@ package org.sonar.batch.sensor;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.fs.FilePredicate;
 import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.batch.rule.ActiveRules;
 import org.sonar.api.batch.sensor.internal.DefaultSensorDescriptor;
 import org.sonar.api.config.Settings;
 
-@BatchSide
+@ScannerSide
 public class SensorOptimizer {
 
   private static final Logger LOG = LoggerFactory.getLogger(SensorOptimizer.class);
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/CodeColorizers.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/CodeColorizers.java
index 39a4a0b1c98..0f1ebe7c250 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/CodeColorizers.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/CodeColorizers.java
@@ -34,7 +34,7 @@ import org.apache.commons.io.input.BOMInputStream;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.sensor.highlighting.NewHighlighting;
 import org.sonar.api.web.CodeColorizerFormat;
 import org.sonar.colorizer.JavaTokenizers;
@@ -43,7 +43,7 @@ import org.sonar.colorizer.Tokenizer;
 /**
  * Central point for sonar-colorizer extensions
  */
-@BatchSide
+@ScannerSide
 public class CodeColorizers {
 
   private static final Logger LOG = LoggerFactory.getLogger(CodeColorizers.class);
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/task/TaskContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/task/TaskContainer.java
index eee91f63055..d730536a8f0 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/task/TaskContainer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/task/TaskContainer.java
@@ -65,7 +65,7 @@ public class TaskContainer extends ComponentContainer {
   static class TaskExtensionFilter implements ExtensionMatcher {
     @Override
     public boolean accept(Object extension) {
-      return ExtensionUtils.isBatchSide(extension)
+      return ExtensionUtils.isScannerSide(extension)
         && ExtensionUtils.isInstantiationStrategy(extension, InstantiationStrategy.PER_TASK);
     }
   }
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/task/Tasks.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/task/Tasks.java
index ee68b62b1db..7689e23ec8c 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/task/Tasks.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/task/Tasks.java
@@ -24,12 +24,12 @@ import com.google.common.collect.Maps;
 import java.util.Collection;
 import java.util.Map;
 import java.util.SortedMap;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.InstantiationStrategy;
 import org.sonar.api.task.Task;
 import org.sonar.api.task.TaskDefinition;
 
-@BatchSide
+@ScannerSide
 @InstantiationStrategy(InstantiationStrategy.PER_TASK)
 public class Tasks {