SONAR-7665 Deprecate @BatchSide and introduce @ScannerSide

67 files changed, 178 insertions, 125 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/BatchComponent.java b/sonar-plugin-api/src/main/java/org/sonar/api/BatchComponent.java
index ea8dfc5863a..426e8bb34a1 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/BatchComponent.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/BatchComponent.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.api;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 
 /**
  * Marker interface for all the components available in container of batch (code analyzer). Note that
@@ -38,9 +38,9 @@ import org.sonar.api.batch.BatchSide;
  * </pre>
  *
  * @since 2.2
- * @deprecated since 5.2 use {@link BatchSide} annotation
+ * @deprecated since 5.2 use {@link ScannerSide} annotation
  */
 @Deprecated
-@BatchSide
+@ScannerSide
 public interface BatchComponent {
 }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/BatchExtension.java b/sonar-plugin-api/src/main/java/org/sonar/api/BatchExtension.java
index 3ea80ff9b11..2531885de94 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/BatchExtension.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/BatchExtension.java
@@ -19,14 +19,14 @@
  */
 package org.sonar.api;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 
 /**
  * Marker interface for all the batch extension points, which are aimed to be implemented
  * by plugins.
  *
  * @since 1.10
- * @deprecated since 5.2 replaced by {@link BatchSide} and {@link ExtensionPoint} annotations
+ * @deprecated since 5.2 replaced by {@link ScannerSide} and {@link ExtensionPoint} annotations
  */
 @Deprecated
 public interface BatchExtension extends Extension, BatchComponent {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/Plugin.java b/sonar-plugin-api/src/main/java/org/sonar/api/Plugin.java
index fc010d2271f..21832e1754e 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/Plugin.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/Plugin.java
@@ -102,10 +102,10 @@ public interface Plugin {
     /**
      * Add an extension as :
      * <ul>
-     *   <li>a Class that is annotated with {@link org.sonar.api.batch.BatchSide}, {@link org.sonar.api.server.ServerSide}
+     *   <li>a Class that is annotated with {@link org.sonar.api.batch.ScannerSide}, {@link org.sonar.api.server.ServerSide}
      *   or {@link org.sonar.api.ce.ComputeEngineSide}. The extension will be instantiated once. Its dependencies are
      *   injected through constructor parameters.</li>
-     *   <li>an instance that is annotated with {@link org.sonar.api.batch.BatchSide}, {@link org.sonar.api.server.ServerSide}
+     *   <li>an instance that is annotated with {@link org.sonar.api.batch.ScannerSide}, {@link org.sonar.api.server.ServerSide}
      *   or {@link org.sonar.api.ce.ComputeEngineSide}.</li>
      * </ul>
      * Only a single component can be registered for a class. It's not allowed for example to register:
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/SonarQubeVersion.java b/sonar-plugin-api/src/main/java/org/sonar/api/SonarQubeVersion.java
index 7c55e533ba2..cbd08aa0090 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/SonarQubeVersion.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/SonarQubeVersion.java
@@ -20,7 +20,7 @@
 package org.sonar.api;
 
 import javax.annotation.concurrent.Immutable;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.sensor.Sensor;
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.server.ServerSide;
@@ -118,7 +118,7 @@ import static java.util.Objects.requireNonNull;
  *
  * @since 5.5
  */
-@BatchSide
+@ScannerSide
 @ServerSide
 @ComputeEngineSide
 @Immutable
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/Startable.java b/sonar-plugin-api/src/main/java/org/sonar/api/Startable.java
index a657d2164f5..b6407045011 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/Startable.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/Startable.java
@@ -20,7 +20,7 @@
 package org.sonar.api;
 
 /**
- * An interface which is implemented by classes annotated with {@link org.sonar.api.batch.BatchSide BatchSide},
+ * An interface which is implemented by classes annotated with {@link org.sonar.api.batch.ScannerSide ScannerSide},
  * {@link org.sonar.api.server.ServerSide ServerSide} and/or {@link org.sonar.api.ce.ComputeEngineSide ComputeEngineSide}
  * (referred to below as "component") that can be started and stopped.
  * <p>
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/AnalysisMode.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/AnalysisMode.java
index 01fd097164a..99abffa2595 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/AnalysisMode.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/AnalysisMode.java
@@ -23,7 +23,7 @@ package org.sonar.api.batch;
  * Use this component to find the current running mode.
  * @since 5.1
  */
-@BatchSide
+@ScannerSide
 public interface AnalysisMode {
   boolean isPreview();
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/BatchSide.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/BatchSide.java
index cb5f1070bd5..4489a51083d 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/BatchSide.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/BatchSide.java
@@ -42,9 +42,10 @@ import java.lang.annotation.Target;
  *   }
  *
  * </pre>
- *
+ * @deprecated since 6.0. Use {@link ScannerSide} instead.
  * @since 5.2
  */
+@Deprecated
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/CoverageExtension.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/CoverageExtension.java
index 1fe8b43a2ed..3731c3f2e4c 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/CoverageExtension.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/CoverageExtension.java
@@ -26,7 +26,7 @@ import org.sonar.api.ExtensionPoint;
  * @deprecated since 5.2 not used anymore
  */
 @Deprecated
-@BatchSide
+@ScannerSide
 @ExtensionPoint
 public interface CoverageExtension {
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/CpdMapping.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/CpdMapping.java
index a39c405dcec..131b9728529 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/CpdMapping.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/CpdMapping.java
@@ -31,7 +31,7 @@ import org.sonar.api.resources.Resource;
  * @since 1.10
  * @deprecated since 5.5 use {@link SensorContext#newCpdTokens()}
  */
-@BatchSide
+@ScannerSide
 @ExtensionPoint
 @Deprecated
 public interface CpdMapping {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/Initializer.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/Initializer.java
index 2a5ec53ff73..fb6a35d8ecd 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/Initializer.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/Initializer.java
@@ -29,7 +29,7 @@ import org.sonar.api.resources.Project;
  * <p>
  * @since 2.6
  */
-@BatchSide
+@ScannerSide
 @ExtensionPoint
 public abstract class Initializer implements CheckProject {
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/PostJob.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/PostJob.java
index a7120f5e8e8..1134d1c6274 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/PostJob.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/PostJob.java
@@ -32,7 +32,7 @@ import org.sonar.api.resources.Project;
  * @deprecated since 5.6 use org.sonar.api.batch.postjob.PostJob
  */
 @Deprecated
-@BatchSide
+@ScannerSide
 @ExtensionPoint
 public interface PostJob {
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/ResourceFilter.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/ResourceFilter.java
index 462d31e0f0f..283fe4d3119 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/ResourceFilter.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/ResourceFilter.java
@@ -32,7 +32,7 @@ import org.sonar.api.resources.Resource;
  * @deprecated since 4.2. Analysis is file-system oriented. See {@link org.sonar.api.batch.fs.InputFileFilter}
  */
 @Deprecated
-@BatchSide
+@ScannerSide
 @ExtensionPoint
 public interface ResourceFilter {
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/ScannerSide.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/ScannerSide.java
new file mode 100644
index 00000000000..688a254469f
--- /dev/null
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/ScannerSide.java
@@ -0,0 +1,52 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonar.api.batch;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Marker annotation for all the components available in the container of the scanner (code analyzer). Note that
+ * injection of dependencies by constructor is used :
+ * <pre>
+ *   {@literal @}ScannerSide
+ *   public class Foo {
+ *
+ *   }
+ *   {@literal @}ScannerSide
+ *   public class Bar {
+ *     private final Foo foo;
+ *     public Bar(Foo f) {
+ *       this.foo = f;
+ *     }
+ *   }
+ *
+ * </pre>
+ *
+ * @since 6.0
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface ScannerSide {
+}
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/Sensor.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/Sensor.java
index 5f632e974a9..2907938da5a 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/Sensor.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/Sensor.java
@@ -43,7 +43,7 @@ import org.sonar.api.resources.Project;
  * @deprecated since 5.6 use org.sonar.api.batch.sensor.Sensor
  */
 @Deprecated
-@BatchSide
+@ScannerSide
 @ExtensionPoint
 public interface Sensor extends CheckProject {
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectBuilder.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectBuilder.java
index 432ea91733b..750e782a4e9 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectBuilder.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectBuilder.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.api.batch.bootstrap;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.ExtensionPoint;
 import org.sonar.api.batch.InstantiationStrategy;
 
@@ -35,7 +35,7 @@ import org.sonar.api.batch.InstantiationStrategy;
  *
  * @since 2.9
  */
-@BatchSide
+@ScannerSide
 @InstantiationStrategy(InstantiationStrategy.PER_BATCH)
 @ExtensionPoint
 public abstract class ProjectBuilder {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectReactor.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectReactor.java
index 66f36ced759..a069cd40980 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectReactor.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectReactor.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.api.batch.bootstrap;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,7 +28,7 @@ import java.util.List;
  * Mutable project definitions that can be modified by {@link ProjectBuilder} extensions.
  * @since 2.9
  */
-@BatchSide
+@ScannerSide
 public class ProjectReactor implements ProjectKey {
 
   private ProjectDefinition root;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/events/EventHandler.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/events/EventHandler.java
index 7d818a1daa6..0f4ec1fe21d 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/events/EventHandler.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/events/EventHandler.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.api.batch.events;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.ExtensionPoint;
 
 /**
@@ -28,7 +28,7 @@ import org.sonar.api.ExtensionPoint;
  * 
  * @since 2.8
  */
-@BatchSide
+@ScannerSide
 @ExtensionPoint
 public interface EventHandler {
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/FileSystem.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/FileSystem.java
index 18733a2c01f..af020cdbc03 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/FileSystem.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/FileSystem.java
@@ -23,7 +23,7 @@ import java.io.File;
 import java.nio.charset.Charset;
 import java.util.SortedSet;
 import javax.annotation.CheckForNull;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 
 /**
  * The {@link FileSystem} manages all the source files to be analyzed.
@@ -51,7 +51,7 @@ import org.sonar.api.batch.BatchSide;
  *
  * @since 4.2
  */
-@BatchSide
+@ScannerSide
 public interface FileSystem {
 
   /**
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/InputFileFilter.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/InputFileFilter.java
index a2f240006de..2c489628b40 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/InputFileFilter.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/InputFileFilter.java
@@ -19,14 +19,14 @@
  */
 package org.sonar.api.batch.fs;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.ExtensionPoint;
 
 /**
  * Extension point to exclude some files from inspection
  * @since 4.2
  */
-@BatchSide
+@ScannerSide
 @ExtensionPoint
 public interface InputFileFilter {
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/FileMetadata.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/FileMetadata.java
index 4d2179886ae..4e45d825a38 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/FileMetadata.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/FileMetadata.java
@@ -43,7 +43,7 @@ import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.ByteOrderMark;
 import org.apache.commons.io.input.BOMInputStream;
 import org.sonar.api.CoreProperties;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 
@@ -51,7 +51,7 @@ import org.sonar.api.utils.log.Loggers;
  * Computes hash of files. Ends of Lines are ignored, so files with
  * same content but different EOL encoding have the same hash.
  */
-@BatchSide
+@ScannerSide
 public class FileMetadata {
 
   private static final Logger LOG = Loggers.get(FileMetadata.class);
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/measure/MetricFinder.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/measure/MetricFinder.java
index ed8338d1473..43c32156d4f 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/measure/MetricFinder.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/measure/MetricFinder.java
@@ -23,12 +23,12 @@ import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;
 import javax.annotation.CheckForNull;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 
 /**
  * @since 4.5
  */
-@BatchSide
+@ScannerSide
 public interface MetricFinder {
 
   @CheckForNull
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/postjob/PostJob.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/postjob/PostJob.java
index 58510ad3ea1..86d9ad50817 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/postjob/PostJob.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/postjob/PostJob.java
@@ -20,7 +20,7 @@
 package org.sonar.api.batch.postjob;
 
 import org.sonar.api.ExtensionPoint;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 
 /**
  * PostJobs are executed at the very end of scanner analysis. A PostJob can't do any modification
@@ -30,7 +30,7 @@ import org.sonar.api.batch.BatchSide;
  *
  * @since 5.2
  */
-@BatchSide
+@ScannerSide
 @ExtensionPoint
 public interface PostJob {
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/ActiveRules.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/ActiveRules.java
index b88131c94b2..09b2804a38f 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/ActiveRules.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/ActiveRules.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.api.batch.rule;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.rule.RuleKey;
 
 import javax.annotation.CheckForNull;
@@ -35,7 +35,7 @@ import java.util.Collection;
  *
  * @since 4.2
  */
-@BatchSide
+@ScannerSide
 public interface ActiveRules {
 
   /**
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/CheckFactory.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/CheckFactory.java
index 2afc732065f..30ce050fa55 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/CheckFactory.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/CheckFactory.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.api.batch.rule;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 
 /**
  * Creates {@link org.sonar.api.batch.rule.Checks}. This class is available
@@ -27,7 +27,7 @@ import org.sonar.api.batch.BatchSide;
  *
  * @since 4.2
  */
-@BatchSide
+@ScannerSide
 public class CheckFactory {
 
   private final ActiveRules activeRules;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/Rules.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/Rules.java
index d27ede1cc5d..3a228f1bdc2 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/Rules.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/Rules.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.api.batch.rule;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.rule.RuleKey;
 
 import javax.annotation.CheckForNull;
@@ -32,7 +32,7 @@ import java.util.Collection;
  *
  * @since 4.2
  */
-@BatchSide
+@ScannerSide
 public interface Rules {
 
   /**
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/scm/BlameCommand.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/scm/BlameCommand.java
index 1527e7ca20f..87dbab5f8a7 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/scm/BlameCommand.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/scm/BlameCommand.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.api.batch.scm;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.InstantiationStrategy;
 import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.batch.fs.InputFile;
@@ -31,7 +31,7 @@ import java.util.List;
  * @since 5.0
  */
 @InstantiationStrategy(InstantiationStrategy.PER_BATCH)
-@BatchSide
+@ScannerSide
 public abstract class BlameCommand {
 
   /**
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/scm/ScmProvider.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/scm/ScmProvider.java
index 56f25efc1a5..5cbf5b96af7 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/scm/ScmProvider.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/scm/ScmProvider.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.api.batch.scm;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.ExtensionPoint;
 import org.sonar.api.batch.InstantiationStrategy;
@@ -30,7 +30,7 @@ import java.io.File;
  * See {@link CoreProperties#LINKS_SOURCES_DEV} to get old Maven URL format.
  * @since 5.0
  */
-@BatchSide
+@ScannerSide
 @InstantiationStrategy(InstantiationStrategy.PER_BATCH)
 @ExtensionPoint
 public abstract class ScmProvider {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/Sensor.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/Sensor.java
index 0633d0c35cd..2eae58b055a 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/Sensor.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/Sensor.java
@@ -20,7 +20,7 @@
 package org.sonar.api.batch.sensor;
 
 import org.sonar.api.ExtensionPoint;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.sensor.internal.SensorContextTester;
 
 /**
@@ -33,7 +33,7 @@ import org.sonar.api.batch.sensor.internal.SensorContextTester;
  * For testing purpose you can use {@link SensorContextTester}
  * @since 5.1
  */
-@BatchSide
+@ScannerSide
 @ExtensionPoint
 public interface Sensor {
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/internal/SensorStorage.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/internal/SensorStorage.java
index 3ea574b5bf6..a0be68cbc24 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/internal/SensorStorage.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/internal/SensorStorage.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.api.batch.sensor.internal;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.sensor.coverage.internal.DefaultCoverage;
 import org.sonar.api.batch.sensor.cpd.internal.DefaultCpdTokens;
 import org.sonar.api.batch.sensor.highlighting.internal.DefaultHighlighting;
@@ -31,7 +31,7 @@ import org.sonar.api.batch.sensor.symbol.internal.DefaultSymbolTable;
  * Interface for storing data computed by sensors.
  * @since 5.1
  */
-@BatchSide
+@ScannerSide
 public interface SensorStorage {
 
   void store(Measure measure);
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/ce/ComputeEngineSide.java b/sonar-plugin-api/src/main/java/org/sonar/api/ce/ComputeEngineSide.java
index fdcb0c1a682..2cdb5411b4c 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/ce/ComputeEngineSide.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/ce/ComputeEngineSide.java
@@ -24,10 +24,10 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 
 /**
- * Same as {@link BatchSide} but for components for the Compute Engine Server.
+ * Same as {@link ScannerSide} but for components for the Compute Engine Server.
  *
  * @since 5.5
  */
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/config/EmailSettings.java b/sonar-plugin-api/src/main/java/org/sonar/api/config/EmailSettings.java
index 60eac6d247e..9628a3c7cef 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/config/EmailSettings.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/config/EmailSettings.java
@@ -21,7 +21,7 @@ package org.sonar.api.config;
 
 import com.google.common.base.MoreObjects;
 import org.sonar.api.CoreProperties;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.server.ServerSide;
 
@@ -30,7 +30,7 @@ import org.sonar.api.server.ServerSide;
  *
  * @since 3.2
  */
-@BatchSide
+@ScannerSide
 @ServerSide
 @ComputeEngineSide
 public class EmailSettings {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java b/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java
index 5214281c54e..eb73a5590ce 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java
@@ -32,7 +32,7 @@ import org.apache.commons.lang.math.NumberUtils;
 import org.sonar.api.ExtensionPoint;
 import org.sonar.api.Property;
 import org.sonar.api.PropertyType;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.server.ServerSide;
@@ -67,7 +67,7 @@ import org.sonar.api.server.ServerSide;
  *
  * @since 3.6
  */
-@BatchSide
+@ScannerSide
 @ServerSide
 @ComputeEngineSide
 @ExtensionPoint
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinitions.java b/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinitions.java
index c2e427b1e17..4aa351ab910 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinitions.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinitions.java
@@ -30,7 +30,7 @@ import org.apache.commons.lang.StringUtils;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.Properties;
 import org.sonar.api.Property;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.server.ServerSide;
 import org.sonar.api.utils.AnnotationUtils;
@@ -40,7 +40,7 @@ import org.sonar.api.utils.AnnotationUtils;
  *
  * @since 2.12
  */
-@BatchSide
+@ScannerSide
 @ServerSide
 @ComputeEngineSide
 public final class PropertyDefinitions {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/config/Settings.java b/sonar-plugin-api/src/main/java/org/sonar/api/config/Settings.java
index 55de869a85f..8946bc77393 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/config/Settings.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/config/Settings.java
@@ -33,7 +33,7 @@ import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.server.ServerSide;
 import org.sonar.api.utils.DateUtils;
@@ -86,7 +86,7 @@ import org.sonar.api.utils.DateUtils;
  * 
  * @since 2.12
  */
-@BatchSide
+@ScannerSide
 @ServerSide
 @ComputeEngineSide
 public class Settings {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/i18n/I18n.java b/sonar-plugin-api/src/main/java/org/sonar/api/i18n/I18n.java
index df37c340bb9..dad422a019b 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/i18n/I18n.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/i18n/I18n.java
@@ -22,7 +22,7 @@ package org.sonar.api.i18n;
 import java.util.Date;
 import java.util.Locale;
 import javax.annotation.Nullable;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.server.ServerSide;
 
@@ -31,7 +31,7 @@ import org.sonar.api.server.ServerSide;
  *
  * @since 2.10
  */
-@BatchSide
+@ScannerSide
 @ServerSide
 @ComputeEngineSide
 public interface I18n {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/i18n/RuleI18n.java b/sonar-plugin-api/src/main/java/org/sonar/api/i18n/RuleI18n.java
index 3f70eeeef67..eacddc29e66 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/i18n/RuleI18n.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/i18n/RuleI18n.java
@@ -21,7 +21,7 @@ package org.sonar.api.i18n;
 
 import java.util.Locale;
 import javax.annotation.CheckForNull;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.rules.Rule;
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.server.ServerSide;
@@ -33,7 +33,7 @@ import org.sonar.api.server.ServerSide;
  * @deprecated in 4.1. Rules are not localized anymore. See http://jira.sonarsource.com/browse/SONAR-4885
  */
 @Deprecated
-@BatchSide
+@ScannerSide
 @ServerSide
 @ComputeEngineSide
 public interface RuleI18n {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/Issue.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/Issue.java
index b02e8590d30..2d20849d44e 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/Issue.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/issue/Issue.java
@@ -26,7 +26,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.CheckForNull;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.utils.Duration;
 
@@ -188,7 +188,7 @@ public interface Issue extends Serializable {
    * Non-null list of comments, ordered by chronological order.
    * <br>
    * IMPORTANT: existing comments are not loaded when this method is called when analyzing project
-   * (from {@link BatchSide}).
+   * (from {@link ScannerSide}).
    */
   List<IssueComment> comments();
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueHandler.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueHandler.java
index b9a794c1b63..fb9bb62aff9 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueHandler.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueHandler.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.api.issue;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.ExtensionPoint;
 import org.sonar.api.user.User;
 
@@ -28,7 +28,7 @@ import javax.annotation.Nullable;
 /**
  * @since 3.6
  */
-@BatchSide
+@ScannerSide
 @ExtensionPoint
 public interface IssueHandler {
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/NoSonarFilter.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/NoSonarFilter.java
index 5fe0c2b4574..fe556767854 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/NoSonarFilter.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/issue/NoSonarFilter.java
@@ -24,7 +24,7 @@ import org.sonar.api.scan.issue.filter.FilterableIssue;
 import org.sonar.api.scan.issue.filter.IssueFilter;
 import com.google.common.collect.Maps;
 import org.apache.commons.lang.StringUtils;
-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.DefaultInputFile;
 import org.sonar.api.scan.issue.filter.IssueFilterChain;
@@ -35,7 +35,7 @@ import java.util.Set;
 /**
  * Issue filter used to ignore issues created on lines commented with the tag "NOSONAR".
  * <br>
- * Plugins, via {@link BatchSide}s, must feed this filter by registering the
+ * Plugins, via {@link ScannerSide}s, must feed this filter by registering the
  * lines that contain "NOSONAR". Note that filters are disabled for the issues reported by
  * end-users from UI or web services.
  *
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/ProjectIssues.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/ProjectIssues.java
index 9f91d7a86d2..662d3ba2688 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/ProjectIssues.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/issue/ProjectIssues.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.api.issue;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.InstantiationStrategy;
 
 import static org.sonar.api.batch.InstantiationStrategy.PER_BATCH;
@@ -30,7 +30,7 @@ import static org.sonar.api.batch.InstantiationStrategy.PER_BATCH;
  * @since 4.0
  */
 @InstantiationStrategy(PER_BATCH)
-@BatchSide
+@ScannerSide
 public interface ProjectIssues {
 
   /**
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/batch/IssueFilter.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/batch/IssueFilter.java
index cb43741b340..d1f025266a0 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/batch/IssueFilter.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/issue/batch/IssueFilter.java
@@ -20,7 +20,7 @@
 package org.sonar.api.issue.batch;
 
 import org.sonar.api.ExtensionPoint;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.issue.Issue;
 
 /**
@@ -28,7 +28,7 @@ import org.sonar.api.issue.Issue;
  * @since 4.0
  * @deprecated since 5.3. Use {@link org.sonar.api.scan.issue.filter.IssueFilter} instead.
  */
-@BatchSide
+@ScannerSide
 @ExtensionPoint
 @Deprecated
 public interface IssueFilter {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/FileLinesContextFactory.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/FileLinesContextFactory.java
index 1d52cc1e163..59f22ffca98 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/FileLinesContextFactory.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/FileLinesContextFactory.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.api.measures;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.resources.Resource;
 
@@ -28,7 +28,7 @@ import org.sonar.api.resources.Resource;
  *
  * @since 2.14
  */
-@BatchSide
+@ScannerSide
 public interface FileLinesContextFactory {
 
   /**
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java
index 941fa587022..425777eada6 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java
@@ -29,7 +29,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.InstantiationStrategy;
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.server.ServerSide;
@@ -42,7 +42,7 @@ import static org.apache.commons.lang.StringUtils.isNotBlank;
  * Used to define a metric in a plugin. Should be used with {@link Metrics} extension point.
  * Should no more be used on scanner side. Use {@link org.sonar.api.batch.measure.Metric} instead. 
  */
-@BatchSide
+@ScannerSide
 @InstantiationStrategy(InstantiationStrategy.PER_BATCH)
 @ServerSide
 @ComputeEngineSide
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/MetricFinder.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/MetricFinder.java
index 5f0d127524e..f82593b55bd 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/MetricFinder.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/MetricFinder.java
@@ -22,7 +22,7 @@ package org.sonar.api.measures;
 import java.util.Collection;
 import java.util.List;
 import javax.annotation.CheckForNull;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.server.ServerSide;
 
@@ -31,7 +31,7 @@ import org.sonar.api.server.ServerSide;
  * @deprecated since 5.1 use {@link org.sonar.api.batch.measure.MetricFinder} on scanner side.
  */
 @Deprecated
-@BatchSide
+@ScannerSide
 @ServerSide
 @ComputeEngineSide
 public interface MetricFinder {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metrics.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metrics.java
index acb25075509..22565ff8612 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metrics.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metrics.java
@@ -21,7 +21,7 @@ package org.sonar.api.measures;
 
 import java.util.List;
 import org.sonar.api.ExtensionPoint;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.InstantiationStrategy;
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.server.ServerSide;
@@ -30,7 +30,7 @@ import org.sonar.api.server.ServerSide;
  * This is the extension point used by plugins to declare new metrics.
  * @since 1.10
  */
-@BatchSide
+@ScannerSide
 @InstantiationStrategy(InstantiationStrategy.PER_BATCH)
 @ServerSide
 @ComputeEngineSide
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java b/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java
index 5ac727afd9e..bfa8d8b6749 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java
@@ -22,14 +22,14 @@ package org.sonar.api.platform;
 import java.io.File;
 import java.util.Date;
 import javax.annotation.CheckForNull;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.server.ServerSide;
 
 /**
  * @since 2.2
   */
-@BatchSide
+@ScannerSide
 @ServerSide
 @ComputeEngineSide
 public abstract class Server {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/profiles/ProfileExporter.java b/sonar-plugin-api/src/main/java/org/sonar/api/profiles/ProfileExporter.java
index c6283fefe34..3e1dfa846d8 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/profiles/ProfileExporter.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/profiles/ProfileExporter.java
@@ -24,13 +24,13 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 import org.sonar.api.ExtensionPoint;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.server.ServerSide;
 
 /**
  * @since 2.3
  */
-@BatchSide
+@ScannerSide
 @ServerSide
 @ExtensionPoint
 public abstract class ProfileExporter {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Language.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Language.java
index b58ed7cfacf..4143453f79e 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Language.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Language.java
@@ -20,7 +20,7 @@
 package org.sonar.api.resources;
 
 import org.sonar.api.ExtensionPoint;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.InstantiationStrategy;
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.server.ServerSide;
@@ -32,7 +32,7 @@ import org.sonar.api.server.ServerSide;
  *
  * @since 1.10
  */
-@BatchSide
+@ScannerSide
 @InstantiationStrategy(InstantiationStrategy.PER_BATCH)
 @ServerSide
 @ComputeEngineSide
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Languages.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Languages.java
index ffb93f6f744..fdc4dd150e5 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Languages.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Languages.java
@@ -26,7 +26,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.lang.ArrayUtils;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.server.ServerSide;
 import org.sonar.api.utils.log.Logger;
@@ -37,7 +37,7 @@ import org.sonar.api.utils.log.Loggers;
  *
  * @since 1.10
  */
-@BatchSide
+@ScannerSide
 @ServerSide
 @ComputeEngineSide
 public class Languages {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceTypeTree.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceTypeTree.java
index 8f7c2e37a65..feed55c9ddd 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceTypeTree.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceTypeTree.java
@@ -30,14 +30,14 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.server.ServerSide;
 
 /**
  * @since 2.14
  */
-@BatchSide
+@ScannerSide
 @ServerSide
 @ComputeEngineSide
 public class ResourceTypeTree {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rules/RuleFinder.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/RuleFinder.java
index 38fbb4f02b0..17c442a4d5e 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/rules/RuleFinder.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/rules/RuleFinder.java
@@ -21,7 +21,7 @@ package org.sonar.api.rules;
 
 import java.util.Collection;
 import javax.annotation.CheckForNull;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.rule.ActiveRules;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.ce.ComputeEngineSide;
@@ -32,7 +32,7 @@ import org.sonar.api.server.ServerSide;
  * @deprecated since 5.1. Use {@link ActiveRules} on batch side.
  */
 @Deprecated
-@BatchSide
+@ScannerSide
 @ServerSide
 @ComputeEngineSide
 public interface RuleFinder {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/FileExclusions.java b/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/FileExclusions.java
index c8dab9ce522..cabf34e6f61 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/FileExclusions.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/FileExclusions.java
@@ -21,7 +21,7 @@ package org.sonar.api.scan.filesystem;
 
 import com.google.common.collect.ObjectArrays;
 import org.apache.commons.lang.StringUtils;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.config.Settings;
 
@@ -35,7 +35,7 @@ import java.util.List;
  *
  * @since 3.5
  */
-@BatchSide
+@ScannerSide
 public class FileExclusions {
   private final Settings settings;
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/FileSystemFilter.java b/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/FileSystemFilter.java
index d7cea0d2e8a..0a4a43483b6 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/FileSystemFilter.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/FileSystemFilter.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.api.scan.filesystem;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.ExtensionPoint;
 import org.sonar.api.batch.fs.InputFileFilter;
 
@@ -36,7 +36,7 @@ import java.io.File;
  * @deprecated since 4.2 use {@link InputFileFilter}
  */
 @Deprecated
-@BatchSide
+@ScannerSide
 @ExtensionPoint
 public interface FileSystemFilter {
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/ModuleFileSystem.java b/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/ModuleFileSystem.java
index 65186db14e2..a35ad1e8a5b 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/ModuleFileSystem.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/ModuleFileSystem.java
@@ -23,7 +23,7 @@ import java.io.File;
 import java.nio.charset.Charset;
 import java.util.List;
 import javax.annotation.CheckForNull;
-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;
 
@@ -32,7 +32,7 @@ import org.sonar.api.batch.fs.InputFile;
  * @deprecated in 4.2. Replaced by {@link org.sonar.api.batch.fs.FileSystem}
  */
 @Deprecated
-@BatchSide
+@ScannerSide
 public interface ModuleFileSystem {
 
   /**
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/PathResolver.java b/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/PathResolver.java
index 266abad42cb..385a3a2efe9 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/PathResolver.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/PathResolver.java
@@ -27,13 +27,13 @@ import java.util.Collection;
 import java.util.List;
 import javax.annotation.CheckForNull;
 import org.apache.commons.io.FilenameUtils;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.utils.PathUtils;
 
 /**
  * @since 3.5
  */
-@BatchSide
+@ScannerSide
 public class PathResolver {
 
   public File relativeFile(File dir, String path) {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/scan/issue/filter/IssueFilter.java b/sonar-plugin-api/src/main/java/org/sonar/api/scan/issue/filter/IssueFilter.java
index eb5d384403f..e403776784e 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/scan/issue/filter/IssueFilter.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/scan/issue/filter/IssueFilter.java
@@ -20,9 +20,9 @@
 package org.sonar.api.scan.issue.filter;
 
 import org.sonar.api.ExtensionPoint;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 
-@BatchSide
+@ScannerSide
 @ExtensionPoint
 /**
  * @since 5.3
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/security/ResourcePermissions.java b/sonar-plugin-api/src/main/java/org/sonar/api/security/ResourcePermissions.java
index 9add6cb6653..d688f06d158 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/security/ResourcePermissions.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/security/ResourcePermissions.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.api.security;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.server.ServerSide;
 import org.sonar.api.resources.Resource;
 
@@ -30,7 +30,7 @@ import org.sonar.api.resources.Resource;
  *
  * @since 3.2
  */
-@BatchSide
+@ScannerSide
 @ServerSide
 public interface ResourcePermissions {
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/ServerSide.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/ServerSide.java
index 3ff2a0e4610..0f1d1e2cac0 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/server/ServerSide.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/ServerSide.java
@@ -24,10 +24,10 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 
 /**
- * Same as {@link BatchSide} but for server-side components.
+ * Same as {@link ScannerSide} but for server-side components.
  *
  * @since 5.2
  */
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/task/Task.java b/sonar-plugin-api/src/main/java/org/sonar/api/task/Task.java
index 7a3a13e3453..c4975c41dd7 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/task/Task.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/task/Task.java
@@ -19,14 +19,14 @@
  */
 package org.sonar.api.task;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.InstantiationStrategy;
 
 /**
  * Implement this interface to provide the behavior of a task.
  * @since 3.6
  */
-@BatchSide
+@ScannerSide
 @InstantiationStrategy(InstantiationStrategy.PER_TASK)
 public interface Task {
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskComponent.java b/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskComponent.java
index 1f5a68f1564..f825f92285f 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskComponent.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskComponent.java
@@ -19,17 +19,17 @@
  */
 package org.sonar.api.task;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.InstantiationStrategy;
 
 /**
  * All the classes implementing this interface can be injected in public constructors of {@link TaskExtension}.
  *
  * @since 3.6
- * @deprecated since 5.1. Use {@link BatchSide} and {@link InstantiationStrategy#PER_TASK} 
+ * @deprecated since 5.1. Use {@link ScannerSide} and {@link InstantiationStrategy#PER_TASK} 
  */
 @Deprecated
-@BatchSide
+@ScannerSide
 @InstantiationStrategy(InstantiationStrategy.PER_TASK)
 public interface TaskComponent {
 }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskDefinition.java b/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskDefinition.java
index 6075e1300ab..ff895a86df6 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskDefinition.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskDefinition.java
@@ -23,7 +23,7 @@ import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import java.util.regex.Pattern;
 import org.sonar.api.ExtensionPoint;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.InstantiationStrategy;
 
 /**
@@ -32,7 +32,7 @@ import org.sonar.api.batch.InstantiationStrategy;
  * @since 3.6
  */
 @ExtensionPoint
-@BatchSide
+@ScannerSide
 @InstantiationStrategy(InstantiationStrategy.PER_TASK)
 public class TaskDefinition implements Comparable<TaskDefinition> {
   static final String KEY_PATTERN = "[a-zA-Z0-9\\-\\_]+";
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskExtension.java b/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskExtension.java
index 6a5aa783662..765e12c4cbb 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskExtension.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskExtension.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.api.task;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.InstantiationStrategy;
 
 /**
@@ -29,7 +29,7 @@ import org.sonar.api.batch.InstantiationStrategy;
  * @deprecated since 5.1. Not used.
  */
 @Deprecated
-@BatchSide
+@ScannerSide
 @InstantiationStrategy(InstantiationStrategy.PER_TASK)
 public interface TaskExtension {
 }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/Durations.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/Durations.java
index febbf03ee98..5c069e664b9 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/Durations.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/Durations.java
@@ -22,7 +22,7 @@ package org.sonar.api.utils;
 import java.util.Locale;
 import javax.annotation.CheckForNull;
 import org.sonar.api.CoreProperties;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.config.Settings;
 import org.sonar.api.i18n.I18n;
@@ -33,7 +33,7 @@ import org.sonar.api.server.ServerSide;
  *
  * @since 4.3
  */
-@BatchSide
+@ScannerSide
 @ServerSide
 @ComputeEngineSide
 public class Durations {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/HttpDownloader.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/HttpDownloader.java
index 8d128afd9b1..a8e6ebc3a6d 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/HttpDownloader.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/HttpDownloader.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.api.utils;
 
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.server.ServerSide;
 
 import java.io.File;
@@ -30,7 +30,7 @@ import java.net.URI;
  * This component is available in IoC container, so it should be injected through
  * a constructor parameter. It is available in both batch and server.
  */
-@BatchSide
+@ScannerSide
 @ServerSide
 public abstract class HttpDownloader extends UriReader.SchemeProcessor {
   public static final int TIMEOUT_MILLISECONDS = 20 * 1000;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/System2.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/System2.java
index 585e14d034d..51c8735def3 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/System2.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/System2.java
@@ -26,7 +26,7 @@ import java.util.Properties;
 import java.util.TimeZone;
 import javax.annotation.CheckForNull;
 import org.apache.commons.lang.SystemUtils;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.server.ServerSide;
 
@@ -63,7 +63,7 @@ import org.sonar.api.server.ServerSide;
  *
  * @since 4.2
  */
-@BatchSide
+@ScannerSide
 @ServerSide
 @ComputeEngineSide
 public class System2 {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/TempFolder.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/TempFolder.java
index da16a352447..5e255810808 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/TempFolder.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/TempFolder.java
@@ -21,7 +21,7 @@ package org.sonar.api.utils;
 
 import java.io.File;
 import javax.annotation.Nullable;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.server.ServerSide;
 
@@ -35,7 +35,7 @@ import org.sonar.api.server.ServerSide;
  * @since 4.0
  *
  */
-@BatchSide
+@ScannerSide
 @ServerSide
 @ComputeEngineSide
 public interface TempFolder {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/UriReader.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/UriReader.java
index 562f313509c..3001e039194 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/UriReader.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/UriReader.java
@@ -32,7 +32,7 @@ import java.nio.charset.Charset;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import org.sonar.api.batch.BatchSide;
+import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.server.ServerSide;
 
@@ -41,7 +41,7 @@ import org.sonar.api.server.ServerSide;
  *
  * @since 3.2
  */
-@BatchSide
+@ScannerSide
 @ServerSide
 @ComputeEngineSide
 public class UriReader {