Rename batch into scanner

728 files changed, 1065 insertions, 1074 deletions

diff --git a/pom.xml b/pom.xml
index ad4d9e792ef..024fe120504 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,9 +18,9 @@
   <modules>
     <module>sonar-plugin-api-deps</module>
     <module>sonar-application</module>
-    <module>sonar-batch</module>
-    <module>sonar-batch-protocol</module>
-    <module>sonar-batch-shaded</module>
+    <module>sonar-scanner-engine</module>
+    <module>sonar-scanner-protocol</module>
+    <module>sonar-scanner-engine-shaded</module>
     <module>sonar-check-api</module>
     <module>sonar-colorizer</module>
     <module>sonar-core</module>
@@ -442,7 +442,7 @@
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>sonar-batch-protocol</artifactId>
+        <artifactId>sonar-scanner-protocol</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -1436,7 +1436,7 @@
 
     <!--
     The following profiles optimize the build for each team, according to their
-     stack layers (batch, server and web teams)
+     stack layers (scanner, server and web teams)
     -->
     <profile>
       <!-- disable all tests -->
@@ -1453,7 +1453,7 @@
     </profile>
 
     <profile>
-      <id>batch</id>
+      <id>scanner</id>
       <properties>
         <skipServerTests>true</skipServerTests>
       </properties>
diff --git a/server/sonar-server-benchmarks/pom.xml b/server/sonar-server-benchmarks/pom.xml
index 7fbeac8dcd8..087d3b832e6 100644
--- a/server/sonar-server-benchmarks/pom.xml
+++ b/server/sonar-server-benchmarks/pom.xml
@@ -60,6 +60,11 @@
       <artifactId>dbunit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/PersistFileSourcesStepTest.java b/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/PersistFileSourcesStepTest.java
index e36f1033a2c..c5d96e80a30 100644
--- a/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/PersistFileSourcesStepTest.java
+++ b/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/PersistFileSourcesStepTest.java
@@ -31,12 +31,12 @@ import org.junit.rules.TemporaryFolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.utils.System2;
-import org.sonar.batch.protocol.Constants;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReportWriter;
 import org.sonar.core.util.Uuids;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbTester;
+import org.sonar.scanner.protocol.Constants;
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
 import org.sonar.server.computation.analysis.AnalysisMetadataHolderRule;
 import org.sonar.server.computation.batch.BatchReportDirectoryHolderImpl;
 import org.sonar.server.computation.batch.BatchReportReaderImpl;
@@ -88,14 +88,14 @@ public class PersistFileSourcesStepTest {
 
     long start = System.currentTimeMillis();
 
-    BatchReportDirectoryHolderImpl batchReportDirectoryHolder = new BatchReportDirectoryHolderImpl();
-    batchReportDirectoryHolder.setDirectory(reportDir);
-    org.sonar.server.computation.batch.BatchReportReader batchReportReader = new BatchReportReaderImpl(batchReportDirectoryHolder);
+    BatchReportDirectoryHolderImpl ScannerReportDirectoryHolder = new BatchReportDirectoryHolderImpl();
+    ScannerReportDirectoryHolder.setDirectory(reportDir);
+    org.sonar.server.computation.batch.BatchReportReader ScannerReportReader = new BatchReportReaderImpl(ScannerReportDirectoryHolder);
     analysisMetadataHolder.setBaseProjectSnapshot(null);
-    SourceLinesRepositoryImpl sourceLinesRepository = new SourceLinesRepositoryImpl(batchReportReader);
+    SourceLinesRepositoryImpl sourceLinesRepository = new SourceLinesRepositoryImpl(ScannerReportReader);
     SourceHashRepositoryImpl sourceHashRepository = new SourceHashRepositoryImpl(sourceLinesRepository);
-    ScmInfoRepositoryImpl scmInfoRepository = new ScmInfoRepositoryImpl(batchReportReader, analysisMetadataHolder, dbClient, sourceHashRepository);
-    PersistFileSourcesStep step = new PersistFileSourcesStep(dbClient, System2.INSTANCE, treeRootHolder, batchReportReader, sourceLinesRepository, scmInfoRepository,
+    ScmInfoRepositoryImpl scmInfoRepository = new ScmInfoRepositoryImpl(ScannerReportReader, analysisMetadataHolder, dbClient, sourceHashRepository);
+    PersistFileSourcesStep step = new PersistFileSourcesStep(dbClient, System2.INSTANCE, treeRootHolder, ScannerReportReader, sourceLinesRepository, scmInfoRepository,
       duplicationRepository);
     step.execute();
 
@@ -112,11 +112,11 @@ public class PersistFileSourcesStepTest {
     LOGGER.info("Create report");
     File reportDir = temp.newFolder();
 
-    BatchReportWriter writer = new BatchReportWriter(reportDir);
-    writer.writeMetadata(BatchReport.Metadata.newBuilder()
+    ScannerReportWriter writer = new ScannerReportWriter(reportDir);
+    writer.writeMetadata(ScannerReport.Metadata.newBuilder()
       .setRootComponentRef(1)
       .build());
-    BatchReport.Component.Builder project = BatchReport.Component.newBuilder()
+    ScannerReport.Component.Builder project = ScannerReport.Component.newBuilder()
       .setRef(1)
       .setType(Constants.ComponentType.PROJECT);
 
@@ -140,7 +140,7 @@ public class PersistFileSourcesStepTest {
     return reportDir;
   }
 
-  private Component generateFileReport(BatchReportWriter writer, int fileRef) throws IOException {
+  private Component generateFileReport(ScannerReportWriter writer, int fileRef) throws IOException {
     LineData lineData = new LineData();
     for (int line = 1; line <= NUMBER_OF_LINES; line++) {
       lineData.generateLineData(line);
@@ -148,11 +148,9 @@ public class PersistFileSourcesStepTest {
         fileRef,
         new Duplication(
           new TextBlock(line, line),
-          Arrays.<Duplicate>asList(new InnerDuplicate(new TextBlock(line + 1, line + 1)))
-        )
-        );
+          Arrays.<Duplicate>asList(new InnerDuplicate(new TextBlock(line + 1, line + 1)))));
     }
-    writer.writeComponent(BatchReport.Component.newBuilder()
+    writer.writeComponent(ScannerReport.Component.newBuilder()
       .setRef(fileRef)
       .setType(Constants.ComponentType.FILE)
       .setLines(NUMBER_OF_LINES)
@@ -169,22 +167,22 @@ public class PersistFileSourcesStepTest {
 
   private static class LineData {
     List<String> lines = new ArrayList<>();
-    BatchReport.Changesets.Builder changesetsBuilder = BatchReport.Changesets.newBuilder();
-    List<BatchReport.Coverage> coverages = new ArrayList<>();
-    List<BatchReport.SyntaxHighlighting> highlightings = new ArrayList<>();
-    List<BatchReport.Symbol> symbols = new ArrayList<>();
+    ScannerReport.Changesets.Builder changesetsBuilder = ScannerReport.Changesets.newBuilder();
+    List<ScannerReport.Coverage> coverages = new ArrayList<>();
+    List<ScannerReport.SyntaxHighlighting> highlightings = new ArrayList<>();
+    List<ScannerReport.Symbol> symbols = new ArrayList<>();
 
     void generateLineData(int line) {
       lines.add("line-" + line);
 
-      changesetsBuilder.addChangeset(BatchReport.Changesets.Changeset.newBuilder()
+      changesetsBuilder.addChangeset(ScannerReport.Changesets.Changeset.newBuilder()
         .setAuthor("author-" + line)
         .setDate(123456789L)
         .setRevision("rev-" + line)
         .build())
         .addChangesetIndexByLine(line - 1);
 
-      coverages.add(BatchReport.Coverage.newBuilder()
+      coverages.add(ScannerReport.Coverage.newBuilder()
         .setLine(line)
         .setConditions(10)
         .setUtHits(true)
@@ -194,19 +192,19 @@ public class PersistFileSourcesStepTest {
         .setOverallCoveredConditions(4)
         .build());
 
-      highlightings.add(BatchReport.SyntaxHighlighting.newBuilder()
-        .setRange(BatchReport.TextRange.newBuilder()
+      highlightings.add(ScannerReport.SyntaxHighlighting.newBuilder()
+        .setRange(ScannerReport.TextRange.newBuilder()
           .setStartLine(line).setEndLine(line)
           .setStartOffset(1).setEndOffset(3)
           .build())
         .setType(Constants.HighlightingType.ANNOTATION)
         .build());
 
-      symbols.add(BatchReport.Symbol.newBuilder()
-        .setDeclaration(BatchReport.TextRange.newBuilder()
+      symbols.add(ScannerReport.Symbol.newBuilder()
+        .setDeclaration(ScannerReport.TextRange.newBuilder()
           .setStartLine(line).setEndLine(line).setStartOffset(2).setEndOffset(4)
           .build())
-        .addReference(BatchReport.TextRange.newBuilder()
+        .addReference(ScannerReport.TextRange.newBuilder()
           .setStartLine(line + 1).setEndLine(line + 1).setStartOffset(1).setEndOffset(3)
           .build())
         .build());
diff --git a/server/sonar-server/pom.xml b/server/sonar-server/pom.xml
index 03ab69e8487..afa1b8f5c17 100644
--- a/server/sonar-server/pom.xml
+++ b/server/sonar-server/pom.xml
@@ -69,7 +69,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>sonar-batch-protocol</artifactId>
+      <artifactId>sonar-scanner-protocol</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java
index 863edf332fe..d0a189510d5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java
@@ -23,13 +23,13 @@ import org.apache.commons.io.IOUtils;
 import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
-import org.sonar.batch.protocol.input.GlobalRepositories;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.MyBatis;
 import org.sonar.db.metric.MetricDto;
 import org.sonar.db.property.PropertiesDao;
 import org.sonar.db.property.PropertyDto;
+import org.sonar.scanner.protocol.input.GlobalRepositories;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.user.UserSession;
 import org.sonarqube.ws.MediaTypes;
@@ -82,7 +82,7 @@ public class GlobalAction implements BatchWsAction {
   private void addMetrics(GlobalRepositories ref, DbSession session) {
     for (MetricDto metric : dbClient.metricDao().selectEnabled(session)) {
       ref.addMetric(
-        new org.sonar.batch.protocol.input.Metric(metric.getId(), metric.getKey(),
+        new org.sonar.scanner.protocol.input.Metric(metric.getId(), metric.getKey(),
           metric.getValueType(),
           metric.getDescription(),
           metric.getDirection(),
diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java
index b30364e719e..4573ded8dde 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java
@@ -28,11 +28,11 @@ import org.sonar.api.resources.Scopes;
 import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
-import org.sonar.batch.protocol.input.BatchInput;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.MyBatis;
 import org.sonar.db.component.ComponentDto;
+import org.sonar.scanner.protocol.input.ScannerInput;
 import org.sonar.server.component.ComponentFinder;
 import org.sonar.server.issue.index.IssueDoc;
 import org.sonar.server.issue.index.IssueIndex;
@@ -86,7 +86,7 @@ public class IssuesAction implements BatchWsAction {
       ComponentDto component = componentFinder.getByKey(session, componentKey);
       Map<String, String> keysByUUid = keysByUUid(session, component);
 
-      BatchInput.ServerIssue.Builder issueBuilder = BatchInput.ServerIssue.newBuilder();
+      ScannerInput.ServerIssue.Builder issueBuilder = ScannerInput.ServerIssue.newBuilder();
       for (Iterator<IssueDoc> issueDocIterator = issueIndex.selectIssuesForBatch(component); issueDocIterator.hasNext();) {
         handleIssue(issueDocIterator.next(), issueBuilder, keysByUUid, response.stream().output());
       }
@@ -95,7 +95,7 @@ public class IssuesAction implements BatchWsAction {
     }
   }
 
-  private static void handleIssue(IssueDoc issue, BatchInput.ServerIssue.Builder issueBuilder, Map<String, String> keysByUUid, OutputStream out) {
+  private static void handleIssue(IssueDoc issue, ScannerInput.ServerIssue.Builder issueBuilder, Map<String, String> keysByUUid, OutputStream out) {
     issueBuilder.setKey(issue.key());
     issueBuilder.setModuleKey(keysByUUid.get(issue.moduleUuid()));
     String path = issue.filePath();
@@ -120,7 +120,7 @@ public class IssuesAction implements BatchWsAction {
     if (message != null) {
       issueBuilder.setMsg(message);
     }
-    issueBuilder.setSeverity(org.sonar.batch.protocol.Constants.Severity.valueOf(issue.severity()));
+    issueBuilder.setSeverity(org.sonar.scanner.protocol.Constants.Severity.valueOf(issue.severity()));
     issueBuilder.setManualSeverity(issue.isManualSeverity());
     issueBuilder.setStatus(issue.status());
     String resolution = issue.resolution();
diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectAction.java
index 256c606cd03..d6917cccc34 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectAction.java
@@ -25,8 +25,8 @@ import java.util.Map;
 import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
-import org.sonar.batch.protocol.input.FileData;
-import org.sonar.batch.protocol.input.ProjectRepositories;
+import org.sonar.scanner.protocol.input.FileData;
+import org.sonar.scanner.protocol.input.ProjectRepositories;
 import org.sonarqube.ws.WsBatch.WsProjectResponse;
 import org.sonarqube.ws.WsBatch.WsProjectResponse.FileData.Builder;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java
index 5bf3879210d..7228cdb4aa1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java
@@ -27,14 +27,14 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import org.sonar.api.server.ServerSide;
-import org.sonar.batch.protocol.input.FileData;
-import org.sonar.batch.protocol.input.ProjectRepositories;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.MyBatis;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.component.FilePathWithHashDto;
 import org.sonar.db.property.PropertyDto;
+import org.sonar.scanner.protocol.input.FileData;
+import org.sonar.scanner.protocol.input.ProjectRepositories;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.user.UserSession;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/UsersAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/UsersAction.java
index fea1f994fcb..e3fd78766c7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/batch/UsersAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/UsersAction.java
@@ -26,7 +26,7 @@ import java.util.List;
 import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
-import org.sonar.batch.protocol.input.BatchInput;
+import org.sonar.scanner.protocol.input.ScannerInput;
 import org.sonar.server.user.UserSession;
 import org.sonar.server.user.index.UserDoc;
 import org.sonar.server.user.index.UserIndex;
@@ -66,7 +66,7 @@ public class UsersAction implements BatchWsAction {
     List<String> logins = request.mandatoryParamAsStrings(PARAM_LOGINS);
 
     response.stream().setMediaType(MediaTypes.PROTOBUF);
-    BatchInput.User.Builder userBuilder = BatchInput.User.newBuilder();
+    ScannerInput.User.Builder userBuilder = ScannerInput.User.newBuilder();
     OutputStream output = response.stream().output();
     try {
       for (Iterator<UserDoc> userDocIterator = userIndex.selectUsersForBatch(logins); userDocIterator.hasNext();) {
@@ -77,7 +77,7 @@ public class UsersAction implements BatchWsAction {
     }
   }
 
-  private static void handleUser(UserDoc user, BatchInput.User.Builder userBuilder, OutputStream out) {
+  private static void handleUser(UserDoc user, ScannerInput.User.Builder userBuilder, OutputStream out) {
     userBuilder
       .clear()
       .setLogin(user.login())
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportReader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportReader.java
index 46ea7f38fa5..2941e9fc5d9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportReader.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportReader.java
@@ -21,41 +21,41 @@ package org.sonar.server.computation.batch;
 
 import com.google.common.base.Optional;
 import javax.annotation.CheckForNull;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.util.CloseableIterator;
+import org.sonar.scanner.protocol.output.ScannerReport;
 
 public interface BatchReportReader {
-  BatchReport.Metadata readMetadata();
+  ScannerReport.Metadata readMetadata();
 
   CloseableIterator<String> readScannerLogs();
 
-  CloseableIterator<BatchReport.ActiveRule> readActiveRules();
+  CloseableIterator<ScannerReport.ActiveRule> readActiveRules();
 
-  CloseableIterator<BatchReport.Measure> readComponentMeasures(int componentRef);
+  CloseableIterator<ScannerReport.Measure> readComponentMeasures(int componentRef);
 
   @CheckForNull
-  BatchReport.Changesets readChangesets(int componentRef);
+  ScannerReport.Changesets readChangesets(int componentRef);
 
-  BatchReport.Component readComponent(int componentRef);
+  ScannerReport.Component readComponent(int componentRef);
 
-  CloseableIterator<BatchReport.Issue> readComponentIssues(int componentRef);
+  CloseableIterator<ScannerReport.Issue> readComponentIssues(int componentRef);
 
-  CloseableIterator<BatchReport.Duplication> readComponentDuplications(int componentRef);
+  CloseableIterator<ScannerReport.Duplication> readComponentDuplications(int componentRef);
 
-  CloseableIterator<BatchReport.CpdTextBlock> readCpdTextBlocks(int componentRef);
+  CloseableIterator<ScannerReport.CpdTextBlock> readCpdTextBlocks(int componentRef);
 
-  CloseableIterator<BatchReport.Symbol> readComponentSymbols(int componentRef);
+  CloseableIterator<ScannerReport.Symbol> readComponentSymbols(int componentRef);
 
-  CloseableIterator<BatchReport.SyntaxHighlighting> readComponentSyntaxHighlighting(int fileRef);
+  CloseableIterator<ScannerReport.SyntaxHighlighting> readComponentSyntaxHighlighting(int fileRef);
 
-  CloseableIterator<BatchReport.Coverage> readComponentCoverage(int fileRef);
+  CloseableIterator<ScannerReport.Coverage> readComponentCoverage(int fileRef);
 
   /**
    * Reads file source line by line. Return an absent optional if the file doest not exist
    */
   Optional<CloseableIterator<String>> readFileSource(int fileRef);
 
-  CloseableIterator<BatchReport.Test> readTests(int testFileRef);
+  CloseableIterator<ScannerReport.Test> readTests(int testFileRef);
 
-  CloseableIterator<BatchReport.CoverageDetail> readCoverageDetails(int testFileRef);
+  CloseableIterator<ScannerReport.CoverageDetail> readCoverageDetails(int testFileRef);
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportReaderImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportReaderImpl.java
index 980d22d3259..c1ae4b7f048 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportReaderImpl.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportReaderImpl.java
@@ -33,21 +33,21 @@ import javax.annotation.CheckForNull;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.LineIterator;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.util.CloseableIterator;
 import org.sonar.core.util.LineReaderIterator;
+import org.sonar.scanner.protocol.output.ScannerReport;
 
 public class BatchReportReaderImpl implements BatchReportReader {
-  private final org.sonar.batch.protocol.output.BatchReportReader delegate;
+  private final org.sonar.scanner.protocol.output.ScannerReportReader delegate;
   // caching of metadata which are read often
-  private BatchReport.Metadata metadata;
+  private ScannerReport.Metadata metadata;
 
   public BatchReportReaderImpl(BatchReportDirectoryHolder batchReportDirectoryHolder) {
-    this.delegate = new org.sonar.batch.protocol.output.BatchReportReader(batchReportDirectoryHolder.getDirectory());
+    this.delegate = new org.sonar.scanner.protocol.output.ScannerReportReader(batchReportDirectoryHolder.getDirectory());
   }
 
   @Override
-  public BatchReport.Metadata readMetadata() {
+  public ScannerReport.Metadata readMetadata() {
     if (this.metadata == null) {
       this.metadata = delegate.readMetadata();
     }
@@ -69,53 +69,53 @@ public class BatchReportReaderImpl implements BatchReportReader {
   }
 
   @Override
-  public CloseableIterator<BatchReport.ActiveRule> readActiveRules() {
+  public CloseableIterator<ScannerReport.ActiveRule> readActiveRules() {
     return delegate.readActiveRules();
   }
 
   @Override
-  public CloseableIterator<BatchReport.Measure> readComponentMeasures(int componentRef) {
+  public CloseableIterator<ScannerReport.Measure> readComponentMeasures(int componentRef) {
     return delegate.readComponentMeasures(componentRef);
   }
 
   @Override
   @CheckForNull
-  public BatchReport.Changesets readChangesets(int componentRef) {
+  public ScannerReport.Changesets readChangesets(int componentRef) {
     return delegate.readChangesets(componentRef);
   }
 
   @Override
-  public BatchReport.Component readComponent(int componentRef) {
+  public ScannerReport.Component readComponent(int componentRef) {
     return delegate.readComponent(componentRef);
   }
 
   @Override
-  public CloseableIterator<BatchReport.Issue> readComponentIssues(int componentRef) {
+  public CloseableIterator<ScannerReport.Issue> readComponentIssues(int componentRef) {
     return delegate.readComponentIssues(componentRef);
   }
 
   @Override
-  public CloseableIterator<BatchReport.Duplication> readComponentDuplications(int componentRef) {
+  public CloseableIterator<ScannerReport.Duplication> readComponentDuplications(int componentRef) {
     return delegate.readComponentDuplications(componentRef);
   }
 
   @Override
-  public CloseableIterator<BatchReport.CpdTextBlock> readCpdTextBlocks(int componentRef) {
+  public CloseableIterator<ScannerReport.CpdTextBlock> readCpdTextBlocks(int componentRef) {
     return delegate.readCpdTextBlocks(componentRef);
   }
 
   @Override
-  public CloseableIterator<BatchReport.Symbol> readComponentSymbols(int componentRef) {
+  public CloseableIterator<ScannerReport.Symbol> readComponentSymbols(int componentRef) {
     return delegate.readComponentSymbols(componentRef);
   }
 
   @Override
-  public CloseableIterator<BatchReport.SyntaxHighlighting> readComponentSyntaxHighlighting(int fileRef) {
+  public CloseableIterator<ScannerReport.SyntaxHighlighting> readComponentSyntaxHighlighting(int fileRef) {
     return delegate.readComponentSyntaxHighlighting(fileRef);
   }
 
   @Override
-  public CloseableIterator<BatchReport.Coverage> readComponentCoverage(int fileRef) {
+  public CloseableIterator<ScannerReport.Coverage> readComponentCoverage(int fileRef) {
     return delegate.readComponentCoverage(fileRef);
   }
 
@@ -163,14 +163,14 @@ public class BatchReportReaderImpl implements BatchReportReader {
   }
 
   @Override
-  public CloseableIterator<BatchReport.Test> readTests(int testFileRef) {
+  public CloseableIterator<ScannerReport.Test> readTests(int testFileRef) {
     File file = delegate.readTests(testFileRef);
     if (file == null) {
       return CloseableIterator.emptyCloseableIterator();
     }
 
     try {
-      return new ParserCloseableIterator<>(BatchReport.Test.parser(), FileUtils.openInputStream(file));
+      return new ParserCloseableIterator<>(ScannerReport.Test.parser(), FileUtils.openInputStream(file));
     } catch (IOException e) {
       Throwables.propagate(e);
       // actually never reached
@@ -179,14 +179,14 @@ public class BatchReportReaderImpl implements BatchReportReader {
   }
 
   @Override
-  public CloseableIterator<BatchReport.CoverageDetail> readCoverageDetails(int testFileRef) {
+  public CloseableIterator<ScannerReport.CoverageDetail> readCoverageDetails(int testFileRef) {
     File file = delegate.readCoverageDetails(testFileRef);
     if (file == null) {
       return CloseableIterator.emptyCloseableIterator();
     }
 
     try {
-      return new ParserCloseableIterator<>(BatchReport.CoverageDetail.parser(), FileUtils.openInputStream(file));
+      return new ParserCloseableIterator<>(ScannerReport.CoverageDetail.parser(), FileUtils.openInputStream(file));
     } catch (IOException e) {
       Throwables.propagate(e);
       // actually never reached
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/ComponentImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/component/ComponentImpl.java
index bc93b14cd3c..c1c48346a98 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/ComponentImpl.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/component/ComponentImpl.java
@@ -26,8 +26,8 @@ import java.util.List;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
-import org.sonar.batch.protocol.Constants;
-import org.sonar.batch.protocol.output.BatchReport;
+import org.sonar.scanner.protocol.Constants;
+import org.sonar.scanner.protocol.output.ScannerReport;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -107,7 +107,7 @@ public class ComponentImpl implements Component {
     throw new IllegalStateException("Only component of type PROJECT_VIEW have a FileAttributes object");
   }
 
-  public static Builder builder(BatchReport.Component component) {
+  public static Builder builder(ScannerReport.Component component) {
     return new Builder(component);
   }
 
@@ -122,7 +122,7 @@ public class ComponentImpl implements Component {
     private FileAttributes fileAttributes;
     private final List<Component> children = new ArrayList<>();
 
-    private Builder(BatchReport.Component component) {
+    private Builder(ScannerReport.Component component) {
       checkNotNull(component);
       this.type = convertType(component.getType());
       this.name = checkNotNull(component.getName());
@@ -155,7 +155,7 @@ public class ComponentImpl implements Component {
       return new ComponentImpl(this);
     }
 
-    private static ReportAttributes createBatchAttributes(BatchReport.Component component) {
+    private static ReportAttributes createBatchAttributes(ScannerReport.Component component) {
       return ReportAttributes.newBuilder(component.getRef())
         .setVersion(component.hasVersion() ? component.getVersion() : null)
         .setPath(component.hasPath() ? component.getPath() : null)
@@ -163,7 +163,7 @@ public class ComponentImpl implements Component {
     }
 
     @CheckForNull
-    private static FileAttributes createFileAttributes(BatchReport.Component component) {
+    private static FileAttributes createFileAttributes(ScannerReport.Component component) {
       if (component.getType() != Constants.ComponentType.FILE) {
         return null;
       }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/TreeRootHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/component/TreeRootHolder.java
index 777ea980df7..441c1507b47 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/TreeRootHolder.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/component/TreeRootHolder.java
@@ -21,7 +21,7 @@ package org.sonar.server.computation.component;
 
 public interface TreeRootHolder {
   /**
-   * The root of the tree of Component representing the component in the current BatchReport.
+   * The root of the tree of Component representing the component in the current ScannerReport.
    *
    * @throws IllegalStateException if the holder is empty (ie. there is no root yet)
    */
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerRawInputFactory.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerRawInputFactory.java
index 4af4e673a9c..63aa189e73d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerRawInputFactory.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerRawInputFactory.java
@@ -25,7 +25,6 @@ import java.util.List;
 import org.sonar.api.issue.Issue;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.issue.DefaultIssue;
 import org.sonar.core.issue.tracking.Input;
 import org.sonar.core.issue.tracking.LazyInput;
@@ -33,6 +32,7 @@ import org.sonar.core.issue.tracking.LineHashSequence;
 import org.sonar.core.util.CloseableIterator;
 import org.sonar.db.protobuf.DbCommons;
 import org.sonar.db.protobuf.DbIssues;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.TreeRootHolder;
@@ -86,11 +86,11 @@ public class TrackerRawInputFactory {
       for (DefaultIssue commonRuleIssue : commonRuleEngine.process(component)) {
         result.add(init(commonRuleIssue));
       }
-      try (CloseableIterator<BatchReport.Issue> reportIssues = reportReader.readComponentIssues(component.getReportAttributes().getRef())) {
+      try (CloseableIterator<ScannerReport.Issue> reportIssues = reportReader.readComponentIssues(component.getReportAttributes().getRef())) {
         // optimization - do not load line hashes if there are no issues -> getLineHashSequence() is executed
         // as late as possible
         while (reportIssues.hasNext()) {
-          BatchReport.Issue reportIssue = reportIssues.next();
+          ScannerReport.Issue reportIssue = reportIssues.next();
           if (isIssueOnUnsupportedCommonRule(reportIssue)) {
             DefaultIssue issue = toIssue(getLineHashSequence(), reportIssue);
             result.add(issue);
@@ -103,13 +103,13 @@ public class TrackerRawInputFactory {
       return result;
     }
 
-    private boolean isIssueOnUnsupportedCommonRule(BatchReport.Issue issue) {
+    private boolean isIssueOnUnsupportedCommonRule(ScannerReport.Issue issue) {
       // issues on batch common rules are ignored. This feature
       // is natively supported by compute engine since 5.2.
       return !issue.getRuleRepository().startsWith(CommonRuleKeys.REPOSITORY_PREFIX);
     }
 
-    private DefaultIssue toIssue(LineHashSequence lineHashSeq, BatchReport.Issue reportIssue) {
+    private DefaultIssue toIssue(LineHashSequence lineHashSeq, ScannerReport.Issue reportIssue) {
       DefaultIssue issue = new DefaultIssue();
       init(issue);
       issue.setRuleKey(RuleKey.of(reportIssue.getRuleRepository(), reportIssue.getRuleKey()));
@@ -132,10 +132,10 @@ public class TrackerRawInputFactory {
       if (reportIssue.hasTextRange()) {
         dbLocationsBuilder.setTextRange(convertTextRange(reportIssue.getTextRange()));
       }
-      for (BatchReport.Flow flow : reportIssue.getFlowList()) {
+      for (ScannerReport.Flow flow : reportIssue.getFlowList()) {
         if (flow.getLocationCount() > 0) {
           DbIssues.Flow.Builder dbFlowBuilder = DbIssues.Flow.newBuilder();
-          for (BatchReport.IssueLocation location : flow.getLocationList()) {
+          for (ScannerReport.IssueLocation location : flow.getLocationList()) {
             dbFlowBuilder.addLocation(convertLocation(location));
           }
           dbLocationsBuilder.addFlow(dbFlowBuilder);
@@ -155,7 +155,7 @@ public class TrackerRawInputFactory {
       return issue;
     }
 
-    private DbIssues.Location convertLocation(BatchReport.IssueLocation source) {
+    private DbIssues.Location convertLocation(ScannerReport.IssueLocation source) {
       DbIssues.Location.Builder target = DbIssues.Location.newBuilder();
       if (source.hasComponentRef() && source.getComponentRef() != component.getReportAttributes().getRef()) {
         target.setComponentId(treeRootHolder.getComponentByRef(source.getComponentRef()).getUuid());
@@ -164,14 +164,14 @@ public class TrackerRawInputFactory {
         target.setMsg(source.getMsg());
       }
       if (source.hasTextRange()) {
-        BatchReport.TextRange sourceRange = source.getTextRange();
+        ScannerReport.TextRange sourceRange = source.getTextRange();
         DbCommons.TextRange.Builder targetRange = convertTextRange(sourceRange);
         target.setTextRange(targetRange);
       }
       return target.build();
     }
 
-    private DbCommons.TextRange.Builder convertTextRange(BatchReport.TextRange sourceRange) {
+    private DbCommons.TextRange.Builder convertTextRange(ScannerReport.TextRange sourceRange) {
       DbCommons.TextRange.Builder targetRange = DbCommons.TextRange.newBuilder();
       if (sourceRange.hasStartLine()) {
         targetRange.setStartLine(sourceRange.getStartLine());
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/BatchMeasureToMeasure.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/BatchMeasureToMeasure.java
index bc5f97e4a35..21797b3b16f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/BatchMeasureToMeasure.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/BatchMeasureToMeasure.java
@@ -22,14 +22,14 @@ package org.sonar.server.computation.measure;
 import com.google.common.base.Optional;
 import java.util.Objects;
 import javax.annotation.Nullable;
-import org.sonar.batch.protocol.output.BatchReport;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.metric.Metric;
 
 import static com.google.common.base.Optional.of;
 
 public class BatchMeasureToMeasure {
 
-  public Optional<Measure> toMeasure(@Nullable BatchReport.Measure batchMeasure, Metric metric) {
+  public Optional<Measure> toMeasure(@Nullable ScannerReport.Measure batchMeasure, Metric metric) {
     Objects.requireNonNull(metric);
     if (batchMeasure == null) {
       return Optional.absent();
@@ -57,21 +57,21 @@ public class BatchMeasureToMeasure {
     }
   }
 
-  private static Optional<Measure> toIntegerMeasure(Measure.NewMeasureBuilder builder, BatchReport.Measure batchMeasure, @Nullable String data) {
+  private static Optional<Measure> toIntegerMeasure(Measure.NewMeasureBuilder builder, ScannerReport.Measure batchMeasure, @Nullable String data) {
     if (!batchMeasure.hasIntValue()) {
       return toNoValueMeasure(builder, batchMeasure);
     }
     return of(builder.create(batchMeasure.getIntValue(), data));
   }
 
-  private static Optional<Measure> toLongMeasure(Measure.NewMeasureBuilder builder, BatchReport.Measure batchMeasure, @Nullable String data) {
+  private static Optional<Measure> toLongMeasure(Measure.NewMeasureBuilder builder, ScannerReport.Measure batchMeasure, @Nullable String data) {
     if (!batchMeasure.hasLongValue()) {
       return toNoValueMeasure(builder, batchMeasure);
     }
     return of(builder.create(batchMeasure.getLongValue(), data));
   }
 
-  private static Optional<Measure> toDoubleMeasure(Measure.NewMeasureBuilder builder, BatchReport.Measure batchMeasure, @Nullable String data) {
+  private static Optional<Measure> toDoubleMeasure(Measure.NewMeasureBuilder builder, ScannerReport.Measure batchMeasure, @Nullable String data) {
     if (!batchMeasure.hasDoubleValue()) {
       return toNoValueMeasure(builder, batchMeasure);
     }
@@ -81,21 +81,21 @@ public class BatchMeasureToMeasure {
       data));
   }
 
-  private static Optional<Measure> toBooleanMeasure(Measure.NewMeasureBuilder builder, BatchReport.Measure batchMeasure, @Nullable String data) {
+  private static Optional<Measure> toBooleanMeasure(Measure.NewMeasureBuilder builder, ScannerReport.Measure batchMeasure, @Nullable String data) {
     if (!batchMeasure.hasBooleanValue()) {
       return toNoValueMeasure(builder, batchMeasure);
     }
     return of(builder.create(batchMeasure.getBooleanValue(), data));
   }
 
-  private static Optional<Measure> toStringMeasure(Measure.NewMeasureBuilder builder, BatchReport.Measure batchMeasure) {
+  private static Optional<Measure> toStringMeasure(Measure.NewMeasureBuilder builder, ScannerReport.Measure batchMeasure) {
     if (!batchMeasure.hasStringValue()) {
       return toNoValueMeasure(builder, batchMeasure);
     }
     return of(builder.create(batchMeasure.getStringValue()));
   }
 
-  private static Optional<Measure> toLevelMeasure(Measure.NewMeasureBuilder builder, BatchReport.Measure batchMeasure) {
+  private static Optional<Measure> toLevelMeasure(Measure.NewMeasureBuilder builder, ScannerReport.Measure batchMeasure) {
     if (!batchMeasure.hasStringValue()) {
       return toNoValueMeasure(builder, batchMeasure);
     }
@@ -106,7 +106,7 @@ public class BatchMeasureToMeasure {
     return of(builder.create(level.get()));
   }
 
-  private static Optional<Measure> toNoValueMeasure(Measure.NewMeasureBuilder builder, BatchReport.Measure batchMeasure) {
+  private static Optional<Measure> toNoValueMeasure(Measure.NewMeasureBuilder builder, ScannerReport.Measure batchMeasure) {
     return of(builder.createNoValue());
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepositoryImpl.java
index d9facc5fd67..b8fa44ec45b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepositoryImpl.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepositoryImpl.java
@@ -23,11 +23,11 @@ import com.google.common.base.Optional;
 import com.google.common.collect.SetMultimap;
 import java.util.HashSet;
 import java.util.Set;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.util.CloseableIterator;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.measure.MeasureDto;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.measure.MapBasedRawMeasureRepository.OverridePolicy;
@@ -113,9 +113,9 @@ public class MeasureRepositoryImpl implements MeasureRepository {
       return;
     }
 
-    try (CloseableIterator<BatchReport.Measure> readIt = reportReader.readComponentMeasures(component.getReportAttributes().getRef())) {
+    try (CloseableIterator<ScannerReport.Measure> readIt = reportReader.readComponentMeasures(component.getReportAttributes().getRef())) {
       while (readIt.hasNext()) {
-        BatchReport.Measure batchMeasure = readIt.next();
+        ScannerReport.Measure batchMeasure = readIt.next();
         String metricKey = batchMeasure.getMetricKey();
         if (reportMetricValidator.validate(metricKey)) {
           Metric metric = metricRepository.getByKey(metricKey);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/scm/ReportScmInfo.java b/server/sonar-server/src/main/java/org/sonar/server/computation/scm/ReportScmInfo.java
index 08f31fcb309..c60ceb94473 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/scm/ReportScmInfo.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/scm/ReportScmInfo.java
@@ -26,7 +26,7 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import javax.annotation.Nonnull;
 import javax.annotation.concurrent.Immutable;
-import org.sonar.batch.protocol.output.BatchReport;
+import org.sonar.scanner.protocol.output.ScannerReport;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
@@ -40,12 +40,12 @@ import static java.util.Objects.requireNonNull;
 class ReportScmInfo implements ScmInfo {
   private final ScmInfo delegate;
 
-  ReportScmInfo(BatchReport.Changesets changesets) {
+  ReportScmInfo(ScannerReport.Changesets changesets) {
     requireNonNull(changesets);
     this.delegate = convertToScmInfo(changesets);
   }
 
-  private static ScmInfo convertToScmInfo(BatchReport.Changesets changesets) {
+  private static ScmInfo convertToScmInfo(ScannerReport.Changesets changesets) {
     return new ScmInfoImpl(
       from(new IntRangeIterable(changesets.getChangesetIndexByLineCount()))
         .transform(new LineIndexToChangeset(changesets)));
@@ -72,11 +72,11 @@ class ReportScmInfo implements ScmInfo {
   }
 
   private static class LineIndexToChangeset implements Function<Integer, Changeset> {
-    private final BatchReport.Changesets changesets;
+    private final ScannerReport.Changesets changesets;
     private final Map<Integer, Changeset> changesetCache;
     private final Changeset.Builder builder = Changeset.newChangesetBuilder();
 
-    public LineIndexToChangeset(BatchReport.Changesets changesets) {
+    public LineIndexToChangeset(ScannerReport.Changesets changesets) {
       this.changesets = changesets;
       changesetCache = new HashMap<>(changesets.getChangesetCount());
     }
@@ -94,7 +94,7 @@ class ReportScmInfo implements ScmInfo {
       return res;
     }
 
-    private Changeset convert(BatchReport.Changesets.Changeset changeset, int line) {
+    private Changeset convert(ScannerReport.Changesets.Changeset changeset, int line) {
       checkState(changeset.hasRevision(), "Changeset on line %s must have a revision", line);
       checkState(changeset.hasDate(), "Changeset on line %s must have a date", line);
       return builder
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/scm/ScmInfoRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/scm/ScmInfoRepositoryImpl.java
index 71db54efc32..f8a8e4a7480 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/scm/ScmInfoRepositoryImpl.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/scm/ScmInfoRepositoryImpl.java
@@ -24,10 +24,10 @@ import java.util.HashMap;
 import java.util.Map;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.source.FileSourceDto;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.analysis.AnalysisMetadataHolder;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.Component;
@@ -81,7 +81,7 @@ public class ScmInfoRepositoryImpl implements ScmInfoRepository {
   }
 
   private ScmInfo getScmInfoForComponent(Component component) {
-    BatchReport.Changesets changesets = batchReportReader.readChangesets(component.getReportAttributes().getRef());
+    ScannerReport.Changesets changesets = batchReportReader.readChangesets(component.getReportAttributes().getRef());
     if (changesets == null) {
       return getScmInfoFromDb(component);
     }
@@ -106,7 +106,7 @@ public class ScmInfoRepositoryImpl implements ScmInfoRepository {
     }
   }
 
-  private static ScmInfo getScmInfoFromReport(Component file, BatchReport.Changesets changesets) {
+  private static ScmInfo getScmInfoFromReport(Component file, ScannerReport.Changesets changesets) {
     LOGGER.trace("Reading SCM info from report for file '{}'", file.getKey());
     return new ReportScmInfo(changesets);
   }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/CoverageLineReader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/source/CoverageLineReader.java
index aa1f6139f00..6a9ac03b364 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/CoverageLineReader.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/source/CoverageLineReader.java
@@ -21,21 +21,21 @@ package org.sonar.server.computation.source;
 
 import java.util.Iterator;
 import javax.annotation.CheckForNull;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.db.protobuf.DbFileSources;
+import org.sonar.scanner.protocol.output.ScannerReport;
 
 public class CoverageLineReader implements LineReader {
 
-  private final Iterator<BatchReport.Coverage> coverageIterator;
-  private BatchReport.Coverage coverage;
+  private final Iterator<ScannerReport.Coverage> coverageIterator;
+  private ScannerReport.Coverage coverage;
 
-  public CoverageLineReader(Iterator<BatchReport.Coverage> coverageIterator) {
+  public CoverageLineReader(Iterator<ScannerReport.Coverage> coverageIterator) {
     this.coverageIterator = coverageIterator;
   }
 
   @Override
   public void read(DbFileSources.Line.Builder lineBuilder) {
-    BatchReport.Coverage reportCoverage = getNextLineCoverageIfMatchLine(lineBuilder.getLine());
+    ScannerReport.Coverage reportCoverage = getNextLineCoverageIfMatchLine(lineBuilder.getLine());
     if (reportCoverage != null) {
       processUnitTest(lineBuilder, reportCoverage);
       processIntegrationTest(lineBuilder, reportCoverage);
@@ -44,7 +44,7 @@ public class CoverageLineReader implements LineReader {
     }
   }
 
-  private static void processUnitTest(DbFileSources.Line.Builder lineBuilder, BatchReport.Coverage reportCoverage) {
+  private static void processUnitTest(DbFileSources.Line.Builder lineBuilder, ScannerReport.Coverage reportCoverage) {
     if (reportCoverage.hasUtHits()) {
       lineBuilder.setUtLineHits(reportCoverage.getUtHits() ? 1 : 0);
     }
@@ -54,7 +54,7 @@ public class CoverageLineReader implements LineReader {
     }
   }
 
-  private static void processIntegrationTest(DbFileSources.Line.Builder lineBuilder, BatchReport.Coverage reportCoverage) {
+  private static void processIntegrationTest(DbFileSources.Line.Builder lineBuilder, ScannerReport.Coverage reportCoverage) {
     if (reportCoverage.hasItHits()) {
       lineBuilder.setItLineHits(reportCoverage.getItHits() ? 1 : 0);
     }
@@ -64,7 +64,7 @@ public class CoverageLineReader implements LineReader {
     }
   }
 
-  private static void processOverallTest(DbFileSources.Line.Builder lineBuilder, BatchReport.Coverage reportCoverage) {
+  private static void processOverallTest(DbFileSources.Line.Builder lineBuilder, ScannerReport.Coverage reportCoverage) {
     if (reportCoverage.hasUtHits() || reportCoverage.hasItHits()) {
       lineBuilder.setOverallLineHits((reportCoverage.getUtHits() || reportCoverage.getItHits()) ? 1 : 0);
     }
@@ -75,7 +75,7 @@ public class CoverageLineReader implements LineReader {
   }
 
   @CheckForNull
-  private BatchReport.Coverage getNextLineCoverageIfMatchLine(int line) {
+  private ScannerReport.Coverage getNextLineCoverageIfMatchLine(int line) {
     // Get next element (if exists)
     if (coverage == null && coverageIterator.hasNext()) {
       coverage = coverageIterator.next();
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/HighlightingLineReader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/source/HighlightingLineReader.java
index 95c5a4f5c18..ac8e167336c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/HighlightingLineReader.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/source/HighlightingLineReader.java
@@ -26,9 +26,9 @@ import java.util.Map;
 import javax.annotation.CheckForNull;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.batch.protocol.Constants;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.db.protobuf.DbFileSources;
+import org.sonar.scanner.protocol.Constants;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.source.RangeOffsetConverter.RangeOffsetConverterException;
 
@@ -56,13 +56,13 @@ public class HighlightingLineReader implements LineReader {
     .build();
 
   private final Component file;
-  private final Iterator<BatchReport.SyntaxHighlighting> lineHighlightingIterator;
+  private final Iterator<ScannerReport.SyntaxHighlighting> lineHighlightingIterator;
   private final RangeOffsetConverter rangeOffsetConverter;
-  private final List<BatchReport.SyntaxHighlighting> highlightingList;
+  private final List<ScannerReport.SyntaxHighlighting> highlightingList;
 
-  private BatchReport.SyntaxHighlighting currentItem;
+  private ScannerReport.SyntaxHighlighting currentItem;
 
-  public HighlightingLineReader(Component file, Iterator<BatchReport.SyntaxHighlighting> lineHighlightingIterator, RangeOffsetConverter rangeOffsetConverter) {
+  public HighlightingLineReader(Component file, Iterator<ScannerReport.SyntaxHighlighting> lineHighlightingIterator, RangeOffsetConverter rangeOffsetConverter) {
     this.file = file;
     this.lineHighlightingIterator = lineHighlightingIterator;
     this.rangeOffsetConverter = rangeOffsetConverter;
@@ -87,7 +87,7 @@ public class HighlightingLineReader implements LineReader {
     StringBuilder highlighting = new StringBuilder();
 
     incrementHighlightingListMatchingLine(line);
-    for (Iterator<BatchReport.SyntaxHighlighting> syntaxHighlightingIterator = highlightingList.iterator(); syntaxHighlightingIterator.hasNext();) {
+    for (Iterator<ScannerReport.SyntaxHighlighting> syntaxHighlightingIterator = highlightingList.iterator(); syntaxHighlightingIterator.hasNext();) {
       processHighlighting(syntaxHighlightingIterator, highlighting, lineBuilder);
     }
     if (highlighting.length() > 0) {
@@ -95,11 +95,11 @@ public class HighlightingLineReader implements LineReader {
     }
   }
 
-  private void processHighlighting(Iterator<BatchReport.SyntaxHighlighting> syntaxHighlightingIterator, StringBuilder highlighting,
+  private void processHighlighting(Iterator<ScannerReport.SyntaxHighlighting> syntaxHighlightingIterator, StringBuilder highlighting,
     DbFileSources.Line.Builder lineBuilder) {
-    BatchReport.SyntaxHighlighting syntaxHighlighting = syntaxHighlightingIterator.next();
+    ScannerReport.SyntaxHighlighting syntaxHighlighting = syntaxHighlightingIterator.next();
     int line = lineBuilder.getLine();
-    BatchReport.TextRange range = syntaxHighlighting.getRange();
+    ScannerReport.TextRange range = syntaxHighlighting.getRange();
     if (range.getStartLine() <= line) {
       String offsets = rangeOffsetConverter.offsetToString(syntaxHighlighting.getRange(), line, lineBuilder.getSource().length());
       if (offsets.isEmpty()) {
@@ -128,7 +128,7 @@ public class HighlightingLineReader implements LineReader {
   }
 
   private void incrementHighlightingListMatchingLine(int line) {
-    BatchReport.SyntaxHighlighting syntaxHighlighting = getNextHighlightingMatchingLine(line);
+    ScannerReport.SyntaxHighlighting syntaxHighlighting = getNextHighlightingMatchingLine(line);
     while (syntaxHighlighting != null) {
       highlightingList.add(syntaxHighlighting);
       this.currentItem = null;
@@ -137,7 +137,7 @@ public class HighlightingLineReader implements LineReader {
   }
 
   @CheckForNull
-  private BatchReport.SyntaxHighlighting getNextHighlightingMatchingLine(int line) {
+  private ScannerReport.SyntaxHighlighting getNextHighlightingMatchingLine(int line) {
     // Get next element (if exists)
     if (currentItem == null && lineHighlightingIterator.hasNext()) {
       currentItem = lineHighlightingIterator.next();
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/RangeOffsetConverter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/source/RangeOffsetConverter.java
index 2cf207abf87..b029fe8254f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/RangeOffsetConverter.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/source/RangeOffsetConverter.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.server.computation.source;
 
-import org.sonar.batch.protocol.output.BatchReport;
+import org.sonar.scanner.protocol.output.ScannerReport;
 
 import static java.lang.String.format;
 
@@ -28,7 +28,7 @@ public class RangeOffsetConverter {
   static final String OFFSET_SEPARATOR = ",";
   static final String SYMBOLS_SEPARATOR = ";";
 
-  public String offsetToString(BatchReport.TextRange range, int lineIndex, int lineLength) {
+  public String offsetToString(ScannerReport.TextRange range, int lineIndex, int lineLength) {
     StringBuilder element = new StringBuilder();
 
     validateOffsetOrder(range, lineIndex);
@@ -46,17 +46,17 @@ public class RangeOffsetConverter {
     return element.toString();
   }
 
-  private static void validateOffsetOrder(BatchReport.TextRange range, int line) {
+  private static void validateOffsetOrder(ScannerReport.TextRange range, int line) {
     checkExpression(range.getStartLine() != range.getEndLine() || range.getStartOffset() <= range.getEndOffset(),
       "End offset %s cannot be defined before start offset %s on line %s", range.getEndOffset(), range.getStartOffset(), line);
   }
 
-  private static void validateStartOffsetNotGreaterThanLineLength(BatchReport.TextRange range, int lineLength, int line) {
+  private static void validateStartOffsetNotGreaterThanLineLength(ScannerReport.TextRange range, int lineLength, int line) {
     checkExpression(range.getStartLine() != line || range.getStartOffset() <= lineLength,
       "Start offset %s is defined outside the length (%s) of the line %s", range.getStartOffset(), lineLength, line);
   }
 
-  private static void validateEndOffsetNotGreaterThanLineLength(BatchReport.TextRange range, int lineLength, int line) {
+  private static void validateEndOffsetNotGreaterThanLineLength(ScannerReport.TextRange range, int lineLength, int line) {
     checkExpression(range.getEndLine() != line || range.getEndOffset() <= lineLength,
       "End offset %s is defined outside the length (%s) of the line %s", range.getEndOffset(), lineLength, line);
   }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/SourceLinesRepository.java b/server/sonar-server/src/main/java/org/sonar/server/computation/source/SourceLinesRepository.java
index 6b41539cc3a..b7f621e902c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/SourceLinesRepository.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/source/SourceLinesRepository.java
@@ -29,7 +29,7 @@ public interface SourceLinesRepository {
    * <p>
    * The returned {@link CloseableIterator} will wrap the {@link CloseableIterator} returned by
    * {@link org.sonar.server.computation.batch.BatchReportReader#readFileSource(int)} but enforces that the number
-   * of lines specified by {@link org.sonar.batch.protocol.output.BatchReport.Component#getLines()} is respected, adding
+   * of lines specified by {@link org.sonar.batch.protocol.output.ScannerReport.Component#getLines()} is respected, adding
    * an extra empty last line if required.
    * </p>
    *
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/SymbolsLineReader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/source/SymbolsLineReader.java
index 8d519a863ab..c8636dbc82e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/SymbolsLineReader.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/source/SymbolsLineReader.java
@@ -31,8 +31,8 @@ import java.util.List;
 import java.util.Map;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.db.protobuf.DbFileSources;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.component.Component;
 
 import static java.lang.String.format;
@@ -45,15 +45,15 @@ public class SymbolsLineReader implements LineReader {
 
   private final Component file;
   private final RangeOffsetConverter rangeOffsetConverter;
-  private final Map<BatchReport.Symbol, Integer> idsBySymbol;
-  private final SetMultimap<Integer, BatchReport.Symbol> symbolsPerLine;
+  private final Map<ScannerReport.Symbol, Integer> idsBySymbol;
+  private final SetMultimap<Integer, ScannerReport.Symbol> symbolsPerLine;
 
   private boolean areSymbolsValid = true;
 
-  public SymbolsLineReader(Component file, Iterator<BatchReport.Symbol> symbolIterator, RangeOffsetConverter rangeOffsetConverter) {
+  public SymbolsLineReader(Component file, Iterator<ScannerReport.Symbol> symbolIterator, RangeOffsetConverter rangeOffsetConverter) {
     this.file = file;
     this.rangeOffsetConverter = rangeOffsetConverter;
-    List<BatchReport.Symbol> symbols = Lists.newArrayList(symbolIterator);
+    List<ScannerReport.Symbol> symbols = Lists.newArrayList(symbolIterator);
     // Sort symbols to have deterministic id generation
     Collections.sort(symbols, SymbolsComparator.INSTANCE);
 
@@ -77,17 +77,17 @@ public class SymbolsLineReader implements LineReader {
   private void processSymbols(DbFileSources.Line.Builder lineBuilder) {
     int line = lineBuilder.getLine();
 
-    List<BatchReport.Symbol> lineSymbols = new ArrayList<>(this.symbolsPerLine.get(line));
+    List<ScannerReport.Symbol> lineSymbols = new ArrayList<>(this.symbolsPerLine.get(line));
     // Sort symbols to have deterministic results and avoid false variation that would lead to an unnecessary update of the source files
     // data
     Collections.sort(lineSymbols, SymbolsComparator.INSTANCE);
 
     StringBuilder symbolString = new StringBuilder();
-    for (BatchReport.Symbol lineSymbol : lineSymbols) {
+    for (ScannerReport.Symbol lineSymbol : lineSymbols) {
       int symbolId = idsBySymbol.get(lineSymbol);
 
       appendSymbol(symbolString, lineSymbol.getDeclaration(), line, symbolId, lineBuilder.getSource());
-      for (BatchReport.TextRange range : lineSymbol.getReferenceList()) {
+      for (ScannerReport.TextRange range : lineSymbol.getReferenceList()) {
         appendSymbol(symbolString, range, line, symbolId, lineBuilder.getSource());
       }
     }
@@ -96,7 +96,7 @@ public class SymbolsLineReader implements LineReader {
     }
   }
 
-  private void appendSymbol(StringBuilder lineSymbol, BatchReport.TextRange range, int line, int symbolId, String sourceLine) {
+  private void appendSymbol(StringBuilder lineSymbol, ScannerReport.TextRange range, int line, int symbolId, String sourceLine) {
     if (matchLine(range, line)) {
       String offsets = rangeOffsetConverter.offsetToString(range, line, sourceLine.length());
       if (!offsets.isEmpty()) {
@@ -110,42 +110,42 @@ public class SymbolsLineReader implements LineReader {
     }
   }
 
-  private static boolean matchLine(BatchReport.TextRange range, int line) {
+  private static boolean matchLine(ScannerReport.TextRange range, int line) {
     return range.getStartLine() <= line && range.getEndLine() >= line;
   }
 
-  private static Map<BatchReport.Symbol, Integer> createIdsBySymbolMap(List<BatchReport.Symbol> symbols) {
-    Map<BatchReport.Symbol, Integer> map = new HashMap<>(symbols.size());
+  private static Map<ScannerReport.Symbol, Integer> createIdsBySymbolMap(List<ScannerReport.Symbol> symbols) {
+    Map<ScannerReport.Symbol, Integer> map = new HashMap<>(symbols.size());
     int symbolId = 1;
-    for (BatchReport.Symbol symbol : symbols) {
+    for (ScannerReport.Symbol symbol : symbols) {
       map.put(symbol, symbolId);
       symbolId++;
     }
     return map;
   }
 
-  private static SetMultimap<Integer, BatchReport.Symbol> buildSymbolsPerLine(List<BatchReport.Symbol> symbols) {
-    SetMultimap<Integer, BatchReport.Symbol> res = HashMultimap.create();
-    for (BatchReport.Symbol symbol : symbols) {
+  private static SetMultimap<Integer, ScannerReport.Symbol> buildSymbolsPerLine(List<ScannerReport.Symbol> symbols) {
+    SetMultimap<Integer, ScannerReport.Symbol> res = HashMultimap.create();
+    for (ScannerReport.Symbol symbol : symbols) {
       putForTextRange(res, symbol, symbol.getDeclaration());
-      for (BatchReport.TextRange textRange : symbol.getReferenceList()) {
+      for (ScannerReport.TextRange textRange : symbol.getReferenceList()) {
         putForTextRange(res, symbol, textRange);
       }
     }
     return res;
   }
 
-  private static void putForTextRange(SetMultimap<Integer, BatchReport.Symbol> res, BatchReport.Symbol symbol, BatchReport.TextRange declaration) {
+  private static void putForTextRange(SetMultimap<Integer, ScannerReport.Symbol> res, ScannerReport.Symbol symbol, ScannerReport.TextRange declaration) {
     for (int i = declaration.getStartLine(); i <= declaration.getEndLine(); i++) {
       res.put(i, symbol);
     }
   }
 
-  private enum SymbolsComparator implements Comparator<BatchReport.Symbol> {
+  private enum SymbolsComparator implements Comparator<ScannerReport.Symbol> {
     INSTANCE;
 
     @Override
-    public int compare(BatchReport.Symbol o1, BatchReport.Symbol o2) {
+    public int compare(ScannerReport.Symbol o1, ScannerReport.Symbol o2) {
       if (o1.getDeclaration().getStartLine() == o2.getDeclaration().getStartLine()) {
         return Integer.compare(o1.getDeclaration().getStartOffset(), o2.getDeclaration().getStartOffset());
       } else {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/BuildComponentTreeStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/BuildComponentTreeStep.java
index 9342d7519b8..c5281b479c4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/BuildComponentTreeStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/BuildComponentTreeStep.java
@@ -24,12 +24,12 @@ import com.google.common.collect.Iterables;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.component.ComponentKeys;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.component.SnapshotDto;
 import org.sonar.db.component.SnapshotQuery;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.analysis.MutableAnalysisMetadataHolder;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.Component;
@@ -61,7 +61,7 @@ public class BuildComponentTreeStep implements ComputationStep {
   @Override
   public void execute() {
     String branch = analysisMetadataHolder.getBranch();
-    BatchReport.Component reportProject = reportReader.readComponent(analysisMetadataHolder.getRootComponentRef());
+    ScannerReport.Component reportProject = reportReader.readComponent(analysisMetadataHolder.getRootComponentRef());
     UuidFactory uuidFactory = new UuidFactory(dbClient, moduleKey(reportProject, branch));
     Component project = new ComponentRootBuilder(reportProject, uuidFactory, branch).build();
     treeRootHolder.setRoot(project);
@@ -92,14 +92,14 @@ public class BuildComponentTreeStep implements ComputationStep {
 
   private class ComponentRootBuilder {
 
-    private final BatchReport.Component reportProject;
+    private final ScannerReport.Component reportProject;
 
     private final UuidFactory uuidFactory;
 
     @CheckForNull
     private final String branch;
 
-    public ComponentRootBuilder(BatchReport.Component reportProject, UuidFactory uuidFactory, @Nullable String branch) {
+    public ComponentRootBuilder(ScannerReport.Component reportProject, UuidFactory uuidFactory, @Nullable String branch) {
       this.reportProject = reportProject;
       this.uuidFactory = uuidFactory;
       this.branch = branch;
@@ -109,7 +109,7 @@ public class BuildComponentTreeStep implements ComputationStep {
       return buildComponent(reportProject, moduleKey(reportProject, branch));
     }
 
-    private ComponentImpl buildComponent(BatchReport.Component reportComponent, String latestModuleKey) {
+    private ComponentImpl buildComponent(ScannerReport.Component reportComponent, String latestModuleKey) {
       switch (reportComponent.getType()) {
         case PROJECT:
         case MODULE:
@@ -123,7 +123,7 @@ public class BuildComponentTreeStep implements ComputationStep {
       }
     }
 
-    private ComponentImpl buildComponent(BatchReport.Component reportComponent, String componentKey, String latestModuleKey) {
+    private ComponentImpl buildComponent(ScannerReport.Component reportComponent, String componentKey, String latestModuleKey) {
       return builder(reportComponent)
         .addChildren(toArray(buildChildren(reportComponent, latestModuleKey), Component.class))
         .setKey(componentKey)
@@ -131,7 +131,7 @@ public class BuildComponentTreeStep implements ComputationStep {
         .build();
     }
 
-    private Iterable<Component> buildChildren(BatchReport.Component component, final String latestModuleKey) {
+    private Iterable<Component> buildChildren(ScannerReport.Component component, final String latestModuleKey) {
       return Iterables.transform(
         component.getChildRefList(),
         new Function<Integer, Component>() {
@@ -144,7 +144,7 @@ public class BuildComponentTreeStep implements ComputationStep {
     }
   }
 
-  private static String moduleKey(BatchReport.Component reportComponent, @Nullable String branch) {
+  private static String moduleKey(ScannerReport.Component reportComponent, @Nullable String branch) {
     return ComponentKeys.createKey(reportComponent.getKey(), branch);
   }
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadCrossProjectDuplicationsRepositoryStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadCrossProjectDuplicationsRepositoryStep.java
index 023c3b95e91..addd61f5fab 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadCrossProjectDuplicationsRepositoryStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadCrossProjectDuplicationsRepositoryStep.java
@@ -25,12 +25,12 @@ import java.util.List;
 import javax.annotation.Nonnull;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.batch.protocol.output.BatchReport.CpdTextBlock;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.duplication.DuplicationUnitDto;
 import org.sonar.duplications.block.Block;
 import org.sonar.duplications.block.ByteArray;
+import org.sonar.scanner.protocol.output.ScannerReport.CpdTextBlock;
 import org.sonar.server.computation.analysis.AnalysisMetadataHolder;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.Component;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadDuplicationsFromReportStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadDuplicationsFromReportStep.java
index a6fd90125e5..1826ff7a3eb 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadDuplicationsFromReportStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadDuplicationsFromReportStep.java
@@ -21,8 +21,8 @@ package org.sonar.server.computation.step;
 
 import com.google.common.base.Function;
 import javax.annotation.Nonnull;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.util.CloseableIterator;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.CrawlerDepthLimit;
@@ -66,7 +66,7 @@ public class LoadDuplicationsFromReportStep implements ComputationStep {
       new TypeAwareVisitorAdapter(CrawlerDepthLimit.FILE, POST_ORDER) {
         @Override
         public void visitFile(Component file) {
-          CloseableIterator<BatchReport.Duplication> duplications = batchReportReader.readComponentDuplications(file.getReportAttributes().getRef());
+          CloseableIterator<ScannerReport.Duplication> duplications = batchReportReader.readComponentDuplications(file.getReportAttributes().getRef());
           try {
             int idGenerator = 1;
             while (duplications.hasNext()) {
@@ -80,7 +80,7 @@ public class LoadDuplicationsFromReportStep implements ComputationStep {
       }).visit(treeRootHolder.getRoot());
   }
 
-  private void loadDuplications(Component file, BatchReport.Duplication duplication, int id) {
+  private void loadDuplications(Component file, ScannerReport.Duplication duplication, int id) {
     duplicationRepository.add(file,
       new Duplication(
         convert(duplication.getOriginPosition(), id),
@@ -89,15 +89,15 @@ public class LoadDuplicationsFromReportStep implements ComputationStep {
       ));
   }
 
-  private static TextBlock convert(BatchReport.TextRange textRange) {
+  private static TextBlock convert(ScannerReport.TextRange textRange) {
     return new TextBlock(textRange.getStartLine(), textRange.getEndLine());
   }
 
-  private static DetailedTextBlock convert(BatchReport.TextRange textRange, int id) {
+  private static DetailedTextBlock convert(ScannerReport.TextRange textRange, int id) {
     return new DetailedTextBlock(id, textRange.getStartLine(), textRange.getEndLine());
   }
 
-  private class BatchDuplicateToCeDuplicate implements Function<BatchReport.Duplicate, Duplicate> {
+  private class BatchDuplicateToCeDuplicate implements Function<ScannerReport.Duplicate, Duplicate> {
     private final Component file;
 
     private BatchDuplicateToCeDuplicate(Component file) {
@@ -106,7 +106,7 @@ public class LoadDuplicationsFromReportStep implements ComputationStep {
 
     @Override
     @Nonnull
-    public Duplicate apply(@Nonnull BatchReport.Duplicate input) {
+    public Duplicate apply(@Nonnull ScannerReport.Duplicate input) {
       if (input.hasOtherFileRef()) {
         checkArgument(input.getOtherFileRef() != file.getReportAttributes().getRef(), "file and otherFile references can not be the same");
         return new InProjectDuplicate(
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadQualityProfilesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadQualityProfilesStep.java
index dc18f23601c..1f93bba907b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadQualityProfilesStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadQualityProfilesStep.java
@@ -28,8 +28,8 @@ import java.util.Map;
 import javax.annotation.Nonnull;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rule.RuleStatus;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.util.CloseableIterator;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.issue.Rule;
 import org.sonar.server.computation.issue.RuleRepository;
@@ -53,9 +53,9 @@ public class LoadQualityProfilesStep implements ComputationStep {
   @Override
   public void execute() {
     List<ActiveRule> activeRules = new ArrayList<>();
-    try (CloseableIterator<BatchReport.ActiveRule> batchActiveRules = batchReportReader.readActiveRules()) {
+    try (CloseableIterator<ScannerReport.ActiveRule> batchActiveRules = batchReportReader.readActiveRules()) {
       while (batchActiveRules.hasNext()) {
-        BatchReport.ActiveRule batchActiveRule = batchActiveRules.next();
+        ScannerReport.ActiveRule batchActiveRule = batchActiveRules.next();
         activeRules.add(convert(batchActiveRule));
       }
     }
@@ -77,10 +77,10 @@ public class LoadQualityProfilesStep implements ComputationStep {
     return "Load quality profiles";
   }
 
-  private static ActiveRule convert(BatchReport.ActiveRule input) {
+  private static ActiveRule convert(ScannerReport.ActiveRule input) {
     RuleKey key = RuleKey.of(input.getRuleRepository(), input.getRuleKey());
     Map<String, String> params = new HashMap<>();
-    for (BatchReport.ActiveRule.ActiveRuleParam inputParam : input.getParamList()) {
+    for (ScannerReport.ActiveRule.ActiveRuleParam inputParam : input.getParamList()) {
       params.put(inputParam.getKey(), inputParam.getValue());
     }
     return new ActiveRule(key, input.getSeverity().name(), params);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadReportAnalysisMetadataHolderStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadReportAnalysisMetadataHolderStep.java
index 726c28cb9d3..53b7d7e106d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadReportAnalysisMetadataHolderStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadReportAnalysisMetadataHolderStep.java
@@ -20,7 +20,7 @@
 package org.sonar.server.computation.step;
 
 import org.sonar.api.utils.MessageException;
-import org.sonar.batch.protocol.output.BatchReport;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.analysis.MutableAnalysisMetadataHolder;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.queue.CeTask;
@@ -44,7 +44,7 @@ public class LoadReportAnalysisMetadataHolderStep implements ComputationStep {
 
   @Override
   public void execute() {
-    BatchReport.Metadata reportMetadata = reportReader.readMetadata();
+    ScannerReport.Metadata reportMetadata = reportReader.readMetadata();
 
     checkProjectKeyConsistency(reportMetadata);
 
@@ -54,7 +54,7 @@ public class LoadReportAnalysisMetadataHolderStep implements ComputationStep {
     mutableAnalysisMetadataHolder.setCrossProjectDuplicationEnabled(reportMetadata.hasCrossProjectDuplicationActivated() && reportMetadata.getCrossProjectDuplicationActivated());
   }
 
-  private void checkProjectKeyConsistency(BatchReport.Metadata reportMetadata) {
+  private void checkProjectKeyConsistency(ScannerReport.Metadata reportMetadata) {
     String reportProjectKey = projectKeyFromReport(reportMetadata);
     String componentKey = ceTask.getComponentKey();
     if (componentKey == null) {
@@ -72,7 +72,7 @@ public class LoadReportAnalysisMetadataHolderStep implements ComputationStep {
     }
   }
 
-  private static String projectKeyFromReport(BatchReport.Metadata reportMetadata) {
+  private static String projectKeyFromReport(ScannerReport.Metadata reportMetadata) {
     if (reportMetadata.hasBranch()) {
       return reportMetadata.getProjectKey() + ":" + reportMetadata.getBranch();
     }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistCrossProjectDuplicationIndexStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistCrossProjectDuplicationIndexStep.java
index 0033463fab5..8a2410363fe 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistCrossProjectDuplicationIndexStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistCrossProjectDuplicationIndexStep.java
@@ -19,11 +19,11 @@
  */
 package org.sonar.server.computation.step;
 
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.util.CloseableIterator;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.duplication.DuplicationUnitDto;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.CrawlerDepthLimit;
@@ -88,10 +88,10 @@ public class PersistCrossProjectDuplicationIndexStep implements ComputationStep
 
     private void visitComponent(Component component) {
       int indexInFile = 0;
-      CloseableIterator<BatchReport.CpdTextBlock> blocks = reportReader.readCpdTextBlocks(component.getReportAttributes().getRef());
+      CloseableIterator<ScannerReport.CpdTextBlock> blocks = reportReader.readCpdTextBlocks(component.getReportAttributes().getRef());
       try {
         while (blocks.hasNext()) {
-          BatchReport.CpdTextBlock block = blocks.next();
+          ScannerReport.CpdTextBlock block = blocks.next();
           dbClient.duplicationDao().insert(
             session,
             new DuplicationUnitDto()
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java
index 47827c044b7..55832544b7d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java
@@ -32,7 +32,6 @@ import org.apache.commons.lang.ObjectUtils;
 import org.apache.ibatis.session.ResultContext;
 import org.apache.ibatis.session.ResultHandler;
 import org.sonar.api.utils.System2;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.util.CloseableIterator;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
@@ -40,6 +39,7 @@ import org.sonar.db.MyBatis;
 import org.sonar.db.protobuf.DbFileSources;
 import org.sonar.db.source.FileSourceDto;
 import org.sonar.db.source.FileSourceDto.Type;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.CrawlerDepthLimit;
@@ -123,7 +123,7 @@ public class PersistFileSourcesStep implements ComputationStep {
     @Override
     public void visitFile(Component file) {
       int fileRef = file.getReportAttributes().getRef();
-      BatchReport.Component component = reportReader.readComponent(fileRef);
+      ScannerReport.Component component = reportReader.readComponent(fileRef);
       CloseableIterator<String> linesIterator = sourceLinesRepository.readLines(file);
       LineReaders lineReaders = new LineReaders(reportReader, scmInfoRepository, duplicationRepository, file);
       try {
@@ -206,7 +206,7 @@ public class PersistFileSourcesStep implements ComputationStep {
 
     LineReaders(BatchReportReader reportReader, ScmInfoRepository scmInfoRepository, DuplicationRepository duplicationRepository, Component component) {
       int componentRef = component.getReportAttributes().getRef();
-      CloseableIterator<BatchReport.Coverage> coverageIt = reportReader.readComponentCoverage(componentRef);
+      CloseableIterator<ScannerReport.Coverage> coverageIt = reportReader.readComponentCoverage(componentRef);
       closeables.add(coverageIt);
       readers.add(new CoverageLineReader(coverageIt));
 
@@ -219,11 +219,11 @@ public class PersistFileSourcesStep implements ComputationStep {
       }
 
       RangeOffsetConverter rangeOffsetConverter = new RangeOffsetConverter();
-      CloseableIterator<BatchReport.SyntaxHighlighting> highlightingIt = reportReader.readComponentSyntaxHighlighting(componentRef);
+      CloseableIterator<ScannerReport.SyntaxHighlighting> highlightingIt = reportReader.readComponentSyntaxHighlighting(componentRef);
       closeables.add(highlightingIt);
       readers.add(new HighlightingLineReader(component, highlightingIt, rangeOffsetConverter));
 
-      CloseableIterator<BatchReport.Symbol> symbolsIt = reportReader.readComponentSymbols(componentRef);
+      CloseableIterator<ScannerReport.Symbol> symbolsIt = reportReader.readComponentSymbols(componentRef);
       closeables.add(symbolsIt);
       readers.add(new SymbolsLineReader(component, symbolsIt, rangeOffsetConverter));
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java
index a25ccdc9f37..98fac5cb3c4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java
@@ -28,12 +28,12 @@ import java.util.Map;
 import java.util.Set;
 import javax.annotation.Nullable;
 import org.sonar.api.i18n.I18n;
-import org.sonar.batch.protocol.Constants;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.MyBatis;
 import org.sonar.db.component.ComponentLinkDto;
+import org.sonar.scanner.protocol.Constants;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.CrawlerDepthLimit;
@@ -100,18 +100,18 @@ public class PersistProjectLinksStep implements ComputationStep {
     }
 
     private void processComponent(Component component) {
-      BatchReport.Component batchComponent = reportReader.readComponent(component.getReportAttributes().getRef());
+      ScannerReport.Component batchComponent = reportReader.readComponent(component.getReportAttributes().getRef());
       processLinks(component.getUuid(), batchComponent.getLinkList());
     }
 
-    private void processLinks(String componentUuid, List<BatchReport.ComponentLink> links) {
+    private void processLinks(String componentUuid, List<ScannerReport.ComponentLink> links) {
       List<ComponentLinkDto> previousLinks = dbClient.componentLinkDao().selectByComponentUuid(session, componentUuid);
       mergeLinks(session, componentUuid, links, previousLinks);
     }
 
-    private void mergeLinks(DbSession session, String componentUuid, List<BatchReport.ComponentLink> links, List<ComponentLinkDto> previousLinks) {
+    private void mergeLinks(DbSession session, String componentUuid, List<ScannerReport.ComponentLink> links, List<ComponentLinkDto> previousLinks) {
       Set<String> linkType = newHashSet();
-      for (final BatchReport.ComponentLink link : links) {
+      for (final ScannerReport.ComponentLink link : links) {
         String type = convertType(link.getType());
         if (!linkType.contains(type)) {
           linkType.add(type);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java
index 7f5dbb51f8a..fec594e8115 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java
@@ -37,7 +37,6 @@ import org.apache.ibatis.session.ResultHandler;
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.util.CloseableIterator;
 import org.sonar.core.util.Uuids;
 import org.sonar.db.DbClient;
@@ -46,6 +45,7 @@ import org.sonar.db.MyBatis;
 import org.sonar.db.protobuf.DbFileSources;
 import org.sonar.db.source.FileSourceDto;
 import org.sonar.db.source.FileSourceDto.Type;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.ComponentVisitor;
@@ -185,9 +185,9 @@ public class PersistTestsStep implements ComputationStep {
     private Multimap<String, DbFileSources.Test.Builder> buildDbTests(int componentRed) {
       Multimap<String, DbFileSources.Test.Builder> tests = ArrayListMultimap.create();
 
-      try (CloseableIterator<BatchReport.Test> testIterator = reportReader.readTests(componentRed)) {
+      try (CloseableIterator<ScannerReport.Test> testIterator = reportReader.readTests(componentRed)) {
         while (testIterator.hasNext()) {
-          BatchReport.Test batchTest = testIterator.next();
+          ScannerReport.Test batchTest = testIterator.next();
           DbFileSources.Test.Builder dbTest = DbFileSources.Test.newBuilder();
           dbTest.setUuid(Uuids.create());
           dbTest.setName(batchTest.getName());
@@ -217,10 +217,10 @@ public class PersistTestsStep implements ComputationStep {
     private Table<String, String, DbFileSources.Test.CoveredFile.Builder> loadCoverageDetails(int testFileRef) {
       Table<String, String, DbFileSources.Test.CoveredFile.Builder> nameToCoveredFiles = HashBasedTable.create();
 
-      try (CloseableIterator<BatchReport.CoverageDetail> coverageIterator = reportReader.readCoverageDetails(testFileRef)) {
+      try (CloseableIterator<ScannerReport.CoverageDetail> coverageIterator = reportReader.readCoverageDetails(testFileRef)) {
         while (coverageIterator.hasNext()) {
-          BatchReport.CoverageDetail batchCoverageDetail = coverageIterator.next();
-          for (BatchReport.CoverageDetail.CoveredFile batchCoveredFile : batchCoverageDetail.getCoveredFileList()) {
+          ScannerReport.CoverageDetail batchCoverageDetail = coverageIterator.next();
+          for (ScannerReport.CoverageDetail.CoveredFile batchCoveredFile : batchCoverageDetail.getCoveredFileList()) {
             String testName = batchCoverageDetail.getTestName();
             String mainFileUuid = getUuid(batchCoveredFile.getFileRef());
             DbFileSources.Test.CoveredFile.Builder existingDbCoveredFile = nameToCoveredFiles.get(testName, mainFileUuid);
diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java
index 9e1d18b0a36..944b683955b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java
@@ -32,11 +32,11 @@ import org.sonar.api.platform.Server;
 import org.sonar.api.security.DefaultGroups;
 import org.sonar.api.utils.System2;
 import org.sonar.api.web.UserRole;
-import org.sonar.batch.protocol.Constants.Severity;
-import org.sonar.batch.protocol.input.BatchInput.ServerIssue;
 import org.sonar.db.DbTester;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.component.ComponentTesting;
+import org.sonar.scanner.protocol.Constants.Severity;
+import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
 import org.sonar.server.component.ComponentFinder;
 import org.sonar.server.es.EsTester;
 import org.sonar.server.exceptions.ForbiddenException;
@@ -54,7 +54,6 @@ import static com.google.common.collect.Lists.newArrayList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
-
 public class IssuesActionTest {
 
   final static String PROJECT_KEY = "struts";
@@ -336,7 +335,7 @@ public class IssuesActionTest {
     issueAuthorizationIndexer.index(newArrayList(new IssueAuthorizationDao.Dto(projectUuid, 1).addGroup(group).addUser(user)));
   }
 
-  private void addBrowsePermissionOnComponent(String componentKey){
+  private void addBrowsePermissionOnComponent(String componentKey) {
     userSessionRule.addComponentPermission(UserRole.USER, PROJECT_KEY, componentKey);
   }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectActionTest.java
index c9255c47f8d..6bc3935f5fc 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectActionTest.java
@@ -22,8 +22,8 @@ package org.sonar.server.batch;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
-import org.sonar.batch.protocol.input.FileData;
-import org.sonar.batch.protocol.input.ProjectRepositories;
+import org.sonar.scanner.protocol.input.FileData;
+import org.sonar.scanner.protocol.input.ProjectRepositories;
 import org.sonar.server.ws.TestResponse;
 import org.sonar.server.ws.WsActionTester;
 import org.sonarqube.ws.MediaTypes;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderMediumTest.java
index 6f170d8417e..f3424182762 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderMediumTest.java
@@ -29,8 +29,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.sonar.api.web.UserRole;
-import org.sonar.batch.protocol.input.FileData;
-import org.sonar.batch.protocol.input.ProjectRepositories;
 import org.sonar.core.permission.GlobalPermissions;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
@@ -41,6 +39,8 @@ import org.sonar.db.qualityprofile.QualityProfileDto;
 import org.sonar.db.source.FileSourceDao;
 import org.sonar.db.source.FileSourceDto;
 import org.sonar.db.source.FileSourceDto.Type;
+import org.sonar.scanner.protocol.input.FileData;
+import org.sonar.scanner.protocol.input.ProjectRepositories;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.qualityprofile.QProfileName;
 import org.sonar.server.tester.ServerTester;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/UsersActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/UsersActionTest.java
index 56616c408d8..85577bd5245 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/batch/UsersActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/batch/UsersActionTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.sonar.api.config.Settings;
 import org.sonar.api.platform.Server;
-import org.sonar.batch.protocol.input.BatchInput.User;
+import org.sonar.scanner.protocol.input.ScannerInput.User;
 import org.sonar.server.es.EsTester;
 import org.sonar.server.exceptions.UnauthorizedException;
 import org.sonar.server.tester.UserSessionRule;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/batch/BatchReportReaderImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/batch/BatchReportReaderImplTest.java
index e168ad4ccab..c265584c865 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/batch/BatchReportReaderImplTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/batch/BatchReportReaderImplTest.java
@@ -26,9 +26,9 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.api.utils.internal.JUnitTempFolder;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReportWriter;
 import org.sonar.core.util.CloseableIterator;
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
 
 import static com.google.common.collect.ImmutableList.of;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -36,33 +36,33 @@ import static org.assertj.guava.api.Assertions.assertThat;
 
 public class BatchReportReaderImplTest {
   private static final int COMPONENT_REF = 1;
-  private static final BatchReport.Changesets CHANGESETS = BatchReport.Changesets.newBuilder().setComponentRef(COMPONENT_REF).build();
-  private static final BatchReport.Measure MEASURE = BatchReport.Measure.newBuilder().build();
-  private static final BatchReport.Component COMPONENT = BatchReport.Component.newBuilder().setRef(COMPONENT_REF).build();
-  private static final BatchReport.Issue ISSUE = BatchReport.Issue.newBuilder().build();
-  private static final BatchReport.Duplication DUPLICATION = BatchReport.Duplication.newBuilder().build();
-  private static final BatchReport.CpdTextBlock DUPLICATION_BLOCK = BatchReport.CpdTextBlock.newBuilder().build();
-  private static final BatchReport.Symbol SYMBOL = BatchReport.Symbol.newBuilder().build();
-  private static final BatchReport.SyntaxHighlighting SYNTAX_HIGHLIGHTING_1 = BatchReport.SyntaxHighlighting.newBuilder().build();
-  private static final BatchReport.SyntaxHighlighting SYNTAX_HIGHLIGHTING_2 = BatchReport.SyntaxHighlighting.newBuilder().build();
-  private static final BatchReport.Coverage COVERAGE_1 = BatchReport.Coverage.newBuilder().build();
-  private static final BatchReport.Coverage COVERAGE_2 = BatchReport.Coverage.newBuilder().build();
-  private static final BatchReport.Test TEST_1 = BatchReport.Test.newBuilder().setName("1").build();
-  private static final BatchReport.Test TEST_2 = BatchReport.Test.newBuilder().setName("2").build();
-  private static final BatchReport.CoverageDetail COVERAGE_DETAIL_1 = BatchReport.CoverageDetail.newBuilder().setTestName("1").build();
-  private static final BatchReport.CoverageDetail COVERAGE_DETAIL_2 = BatchReport.CoverageDetail.newBuilder().setTestName("2").build();
+  private static final ScannerReport.Changesets CHANGESETS = ScannerReport.Changesets.newBuilder().setComponentRef(COMPONENT_REF).build();
+  private static final ScannerReport.Measure MEASURE = ScannerReport.Measure.newBuilder().build();
+  private static final ScannerReport.Component COMPONENT = ScannerReport.Component.newBuilder().setRef(COMPONENT_REF).build();
+  private static final ScannerReport.Issue ISSUE = ScannerReport.Issue.newBuilder().build();
+  private static final ScannerReport.Duplication DUPLICATION = ScannerReport.Duplication.newBuilder().build();
+  private static final ScannerReport.CpdTextBlock DUPLICATION_BLOCK = ScannerReport.CpdTextBlock.newBuilder().build();
+  private static final ScannerReport.Symbol SYMBOL = ScannerReport.Symbol.newBuilder().build();
+  private static final ScannerReport.SyntaxHighlighting SYNTAX_HIGHLIGHTING_1 = ScannerReport.SyntaxHighlighting.newBuilder().build();
+  private static final ScannerReport.SyntaxHighlighting SYNTAX_HIGHLIGHTING_2 = ScannerReport.SyntaxHighlighting.newBuilder().build();
+  private static final ScannerReport.Coverage COVERAGE_1 = ScannerReport.Coverage.newBuilder().build();
+  private static final ScannerReport.Coverage COVERAGE_2 = ScannerReport.Coverage.newBuilder().build();
+  private static final ScannerReport.Test TEST_1 = ScannerReport.Test.newBuilder().setName("1").build();
+  private static final ScannerReport.Test TEST_2 = ScannerReport.Test.newBuilder().setName("2").build();
+  private static final ScannerReport.CoverageDetail COVERAGE_DETAIL_1 = ScannerReport.CoverageDetail.newBuilder().setTestName("1").build();
+  private static final ScannerReport.CoverageDetail COVERAGE_DETAIL_2 = ScannerReport.CoverageDetail.newBuilder().setTestName("2").build();
 
   @Rule
   public JUnitTempFolder tempFolder = new JUnitTempFolder();
 
-  private BatchReportWriter writer;
+  private ScannerReportWriter writer;
   private BatchReportReaderImpl underTest;
 
   @Before
   public void setUp() {
     BatchReportDirectoryHolder holder = new ImmutableBatchReportDirectoryHolder(tempFolder.newDir());
     underTest = new BatchReportReaderImpl(holder);
-    writer = new BatchReportWriter(holder.getDirectory());
+    writer = new ScannerReportWriter(holder.getDirectory());
   }
 
   @Test(expected = IllegalStateException.class)
@@ -72,11 +72,11 @@ public class BatchReportReaderImplTest {
 
   @Test
   public void readMetadata_result_is_cached() {
-    BatchReport.Metadata metadata = BatchReport.Metadata.newBuilder().build();
+    ScannerReport.Metadata metadata = ScannerReport.Metadata.newBuilder().build();
 
     writer.writeMetadata(metadata);
 
-    BatchReport.Metadata res = underTest.readMetadata();
+    ScannerReport.Metadata res = underTest.readMetadata();
     assertThat(res).isEqualTo(metadata);
     assertThat(underTest.readMetadata()).isSameAs(res);
   }
@@ -105,7 +105,7 @@ public class BatchReportReaderImplTest {
   public void verify_readComponentMeasures_returns_measures() {
     writer.writeComponentMeasures(COMPONENT_REF, of(MEASURE));
 
-    try (CloseableIterator<BatchReport.Measure> measures = underTest.readComponentMeasures(COMPONENT_REF)) {
+    try (CloseableIterator<ScannerReport.Measure> measures = underTest.readComponentMeasures(COMPONENT_REF)) {
       assertThat(measures.next()).isEqualTo(MEASURE);
       assertThat(measures.hasNext()).isFalse();
     }
@@ -127,7 +127,7 @@ public class BatchReportReaderImplTest {
   public void verify_readChangesets_returns_changesets() {
     writer.writeComponentChangesets(CHANGESETS);
 
-    BatchReport.Changesets res = underTest.readChangesets(COMPONENT_REF);
+    ScannerReport.Changesets res = underTest.readChangesets(COMPONENT_REF);
     assertThat(res).isEqualTo(CHANGESETS);
   }
 
@@ -166,7 +166,7 @@ public class BatchReportReaderImplTest {
   public void verify_readComponentIssues_returns_Issues() {
     writer.writeComponentIssues(COMPONENT_REF, of(ISSUE));
 
-    try (CloseableIterator<BatchReport.Issue> res = underTest.readComponentIssues(COMPONENT_REF)) {
+    try (CloseableIterator<ScannerReport.Issue> res = underTest.readComponentIssues(COMPONENT_REF)) {
       assertThat(res.next()).isEqualTo(ISSUE);
       assertThat(res.hasNext()).isFalse();
     }
@@ -188,7 +188,7 @@ public class BatchReportReaderImplTest {
   public void verify_readComponentDuplications_returns_Issues() {
     writer.writeComponentDuplications(COMPONENT_REF, of(DUPLICATION));
 
-    try (CloseableIterator<BatchReport.Duplication> res = underTest.readComponentDuplications(COMPONENT_REF)) {
+    try (CloseableIterator<ScannerReport.Duplication> res = underTest.readComponentDuplications(COMPONENT_REF)) {
       assertThat(res.next()).isEqualTo(DUPLICATION);
       assertThat(res.hasNext()).isFalse();
     }
@@ -210,7 +210,7 @@ public class BatchReportReaderImplTest {
   public void verify_readComponentDuplicationBlocks_returns_Issues() {
     writer.writeCpdTextBlocks(COMPONENT_REF, of(DUPLICATION_BLOCK));
 
-    try (CloseableIterator<BatchReport.CpdTextBlock> res = underTest.readCpdTextBlocks(COMPONENT_REF)) {
+    try (CloseableIterator<ScannerReport.CpdTextBlock> res = underTest.readCpdTextBlocks(COMPONENT_REF)) {
       assertThat(res.next()).isEqualTo(DUPLICATION_BLOCK);
       assertThat(res.hasNext()).isFalse();
     }
@@ -232,7 +232,7 @@ public class BatchReportReaderImplTest {
   public void verify_readComponentSymbols_returns_Issues() {
     writer.writeComponentSymbols(COMPONENT_REF, of(SYMBOL));
 
-    try (CloseableIterator<BatchReport.Symbol> res = underTest.readComponentSymbols(COMPONENT_REF)) {
+    try (CloseableIterator<ScannerReport.Symbol> res = underTest.readComponentSymbols(COMPONENT_REF)) {
       assertThat(res.next()).isEqualTo(SYMBOL);
       assertThat(res.hasNext()).isFalse();
     }
@@ -254,7 +254,7 @@ public class BatchReportReaderImplTest {
   public void verify_readComponentSyntaxHighlighting() {
     writer.writeComponentSyntaxHighlighting(COMPONENT_REF, of(SYNTAX_HIGHLIGHTING_1, SYNTAX_HIGHLIGHTING_2));
 
-    CloseableIterator<BatchReport.SyntaxHighlighting> res = underTest.readComponentSyntaxHighlighting(COMPONENT_REF);
+    CloseableIterator<ScannerReport.SyntaxHighlighting> res = underTest.readComponentSyntaxHighlighting(COMPONENT_REF);
     assertThat(res).containsExactly(SYNTAX_HIGHLIGHTING_1, SYNTAX_HIGHLIGHTING_2);
     res.close();
   }
@@ -268,7 +268,7 @@ public class BatchReportReaderImplTest {
   public void verify_readComponentCoverage() {
     writer.writeComponentCoverage(COMPONENT_REF, of(COVERAGE_1, COVERAGE_2));
 
-    CloseableIterator<BatchReport.Coverage> res = underTest.readComponentCoverage(COMPONENT_REF);
+    CloseableIterator<ScannerReport.Coverage> res = underTest.readComponentCoverage(COMPONENT_REF);
     assertThat(res).containsExactly(COVERAGE_1, COVERAGE_2);
     res.close();
   }
@@ -297,7 +297,7 @@ public class BatchReportReaderImplTest {
   public void verify_readTests() {
     writer.writeTests(COMPONENT_REF, of(TEST_1, TEST_2));
 
-    CloseableIterator<BatchReport.Test> res = underTest.readTests(COMPONENT_REF);
+    CloseableIterator<ScannerReport.Test> res = underTest.readTests(COMPONENT_REF);
     assertThat(res).containsExactly(TEST_1, TEST_2);
     res.close();
   }
@@ -311,7 +311,7 @@ public class BatchReportReaderImplTest {
   public void verify_readCoverageDetails() {
     writer.writeCoverageDetails(COMPONENT_REF, of(COVERAGE_DETAIL_1, COVERAGE_DETAIL_2));
 
-    CloseableIterator<BatchReport.CoverageDetail> res = underTest.readCoverageDetails(COMPONENT_REF);
+    CloseableIterator<ScannerReport.CoverageDetail> res = underTest.readCoverageDetails(COMPONENT_REF);
     assertThat(res).containsExactly(COVERAGE_DETAIL_1, COVERAGE_DETAIL_2);
     res.close();
   }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/batch/BatchReportReaderRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/batch/BatchReportReaderRule.java
index 528f0d9165e..323e7a85230 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/batch/BatchReportReaderRule.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/batch/BatchReportReaderRule.java
@@ -31,25 +31,25 @@ import javax.annotation.Nullable;
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.util.CloseableIterator;
+import org.sonar.scanner.protocol.output.ScannerReport;
 
 public class BatchReportReaderRule implements TestRule, BatchReportReader {
-  private BatchReport.Metadata metadata;
+  private ScannerReport.Metadata metadata;
   private List<String> scannerLogs;
-  private List<BatchReport.ActiveRule> activeRules = new ArrayList<>();
-  private Map<Integer, List<BatchReport.Measure>> measures = new HashMap<>();
-  private Map<Integer, BatchReport.Changesets> changesets = new HashMap<>();
-  private Map<Integer, BatchReport.Component> components = new HashMap<>();
-  private Map<Integer, List<BatchReport.Issue>> issues = new HashMap<>();
-  private Map<Integer, List<BatchReport.Duplication>> duplications = new HashMap<>();
-  private Map<Integer, List<BatchReport.CpdTextBlock>> duplicationBlocks = new HashMap<>();
-  private Map<Integer, List<BatchReport.Symbol>> symbols = new HashMap<>();
-  private Map<Integer, List<BatchReport.SyntaxHighlighting>> syntaxHighlightings = new HashMap<>();
-  private Map<Integer, List<BatchReport.Coverage>> coverages = new HashMap<>();
+  private List<ScannerReport.ActiveRule> activeRules = new ArrayList<>();
+  private Map<Integer, List<ScannerReport.Measure>> measures = new HashMap<>();
+  private Map<Integer, ScannerReport.Changesets> changesets = new HashMap<>();
+  private Map<Integer, ScannerReport.Component> components = new HashMap<>();
+  private Map<Integer, List<ScannerReport.Issue>> issues = new HashMap<>();
+  private Map<Integer, List<ScannerReport.Duplication>> duplications = new HashMap<>();
+  private Map<Integer, List<ScannerReport.CpdTextBlock>> duplicationBlocks = new HashMap<>();
+  private Map<Integer, List<ScannerReport.Symbol>> symbols = new HashMap<>();
+  private Map<Integer, List<ScannerReport.SyntaxHighlighting>> syntaxHighlightings = new HashMap<>();
+  private Map<Integer, List<ScannerReport.Coverage>> coverages = new HashMap<>();
   private Map<Integer, List<String>> fileSources = new HashMap<>();
-  private Map<Integer, List<BatchReport.Test>> tests = new HashMap<>();
-  private Map<Integer, List<BatchReport.CoverageDetail>> coverageDetails = new HashMap<>();
+  private Map<Integer, List<ScannerReport.Test>> tests = new HashMap<>();
+  private Map<Integer, List<ScannerReport.CoverageDetail>> coverageDetails = new HashMap<>();
 
   @Override
   public Statement apply(final Statement statement, Description description) {
@@ -83,14 +83,14 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader {
   }
 
   @Override
-  public BatchReport.Metadata readMetadata() {
+  public ScannerReport.Metadata readMetadata() {
     if (metadata == null) {
       throw new IllegalStateException("Metadata is missing");
     }
     return metadata;
   }
 
-  public BatchReportReaderRule setMetadata(BatchReport.Metadata metadata) {
+  public BatchReportReaderRule setMetadata(ScannerReport.Metadata metadata) {
     this.metadata = metadata;
     return this;
   }
@@ -109,85 +109,85 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader {
   }
 
   @Override
-  public CloseableIterator<BatchReport.ActiveRule> readActiveRules() {
+  public CloseableIterator<ScannerReport.ActiveRule> readActiveRules() {
     if (activeRules == null) {
       throw new IllegalStateException("Active rules are not set");
     }
     return CloseableIterator.from(activeRules.iterator());
   }
 
-  public BatchReportReaderRule putActiveRules(List<BatchReport.ActiveRule> activeRules) {
+  public BatchReportReaderRule putActiveRules(List<ScannerReport.ActiveRule> activeRules) {
     this.activeRules = activeRules;
     return this;
   }
 
   @Override
-  public CloseableIterator<BatchReport.Measure> readComponentMeasures(int componentRef) {
-    List<BatchReport.Measure> res = this.measures.get(componentRef);
+  public CloseableIterator<ScannerReport.Measure> readComponentMeasures(int componentRef) {
+    List<ScannerReport.Measure> res = this.measures.get(componentRef);
     if (res == null) {
       return CloseableIterator.emptyCloseableIterator();
     }
     return CloseableIterator.from(res.iterator());
   }
 
-  public BatchReportReaderRule putMeasures(int componentRef, List<BatchReport.Measure> measures) {
+  public BatchReportReaderRule putMeasures(int componentRef, List<ScannerReport.Measure> measures) {
     this.measures.put(componentRef, measures);
     return this;
   }
 
   @Override
   @CheckForNull
-  public BatchReport.Changesets readChangesets(int componentRef) {
+  public ScannerReport.Changesets readChangesets(int componentRef) {
     return changesets.get(componentRef);
   }
 
-  public BatchReportReaderRule putChangesets(BatchReport.Changesets changesets) {
+  public BatchReportReaderRule putChangesets(ScannerReport.Changesets changesets) {
     this.changesets.put(changesets.getComponentRef(), changesets);
     return this;
   }
 
   @Override
-  public BatchReport.Component readComponent(int componentRef) {
+  public ScannerReport.Component readComponent(int componentRef) {
     return components.get(componentRef);
   }
 
-  public BatchReportReaderRule putComponent(BatchReport.Component component) {
+  public BatchReportReaderRule putComponent(ScannerReport.Component component) {
     this.components.put(component.getRef(), component);
     return this;
   }
 
   @Override
-  public CloseableIterator<BatchReport.Issue> readComponentIssues(int componentRef) {
+  public CloseableIterator<ScannerReport.Issue> readComponentIssues(int componentRef) {
     return closeableIterator(issues.get(componentRef));
   }
 
-  public BatchReportReaderRule putIssues(int componentRef, List<BatchReport.Issue> issue) {
+  public BatchReportReaderRule putIssues(int componentRef, List<ScannerReport.Issue> issue) {
     this.issues.put(componentRef, issue);
     return this;
   }
 
   @Override
-  public CloseableIterator<BatchReport.Duplication> readComponentDuplications(int componentRef) {
+  public CloseableIterator<ScannerReport.Duplication> readComponentDuplications(int componentRef) {
     return closeableIterator(this.duplications.get(componentRef));
   }
 
-  public BatchReportReaderRule putDuplications(int componentRef, BatchReport.Duplication... duplications) {
+  public BatchReportReaderRule putDuplications(int componentRef, ScannerReport.Duplication... duplications) {
     this.duplications.put(componentRef, Arrays.asList(duplications));
     return this;
   }
 
   @Override
-  public CloseableIterator<BatchReport.CpdTextBlock> readCpdTextBlocks(int componentRef) {
+  public CloseableIterator<ScannerReport.CpdTextBlock> readCpdTextBlocks(int componentRef) {
     return closeableIterator(this.duplicationBlocks.get(componentRef));
   }
 
-  public BatchReportReaderRule putDuplicationBlocks(int componentRef, List<BatchReport.CpdTextBlock> duplicationBlocks) {
+  public BatchReportReaderRule putDuplicationBlocks(int componentRef, List<ScannerReport.CpdTextBlock> duplicationBlocks) {
     this.duplicationBlocks.put(componentRef, duplicationBlocks);
     return this;
   }
 
   @Override
-  public CloseableIterator<BatchReport.Symbol> readComponentSymbols(int componentRef) {
+  public CloseableIterator<ScannerReport.Symbol> readComponentSymbols(int componentRef) {
     return closeableIterator(this.symbols.get(componentRef));
   }
 
@@ -195,14 +195,14 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader {
     return list == null ? CloseableIterator.<T>emptyCloseableIterator() : CloseableIterator.from(list.iterator());
   }
 
-  public BatchReportReaderRule putSymbols(int componentRef, List<BatchReport.Symbol> symbols) {
+  public BatchReportReaderRule putSymbols(int componentRef, List<ScannerReport.Symbol> symbols) {
     this.symbols.put(componentRef, symbols);
     return this;
   }
 
   @Override
-  public CloseableIterator<BatchReport.SyntaxHighlighting> readComponentSyntaxHighlighting(int fileRef) {
-    List<BatchReport.SyntaxHighlighting> res = this.syntaxHighlightings.get(fileRef);
+  public CloseableIterator<ScannerReport.SyntaxHighlighting> readComponentSyntaxHighlighting(int fileRef) {
+    List<ScannerReport.SyntaxHighlighting> res = this.syntaxHighlightings.get(fileRef);
     if (res == null) {
       return CloseableIterator.emptyCloseableIterator();
     }
@@ -210,14 +210,14 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader {
     return CloseableIterator.from(res.iterator());
   }
 
-  public BatchReportReaderRule putSyntaxHighlighting(int fileRef, List<BatchReport.SyntaxHighlighting> syntaxHighlightings) {
+  public BatchReportReaderRule putSyntaxHighlighting(int fileRef, List<ScannerReport.SyntaxHighlighting> syntaxHighlightings) {
     this.syntaxHighlightings.put(fileRef, syntaxHighlightings);
     return this;
   }
 
   @Override
-  public CloseableIterator<BatchReport.Coverage> readComponentCoverage(int fileRef) {
-    List<BatchReport.Coverage> res = this.coverages.get(fileRef);
+  public CloseableIterator<ScannerReport.Coverage> readComponentCoverage(int fileRef) {
+    List<ScannerReport.Coverage> res = this.coverages.get(fileRef);
     if (res == null) {
       return CloseableIterator.emptyCloseableIterator();
     }
@@ -225,7 +225,7 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader {
     return CloseableIterator.from(res.iterator());
   }
 
-  public BatchReportReaderRule putCoverage(int fileRef, List<BatchReport.Coverage> coverages) {
+  public BatchReportReaderRule putCoverage(int fileRef, List<ScannerReport.Coverage> coverages) {
     this.coverages.put(fileRef, coverages);
     return this;
   }
@@ -252,8 +252,8 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader {
   }
 
   @Override
-  public CloseableIterator<BatchReport.Test> readTests(int testFileRef) {
-    List<BatchReport.Test> res = this.tests.get(testFileRef);
+  public CloseableIterator<ScannerReport.Test> readTests(int testFileRef) {
+    List<ScannerReport.Test> res = this.tests.get(testFileRef);
     if (res == null) {
       return CloseableIterator.emptyCloseableIterator();
     }
@@ -261,14 +261,14 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader {
     return CloseableIterator.from(res.iterator());
   }
 
-  public BatchReportReaderRule putTests(int testFileRed, List<BatchReport.Test> tests) {
+  public BatchReportReaderRule putTests(int testFileRed, List<ScannerReport.Test> tests) {
     this.tests.put(testFileRed, tests);
     return this;
   }
 
   @Override
-  public CloseableIterator<BatchReport.CoverageDetail> readCoverageDetails(int testFileRef) {
-    List<BatchReport.CoverageDetail> res = this.coverageDetails.get(testFileRef);
+  public CloseableIterator<ScannerReport.CoverageDetail> readCoverageDetails(int testFileRef) {
+    List<ScannerReport.CoverageDetail> res = this.coverageDetails.get(testFileRef);
     if (res == null) {
       return CloseableIterator.emptyCloseableIterator();
     }
@@ -276,7 +276,7 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader {
     return CloseableIterator.from(res.iterator());
   }
 
-  public BatchReportReaderRule putCoverageDetails(int testFileRef, List<BatchReport.CoverageDetail> coverageDetails) {
+  public BatchReportReaderRule putCoverageDetails(int testFileRef, List<ScannerReport.CoverageDetail> coverageDetails) {
     this.coverageDetails.put(testFileRef, coverageDetails);
     return this;
   }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentImplTest.java
index 541dceafb98..1427bfb3c9b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentImplTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentImplTest.java
@@ -22,7 +22,7 @@ package org.sonar.server.computation.component;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.sonar.batch.protocol.output.BatchReport;
+import org.sonar.scanner.protocol.output.ScannerReport;
 
 import static com.google.common.base.Predicates.equalTo;
 import static com.google.common.base.Predicates.not;
@@ -30,8 +30,8 @@ import static com.google.common.collect.FluentIterable.from;
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
-import static org.sonar.batch.protocol.Constants.ComponentType;
-import static org.sonar.batch.protocol.Constants.ComponentType.FILE;
+import static org.sonar.scanner.protocol.Constants.ComponentType;
+import static org.sonar.scanner.protocol.Constants.ComponentType.FILE;
 import static org.sonar.server.computation.component.ComponentImpl.builder;
 
 public class ComponentImplTest {
@@ -44,7 +44,7 @@ public class ComponentImplTest {
 
   @Test
   public void verify_key_and_uuid() throws Exception {
-    ComponentImpl component = builder(BatchReport.Component.newBuilder().build()).setKey(KEY).setUuid(UUID).build();
+    ComponentImpl component = builder(ScannerReport.Component.newBuilder().build()).setKey(KEY).setUuid(UUID).build();
 
     assertThat(component.getKey()).isEqualTo(KEY);
     assertThat(component.getUuid()).isEqualTo(UUID);
@@ -61,48 +61,48 @@ public class ComponentImplTest {
   public void set_key_throws_NPE_if_component_arg_is_Null() {
     thrown.expect(NullPointerException.class);
 
-    builder(BatchReport.Component.newBuilder().build()).setUuid(null);
+    builder(ScannerReport.Component.newBuilder().build()).setUuid(null);
   }
 
   @Test
   public void set_uuid_throws_NPE_if_component_arg_is_Null() {
     thrown.expect(NullPointerException.class);
 
-    builder(BatchReport.Component.newBuilder().build()).setKey(null);
+    builder(ScannerReport.Component.newBuilder().build()).setKey(null);
   }
 
   @Test
   public void build_without_key_throws_NPE_if_component_arg_is_Null() {
     thrown.expect(NullPointerException.class);
 
-    builder(BatchReport.Component.newBuilder().build()).setUuid("ABCD").build();
+    builder(ScannerReport.Component.newBuilder().build()).setUuid("ABCD").build();
   }
 
   @Test
   public void build_without_uuid_throws_NPE_if_component_arg_is_Null() {
     thrown.expect(NullPointerException.class);
 
-    builder(BatchReport.Component.newBuilder().build()).setKey(KEY).build();
+    builder(ScannerReport.Component.newBuilder().build()).setKey(KEY).build();
   }
 
   @Test
   public void get_name_from_batch_component() {
     String name = "project";
-    ComponentImpl component = buildSimpleComponent(BatchReport.Component.newBuilder().setName(name).build());
+    ComponentImpl component = buildSimpleComponent(ScannerReport.Component.newBuilder().setName(name).build());
     assertThat(component.getName()).isEqualTo(name);
   }
 
   @Test
   public void get_version_from_batch_component() {
     String version = "1.0";
-    ComponentImpl component = buildSimpleComponent(BatchReport.Component.newBuilder().setVersion(version).build());
+    ComponentImpl component = buildSimpleComponent(ScannerReport.Component.newBuilder().setVersion(version).build());
     assertThat(component.getReportAttributes().getVersion()).isEqualTo(version);
   }
 
   @Test
   public void getFileAttributes_throws_ISE_if_BatchComponent_does_not_have_type_FILE() {
     for (ComponentType componentType : from(asList(ComponentType.values())).filter(not(equalTo(FILE)))) {
-      ComponentImpl component = buildSimpleComponent(BatchReport.Component.newBuilder().setType(componentType).build());
+      ComponentImpl component = buildSimpleComponent(ScannerReport.Component.newBuilder().setType(componentType).build());
       try {
         component.getFileAttributes();
         fail("A IllegalStateException should have been raised");
@@ -114,7 +114,7 @@ public class ComponentImplTest {
 
   @Test
   public void isUnitTest_returns_true_if_IsTest_is_set_in_BatchComponent() {
-    ComponentImpl component = buildSimpleComponent(BatchReport.Component.newBuilder().setType(FILE).setIsTest(true).build());
+    ComponentImpl component = buildSimpleComponent(ScannerReport.Component.newBuilder().setType(FILE).setIsTest(true).build());
 
     assertThat(component.getFileAttributes().isUnitTest()).isTrue();
   }
@@ -122,20 +122,20 @@ public class ComponentImplTest {
   @Test
   public void isUnitTest_returns_value_of_language_of_BatchComponent() {
     String languageKey = "some language key";
-    ComponentImpl component = buildSimpleComponent(BatchReport.Component.newBuilder().setType(FILE).setLanguage(languageKey).build());
+    ComponentImpl component = buildSimpleComponent(ScannerReport.Component.newBuilder().setType(FILE).setLanguage(languageKey).build());
 
     assertThat(component.getFileAttributes().getLanguageKey()).isEqualTo(languageKey);
   }
 
   @Test
   public void build_with_child() throws Exception {
-    buildSimpleComponent(BatchReport.Component.newBuilder().build());
+    buildSimpleComponent(ScannerReport.Component.newBuilder().build());
 
-    ComponentImpl child = builder(BatchReport.Component.newBuilder().setType(FILE).build())
+    ComponentImpl child = builder(ScannerReport.Component.newBuilder().setType(FILE).build())
       .setKey("CHILD_KEY")
       .setUuid("CHILD_UUID")
       .build();
-    ComponentImpl componentImpl = builder(BatchReport.Component.newBuilder().build())
+    ComponentImpl componentImpl = builder(ScannerReport.Component.newBuilder().build())
       .setKey(KEY)
       .setUuid(UUID)
       .addChildren(child)
@@ -155,13 +155,13 @@ public class ComponentImplTest {
     }
   }
 
-  private static ComponentImpl buildSimpleComponent(BatchReport.Component reportComponent) {
+  private static ComponentImpl buildSimpleComponent(ScannerReport.Component reportComponent) {
     return builder(reportComponent).setKey(KEY).setUuid(UUID).build();
   }
 
   @Test
   public void equals_compares_on_uuid_only() {
-    ComponentImpl.Builder builder = builder(BatchReport.Component.newBuilder().build()).setUuid(UUID);
+    ComponentImpl.Builder builder = builder(ScannerReport.Component.newBuilder().build()).setUuid(UUID);
 
     assertThat(builder.setKey("1").build()).isEqualTo(builder.setKey("1").build());
     assertThat(builder.setKey("1").build()).isEqualTo(builder.setKey("2").build());
@@ -169,7 +169,7 @@ public class ComponentImplTest {
 
   @Test
   public void hashCode_is_hashcode_of_uuid() {
-    ComponentImpl.Builder builder = builder(BatchReport.Component.newBuilder().build()).setUuid(UUID);
+    ComponentImpl.Builder builder = builder(ScannerReport.Component.newBuilder().build()).setUuid(UUID);
 
     assertThat(builder.setKey("1").build().hashCode()).isEqualTo(builder.setKey("1").build().hashCode());
     assertThat(builder.setKey("1").build().hashCode()).isEqualTo(builder.setKey("2").build().hashCode());
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IntegrateIssuesVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IntegrateIssuesVisitorTest.java
index eb02da08aa7..83b89c79d96 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IntegrateIssuesVisitorTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IntegrateIssuesVisitorTest.java
@@ -30,8 +30,6 @@ import org.sonar.api.issue.Issue;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rule.Severity;
 import org.sonar.api.utils.System2;
-import org.sonar.batch.protocol.Constants;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.issue.DefaultIssue;
 import org.sonar.core.issue.tracking.Tracker;
 import org.sonar.db.DbTester;
@@ -40,6 +38,8 @@ import org.sonar.db.component.ComponentTesting;
 import org.sonar.db.issue.IssueDto;
 import org.sonar.db.rule.RuleDto;
 import org.sonar.db.rule.RuleTesting;
+import org.sonar.scanner.protocol.Constants;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.batch.BatchReportReaderRule;
 import org.sonar.server.computation.batch.TreeRootHolderRule;
 import org.sonar.server.computation.component.Component;
@@ -126,7 +126,7 @@ public class IntegrateIssuesVisitorTest {
   public void process_new_issue() throws Exception {
     componentsWithUnprocessedIssues.setUuids(Collections.<String>emptySet());
 
-    BatchReport.Issue reportIssue = BatchReport.Issue.newBuilder()
+    ScannerReport.Issue reportIssue = ScannerReport.Issue.newBuilder()
       .setMsg("the message")
       .setRuleRepository("xoo")
       .setRuleKey("S001")
@@ -156,7 +156,7 @@ public class IntegrateIssuesVisitorTest {
     addBaseIssue(ruleKey);
 
     // Issue from report has severity blocker
-    BatchReport.Issue reportIssue = BatchReport.Issue.newBuilder()
+    ScannerReport.Issue reportIssue = ScannerReport.Issue.newBuilder()
       .setMsg("the message")
       .setRuleRepository(ruleKey.repository())
       .setRuleKey(ruleKey.rule())
@@ -205,7 +205,7 @@ public class IntegrateIssuesVisitorTest {
   @Test
   public void execute_issue_visitors() throws Exception {
     componentsWithUnprocessedIssues.setUuids(Collections.<String>emptySet());
-    BatchReport.Issue reportIssue = BatchReport.Issue.newBuilder()
+    ScannerReport.Issue reportIssue = ScannerReport.Issue.newBuilder()
       .setMsg("the message")
       .setRuleRepository("xoo")
       .setRuleKey("S001")
@@ -244,7 +244,7 @@ public class IntegrateIssuesVisitorTest {
   public void feed_component_issues_repo() throws Exception {
     componentsWithUnprocessedIssues.setUuids(Collections.<String>emptySet());
 
-    BatchReport.Issue reportIssue = BatchReport.Issue.newBuilder()
+    ScannerReport.Issue reportIssue = ScannerReport.Issue.newBuilder()
       .setMsg("the message")
       .setRuleRepository("xoo")
       .setRuleKey("S001")
@@ -262,7 +262,7 @@ public class IntegrateIssuesVisitorTest {
   public void empty_component_issues_repo_when_no_issue() throws Exception {
     componentsWithUnprocessedIssues.setUuids(Collections.<String>emptySet());
 
-    BatchReport.Issue reportIssue = BatchReport.Issue.newBuilder()
+    ScannerReport.Issue reportIssue = ScannerReport.Issue.newBuilder()
       .setMsg("the message")
       .setRuleRepository("xoo")
       .setRuleKey("S001")
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/TrackerRawInputFactoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/TrackerRawInputFactoryTest.java
index c2d2baab706..fc43b2639cf 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/TrackerRawInputFactoryTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/TrackerRawInputFactoryTest.java
@@ -26,10 +26,10 @@ import org.junit.Test;
 import org.sonar.api.issue.Issue;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rule.Severity;
-import org.sonar.batch.protocol.Constants;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.issue.DefaultIssue;
 import org.sonar.core.issue.tracking.Input;
+import org.sonar.scanner.protocol.Constants;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.batch.BatchReportReaderRule;
 import org.sonar.server.computation.batch.TreeRootHolderRule;
 import org.sonar.server.computation.component.Component;
@@ -87,7 +87,7 @@ public class TrackerRawInputFactoryTest {
   @Test
   public void load_issues() throws Exception {
     fileSourceRepository.addLines(FILE_REF, "line 1;", "line 2;");
-    BatchReport.Issue reportIssue = BatchReport.Issue.newBuilder()
+    ScannerReport.Issue reportIssue = ScannerReport.Issue.newBuilder()
       .setLine(2)
       .setMsg("the message")
       .setRuleRepository("java")
@@ -119,7 +119,7 @@ public class TrackerRawInputFactoryTest {
   @Test
   public void ignore_report_issues_on_common_rules() throws Exception {
     fileSourceRepository.addLines(FILE_REF, "line 1;", "line 2;");
-    BatchReport.Issue reportIssue = BatchReport.Issue.newBuilder()
+    ScannerReport.Issue reportIssue = ScannerReport.Issue.newBuilder()
       .setMsg("the message")
       .setRuleRepository(CommonRuleKeys.commonRepositoryForLang("java"))
       .setRuleKey("S001")
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/BatchMeasureToMeasureTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/measure/BatchMeasureToMeasureTest.java
index d8bd68eda8e..ddc18d8c558 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/BatchMeasureToMeasureTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/measure/BatchMeasureToMeasureTest.java
@@ -24,7 +24,7 @@ import com.tngtech.java.junit.dataprovider.DataProvider;
 import com.tngtech.java.junit.dataprovider.DataProviderRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.sonar.batch.protocol.output.BatchReport;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.metric.Metric;
 import org.sonar.server.computation.metric.MetricImpl;
 
@@ -41,7 +41,7 @@ public class BatchMeasureToMeasureTest {
   private static final Metric SOME_LEVEL_METRIC = new MetricImpl(42, "level", "name", Metric.MetricType.LEVEL);
 
   private static final String SOME_DATA = "some_data man!";
-  private static final BatchReport.Measure EMPTY_BATCH_MEASURE = BatchReport.Measure.newBuilder().build();
+  private static final ScannerReport.Measure EMPTY_BATCH_MEASURE = ScannerReport.Measure.newBuilder().build();
 
   private BatchMeasureToMeasure underTest = new BatchMeasureToMeasure();
 
@@ -70,7 +70,7 @@ public class BatchMeasureToMeasureTest {
 
   @Test
   public void toMeasure_returns_no_value_if_dto_has_invalid_string_value_for_LEVEL_Metric() {
-    Optional<Measure> measure = underTest.toMeasure(BatchReport.Measure.newBuilder().setStringValue("trololo").build(), SOME_LEVEL_METRIC);
+    Optional<Measure> measure = underTest.toMeasure(ScannerReport.Measure.newBuilder().setStringValue("trololo").build(), SOME_LEVEL_METRIC);
 
     assertThat(measure).isPresent();
     assertThat(measure.get().getValueType()).isEqualTo(Measure.ValueType.NO_VALUE);
@@ -78,7 +78,7 @@ public class BatchMeasureToMeasureTest {
 
   @Test
   public void toMeasure_returns_no_value_if_dto_has_value_in_wrong_case_for_LEVEL_Metric() {
-    Optional<Measure> measure = underTest.toMeasure(BatchReport.Measure.newBuilder().setStringValue("waRn").build(), SOME_LEVEL_METRIC);
+    Optional<Measure> measure = underTest.toMeasure(ScannerReport.Measure.newBuilder().setStringValue("waRn").build(), SOME_LEVEL_METRIC);
 
     assertThat(measure).isPresent();
     assertThat(measure.get().getValueType()).isEqualTo(Measure.ValueType.NO_VALUE);
@@ -92,7 +92,7 @@ public class BatchMeasureToMeasureTest {
   }
 
   private void verify_toMeasure_returns_value_for_LEVEL_Metric(Measure.Level expectedQualityGateStatus) {
-    Optional<Measure> measure = underTest.toMeasure(BatchReport.Measure.newBuilder().setStringValue(expectedQualityGateStatus.name()).build(), SOME_LEVEL_METRIC);
+    Optional<Measure> measure = underTest.toMeasure(ScannerReport.Measure.newBuilder().setStringValue(expectedQualityGateStatus.name()).build(), SOME_LEVEL_METRIC);
     assertThat(measure).isPresent();
     assertThat(measure.get().getValueType()).isEqualTo(Measure.ValueType.LEVEL);
     assertThat(measure.get().getLevelValue()).isEqualTo(expectedQualityGateStatus);
@@ -100,7 +100,7 @@ public class BatchMeasureToMeasureTest {
 
   @Test
   public void toMeasure_for_LEVEL_Metric_maps_QualityGateStatus() {
-    BatchReport.Measure batchMeasure = BatchReport.Measure.newBuilder()
+    ScannerReport.Measure batchMeasure = ScannerReport.Measure.newBuilder()
       .setStringValue(Measure.Level.OK.name())
       .build();
 
@@ -119,7 +119,7 @@ public class BatchMeasureToMeasureTest {
   }
 
   private void verify_toMeasure_for_LEVEL_Metric_parses_level_from_data(Measure.Level expectedLevel) {
-    BatchReport.Measure batchMeasure = BatchReport.Measure.newBuilder()
+    ScannerReport.Measure batchMeasure = ScannerReport.Measure.newBuilder()
       .setStringValue(expectedLevel.name())
       .build();
 
@@ -139,7 +139,7 @@ public class BatchMeasureToMeasureTest {
 
   @Test
   public void toMeasure_maps_data_and_alert_properties_in_dto_for_Int_Metric() {
-    BatchReport.Measure batchMeasure = BatchReport.Measure.newBuilder()
+    ScannerReport.Measure batchMeasure = ScannerReport.Measure.newBuilder()
       .setIntValue(10)
       .setStringValue(SOME_DATA)
       .build();
@@ -162,7 +162,7 @@ public class BatchMeasureToMeasureTest {
 
   @Test
   public void toMeasure_returns_long_part_of_value_in_dto_for_Long_Metric() {
-    Optional<Measure> measure = underTest.toMeasure(BatchReport.Measure.newBuilder().setLongValue(15l).build(), SOME_LONG_METRIC);
+    Optional<Measure> measure = underTest.toMeasure(ScannerReport.Measure.newBuilder().setLongValue(15l).build(), SOME_LONG_METRIC);
 
     assertThat(measure.isPresent()).isTrue();
     assertThat(measure.get().getValueType()).isEqualTo(Measure.ValueType.LONG);
@@ -171,7 +171,7 @@ public class BatchMeasureToMeasureTest {
 
   @Test
   public void toMeasure_maps_data_and_alert_properties_in_dto_for_Long_Metric() {
-    BatchReport.Measure batchMeasure = BatchReport.Measure.newBuilder()
+    ScannerReport.Measure batchMeasure = ScannerReport.Measure.newBuilder()
       .setLongValue(10l)
       .setStringValue(SOME_DATA)
       .build();
@@ -194,7 +194,7 @@ public class BatchMeasureToMeasureTest {
 
   @Test
   public void toMeasure_maps_data_and_alert_properties_in_dto_for_Double_Metric() {
-    BatchReport.Measure batchMeasure = BatchReport.Measure.newBuilder()
+    ScannerReport.Measure batchMeasure = ScannerReport.Measure.newBuilder()
       .setDoubleValue(10.6395d)
       .setStringValue(SOME_DATA)
       .build();
@@ -222,7 +222,7 @@ public class BatchMeasureToMeasureTest {
   }
 
   private void verify_toMeasure_returns_false_value_if_dto_has_invalid_value_for_Boolean_metric(boolean expected) {
-    Optional<Measure> measure = underTest.toMeasure(BatchReport.Measure.newBuilder().setBooleanValue(expected).build(), SOME_BOOLEAN_METRIC);
+    Optional<Measure> measure = underTest.toMeasure(ScannerReport.Measure.newBuilder().setBooleanValue(expected).build(), SOME_BOOLEAN_METRIC);
 
     assertThat(measure.isPresent()).isTrue();
     assertThat(measure.get().getValueType()).isEqualTo(Measure.ValueType.BOOLEAN);
@@ -231,7 +231,7 @@ public class BatchMeasureToMeasureTest {
 
   @Test
   public void toMeasure_maps_data_and_alert_properties_in_dto_for_Boolean_metric() {
-    BatchReport.Measure batchMeasure = BatchReport.Measure.newBuilder()
+    ScannerReport.Measure batchMeasure = ScannerReport.Measure.newBuilder()
       .setBooleanValue(true).setStringValue(SOME_DATA).build();
 
     Optional<Measure> measure = underTest.toMeasure(batchMeasure, SOME_BOOLEAN_METRIC);
@@ -252,7 +252,7 @@ public class BatchMeasureToMeasureTest {
 
   @Test
   public void toMeasure_maps_alert_properties_in_dto_for_String_Metric() {
-    BatchReport.Measure batchMeasure = BatchReport.Measure.newBuilder()
+    ScannerReport.Measure batchMeasure = ScannerReport.Measure.newBuilder()
       .setStringValue(SOME_DATA)
       .build();
 
@@ -267,12 +267,12 @@ public class BatchMeasureToMeasureTest {
   @DataProvider
   public static Object[][] all_types_batch_measure_builders() {
     return new Object[][] {
-      {BatchReport.Measure.newBuilder().setBooleanValue(true), SOME_BOOLEAN_METRIC},
-      {BatchReport.Measure.newBuilder().setIntValue(1), SOME_INT_METRIC},
-      {BatchReport.Measure.newBuilder().setLongValue(1), SOME_LONG_METRIC},
-      {BatchReport.Measure.newBuilder().setDoubleValue(1), SOME_DOUBLE_METRIC},
-      {BatchReport.Measure.newBuilder().setStringValue("1"), SOME_STRING_METRIC},
-      {BatchReport.Measure.newBuilder().setStringValue(Measure.Level.OK.name()), SOME_LEVEL_METRIC}
+      {ScannerReport.Measure.newBuilder().setBooleanValue(true), SOME_BOOLEAN_METRIC},
+      {ScannerReport.Measure.newBuilder().setIntValue(1), SOME_INT_METRIC},
+      {ScannerReport.Measure.newBuilder().setLongValue(1), SOME_LONG_METRIC},
+      {ScannerReport.Measure.newBuilder().setDoubleValue(1), SOME_DOUBLE_METRIC},
+      {ScannerReport.Measure.newBuilder().setStringValue("1"), SOME_STRING_METRIC},
+      {ScannerReport.Measure.newBuilder().setStringValue(Measure.Level.OK.name()), SOME_LEVEL_METRIC}
     };
   }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java
index 5db038fccc2..060cee163be 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java
@@ -37,12 +37,12 @@ import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.utils.System2;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.DbTester;
 import org.sonar.db.measure.MeasureDto;
 import org.sonar.db.rule.RuleDto;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.batch.BatchReportReaderRule;
 import org.sonar.server.computation.component.Component;
@@ -354,7 +354,7 @@ public class MeasureRepositoryImplTest {
     when(reportMetricValidator.validate(METRIC_KEY_1)).thenReturn(true);
 
     reportReader.putMeasures(FILE_COMPONENT.getReportAttributes().getRef(), ImmutableList.of(
-      BatchReport.Measure.newBuilder().setMetricKey(METRIC_KEY_1).setStringValue(value).build()
+      ScannerReport.Measure.newBuilder().setMetricKey(METRIC_KEY_1).setStringValue(value).build()
       ));
 
     Optional<Measure> res = underTest.getRawMeasure(FILE_COMPONENT, metric1);
@@ -373,8 +373,8 @@ public class MeasureRepositoryImplTest {
     when(reportMetricValidator.validate(METRIC_KEY_2)).thenReturn(false);
 
     reportReader.putMeasures(FILE_COMPONENT.getReportAttributes().getRef(), ImmutableList.of(
-      BatchReport.Measure.newBuilder().setMetricKey(METRIC_KEY_1).setStringValue("value1").build(),
-      BatchReport.Measure.newBuilder().setMetricKey(METRIC_KEY_2).setStringValue("value2").build()
+      ScannerReport.Measure.newBuilder().setMetricKey(METRIC_KEY_1).setStringValue("value1").build(),
+      ScannerReport.Measure.newBuilder().setMetricKey(METRIC_KEY_2).setStringValue("value2").build()
       ));
 
     assertThat(underTest.getRawMeasure(FILE_COMPONENT, metric1)).isPresent();
@@ -385,7 +385,7 @@ public class MeasureRepositoryImplTest {
   public void getRawMeasure_retrieves_added_measure_over_batch_measure() {
     when(reportMetricValidator.validate(METRIC_KEY_1)).thenReturn(true);
     reportReader.putMeasures(FILE_COMPONENT.getReportAttributes().getRef(), ImmutableList.of(
-      BatchReport.Measure.newBuilder().setMetricKey(METRIC_KEY_1).setStringValue("some value").build()
+      ScannerReport.Measure.newBuilder().setMetricKey(METRIC_KEY_1).setStringValue("some value").build()
       ));
 
     Measure addedMeasure = SOME_MEASURE;
@@ -401,7 +401,7 @@ public class MeasureRepositoryImplTest {
   public void getRawMeasure_retrieves_measure_from_batch_and_caches_it_locally_so_that_it_can_be_updated() {
     when(reportMetricValidator.validate(METRIC_KEY_1)).thenReturn(true);
     reportReader.putMeasures(FILE_COMPONENT.getReportAttributes().getRef(), ImmutableList.of(
-      BatchReport.Measure.newBuilder().setMetricKey(METRIC_KEY_1).setStringValue("some value").build()
+      ScannerReport.Measure.newBuilder().setMetricKey(METRIC_KEY_1).setStringValue("some value").build()
       ));
 
     Optional<Measure> measure = underTest.getRawMeasure(FILE_COMPONENT, metric1);
@@ -441,8 +441,8 @@ public class MeasureRepositoryImplTest {
   public void getRawMeasures_returns_added_measures_over_batch_measures() {
     when(reportMetricValidator.validate(METRIC_KEY_1)).thenReturn(true);
     when(reportMetricValidator.validate(METRIC_KEY_2)).thenReturn(true);
-    BatchReport.Measure batchMeasure1 = BatchReport.Measure.newBuilder().setMetricKey(METRIC_KEY_1).setStringValue("some value").build();
-    BatchReport.Measure batchMeasure2 = BatchReport.Measure.newBuilder().setMetricKey(METRIC_KEY_2).setStringValue("some value").build();
+    ScannerReport.Measure batchMeasure1 = ScannerReport.Measure.newBuilder().setMetricKey(METRIC_KEY_1).setStringValue("some value").build();
+    ScannerReport.Measure batchMeasure2 = ScannerReport.Measure.newBuilder().setMetricKey(METRIC_KEY_2).setStringValue("some value").build();
     reportReader.putMeasures(FILE_COMPONENT.getReportAttributes().getRef(), ImmutableList.of(batchMeasure1, batchMeasure2));
 
     Measure addedMeasure = SOME_MEASURE;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/scm/ReportScmInfoTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/scm/ReportScmInfoTest.java
index a36d84c386b..f08358ee138 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/scm/ReportScmInfoTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/scm/ReportScmInfoTest.java
@@ -22,7 +22,7 @@ package org.sonar.server.computation.scm;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.sonar.batch.protocol.output.BatchReport;
+import org.sonar.scanner.protocol.output.ScannerReport;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -35,14 +35,14 @@ public class ReportScmInfoTest {
 
   @Test
   public void create_scm_info_with_some_changesets() throws Exception {
-    ScmInfo scmInfo = new ReportScmInfo(BatchReport.Changesets.newBuilder()
+    ScmInfo scmInfo = new ReportScmInfo(ScannerReport.Changesets.newBuilder()
       .setComponentRef(FILE_REF)
-      .addChangeset(BatchReport.Changesets.Changeset.newBuilder()
+      .addChangeset(ScannerReport.Changesets.Changeset.newBuilder()
         .setAuthor("john")
         .setDate(123456789L)
         .setRevision("rev-1")
         .build())
-      .addChangeset(BatchReport.Changesets.Changeset.newBuilder()
+      .addChangeset(ScannerReport.Changesets.Changeset.newBuilder()
         .setAuthor("henry")
         .setDate(1234567810L)
         .setRevision("rev-2")
@@ -58,14 +58,14 @@ public class ReportScmInfoTest {
 
   @Test
   public void return_changeset_for_a_given_line() throws Exception {
-    ScmInfo scmInfo = new ReportScmInfo(BatchReport.Changesets.newBuilder()
+    ScmInfo scmInfo = new ReportScmInfo(ScannerReport.Changesets.newBuilder()
       .setComponentRef(FILE_REF)
-      .addChangeset(BatchReport.Changesets.Changeset.newBuilder()
+      .addChangeset(ScannerReport.Changesets.Changeset.newBuilder()
         .setAuthor("john")
         .setDate(123456789L)
         .setRevision("rev-1")
         .build())
-      .addChangeset(BatchReport.Changesets.Changeset.newBuilder()
+      .addChangeset(ScannerReport.Changesets.Changeset.newBuilder()
         .setAuthor("henry")
         .setDate(1234567810L)
         .setRevision("rev-2")
@@ -86,15 +86,15 @@ public class ReportScmInfoTest {
 
   @Test
   public void return_latest_changeset() throws Exception {
-    ScmInfo scmInfo = new ReportScmInfo(BatchReport.Changesets.newBuilder()
+    ScmInfo scmInfo = new ReportScmInfo(ScannerReport.Changesets.newBuilder()
       .setComponentRef(FILE_REF)
-      .addChangeset(BatchReport.Changesets.Changeset.newBuilder()
+      .addChangeset(ScannerReport.Changesets.Changeset.newBuilder()
         .setAuthor("john")
         .setDate(123456789L)
         .setRevision("rev-1")
         .build())
       // Older changeset
-      .addChangeset(BatchReport.Changesets.Changeset.newBuilder()
+      .addChangeset(ScannerReport.Changesets.Changeset.newBuilder()
         .setAuthor("henry")
         .setDate(1234567810L)
         .setRevision("rev-2")
@@ -114,7 +114,7 @@ public class ReportScmInfoTest {
   public void fail_with_ISE_when_no_changeset() throws Exception {
     thrown.expect(IllegalStateException.class);
 
-    new ReportScmInfo(BatchReport.Changesets.newBuilder().build());
+    new ReportScmInfo(ScannerReport.Changesets.newBuilder().build());
   }
 
   @Test
@@ -129,9 +129,9 @@ public class ReportScmInfoTest {
     thrown.expect(IllegalStateException.class);
     thrown.expectMessage("Changeset on line 1 must have a revision");
 
-    new ReportScmInfo(BatchReport.Changesets.newBuilder()
+    new ReportScmInfo(ScannerReport.Changesets.newBuilder()
       .setComponentRef(FILE_REF)
-      .addChangeset(BatchReport.Changesets.Changeset.newBuilder()
+      .addChangeset(ScannerReport.Changesets.Changeset.newBuilder()
         .setAuthor("john")
         .setDate(123456789L)
         .build())
@@ -144,9 +144,9 @@ public class ReportScmInfoTest {
     thrown.expect(IllegalStateException.class);
     thrown.expectMessage("Changeset on line 1 must have a date");
 
-    new ReportScmInfo(BatchReport.Changesets.newBuilder()
+    new ReportScmInfo(ScannerReport.Changesets.newBuilder()
       .setComponentRef(FILE_REF)
-      .addChangeset(BatchReport.Changesets.Changeset.newBuilder()
+      .addChangeset(ScannerReport.Changesets.Changeset.newBuilder()
         .setAuthor("john")
         .setRevision("rev-1")
         .build())
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/scm/ScmInfoRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/scm/ScmInfoRepositoryImplTest.java
index e756e694da4..6a2f1f4d564 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/scm/ScmInfoRepositoryImplTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/scm/ScmInfoRepositoryImplTest.java
@@ -33,12 +33,12 @@ import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.log.LogTester;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.hash.SourceHashComputer;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbTester;
 import org.sonar.db.protobuf.DbFileSources;
 import org.sonar.db.source.FileSourceDto;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.analysis.AnalysisMetadataHolder;
 import org.sonar.server.computation.analysis.AnalysisMetadataHolderRule;
 import org.sonar.server.computation.batch.BatchReportReader;
@@ -234,9 +234,9 @@ public class ScmInfoRepositoryImplTest {
   }
 
   private void addChangesetInReport(String author, Long date, String revision) {
-    reportReader.putChangesets(BatchReport.Changesets.newBuilder()
+    reportReader.putChangesets(ScannerReport.Changesets.newBuilder()
       .setComponentRef(FILE_REF)
-      .addChangeset(BatchReport.Changesets.Changeset.newBuilder()
+      .addChangeset(ScannerReport.Changesets.Changeset.newBuilder()
         .setAuthor(author)
         .setDate(date)
         .setRevision(revision)
@@ -247,7 +247,7 @@ public class ScmInfoRepositoryImplTest {
 
   private void addFileSourceInReport(int lineCount) {
     reportReader.putFileSourceLines(FILE_REF, generateLines(lineCount));
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(FILE_REF)
       .setLines(lineCount)
       .build());
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/CoverageLineReaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/source/CoverageLineReaderTest.java
index 44052a83024..247105f8004 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/CoverageLineReaderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/source/CoverageLineReaderTest.java
@@ -21,8 +21,8 @@ package org.sonar.server.computation.source;
 
 import java.util.Collections;
 import org.junit.Test;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.db.protobuf.DbFileSources;
+import org.sonar.scanner.protocol.output.ScannerReport;
 
 import static com.google.common.collect.Lists.newArrayList;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -31,7 +31,7 @@ public class CoverageLineReaderTest {
 
   @Test
   public void set_coverage() {
-    CoverageLineReader computeCoverageLine = new CoverageLineReader(newArrayList(BatchReport.Coverage.newBuilder()
+    CoverageLineReader computeCoverageLine = new CoverageLineReader(newArrayList(ScannerReport.Coverage.newBuilder()
       .setLine(1)
       .setConditions(10)
       .setUtHits(true)
@@ -55,7 +55,7 @@ public class CoverageLineReaderTest {
 
   @Test
   public void set_coverage_on_uncovered_lines() {
-    CoverageLineReader computeCoverageLine = new CoverageLineReader(newArrayList(BatchReport.Coverage.newBuilder()
+    CoverageLineReader computeCoverageLine = new CoverageLineReader(newArrayList(ScannerReport.Coverage.newBuilder()
       .setLine(1)
       .setUtHits(false)
       .setItHits(false)
@@ -74,7 +74,7 @@ public class CoverageLineReaderTest {
 
   @Test
   public void set_coverage_without_line_hits() {
-    CoverageLineReader computeCoverageLine = new CoverageLineReader(newArrayList(BatchReport.Coverage.newBuilder()
+    CoverageLineReader computeCoverageLine = new CoverageLineReader(newArrayList(ScannerReport.Coverage.newBuilder()
       .setLine(1)
       .build()).iterator());
 
@@ -88,7 +88,7 @@ public class CoverageLineReaderTest {
 
   @Test
   public void set_overall_line_hits_with_only_ut() {
-    CoverageLineReader computeCoverageLine = new CoverageLineReader(newArrayList(BatchReport.Coverage.newBuilder()
+    CoverageLineReader computeCoverageLine = new CoverageLineReader(newArrayList(ScannerReport.Coverage.newBuilder()
       .setLine(1)
       .setUtHits(true)
       .setItHits(false)
@@ -102,7 +102,7 @@ public class CoverageLineReaderTest {
 
   @Test
   public void set_overall_line_hits_with_only_it() {
-    CoverageLineReader computeCoverageLine = new CoverageLineReader(newArrayList(BatchReport.Coverage.newBuilder()
+    CoverageLineReader computeCoverageLine = new CoverageLineReader(newArrayList(ScannerReport.Coverage.newBuilder()
       .setLine(1)
       .setUtHits(false)
       .setItHits(true)
@@ -116,7 +116,7 @@ public class CoverageLineReaderTest {
 
   @Test
   public void set_overall_line_hits_with_ut_and_it() {
-    CoverageLineReader computeCoverageLine = new CoverageLineReader(newArrayList(BatchReport.Coverage.newBuilder()
+    CoverageLineReader computeCoverageLine = new CoverageLineReader(newArrayList(ScannerReport.Coverage.newBuilder()
       .setLine(1)
       .setUtHits(true)
       .setItHits(true)
@@ -130,7 +130,7 @@ public class CoverageLineReaderTest {
 
   @Test
   public void nothing_to_do_when_no_coverage_info() {
-    CoverageLineReader computeCoverageLine = new CoverageLineReader(Collections.<BatchReport.Coverage>emptyList().iterator());
+    CoverageLineReader computeCoverageLine = new CoverageLineReader(Collections.<ScannerReport.Coverage>emptyList().iterator());
 
     DbFileSources.Line.Builder lineBuilder = DbFileSources.Data.newBuilder().addLinesBuilder().setLine(1);
     computeCoverageLine.read(lineBuilder);
@@ -147,7 +147,7 @@ public class CoverageLineReaderTest {
   @Test
   public void nothing_to_do_when_no_coverage_info_for_current_line() {
     CoverageLineReader computeCoverageLine = new CoverageLineReader(newArrayList(
-      BatchReport.Coverage.newBuilder()
+      ScannerReport.Coverage.newBuilder()
         .setLine(1)
         .setConditions(10)
         .setUtHits(true)
@@ -174,7 +174,7 @@ public class CoverageLineReaderTest {
   @Test
   public void nothing_to_do_when_no_coverage_info_for_next_line() {
     CoverageLineReader computeCoverageLine = new CoverageLineReader(newArrayList(
-      BatchReport.Coverage.newBuilder()
+      ScannerReport.Coverage.newBuilder()
         .setLine(1)
         .setConditions(10)
         .setUtHits(true)
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/HighlightingLineReaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/source/HighlightingLineReaderTest.java
index 1ead6a6e873..dea1dd7d97b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/HighlightingLineReaderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/source/HighlightingLineReaderTest.java
@@ -27,10 +27,10 @@ import java.util.Random;
 import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.api.utils.log.LogTester;
-import org.sonar.batch.protocol.Constants;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReport.TextRange;
 import org.sonar.db.protobuf.DbFileSources;
+import org.sonar.scanner.protocol.Constants;
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReport.TextRange;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.source.RangeOffsetConverter.RangeOffsetConverterException;
 
@@ -40,11 +40,11 @@ import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.sonar.api.utils.log.LoggerLevel.WARN;
-import static org.sonar.batch.protocol.Constants.HighlightingType.ANNOTATION;
-import static org.sonar.batch.protocol.Constants.HighlightingType.COMMENT;
-import static org.sonar.batch.protocol.Constants.HighlightingType.CONSTANT;
-import static org.sonar.batch.protocol.Constants.HighlightingType.HIGHLIGHTING_STRING;
 import static org.sonar.db.protobuf.DbFileSources.Data.newBuilder;
+import static org.sonar.scanner.protocol.Constants.HighlightingType.ANNOTATION;
+import static org.sonar.scanner.protocol.Constants.HighlightingType.COMMENT;
+import static org.sonar.scanner.protocol.Constants.HighlightingType.CONSTANT;
+import static org.sonar.scanner.protocol.Constants.HighlightingType.HIGHLIGHTING_STRING;
 import static org.sonar.server.computation.component.ReportComponent.builder;
 
 public class HighlightingLineReaderTest {
@@ -242,9 +242,9 @@ public class HighlightingLineReaderTest {
   }
 
   private HighlightingLineReader newReader(Map<TextRange, Constants.HighlightingType> textRangeByType) {
-    List<BatchReport.SyntaxHighlighting> syntaxHighlightingList = new ArrayList<>();
+    List<ScannerReport.SyntaxHighlighting> syntaxHighlightingList = new ArrayList<>();
     for (Map.Entry<TextRange, Constants.HighlightingType> entry : textRangeByType.entrySet()) {
-      syntaxHighlightingList.add(BatchReport.SyntaxHighlighting.newBuilder()
+      syntaxHighlightingList.add(ScannerReport.SyntaxHighlighting.newBuilder()
         .setRange(entry.getKey())
         .setType(entry.getValue())
         .build());
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/RangeOffsetConverterTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/source/RangeOffsetConverterTest.java
index 71291ca70d1..77d10666b27 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/RangeOffsetConverterTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/source/RangeOffsetConverterTest.java
@@ -22,7 +22,7 @@ package org.sonar.server.computation.source;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.sonar.batch.protocol.output.BatchReport;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.source.RangeOffsetConverter.RangeOffsetConverterException;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -115,8 +115,8 @@ public class RangeOffsetConverterTest {
       LINE_1, DEFAULT_LINE_LENGTH);
   }
 
-  private static BatchReport.TextRange createTextRange(int startLine, int enLine, int startOffset, int endOffset) {
-    return BatchReport.TextRange.newBuilder()
+  private static ScannerReport.TextRange createTextRange(int startLine, int enLine, int startOffset, int endOffset) {
+    return ScannerReport.TextRange.newBuilder()
       .setStartLine(startLine).setEndLine(enLine)
       .setStartOffset(startOffset).setEndOffset(endOffset)
       .build();
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/ReportIteratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/source/ReportIteratorTest.java
index 3c658b6e4d7..33422d738bf 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/ReportIteratorTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/source/ReportIteratorTest.java
@@ -24,10 +24,9 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReportWriter;
-import org.sonar.batch.protocol.output.FileStructure;
-
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
+import org.sonar.scanner.protocol.output.FileStructure;
 import java.io.File;
 import java.util.NoSuchElementException;
 
@@ -41,15 +40,15 @@ public class ReportIteratorTest {
 
   File file;
 
-  ReportIterator<BatchReport.Coverage> underTest;
+  ReportIterator<ScannerReport.Coverage> underTest;
 
   @Before
   public void setUp() throws Exception {
     File dir = temp.newFolder();
-    BatchReportWriter writer = new BatchReportWriter(dir);
+    ScannerReportWriter writer = new ScannerReportWriter(dir);
 
     writer.writeComponentCoverage(1, newArrayList(
-      BatchReport.Coverage.newBuilder()
+      ScannerReport.Coverage.newBuilder()
         .setLine(1)
         .build()
     ));
@@ -66,13 +65,13 @@ public class ReportIteratorTest {
 
   @Test
   public void read_report() {
-    underTest = new ReportIterator<>(file, BatchReport.Coverage.PARSER);
+    underTest = new ReportIterator<>(file, ScannerReport.Coverage.PARSER);
     assertThat(underTest.next().getLine()).isEqualTo(1);
   }
 
   @Test
   public void do_not_fail_when_calling_has_next_with_iterator_already_closed() {
-    underTest = new ReportIterator<>(file, BatchReport.Coverage.PARSER);
+    underTest = new ReportIterator<>(file, ScannerReport.Coverage.PARSER);
     assertThat(underTest.next().getLine()).isEqualTo(1);
     assertThat(underTest.hasNext()).isFalse();
 
@@ -82,7 +81,7 @@ public class ReportIteratorTest {
 
   @Test(expected = NoSuchElementException.class)
   public void test_error() throws Exception {
-    underTest = new ReportIterator<>(file, BatchReport.Coverage.PARSER);
+    underTest = new ReportIterator<>(file, ScannerReport.Coverage.PARSER);
     underTest.next();
 
     // fail !
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/SourceLinesRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/source/SourceLinesRepositoryImplTest.java
index 5a49562ce7f..dcf600f0a24 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/SourceLinesRepositoryImplTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/source/SourceLinesRepositoryImplTest.java
@@ -22,8 +22,8 @@ package org.sonar.server.computation.source;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.util.CloseableIterator;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.batch.BatchReportReaderRule;
 import org.sonar.server.computation.component.Component;
 
@@ -121,8 +121,8 @@ public class SourceLinesRepositoryImplTest {
     underTest.readLines(builder(Component.Type.PROJECT, 123).setKey("NotFile").build());
   }
 
-  private static BatchReport.Component createFileBatchComponent(int lineCount) {
-    return BatchReport.Component.newBuilder().setRef(FILE_REF).setLines(lineCount).build();
+  private static ScannerReport.Component createFileBatchComponent(int lineCount) {
+    return ScannerReport.Component.newBuilder().setRef(FILE_REF).setLines(lineCount).build();
   }
 
   private static void consume(CloseableIterator<String> stringCloseableIterator) {
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/SymbolsLineReaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/source/SymbolsLineReaderTest.java
index 3adf5b4eaab..023db6eb798 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/SymbolsLineReaderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/source/SymbolsLineReaderTest.java
@@ -23,9 +23,9 @@ import java.util.Arrays;
 import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.api.utils.log.LogTester;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReport.TextRange;
 import org.sonar.db.protobuf.DbFileSources;
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReport.TextRange;
 import org.sonar.server.computation.component.Component;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -299,8 +299,8 @@ public class SymbolsLineReaderTest {
     assertThat(logTester.logs(WARN)).containsOnly("Inconsistency detected in Symbols data. Symbols will be ignored for file 'FILE_KEY'");
   }
 
-  private BatchReport.Symbol newSymbol(TextRange declaration, TextRange... references) {
-    BatchReport.Symbol.Builder builder = BatchReport.Symbol.newBuilder()
+  private ScannerReport.Symbol newSymbol(TextRange declaration, TextRange... references) {
+    ScannerReport.Symbol.Builder builder = ScannerReport.Symbol.newBuilder()
       .setDeclaration(declaration);
     for (TextRange reference : references) {
       builder.addReference(reference);
@@ -308,7 +308,7 @@ public class SymbolsLineReaderTest {
     return builder.build();
   }
 
-  private SymbolsLineReader newReader(BatchReport.Symbol... symbols) {
+  private SymbolsLineReader newReader(ScannerReport.Symbol... symbols) {
     return new SymbolsLineReader(FILE, Arrays.asList(symbols).iterator(), rangeOffsetConverter);
   }
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/BuildComponentTreeStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/BuildComponentTreeStepTest.java
index f4493dc1213..e58395b5c96 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/BuildComponentTreeStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/BuildComponentTreeStepTest.java
@@ -29,12 +29,12 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.sonar.api.utils.System2;
-import org.sonar.batch.protocol.Constants;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbTester;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.component.SnapshotDto;
+import org.sonar.scanner.protocol.Constants;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.analysis.AnalysisMetadataHolderImpl;
 import org.sonar.server.computation.analysis.MutableAnalysisMetadataHolder;
 import org.sonar.server.computation.analysis.MutableAnalysisMetadataHolderRule;
@@ -43,15 +43,15 @@ import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.MutableTreeRootHolderRule;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.sonar.batch.protocol.Constants.ComponentType.DIRECTORY;
-import static org.sonar.batch.protocol.Constants.ComponentType.FILE;
-import static org.sonar.batch.protocol.Constants.ComponentType.MODULE;
-import static org.sonar.batch.protocol.Constants.ComponentType.PROJECT;
 import static org.sonar.db.component.ComponentTesting.newDirectory;
 import static org.sonar.db.component.ComponentTesting.newFileDto;
 import static org.sonar.db.component.ComponentTesting.newModuleDto;
 import static org.sonar.db.component.ComponentTesting.newProjectDto;
 import static org.sonar.db.component.SnapshotTesting.newSnapshotForProject;
+import static org.sonar.scanner.protocol.Constants.ComponentType.DIRECTORY;
+import static org.sonar.scanner.protocol.Constants.ComponentType.FILE;
+import static org.sonar.scanner.protocol.Constants.ComponentType.MODULE;
+import static org.sonar.scanner.protocol.Constants.ComponentType.PROJECT;
 
 
 @RunWith(DataProviderRunner.class)
@@ -316,20 +316,20 @@ public class BuildComponentTreeStepTest {
     }
   }
 
-  private static BatchReport.Component component(int componentRef, Constants.ComponentType componentType, int... children) {
+  private static ScannerReport.Component component(int componentRef, Constants.ComponentType componentType, int... children) {
     return component(componentRef, componentType, null, null, children);
   }
 
-  private static BatchReport.Component componentWithKey(int componentRef, Constants.ComponentType componentType, String key, int... children) {
+  private static ScannerReport.Component componentWithKey(int componentRef, Constants.ComponentType componentType, String key, int... children) {
     return component(componentRef, componentType, key, null, children);
   }
 
-  private static BatchReport.Component componentWithPath(int componentRef, Constants.ComponentType componentType, String path, int... children) {
+  private static ScannerReport.Component componentWithPath(int componentRef, Constants.ComponentType componentType, String path, int... children) {
     return component(componentRef, componentType, null, path, children);
   }
 
-  private static BatchReport.Component component(int componentRef, Constants.ComponentType componentType, @Nullable String key, @Nullable String path, int... children) {
-    BatchReport.Component.Builder builder = BatchReport.Component.newBuilder()
+  private static ScannerReport.Component component(int componentRef, Constants.ComponentType componentType, @Nullable String key, @Nullable String path, int... children) {
+    ScannerReport.Component.Builder builder = ScannerReport.Component.newBuilder()
       .setType(componentType)
       .setRef(componentRef);
     if (key != null) {
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadCrossProjectDuplicationsRepositoryStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadCrossProjectDuplicationsRepositoryStepTest.java
index 4e5b98aa6e0..356e33c0b5a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadCrossProjectDuplicationsRepositoryStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadCrossProjectDuplicationsRepositoryStepTest.java
@@ -27,7 +27,6 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.ArgumentCaptor;
 import org.sonar.api.utils.System2;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.DbTester;
@@ -38,6 +37,7 @@ import org.sonar.db.component.SnapshotTesting;
 import org.sonar.db.duplication.DuplicationUnitDto;
 import org.sonar.duplications.block.Block;
 import org.sonar.duplications.block.ByteArray;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.analysis.AnalysisMetadataHolderRule;
 import org.sonar.server.computation.batch.BatchReportReaderRule;
 import org.sonar.server.computation.batch.TreeRootHolderRule;
@@ -134,7 +134,7 @@ public class LoadCrossProjectDuplicationsRepositoryStepTest {
     dbClient.duplicationDao().insert(dbSession, duplicate);
     dbSession.commit();
 
-    BatchReport.CpdTextBlock originBlock = BatchReport.CpdTextBlock.newBuilder()
+    ScannerReport.CpdTextBlock originBlock = ScannerReport.CpdTextBlock.newBuilder()
       .setHash(hash)
       .setStartLine(30)
       .setEndLine(45)
@@ -177,14 +177,14 @@ public class LoadCrossProjectDuplicationsRepositoryStepTest {
     ComponentDto otherFIle = createFile("OTHER_FILE_KEY", otherProject);
     SnapshotDto otherFileSnapshot = createFileSnapshot(otherFIle, otherProjectSnapshot);
 
-    BatchReport.CpdTextBlock originBlock1 = BatchReport.CpdTextBlock.newBuilder()
+    ScannerReport.CpdTextBlock originBlock1 = ScannerReport.CpdTextBlock.newBuilder()
       .setHash("a8998353e96320ec")
       .setStartLine(30)
       .setEndLine(45)
       .setStartTokenIndex(0)
       .setEndTokenIndex(10)
       .build();
-    BatchReport.CpdTextBlock originBlock2 = BatchReport.CpdTextBlock.newBuilder()
+    ScannerReport.CpdTextBlock originBlock2 = ScannerReport.CpdTextBlock.newBuilder()
       .setHash("b1234353e96320ff")
       .setStartLine(10)
       .setEndLine(25)
@@ -281,7 +281,7 @@ public class LoadCrossProjectDuplicationsRepositoryStepTest {
     dbClient.duplicationDao().insert(dbSession, duplicate);
     dbSession.commit();
 
-    BatchReport.CpdTextBlock originBlock = BatchReport.CpdTextBlock.newBuilder()
+    ScannerReport.CpdTextBlock originBlock = ScannerReport.CpdTextBlock.newBuilder()
       .setHash(hash)
       .setStartLine(30)
       .setEndLine(45)
@@ -300,7 +300,7 @@ public class LoadCrossProjectDuplicationsRepositoryStepTest {
     when(crossProjectDuplicationStatusHolder.isEnabled()).thenReturn(true);
     analysisMetadataHolder.setBaseProjectSnapshot(baseProjectSnapshot);
 
-    batchReportReader.putDuplicationBlocks(FILE_REF, Collections.<BatchReport.CpdTextBlock>emptyList());
+    batchReportReader.putDuplicationBlocks(FILE_REF, Collections.<ScannerReport.CpdTextBlock>emptyList());
 
     underTest.execute();
 
@@ -312,7 +312,7 @@ public class LoadCrossProjectDuplicationsRepositoryStepTest {
     when(crossProjectDuplicationStatusHolder.isEnabled()).thenReturn(true);
     analysisMetadataHolder.setBaseProjectSnapshot(baseProjectSnapshot);
 
-    BatchReport.CpdTextBlock originBlock = BatchReport.CpdTextBlock.newBuilder()
+    ScannerReport.CpdTextBlock originBlock = ScannerReport.CpdTextBlock.newBuilder()
       .setHash("a8998353e96320ec")
       .setStartLine(30)
       .setEndLine(45)
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadDuplicationsFromReportStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadDuplicationsFromReportStepTest.java
index 774c3ea0883..6f6f787340c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadDuplicationsFromReportStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadDuplicationsFromReportStepTest.java
@@ -23,7 +23,7 @@ import java.util.Arrays;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.sonar.batch.protocol.output.BatchReport;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.batch.BatchReportReaderRule;
 import org.sonar.server.computation.batch.TreeRootHolderRule;
 import org.sonar.server.computation.component.Component;
@@ -200,30 +200,30 @@ public class LoadDuplicationsFromReportStepTest {
     return new DetailedTextBlock(id, line, line);
   }
 
-  private static BatchReport.Duplication createDuplication(BatchReport.TextRange original, BatchReport.Duplicate... duplicates) {
-    BatchReport.Duplication.Builder builder = BatchReport.Duplication.newBuilder()
+  private static ScannerReport.Duplication createDuplication(ScannerReport.TextRange original, ScannerReport.Duplicate... duplicates) {
+    ScannerReport.Duplication.Builder builder = ScannerReport.Duplication.newBuilder()
       .setOriginPosition(original);
-    for (BatchReport.Duplicate duplicate : duplicates) {
+    for (ScannerReport.Duplicate duplicate : duplicates) {
       builder.addDuplicate(duplicate);
     }
     return builder.build();
   }
 
-  private static BatchReport.Duplicate createInnerDuplicate(int line) {
-    return BatchReport.Duplicate.newBuilder()
+  private static ScannerReport.Duplicate createInnerDuplicate(int line) {
+    return ScannerReport.Duplicate.newBuilder()
       .setRange(singleLineTextRange(line))
       .build();
   }
 
-  private static BatchReport.Duplicate createInProjectDuplicate(int componentRef, int line) {
-    return BatchReport.Duplicate.newBuilder()
+  private static ScannerReport.Duplicate createInProjectDuplicate(int componentRef, int line) {
+    return ScannerReport.Duplicate.newBuilder()
       .setOtherFileRef(componentRef)
       .setRange(singleLineTextRange(line))
       .build();
   }
 
-  private static BatchReport.TextRange singleLineTextRange(int line) {
-    return BatchReport.TextRange.newBuilder()
+  private static ScannerReport.TextRange singleLineTextRange(int line) {
+    return ScannerReport.TextRange.newBuilder()
       .setStartLine(line)
       .setEndLine(line)
       .build();
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadQualityProfilesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadQualityProfilesStepTest.java
index 1504b808f18..415867e6294 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadQualityProfilesStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadQualityProfilesStepTest.java
@@ -25,8 +25,8 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.api.rule.RuleStatus;
 import org.sonar.api.rule.Severity;
-import org.sonar.batch.protocol.Constants;
-import org.sonar.batch.protocol.output.BatchReport;
+import org.sonar.scanner.protocol.Constants;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.batch.BatchReportReaderRule;
 import org.sonar.server.computation.issue.DumbRule;
 import org.sonar.server.computation.issue.RuleRepositoryRule;
@@ -54,12 +54,12 @@ public class LoadQualityProfilesStepTest {
     ruleRepository.add(XOO_X1);
     ruleRepository.add(XOO_X2);
 
-    BatchReport.ActiveRule.Builder batch1 = BatchReport.ActiveRule.newBuilder()
+    ScannerReport.ActiveRule.Builder batch1 = ScannerReport.ActiveRule.newBuilder()
       .setRuleRepository(XOO_X1.repository()).setRuleKey(XOO_X1.rule())
       .setSeverity(Constants.Severity.BLOCKER);
     batch1.addParamBuilder().setKey("p1").setValue("v1").build();
 
-    BatchReport.ActiveRule.Builder batch2 = BatchReport.ActiveRule.newBuilder()
+    ScannerReport.ActiveRule.Builder batch2 = ScannerReport.ActiveRule.newBuilder()
       .setRuleRepository(XOO_X2.repository()).setRuleKey(XOO_X2.rule()).setSeverity(Constants.Severity.MAJOR);
     batchReportReader.putActiveRules(asList(batch1.build(), batch2.build()));
 
@@ -80,7 +80,7 @@ public class LoadQualityProfilesStepTest {
   public void ignore_rules_with_status_REMOVED() throws Exception {
     ruleRepository.add(new DumbRule(XOO_X1).setStatus(RuleStatus.REMOVED));
 
-    BatchReport.ActiveRule.Builder batch1 = BatchReport.ActiveRule.newBuilder()
+    ScannerReport.ActiveRule.Builder batch1 = ScannerReport.ActiveRule.newBuilder()
       .setRuleRepository(XOO_X1.repository()).setRuleKey(XOO_X1.rule())
       .setSeverity(Constants.Severity.BLOCKER);
     batchReportReader.putActiveRules(asList(batch1.build()));
@@ -92,7 +92,7 @@ public class LoadQualityProfilesStepTest {
 
   @Test
   public void ignore_not_found_rules() throws Exception {
-    BatchReport.ActiveRule.Builder batch1 = BatchReport.ActiveRule.newBuilder()
+    ScannerReport.ActiveRule.Builder batch1 = ScannerReport.ActiveRule.newBuilder()
       .setRuleRepository(XOO_X1.repository()).setRuleKey(XOO_X1.rule())
       .setSeverity(Constants.Severity.BLOCKER);
     batchReportReader.putActiveRules(asList(batch1.build()));
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadReportAnalysisMetadataHolderStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadReportAnalysisMetadataHolderStepTest.java
index 2ae20cd8289..c1bab1e0875 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadReportAnalysisMetadataHolderStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadReportAnalysisMetadataHolderStepTest.java
@@ -23,7 +23,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.sonar.api.utils.MessageException;
-import org.sonar.batch.protocol.output.BatchReport;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.analysis.MutableAnalysisMetadataHolderRule;
 import org.sonar.server.computation.batch.BatchReportReaderRule;
 import org.sonar.server.computation.queue.CeTask;
@@ -138,7 +138,7 @@ public class LoadReportAnalysisMetadataHolderStepTest {
   public void execute_fails_with_MessageException_if_projectKey_is_null_in_CE_task() {
     CeTask res = mock(CeTask.class);
     when(res.getComponentUuid()).thenReturn("prj_uuid");
-    reportReader.setMetadata(BatchReport.Metadata.newBuilder().build());
+    reportReader.setMetadata(ScannerReport.Metadata.newBuilder().build());
 
     ComputationStep underTest = new LoadReportAnalysisMetadataHolderStep(res, reportReader, analysisMetadataHolder);
 
@@ -151,7 +151,7 @@ public class LoadReportAnalysisMetadataHolderStepTest {
   @Test
   public void execute_fails_with_MessageException_when_projectKey_in_report_is_different_from_componentKey_in_CE_task() {
     reportReader.setMetadata(
-      BatchReport.Metadata.newBuilder()
+      ScannerReport.Metadata.newBuilder()
         .setProjectKey("some other key")
         .build());
 
@@ -161,8 +161,8 @@ public class LoadReportAnalysisMetadataHolderStepTest {
     underTest.execute();
   }
 
-  private static BatchReport.Metadata.Builder newBatchReportBuilder() {
-    return BatchReport.Metadata.newBuilder()
+  private static ScannerReport.Metadata.Builder newBatchReportBuilder() {
+    return ScannerReport.Metadata.newBuilder()
       .setProjectKey(PROJECT_KEY);
   }
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistCrossProjectDuplicationIndexStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistCrossProjectDuplicationIndexStepTest.java
index 4439b6516f1..cfee41ef09a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistCrossProjectDuplicationIndexStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistCrossProjectDuplicationIndexStepTest.java
@@ -28,9 +28,9 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.api.utils.System2;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbTester;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.batch.BatchReportReaderRule;
 import org.sonar.server.computation.batch.TreeRootHolderRule;
 import org.sonar.server.computation.component.Component;
@@ -54,7 +54,7 @@ public class PersistCrossProjectDuplicationIndexStepTest {
     .build();
   static final long PROJECT_SNAPSHOT_ID = 10L;
 
-  static final BatchReport.CpdTextBlock CPD_TEXT_BLOCK = BatchReport.CpdTextBlock.newBuilder()
+  static final ScannerReport.CpdTextBlock CPD_TEXT_BLOCK = ScannerReport.CpdTextBlock.newBuilder()
     .setHash("a8998353e96320ec")
     .setStartLine(30)
     .setEndLine(45)
@@ -105,7 +105,7 @@ public class PersistCrossProjectDuplicationIndexStepTest {
     when(crossProjectDuplicationStatusHolder.isEnabled()).thenReturn(true);
     reportReader.putDuplicationBlocks(FILE_REF, Arrays.asList(
       CPD_TEXT_BLOCK,
-      BatchReport.CpdTextBlock.newBuilder()
+      ScannerReport.CpdTextBlock.newBuilder()
         .setHash("b1234353e96320ff")
         .setStartLine(20)
         .setEndLine(15)
@@ -126,7 +126,7 @@ public class PersistCrossProjectDuplicationIndexStepTest {
   @Test
   public void nothing_to_persist_when_no_cpd_text_blocks_in_report() throws Exception {
     when(crossProjectDuplicationStatusHolder.isEnabled()).thenReturn(true);
-    reportReader.putDuplicationBlocks(FILE_REF, Collections.<BatchReport.CpdTextBlock>emptyList());
+    reportReader.putDuplicationBlocks(FILE_REF, Collections.<ScannerReport.CpdTextBlock>emptyList());
 
     underTest.execute();
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java
index f17ed019831..63b515b4a44 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java
@@ -25,14 +25,14 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.sonar.api.utils.System2;
-import org.sonar.batch.protocol.Constants;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.DbTester;
 import org.sonar.db.protobuf.DbFileSources;
 import org.sonar.db.source.FileSourceDto;
 import org.sonar.db.source.FileSourceDto.Type;
+import org.sonar.scanner.protocol.Constants;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.batch.BatchReportReaderRule;
 import org.sonar.server.computation.batch.TreeRootHolderRule;
 import org.sonar.server.computation.component.Component;
@@ -135,7 +135,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest {
   public void persist_coverage() {
     initBasicReport(1);
 
-    reportReader.putCoverage(FILE_REF, newArrayList(BatchReport.Coverage.newBuilder()
+    reportReader.putCoverage(FILE_REF, newArrayList(ScannerReport.Coverage.newBuilder()
       .setLine(1)
       .setConditions(10)
       .setUtHits(true)
@@ -193,8 +193,8 @@ public class PersistFileSourcesStepTest extends BaseStepTest {
   public void persist_highlighting() {
     initBasicReport(1);
 
-    reportReader.putSyntaxHighlighting(FILE_REF, newArrayList(BatchReport.SyntaxHighlighting.newBuilder()
-      .setRange(BatchReport.TextRange.newBuilder()
+    reportReader.putSyntaxHighlighting(FILE_REF, newArrayList(ScannerReport.SyntaxHighlighting.newBuilder()
+      .setRange(ScannerReport.TextRange.newBuilder()
         .setStartLine(1).setEndLine(1)
         .setStartOffset(2).setEndOffset(4)
         .build())
@@ -217,11 +217,11 @@ public class PersistFileSourcesStepTest extends BaseStepTest {
     initBasicReport(3);
 
     reportReader.putSymbols(FILE_REF, newArrayList(
-      BatchReport.Symbol.newBuilder()
-        .setDeclaration(BatchReport.TextRange.newBuilder()
+      ScannerReport.Symbol.newBuilder()
+        .setDeclaration(ScannerReport.TextRange.newBuilder()
           .setStartLine(1).setEndLine(1).setStartOffset(2).setEndOffset(4)
           .build())
-        .addReference(BatchReport.TextRange.newBuilder()
+        .addReference(ScannerReport.TextRange.newBuilder()
           .setStartLine(3).setEndLine(3).setStartOffset(1).setEndOffset(3)
           .build())
         .build()));
@@ -439,17 +439,17 @@ public class PersistFileSourcesStepTest extends BaseStepTest {
         .build())
       .build());
 
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(1)
       .setType(Constants.ComponentType.PROJECT)
       .addChildRef(2)
       .build());
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(2)
       .setType(Constants.ComponentType.MODULE)
       .addChildRef(FILE_REF)
       .build());
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(FILE_REF)
       .setType(Constants.ComponentType.FILE)
       .build());
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java
index d7b8e88fdc3..4266a76e38d 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java
@@ -29,7 +29,6 @@ import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rule.Severity;
 import org.sonar.api.rules.RuleType;
 import org.sonar.api.utils.System2;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.issue.DefaultIssue;
 import org.sonar.core.issue.DefaultIssueComment;
 import org.sonar.core.issue.FieldDiffs;
@@ -41,6 +40,7 @@ import org.sonar.db.component.ComponentTesting;
 import org.sonar.db.issue.IssueDto;
 import org.sonar.db.rule.RuleDto;
 import org.sonar.db.rule.RuleTesting;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.batch.BatchReportReaderRule;
 import org.sonar.server.computation.issue.IssueCache;
 import org.sonar.server.computation.issue.RuleRepositoryImpl;
@@ -84,7 +84,7 @@ public class PersistIssuesStepTest extends BaseStepTest {
     issueCache = new IssueCache(temp.newFile(), System2.INSTANCE);
     system2 = mock(System2.class);
     when(system2.now()).thenReturn(NOW);
-    reportReader.setMetadata(BatchReport.Metadata.getDefaultInstance());
+    reportReader.setMetadata(ScannerReport.Metadata.getDefaultInstance());
 
     step = new PersistIssuesStep(dbClient, system2, new UpdateConflictResolver(), new RuleRepositoryImpl(dbClient), issueCache);
   }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java
index 35e973fc5ca..0f7e9671905 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java
@@ -25,9 +25,9 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.api.i18n.I18n;
 import org.sonar.api.utils.System2;
-import org.sonar.batch.protocol.Constants;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.db.DbTester;
+import org.sonar.scanner.protocol.Constants;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.batch.BatchReportReaderRule;
 import org.sonar.server.computation.batch.TreeRootHolderRule;
 import org.sonar.server.computation.component.Component;
@@ -79,20 +79,20 @@ public class PersistProjectLinksStepTest extends BaseStepTest {
       .build());
 
     // project and 1 module
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(1)
       .setType(Constants.ComponentType.PROJECT)
       .addChildRef(2)
-      .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build())
-      .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.SCM).setHref("https://github.com/SonarSource/sonar").build())
-      .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.SCM_DEV).setHref("scm:git:git@github.com:SonarSource/sonar.git/sonar").build())
-      .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.ISSUE).setHref("http://jira.sonarsource.com/").build())
-      .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.CI).setHref("http://bamboo.ci.codehaus.org/browse/SONAR").build())
+      .addLink(ScannerReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build())
+      .addLink(ScannerReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.SCM).setHref("https://github.com/SonarSource/sonar").build())
+      .addLink(ScannerReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.SCM_DEV).setHref("scm:git:git@github.com:SonarSource/sonar.git/sonar").build())
+      .addLink(ScannerReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.ISSUE).setHref("http://jira.sonarsource.com/").build())
+      .addLink(ScannerReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.CI).setHref("http://bamboo.ci.codehaus.org/browse/SONAR").build())
       .build());
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(2)
       .setType(Constants.ComponentType.MODULE)
-      .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.SCM).setHref("https://github.com/SonarSource/sonar/server").build())
+      .addLink(ScannerReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.SCM).setHref("https://github.com/SonarSource/sonar/server").build())
       .build());
 
     step.execute();
@@ -106,10 +106,10 @@ public class PersistProjectLinksStepTest extends BaseStepTest {
 
     treeRootHolder.setRoot(ReportComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").build());
 
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(1)
       .setType(Constants.ComponentType.PROJECT)
-      .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build())
+      .addLink(ScannerReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build())
       .build());
 
     step.execute();
@@ -125,15 +125,15 @@ public class PersistProjectLinksStepTest extends BaseStepTest {
       ReportComponent.builder(Component.Type.FILE, 2).setUuid("BCDE").build())
       .build());
 
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(1)
       .setType(Constants.ComponentType.PROJECT)
       .addChildRef(2)
       .build());
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(2)
       .setType(Constants.ComponentType.FILE)
-      .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build())
+      .addLink(ScannerReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build())
       .build());
 
     step.execute();
@@ -147,10 +147,10 @@ public class PersistProjectLinksStepTest extends BaseStepTest {
 
     treeRootHolder.setRoot(ReportComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").build());
 
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(1)
       .setType(Constants.ComponentType.PROJECT)
-      .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build())
+      .addLink(ScannerReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build())
       .build());
 
     step.execute();
@@ -164,7 +164,7 @@ public class PersistProjectLinksStepTest extends BaseStepTest {
 
     treeRootHolder.setRoot(ReportComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").build());
 
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(1)
       .setType(Constants.ComponentType.PROJECT)
       .build());
@@ -180,7 +180,7 @@ public class PersistProjectLinksStepTest extends BaseStepTest {
 
     treeRootHolder.setRoot(ReportComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").build());
 
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(1)
       .setType(Constants.ComponentType.PROJECT)
       .build());
@@ -196,11 +196,11 @@ public class PersistProjectLinksStepTest extends BaseStepTest {
 
     treeRootHolder.setRoot(ReportComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").build());
 
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(1)
       .setType(Constants.ComponentType.PROJECT)
-      .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build())
-      .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build())
+      .addLink(ScannerReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build())
+      .addLink(ScannerReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build())
       .build());
 
     try {
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java
index d74f5c955b8..b84689867f5 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java
@@ -27,13 +27,13 @@ import org.junit.Test;
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.log.LogTester;
 import org.sonar.api.utils.log.LoggerLevel;
-import org.sonar.batch.protocol.Constants;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReport.CoverageDetail;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbTester;
 import org.sonar.db.protobuf.DbFileSources;
 import org.sonar.db.source.FileSourceDto;
+import org.sonar.scanner.protocol.Constants;
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReport.CoverageDetail;
 import org.sonar.server.computation.batch.BatchReportReaderRule;
 import org.sonar.server.computation.batch.TreeRootHolderRule;
 import org.sonar.server.computation.component.Component;
@@ -110,7 +110,7 @@ public class PersistTestsStepTest extends BaseStepTest {
 
   @Test
   public void insert_several_tests_in_a_report() {
-    List<BatchReport.Test> batchTests = Arrays.asList(
+    List<ScannerReport.Test> batchTests = Arrays.asList(
       newTest(1), newTest(2));
     reportReader.putTests(TEST_FILE_REF_1, batchTests);
     List<CoverageDetail> coverageDetails = Arrays.asList(
@@ -163,7 +163,7 @@ public class PersistTestsStepTest extends BaseStepTest {
 
   @Test
   public void insert_tests_without_coverage_details() {
-    List<BatchReport.Test> batchTests = Arrays.asList(newTest(1));
+    List<ScannerReport.Test> batchTests = Arrays.asList(newTest(1));
     reportReader.putTests(TEST_FILE_REF_1, batchTests);
 
     underTest.execute();
@@ -178,7 +178,7 @@ public class PersistTestsStepTest extends BaseStepTest {
 
   @Test
   public void insert_coverage_details_not_taken_into_account() {
-    List<BatchReport.Test> batchTests = Arrays.asList(newTest(1));
+    List<ScannerReport.Test> batchTests = Arrays.asList(newTest(1));
     reportReader.putTests(TEST_FILE_REF_1, batchTests);
     List<CoverageDetail> coverageDetails = Arrays.asList(newCoverageDetail(1, MAIN_FILE_REF_1), newCoverageDetail(2, MAIN_FILE_REF_2));
     reportReader.putCoverageDetails(TEST_FILE_REF_1, coverageDetails);
@@ -227,7 +227,7 @@ public class PersistTestsStepTest extends BaseStepTest {
     db.getSession().commit();
     assertThat(dbClient.fileSourceDao().selectTest(TEST_FILE_UUID_1)).isNotNull();
 
-    BatchReport.Test newBatchTest = newTest(1);
+    ScannerReport.Test newBatchTest = newTest(1);
     reportReader.putTests(TEST_FILE_REF_1, Arrays.asList(newBatchTest));
 
     CoverageDetail newCoverageDetail = newCoverageDetail(1, MAIN_FILE_REF_1);
@@ -254,8 +254,8 @@ public class PersistTestsStepTest extends BaseStepTest {
     assertThat(test.getCoveredFile(0).getFileUuid()).isEqualTo(MAIN_FILE_UUID_1);
   }
 
-  private BatchReport.Test newTest(int id) {
-    return BatchReport.Test.newBuilder()
+  private ScannerReport.Test newTest(int id) {
+    return ScannerReport.Test.newBuilder()
       .setStatus(Constants.TestStatus.FAILURE)
       .setName("name#" + id)
       .setStacktrace("stacktrace#" + id)
@@ -264,11 +264,11 @@ public class PersistTestsStepTest extends BaseStepTest {
       .build();
   }
 
-  private BatchReport.CoverageDetail newCoverageDetail(int id, int covered_file_ref) {
+  private ScannerReport.CoverageDetail newCoverageDetail(int id, int covered_file_ref) {
     return newCoverageDetailWithLines(id, covered_file_ref, 1, 2, 3);
   }
 
-  private BatchReport.CoverageDetail newCoverageDetailWithLines(int id, int covered_file_ref, Integer... lines) {
+  private ScannerReport.CoverageDetail newCoverageDetailWithLines(int id, int covered_file_ref, Integer... lines) {
     return CoverageDetail.newBuilder()
       .setTestName("name#" + id)
       .addCoveredFile(CoverageDetail.CoveredFile.newBuilder()
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java
index 840096b6794..61f1a0265b2 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java
@@ -27,13 +27,13 @@ import org.junit.rules.ExpectedException;
 import org.sonar.api.utils.DateUtils;
 import org.sonar.api.utils.MessageException;
 import org.sonar.api.utils.System2;
-import org.sonar.batch.protocol.Constants;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbTester;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.component.ComponentTesting;
 import org.sonar.db.component.SnapshotTesting;
+import org.sonar.scanner.protocol.Constants;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.server.computation.analysis.AnalysisMetadataHolderRule;
 import org.sonar.server.computation.batch.BatchReportReaderRule;
 import org.sonar.server.computation.batch.TreeRootHolderRule;
@@ -77,7 +77,7 @@ public class ValidateProjectStepTest {
   @Test
   public void not_fail_on_valid_branch() {
     analysisMetadataHolder.setBranch(DEFAULT_BRANCH);
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(1)
       .setType(Constants.ComponentType.PROJECT)
       .setKey(PROJECT_KEY)
@@ -94,7 +94,7 @@ public class ValidateProjectStepTest {
       "  o \"bran#ch\" is not a valid branch name. Allowed characters are alphanumeric, '-', '_', '.' and '/'.");
 
     analysisMetadataHolder.setBranch("bran#ch");
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(1)
       .setType(Constants.ComponentType.PROJECT)
       .setKey(PROJECT_KEY)
@@ -113,13 +113,13 @@ public class ValidateProjectStepTest {
       "  o \"Project\\Key\" is not a valid project or module key. Allowed characters are alphanumeric, '-', '_', '.' and ':', with at least one non-digit.\n" +
       "  o \"Module$Key\" is not a valid project or module key. Allowed characters are alphanumeric, '-', '_', '.' and ':', with at least one non-digit");
 
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(1)
       .setType(Constants.ComponentType.PROJECT)
       .setKey(invalidProjectKey)
       .addChildRef(2)
       .build());
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(2)
       .setType(Constants.ComponentType.MODULE)
       .setKey("Module$Key")
@@ -139,13 +139,13 @@ public class ValidateProjectStepTest {
       "If you really want to stop directly analysing project \"" + MODULE_KEY + "\", please first delete it from SonarQube and then relaunch the analysis of project \""
       + PROJECT_KEY + "\".");
 
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(1)
       .setType(Constants.ComponentType.PROJECT)
       .setKey(PROJECT_KEY)
       .addChildRef(2)
       .build());
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(2)
       .setType(Constants.ComponentType.MODULE)
       .setKey(MODULE_KEY)
@@ -169,13 +169,13 @@ public class ValidateProjectStepTest {
     thrown.expectMessage("Validation of project failed:\n" +
       "  o Module \"" + MODULE_KEY + "\" is already part of project \"" + anotherProjectKey + "\"");
 
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(1)
       .setType(Constants.ComponentType.PROJECT)
       .setKey(PROJECT_KEY)
       .addChildRef(2)
       .build());
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(2)
       .setType(Constants.ComponentType.MODULE)
       .setKey(MODULE_KEY)
@@ -204,13 +204,13 @@ public class ValidateProjectStepTest {
       "If you really want to stop directly analysing project \"" + anotherProjectKey + "\", please first delete it from SonarQube and then relaunch the analysis of project \""
       + PROJECT_KEY + "\".");
 
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(1)
       .setType(Constants.ComponentType.PROJECT)
       .setKey(PROJECT_KEY)
       .addChildRef(2)
       .build());
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(2)
       .setType(Constants.ComponentType.MODULE)
       .setKey(MODULE_KEY)
@@ -231,7 +231,7 @@ public class ValidateProjectStepTest {
 
   @Test
   public void not_fail_if_analysis_date_is_after_last_analysis() {
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(1)
       .setType(Constants.ComponentType.PROJECT)
       .setKey(PROJECT_KEY)
@@ -257,7 +257,7 @@ public class ValidateProjectStepTest {
 
     analysisMetadataHolder.setAnalysisDate(DateUtils.parseDate("2015-01-01"));
 
-    reportReader.putComponent(BatchReport.Component.newBuilder()
+    reportReader.putComponent(ScannerReport.Component.newBuilder()
       .setRef(1)
       .setType(Constants.ComponentType.PROJECT)
       .setKey(PROJECT_KEY)
diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml
index 07d90cc1ffe..2300b6dd140 100644
--- a/sonar-application/assembly.xml
+++ b/sonar-application/assembly.xml
@@ -73,7 +73,7 @@
       <outputDirectory>lib/batch</outputDirectory>
       <useTransitiveDependencies>false</useTransitiveDependencies>
       <includes>
-        <include>org.sonarsource.sonarqube:sonar-batch-shaded</include>
+        <include>org.sonarsource.sonarqube:sonar-scanner-engine-shaded</include>
       </includes>
       <scope>provided</scope>
     </dependencySet>
diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml
index 174d7fb6512..b2126dc6da3 100644
--- a/sonar-application/pom.xml
+++ b/sonar-application/pom.xml
@@ -56,7 +56,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>sonar-batch-shaded</artifactId>
+      <artifactId>sonar-scanner-engine-shaded</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/sonar-batch-protocol/src/test/resources/org/sonar/batch/protocol/FileStreamTest/file.txt b/sonar-batch-protocol/src/test/resources/org/sonar/batch/protocol/FileStreamTest/file.txt
deleted file mode 100644
index 83db48f84ec..00000000000
--- a/sonar-batch-protocol/src/test/resources/org/sonar/batch/protocol/FileStreamTest/file.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-line1
-line2
-line3
diff --git a/sonar-db/pom.xml b/sonar-db/pom.xml
index 06406d3470f..a767c67c90e 100644
--- a/sonar-db/pom.xml
+++ b/sonar-db/pom.xml
@@ -34,7 +34,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>sonar-batch-protocol</artifactId>
+      <artifactId>sonar-scanner-protocol</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/sonar-batch-shaded/pom.xml b/sonar-scanner-engine-shaded/pom.xml
index dffaa5a37a4..339ef5d6cdb 100644
--- a/sonar-batch-shaded/pom.xml
+++ b/sonar-scanner-engine-shaded/pom.xml
@@ -8,14 +8,14 @@
     <version>5.5-SNAPSHOT</version>
   </parent>
 
-  <artifactId>sonar-batch-shaded</artifactId>
-  <name>SonarQube :: Batch Shaded</name>
-  <description>All batch dependencies in a single jar</description>
+  <artifactId>sonar-scanner-engine-shaded</artifactId>
+  <name>SonarQube :: Scanner Engine Shaded</name>
+  <description>All Scanner Engine dependencies in a single jar</description>
 
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>sonar-batch</artifactId>
+      <artifactId>sonar-scanner-engine</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>
diff --git a/sonar-batch/pom.xml b/sonar-scanner-engine/pom.xml
index 8fdc1483bb5..0a2eb36f5b5 100644
--- a/sonar-batch/pom.xml
+++ b/sonar-scanner-engine/pom.xml
@@ -7,8 +7,8 @@
     <version>5.5-SNAPSHOT</version>
   </parent>
 
-  <artifactId>sonar-batch</artifactId>
-  <name>SonarQube :: Batch</name>
+  <artifactId>sonar-scanner-engine</artifactId>
+  <name>SonarQube :: Scanner Engine</name>
   
   <properties>
     <enableBenchmarkAssertions>false</enableBenchmarkAssertions>
@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>sonar-batch-protocol</artifactId>
+      <artifactId>sonar-scanner-protocol</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/sonar-batch/src/main/java/org/sonar/batch/DefaultFileLinesContext.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/DefaultFileLinesContext.java
index a4045f18ce0..a4045f18ce0 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/DefaultFileLinesContext.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/DefaultFileLinesContext.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/DefaultFileLinesContextFactory.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/DefaultFileLinesContextFactory.java
index 922f101f085..922f101f085 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/DefaultFileLinesContextFactory.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/DefaultFileLinesContextFactory.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/DefaultProjectTree.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/DefaultProjectTree.java
index 5b56f27154c..5b56f27154c 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/DefaultProjectTree.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/DefaultProjectTree.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/ProjectConfigurator.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/ProjectConfigurator.java
index 997cae744f2..997cae744f2 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/ProjectConfigurator.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/ProjectConfigurator.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/analysis/AnalysisProperties.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/analysis/AnalysisProperties.java
index e3be61067e6..e3be61067e6 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/analysis/AnalysisProperties.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/analysis/AnalysisProperties.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/analysis/AnalysisTempFolderProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/analysis/AnalysisTempFolderProvider.java
index 68c2608b864..68c2608b864 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/analysis/AnalysisTempFolderProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/analysis/AnalysisTempFolderProvider.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/analysis/AnalysisWSLoaderProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/analysis/AnalysisWSLoaderProvider.java
index 54ce6e112a3..54ce6e112a3 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/analysis/AnalysisWSLoaderProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/analysis/AnalysisWSLoaderProvider.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/analysis/DefaultAnalysisMode.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/analysis/DefaultAnalysisMode.java
index bd27cf81ca0..bd27cf81ca0 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/analysis/DefaultAnalysisMode.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/analysis/DefaultAnalysisMode.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/analysis/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/analysis/package-info.java
index be39545404c..be39545404c 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/analysis/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/analysis/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/AbstractAnalysisMode.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/AbstractAnalysisMode.java
index 2944accbd27..2944accbd27 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/AbstractAnalysisMode.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/AbstractAnalysisMode.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java
index 0a2ec661d73..0a2ec661d73 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchExtensionDictionnary.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchExtensionDictionnary.java
index cfebad6cbb5..cfebad6cbb5 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchExtensionDictionnary.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchExtensionDictionnary.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginInstaller.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginInstaller.java
index 1c1ee8e1fc4..1c1ee8e1fc4 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginInstaller.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginInstaller.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginJarExploder.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginJarExploder.java
index a91a6b38cbc..a91a6b38cbc 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginJarExploder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginJarExploder.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginPredicate.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginPredicate.java
index ea4380c44da..ea4380c44da 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginPredicate.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginPredicate.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java
index 4d0d0c46c2d..4d0d0c46c2d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchWsClient.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchWsClient.java
index d77670a6c86..d77670a6c86 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchWsClient.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchWsClient.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchWsClientProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchWsClientProvider.java
index d33baf821e5..d33baf821e5 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchWsClientProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchWsClientProvider.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/DroppedPropertyChecker.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/DroppedPropertyChecker.java
index 72b34d613ea..72b34d613ea 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/DroppedPropertyChecker.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/DroppedPropertyChecker.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java
index ff610139032..ff610139032 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionMatcher.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/ExtensionMatcher.java
index d38581f572d..d38581f572d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionMatcher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/ExtensionMatcher.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionUtils.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/ExtensionUtils.java
index adf16a40315..adf16a40315 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionUtils.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/ExtensionUtils.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/FileCacheProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/FileCacheProvider.java
index 9880c7de23b..9880c7de23b 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/FileCacheProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/FileCacheProvider.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/GlobalContainer.java
index 8ac69fd6258..8ac69fd6258 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalContainer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/GlobalContainer.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalMode.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/GlobalMode.java
index 774dac71361..774dac71361 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalMode.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/GlobalMode.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalProperties.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/GlobalProperties.java
index 62bc070080e..62bc070080e 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalProperties.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/GlobalProperties.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalSettings.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/GlobalSettings.java
index 4e5ebdd9c98..3ff5dce8ecd 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalSettings.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/GlobalSettings.java
@@ -27,7 +27,7 @@ import org.sonar.api.CoreProperties;
 import org.sonar.api.config.PropertyDefinitions;
 import org.sonar.api.config.Settings;
 import org.sonar.api.utils.MessageException;
-import org.sonar.batch.protocol.input.GlobalRepositories;
+import org.sonar.scanner.protocol.input.GlobalRepositories;
 
 public class GlobalSettings extends Settings {
 
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalTempFolderProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/GlobalTempFolderProvider.java
index 2ea3bff55a3..2ea3bff55a3 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalTempFolderProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/GlobalTempFolderProvider.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/MetricProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/MetricProvider.java
index 1735ab4a79b..1735ab4a79b 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/MetricProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/MetricProvider.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/PluginInstaller.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/PluginInstaller.java
index 64f923bd9a5..64f923bd9a5 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/PluginInstaller.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/PluginInstaller.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/Slf4jLogger.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/Slf4jLogger.java
index 270bc10fe0d..270bc10fe0d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/Slf4jLogger.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/Slf4jLogger.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/UserProperties.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/UserProperties.java
index d16f8e72d27..d16f8e72d27 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/UserProperties.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/UserProperties.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/package-info.java
index 0efbab080ec..0efbab080ec 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/Batch.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/Batch.java
index d5d3da13087..d5d3da13087 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/Batch.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/Batch.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/EnvironmentInformation.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/EnvironmentInformation.java
index a04da9df40a..a04da9df40a 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/EnvironmentInformation.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/EnvironmentInformation.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/IssueListener.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/IssueListener.java
index bf3f399142a..bf3f399142a 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/IssueListener.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/IssueListener.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/LogCallbackAppender.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/LogCallbackAppender.java
index 183cd378711..183cd378711 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/LogCallbackAppender.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/LogCallbackAppender.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/LogOutput.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/LogOutput.java
index b69c405d931..b69c405d931 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/LogOutput.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/LogOutput.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/LoggingConfiguration.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/LoggingConfiguration.java
index 41a741bbd08..41a741bbd08 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/LoggingConfiguration.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/LoggingConfiguration.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/LoggingConfigurator.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/LoggingConfigurator.java
index f7f45b1c6fe..f7f45b1c6fe 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/LoggingConfigurator.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/LoggingConfigurator.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/package-info.java
index 645b8d7dfe2..645b8d7dfe2 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cache/DefaultProjectCacheStatus.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/DefaultProjectCacheStatus.java
index 45baaecacc8..45baaecacc8 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cache/DefaultProjectCacheStatus.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/DefaultProjectCacheStatus.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cache/GlobalPersistentCacheProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/GlobalPersistentCacheProvider.java
index 6b8677e2ada..6b8677e2ada 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cache/GlobalPersistentCacheProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/GlobalPersistentCacheProvider.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cache/NonAssociatedCacheSynchronizer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/NonAssociatedCacheSynchronizer.java
index 9287c268634..9287c268634 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cache/NonAssociatedCacheSynchronizer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/NonAssociatedCacheSynchronizer.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cache/ProjectCacheStatus.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/ProjectCacheStatus.java
index ef5fd9754a1..ef5fd9754a1 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cache/ProjectCacheStatus.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/ProjectCacheStatus.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cache/ProjectCacheSynchronizer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/ProjectCacheSynchronizer.java
index 9272d279aad..64010b34c41 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cache/ProjectCacheSynchronizer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/ProjectCacheSynchronizer.java
@@ -32,7 +32,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.api.utils.log.Profiler;
-import org.sonar.batch.protocol.input.BatchInput.ServerIssue;
 import org.sonar.batch.repository.ProjectRepositories;
 import org.sonar.batch.repository.ProjectRepositoriesLoader;
 import org.sonar.batch.repository.QualityProfileLoader;
@@ -40,6 +39,7 @@ import org.sonar.batch.repository.ServerIssuesLoader;
 import org.sonar.batch.repository.user.UserRepositoryLoader;
 import org.sonar.batch.rule.ActiveRulesLoader;
 import org.sonar.batch.rule.RulesLoader;
+import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
 import org.sonarqube.ws.QualityProfiles.SearchWsResponse.QualityProfile;
 
 public class ProjectCacheSynchronizer {
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cache/ProjectKeySupplier.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/ProjectKeySupplier.java
index abbd8a69485..abbd8a69485 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cache/ProjectKeySupplier.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/ProjectKeySupplier.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cache/ProjectPersistentCacheProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/ProjectPersistentCacheProvider.java
index 2594a006543..2594a006543 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cache/ProjectPersistentCacheProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/ProjectPersistentCacheProvider.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cache/ProjectSyncContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/ProjectSyncContainer.java
index 816091786b3..816091786b3 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cache/ProjectSyncContainer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/ProjectSyncContainer.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cache/StrategyWSLoaderProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/StrategyWSLoaderProvider.java
index d89de5ba448..d89de5ba448 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cache/StrategyWSLoaderProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/StrategyWSLoaderProvider.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cache/WSLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/WSLoader.java
index 328480e68bf..328480e68bf 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cache/WSLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/WSLoader.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cache/WSLoaderResult.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/WSLoaderResult.java
index 29db0bcb3a7..29db0bcb3a7 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cache/WSLoaderResult.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/WSLoaderResult.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cache/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/package-info.java
index 3f72a2d38b6..3f72a2d38b6 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cache/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cache/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cpd/CpdComponents.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/CpdComponents.java
index 30f4863783d..30f4863783d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cpd/CpdComponents.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/CpdComponents.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cpd/CpdExecutor.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/CpdExecutor.java
index 38cee8c127c..410938bab46 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cpd/CpdExecutor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/CpdExecutor.java
@@ -29,9 +29,6 @@ import org.sonar.api.utils.log.Loggers;
 import org.sonar.batch.cpd.index.SonarCpdBlockIndex;
 import org.sonar.batch.index.BatchComponent;
 import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReport.Duplicate;
-import org.sonar.batch.protocol.output.BatchReport.Duplication;
 import org.sonar.batch.report.ReportPublisher;
 import org.sonar.batch.util.ProgressReport;
 import org.sonar.duplications.block.Block;
@@ -39,7 +36,9 @@ import org.sonar.duplications.detector.suffixtree.SuffixTreeCloneDetectionAlgori
 import org.sonar.duplications.index.CloneGroup;
 import org.sonar.duplications.index.ClonePart;
 import org.sonar.duplications.index.PackedMemoryCloneIndex.ResourceBlocks;
-
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReport.Duplicate;
+import org.sonar.scanner.protocol.output.ScannerReport.Duplication;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
@@ -165,15 +164,15 @@ public class CpdExecutor {
       LOG.warn("Too many duplication groups on file " + component.inputComponent() + ". Keep only the first " + MAX_CLONE_GROUP_PER_FILE +
         " groups.");
     }
-    Iterable<org.sonar.batch.protocol.output.BatchReport.Duplication> reportDuplications = from(duplications)
+    Iterable<org.sonar.scanner.protocol.output.ScannerReport.Duplication> reportDuplications = from(duplications)
       .limit(MAX_CLONE_GROUP_PER_FILE)
       .transform(
-        new Function<CloneGroup, BatchReport.Duplication>() {
-          private final BatchReport.Duplication.Builder dupBuilder = BatchReport.Duplication.newBuilder();
-          private final BatchReport.Duplicate.Builder blockBuilder = BatchReport.Duplicate.newBuilder();
+        new Function<CloneGroup, ScannerReport.Duplication>() {
+          private final ScannerReport.Duplication.Builder dupBuilder = ScannerReport.Duplication.newBuilder();
+          private final ScannerReport.Duplicate.Builder blockBuilder = ScannerReport.Duplicate.newBuilder();
 
           @Override
-          public BatchReport.Duplication apply(CloneGroup input) {
+          public ScannerReport.Duplication apply(CloneGroup input) {
             return toReportDuplication(component, dupBuilder, blockBuilder, input);
           }
 
@@ -185,7 +184,7 @@ public class CpdExecutor {
     dupBuilder.clear();
     ClonePart originBlock = input.getOriginPart();
     blockBuilder.clear();
-    dupBuilder.setOriginPosition(BatchReport.TextRange.newBuilder()
+    dupBuilder.setOriginPosition(ScannerReport.TextRange.newBuilder()
       .setStartLine(originBlock.getStartLine())
       .setEndLine(originBlock.getEndLine())
       .build());
@@ -206,7 +205,7 @@ public class CpdExecutor {
           blockBuilder.setOtherFileRef(sameProjectComponent.batchId());
         }
         dupBuilder.addDuplicate(blockBuilder
-          .setRange(BatchReport.TextRange.newBuilder()
+          .setRange(ScannerReport.TextRange.newBuilder()
             .setStartLine(duplicate.getStartLine())
             .setEndLine(duplicate.getEndLine())
             .build())
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cpd/CpdIndexer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/CpdIndexer.java
index 9ebf80c88a7..9ebf80c88a7 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cpd/CpdIndexer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/CpdIndexer.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cpd/CpdMappings.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/CpdMappings.java
index 9a930d62fb5..9a930d62fb5 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cpd/CpdMappings.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/CpdMappings.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cpd/CpdSensor.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/CpdSensor.java
index 9ea1bac9254..9ea1bac9254 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cpd/CpdSensor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/CpdSensor.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cpd/DefaultCpdBlockIndexer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/DefaultCpdBlockIndexer.java
index 33b2f269595..33b2f269595 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cpd/DefaultCpdBlockIndexer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/DefaultCpdBlockIndexer.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cpd/DuplicationPredicates.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/DuplicationPredicates.java
index e016ae6f970..e016ae6f970 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cpd/DuplicationPredicates.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/DuplicationPredicates.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cpd/JavaCpdBlockIndexer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/JavaCpdBlockIndexer.java
index a2dde817c74..a2dde817c74 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cpd/JavaCpdBlockIndexer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/JavaCpdBlockIndexer.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cpd/index/SonarCpdBlockIndex.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/index/SonarCpdBlockIndex.java
index 48ee611ffaf..e819c12e32e 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cpd/index/SonarCpdBlockIndex.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/index/SonarCpdBlockIndex.java
@@ -30,7 +30,6 @@ import org.sonar.api.CoreProperties;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.config.Settings;
 import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.batch.report.ReportPublisher;
 import org.sonar.duplications.block.Block;
 import org.sonar.duplications.block.ByteArray;
@@ -38,6 +37,7 @@ import org.sonar.duplications.index.AbstractCloneIndex;
 import org.sonar.duplications.index.CloneIndex;
 import org.sonar.duplications.index.PackedMemoryCloneIndex;
 import org.sonar.duplications.index.PackedMemoryCloneIndex.ResourceBlocks;
+import org.sonar.scanner.protocol.output.ScannerReport;
 
 public class SonarCpdBlockIndex extends AbstractCloneIndex {
 
@@ -57,10 +57,10 @@ public class SonarCpdBlockIndex extends AbstractCloneIndex {
   public void insert(InputFile inputFile, Collection<Block> blocks) {
     if (isCrossProjectDuplicationEnabled(settings)) {
       int id = batchComponentCache.get(inputFile).batchId();
-      final BatchReport.CpdTextBlock.Builder builder = BatchReport.CpdTextBlock.newBuilder();
-      publisher.getWriter().writeCpdTextBlocks(id, Iterables.transform(blocks, new Function<Block, BatchReport.CpdTextBlock>() {
+      final ScannerReport.CpdTextBlock.Builder builder = ScannerReport.CpdTextBlock.newBuilder();
+      publisher.getWriter().writeCpdTextBlocks(id, Iterables.transform(blocks, new Function<Block, ScannerReport.CpdTextBlock>() {
         @Override
-        public BatchReport.CpdTextBlock apply(Block input) {
+        public ScannerReport.CpdTextBlock apply(Block input) {
           builder.clear();
           builder.setStartLine(input.getStartLine());
           builder.setEndLine(input.getEndLine());
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cpd/index/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/index/package-info.java
index 86431b3a529..86431b3a529 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cpd/index/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/index/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cpd/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/package-info.java
index c4205b6d38e..c4205b6d38e 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cpd/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/deprecated/DeprecatedSensorContext.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/DeprecatedSensorContext.java
index 33a56f3e5ee..33a56f3e5ee 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/deprecated/DeprecatedSensorContext.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/DeprecatedSensorContext.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/deprecated/InputFileComponent.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/InputFileComponent.java
index e8dcc72cb32..e8dcc72cb32 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/deprecated/InputFileComponent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/InputFileComponent.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/deprecated/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/package-info.java
index 9ec5890816a..9ec5890816a 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/deprecated/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/deprecated/perspectives/BatchPerspectives.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/perspectives/BatchPerspectives.java
index ebc8465b0d3..ebc8465b0d3 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/deprecated/perspectives/BatchPerspectives.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/perspectives/BatchPerspectives.java
diff --git a/sonar-batch/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..0f38dc2ed41 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/deprecated/perspectives/PerspectiveBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/perspectives/PerspectiveBuilder.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/deprecated/perspectives/PerspectiveNotFoundException.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/perspectives/PerspectiveNotFoundException.java
index 76dcaf532eb..76dcaf532eb 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/deprecated/perspectives/PerspectiveNotFoundException.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/perspectives/PerspectiveNotFoundException.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/deprecated/perspectives/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/perspectives/package-info.java
index 1496e020dd6..1496e020dd6 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/deprecated/perspectives/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/perspectives/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/events/BatchEvent.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/events/BatchEvent.java
index f168bb4cd7e..f168bb4cd7e 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/events/BatchEvent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/events/BatchEvent.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/events/BatchStepEvent.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/events/BatchStepEvent.java
index cfa628edbf0..cfa628edbf0 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/events/BatchStepEvent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/events/BatchStepEvent.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/events/BatchStepHandler.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/events/BatchStepHandler.java
index 9d2cc5e54ba..9d2cc5e54ba 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/events/BatchStepHandler.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/events/BatchStepHandler.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/events/EventBus.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/events/EventBus.java
index 4b1629f1444..4b1629f1444 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/events/EventBus.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/events/EventBus.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/events/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/events/package-info.java
index 922fe861be7..922fe861be7 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/events/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/events/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/BatchComponent.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/index/BatchComponent.java
index 9690c833b1e..9690c833b1e 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/index/BatchComponent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/index/BatchComponent.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/BatchComponentCache.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/index/BatchComponentCache.java
index 68c29f69c95..68c29f69c95 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/index/BatchComponentCache.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/index/BatchComponentCache.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/Bucket.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/index/Bucket.java
index 5fde268c097..5fde268c097 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/index/Bucket.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/index/Bucket.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/Cache.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/index/Cache.java
index ad194c3aad0..ad194c3aad0 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/index/Cache.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/index/Cache.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/Caches.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/index/Caches.java
index ddddb271dfd..ddddb271dfd 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/index/Caches.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/index/Caches.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/CachesManager.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/index/CachesManager.java
index 010375a84eb..010375a84eb 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/index/CachesManager.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/index/CachesManager.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/index/DefaultIndex.java
index d5f1a561729..d5f1a561729 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/index/DefaultIndex.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/index/package-info.java
index 6fc80086043..6fc80086043 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/index/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/index/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/DefaultFilterableIssue.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DefaultFilterableIssue.java
index a7f28e5bfa4..12dac2c1902 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/DefaultFilterableIssue.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DefaultFilterableIssue.java
@@ -25,7 +25,7 @@ import org.apache.commons.lang.builder.ToStringStyle;
 import org.sonar.api.resources.Project;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.scan.issue.filter.FilterableIssue;
-import org.sonar.batch.protocol.output.BatchReport.Issue;
+import org.sonar.scanner.protocol.output.ScannerReport.Issue;
 
 public class DefaultFilterableIssue implements FilterableIssue {
   private final Issue rawIssue;
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/DefaultIssuable.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DefaultIssuable.java
index 291fb7bb2ee..291fb7bb2ee 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/DefaultIssuable.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DefaultIssuable.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/DefaultIssueCallback.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DefaultIssueCallback.java
index e021cc02884..4c6a3b5c1e4 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/DefaultIssueCallback.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DefaultIssueCallback.java
@@ -25,14 +25,13 @@ import org.apache.commons.lang.StringUtils;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.batch.rule.Rule;
 import org.sonar.api.batch.rule.Rules;
-import org.sonar.batch.protocol.input.BatchInput.User;
-
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
 import org.sonar.batch.repository.user.UserRepositoryLoader;
+import org.sonar.scanner.protocol.input.ScannerInput.User;
 import org.sonar.batch.bootstrapper.IssueListener;
 
 public class DefaultIssueCallback implements IssueCallback {
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/DefaultIssueFilterChain.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DefaultIssueFilterChain.java
index 2d9b86ad4a8..2d9b86ad4a8 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/DefaultIssueFilterChain.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DefaultIssueFilterChain.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/DefaultProjectIssues.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DefaultProjectIssues.java
index be81a1a2a53..be81a1a2a53 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/DefaultProjectIssues.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DefaultProjectIssues.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/DeprecatedIssueAdapterForFilter.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DeprecatedIssueAdapterForFilter.java
index f6df0fdbd39..9dfa16d7f7f 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/DeprecatedIssueAdapterForFilter.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DeprecatedIssueAdapterForFilter.java
@@ -36,10 +36,10 @@ import org.sonar.api.utils.Duration;
 @Deprecated
 class DeprecatedIssueAdapterForFilter implements Issue {
   private final Project project;
-  private final org.sonar.batch.protocol.output.BatchReport.Issue rawIssue;
+  private final org.sonar.scanner.protocol.output.ScannerReport.Issue rawIssue;
   private final String componentKey;
 
-  DeprecatedIssueAdapterForFilter(Project project, org.sonar.batch.protocol.output.BatchReport.Issue rawIssue, String componentKey) {
+  DeprecatedIssueAdapterForFilter(Project project, org.sonar.scanner.protocol.output.ScannerReport.Issue rawIssue, String componentKey) {
     this.project = project;
     this.rawIssue = rawIssue;
     this.componentKey = componentKey;
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/DeprecatedIssueBuilderWrapper.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DeprecatedIssueBuilderWrapper.java
index 0ebef7b6c73..0ebef7b6c73 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/DeprecatedIssueBuilderWrapper.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DeprecatedIssueBuilderWrapper.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/DeprecatedIssueFilterChain.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DeprecatedIssueFilterChain.java
index 83994cfb49d..83994cfb49d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/DeprecatedIssueFilterChain.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DeprecatedIssueFilterChain.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/DeprecatedIssueWrapper.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DeprecatedIssueWrapper.java
index 61e215cc931..61e215cc931 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/DeprecatedIssueWrapper.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DeprecatedIssueWrapper.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/IssuableFactory.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssuableFactory.java
index a2c7afc9c59..a2c7afc9c59 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/IssuableFactory.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssuableFactory.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/IssueCache.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueCache.java
index ac1bc6826a5..ac1bc6826a5 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/IssueCache.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueCache.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/IssueCallback.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueCallback.java
index b27b7887045..b27b7887045 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/IssueCallback.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueCallback.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/IssueFilters.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueFilters.java
index b84352da6df..ef542d551ab 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/IssueFilters.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueFilters.java
@@ -22,11 +22,11 @@ package org.sonar.batch.issue;
 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.issue.Issue;
 import org.sonar.api.scan.issue.filter.IssueFilter;
 import org.sonar.api.resources.Project;
-import org.sonar.batch.protocol.output.BatchReport;
 
 @BatchSide
 public class IssueFilters {
@@ -52,7 +52,7 @@ public class IssueFilters {
     this(project, new IssueFilter[0], new org.sonar.api.issue.batch.IssueFilter[0]);
   }
 
-  public boolean accept(String componentKey, BatchReport.Issue rawIssue) {
+  public boolean accept(String componentKey, ScannerReport.Issue rawIssue) {
     IssueFilterChain filterChain = new DefaultIssueFilterChain(filters);
     FilterableIssue fIssue = new DefaultFilterableIssue(project, rawIssue, componentKey);
     if (filterChain.accept(fIssue)) {
@@ -62,7 +62,7 @@ public class IssueFilters {
     return false;
   }
 
-  public boolean acceptDeprecated(String componentKey, BatchReport.Issue rawIssue) {
+  public boolean acceptDeprecated(String componentKey, ScannerReport.Issue rawIssue) {
     Issue issue = new DeprecatedIssueAdapterForFilter(project, rawIssue, componentKey);
     return new DeprecatedIssueFilterChain(deprecatedFilters).accept(issue);
   }
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/IssueTransformer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueTransformer.java
index b606854be93..8a34253114b 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/IssueTransformer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueTransformer.java
@@ -30,11 +30,11 @@ import org.sonar.api.rule.RuleKey;
 import org.sonar.batch.index.BatchComponent;
 import org.sonar.batch.issue.tracking.SourceHashHolder;
 import org.sonar.batch.issue.tracking.TrackedIssue;
-import org.sonar.batch.protocol.input.BatchInput.ServerIssue;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReport.TextRange;
 import org.sonar.core.component.ComponentKeys;
 import org.sonar.core.util.Uuids;
+import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReport.TextRange;
 
 public class IssueTransformer {
   private IssueTransformer() {
@@ -72,17 +72,17 @@ public class IssueTransformer {
     issue.setResolution(Issue.RESOLUTION_REMOVED);
   }
 
-  public static Collection<TrackedIssue> toTrackedIssue(BatchComponent component, Collection<BatchReport.Issue> rawIssues, @Nullable SourceHashHolder hashes) {
+  public static Collection<TrackedIssue> toTrackedIssue(BatchComponent component, Collection<ScannerReport.Issue> rawIssues, @Nullable SourceHashHolder hashes) {
     List<TrackedIssue> issues = new ArrayList<>(rawIssues.size());
 
-    for (BatchReport.Issue issue : rawIssues) {
+    for (ScannerReport.Issue issue : rawIssues) {
       issues.add(toTrackedIssue(component, issue, hashes));
     }
 
     return issues;
   }
 
-  public static TrackedIssue toTrackedIssue(BatchComponent component, BatchReport.Issue rawIssue, @Nullable SourceHashHolder hashes) {
+  public static TrackedIssue toTrackedIssue(BatchComponent component, ScannerReport.Issue rawIssue, @Nullable SourceHashHolder hashes) {
     RuleKey ruleKey = RuleKey.of(rawIssue.getRuleRepository(), rawIssue.getRuleKey());
 
     Preconditions.checkNotNull(component.key(), "Component key must be set");
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/ModuleIssues.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ModuleIssues.java
index fb798fd563b..433c8826f85 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/ModuleIssues.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ModuleIssues.java
@@ -32,11 +32,11 @@ import org.sonar.api.rule.RuleKey;
 import org.sonar.api.utils.MessageException;
 import org.sonar.batch.index.BatchComponent;
 import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.protocol.Constants.Severity;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReport.IssueLocation;
-import org.sonar.batch.protocol.output.BatchReport.IssueLocation.Builder;
 import org.sonar.batch.report.ReportPublisher;
+import org.sonar.scanner.protocol.Constants.Severity;
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReport.IssueLocation;
+import org.sonar.scanner.protocol.output.ScannerReport.IssueLocation.Builder;
 
 /**
  * Initialize the issues raised during scan.
@@ -48,10 +48,10 @@ public class ModuleIssues {
   private final IssueFilters filters;
   private final ReportPublisher reportPublisher;
   private final BatchComponentCache componentCache;
-  private final BatchReport.Issue.Builder builder = BatchReport.Issue.newBuilder();
+  private final ScannerReport.Issue.Builder builder = ScannerReport.Issue.newBuilder();
   private final Builder locationBuilder = IssueLocation.newBuilder();
-  private final org.sonar.batch.protocol.output.BatchReport.TextRange.Builder textRangeBuilder = org.sonar.batch.protocol.output.BatchReport.TextRange.newBuilder();
-  private final BatchReport.Flow.Builder flowBuilder = BatchReport.Flow.newBuilder();
+  private final org.sonar.scanner.protocol.output.ScannerReport.TextRange.Builder textRangeBuilder = org.sonar.scanner.protocol.output.ScannerReport.TextRange.newBuilder();
+  private final ScannerReport.Flow.Builder flowBuilder = ScannerReport.Flow.newBuilder();
 
   public ModuleIssues(ActiveRules activeRules, Rules rules, IssueFilters filters, ReportPublisher reportPublisher, BatchComponentCache componentCache) {
     this.activeRules = activeRules;
@@ -96,7 +96,7 @@ public class ModuleIssues {
       builder.setGap(gap);
     }
     applyFlows(issue);
-    BatchReport.Issue rawIssue = builder.build();
+    ScannerReport.Issue rawIssue = builder.build();
 
     if (filters.accept(inputComponent.key(), rawIssue)) {
       write(component, rawIssue);
@@ -127,7 +127,7 @@ public class ModuleIssues {
     }
   }
 
-  private org.sonar.batch.protocol.output.BatchReport.TextRange toProtobufTextRange(TextRange primaryTextRange) {
+  private org.sonar.scanner.protocol.output.ScannerReport.TextRange toProtobufTextRange(TextRange primaryTextRange) {
     textRangeBuilder.clear();
     textRangeBuilder.setStartLine(primaryTextRange.start().line());
     textRangeBuilder.setStartOffset(primaryTextRange.start().lineOffset());
@@ -148,7 +148,7 @@ public class ModuleIssues {
     return rule;
   }
 
-  public void write(BatchComponent component, BatchReport.Issue rawIssue) {
+  public void write(BatchComponent component, ScannerReport.Issue rawIssue) {
     reportPublisher.getWriter().appendComponentIssue(component.batchId(), rawIssue);
   }
 
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/TrackedIssueAdapter.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/TrackedIssueAdapter.java
index 19027847d9d..19027847d9d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/TrackedIssueAdapter.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/TrackedIssueAdapter.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/EnforceIssuesFilter.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/EnforceIssuesFilter.java
index de4920a1f06..de4920a1f06 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/EnforceIssuesFilter.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/EnforceIssuesFilter.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/IgnoreIssuesFilter.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/IgnoreIssuesFilter.java
index 99a716148c6..99a716148c6 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/IgnoreIssuesFilter.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/IgnoreIssuesFilter.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/package-info.java
index ead2a62c636..ead2a62c636 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/package-info.java
diff --git a/sonar-batch/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 a3e58803a71..a3e58803a71 100644
--- a/sonar-batch/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
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/IssueExclusionPatternInitializer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/IssueExclusionPatternInitializer.java
index 74d80f95186..74d80f95186 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/IssueExclusionPatternInitializer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/IssueExclusionPatternInitializer.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/IssueInclusionPatternInitializer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/IssueInclusionPatternInitializer.java
index 9fec33bb952..9fec33bb952 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/IssueInclusionPatternInitializer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/IssueInclusionPatternInitializer.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/IssuePattern.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/IssuePattern.java
index 4c4cc0b4715..4c4cc0b4715 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/IssuePattern.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/IssuePattern.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/LineRange.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/LineRange.java
index 72d43f5f216..72d43f5f216 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/LineRange.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/LineRange.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/PatternDecoder.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/PatternDecoder.java
index 11dc501cac4..11dc501cac4 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/PatternDecoder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/PatternDecoder.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/PatternMatcher.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/PatternMatcher.java
index 80b6f716cff..80b6f716cff 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/PatternMatcher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/PatternMatcher.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/package-info.java
index ebbc7b8371e..ebbc7b8371e 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsLoader.java
index 8622dc618eb..8622dc618eb 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsLoader.java
diff --git a/sonar-batch/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..de465ad4dc5 100644
--- a/sonar-batch/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
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/scanner/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/scanner/package-info.java
index 3beb574f061..3beb574f061 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/scanner/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/scanner/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/package-info.java
index 75db5554d7f..75db5554d7f 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/DefaultServerLineHashesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/DefaultServerLineHashesLoader.java
index 954997466fe..954997466fe 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/DefaultServerLineHashesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/DefaultServerLineHashesLoader.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/FileHashes.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/FileHashes.java
index 3284b5a681b..3284b5a681b 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/FileHashes.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/FileHashes.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/IssueTrackingInput.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/IssueTrackingInput.java
index 031396b54d7..031396b54d7 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/IssueTrackingInput.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/IssueTrackingInput.java
diff --git a/sonar-batch/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 fef29bfcb39..bff1974a99d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/IssueTransition.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/IssueTransition.java
@@ -26,11 +26,10 @@ import org.sonar.api.resources.Project;
 import org.sonar.batch.index.BatchComponent;
 import org.sonar.batch.index.BatchComponentCache;
 import org.sonar.batch.issue.IssueCache;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReportReader;
 import org.sonar.batch.report.ReportPublisher;
 import org.sonar.core.util.CloseableIterator;
-
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReportReader;
 import javax.annotation.Nullable;
 
 import java.util.ArrayList;
@@ -66,7 +65,7 @@ public class IssueTransition {
       localIssueTracking.init();
     }
 
-    BatchReportReader reader = new BatchReportReader(reportPublisher.getReportDir());
+    ScannerReportReader reader = new ScannerReportReader(reportPublisher.getReportDir());
     int nbComponents = componentCache.all().size();
 
     if (nbComponents == 0) {
@@ -88,10 +87,10 @@ public class IssueTransition {
     }
   }
 
-  public void trackIssues(BatchReportReader reader, BatchComponent component) {
+  public void trackIssues(ScannerReportReader reader, BatchComponent component) {
     // raw issues = all the issues created by rule engines during this module scan and not excluded by filters
-    List<BatchReport.Issue> rawIssues = new LinkedList<>();
-    try (CloseableIterator<BatchReport.Issue> it = reader.readComponentIssues(component.batchId())) {
+    List<ScannerReport.Issue> rawIssues = new LinkedList<>();
+    try (CloseableIterator<ScannerReport.Issue> it = reader.readComponentIssues(component.batchId())) {
       while (it.hasNext()) {
         rawIssues.add(it.next());
       }
@@ -111,10 +110,10 @@ public class IssueTransition {
     }
   }
 
-  private static List<TrackedIssue> doTransition(List<BatchReport.Issue> rawIssues, BatchComponent component) {
+  private static List<TrackedIssue> doTransition(List<ScannerReport.Issue> rawIssues, BatchComponent component) {
     List<TrackedIssue> issues = new ArrayList<>(rawIssues.size());
 
-    for (BatchReport.Issue issue : rawIssues) {
+    for (ScannerReport.Issue issue : rawIssues) {
       issues.add(IssueTransformer.toTrackedIssue(component, issue, null));
     }
 
diff --git a/sonar-batch/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 5a6c739b956..634326771d4 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/LocalIssueTracking.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/LocalIssueTracking.java
@@ -20,6 +20,7 @@
 package org.sonar.batch.issue.tracking;
 
 import org.sonar.core.issue.tracking.Tracking;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.core.issue.tracking.Input;
 import org.sonar.core.issue.tracking.Tracker;
 import org.sonar.batch.issue.IssueTransformer;
@@ -45,7 +46,6 @@ import org.sonar.api.batch.rule.ActiveRules;
 import org.sonar.api.issue.Issue;
 import org.sonar.api.resources.ResourceUtils;
 import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.batch.repository.ProjectRepositories;
 
 @BatchSide
@@ -74,7 +74,7 @@ public class LocalIssueTracking {
     }
   }
 
-  public List<TrackedIssue> trackIssues(BatchComponent component, Collection<BatchReport.Issue> reportIssues, Date analysisDate) {
+  public List<TrackedIssue> trackIssues(BatchComponent component, Collection<ScannerReport.Issue> reportIssues, Date analysisDate) {
     List<TrackedIssue> trackedIssues = new LinkedList<>();
     if (hasServerAnalysis) {
       // all the issues that are not closed in db before starting this module scan, including manual issues
@@ -143,7 +143,7 @@ public class LocalIssueTracking {
 
   private void copyServerIssues(Collection<ServerIssueFromWs> serverIssues, List<TrackedIssue> trackedIssues) {
     for (ServerIssueFromWs serverIssue : serverIssues) {
-      org.sonar.batch.protocol.input.BatchInput.ServerIssue unmatchedPreviousIssue = serverIssue.getDto();
+      org.sonar.scanner.protocol.input.ScannerInput.ServerIssue unmatchedPreviousIssue = serverIssue.getDto();
       TrackedIssue unmatched = IssueTransformer.toTrackedIssue(unmatchedPreviousIssue);
 
       ActiveRule activeRule = activeRules.find(unmatched.getRuleKey());
@@ -173,7 +173,7 @@ public class LocalIssueTracking {
 
   private Collection<ServerIssueFromWs> loadServerIssues(BatchComponent component) {
     Collection<ServerIssueFromWs> serverIssues = new ArrayList<>();
-    for (org.sonar.batch.protocol.input.BatchInput.ServerIssue previousIssue : serverIssueRepository.byComponent(component)) {
+    for (org.sonar.scanner.protocol.input.ScannerInput.ServerIssue previousIssue : serverIssueRepository.byComponent(component)) {
       serverIssues.add(new ServerIssueFromWs(previousIssue));
     }
     return serverIssues;
@@ -182,7 +182,7 @@ public class LocalIssueTracking {
   @VisibleForTesting
   protected void mergeMatched(Tracking<TrackedIssue, ServerIssueFromWs> result, Collection<TrackedIssue> mergeTo, Collection<TrackedIssue> rawIssues) {
     for (Map.Entry<TrackedIssue, ServerIssueFromWs> e : result.getMatchedRaws().entrySet()) {
-      org.sonar.batch.protocol.input.BatchInput.ServerIssue dto = e.getValue().getDto();
+      org.sonar.scanner.protocol.input.ScannerInput.ServerIssue dto = e.getValue().getDto();
       TrackedIssue tracked = e.getKey();
 
       // invariant fields
@@ -207,7 +207,7 @@ public class LocalIssueTracking {
 
   private void addUnmatchedFromServer(Iterable<ServerIssueFromWs> unmatchedIssues, SourceHashHolder sourceHashHolder, Collection<TrackedIssue> mergeTo) {
     for (ServerIssueFromWs unmatchedIssue : unmatchedIssues) {
-      org.sonar.batch.protocol.input.BatchInput.ServerIssue unmatchedPreviousIssue = unmatchedIssue.getDto();
+      org.sonar.scanner.protocol.input.ScannerInput.ServerIssue unmatchedPreviousIssue = unmatchedIssue.getDto();
       TrackedIssue unmatched = IssueTransformer.toTrackedIssue(unmatchedPreviousIssue);
       if (unmatchedIssue.getRuleKey().isManual() && !Issue.STATUS_CLOSED.equals(unmatchedPreviousIssue.getStatus())) {
         relocateManualIssue(unmatched, unmatchedIssue, sourceHashHolder);
@@ -225,7 +225,7 @@ public class LocalIssueTracking {
   }
 
   private void addIssuesOnDeletedComponents(Collection<TrackedIssue> issues) {
-    for (org.sonar.batch.protocol.input.BatchInput.ServerIssue previous : serverIssueRepository.issuesOnMissingComponents()) {
+    for (org.sonar.scanner.protocol.input.ScannerInput.ServerIssue previous : serverIssueRepository.issuesOnMissingComponents()) {
       TrackedIssue dead = IssueTransformer.toTrackedIssue(previous);
       updateUnmatchedIssue(dead, true);
       issues.add(dead);
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/RollingFileHashes.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/RollingFileHashes.java
index aaf2ba7bdf5..aaf2ba7bdf5 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/RollingFileHashes.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/RollingFileHashes.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/ServerIssueFromWs.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/ServerIssueFromWs.java
index bbc68cb1455..7898d5c88eb 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/ServerIssueFromWs.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/ServerIssueFromWs.java
@@ -26,13 +26,13 @@ import org.sonar.api.rule.RuleKey;
 
 public class ServerIssueFromWs implements Trackable {
 
-  private org.sonar.batch.protocol.input.BatchInput.ServerIssue dto;
+  private org.sonar.scanner.protocol.input.ScannerInput.ServerIssue dto;
 
-  public ServerIssueFromWs(org.sonar.batch.protocol.input.BatchInput.ServerIssue dto) {
+  public ServerIssueFromWs(org.sonar.scanner.protocol.input.ScannerInput.ServerIssue dto) {
     this.dto = dto;
   }
 
-  public org.sonar.batch.protocol.input.BatchInput.ServerIssue getDto() {
+  public org.sonar.scanner.protocol.input.ScannerInput.ServerIssue getDto() {
     return dto;
   }
 
diff --git a/sonar-batch/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 eb864b04c61..16f104583fd 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/ServerIssueRepository.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/ServerIssueRepository.java
@@ -30,10 +30,10 @@ import org.sonar.batch.index.BatchComponent;
 import org.sonar.batch.index.BatchComponentCache;
 import org.sonar.batch.index.Cache;
 import org.sonar.batch.index.Caches;
-import org.sonar.batch.protocol.input.BatchInput.ServerIssue;
 import org.sonar.batch.repository.ServerIssuesLoader;
 import org.sonar.batch.scan.ImmutableProjectReactor;
 import org.sonar.core.component.ComponentKeys;
+import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
 
 @InstantiationStrategy(InstantiationStrategy.PER_BATCH)
 @BatchSide
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/ServerIssueValueCoder.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/ServerIssueValueCoder.java
index c3c6f26b451..44876e4761c 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/ServerIssueValueCoder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/ServerIssueValueCoder.java
@@ -22,9 +22,8 @@ package org.sonar.batch.issue.tracking;
 import com.persistit.Value;
 import com.persistit.encoding.CoderContext;
 import com.persistit.encoding.ValueCoder;
-import org.sonar.batch.protocol.input.BatchInput.ServerIssue;
-
 import java.io.IOException;
+import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
 
 public class ServerIssueValueCoder implements ValueCoder {
 
diff --git a/sonar-batch/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 fb0b32d0d2b..fb0b32d0d2b 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/ServerLineHashesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/ServerLineHashesLoader.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/SourceHashHolder.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/SourceHashHolder.java
index 583a92f0b9d..583a92f0b9d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/SourceHashHolder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/SourceHashHolder.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/TrackedIssue.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/TrackedIssue.java
index ea303bf6a4f..ea303bf6a4f 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/TrackedIssue.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/TrackedIssue.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/package-info.java
index 148dc77f0f4..148dc77f0f4 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/mediumtest/FakePluginInstaller.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/FakePluginInstaller.java
index 71205c7b08d..71205c7b08d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/mediumtest/FakePluginInstaller.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/FakePluginInstaller.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/mediumtest/ScanTaskObserver.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/ScanTaskObserver.java
index 05b9f338eef..05b9f338eef 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/mediumtest/ScanTaskObserver.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/ScanTaskObserver.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/mediumtest/ScanTaskObservers.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/ScanTaskObservers.java
index 90e092cad77..90e092cad77 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/mediumtest/ScanTaskObservers.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/ScanTaskObservers.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/mediumtest/TaskResult.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/TaskResult.java
index 04d2b8843e7..5d3d87b540d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/mediumtest/TaskResult.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/TaskResult.java
@@ -43,16 +43,16 @@ import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.batch.sensor.highlighting.TypeOfText;
 import org.sonar.batch.issue.IssueCache;
 import org.sonar.batch.issue.tracking.TrackedIssue;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReport.Component;
-import org.sonar.batch.protocol.output.BatchReport.Metadata;
-import org.sonar.batch.protocol.output.BatchReport.Symbol;
-import org.sonar.batch.protocol.output.BatchReportReader;
-import org.sonar.batch.report.BatchReportUtils;
+import org.sonar.batch.report.ScannerReportUtils;
 import org.sonar.batch.report.ReportPublisher;
 import org.sonar.batch.scan.ProjectScanContainer;
 import org.sonar.batch.scan.filesystem.InputPathCache;
 import org.sonar.core.util.CloseableIterator;
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReportReader;
+import org.sonar.scanner.protocol.output.ScannerReport.Component;
+import org.sonar.scanner.protocol.output.ScannerReport.Metadata;
+import org.sonar.scanner.protocol.output.ScannerReport.Symbol;
 
 public class TaskResult implements org.sonar.batch.mediumtest.ScanTaskObserver {
 
@@ -62,7 +62,7 @@ public class TaskResult implements org.sonar.batch.mediumtest.ScanTaskObserver {
   private Map<String, InputFile> inputFiles = new HashMap<>();
   private Map<String, Component> reportComponents = new HashMap<>();
   private Map<String, InputDir> inputDirs = new HashMap<>();
-  private BatchReportReader reader;
+  private ScannerReportReader reader;
 
   @Override
   public void scanTaskCompleted(ProjectScanContainer container) {
@@ -72,7 +72,7 @@ public class TaskResult implements org.sonar.batch.mediumtest.ScanTaskObserver {
     }
 
     ReportPublisher reportPublisher = container.getComponentByType(ReportPublisher.class);
-    reader = new BatchReportReader(reportPublisher.getReportDir());
+    reader = new ScannerReportReader(reportPublisher.getReportDir());
     if (!container.getComponentByType(AnalysisMode.class).isIssues()) {
       Metadata readMetadata = getReportReader().readMetadata();
       int rootComponentRef = readMetadata.getRootComponentRef();
@@ -96,7 +96,7 @@ public class TaskResult implements org.sonar.batch.mediumtest.ScanTaskObserver {
 
   }
 
-  public BatchReportReader getReportReader() {
+  public ScannerReportReader getReportReader() {
     return reader;
   }
 
@@ -118,19 +118,19 @@ public class TaskResult implements org.sonar.batch.mediumtest.ScanTaskObserver {
     return reportComponents.get(key);
   }
 
-  public List<BatchReport.Issue> issuesFor(InputComponent inputComponent) {
+  public List<ScannerReport.Issue> issuesFor(InputComponent inputComponent) {
     int ref = reportComponents.get(inputComponent.key()).getRef();
     return issuesFor(ref);
   }
 
-  public List<BatchReport.Issue> issuesFor(Component reportComponent) {
+  public List<ScannerReport.Issue> issuesFor(Component reportComponent) {
     int ref = reportComponent.getRef();
     return issuesFor(ref);
   }
 
-  private List<BatchReport.Issue> issuesFor(int ref) {
-    List<BatchReport.Issue> result = Lists.newArrayList();
-    try (CloseableIterator<BatchReport.Issue> it = reader.readComponentIssues(ref)) {
+  private List<ScannerReport.Issue> issuesFor(int ref) {
+    List<ScannerReport.Issue> result = Lists.newArrayList();
+    try (CloseableIterator<ScannerReport.Issue> it = reader.readComponentIssues(ref)) {
       while (it.hasNext()) {
         result.add(it.next());
       }
@@ -156,11 +156,11 @@ public class TaskResult implements org.sonar.batch.mediumtest.ScanTaskObserver {
     return inputDirs.get(relativePath);
   }
 
-  public Map<String, List<BatchReport.Measure>> allMeasures() {
-    Map<String, List<BatchReport.Measure>> result = new HashMap<>();
+  public Map<String, List<ScannerReport.Measure>> allMeasures() {
+    Map<String, List<ScannerReport.Measure>> result = new HashMap<>();
     for (Map.Entry<String, Component> component : reportComponents.entrySet()) {
-      List<BatchReport.Measure> measures = new ArrayList<>();
-      try (CloseableIterator<BatchReport.Measure> it = reader.readComponentMeasures(component.getValue().getRef())) {
+      List<ScannerReport.Measure> measures = new ArrayList<>();
+      try (CloseableIterator<ScannerReport.Measure> it = reader.readComponentMeasures(component.getValue().getRef())) {
         Iterators.addAll(measures, it);
       }
       result.put(component.getKey(), measures);
@@ -179,12 +179,12 @@ public class TaskResult implements org.sonar.batch.mediumtest.ScanTaskObserver {
     }
     TextPointer pointer = file.newPointer(line, lineOffset);
     List<TypeOfText> result = new ArrayList<>();
-    try (CloseableIterator<BatchReport.SyntaxHighlighting> it = reader.readComponentSyntaxHighlighting(ref)) {
+    try (CloseableIterator<ScannerReport.SyntaxHighlighting> it = reader.readComponentSyntaxHighlighting(ref)) {
       while (it.hasNext()) {
-        BatchReport.SyntaxHighlighting rule = it.next();
+        ScannerReport.SyntaxHighlighting rule = it.next();
         TextRange ruleRange = toRange(file, rule.getRange());
         if (ruleRange.start().compareTo(pointer) <= 0 && ruleRange.end().compareTo(pointer) > 0) {
-          result.add(BatchReportUtils.toBatchType(rule.getType()));
+          result.add(ScannerReportUtils.toBatchType(rule.getType()));
         }
       }
     } catch (Exception e) {
@@ -193,7 +193,7 @@ public class TaskResult implements org.sonar.batch.mediumtest.ScanTaskObserver {
     return result;
   }
 
-  private static TextRange toRange(InputFile file, BatchReport.TextRange reportRange) {
+  private static TextRange toRange(InputFile file, ScannerReport.TextRange reportRange) {
     return file.newRange(file.newPointer(reportRange.getStartLine(), reportRange.getStartOffset()), file.newPointer(reportRange.getEndLine(), reportRange.getEndOffset()));
   }
 
@@ -203,7 +203,7 @@ public class TaskResult implements org.sonar.batch.mediumtest.ScanTaskObserver {
    * @param symbolStartLineOffset 0-based end offset for the symbol in file
    */
   @CheckForNull
-  public List<BatchReport.TextRange> symbolReferencesFor(InputFile file, int symbolStartLine, int symbolStartLineOffset) {
+  public List<ScannerReport.TextRange> symbolReferencesFor(InputFile file, int symbolStartLine, int symbolStartLineOffset) {
     int ref = reportComponents.get(((DefaultInputFile) file).key()).getRef();
     try (CloseableIterator<Symbol> symbols = getReportReader().readComponentSymbols(ref)) {
       while (symbols.hasNext()) {
@@ -216,10 +216,10 @@ public class TaskResult implements org.sonar.batch.mediumtest.ScanTaskObserver {
     return Collections.emptyList();
   }
 
-  public List<BatchReport.Duplication> duplicationsFor(InputFile file) {
-    List<BatchReport.Duplication> result = new ArrayList<>();
+  public List<ScannerReport.Duplication> duplicationsFor(InputFile file) {
+    List<ScannerReport.Duplication> result = new ArrayList<>();
     int ref = reportComponents.get(((DefaultInputFile) file).key()).getRef();
-    try (CloseableIterator<BatchReport.Duplication> it = getReportReader().readComponentDuplications(ref)) {
+    try (CloseableIterator<ScannerReport.Duplication> it = getReportReader().readComponentDuplications(ref)) {
       while (it.hasNext()) {
         result.add(it.next());
       }
@@ -229,10 +229,10 @@ public class TaskResult implements org.sonar.batch.mediumtest.ScanTaskObserver {
     return result;
   }
 
-  public List<BatchReport.CpdTextBlock> duplicationBlocksFor(InputFile file) {
-    List<BatchReport.CpdTextBlock> result = new ArrayList<>();
+  public List<ScannerReport.CpdTextBlock> duplicationBlocksFor(InputFile file) {
+    List<ScannerReport.CpdTextBlock> result = new ArrayList<>();
     int ref = reportComponents.get(((DefaultInputFile) file).key()).getRef();
-    try (CloseableIterator<BatchReport.CpdTextBlock> it = getReportReader().readCpdTextBlocks(ref)) {
+    try (CloseableIterator<ScannerReport.CpdTextBlock> it = getReportReader().readCpdTextBlocks(ref)) {
       while (it.hasNext()) {
         result.add(it.next());
       }
@@ -243,11 +243,11 @@ public class TaskResult implements org.sonar.batch.mediumtest.ScanTaskObserver {
   }
 
   @CheckForNull
-  public BatchReport.Coverage coverageFor(InputFile file, int line) {
+  public ScannerReport.Coverage coverageFor(InputFile file, int line) {
     int ref = reportComponents.get(((DefaultInputFile) file).key()).getRef();
-    try (CloseableIterator<BatchReport.Coverage> it = getReportReader().readComponentCoverage(ref)) {
+    try (CloseableIterator<ScannerReport.Coverage> it = getReportReader().readComponentCoverage(ref)) {
       while (it.hasNext()) {
-        BatchReport.Coverage coverage = it.next();
+        ScannerReport.Coverage coverage = it.next();
         if (coverage.getLine() == line) {
           return coverage;
         }
@@ -258,15 +258,15 @@ public class TaskResult implements org.sonar.batch.mediumtest.ScanTaskObserver {
     return null;
   }
 
-  public BatchReport.Test testExecutionFor(InputFile testFile, String testName) {
+  public ScannerReport.Test testExecutionFor(InputFile testFile, String testName) {
     int ref = reportComponents.get(((DefaultInputFile) testFile).key()).getRef();
     try (InputStream inputStream = FileUtils.openInputStream(getReportReader().readTests(ref))) {
-      BatchReport.Test test = BatchReport.Test.PARSER.parseDelimitedFrom(inputStream);
+      ScannerReport.Test test = ScannerReport.Test.PARSER.parseDelimitedFrom(inputStream);
       while (test != null) {
         if (test.getName().equals(testName)) {
           return test;
         }
-        test = BatchReport.Test.PARSER.parseDelimitedFrom(inputStream);
+        test = ScannerReport.Test.PARSER.parseDelimitedFrom(inputStream);
       }
     } catch (Exception e) {
       throw new IllegalStateException(e);
@@ -274,15 +274,15 @@ public class TaskResult implements org.sonar.batch.mediumtest.ScanTaskObserver {
     return null;
   }
 
-  public BatchReport.CoverageDetail coveragePerTestFor(InputFile testFile, String testName) {
+  public ScannerReport.CoverageDetail coveragePerTestFor(InputFile testFile, String testName) {
     int ref = reportComponents.get(((DefaultInputFile) testFile).key()).getRef();
     try (InputStream inputStream = FileUtils.openInputStream(getReportReader().readCoverageDetails(ref))) {
-      BatchReport.CoverageDetail details = BatchReport.CoverageDetail.PARSER.parseDelimitedFrom(inputStream);
+      ScannerReport.CoverageDetail details = ScannerReport.CoverageDetail.PARSER.parseDelimitedFrom(inputStream);
       while (details != null) {
         if (details.getTestName().equals(testName)) {
           return details;
         }
-        details = BatchReport.CoverageDetail.PARSER.parseDelimitedFrom(inputStream);
+        details = ScannerReport.CoverageDetail.PARSER.parseDelimitedFrom(inputStream);
       }
     } catch (Exception e) {
       throw new IllegalStateException(e);
diff --git a/sonar-batch/src/main/java/org/sonar/batch/mediumtest/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/package-info.java
index 2cc10ab66ff..2cc10ab66ff 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/mediumtest/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/package-info.java
index 408dd9f93a6..408dd9f93a6 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/AbstractPhaseEvent.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/AbstractPhaseEvent.java
index df8bc690534..df8bc690534 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/phases/AbstractPhaseEvent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/AbstractPhaseEvent.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/AbstractPhaseExecutor.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/AbstractPhaseExecutor.java
index c388b75f1f3..c388b75f1f3 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/phases/AbstractPhaseExecutor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/AbstractPhaseExecutor.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/InitializerExecutionEvent.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/InitializerExecutionEvent.java
index 9a8bdc92706..9a8bdc92706 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/phases/InitializerExecutionEvent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/InitializerExecutionEvent.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/InitializersExecutor.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/InitializersExecutor.java
index 591969ea1b0..591969ea1b0 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/phases/InitializersExecutor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/InitializersExecutor.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/InitializersPhaseEvent.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/InitializersPhaseEvent.java
index 5e109625da6..5e109625da6 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/phases/InitializersPhaseEvent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/InitializersPhaseEvent.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/IssuesPhaseExecutor.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/IssuesPhaseExecutor.java
index ba9a155962e..ba9a155962e 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/phases/IssuesPhaseExecutor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/IssuesPhaseExecutor.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/PhasesTimeProfiler.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PhasesTimeProfiler.java
index ba8c7c498d0..ba8c7c498d0 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/phases/PhasesTimeProfiler.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PhasesTimeProfiler.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/PostJobExecutionEvent.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PostJobExecutionEvent.java
index b7cd92a217b..b7cd92a217b 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/phases/PostJobExecutionEvent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PostJobExecutionEvent.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/PostJobPhaseEvent.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PostJobPhaseEvent.java
index 860d7cc938d..860d7cc938d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/phases/PostJobPhaseEvent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PostJobPhaseEvent.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/PostJobsExecutor.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PostJobsExecutor.java
index 277b45b8d3c..277b45b8d3c 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/phases/PostJobsExecutor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PostJobsExecutor.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/ProjectAnalysisEvent.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/ProjectAnalysisEvent.java
index 428774acd82..428774acd82 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/phases/ProjectAnalysisEvent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/ProjectAnalysisEvent.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/ProjectInitializer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/ProjectInitializer.java
index 8dac11520e5..8dac11520e5 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/phases/ProjectInitializer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/ProjectInitializer.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/PublishPhaseExecutor.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PublishPhaseExecutor.java
index 33073a110b3..33073a110b3 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/phases/PublishPhaseExecutor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PublishPhaseExecutor.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/SensorExecutionEvent.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/SensorExecutionEvent.java
index 22cbd25aadb..22cbd25aadb 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/phases/SensorExecutionEvent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/SensorExecutionEvent.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/SensorsExecutor.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/SensorsExecutor.java
index 3af1cf2b6ee..3af1cf2b6ee 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/phases/SensorsExecutor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/SensorsExecutor.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/SensorsPhaseEvent.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/SensorsPhaseEvent.java
index a1f658efa1e..a1f658efa1e 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/phases/SensorsPhaseEvent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/SensorsPhaseEvent.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/package-info.java
index f4cd97fca3c..f4cd97fca3c 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/phases/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/platform/DefaultServer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/platform/DefaultServer.java
index 3136f4a3112..3136f4a3112 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/platform/DefaultServer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/platform/DefaultServer.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/platform/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/platform/package-info.java
index cb2793702b0..cb2793702b0 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/platform/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/platform/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/postjob/DefaultPostJobContext.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/postjob/DefaultPostJobContext.java
index 02b1582b999..02b1582b999 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/postjob/DefaultPostJobContext.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/postjob/DefaultPostJobContext.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/postjob/PostJobOptimizer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/postjob/PostJobOptimizer.java
index b27e89e87f8..b27e89e87f8 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/postjob/PostJobOptimizer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/postjob/PostJobOptimizer.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/postjob/PostJobWrapper.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/postjob/PostJobWrapper.java
index c5ba661637c..c5ba661637c 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/postjob/PostJobWrapper.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/postjob/PostJobWrapper.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/postjob/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/postjob/package-info.java
index 0e8cb6ac72d..0e8cb6ac72d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/postjob/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/postjob/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/profiling/AbstractTimeProfiling.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/AbstractTimeProfiling.java
index 6e204596616..6e204596616 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/profiling/AbstractTimeProfiling.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/AbstractTimeProfiling.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/profiling/ItemProfiling.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/ItemProfiling.java
index abbb11ccbcb..abbb11ccbcb 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/profiling/ItemProfiling.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/ItemProfiling.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/profiling/ModuleProfiling.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/ModuleProfiling.java
index 7c04dcff55e..7c04dcff55e 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/profiling/ModuleProfiling.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/ModuleProfiling.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/profiling/Phase.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/Phase.java
index f00496f9644..f00496f9644 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/profiling/Phase.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/Phase.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/profiling/PhaseProfiling.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/PhaseProfiling.java
index 5b13f1d4ee1..5b13f1d4ee1 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/profiling/PhaseProfiling.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/PhaseProfiling.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/profiling/PhasesSumUpTimeProfiler.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/PhasesSumUpTimeProfiler.java
index f03b84caaac..f03b84caaac 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/profiling/PhasesSumUpTimeProfiler.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/PhasesSumUpTimeProfiler.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/profiling/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/package-info.java
index 8f57dd4e4c7..8f57dd4e4c7 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/profiling/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/report/ActiveRulesPublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ActiveRulesPublisher.java
index f7d059c3d83..ba5dd00fbac 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/report/ActiveRulesPublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ActiveRulesPublisher.java
@@ -25,9 +25,9 @@ import java.util.Map;
 import javax.annotation.Nonnull;
 import org.sonar.api.batch.rule.ActiveRule;
 import org.sonar.api.batch.rule.ActiveRules;
-import org.sonar.batch.protocol.Constants;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReportWriter;
+import org.sonar.scanner.protocol.Constants;
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
 
 public class ActiveRulesPublisher implements ReportPublisherStep {
 
@@ -38,16 +38,16 @@ public class ActiveRulesPublisher implements ReportPublisherStep {
   }
 
   @Override
-  public void publish(BatchReportWriter writer) {
-    Iterable<BatchReport.ActiveRule> activeRuleMessages = FluentIterable.from(activeRules.findAll()).transform(new ToMessage());
+  public void publish(ScannerReportWriter writer) {
+    Iterable<ScannerReport.ActiveRule> activeRuleMessages = FluentIterable.from(activeRules.findAll()).transform(new ToMessage());
     writer.writeActiveRules(activeRuleMessages);
   }
 
-  private static class ToMessage implements Function<ActiveRule, BatchReport.ActiveRule> {
-    private final BatchReport.ActiveRule.Builder builder = BatchReport.ActiveRule.newBuilder();
+  private static class ToMessage implements Function<ActiveRule, ScannerReport.ActiveRule> {
+    private final ScannerReport.ActiveRule.Builder builder = ScannerReport.ActiveRule.newBuilder();
 
     @Override
-    public BatchReport.ActiveRule apply(@Nonnull ActiveRule input) {
+    public ScannerReport.ActiveRule apply(@Nonnull ActiveRule input) {
       builder.clear();
       builder.setRuleRepository(input.ruleKey().repository());
       builder.setRuleKey(input.ruleKey().rule());
diff --git a/sonar-batch/src/main/java/org/sonar/batch/report/AnalysisContextReportPublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/AnalysisContextReportPublisher.java
index a15cb2b2ed6..614e80d71a4 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/report/AnalysisContextReportPublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/AnalysisContextReportPublisher.java
@@ -36,9 +36,9 @@ import org.sonar.api.utils.System2;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.batch.bootstrap.BatchPluginRepository;
-import org.sonar.batch.protocol.output.BatchReportWriter;
 import org.sonar.batch.repository.ProjectRepositories;
 import org.sonar.core.platform.PluginInfo;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
 
 @BatchSide
 public class AnalysisContextReportPublisher {
@@ -52,7 +52,7 @@ public class AnalysisContextReportPublisher {
   private final System2 system;
   private final ProjectRepositories projectRepos;
 
-  private BatchReportWriter writer;
+  private ScannerReportWriter writer;
 
   public AnalysisContextReportPublisher(AnalysisMode mode, BatchPluginRepository pluginRepo, System2 system, ProjectRepositories projectRepos) {
     this.mode = mode;
@@ -61,7 +61,7 @@ public class AnalysisContextReportPublisher {
     this.projectRepos = projectRepos;
   }
 
-  public void init(BatchReportWriter writer) {
+  public void init(ScannerReportWriter writer) {
     if (mode.isIssues()) {
       return;
     }
diff --git a/sonar-batch/src/main/java/org/sonar/batch/report/ComponentsPublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ComponentsPublisher.java
index e576c3f8393..0aa66d0bdca 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/report/ComponentsPublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ComponentsPublisher.java
@@ -29,12 +29,12 @@ import org.sonar.api.resources.Resource;
 import org.sonar.api.resources.ResourceUtils;
 import org.sonar.batch.index.BatchComponent;
 import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.protocol.Constants;
-import org.sonar.batch.protocol.Constants.ComponentLinkType;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReport.ComponentLink;
-import org.sonar.batch.protocol.output.BatchReportWriter;
 import org.sonar.batch.scan.ImmutableProjectReactor;
+import org.sonar.scanner.protocol.Constants;
+import org.sonar.scanner.protocol.Constants.ComponentLinkType;
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
+import org.sonar.scanner.protocol.output.ScannerReport.ComponentLink;
 
 /**
  * Adds components and analysis metadata to output report
@@ -50,14 +50,14 @@ public class ComponentsPublisher implements ReportPublisherStep {
   }
 
   @Override
-  public void publish(BatchReportWriter writer) {
+  public void publish(ScannerReportWriter writer) {
     BatchComponent rootProject = resourceCache.get(reactor.getRoot().getKeyWithBranch());
     recursiveWriteComponent(rootProject, writer);
   }
 
-  private void recursiveWriteComponent(BatchComponent batchComponent, BatchReportWriter writer) {
+  private void recursiveWriteComponent(BatchComponent batchComponent, ScannerReportWriter writer) {
     Resource r = batchComponent.resource();
-    BatchReport.Component.Builder builder = BatchReport.Component.newBuilder();
+    ScannerReport.Component.Builder builder = ScannerReport.Component.newBuilder();
 
     // non-null fields
     builder.setRef(batchComponent.batchId());
@@ -104,7 +104,7 @@ public class ComponentsPublisher implements ReportPublisherStep {
     }
   }
 
-  private void writeVersion(BatchComponent c, BatchReport.Component.Builder builder) {
+  private void writeVersion(BatchComponent c, ScannerReport.Component.Builder builder) {
     if (c.isProjectOrModule()) {
       ProjectDefinition def = reactor.getProjectDefinition(c.key());
       String version = getVersion(def);
@@ -117,7 +117,7 @@ public class ComponentsPublisher implements ReportPublisherStep {
     return StringUtils.isNotBlank(version) ? version : getVersion(def.getParent());
   }
 
-  private void writeLinks(BatchComponent c, BatchReport.Component.Builder builder) {
+  private void writeLinks(BatchComponent c, ScannerReport.Component.Builder builder) {
     if (c.isProjectOrModule()) {
       ProjectDefinition def = reactor.getProjectDefinition(c.key());
       ComponentLink.Builder linkBuilder = ComponentLink.newBuilder();
@@ -130,7 +130,7 @@ public class ComponentsPublisher implements ReportPublisherStep {
     }
   }
 
-  private static void writeProjectLink(BatchReport.Component.Builder componentBuilder, ProjectDefinition def, ComponentLink.Builder linkBuilder, String linkProp,
+  private static void writeProjectLink(ScannerReport.Component.Builder componentBuilder, ProjectDefinition def, ComponentLink.Builder linkBuilder, String linkProp,
     ComponentLinkType linkType) {
     String link = def.properties().get(linkProp);
     if (StringUtils.isNotBlank(link)) {
diff --git a/sonar-batch/src/main/java/org/sonar/batch/report/CoveragePublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/CoveragePublisher.java
index 921c37f5a83..1d6b9db71ef 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/report/CoveragePublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/CoveragePublisher.java
@@ -31,10 +31,10 @@ import org.sonar.api.measures.Measure;
 import org.sonar.api.utils.KeyValueFormat;
 import org.sonar.batch.index.BatchComponent;
 import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.protocol.output.BatchReport.Coverage;
-import org.sonar.batch.protocol.output.BatchReport.Coverage.Builder;
-import org.sonar.batch.protocol.output.BatchReportWriter;
 import org.sonar.batch.scan.measure.MeasureCache;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
+import org.sonar.scanner.protocol.output.ScannerReport.Coverage;
+import org.sonar.scanner.protocol.output.ScannerReport.Coverage.Builder;
 
 public class CoveragePublisher implements ReportPublisherStep {
 
@@ -47,7 +47,7 @@ public class CoveragePublisher implements ReportPublisherStep {
   }
 
   @Override
-  public void publish(BatchReportWriter writer) {
+  public void publish(ScannerReportWriter writer) {
     for (final BatchComponent resource : resourceCache.all()) {
       if (!resource.isFile()) {
         continue;
diff --git a/sonar-batch/src/main/java/org/sonar/batch/report/MeasuresPublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/MeasuresPublisher.java
index e19b590610f..51e8867ddca 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/report/MeasuresPublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/MeasuresPublisher.java
@@ -29,11 +29,11 @@ import org.sonar.api.measures.Measure;
 import org.sonar.api.measures.Metric.ValueType;
 import org.sonar.batch.index.BatchComponent;
 import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.protocol.Constants.MeasureValueType;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReportWriter;
 import org.sonar.batch.scan.measure.MeasureCache;
 import org.sonar.core.metric.BatchMetrics;
+import org.sonar.scanner.protocol.Constants.MeasureValueType;
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
 
 import static com.google.common.collect.Iterables.filter;
 import static com.google.common.collect.Iterables.transform;
@@ -41,16 +41,16 @@ import static com.google.common.collect.Sets.newHashSet;
 
 public class MeasuresPublisher implements ReportPublisherStep {
 
-  private static final class MeasureToReportMeasure implements Function<Measure, BatchReport.Measure> {
+  private static final class MeasureToReportMeasure implements Function<Measure, ScannerReport.Measure> {
     private final BatchComponent resource;
-    private final BatchReport.Measure.Builder builder = BatchReport.Measure.newBuilder();
+    private final ScannerReport.Measure.Builder builder = ScannerReport.Measure.newBuilder();
 
     private MeasureToReportMeasure(BatchComponent resource) {
       this.resource = resource;
     }
 
     @Override
-    public BatchReport.Measure apply(@Nonnull Measure input) {
+    public ScannerReport.Measure apply(@Nonnull Measure input) {
       validateMeasure(input, resource.key());
       return toReportMeasure(builder, input);
     }
@@ -61,7 +61,7 @@ public class MeasuresPublisher implements ReportPublisherStep {
       }
     }
 
-    private BatchReport.Measure toReportMeasure(BatchReport.Measure.Builder builder, Measure measure) {
+    private ScannerReport.Measure toReportMeasure(ScannerReport.Measure.Builder builder, Measure measure) {
       builder.clear();
 
       builder.setValueType(getMeasureValueType(measure.getMetric().getType()));
@@ -75,7 +75,7 @@ public class MeasuresPublisher implements ReportPublisherStep {
       return builder.build();
     }
 
-    private void setValueAccordingToType(BatchReport.Measure.Builder builder, Measure measure) {
+    private void setValueAccordingToType(ScannerReport.Measure.Builder builder, Measure measure) {
       Serializable value = measure.value();
       switch (builder.getValueType()) {
         case BOOLEAN:
@@ -154,11 +154,11 @@ public class MeasuresPublisher implements ReportPublisherStep {
   }
 
   @Override
-  public void publish(BatchReportWriter writer) {
+  public void publish(ScannerReportWriter writer) {
     final Set<String> allowedMetricKeys = newHashSet(transform(batchMetrics.getMetrics(), new MetricToKey()));
     for (final BatchComponent resource : resourceCache.all()) {
       Iterable<Measure> batchMeasures = measureCache.byResource(resource.resource());
-      Iterable<org.sonar.batch.protocol.output.BatchReport.Measure> reportMeasures = transform(
+      Iterable<org.sonar.scanner.protocol.output.ScannerReport.Measure> reportMeasures = transform(
         filter(batchMeasures, new IsMetricAllowed(allowedMetricKeys)),
         new MeasureToReportMeasure(resource));
       writer.writeComponentMeasures(resource.batchId(), reportMeasures);
diff --git a/sonar-batch/src/main/java/org/sonar/batch/report/MetadataPublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/MetadataPublisher.java
index eac42e0ad7d..67dc6c0be04 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/report/MetadataPublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/MetadataPublisher.java
@@ -26,9 +26,9 @@ import org.sonar.api.resources.Project;
 import org.sonar.batch.cpd.index.SonarCpdBlockIndex;
 import org.sonar.batch.index.BatchComponent;
 import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReportWriter;
 import org.sonar.batch.scan.ImmutableProjectReactor;
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
 
 public class MetadataPublisher implements ReportPublisherStep {
 
@@ -43,10 +43,10 @@ public class MetadataPublisher implements ReportPublisherStep {
   }
 
   @Override
-  public void publish(BatchReportWriter writer) {
+  public void publish(ScannerReportWriter writer) {
     ProjectDefinition root = reactor.getRoot();
     BatchComponent rootProject = componentCache.getRoot();
-    BatchReport.Metadata.Builder builder = BatchReport.Metadata.newBuilder()
+    ScannerReport.Metadata.Builder builder = ScannerReport.Metadata.newBuilder()
       .setAnalysisDate(((Project) rootProject.resource()).getAnalysisDate().getTime())
       // Here we want key without branch
       .setProjectKey(root.getKey())
diff --git a/sonar-batch/src/main/java/org/sonar/batch/report/ReportPublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ReportPublisher.java
index 4654892fb57..c0487441c10 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/report/ReportPublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ReportPublisher.java
@@ -45,8 +45,8 @@ import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.batch.analysis.DefaultAnalysisMode;
 import org.sonar.batch.bootstrap.BatchWsClient;
-import org.sonar.batch.protocol.output.BatchReportWriter;
 import org.sonar.batch.scan.ImmutableProjectReactor;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
 import org.sonarqube.ws.MediaTypes;
 import org.sonarqube.ws.WsCe;
 import org.sonarqube.ws.client.PostRequest;
@@ -73,7 +73,7 @@ public class ReportPublisher implements Startable {
   private final ReportPublisherStep[] publishers;
 
   private File reportDir;
-  private BatchReportWriter writer;
+  private ScannerReportWriter writer;
 
   public ReportPublisher(Settings settings, BatchWsClient wsClient, AnalysisContextReportPublisher contextPublisher,
     ImmutableProjectReactor projectReactor, DefaultAnalysisMode analysisMode, TempFolder temp, ReportPublisherStep[] publishers) {
@@ -89,7 +89,7 @@ public class ReportPublisher implements Startable {
   @Override
   public void start() {
     reportDir = new File(projectReactor.getRoot().getWorkDir(), "batch-report");
-    writer = new BatchReportWriter(reportDir);
+    writer = new ScannerReportWriter(reportDir);
     contextPublisher.init(writer);
 
     if (!analysisMode.isIssues() && !analysisMode.isMediumTest()) {
@@ -113,7 +113,7 @@ public class ReportPublisher implements Startable {
     return reportDir;
   }
 
-  public BatchReportWriter getWriter() {
+  public ScannerReportWriter getWriter() {
     return writer;
   }
 
diff --git a/sonar-batch/src/main/java/org/sonar/batch/report/ReportPublisherStep.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ReportPublisherStep.java
index 873e95a5683..8edcacb4b48 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/report/ReportPublisherStep.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ReportPublisherStep.java
@@ -19,13 +19,13 @@
  */
 package org.sonar.batch.report;
 
-import org.sonar.batch.protocol.output.BatchReportWriter;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
 
 /**
  * Adds a sub-part of data to output report
  */
 public interface ReportPublisherStep {
 
-  void publish(BatchReportWriter writer);
+  void publish(ScannerReportWriter writer);
 
 }
diff --git a/sonar-batch/src/main/java/org/sonar/batch/report/BatchReportUtils.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ScannerReportUtils.java
index 9ba54f164ab..b5e026476d3 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/report/BatchReportUtils.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ScannerReportUtils.java
@@ -20,11 +20,11 @@
 package org.sonar.batch.report;
 
 import org.sonar.api.batch.sensor.highlighting.TypeOfText;
-import org.sonar.batch.protocol.Constants.HighlightingType;
+import org.sonar.scanner.protocol.Constants.HighlightingType;
 
-public class BatchReportUtils {
+public class ScannerReportUtils {
 
-  private BatchReportUtils() {
+  private ScannerReportUtils() {
   }
 
   public static HighlightingType toProtocolType(TypeOfText textType) {
diff --git a/sonar-batch/src/main/java/org/sonar/batch/report/SourcePublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/SourcePublisher.java
index 02fe7449038..b6b5a1d1745 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/report/SourcePublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/SourcePublisher.java
@@ -25,8 +25,7 @@ import org.apache.commons.io.input.BOMInputStream;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.batch.index.BatchComponent;
 import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.protocol.output.BatchReportWriter;
-
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -44,7 +43,7 @@ public class SourcePublisher implements ReportPublisherStep {
   }
 
   @Override
-  public void publish(BatchReportWriter writer) {
+  public void publish(ScannerReportWriter writer) {
     for (final BatchComponent resource : resourceCache.all()) {
       if (!resource.isFile()) {
         continue;
diff --git a/sonar-batch/src/main/java/org/sonar/batch/report/TestExecutionAndCoveragePublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/TestExecutionAndCoveragePublisher.java
index 22513bdc9d9..7561eb1ed1d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/report/TestExecutionAndCoveragePublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/TestExecutionAndCoveragePublisher.java
@@ -32,19 +32,19 @@ import org.sonar.api.test.MutableTestPlan;
 import org.sonar.api.test.TestCase;
 import org.sonar.batch.index.BatchComponent;
 import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.protocol.Constants.TestStatus;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReport.CoverageDetail;
-import org.sonar.batch.protocol.output.BatchReport.Test;
-import org.sonar.batch.protocol.output.BatchReportWriter;
 import org.sonar.batch.test.DefaultTestable;
 import org.sonar.batch.test.TestPlanBuilder;
+import org.sonar.scanner.protocol.Constants.TestStatus;
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
+import org.sonar.scanner.protocol.output.ScannerReport.CoverageDetail;
+import org.sonar.scanner.protocol.output.ScannerReport.Test;
 
 public class TestExecutionAndCoveragePublisher implements ReportPublisherStep {
 
-  private static final class TestConverter implements Function<MutableTestCase, BatchReport.Test> {
+  private static final class TestConverter implements Function<MutableTestCase, ScannerReport.Test> {
     private final Set<String> testNamesWithCoverage;
-    private BatchReport.Test.Builder builder = BatchReport.Test.newBuilder();
+    private ScannerReport.Test.Builder builder = ScannerReport.Test.newBuilder();
 
     private TestConverter(Set<String> testNamesWithCoverage) {
       this.testNamesWithCoverage = testNamesWithCoverage;
@@ -79,8 +79,8 @@ public class TestExecutionAndCoveragePublisher implements ReportPublisherStep {
 
   private final class TestCoverageConverter implements Function<String, CoverageDetail> {
     private final MutableTestPlan testPlan;
-    private BatchReport.CoverageDetail.Builder builder = BatchReport.CoverageDetail.newBuilder();
-    private BatchReport.CoverageDetail.CoveredFile.Builder coveredBuilder = BatchReport.CoverageDetail.CoveredFile.newBuilder();
+    private ScannerReport.CoverageDetail.Builder builder = ScannerReport.CoverageDetail.newBuilder();
+    private ScannerReport.CoverageDetail.CoveredFile.Builder coveredBuilder = ScannerReport.CoverageDetail.CoveredFile.newBuilder();
 
     private TestCoverageConverter(MutableTestPlan testPlan) {
       this.testPlan = testPlan;
@@ -113,7 +113,7 @@ public class TestExecutionAndCoveragePublisher implements ReportPublisherStep {
   }
 
   @Override
-  public void publish(BatchReportWriter writer) {
+  public void publish(ScannerReportWriter writer) {
     for (final BatchComponent component : componentCache.all()) {
       if (!component.isFile()) {
         continue;
diff --git a/sonar-batch/src/main/java/org/sonar/batch/report/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/package-info.java
index f4b3d8e51a9..f4b3d8e51a9 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/report/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultGlobalRepositoriesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/DefaultGlobalRepositoriesLoader.java
index 630b49a0bba..55508b0e8bf 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultGlobalRepositoriesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/DefaultGlobalRepositoriesLoader.java
@@ -20,13 +20,12 @@
 package org.sonar.batch.repository;
 
 import org.sonar.batch.cache.WSLoaderResult;
-
+import org.sonar.scanner.protocol.input.GlobalRepositories;
 import org.sonar.batch.cache.WSLoader;
 
 import javax.annotation.Nullable;
 
 import org.apache.commons.lang.mutable.MutableBoolean;
-import org.sonar.batch.protocol.input.GlobalRepositories;
 
 public class DefaultGlobalRepositoriesLoader implements GlobalRepositoriesLoader {
 
diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoader.java
index 0e8a0904b57..0e8a0904b57 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoader.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultQualityProfileLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/DefaultQualityProfileLoader.java
index 524e6f6856d..524e6f6856d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultQualityProfileLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/DefaultQualityProfileLoader.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultServerIssuesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/DefaultServerIssuesLoader.java
index 853b4ae20db..394ce0eea92 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultServerIssuesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/DefaultServerIssuesLoader.java
@@ -25,8 +25,8 @@ import java.io.InputStream;
 import org.apache.commons.io.IOUtils;
 import org.sonar.batch.cache.WSLoader;
 import org.sonar.batch.cache.WSLoaderResult;
-import org.sonar.batch.protocol.input.BatchInput.ServerIssue;
 import org.sonar.batch.util.BatchUtils;
+import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
 
 public class DefaultServerIssuesLoader implements ServerIssuesLoader {
 
diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/FileData.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/FileData.java
index bcf470e8986..bcf470e8986 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/repository/FileData.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/FileData.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/GlobalRepositoriesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/GlobalRepositoriesLoader.java
index 7c32e2bf484..86359e4b772 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/repository/GlobalRepositoriesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/GlobalRepositoriesLoader.java
@@ -20,11 +20,9 @@
 package org.sonar.batch.repository;
 
 import org.apache.commons.lang.mutable.MutableBoolean;
-
+import org.sonar.scanner.protocol.input.GlobalRepositories;
 import javax.annotation.Nullable;
 
-import org.sonar.batch.protocol.input.GlobalRepositories;
-
 public interface GlobalRepositoriesLoader {
 
   GlobalRepositories load(@Nullable MutableBoolean fromCache);
diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/GlobalRepositoriesProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/GlobalRepositoriesProvider.java
index 56f741a6c74..578b5458cd8 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/repository/GlobalRepositoriesProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/GlobalRepositoriesProvider.java
@@ -25,7 +25,7 @@ import org.picocontainer.injectors.ProviderAdapter;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.api.utils.log.Profiler;
-import org.sonar.batch.protocol.input.GlobalRepositories;
+import org.sonar.scanner.protocol.input.GlobalRepositories;
 
 public class GlobalRepositoriesProvider extends ProviderAdapter {
 
diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/ProjectRepositories.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/ProjectRepositories.java
index baba0c52396..baba0c52396 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/repository/ProjectRepositories.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/ProjectRepositories.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/ProjectRepositoriesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/ProjectRepositoriesLoader.java
index 53de4805324..53de4805324 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/repository/ProjectRepositoriesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/ProjectRepositoriesLoader.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/ProjectRepositoriesProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/ProjectRepositoriesProvider.java
index 1e0469651d5..1e0469651d5 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/repository/ProjectRepositoriesProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/ProjectRepositoriesProvider.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/QualityProfileLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/QualityProfileLoader.java
index a93bea66b11..a93bea66b11 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/repository/QualityProfileLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/QualityProfileLoader.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/QualityProfileProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/QualityProfileProvider.java
index 6878d21ecfb..6878d21ecfb 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/repository/QualityProfileProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/QualityProfileProvider.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/ServerIssuesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/ServerIssuesLoader.java
index 7f9154a54ad..e0c981a11e0 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/repository/ServerIssuesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/ServerIssuesLoader.java
@@ -20,7 +20,7 @@
 package org.sonar.batch.repository;
 
 import com.google.common.base.Function;
-import org.sonar.batch.protocol.input.BatchInput.ServerIssue;
+import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
 
 public interface ServerIssuesLoader {
 
diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/language/DefaultLanguagesRepository.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/language/DefaultLanguagesRepository.java
index 4f891e64f3d..4f891e64f3d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/repository/language/DefaultLanguagesRepository.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/language/DefaultLanguagesRepository.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/language/Language.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/language/Language.java
index 1a9ae783536..1a9ae783536 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/repository/language/Language.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/language/Language.java
diff --git a/sonar-batch/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..da1bab7993f 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/repository/language/LanguagesRepository.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/language/LanguagesRepository.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/language/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/language/package-info.java
index 03b2bf5f676..03b2bf5f676 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/repository/language/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/language/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/package-info.java
index 3679d1bfbb1..3679d1bfbb1 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/repository/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/user/UserRepositoryLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/user/UserRepositoryLoader.java
index 6a5ad2e06a0..9b33645cebe 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/repository/user/UserRepositoryLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/user/UserRepositoryLoader.java
@@ -30,9 +30,8 @@ import org.apache.commons.lang.mutable.MutableBoolean;
 import com.google.common.collect.Lists;
 import com.google.common.base.Joiner;
 import org.sonar.batch.util.BatchUtils;
+import org.sonar.scanner.protocol.input.ScannerInput;
 import com.google.common.base.Function;
-import org.sonar.batch.protocol.input.BatchInput;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -47,23 +46,23 @@ public class UserRepositoryLoader {
     this.wsLoader = wsLoader;
   }
 
-  public BatchInput.User load(String userLogin) {
+  public ScannerInput.User load(String userLogin) {
     return load(userLogin, null);
   }
 
-  public BatchInput.User load(String userLogin, @Nullable MutableBoolean fromCache) {
+  public ScannerInput.User load(String userLogin, @Nullable MutableBoolean fromCache) {
     InputStream is = loadQuery(new UserEncodingFunction().apply(userLogin), fromCache);
     return parseUser(is);
   }
 
-  public Collection<BatchInput.User> load(List<String> userLogins) {
+  public Collection<ScannerInput.User> load(List<String> userLogins) {
     return load(userLogins, null);
   }
 
   /**
    * Not cache friendly. Should not be used if a cache hit is expected.
    */
-  public Collection<BatchInput.User> load(List<String> userLogins, @Nullable MutableBoolean fromCache) {
+  public Collection<ScannerInput.User> load(List<String> userLogins, @Nullable MutableBoolean fromCache) {
     if (userLogins.isEmpty()) {
       return Collections.emptyList();
     }
@@ -87,9 +86,9 @@ public class UserRepositoryLoader {
     }
   }
 
-  private static BatchInput.User parseUser(InputStream is) {
+  private static ScannerInput.User parseUser(InputStream is) {
     try {
-      return BatchInput.User.parseDelimitedFrom(is);
+      return ScannerInput.User.parseDelimitedFrom(is);
     } catch (IOException e) {
       throw new IllegalStateException("Unable to get user details from server", e);
     } finally {
@@ -97,14 +96,14 @@ public class UserRepositoryLoader {
     }
   }
 
-  private static Collection<BatchInput.User> parseUsers(InputStream is) {
-    List<BatchInput.User> users = new ArrayList<>();
+  private static Collection<ScannerInput.User> parseUsers(InputStream is) {
+    List<ScannerInput.User> users = new ArrayList<>();
 
     try {
-      BatchInput.User user = BatchInput.User.parseDelimitedFrom(is);
+      ScannerInput.User user = ScannerInput.User.parseDelimitedFrom(is);
       while (user != null) {
         users.add(user);
-        user = BatchInput.User.parseDelimitedFrom(is);
+        user = ScannerInput.User.parseDelimitedFrom(is);
       }
     } catch (IOException e) {
       throw new IllegalStateException("Unable to get user details from server", e);
diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/user/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/user/package-info.java
index 6462fb00b8a..6462fb00b8a 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/repository/user/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/user/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/ActiveRulesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/ActiveRulesLoader.java
index 028929bd141..028929bd141 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/rule/ActiveRulesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/ActiveRulesLoader.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/ActiveRulesProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/ActiveRulesProvider.java
index 83034e22132..83034e22132 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/rule/ActiveRulesProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/ActiveRulesProvider.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/DefaultActiveRulesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/DefaultActiveRulesLoader.java
index 9485d99e1cb..9485d99e1cb 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/rule/DefaultActiveRulesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/DefaultActiveRulesLoader.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/DefaultRulesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/DefaultRulesLoader.java
index 62292b4581b..62292b4581b 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/rule/DefaultRulesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/DefaultRulesLoader.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/LoadedActiveRule.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/LoadedActiveRule.java
index 31e5919220f..31e5919220f 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/rule/LoadedActiveRule.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/LoadedActiveRule.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/ModuleQProfiles.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/ModuleQProfiles.java
index 5a671de840f..5a671de840f 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/rule/ModuleQProfiles.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/ModuleQProfiles.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/QProfile.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/QProfile.java
index 5abc9955c7d..5abc9955c7d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/rule/QProfile.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/QProfile.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/QProfileSensor.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/QProfileSensor.java
index 758851dafc4..bdffd6f1f5d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/rule/QProfileSensor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/QProfileSensor.java
@@ -30,7 +30,7 @@ import org.sonar.api.resources.Project;
 /**
  * Stores which Quality profiles have been used on the current module.
  *
- * TODO This information should not be stored as a measure but should be send as metadata in the {@link org.sonar.batch.protocol.output.BatchReport}
+ * TODO This information should not be stored as a measure but should be send as metadata in the {@link org.sonar.scanner.protocol.output.ScannerReport}
  */
 public class QProfileSensor implements Sensor {
 
diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/QProfileVerifier.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/QProfileVerifier.java
index 6206a289f17..6206a289f17 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/rule/QProfileVerifier.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/QProfileVerifier.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/RuleFinderCompatibility.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/RuleFinderCompatibility.java
index fe763f873bd..fe763f873bd 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/rule/RuleFinderCompatibility.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/RuleFinderCompatibility.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/RulesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/RulesLoader.java
index 9572f628f2d..9572f628f2d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/rule/RulesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/RulesLoader.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/RulesProfileProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/RulesProfileProvider.java
index de29cc352fc..de29cc352fc 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/rule/RulesProfileProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/RulesProfileProvider.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/RulesProfileWrapper.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/RulesProfileWrapper.java
index 327c141ea34..327c141ea34 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/rule/RulesProfileWrapper.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/RulesProfileWrapper.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/RulesProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/RulesProvider.java
index 7a3e0ea34f0..7a3e0ea34f0 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/rule/RulesProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/RulesProvider.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/UsedQProfiles.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/UsedQProfiles.java
index 72186a5e959..72186a5e959 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/rule/UsedQProfiles.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/UsedQProfiles.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/package-info.java
index 1bdc402f399..1bdc402f399 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/rule/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ImmutableProjectReactor.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ImmutableProjectReactor.java
index 4bfa99c6da2..4bfa99c6da2 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ImmutableProjectReactor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ImmutableProjectReactor.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ImmutableProjectReactorProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ImmutableProjectReactorProvider.java
index ecf58a88482..ecf58a88482 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ImmutableProjectReactorProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ImmutableProjectReactorProvider.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/LanguageVerifier.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/LanguageVerifier.java
index 83e27324e64..83e27324e64 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/LanguageVerifier.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/LanguageVerifier.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java
index 56da7fd624d..56da7fd624d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleSettings.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ModuleSettings.java
index 2176ad347fe..2176ad347fe 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleSettings.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ModuleSettings.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/MutableProjectReactorProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/MutableProjectReactorProvider.java
index afde1e18c4d..afde1e18c4d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/MutableProjectReactorProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/MutableProjectReactorProvider.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectBuildersExecutor.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectBuildersExecutor.java
index 505a80bc117..505a80bc117 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectBuildersExecutor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectBuildersExecutor.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectExclusions.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectExclusions.java
index 0bea9a81309..0bea9a81309 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectExclusions.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectExclusions.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectLock.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectLock.java
index d52f49cfd88..d52f49cfd88 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectLock.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectLock.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorBuilder.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectReactorBuilder.java
index 2d7e453cfaf..2d7e453cfaf 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectReactorBuilder.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorValidator.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectReactorValidator.java
index 7e36ab54958..7e36ab54958 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorValidator.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectReactorValidator.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java
index ff8108e4871..ff8108e4871 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectSettings.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectSettings.java
index 382d02424a3..382d02424a3 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectSettings.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectSettings.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/WorkDirectoryCleaner.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/WorkDirectoryCleaner.java
index b4857bf6afb..b4857bf6afb 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/WorkDirectoryCleaner.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/WorkDirectoryCleaner.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/AdditionalFilePredicates.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/AdditionalFilePredicates.java
index b68b6a3625a..b68b6a3625a 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/AdditionalFilePredicates.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/AdditionalFilePredicates.java
diff --git a/sonar-batch/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..761f6d15823 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ComponentIndexer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ComponentIndexer.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystem.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystem.java
index 125a73d0078..125a73d0078 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystem.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystem.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/DeprecatedFileFilters.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/DeprecatedFileFilters.java
index 29968e7e102..29968e7e102 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/DeprecatedFileFilters.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/DeprecatedFileFilters.java
diff --git a/sonar-batch/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 2a2952884f5..2a2952884f5 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ExclusionFilters.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ExclusionFilters.java
diff --git a/sonar-batch/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 9ebf91886a0..9ebf91886a0 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java
diff --git a/sonar-batch/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..0d717301283 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileSystemLogger.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/FileSystemLogger.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/InputFileBuilder.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/InputFileBuilder.java
index 49cbd423cf9..49cbd423cf9 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/InputFileBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/InputFileBuilder.java
diff --git a/sonar-batch/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..46dc2b2fbcd 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/InputFileBuilderFactory.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/InputFileBuilderFactory.java
diff --git a/sonar-batch/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..3375f92c7ff 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/InputPathCache.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/InputPathCache.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/LanguageDetection.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/LanguageDetection.java
index db1300e2a97..db1300e2a97 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/LanguageDetection.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/LanguageDetection.java
diff --git a/sonar-batch/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..b25a0038c64 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/LanguageDetectionFactory.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/LanguageDetectionFactory.java
diff --git a/sonar-batch/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..faab666579a 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializer.java
diff --git a/sonar-batch/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..5326b3fda4b 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ModuleInputFileCache.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ModuleInputFileCache.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/StatusDetection.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/StatusDetection.java
index bd63a81dfe2..bd63a81dfe2 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/StatusDetection.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/StatusDetection.java
diff --git a/sonar-batch/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..b1a75c228c0 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/StatusDetectionFactory.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/StatusDetectionFactory.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/package-info.java
index d5f662e81ea..d5f662e81ea 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/measure/DefaultMetricFinder.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/DefaultMetricFinder.java
index 295e74aa2e2..f453f1bb5f4 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/measure/DefaultMetricFinder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/DefaultMetricFinder.java
@@ -23,8 +23,7 @@ import com.google.common.collect.Lists;
 import org.sonar.api.batch.measure.Metric;
 import org.sonar.api.batch.measure.MetricFinder;
 import org.sonar.api.measures.Metric.ValueType;
-import org.sonar.batch.protocol.input.GlobalRepositories;
-
+import org.sonar.scanner.protocol.input.GlobalRepositories;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -35,7 +34,7 @@ public class DefaultMetricFinder implements MetricFinder {
   private Map<String, Metric> metricsByKey = new LinkedHashMap<>();
 
   public DefaultMetricFinder(GlobalRepositories globalReferentials) {
-    for (org.sonar.batch.protocol.input.Metric metric : globalReferentials.metrics()) {
+    for (org.sonar.scanner.protocol.input.Metric metric : globalReferentials.metrics()) {
       metricsByKey.put(metric.key(), new org.sonar.api.measures.Metric.Builder(metric.key(), metric.key(), ValueType.valueOf(metric.valueType())).create());
     }
   }
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/measure/DeprecatedMetricFinder.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/DeprecatedMetricFinder.java
index f866972fd78..09e6063355c 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/measure/DeprecatedMetricFinder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/DeprecatedMetricFinder.java
@@ -23,9 +23,8 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.sonar.api.measures.Metric;
 import org.sonar.api.measures.Metric.ValueType;
+import org.sonar.scanner.protocol.input.GlobalRepositories;
 import org.sonar.api.measures.MetricFinder;
-import org.sonar.batch.protocol.input.GlobalRepositories;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -36,7 +35,7 @@ public final class DeprecatedMetricFinder implements MetricFinder {
   private Map<Integer, Metric> metricsById = Maps.newLinkedHashMap();
 
   public DeprecatedMetricFinder(GlobalRepositories globalReferentials) {
-    for (org.sonar.batch.protocol.input.Metric metric : globalReferentials.metrics()) {
+    for (org.sonar.scanner.protocol.input.Metric metric : globalReferentials.metrics()) {
       Metric hibernateMetric = new org.sonar.api.measures.Metric.Builder(metric.key(), metric.name(), ValueType.valueOf(metric.valueType()))
         .create()
         .setDirection(metric.direction())
diff --git a/sonar-batch/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 963f7e14b91..963f7e14b91 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/measure/MeasureCache.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/MeasureCache.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/measure/MeasureValueCoder.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/MeasureValueCoder.java
index 019410fd06b..019410fd06b 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/measure/MeasureValueCoder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/MeasureValueCoder.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/measure/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/package-info.java
index f35eb86c95c..f35eb86c95c 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/measure/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/package-info.java
index af539896111..af539896111 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/ConsoleReport.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/ConsoleReport.java
index 7e37b789c71..7e37b789c71 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/report/ConsoleReport.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/ConsoleReport.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/HtmlReport.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/HtmlReport.java
index 8111abd467e..8111abd467e 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/report/HtmlReport.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/HtmlReport.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssueVariation.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/IssueVariation.java
index 23ca58e7d8c..23ca58e7d8c 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssueVariation.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/IssueVariation.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssuesReport.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/IssuesReport.java
index cede7a81d1c..cede7a81d1c 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssuesReport.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/IssuesReport.java
diff --git a/sonar-batch/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..079dabc2ceb 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssuesReportBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/IssuesReportBuilder.java
diff --git a/sonar-batch/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..ac4a5abb375 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssuesReports.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/IssuesReports.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/JSONReport.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/JSONReport.java
index f0c2e2b6da7..99954736613 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/report/JSONReport.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/JSONReport.java
@@ -52,10 +52,10 @@ import org.sonar.api.rule.RuleKey;
 import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.batch.issue.IssueCache;
 import org.sonar.batch.issue.tracking.TrackedIssue;
-import org.sonar.batch.protocol.input.BatchInput;
-import org.sonar.batch.protocol.input.BatchInput.User;
 import org.sonar.batch.repository.user.UserRepositoryLoader;
 import org.sonar.batch.scan.filesystem.InputPathCache;
+import org.sonar.scanner.protocol.input.ScannerInput;
+import org.sonar.scanner.protocol.input.ScannerInput.User;
 
 @Properties({
   @Property(
@@ -216,7 +216,7 @@ public class JSONReport implements Reporter {
   }
 
   private void writeUsers(JsonWriter json, Collection<String> userLogins) throws IOException {
-    List<BatchInput.User> users = new LinkedList<>();
+    List<ScannerInput.User> users = new LinkedList<>();
     for (String userLogin : userLogins) {
       User user = userRepository.load(userLogin);
       if (user != null) {
@@ -225,7 +225,7 @@ public class JSONReport implements Reporter {
     }
 
     json.name("users").beginArray();
-    for (BatchInput.User user : users) {
+    for (ScannerInput.User user : users) {
       json
         .beginObject()
         .prop("login", user.getLogin())
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/ReportRuleKey.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/ReportRuleKey.java
index 1061d3c3238..1061d3c3238 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/report/ReportRuleKey.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/ReportRuleKey.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/ReportSummary.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/ReportSummary.java
index 435aee37450..435aee37450 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/report/ReportSummary.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/ReportSummary.java
diff --git a/sonar-batch/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..9cb91dc2fad 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/report/Reporter.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/Reporter.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/ResourceReport.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/ResourceReport.java
index 6267335baf0..6267335baf0 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/report/ResourceReport.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/ResourceReport.java
diff --git a/sonar-batch/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..90981fea342 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/report/RuleNameProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/RuleNameProvider.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/RuleReport.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/RuleReport.java
index 4026ed387ab..4026ed387ab 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/report/RuleReport.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/RuleReport.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/RuleReportComparator.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/RuleReportComparator.java
index b779537e8fd..b779537e8fd 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/report/RuleReportComparator.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/RuleReportComparator.java
diff --git a/sonar-batch/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..8017dbd753e 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/report/SourceProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/SourceProvider.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/package-info.java
index d6dacad1b54..d6dacad1b54 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/report/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scm/DefaultBlameInput.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/DefaultBlameInput.java
index a85c6536c92..a85c6536c92 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scm/DefaultBlameInput.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/DefaultBlameInput.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scm/DefaultBlameOutput.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/DefaultBlameOutput.java
index 9341e6fbe01..69d7d5f2481 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scm/DefaultBlameOutput.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/DefaultBlameOutput.java
@@ -37,10 +37,10 @@ import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.batch.index.BatchComponent;
 import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReport.Changesets.Builder;
-import org.sonar.batch.protocol.output.BatchReportWriter;
 import org.sonar.batch.util.ProgressReport;
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
+import org.sonar.scanner.protocol.output.ScannerReport.Changesets.Builder;
 
 class DefaultBlameOutput implements BlameOutput {
 
@@ -49,14 +49,14 @@ class DefaultBlameOutput implements BlameOutput {
   private static final Pattern NON_ASCII_CHARS = Pattern.compile("[^\\x00-\\x7F]");
   private static final Pattern ACCENT_CODES = Pattern.compile("\\p{InCombiningDiacriticalMarks}+");
 
-  private final BatchReportWriter writer;
+  private final ScannerReportWriter writer;
   private final BatchComponentCache componentCache;
   private final Set<InputFile> allFilesToBlame = new HashSet<>();
   private ProgressReport progressReport;
   private int count;
   private int total;
 
-  DefaultBlameOutput(BatchReportWriter writer, BatchComponentCache componentCache, List<InputFile> filesToBlame) {
+  DefaultBlameOutput(ScannerReportWriter writer, BatchComponentCache componentCache, List<InputFile> filesToBlame) {
     this.writer = writer;
     this.componentCache = componentCache;
     this.allFilesToBlame.addAll(filesToBlame);
@@ -78,7 +78,7 @@ class DefaultBlameOutput implements BlameOutput {
     }
 
     BatchComponent batchComponent = componentCache.get(file);
-    Builder scmBuilder = BatchReport.Changesets.newBuilder();
+    Builder scmBuilder = ScannerReport.Changesets.newBuilder();
     scmBuilder.setComponentRef(batchComponent.batchId());
     Map<String, Integer> changesetsIdByRevision = new HashMap<>();
 
@@ -106,7 +106,7 @@ class DefaultBlameOutput implements BlameOutput {
   }
 
   private static void addChangeset(Builder scmBuilder, BlameLine line) {
-    BatchReport.Changesets.Changeset.Builder changesetBuilder = BatchReport.Changesets.Changeset.newBuilder();
+    ScannerReport.Changesets.Changeset.Builder changesetBuilder = ScannerReport.Changesets.Changeset.newBuilder();
     changesetBuilder.setRevision(line.revision());
     changesetBuilder.setDate(line.date().getTime());
     if (StringUtils.isNotBlank(line.author())) {
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scm/ScmConfiguration.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/ScmConfiguration.java
index f6a88bf4465..f6a88bf4465 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scm/ScmConfiguration.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/ScmConfiguration.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scm/ScmSensor.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/ScmSensor.java
index 078224bb6c6..078224bb6c6 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scm/ScmSensor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/ScmSensor.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scm/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/package-info.java
index 925761a7298..925761a7298 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scm/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/sensor/DefaultSensorContext.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/DefaultSensorContext.java
index 1080dab084a..1080dab084a 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/sensor/DefaultSensorContext.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/DefaultSensorContext.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/sensor/DefaultSensorStorage.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/DefaultSensorStorage.java
index 096a115d425..62e7d982d34 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/sensor/DefaultSensorStorage.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/DefaultSensorStorage.java
@@ -58,15 +58,15 @@ import org.sonar.batch.cpd.index.SonarCpdBlockIndex;
 import org.sonar.batch.index.BatchComponent;
 import org.sonar.batch.index.BatchComponentCache;
 import org.sonar.batch.issue.ModuleIssues;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReportWriter;
-import org.sonar.batch.report.BatchReportUtils;
+import org.sonar.batch.report.ScannerReportUtils;
 import org.sonar.batch.report.ReportPublisher;
 import org.sonar.batch.scan.measure.MeasureCache;
 import org.sonar.batch.sensor.coverage.CoverageExclusions;
 import org.sonar.batch.source.DefaultSymbol;
 import org.sonar.duplications.block.Block;
 import org.sonar.duplications.internal.pmd.PmdBlockChunker;
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
 
 public class DefaultSensorStorage implements SensorStorage {
 
@@ -193,21 +193,21 @@ public class DefaultSensorStorage implements SensorStorage {
 
   @Override
   public void store(DefaultHighlighting highlighting) {
-    BatchReportWriter writer = reportPublisher.getWriter();
+    ScannerReportWriter writer = reportPublisher.getWriter();
     DefaultInputFile inputFile = (DefaultInputFile) highlighting.inputFile();
     writer.writeComponentSyntaxHighlighting(componentCache.get(inputFile).batchId(),
       Iterables.transform(highlighting.getSyntaxHighlightingRuleSet(), new BuildSyntaxHighlighting()));
   }
 
   public void store(DefaultInputFile inputFile, Map<Symbol, Set<TextRange>> referencesBySymbol) {
-    BatchReportWriter writer = reportPublisher.getWriter();
+    ScannerReportWriter writer = reportPublisher.getWriter();
     writer.writeComponentSymbols(componentCache.get(inputFile).batchId(),
-      Iterables.transform(referencesBySymbol.entrySet(), new Function<Map.Entry<Symbol, Set<TextRange>>, BatchReport.Symbol>() {
-        private BatchReport.Symbol.Builder builder = BatchReport.Symbol.newBuilder();
-        private BatchReport.TextRange.Builder rangeBuilder = BatchReport.TextRange.newBuilder();
+      Iterables.transform(referencesBySymbol.entrySet(), new Function<Map.Entry<Symbol, Set<TextRange>>, ScannerReport.Symbol>() {
+        private ScannerReport.Symbol.Builder builder = ScannerReport.Symbol.newBuilder();
+        private ScannerReport.TextRange.Builder rangeBuilder = ScannerReport.TextRange.newBuilder();
 
         @Override
-        public BatchReport.Symbol apply(Map.Entry<Symbol, Set<TextRange>> input) {
+        public ScannerReport.Symbol apply(Map.Entry<Symbol, Set<TextRange>> input) {
           builder.clear();
           rangeBuilder.clear();
           DefaultSymbol symbol = (DefaultSymbol) input.getKey();
@@ -249,18 +249,18 @@ public class DefaultSensorStorage implements SensorStorage {
     }
   }
 
-  private static class BuildSyntaxHighlighting implements Function<SyntaxHighlightingRule, BatchReport.SyntaxHighlighting> {
-    private BatchReport.SyntaxHighlighting.Builder builder = BatchReport.SyntaxHighlighting.newBuilder();
-    private BatchReport.TextRange.Builder rangeBuilder = BatchReport.TextRange.newBuilder();
+  private static class BuildSyntaxHighlighting implements Function<SyntaxHighlightingRule, ScannerReport.SyntaxHighlighting> {
+    private ScannerReport.SyntaxHighlighting.Builder builder = ScannerReport.SyntaxHighlighting.newBuilder();
+    private ScannerReport.TextRange.Builder rangeBuilder = ScannerReport.TextRange.newBuilder();
 
     @Override
-    public BatchReport.SyntaxHighlighting apply(@Nonnull SyntaxHighlightingRule input) {
+    public ScannerReport.SyntaxHighlighting apply(@Nonnull SyntaxHighlightingRule input) {
       builder.setRange(rangeBuilder.setStartLine(input.range().start().line())
         .setStartOffset(input.range().start().lineOffset())
         .setEndLine(input.range().end().line())
         .setEndOffset(input.range().end().lineOffset())
         .build());
-      builder.setType(BatchReportUtils.toProtocolType(input.getTextType()));
+      builder.setType(ScannerReportUtils.toProtocolType(input.getTextType()));
       return builder.build();
     }
   }
diff --git a/sonar-batch/src/main/java/org/sonar/batch/sensor/SensorOptimizer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/SensorOptimizer.java
index 7e8dd63e93a..7e8dd63e93a 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/sensor/SensorOptimizer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/SensorOptimizer.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/sensor/SensorWrapper.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/SensorWrapper.java
index 3e82a222546..3e82a222546 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/sensor/SensorWrapper.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/SensorWrapper.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/sensor/coverage/CoverageConstants.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/coverage/CoverageConstants.java
index 569ac157e42..569ac157e42 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/sensor/coverage/CoverageConstants.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/coverage/CoverageConstants.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/sensor/coverage/CoverageExclusions.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/coverage/CoverageExclusions.java
index 198b61141bb..198b61141bb 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/sensor/coverage/CoverageExclusions.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/coverage/CoverageExclusions.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/sensor/coverage/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/coverage/package-info.java
index b4c6be3d144..b4c6be3d144 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/sensor/coverage/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/coverage/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/sensor/noop/NoOpNewCpdTokens.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/noop/NoOpNewCpdTokens.java
index afd00476b2a..afd00476b2a 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/sensor/noop/NoOpNewCpdTokens.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/noop/NoOpNewCpdTokens.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/sensor/noop/NoOpNewHighlighting.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/noop/NoOpNewHighlighting.java
index 7ead32f7f04..7ead32f7f04 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/sensor/noop/NoOpNewHighlighting.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/noop/NoOpNewHighlighting.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/sensor/noop/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/noop/package-info.java
index 0a654a40800..0a654a40800 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/sensor/noop/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/noop/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/sensor/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/package-info.java
index 4c9f457a97f..4c9f457a97f 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/sensor/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/source/CodeColorizerSensor.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/CodeColorizerSensor.java
index 158e02a9777..616ac48ffef 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/source/CodeColorizerSensor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/CodeColorizerSensor.java
@@ -26,8 +26,8 @@ import org.sonar.api.batch.sensor.Sensor;
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.batch.sensor.SensorDescriptor;
 import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.protocol.output.BatchReportReader;
 import org.sonar.batch.report.ReportPublisher;
+import org.sonar.scanner.protocol.output.ScannerReportReader;
 
 @Phase(name = Phase.Name.POST)
 public final class CodeColorizerSensor implements Sensor {
@@ -51,7 +51,7 @@ public final class CodeColorizerSensor implements Sensor {
   public void execute(final SensorContext context) {
     FileSystem fs = context.fileSystem();
     for (InputFile f : fs.inputFiles(fs.predicates().all())) {
-      BatchReportReader reader = new BatchReportReader(reportPublisher.getReportDir());
+      ScannerReportReader reader = new ScannerReportReader(reportPublisher.getReportDir());
       int batchId = resourceCache.get(f).batchId();
       String language = f.language();
       if (reader.hasSyntaxHighlighting(batchId) || language == null) {
diff --git a/sonar-batch/src/main/java/org/sonar/batch/source/CodeColorizers.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/CodeColorizers.java
index 39a4a0b1c98..39a4a0b1c98 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/source/CodeColorizers.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/CodeColorizers.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/source/DefaultHighlightable.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/DefaultHighlightable.java
index 80403efc298..80403efc298 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/source/DefaultHighlightable.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/DefaultHighlightable.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/source/DefaultSymbol.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/DefaultSymbol.java
index a317bfb2de8..a317bfb2de8 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/source/DefaultSymbol.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/DefaultSymbol.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/source/DefaultSymbolTable.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/DefaultSymbolTable.java
index f4ecc8e3761..f4ecc8e3761 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/source/DefaultSymbolTable.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/DefaultSymbolTable.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/source/DefaultSymbolizable.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/DefaultSymbolizable.java
index cddeabb9683..cddeabb9683 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/source/DefaultSymbolizable.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/DefaultSymbolizable.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/source/HighlightableBuilder.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/HighlightableBuilder.java
index d911516b984..d911516b984 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/source/HighlightableBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/HighlightableBuilder.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/source/HighlightingCodeBuilder.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/HighlightingCodeBuilder.java
index b807ee2d5e2..b807ee2d5e2 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/source/HighlightingCodeBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/HighlightingCodeBuilder.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/source/HighlightingRenderer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/HighlightingRenderer.java
index f4b9f3d399f..f4b9f3d399f 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/source/HighlightingRenderer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/HighlightingRenderer.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/source/LinesSensor.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/LinesSensor.java
index d27c90953a0..d27c90953a0 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/source/LinesSensor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/LinesSensor.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/source/SymbolizableBuilder.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/SymbolizableBuilder.java
index fda6c4c7166..fda6c4c7166 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/source/SymbolizableBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/SymbolizableBuilder.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/source/ZeroCoverageSensor.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/ZeroCoverageSensor.java
index f211050dabc..f211050dabc 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/source/ZeroCoverageSensor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/ZeroCoverageSensor.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/source/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/package-info.java
index c33229b0ab2..c33229b0ab2 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/source/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/task/ListTask.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/task/ListTask.java
index 7c535674d82..7c535674d82 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/task/ListTask.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/task/ListTask.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/task/ScanTask.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/task/ScanTask.java
index c5ba59c3d37..c5ba59c3d37 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/task/ScanTask.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/task/ScanTask.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/task/TaskContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/task/TaskContainer.java
index eee91f63055..eee91f63055 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/task/TaskContainer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/task/TaskContainer.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/task/TaskProperties.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/task/TaskProperties.java
index b8470ce4d00..b8470ce4d00 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/task/TaskProperties.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/task/TaskProperties.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/task/Tasks.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/task/Tasks.java
index ee68b62b1db..ee68b62b1db 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/task/Tasks.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/task/Tasks.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/task/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/task/package-info.java
index 5787c1e27c2..5787c1e27c2 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/task/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/task/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/test/DefaultCoverageBlock.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/test/DefaultCoverageBlock.java
index 52c3ca7a76f..52c3ca7a76f 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/test/DefaultCoverageBlock.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/test/DefaultCoverageBlock.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/test/DefaultTestCase.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/test/DefaultTestCase.java
index 652d11a0ddb..652d11a0ddb 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/test/DefaultTestCase.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/test/DefaultTestCase.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/test/DefaultTestPlan.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/test/DefaultTestPlan.java
index 85b26082424..85b26082424 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/test/DefaultTestPlan.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/test/DefaultTestPlan.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/test/DefaultTestable.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/test/DefaultTestable.java
index c672253920e..c672253920e 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/test/DefaultTestable.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/test/DefaultTestable.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/test/TestPlanBuilder.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/test/TestPlanBuilder.java
index b3bab1ee6f5..b3bab1ee6f5 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/test/TestPlanBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/test/TestPlanBuilder.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/test/TestableBuilder.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/test/TestableBuilder.java
index 261b0b15a1d..261b0b15a1d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/test/TestableBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/test/TestableBuilder.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/test/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/test/package-info.java
index cb0a2f6c3e7..cb0a2f6c3e7 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/test/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/test/package-info.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/util/BatchUtils.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/util/BatchUtils.java
index 81eed874378..81eed874378 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/util/BatchUtils.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/util/BatchUtils.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/util/ProgressReport.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/util/ProgressReport.java
index f2ea0406a01..f2ea0406a01 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/util/ProgressReport.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/util/ProgressReport.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/util/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/util/package-info.java
index 42cf7aa9450..42cf7aa9450 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/util/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/util/package-info.java
diff --git a/sonar-batch/src/main/resources/org/sonar/batch/bootstrapper/logback.xml b/sonar-scanner-engine/src/main/resources/org/sonar/batch/bootstrapper/logback.xml
index 99f956e4b4c..99f956e4b4c 100644
--- a/sonar-batch/src/main/resources/org/sonar/batch/bootstrapper/logback.xml
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/batch/bootstrapper/logback.xml
diff --git a/sonar-batch/src/main/resources/org/sonar/batch/logback.xml b/sonar-scanner-engine/src/main/resources/org/sonar/batch/logback.xml
index 198cd9c1bc6..198cd9c1bc6 100644
--- a/sonar-batch/src/main/resources/org/sonar/batch/logback.xml
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/batch/logback.xml
diff --git a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport.ftl b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport.ftl
index c41b8067222..c41b8067222 100644
--- a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport.ftl
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport.ftl
diff --git a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/DIR.png b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/DIR.png
index b135ef92eec..b135ef92eec 100644
--- a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/DIR.png
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/DIR.png
diff --git a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/FIL.png b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/FIL.png
index 1664e25c8b5..1664e25c8b5 100644
--- a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/FIL.png
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/FIL.png
diff --git a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/PRJ.png b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/PRJ.png
index b32e51c5f42..b32e51c5f42 100644
--- a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/PRJ.png
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/PRJ.png
diff --git a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/favicon.ico b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/favicon.ico
index c6d382d9823..c6d382d9823 100644
--- a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/favicon.ico
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/favicon.ico
diff --git a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/jquery.min.js b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/jquery.min.js
index 53763631337..53763631337 100644
--- a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/jquery.min.js
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/jquery.min.js
diff --git a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sep12.png b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sep12.png
index bb10431c778..bb10431c778 100644
--- a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sep12.png
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sep12.png
diff --git a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.css b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.css
index 40e929cf077..40e929cf077 100644
--- a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.css
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.css
diff --git a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.eot b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.eot
index 189f7b56818..189f7b56818 100755
--- a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.eot
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.eot
diff --git a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.svg b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.svg
index 36965167290..36965167290 100755
--- a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.svg
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.svg
diff --git a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.ttf b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.ttf
index 5a876906e10..5a876906e10 100755
--- a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.ttf
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.ttf
diff --git a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.woff b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.woff
index bf0cf103cd0..bf0cf103cd0 100755
--- a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.woff
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.woff
diff --git a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonarqube-24x100.png b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonarqube-24x100.png
index b2ff23bf288..b2ff23bf288 100644
--- a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonarqube-24x100.png
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonarqube-24x100.png
diff --git a/sonar-batch/src/test/java/org/sonar/batch/DefaultFileLinesContextTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/DefaultFileLinesContextTest.java
index eb622b003fa..eb622b003fa 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/DefaultFileLinesContextTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/DefaultFileLinesContextTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/ProjectConfiguratorTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/ProjectConfiguratorTest.java
index 6a30188454c..6a30188454c 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/ProjectConfiguratorTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/ProjectConfiguratorTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/analysis/AnalysisTempFolderProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/analysis/AnalysisTempFolderProviderTest.java
index 058ea4fd34c..058ea4fd34c 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/analysis/AnalysisTempFolderProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/analysis/AnalysisTempFolderProviderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/analysis/AnalysisWSLoaderProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/analysis/AnalysisWSLoaderProviderTest.java
index 66ab296a063..66ab296a063 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/analysis/AnalysisWSLoaderProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/analysis/AnalysisWSLoaderProviderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/analysis/DefaultAnalysisModeTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/analysis/DefaultAnalysisModeTest.java
index 67734ed62fa..67734ed62fa 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/analysis/DefaultAnalysisModeTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/analysis/DefaultAnalysisModeTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchExtensionDictionnaryTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchExtensionDictionnaryTest.java
index 77a0021ef31..77a0021ef31 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchExtensionDictionnaryTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchExtensionDictionnaryTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginInstallerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchPluginInstallerTest.java
index 95e17ca849a..95e17ca849a 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginInstallerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchPluginInstallerTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginJarExploderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchPluginJarExploderTest.java
index fe991f5d406..fe991f5d406 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginJarExploderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchPluginJarExploderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginPredicateTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchPluginPredicateTest.java
index 0e8f29a1609..0e8f29a1609 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginPredicateTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchPluginPredicateTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java
index 0d0fc068dfe..0d0fc068dfe 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchWsClientProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchWsClientProviderTest.java
index 76fa07167ab..76fa07167ab 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchWsClientProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchWsClientProviderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchWsClientTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchWsClientTest.java
index 3689c2d601a..3689c2d601a 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchWsClientTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchWsClientTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/DroppedPropertyCheckerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/DroppedPropertyCheckerTest.java
index e6cd758d253..e6cd758d253 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/DroppedPropertyCheckerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/DroppedPropertyCheckerTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/ExtensionInstallerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/ExtensionInstallerTest.java
index c368fb146b6..c368fb146b6 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/ExtensionInstallerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/ExtensionInstallerTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/ExtensionUtilsTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/ExtensionUtilsTest.java
index f83920847e3..f83920847e3 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/ExtensionUtilsTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/ExtensionUtilsTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/FileCacheProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/FileCacheProviderTest.java
index 09ce7835e0c..09ce7835e0c 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/FileCacheProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/FileCacheProviderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/GlobalContainerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/GlobalContainerTest.java
index 41152b3ccb5..41152b3ccb5 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/GlobalContainerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/GlobalContainerTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/GlobalModeTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/GlobalModeTest.java
index 5da1858e33b..5da1858e33b 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/GlobalModeTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/GlobalModeTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/GlobalPropertiesTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/GlobalPropertiesTest.java
index 4f3fd5cebca..4f3fd5cebca 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/GlobalPropertiesTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/GlobalPropertiesTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/GlobalSettingsTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/GlobalSettingsTest.java
index 48377e0e2a0..aa13b14ccb5 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/GlobalSettingsTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/GlobalSettingsTest.java
@@ -28,7 +28,8 @@ import org.junit.rules.ExpectedException;
 import org.sonar.api.config.PropertyDefinitions;
 import org.sonar.api.utils.log.LogTester;
 import org.sonar.api.utils.log.LoggerLevel;
-import org.sonar.batch.protocol.input.GlobalRepositories;
+import org.sonar.scanner.protocol.input.GlobalRepositories;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/GlobalTempFolderProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/GlobalTempFolderProviderTest.java
index e0d4ee9d3ea..e0d4ee9d3ea 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/GlobalTempFolderProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/GlobalTempFolderProviderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/MetricProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/MetricProviderTest.java
index 8d1ab306b8d..8d1ab306b8d 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/MetricProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/MetricProviderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/MockHttpServer.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/MockHttpServer.java
index 99f10de2c9e..99f10de2c9e 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/MockHttpServer.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/MockHttpServer.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrapper/BatchTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/BatchTest.java
index b9696631f89..b9696631f89 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrapper/BatchTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/BatchTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrapper/EnvironmentInformationTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/EnvironmentInformationTest.java
index 71dd0495d49..71dd0495d49 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrapper/EnvironmentInformationTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/EnvironmentInformationTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrapper/LogCallbackAppenderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/LogCallbackAppenderTest.java
index 6b225306fe0..6b225306fe0 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrapper/LogCallbackAppenderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/LogCallbackAppenderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrapper/LoggingConfigurationTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/LoggingConfigurationTest.java
index 920af566e93..920af566e93 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrapper/LoggingConfigurationTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/LoggingConfigurationTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrapper/LoggingConfiguratorTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/LoggingConfiguratorTest.java
index 2d719e4a657..2d719e4a657 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrapper/LoggingConfiguratorTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/LoggingConfiguratorTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/cache/DefaultProjectCacheStatusTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/cache/DefaultProjectCacheStatusTest.java
index c8f105de443..c8f105de443 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/cache/DefaultProjectCacheStatusTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/cache/DefaultProjectCacheStatusTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/cache/GlobalPersistentCacheProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/cache/GlobalPersistentCacheProviderTest.java
index 3f019caae02..3f019caae02 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/cache/GlobalPersistentCacheProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/cache/GlobalPersistentCacheProviderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/cache/NonAssociatedCacheSynchronizerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/cache/NonAssociatedCacheSynchronizerTest.java
index c06bb94ca08..c06bb94ca08 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/cache/NonAssociatedCacheSynchronizerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/cache/NonAssociatedCacheSynchronizerTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/cache/ProjectCacheSynchronizerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/cache/ProjectCacheSynchronizerTest.java
index 52df42e035d..52df42e035d 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/cache/ProjectCacheSynchronizerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/cache/ProjectCacheSynchronizerTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/cache/ProjectPersistentCacheProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/cache/ProjectPersistentCacheProviderTest.java
index 69c142556ae..69c142556ae 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/cache/ProjectPersistentCacheProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/cache/ProjectPersistentCacheProviderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/cache/ProjectSyncContainerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/cache/ProjectSyncContainerTest.java
index 352b40c307b..948f888cd68 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/cache/ProjectSyncContainerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/cache/ProjectSyncContainerTest.java
@@ -22,9 +22,9 @@ package org.sonar.batch.cache;
 import java.util.HashMap;
 import org.junit.Test;
 import org.sonar.batch.bootstrap.GlobalProperties;
-import org.sonar.batch.protocol.input.ProjectRepositories;
 import org.sonar.core.platform.ComponentContainer;
 import org.sonar.home.cache.PersistentCache;
+import org.sonar.scanner.protocol.input.ProjectRepositories;
 import org.sonarqube.ws.client.WsClient;
 
 import static org.mockito.Mockito.mock;
diff --git a/sonar-batch/src/test/java/org/sonar/batch/cache/StrategyWSLoaderProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/cache/StrategyWSLoaderProviderTest.java
index ce9d88a037c..ce9d88a037c 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/cache/StrategyWSLoaderProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/cache/StrategyWSLoaderProviderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/cache/WSLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/cache/WSLoaderTest.java
index ad7bb763d67..ad7bb763d67 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/cache/WSLoaderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/cache/WSLoaderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/cpd/CpdComponentsTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/CpdComponentsTest.java
index 814e7d69d38..814e7d69d38 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/cpd/CpdComponentsTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/CpdComponentsTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/cpd/CpdExecutorTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/CpdExecutorTest.java
index 1da83a0e730..6a6c209348f 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/cpd/CpdExecutorTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/CpdExecutorTest.java
@@ -32,15 +32,14 @@ import org.sonar.api.utils.log.LoggerLevel;
 import org.sonar.batch.cpd.index.SonarCpdBlockIndex;
 import org.sonar.batch.index.BatchComponent;
 import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.protocol.output.BatchReportReader;
-import org.sonar.batch.protocol.output.BatchReportWriter;
-import org.sonar.batch.protocol.output.BatchReport.Duplicate;
-import org.sonar.batch.protocol.output.BatchReport.Duplication;
 import org.sonar.batch.report.ReportPublisher;
 import org.sonar.core.util.CloseableIterator;
 import org.sonar.duplications.index.CloneGroup;
 import org.sonar.duplications.index.ClonePart;
-
+import org.sonar.scanner.protocol.output.ScannerReportReader;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
+import org.sonar.scanner.protocol.output.ScannerReport.Duplicate;
+import org.sonar.scanner.protocol.output.ScannerReport.Duplication;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -67,7 +66,7 @@ public class CpdExecutorTest {
 
   // private AbstractCpdEngine engine;
 
-  private BatchReportReader reader;
+  private ScannerReportReader reader;
   private BatchComponent batchComponent1;
   private BatchComponent batchComponent2;
   private BatchComponent batchComponent3;
@@ -79,10 +78,10 @@ public class CpdExecutorTest {
     settings = new Settings();
     index = mock(SonarCpdBlockIndex.class);
     publisher = mock(ReportPublisher.class);
-    when(publisher.getWriter()).thenReturn(new BatchReportWriter(outputDir));
+    when(publisher.getWriter()).thenReturn(new ScannerReportWriter(outputDir));
     componentCache = new BatchComponentCache();
     executor = new CpdExecutor(settings, index, publisher, componentCache);
-    reader = new BatchReportReader(outputDir);
+    reader = new ScannerReportReader(outputDir);
 
     Project p = new Project("foo");
     componentCache.add(p, null).setInputComponent(new DefaultInputModule("foo"));
diff --git a/sonar-batch/src/test/java/org/sonar/batch/cpd/CpdSensorTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/CpdSensorTest.java
index ce27f0776c4..ce27f0776c4 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/cpd/CpdSensorTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/CpdSensorTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/cpd/DefaultCpdBlockIndexerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/DefaultCpdBlockIndexerTest.java
index 9fcd03ac940..9fcd03ac940 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/cpd/DefaultCpdBlockIndexerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/DefaultCpdBlockIndexerTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/cpd/DuplicationPredicatesTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/DuplicationPredicatesTest.java
index 6b6fa4fa0e8..6b6fa4fa0e8 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/cpd/DuplicationPredicatesTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/DuplicationPredicatesTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/cpd/JavaCpdBlockIndexerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/JavaCpdBlockIndexerTest.java
index 851fb523815..851fb523815 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/cpd/JavaCpdBlockIndexerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/JavaCpdBlockIndexerTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/deprecated/perspectives/PerspectiveBuilderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/deprecated/perspectives/PerspectiveBuilderTest.java
index b07671362ce..b07671362ce 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/deprecated/perspectives/PerspectiveBuilderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/deprecated/perspectives/PerspectiveBuilderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/events/BatchStepEventTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/events/BatchStepEventTest.java
index 3f3738b3900..3f3738b3900 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/events/BatchStepEventTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/events/BatchStepEventTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/events/EventBusTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/events/EventBusTest.java
index 78fcd4926c2..78fcd4926c2 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/events/EventBusTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/events/EventBusTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/index/AbstractCachesTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/index/AbstractCachesTest.java
index b3e6592d9d2..b3e6592d9d2 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/index/AbstractCachesTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/index/AbstractCachesTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/index/BatchComponentCacheTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/index/BatchComponentCacheTest.java
index 8d014b67321..8d014b67321 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/index/BatchComponentCacheTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/index/BatchComponentCacheTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/index/BucketTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/index/BucketTest.java
index a6a5f900088..a6a5f900088 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/index/BucketTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/index/BucketTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/index/CacheTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/index/CacheTest.java
index 95ddcb8b766..95ddcb8b766 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/index/CacheTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/index/CacheTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/index/CachesManagerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/index/CachesManagerTest.java
index 177c6f1e357..177c6f1e357 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/index/CachesManagerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/index/CachesManagerTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/index/CachesTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/index/CachesTest.java
index 2a01ac38025..2a01ac38025 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/index/CachesTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/index/CachesTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/index/DefaultIndexTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/index/DefaultIndexTest.java
index 8dae9e19ad0..8dae9e19ad0 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/index/DefaultIndexTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/index/DefaultIndexTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/DefaultFilterableIssueTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DefaultFilterableIssueTest.java
index 4e1ed3d053a..daded262498 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/DefaultFilterableIssueTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DefaultFilterableIssueTest.java
@@ -21,7 +21,6 @@ package org.sonar.batch.issue;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
-import org.sonar.batch.protocol.Constants.Severity;
 
 import java.util.Date;
 
@@ -30,7 +29,8 @@ import static org.mockito.Mockito.mock;
 import org.junit.Before;
 import org.junit.Test;
 import org.sonar.api.resources.Project;
-import org.sonar.batch.protocol.output.BatchReport.Issue;
+import org.sonar.scanner.protocol.Constants.Severity;
+import org.sonar.scanner.protocol.output.ScannerReport.Issue;
 
 public class DefaultFilterableIssueTest {
   private DefaultFilterableIssue issue;
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/DefaultIssueCallbackTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DefaultIssueCallbackTest.java
index 8181c748572..7be36bd3bc5 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/DefaultIssueCallbackTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DefaultIssueCallbackTest.java
@@ -27,11 +27,11 @@ import org.sonar.batch.issue.tracking.TrackedIssue;
 import org.sonar.api.batch.rule.Rule;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.batch.bootstrapper.IssueListener.Issue;
-import org.sonar.batch.protocol.input.BatchInput;
 import org.mockito.MockitoAnnotations;
 import org.mockito.Mock;
 import org.sonar.api.batch.rule.Rules;
 import org.sonar.batch.repository.user.UserRepositoryLoader;
+import org.sonar.scanner.protocol.input.ScannerInput;
 import org.sonar.batch.bootstrapper.IssueListener;
 import org.junit.Before;
 import com.google.common.collect.ImmutableList;
@@ -65,7 +65,7 @@ public class DefaultIssueCallbackTest {
 
     when(issueCache.all()).thenReturn(ImmutableList.of(issue));
 
-    BatchInput.User.Builder userBuilder = BatchInput.User.newBuilder();
+    ScannerInput.User.Builder userBuilder = ScannerInput.User.newBuilder();
     userBuilder.setLogin("user");
     userBuilder.setName("name");
     when(userRepository.load("user")).thenReturn(userBuilder.build());
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/DefaultIssueFilterChainTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DefaultIssueFilterChainTest.java
index 041bc8493a2..041bc8493a2 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/DefaultIssueFilterChainTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DefaultIssueFilterChainTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/DefaultProjectIssuesTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DefaultProjectIssuesTest.java
index 9448206b1d6..9448206b1d6 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/DefaultProjectIssuesTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DefaultProjectIssuesTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/DeprecatedIssueAdapterForFilterTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DeprecatedIssueAdapterForFilterTest.java
index ba835314e53..b4818adae0e 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/DeprecatedIssueAdapterForFilterTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DeprecatedIssueAdapterForFilterTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
 import org.sonar.api.issue.Issue;
 import org.sonar.api.resources.Project;
 import org.sonar.api.rule.RuleKey;
-import org.sonar.batch.protocol.Constants.Severity;
+import org.sonar.scanner.protocol.Constants.Severity;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
@@ -38,7 +38,7 @@ public class DeprecatedIssueAdapterForFilterTest {
   @Test
   public void improve_coverage() {
     DeprecatedIssueAdapterForFilter issue = new DeprecatedIssueAdapterForFilter(new Project(PROJECT_KEY).setAnalysisDate(ANALYSIS_DATE),
-      org.sonar.batch.protocol.output.BatchReport.Issue.newBuilder()
+      org.sonar.scanner.protocol.output.ScannerReport.Issue.newBuilder()
         .setRuleRepository("repo")
         .setRuleKey("key")
         .setSeverity(Severity.BLOCKER)
@@ -46,7 +46,7 @@ public class DeprecatedIssueAdapterForFilterTest {
         .build(),
       COMPONENT_KEY);
     DeprecatedIssueAdapterForFilter issue2 = new DeprecatedIssueAdapterForFilter(new Project(PROJECT_KEY).setAnalysisDate(ANALYSIS_DATE),
-      org.sonar.batch.protocol.output.BatchReport.Issue.newBuilder()
+      org.sonar.scanner.protocol.output.ScannerReport.Issue.newBuilder()
         .setRuleRepository("repo")
         .setRuleKey("key")
         .setSeverity(Severity.BLOCKER)
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/DeprecatedIssueFilterChainTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DeprecatedIssueFilterChainTest.java
index c80b1d64a82..c80b1d64a82 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/DeprecatedIssueFilterChainTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DeprecatedIssueFilterChainTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/IssuableFactoryTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/IssuableFactoryTest.java
index 65856e1e808..65856e1e808 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/IssuableFactoryTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/IssuableFactoryTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/IssueCacheTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/IssueCacheTest.java
index 6d9f42a8ede..6d9f42a8ede 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/IssueCacheTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/IssueCacheTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/ModuleIssuesTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ModuleIssuesTest.java
index 7bd663a938d..af84563a8b8 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/ModuleIssuesTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ModuleIssuesTest.java
@@ -38,8 +38,8 @@ import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rule.Severity;
 import org.sonar.api.utils.MessageException;
 import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.batch.report.ReportPublisher;
+import org.sonar.scanner.protocol.output.ScannerReport;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
@@ -147,14 +147,14 @@ public class ModuleIssuesTest {
       .forRule(SQUID_RULE_KEY)
       .overrideSeverity(org.sonar.api.batch.rule.Severity.CRITICAL);
 
-    when(filters.accept(anyString(), any(BatchReport.Issue.class))).thenReturn(true);
+    when(filters.accept(anyString(), any(ScannerReport.Issue.class))).thenReturn(true);
 
     boolean added = moduleIssues.initAndAddIssue(issue);
 
     assertThat(added).isTrue();
-    ArgumentCaptor<BatchReport.Issue> argument = ArgumentCaptor.forClass(BatchReport.Issue.class);
+    ArgumentCaptor<ScannerReport.Issue> argument = ArgumentCaptor.forClass(ScannerReport.Issue.class);
     verify(reportPublisher.getWriter()).appendComponentIssue(eq(1), argument.capture());
-    assertThat(argument.getValue().getSeverity()).isEqualTo(org.sonar.batch.protocol.Constants.Severity.CRITICAL);
+    assertThat(argument.getValue().getSeverity()).isEqualTo(org.sonar.scanner.protocol.Constants.Severity.CRITICAL);
   }
 
   @Test
@@ -166,12 +166,12 @@ public class ModuleIssuesTest {
     DefaultIssue issue = new DefaultIssue()
       .at(new DefaultIssueLocation().on(file).at(file.selectLine(3)).message("Foo"))
       .forRule(SQUID_RULE_KEY);
-    when(filters.accept(anyString(), any(BatchReport.Issue.class))).thenReturn(true);
+    when(filters.accept(anyString(), any(ScannerReport.Issue.class))).thenReturn(true);
     moduleIssues.initAndAddIssue(issue);
 
-    ArgumentCaptor<BatchReport.Issue> argument = ArgumentCaptor.forClass(BatchReport.Issue.class);
+    ArgumentCaptor<ScannerReport.Issue> argument = ArgumentCaptor.forClass(ScannerReport.Issue.class);
     verify(reportPublisher.getWriter()).appendComponentIssue(eq(1), argument.capture());
-    assertThat(argument.getValue().getSeverity()).isEqualTo(org.sonar.batch.protocol.Constants.Severity.INFO);
+    assertThat(argument.getValue().getSeverity()).isEqualTo(org.sonar.scanner.protocol.Constants.Severity.INFO);
   }
 
   @Test
@@ -183,12 +183,12 @@ public class ModuleIssuesTest {
     DefaultIssue issue = new DefaultIssue()
       .at(new DefaultIssueLocation().on(file).at(file.selectLine(3)).message(""))
       .forRule(SQUID_RULE_KEY);
-    when(filters.accept(anyString(), any(BatchReport.Issue.class))).thenReturn(true);
+    when(filters.accept(anyString(), any(ScannerReport.Issue.class))).thenReturn(true);
 
     boolean added = moduleIssues.initAndAddIssue(issue);
 
     assertThat(added).isTrue();
-    ArgumentCaptor<BatchReport.Issue> argument = ArgumentCaptor.forClass(BatchReport.Issue.class);
+    ArgumentCaptor<ScannerReport.Issue> argument = ArgumentCaptor.forClass(ScannerReport.Issue.class);
     verify(reportPublisher.getWriter()).appendComponentIssue(eq(1), argument.capture());
     assertThat(argument.getValue().getMsg()).isEqualTo("Avoid Cycle");
   }
@@ -203,7 +203,7 @@ public class ModuleIssuesTest {
       .at(new DefaultIssueLocation().on(file).at(file.selectLine(3)).message(""))
       .forRule(SQUID_RULE_KEY);
 
-    when(filters.accept(anyString(), any(BatchReport.Issue.class))).thenReturn(false);
+    when(filters.accept(anyString(), any(ScannerReport.Issue.class))).thenReturn(false);
 
     boolean added = moduleIssues.initAndAddIssue(issue);
 
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/TrackedIssueAdapterTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/TrackedIssueAdapterTest.java
index 11fc560b318..11fc560b318 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/TrackedIssueAdapterTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/TrackedIssueAdapterTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/EnforceIssuesFilterTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/EnforceIssuesFilterTest.java
index 28df728657d..28df728657d 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/EnforceIssuesFilterTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/EnforceIssuesFilterTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/IgnoreIssuesFilterTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/IgnoreIssuesFilterTest.java
index 6cf431e215c..6cf431e215c 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/IgnoreIssuesFilterTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/IgnoreIssuesFilterTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/pattern/IssueExclusionPatternInitializerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/IssueExclusionPatternInitializerTest.java
index 13e1646bb9d..13e1646bb9d 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/pattern/IssueExclusionPatternInitializerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/IssueExclusionPatternInitializerTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/pattern/IssueInclusionPatternInitializerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/IssueInclusionPatternInitializerTest.java
index 25c74587522..25c74587522 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/pattern/IssueInclusionPatternInitializerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/IssueInclusionPatternInitializerTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/pattern/IssuePatternTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/IssuePatternTest.java
index e67111d0f9c..e67111d0f9c 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/pattern/IssuePatternTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/IssuePatternTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/pattern/LineRangeTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/LineRangeTest.java
index 8af95b5d4ad..8af95b5d4ad 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/pattern/LineRangeTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/LineRangeTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/pattern/PatternDecoderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/PatternDecoderTest.java
index 3501d1a2326..3501d1a2326 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/pattern/PatternDecoderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/PatternDecoderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/pattern/PatternMatcherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/PatternMatcherTest.java
index 1d69a30c371..1d69a30c371 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/pattern/PatternMatcherTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/PatternMatcherTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsLoaderTest.java
index 52a0e59cbbe..52a0e59cbbe 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsLoaderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsLoaderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest.java
index f4aa4ebd9f1..f4aa4ebd9f1 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/tracking/DefaultServerLineHashesLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/tracking/DefaultServerLineHashesLoaderTest.java
index 7d8ab1d2319..7d8ab1d2319 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/tracking/DefaultServerLineHashesLoaderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/tracking/DefaultServerLineHashesLoaderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/tracking/RollingFileHashesTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/tracking/RollingFileHashesTest.java
index 8648fba48d1..8648fba48d1 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/tracking/RollingFileHashesTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/tracking/RollingFileHashesTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/tracking/SourceHashHolderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/tracking/SourceHashHolderTest.java
index 9acf02b3577..9acf02b3577 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/tracking/SourceHashHolderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/tracking/SourceHashHolderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/tracking/TrackedIssueTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/tracking/TrackedIssueTest.java
index 4228f912b94..4228f912b94 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/tracking/TrackedIssueTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/tracking/TrackedIssueTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/BatchMediumTester.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/BatchMediumTester.java
index 13eea883eba..619977ce156 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/BatchMediumTester.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/BatchMediumTester.java
@@ -40,6 +40,8 @@ import org.sonar.batch.bootstrapper.IssueListener;
 import org.sonar.api.server.rule.RulesDefinition.Repository;
 import org.sonar.api.server.rule.RulesDefinition;
 import org.sonar.batch.rule.RulesLoader;
+import org.sonar.scanner.protocol.input.GlobalRepositories;
+import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
 import com.google.common.base.Function;
 
 import java.io.File;
@@ -66,8 +68,6 @@ import org.sonar.batch.bootstrapper.Batch;
 import org.sonar.batch.bootstrapper.EnvironmentInformation;
 import org.sonar.batch.bootstrapper.LogOutput;
 import org.sonar.batch.issue.tracking.ServerLineHashesLoader;
-import org.sonar.batch.protocol.input.BatchInput.ServerIssue;
-import org.sonar.batch.protocol.input.GlobalRepositories;
 import org.sonar.batch.report.ReportPublisher;
 import org.sonar.batch.repository.GlobalRepositoriesLoader;
 import org.sonar.batch.repository.ProjectRepositoriesLoader;
@@ -400,7 +400,7 @@ public class BatchMediumTester {
 
     public FakeGlobalRepositoriesLoader add(Metric<?> metric) {
       Boolean optimizedBestValue = metric.isOptimizedBestValue();
-      ref.metrics().add(new org.sonar.batch.protocol.input.Metric(metricId,
+      ref.metrics().add(new org.sonar.scanner.protocol.input.Metric(metricId,
         metric.key(),
         metric.getType().name(),
         metric.getDescription(),
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/LogOutputRecorder.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/LogOutputRecorder.java
index edae5e47fb1..edae5e47fb1 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/LogOutputRecorder.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/LogOutputRecorder.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/cache/CacheSyncTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/cache/CacheSyncTest.java
index 4ebf5eb1fa6..4ebf5eb1fa6 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/cache/CacheSyncTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/cache/CacheSyncTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/coverage/CoverageMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/coverage/CoverageMediumTest.java
index d693527df47..e3dac6ed869 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/coverage/CoverageMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/coverage/CoverageMediumTest.java
@@ -90,7 +90,7 @@ public class CoverageMediumTest {
     assertThat(result.coverageFor(file, 2).getItCoveredConditions()).isEqualTo(0);
     assertThat(result.coverageFor(file, 2).getOverallCoveredConditions()).isEqualTo(0);
 
-    Map<String, List<org.sonar.batch.protocol.output.BatchReport.Measure>> allMeasures = result.allMeasures();
+    Map<String, List<org.sonar.scanner.protocol.output.ScannerReport.Measure>> allMeasures = result.allMeasures();
     assertThat(allMeasures.get("com.foo.project:src/sample.xoo")).extracting("metricKey", "intValue")
       .contains(tuple(CoreMetrics.LINES_TO_COVER_KEY, 2),
         tuple(CoreMetrics.UNCOVERED_LINES_KEY, 0),
@@ -126,7 +126,7 @@ public class CoverageMediumTest {
     InputFile file = result.inputFile("src/sample.xoo");
     assertThat(result.coverageFor(file, 2)).isNull();
 
-    Map<String, List<org.sonar.batch.protocol.output.BatchReport.Measure>> allMeasures = result.allMeasures();
+    Map<String, List<org.sonar.scanner.protocol.output.ScannerReport.Measure>> allMeasures = result.allMeasures();
     assertThat(allMeasures.get("com.foo.project:src/sample.xoo")).extracting("metricKey")
       .doesNotContain(CoreMetrics.LINES_TO_COVER_KEY, CoreMetrics.UNCOVERED_LINES_KEY, CoreMetrics.CONDITIONS_TO_COVER_KEY,
         CoreMetrics.COVERED_CONDITIONS_BY_LINE_KEY);
@@ -169,7 +169,7 @@ public class CoverageMediumTest {
     assertThat(result.coverageFor(file, 3).getUtHits()).isFalse();
     assertThat(result.coverageFor(file, 4)).isNull();
 
-    Map<String, List<org.sonar.batch.protocol.output.BatchReport.Measure>> allMeasures = result.allMeasures();
+    Map<String, List<org.sonar.scanner.protocol.output.ScannerReport.Measure>> allMeasures = result.allMeasures();
     assertThat(allMeasures.get("com.foo.project:src/sample.xoo")).extracting("metricKey", "intValue")
       .contains(tuple(CoreMetrics.LINES_TO_COVER_KEY, 2),
         tuple(CoreMetrics.UNCOVERED_LINES_KEY, 2));
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/cpd/CpdMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/cpd/CpdMediumTest.java
index ac30e0466f5..662ed7dbcfd 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/cpd/CpdMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/cpd/CpdMediumTest.java
@@ -42,8 +42,8 @@ import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.batch.mediumtest.BatchMediumTester;
 import org.sonar.batch.mediumtest.TaskResult;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReport.Measure;
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReport.Measure;
 import org.sonar.xoo.XooPlugin;
 import org.sonar.xoo.lang.CpdTokenizerSensor;
 
@@ -146,19 +146,19 @@ public class CpdMediumTest {
     InputFile inputFile2 = result.inputFile("sample2.xoo");
 
     // One clone group on each file
-    List<org.sonar.batch.protocol.output.BatchReport.Duplication> duplicationGroupsFile1 = result.duplicationsFor(inputFile1);
+    List<org.sonar.scanner.protocol.output.ScannerReport.Duplication> duplicationGroupsFile1 = result.duplicationsFor(inputFile1);
     assertThat(duplicationGroupsFile1).hasSize(1);
 
-    org.sonar.batch.protocol.output.BatchReport.Duplication cloneGroupFile1 = duplicationGroupsFile1.get(0);
+    org.sonar.scanner.protocol.output.ScannerReport.Duplication cloneGroupFile1 = duplicationGroupsFile1.get(0);
     assertThat(cloneGroupFile1.getOriginPosition().getStartLine()).isEqualTo(1);
     assertThat(cloneGroupFile1.getOriginPosition().getEndLine()).isEqualTo(17);
     assertThat(cloneGroupFile1.getDuplicateList()).hasSize(1);
     assertThat(cloneGroupFile1.getDuplicate(0).getOtherFileRef()).isEqualTo(result.getReportComponent(((DefaultInputFile) inputFile2).key()).getRef());
 
-    List<org.sonar.batch.protocol.output.BatchReport.Duplication> duplicationGroupsFile2 = result.duplicationsFor(inputFile2);
+    List<org.sonar.scanner.protocol.output.ScannerReport.Duplication> duplicationGroupsFile2 = result.duplicationsFor(inputFile2);
     assertThat(duplicationGroupsFile2).hasSize(1);
 
-    org.sonar.batch.protocol.output.BatchReport.Duplication cloneGroupFile2 = duplicationGroupsFile2.get(0);
+    org.sonar.scanner.protocol.output.ScannerReport.Duplication cloneGroupFile2 = duplicationGroupsFile2.get(0);
     assertThat(cloneGroupFile2.getOriginPosition().getStartLine()).isEqualTo(1);
     assertThat(cloneGroupFile2.getOriginPosition().getEndLine()).isEqualTo(17);
     assertThat(cloneGroupFile2.getDuplicateList()).hasSize(1);
@@ -198,19 +198,19 @@ public class CpdMediumTest {
     InputFile inputFile2 = result.inputFile("src/sample2.xoo");
 
     // One clone group on each file
-    List<org.sonar.batch.protocol.output.BatchReport.Duplication> duplicationGroupsFile1 = result.duplicationsFor(inputFile1);
+    List<org.sonar.scanner.protocol.output.ScannerReport.Duplication> duplicationGroupsFile1 = result.duplicationsFor(inputFile1);
     assertThat(duplicationGroupsFile1).hasSize(1);
 
-    org.sonar.batch.protocol.output.BatchReport.Duplication cloneGroupFile1 = duplicationGroupsFile1.get(0);
+    org.sonar.scanner.protocol.output.ScannerReport.Duplication cloneGroupFile1 = duplicationGroupsFile1.get(0);
     assertThat(cloneGroupFile1.getOriginPosition().getStartLine()).isEqualTo(1);
     assertThat(cloneGroupFile1.getOriginPosition().getEndLine()).isEqualTo(17);
     assertThat(cloneGroupFile1.getDuplicateList()).hasSize(1);
     assertThat(cloneGroupFile1.getDuplicate(0).getOtherFileRef()).isEqualTo(result.getReportComponent(((DefaultInputFile) inputFile2).key()).getRef());
 
-    List<org.sonar.batch.protocol.output.BatchReport.Duplication> duplicationGroupsFile2 = result.duplicationsFor(inputFile2);
+    List<org.sonar.scanner.protocol.output.ScannerReport.Duplication> duplicationGroupsFile2 = result.duplicationsFor(inputFile2);
     assertThat(duplicationGroupsFile2).hasSize(1);
 
-    org.sonar.batch.protocol.output.BatchReport.Duplication cloneGroupFile2 = duplicationGroupsFile2.get(0);
+    org.sonar.scanner.protocol.output.ScannerReport.Duplication cloneGroupFile2 = duplicationGroupsFile2.get(0);
     assertThat(cloneGroupFile2.getOriginPosition().getStartLine()).isEqualTo(1);
     assertThat(cloneGroupFile2.getOriginPosition().getEndLine()).isEqualTo(17);
     assertThat(cloneGroupFile2.getDuplicateList()).hasSize(1);
@@ -241,7 +241,7 @@ public class CpdMediumTest {
 
     InputFile inputFile1 = result.inputFile("src/sample1.xoo");
 
-    List<BatchReport.CpdTextBlock> duplicationBlocks = result.duplicationBlocksFor(inputFile1);
+    List<ScannerReport.CpdTextBlock> duplicationBlocks = result.duplicationBlocksFor(inputFile1);
     assertThat(duplicationBlocks).hasSize(3);
     assertThat(duplicationBlocks.get(0).getStartLine()).isEqualTo(1);
     assertThat(duplicationBlocks.get(0).getEndLine()).isEqualTo(5);
@@ -294,10 +294,10 @@ public class CpdMediumTest {
     assertThat(allMeasures.get("com.foo.project:src/sample.xoo")).extracting("metricKey", "intValue").containsOnly(
       Tuple.tuple(CoreMetrics.LINES_KEY, blockCount * 2 + 1));
 
-    List<org.sonar.batch.protocol.output.BatchReport.Duplication> duplicationGroups = result.duplicationsFor(result.inputFile("src/sample.xoo"));
+    List<org.sonar.scanner.protocol.output.ScannerReport.Duplication> duplicationGroups = result.duplicationsFor(result.inputFile("src/sample.xoo"));
     assertThat(duplicationGroups).hasSize(1);
 
-    org.sonar.batch.protocol.output.BatchReport.Duplication cloneGroup = duplicationGroups.get(0);
+    org.sonar.scanner.protocol.output.ScannerReport.Duplication cloneGroup = duplicationGroups.get(0);
     assertThat(cloneGroup.getDuplicateList()).hasSize(100);
   }
 
@@ -322,10 +322,10 @@ public class CpdMediumTest {
 
     InputFile inputFile = result.inputFile("src/sample.xoo");
     // One clone group
-    List<org.sonar.batch.protocol.output.BatchReport.Duplication> duplicationGroups = result.duplicationsFor(inputFile);
+    List<org.sonar.scanner.protocol.output.ScannerReport.Duplication> duplicationGroups = result.duplicationsFor(inputFile);
     assertThat(duplicationGroups).hasSize(1);
 
-    org.sonar.batch.protocol.output.BatchReport.Duplication cloneGroup = duplicationGroups.get(0);
+    org.sonar.scanner.protocol.output.ScannerReport.Duplication cloneGroup = duplicationGroups.get(0);
     assertThat(cloneGroup.getOriginPosition().getStartLine()).isEqualTo(1);
     assertThat(cloneGroup.getOriginPosition().getEndLine()).isEqualTo(2);
     assertThat(cloneGroup.getDuplicateList()).hasSize(1);
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/deprecated/DeprecatedApiMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/deprecated/DeprecatedApiMediumTest.java
index fa1ff38833d..fa1ff38833d 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/deprecated/DeprecatedApiMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/deprecated/DeprecatedApiMediumTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/fs/FileSystemMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/fs/FileSystemMediumTest.java
index dcb32c1030e..dcb32c1030e 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/fs/FileSystemMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/fs/FileSystemMediumTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/fs/NoLanguagesPluginsMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/fs/NoLanguagesPluginsMediumTest.java
index 90502c54ae8..90502c54ae8 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/fs/NoLanguagesPluginsMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/fs/NoLanguagesPluginsMediumTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/fs/ProjectBuilderMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/fs/ProjectBuilderMediumTest.java
index 418b1104404..21526ddcfd5 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/fs/ProjectBuilderMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/fs/ProjectBuilderMediumTest.java
@@ -34,7 +34,7 @@ import org.junit.rules.TemporaryFolder;
 import org.sonar.api.utils.MessageException;
 import org.sonar.batch.mediumtest.BatchMediumTester;
 import org.sonar.batch.mediumtest.TaskResult;
-import org.sonar.batch.protocol.output.BatchReport.Issue;
+import org.sonar.scanner.protocol.output.ScannerReport.Issue;
 import org.sonar.xoo.XooPlugin;
 import org.sonar.xoo.rule.XooRulesDefinition;
 
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/highlighting/HighlightingMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/highlighting/HighlightingMediumTest.java
index 3c83ed61fcf..3c83ed61fcf 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/highlighting/HighlightingMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/highlighting/HighlightingMediumTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/ChecksMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/ChecksMediumTest.java
index 501e0961adb..804a66a7d4d 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/ChecksMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/ChecksMediumTest.java
@@ -34,8 +34,8 @@ import org.junit.rules.TemporaryFolder;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.batch.mediumtest.BatchMediumTester;
 import org.sonar.batch.mediumtest.TaskResult;
-import org.sonar.batch.protocol.output.BatchReport.Issue;
 import org.sonar.batch.rule.LoadedActiveRule;
+import org.sonar.scanner.protocol.output.ScannerReport.Issue;
 import org.sonar.xoo.XooPlugin;
 import org.sonar.xoo.rule.XooRulesDefinition;
 
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/IssuesIssuesModeMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/IssuesIssuesModeMediumTest.java
index cae361869cb..cae361869cb 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/IssuesIssuesModeMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/IssuesIssuesModeMediumTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/IssuesMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/IssuesMediumTest.java
index 176c51ca5d7..50823ff4f48 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/IssuesMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/IssuesMediumTest.java
@@ -32,7 +32,7 @@ import org.junit.rules.TemporaryFolder;
 import org.sonar.batch.bootstrapper.IssueListener;
 import org.sonar.batch.mediumtest.BatchMediumTester;
 import org.sonar.batch.mediumtest.TaskResult;
-import org.sonar.batch.protocol.output.BatchReport.Issue;
+import org.sonar.scanner.protocol.output.ScannerReport.Issue;
 import org.sonar.xoo.XooPlugin;
 import org.sonar.xoo.rule.XooRulesDefinition;
 
@@ -121,7 +121,7 @@ public class IssuesMediumTest {
       .start();
 
     List<Issue> issues = result.issuesFor(result.inputFile("xources/hello/HelloJava.xoo"));
-    assertThat(issues.get(0).getSeverity()).isEqualTo(org.sonar.batch.protocol.Constants.Severity.CRITICAL);
+    assertThat(issues.get(0).getSeverity()).isEqualTo(org.sonar.scanner.protocol.Constants.Severity.CRITICAL);
   }
 
   @Test
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/IssuesOnDirMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/IssuesOnDirMediumTest.java
index aae11ca0e39..aae11ca0e39 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/IssuesOnDirMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/IssuesOnDirMediumTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/IssuesOnModuleMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/IssuesOnModuleMediumTest.java
index 73434ed872d..73434ed872d 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/IssuesOnModuleMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/IssuesOnModuleMediumTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/MultilineIssuesMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/MultilineIssuesMediumTest.java
index ac313d4a14c..7ec0fe90535 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/MultilineIssuesMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/MultilineIssuesMediumTest.java
@@ -28,9 +28,9 @@ import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.batch.mediumtest.BatchMediumTester;
 import org.sonar.batch.mediumtest.TaskResult;
-import org.sonar.batch.protocol.output.BatchReport.Flow;
-import org.sonar.batch.protocol.output.BatchReport.Issue;
-import org.sonar.batch.protocol.output.BatchReport.IssueLocation;
+import org.sonar.scanner.protocol.output.ScannerReport.Flow;
+import org.sonar.scanner.protocol.output.ScannerReport.Issue;
+import org.sonar.scanner.protocol.output.ScannerReport.IssueLocation;
 import org.sonar.xoo.XooPlugin;
 import org.sonar.xoo.rule.XooRulesDefinition;
 
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issuesmode/EmptyFileTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issuesmode/EmptyFileTest.java
index 22eb34b4c22..22eb34b4c22 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issuesmode/EmptyFileTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issuesmode/EmptyFileTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issuesmode/IssueModeAndReportsMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issuesmode/IssueModeAndReportsMediumTest.java
index 7be43ca1e29..e02c84ec71a 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issuesmode/IssueModeAndReportsMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issuesmode/IssueModeAndReportsMediumTest.java
@@ -46,9 +46,9 @@ import org.sonar.api.utils.log.LogTester;
 import org.sonar.batch.bootstrapper.IssueListener;
 import org.sonar.batch.mediumtest.BatchMediumTester;
 import org.sonar.batch.mediumtest.TaskResult;
-import org.sonar.batch.protocol.Constants.Severity;
-import org.sonar.batch.protocol.input.BatchInput.ServerIssue;
 import org.sonar.batch.scan.report.ConsoleReport;
+import org.sonar.scanner.protocol.Constants.Severity;
+import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
 import org.sonar.xoo.XooPlugin;
 import org.sonar.xoo.rule.XooRulesDefinition;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issuesmode/NoPreviousAnalysisTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issuesmode/NoPreviousAnalysisTest.java
index fa133979562..fa133979562 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issuesmode/NoPreviousAnalysisTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issuesmode/NoPreviousAnalysisTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issuesmode/NonAssociatedProject.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issuesmode/NonAssociatedProject.java
index 32c66f2689f..32c66f2689f 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issuesmode/NonAssociatedProject.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issuesmode/NonAssociatedProject.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issuesmode/ScanOnlyChangedTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issuesmode/ScanOnlyChangedTest.java
index d2c98c1fe36..eb5850b0809 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issuesmode/ScanOnlyChangedTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issuesmode/ScanOnlyChangedTest.java
@@ -24,6 +24,8 @@ import org.sonar.batch.issue.tracking.TrackedIssue;
 import org.assertj.core.api.Condition;
 import com.google.common.io.Resources;
 import org.sonar.batch.repository.FileData;
+import org.sonar.scanner.protocol.Constants.Severity;
+import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
 import com.google.common.collect.ImmutableMap;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.FileUtils;
@@ -32,8 +34,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.sonar.api.CoreProperties;
 import org.sonar.batch.mediumtest.BatchMediumTester;
-import org.sonar.batch.protocol.Constants.Severity;
-import org.sonar.batch.protocol.input.BatchInput.ServerIssue;
 import org.sonar.xoo.XooPlugin;
 import org.sonar.xoo.rule.XooRulesDefinition;
 import org.junit.rules.TemporaryFolder;
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/log/ExceptionHandlingMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/log/ExceptionHandlingMediumTest.java
index f894febe7c1..db1a2dcd30e 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/log/ExceptionHandlingMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/log/ExceptionHandlingMediumTest.java
@@ -28,8 +28,8 @@ import org.junit.BeforeClass;
 import org.sonar.batch.bootstrapper.EnvironmentInformation;
 import org.sonar.api.utils.MessageException;
 import org.apache.commons.lang.mutable.MutableBoolean;
-import org.sonar.batch.protocol.input.GlobalRepositories;
 import org.sonar.batch.repository.GlobalRepositoriesLoader;
+import org.sonar.scanner.protocol.input.GlobalRepositories;
 import org.sonar.batch.bootstrapper.Batch;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/log/LogListenerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/log/LogListenerTest.java
index f360dca56ac..f360dca56ac 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/log/LogListenerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/log/LogListenerTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/measures/MeasuresMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/measures/MeasuresMediumTest.java
index b083f243cb3..e9db30c49f4 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/measures/MeasuresMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/measures/MeasuresMediumTest.java
@@ -33,7 +33,7 @@ import org.junit.rules.TemporaryFolder;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.batch.mediumtest.BatchMediumTester;
 import org.sonar.batch.mediumtest.TaskResult;
-import org.sonar.batch.protocol.output.BatchReport.Measure;
+import org.sonar.scanner.protocol.output.ScannerReport.Measure;
 import org.sonar.xoo.XooPlugin;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/scm/ScmMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/scm/ScmMediumTest.java
index 8230743da28..37c8da1ef01 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/scm/ScmMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/scm/ScmMediumTest.java
@@ -34,11 +34,11 @@ import org.sonar.api.utils.PathUtils;
 import org.sonar.api.utils.log.LogTester;
 import org.sonar.batch.mediumtest.BatchMediumTester;
 import org.sonar.batch.mediumtest.BatchMediumTester.TaskBuilder;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReport.Changesets.Changeset;
-import org.sonar.batch.protocol.output.BatchReport.Component;
-import org.sonar.batch.protocol.output.BatchReportReader;
 import org.sonar.batch.repository.FileData;
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReportReader;
+import org.sonar.scanner.protocol.output.ScannerReport.Component;
+import org.sonar.scanner.protocol.output.ScannerReport.Changesets.Changeset;
 import org.sonar.xoo.XooPlugin;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -96,7 +96,7 @@ public class ScmMediumTest {
         .build())
       .start();
 
-    BatchReport.Changesets fileScm = getChangesets(baseDir, "src/sample.xoo");
+    ScannerReport.Changesets fileScm = getChangesets(baseDir, "src/sample.xoo");
 
     assertThat(fileScm.getChangesetIndexByLineList()).hasSize(5);
 
@@ -116,9 +116,9 @@ public class ScmMediumTest {
     assertThat(changesetLine5.getAuthor()).isEqualTo("simon");
   }
 
-  private BatchReport.Changesets getChangesets(File baseDir, String path) {
+  private ScannerReport.Changesets getChangesets(File baseDir, String path) {
     File reportDir = new File(baseDir, ".sonar/batch-report");
-    BatchReportReader reader = new BatchReportReader(reportDir);
+    ScannerReportReader reader = new ScannerReportReader(reportDir);
 
     Component project = reader.readComponent(reader.readMetadata().getRootComponentRef());
     Component dir = reader.readComponent(project.getChildRef(0));
@@ -152,7 +152,7 @@ public class ScmMediumTest {
         .build())
       .start();
 
-    BatchReport.Changesets changesets = getChangesets(baseDir, "src/sample.xoo");
+    ScannerReport.Changesets changesets = getChangesets(baseDir, "src/sample.xoo");
 
     assertThat(changesets).isNull();
   }
@@ -177,10 +177,10 @@ public class ScmMediumTest {
         .build())
       .start();
 
-    BatchReport.Changesets file1Scm = getChangesets(baseDir, "src/sample.xoo");
+    ScannerReport.Changesets file1Scm = getChangesets(baseDir, "src/sample.xoo");
     assertThat(file1Scm).isNotNull();
 
-    BatchReport.Changesets fileWithoutBlameScm = getChangesets(baseDir, "src/sample_no_blame.xoo");
+    ScannerReport.Changesets fileWithoutBlameScm = getChangesets(baseDir, "src/sample_no_blame.xoo");
     assertThat(fileWithoutBlameScm).isNull();
 
     assertThat(logTester.logs()).containsSubsequence("2 files to be analyzed", "1/2 files analyzed", MISSING_BLAME_INFORMATION_FOR_THE_FOLLOWING_FILES,
@@ -266,10 +266,10 @@ public class ScmMediumTest {
 
     taskBuilder.start();
 
-    BatchReport.Changesets file1Scm = getChangesets(baseDir, "src/sample.xoo");
+    ScannerReport.Changesets file1Scm = getChangesets(baseDir, "src/sample.xoo");
     assertThat(file1Scm).isNotNull();
 
-    BatchReport.Changesets file2Scm = getChangesets(baseDir, SAME_CONTENT_SCM_ON_SERVER_XOO);
+    ScannerReport.Changesets file2Scm = getChangesets(baseDir, SAME_CONTENT_SCM_ON_SERVER_XOO);
     assertThat(file2Scm).isNotNull();
   }
 
@@ -291,7 +291,7 @@ public class ScmMediumTest {
         .build())
       .start();
 
-    BatchReport.Changesets file1Scm = getChangesets(baseDir, "src/sample.xoo");
+    ScannerReport.Changesets file1Scm = getChangesets(baseDir, "src/sample.xoo");
     assertThat(file1Scm).isNotNull();
   }
 
@@ -313,7 +313,7 @@ public class ScmMediumTest {
         .build())
       .start();
 
-    BatchReport.Changesets file1Scm = getChangesets(baseDir, "src/sample.xoo");
+    ScannerReport.Changesets file1Scm = getChangesets(baseDir, "src/sample.xoo");
     assertThat(file1Scm).isNotNull();
   }
 
@@ -356,7 +356,7 @@ public class ScmMediumTest {
         .build())
       .start();
 
-    BatchReport.Changesets changesets = getChangesets(baseDir, "src/sample.xoo");
+    ScannerReport.Changesets changesets = getChangesets(baseDir, "src/sample.xoo");
     assertThat(changesets).isNull();
   }
 
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/symbol/SymbolMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/symbol/SymbolMediumTest.java
index dc4c7e3a286..8d9836f994d 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/symbol/SymbolMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/symbol/SymbolMediumTest.java
@@ -30,7 +30,7 @@ import org.junit.rules.TemporaryFolder;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.batch.mediumtest.BatchMediumTester;
 import org.sonar.batch.mediumtest.TaskResult;
-import org.sonar.batch.protocol.output.BatchReport;
+import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.xoo.XooPlugin;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -81,7 +81,7 @@ public class SymbolMediumTest {
       .start();
 
     InputFile file = result.inputFile("src/sample.xoo");
-    assertThat(result.symbolReferencesFor(file, 1, 7)).containsOnly(BatchReport.TextRange.newBuilder().setStartLine(3).setStartOffset(8).setEndLine(3).setEndOffset(11).build());
+    assertThat(result.symbolReferencesFor(file, 1, 7)).containsOnly(ScannerReport.TextRange.newBuilder().setStartLine(3).setStartOffset(8).setEndLine(3).setEndOffset(11).build());
   }
 
   @Test
@@ -110,7 +110,7 @@ public class SymbolMediumTest {
       .start();
 
     InputFile file = result.inputFile("src/sample.xoo");
-    assertThat(result.symbolReferencesFor(file, 1, 7)).containsOnly(BatchReport.TextRange.newBuilder().setStartLine(3).setStartOffset(8).setEndLine(4).setEndOffset(1).build());
+    assertThat(result.symbolReferencesFor(file, 1, 7)).containsOnly(ScannerReport.TextRange.newBuilder().setStartLine(3).setStartOffset(8).setEndLine(4).setEndOffset(1).build());
   }
 
 }
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/tasks/TasksMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/tasks/TasksMediumTest.java
index 766e9371898..766e9371898 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/tasks/TasksMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/tasks/TasksMediumTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/tests/CoveragePerTestMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/tests/CoveragePerTestMediumTest.java
index f2b121fef16..d62d978ecaf 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/tests/CoveragePerTestMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/tests/CoveragePerTestMediumTest.java
@@ -107,14 +107,14 @@ public class CoveragePerTestMediumTest {
     TaskResult result = runTask(baseDir);
 
     InputFile file = result.inputFile("test/sampleTest.xoo");
-    org.sonar.batch.protocol.output.BatchReport.CoverageDetail someTest = result.coveragePerTestFor(file, "some test");
+    org.sonar.scanner.protocol.output.ScannerReport.CoverageDetail someTest = result.coveragePerTestFor(file, "some test");
     assertThat(someTest.getCoveredFileList()).hasSize(2);
     assertThat(someTest.getCoveredFile(0).getFileRef()).isGreaterThan(0);
     assertThat(someTest.getCoveredFile(0).getCoveredLineList()).containsExactly(10, 11);
     assertThat(someTest.getCoveredFile(1).getFileRef()).isGreaterThan(0);
     assertThat(someTest.getCoveredFile(1).getCoveredLineList()).containsExactly(1, 2);
 
-    org.sonar.batch.protocol.output.BatchReport.CoverageDetail anotherTest = result.coveragePerTestFor(file, "another test");
+    org.sonar.scanner.protocol.output.ScannerReport.CoverageDetail anotherTest = result.coveragePerTestFor(file, "another test");
     assertThat(anotherTest.getCoveredFileList()).hasSize(1);
     assertThat(anotherTest.getCoveredFile(0).getFileRef()).isGreaterThan(0);
     assertThat(anotherTest.getCoveredFile(0).getCoveredLineList()).containsExactly(10, 20);
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/tests/TestExecutionMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/tests/TestExecutionMediumTest.java
index 7b9c45dd9b6..cae559f16c5 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/tests/TestExecutionMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/tests/TestExecutionMediumTest.java
@@ -28,7 +28,7 @@ import org.junit.rules.TemporaryFolder;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.batch.mediumtest.BatchMediumTester;
 import org.sonar.batch.mediumtest.TaskResult;
-import org.sonar.batch.protocol.Constants.TestStatus;
+import org.sonar.scanner.protocol.Constants.TestStatus;
 import org.sonar.xoo.XooPlugin;
 
 import java.io.File;
@@ -91,11 +91,11 @@ public class TestExecutionMediumTest {
       .start();
 
     InputFile file = result.inputFile("test/sampleTest.xoo");
-    org.sonar.batch.protocol.output.BatchReport.Test success = result.testExecutionFor(file, "success");
+    org.sonar.scanner.protocol.output.ScannerReport.Test success = result.testExecutionFor(file, "success");
     assertThat(success.getDurationInMs()).isEqualTo(4);
     assertThat(success.getStatus()).isEqualTo(TestStatus.OK);
 
-    org.sonar.batch.protocol.output.BatchReport.Test error = result.testExecutionFor(file, "error");
+    org.sonar.scanner.protocol.output.ScannerReport.Test error = result.testExecutionFor(file, "error");
     assertThat(error.getDurationInMs()).isEqualTo(2);
     assertThat(error.getStatus()).isEqualTo(TestStatus.ERROR);
     assertThat(error.getMsg()).isEqualTo("Error");
diff --git a/sonar-batch/src/test/java/org/sonar/batch/phases/PostJobsExecutorTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/phases/PostJobsExecutorTest.java
index f9fda97b21c..f9fda97b21c 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/phases/PostJobsExecutorTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/phases/PostJobsExecutorTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/platform/DefaultServerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/platform/DefaultServerTest.java
index 801848354fc..801848354fc 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/platform/DefaultServerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/platform/DefaultServerTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/postjob/DefaultPostJobContextTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/postjob/DefaultPostJobContextTest.java
index 12f00a55d90..12f00a55d90 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/postjob/DefaultPostJobContextTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/postjob/DefaultPostJobContextTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/postjob/PostJobOptimizerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/postjob/PostJobOptimizerTest.java
index e5d30f1dfa3..e5d30f1dfa3 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/postjob/PostJobOptimizerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/postjob/PostJobOptimizerTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/profiling/PhasesSumUpTimeProfilerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/profiling/PhasesSumUpTimeProfilerTest.java
index 9c8e4ed8d56..9c8e4ed8d56 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/profiling/PhasesSumUpTimeProfilerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/profiling/PhasesSumUpTimeProfilerTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/report/ActiveRulesPublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/report/ActiveRulesPublisherTest.java
index 187f6c6586b..4b912b22d7b 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/report/ActiveRulesPublisherTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/report/ActiveRulesPublisherTest.java
@@ -30,11 +30,11 @@ import org.sonar.api.batch.rule.internal.ActiveRulesBuilder;
 import org.sonar.api.batch.rule.internal.DefaultActiveRules;
 import org.sonar.api.batch.rule.internal.NewActiveRule;
 import org.sonar.api.rule.RuleKey;
-import org.sonar.batch.protocol.Constants;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReportReader;
-import org.sonar.batch.protocol.output.BatchReportWriter;
 import org.sonar.core.util.CloseableIterator;
+import org.sonar.scanner.protocol.Constants;
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReportReader;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -46,7 +46,7 @@ public class ActiveRulesPublisherTest {
   @Test
   public void write() throws Exception {
     File outputDir = temp.newFolder();
-    BatchReportWriter writer = new BatchReportWriter(outputDir);
+    ScannerReportWriter writer = new ScannerReportWriter(outputDir);
 
     NewActiveRule ar = new ActiveRulesBuilder().create(RuleKey.of("java", "S001")).setSeverity("BLOCKER").setParam("p1", "v1");
     ActiveRules activeRules = new DefaultActiveRules(Arrays.asList(ar));
@@ -54,9 +54,9 @@ public class ActiveRulesPublisherTest {
     ActiveRulesPublisher underTest = new ActiveRulesPublisher(activeRules);
     underTest.publish(writer);
 
-    BatchReportReader reader = new BatchReportReader(outputDir);
-    try (CloseableIterator<BatchReport.ActiveRule> readIt = reader.readActiveRules()) {
-      BatchReport.ActiveRule reportAr = readIt.next();
+    ScannerReportReader reader = new ScannerReportReader(outputDir);
+    try (CloseableIterator<ScannerReport.ActiveRule> readIt = reader.readActiveRules()) {
+      ScannerReport.ActiveRule reportAr = readIt.next();
       assertThat(reportAr.getRuleRepository()).isEqualTo("java");
       assertThat(reportAr.getRuleKey()).isEqualTo("S001");
       assertThat(reportAr.getSeverity()).isEqualTo(Constants.Severity.BLOCKER);
diff --git a/sonar-batch/src/test/java/org/sonar/batch/report/AnalysisContextReportPublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/report/AnalysisContextReportPublisherTest.java
index c8fd502117f..320941119b3 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/report/AnalysisContextReportPublisherTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/report/AnalysisContextReportPublisherTest.java
@@ -35,9 +35,9 @@ import org.sonar.api.utils.System2;
 import org.sonar.api.utils.log.LogTester;
 import org.sonar.api.utils.log.LoggerLevel;
 import org.sonar.batch.bootstrap.BatchPluginRepository;
-import org.sonar.batch.protocol.output.BatchReportWriter;
 import org.sonar.batch.repository.ProjectRepositories;
 import org.sonar.core.platform.PluginInfo;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
 import org.sonar.updatecenter.common.Version;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -77,7 +77,7 @@ public class AnalysisContextReportPublisherTest {
   public void shouldOnlyDumpPluginsByDefault() throws Exception {
     when(pluginRepo.getPluginInfos()).thenReturn(Arrays.asList(new PluginInfo("xoo").setName("Xoo").setVersion(Version.create("1.0"))));
 
-    BatchReportWriter writer = new BatchReportWriter(temp.newFolder());
+    ScannerReportWriter writer = new ScannerReportWriter(temp.newFolder());
     publisher.init(writer);
 
     assertThat(writer.getFileStructure().analysisLog()).exists();
@@ -90,7 +90,7 @@ public class AnalysisContextReportPublisherTest {
   public void shouldNotDumpInIssuesMode() throws Exception {
     when(analysisMode.isIssues()).thenReturn(true);
 
-    BatchReportWriter writer = new BatchReportWriter(temp.newFolder());
+    ScannerReportWriter writer = new ScannerReportWriter(temp.newFolder());
     publisher.init(writer);
     publisher.dumpSettings(ProjectDefinition.create().setProperty("sonar.projectKey", "foo"));
 
@@ -100,7 +100,7 @@ public class AnalysisContextReportPublisherTest {
   @Test
   public void dumpServerSideProps() throws Exception {
     logTester.setLevel(LoggerLevel.DEBUG);
-    BatchReportWriter writer = new BatchReportWriter(temp.newFolder());
+    ScannerReportWriter writer = new ScannerReportWriter(temp.newFolder());
     publisher.init(writer);
 
     when(projectRepos.moduleExists("foo")).thenReturn(true);
@@ -117,7 +117,7 @@ public class AnalysisContextReportPublisherTest {
   @Test
   public void shouldNotDumpSQPropsInSystemProps() throws Exception {
     logTester.setLevel(LoggerLevel.DEBUG);
-    BatchReportWriter writer = new BatchReportWriter(temp.newFolder());
+    ScannerReportWriter writer = new ScannerReportWriter(temp.newFolder());
     Properties props = new Properties();
     props.setProperty(COM_FOO, "bar");
     props.setProperty(SONAR_SKIP, "true");
@@ -141,7 +141,7 @@ public class AnalysisContextReportPublisherTest {
   @Test
   public void shouldNotDumpEnvTwice() throws Exception {
     logTester.setLevel(LoggerLevel.DEBUG);
-    BatchReportWriter writer = new BatchReportWriter(temp.newFolder());
+    ScannerReportWriter writer = new ScannerReportWriter(temp.newFolder());
 
     Map<String, String> env = new HashMap<>();
     env.put(FOO, "BAR");
@@ -166,7 +166,7 @@ public class AnalysisContextReportPublisherTest {
 
   @Test
   public void shouldNotDumpSensitiveProperties() throws Exception {
-    BatchReportWriter writer = new BatchReportWriter(temp.newFolder());
+    ScannerReportWriter writer = new ScannerReportWriter(temp.newFolder());
     publisher.init(writer);
 
     assertThat(writer.getFileStructure().analysisLog()).exists();
@@ -187,7 +187,7 @@ public class AnalysisContextReportPublisherTest {
   @Test
   public void dontDumpParentProps() throws Exception {
     logTester.setLevel(LoggerLevel.DEBUG);
-    BatchReportWriter writer = new BatchReportWriter(temp.newFolder());
+    ScannerReportWriter writer = new ScannerReportWriter(temp.newFolder());
     publisher.init(writer);
 
     ProjectDefinition module = ProjectDefinition.create()
diff --git a/sonar-batch/src/test/java/org/sonar/batch/report/ComponentsPublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/report/ComponentsPublisherTest.java
index 1d5393f95f2..0a4ed8d69cd 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/report/ComponentsPublisherTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/report/ComponentsPublisherTest.java
@@ -33,12 +33,12 @@ import org.sonar.api.resources.Java;
 import org.sonar.api.resources.Project;
 import org.sonar.api.utils.DateUtils;
 import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.protocol.Constants.ComponentLinkType;
-import org.sonar.batch.protocol.output.BatchReport.Component;
-import org.sonar.batch.protocol.output.BatchReportReader;
-import org.sonar.batch.protocol.output.BatchReportWriter;
-import org.sonar.batch.protocol.output.FileStructure;
 import org.sonar.batch.scan.ImmutableProjectReactor;
+import org.sonar.scanner.protocol.Constants.ComponentLinkType;
+import org.sonar.scanner.protocol.output.ScannerReportReader;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
+import org.sonar.scanner.protocol.output.FileStructure;
+import org.sonar.scanner.protocol.output.ScannerReport.Component;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -90,7 +90,7 @@ public class ComponentsPublisherTest {
     ComponentsPublisher publisher = new ComponentsPublisher(reactor, resourceCache);
 
     File outputDir = temp.newFolder();
-    BatchReportWriter writer = new BatchReportWriter(outputDir);
+    ScannerReportWriter writer = new ScannerReportWriter(outputDir);
     publisher.publish(writer);
 
     assertThat(writer.hasComponentData(FileStructure.Domain.COMPONENT, 1)).isTrue();
@@ -103,7 +103,7 @@ public class ComponentsPublisherTest {
     // no such reference
     assertThat(writer.hasComponentData(FileStructure.Domain.COMPONENT, 7)).isFalse();
 
-    BatchReportReader reader = new BatchReportReader(outputDir);
+    ScannerReportReader reader = new ScannerReportReader(outputDir);
     Component rootProtobuf = reader.readComponent(1);
     assertThat(rootProtobuf.getKey()).isEqualTo("foo");
     assertThat(rootProtobuf.getDescription()).isEqualTo("Root description");
@@ -151,10 +151,10 @@ public class ComponentsPublisherTest {
     ComponentsPublisher publisher = new ComponentsPublisher(reactor, resourceCache);
 
     File outputDir = temp.newFolder();
-    BatchReportWriter writer = new BatchReportWriter(outputDir);
+    ScannerReportWriter writer = new ScannerReportWriter(outputDir);
     publisher.publish(writer);
 
-    BatchReportReader reader = new BatchReportReader(outputDir);
+    ScannerReportReader reader = new ScannerReportReader(outputDir);
     Component rootProtobuf = reader.readComponent(1);
     assertThat(rootProtobuf.getVersion()).isEqualTo("1.0");
     assertThat(rootProtobuf.getLinkCount()).isEqualTo(1);
diff --git a/sonar-batch/src/test/java/org/sonar/batch/report/CoveragePublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/report/CoveragePublisherTest.java
index 07952274c45..72c31cf4928 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/report/CoveragePublisherTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/report/CoveragePublisherTest.java
@@ -31,11 +31,11 @@ import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.measures.Measure;
 import org.sonar.api.resources.Project;
 import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.protocol.output.BatchReport.Coverage;
-import org.sonar.batch.protocol.output.BatchReportReader;
-import org.sonar.batch.protocol.output.BatchReportWriter;
 import org.sonar.batch.scan.measure.MeasureCache;
 import org.sonar.core.util.CloseableIterator;
+import org.sonar.scanner.protocol.output.ScannerReportReader;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
+import org.sonar.scanner.protocol.output.ScannerReport.Coverage;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.anyString;
@@ -86,11 +86,11 @@ public class CoveragePublisherTest {
     when(measureCache.byMetric("foo:src/Foo.php", CoreMetrics.OVERALL_COVERED_CONDITIONS_BY_LINE_KEY)).thenReturn(overallCoveredConditions);
 
     File outputDir = temp.newFolder();
-    BatchReportWriter writer = new BatchReportWriter(outputDir);
+    ScannerReportWriter writer = new ScannerReportWriter(outputDir);
 
     publisher.publish(writer);
 
-    try (CloseableIterator<Coverage> it = new BatchReportReader(outputDir).readComponentCoverage(2)) {
+    try (CloseableIterator<Coverage> it = new ScannerReportReader(outputDir).readComponentCoverage(2)) {
       assertThat(it.next()).isEqualTo(Coverage.newBuilder()
         .setLine(2)
         .setUtHits(true)
diff --git a/sonar-batch/src/test/java/org/sonar/batch/report/MeasuresPublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/report/MeasuresPublisherTest.java
index 51830c30d1e..0c7a29dd377 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/report/MeasuresPublisherTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/report/MeasuresPublisherTest.java
@@ -33,12 +33,12 @@ import org.sonar.api.measures.Measure;
 import org.sonar.api.resources.Project;
 import org.sonar.api.resources.Resource;
 import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReportReader;
-import org.sonar.batch.protocol.output.BatchReportWriter;
 import org.sonar.batch.scan.measure.MeasureCache;
 import org.sonar.core.metric.BatchMetrics;
 import org.sonar.core.util.CloseableIterator;
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReportReader;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
 
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -82,14 +82,14 @@ public class MeasuresPublisherTest {
     when(measureCache.byResource(sampleFile)).thenReturn(asList(measure, stringMeasure));
 
     File outputDir = temp.newFolder();
-    BatchReportWriter writer = new BatchReportWriter(outputDir);
+    ScannerReportWriter writer = new ScannerReportWriter(outputDir);
 
     publisher.publish(writer);
 
-    BatchReportReader reader = new BatchReportReader(outputDir);
+    ScannerReportReader reader = new ScannerReportReader(outputDir);
 
     assertThat(reader.readComponentMeasures(1)).hasSize(0);
-    try (CloseableIterator<BatchReport.Measure> componentMeasures = reader.readComponentMeasures(2)) {
+    try (CloseableIterator<ScannerReport.Measure> componentMeasures = reader.readComponentMeasures(2)) {
       assertThat(componentMeasures).hasSize(2);
     }
   }
@@ -100,7 +100,7 @@ public class MeasuresPublisherTest {
     when(measureCache.byResource(sampleFile)).thenReturn(Collections.singletonList(measure));
 
     File outputDir = temp.newFolder();
-    BatchReportWriter writer = new BatchReportWriter(outputDir);
+    ScannerReportWriter writer = new ScannerReportWriter(outputDir);
 
     try {
       publisher.publish(writer);
diff --git a/sonar-batch/src/test/java/org/sonar/batch/report/MetadataPublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/report/MetadataPublisherTest.java
index 90e261cd776..7069845e9cf 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/report/MetadataPublisherTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/report/MetadataPublisherTest.java
@@ -30,10 +30,10 @@ import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.config.Settings;
 import org.sonar.api.resources.Project;
 import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReportReader;
-import org.sonar.batch.protocol.output.BatchReportWriter;
 import org.sonar.batch.scan.ImmutableProjectReactor;
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReportReader;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -63,12 +63,12 @@ public class MetadataPublisherTest {
   public void write_metadata() throws Exception {
     settings.setProperty(CoreProperties.CPD_CROSS_PROJECT, "true");
     File outputDir = temp.newFolder();
-    BatchReportWriter writer = new BatchReportWriter(outputDir);
+    ScannerReportWriter writer = new ScannerReportWriter(outputDir);
 
     underTest.publish(writer);
 
-    BatchReportReader reader = new BatchReportReader(outputDir);
-    BatchReport.Metadata metadata = reader.readMetadata();
+    ScannerReportReader reader = new ScannerReportReader(outputDir);
+    ScannerReport.Metadata metadata = reader.readMetadata();
     assertThat(metadata.getAnalysisDate()).isEqualTo(1234567L);
     assertThat(metadata.getProjectKey()).isEqualTo("foo");
     assertThat(metadata.getProjectKey()).isEqualTo("foo");
@@ -84,12 +84,12 @@ public class MetadataPublisherTest {
     project.setEffectiveKey("foo:myBranch");
 
     File outputDir = temp.newFolder();
-    BatchReportWriter writer = new BatchReportWriter(outputDir);
+    ScannerReportWriter writer = new ScannerReportWriter(outputDir);
 
     underTest.publish(writer);
 
-    BatchReportReader reader = new BatchReportReader(outputDir);
-    BatchReport.Metadata metadata = reader.readMetadata();
+    ScannerReportReader reader = new ScannerReportReader(outputDir);
+    ScannerReport.Metadata metadata = reader.readMetadata();
     assertThat(metadata.getAnalysisDate()).isEqualTo(1234567L);
     assertThat(metadata.getProjectKey()).isEqualTo("foo");
     assertThat(metadata.getBranch()).isEqualTo("myBranch");
diff --git a/sonar-batch/src/test/java/org/sonar/batch/report/ReportPublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/report/ReportPublisherTest.java
index bb54bfb9113..bb54bfb9113 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/report/ReportPublisherTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/report/ReportPublisherTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/report/SourcePublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/report/SourcePublisherTest.java
index 47da22e67ce..683d6fecb8a 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/report/SourcePublisherTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/report/SourcePublisherTest.java
@@ -33,7 +33,7 @@ import org.sonar.api.batch.fs.internal.DefaultInputModule;
 import org.sonar.api.resources.Project;
 import org.sonar.api.resources.Qualifiers;
 import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.protocol.output.BatchReportWriter;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -46,7 +46,7 @@ public class SourcePublisherTest {
 
   private File sourceFile;
 
-  private BatchReportWriter writer;
+  private ScannerReportWriter writer;
 
   private org.sonar.api.resources.File sampleFile;
 
@@ -63,7 +63,7 @@ public class SourcePublisherTest {
       new DefaultInputFile("foo", "src/Foo.php").setLines(5).setModuleBaseDir(baseDir.toPath()).setCharset(StandardCharsets.ISO_8859_1));
     publisher = new SourcePublisher(resourceCache);
     File outputDir = temp.newFolder();
-    writer = new BatchReportWriter(outputDir);
+    writer = new ScannerReportWriter(outputDir);
   }
 
   @Test
diff --git a/sonar-batch/src/test/java/org/sonar/batch/repository/DefaultGlobalRepositoriesLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/DefaultGlobalRepositoriesLoaderTest.java
index c50cc0a0338..cb3781e5103 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/repository/DefaultGlobalRepositoriesLoaderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/DefaultGlobalRepositoriesLoaderTest.java
@@ -24,7 +24,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.sonar.batch.cache.WSLoader;
 import org.sonar.batch.cache.WSLoaderResult;
-import org.sonar.batch.protocol.input.GlobalRepositories;
+import org.sonar.scanner.protocol.input.GlobalRepositories;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-batch/src/test/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoaderTest.java
index d633820ca83..d633820ca83 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoaderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoaderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/repository/DefaultQualityProfileLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/DefaultQualityProfileLoaderTest.java
index d3b4ce6b87d..d3b4ce6b87d 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/repository/DefaultQualityProfileLoaderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/DefaultQualityProfileLoaderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/repository/DefaultServerIssuesLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/DefaultServerIssuesLoaderTest.java
index 96d4e3c0a28..22416368f3f 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/repository/DefaultServerIssuesLoaderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/DefaultServerIssuesLoaderTest.java
@@ -20,13 +20,12 @@
 package org.sonar.batch.repository;
 
 import org.sonar.batch.cache.WSLoaderResult;
+import org.sonar.scanner.protocol.input.ScannerInput;
+import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
 import org.sonar.batch.cache.WSLoader;
 import com.google.common.base.Function;
 import org.junit.Before;
 import org.junit.Test;
-import org.sonar.batch.protocol.input.BatchInput;
-import org.sonar.batch.protocol.input.BatchInput.ServerIssue;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -61,7 +60,7 @@ public class DefaultServerIssuesLoaderTest {
     when(wsLoader.loadStream("/batch/issues.protobuf?key=foo")).thenReturn(new WSLoaderResult<>(is, true));
 
     final List<ServerIssue> result = new ArrayList<>();
-    loader.load("foo", new Function<BatchInput.ServerIssue, Void>() {
+    loader.load("foo", new Function<ScannerInput.ServerIssue, Void>() {
 
       @Override
       public Void apply(ServerIssue input) {
diff --git a/sonar-batch/src/test/java/org/sonar/batch/repository/ProjectRepositoriesProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/ProjectRepositoriesProviderTest.java
index 781b48a2a59..781b48a2a59 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/repository/ProjectRepositoriesProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/ProjectRepositoriesProviderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/repository/QualityProfileProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/QualityProfileProviderTest.java
index 0cd1683b9c9..0cd1683b9c9 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/repository/QualityProfileProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/QualityProfileProviderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/repository/user/UserRepositoryLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/user/UserRepositoryLoaderTest.java
index 42d681b5b79..870afd5737e 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/repository/user/UserRepositoryLoaderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/user/UserRepositoryLoaderTest.java
@@ -22,6 +22,7 @@ package org.sonar.batch.repository.user;
 import org.assertj.core.util.Lists;
 
 import org.sonar.batch.cache.WSLoaderResult;
+import org.sonar.scanner.protocol.input.ScannerInput;
 import org.sonar.batch.cache.WSLoader;
 import org.junit.Before;
 import com.google.common.collect.ImmutableList;
@@ -31,8 +32,6 @@ import org.junit.rules.ExpectedException;
 import org.junit.Rule;
 import org.mockito.Mockito;
 import org.junit.Test;
-import org.sonar.batch.protocol.input.BatchInput;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -98,7 +97,7 @@ public class UserRepositoryLoaderTest {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
 
     for (Map.Entry<String, String> user : users.entrySet()) {
-      BatchInput.User.Builder builder = BatchInput.User.newBuilder();
+      ScannerInput.User.Builder builder = ScannerInput.User.newBuilder();
       builder.setLogin(user.getKey()).setName(user.getValue()).build().writeDelimitedTo(out);
     }
     return new ByteArrayInputStream(out.toByteArray());
diff --git a/sonar-batch/src/test/java/org/sonar/batch/rule/ActiveRulesProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/ActiveRulesProviderTest.java
index 1e1b1f0fc3c..1e1b1f0fc3c 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/rule/ActiveRulesProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/ActiveRulesProviderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/rule/DefaultActiveRulesLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/DefaultActiveRulesLoaderTest.java
index 434c84dda93..434c84dda93 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/rule/DefaultActiveRulesLoaderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/DefaultActiveRulesLoaderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/rule/DefaultRulesLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/DefaultRulesLoaderTest.java
index a5a461c4e9f..a5a461c4e9f 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/rule/DefaultRulesLoaderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/DefaultRulesLoaderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/rule/QProfileSensorTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/QProfileSensorTest.java
index 4801f246c55..4801f246c55 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/rule/QProfileSensorTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/QProfileSensorTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/rule/QProfileVerifierTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/QProfileVerifierTest.java
index 9df8cd75491..9df8cd75491 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/rule/QProfileVerifierTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/QProfileVerifierTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/rule/RuleFinderCompatibilityTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/RuleFinderCompatibilityTest.java
index abc5f5dfd75..abc5f5dfd75 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/rule/RuleFinderCompatibilityTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/RuleFinderCompatibilityTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/rule/RulesProfileProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/RulesProfileProviderTest.java
index 208a187a966..208a187a966 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/rule/RulesProfileProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/RulesProfileProviderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/rule/RulesProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/RulesProviderTest.java
index 2df29eaa61a..2df29eaa61a 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/rule/RulesProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/RulesProviderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/rule/UsedQProfilesTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/UsedQProfilesTest.java
index dd46501e68e..dd46501e68e 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/rule/UsedQProfilesTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/UsedQProfilesTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/LanguageVerifierTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/LanguageVerifierTest.java
index 22a4f21091f..22a4f21091f 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/LanguageVerifierTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/LanguageVerifierTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/ModuleSettingsTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ModuleSettingsTest.java
index 88fb18f06a4..88fb18f06a4 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/ModuleSettingsTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ModuleSettingsTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectExclusionsTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ProjectExclusionsTest.java
index 4f9b403a94e..4f9b403a94e 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectExclusionsTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ProjectExclusionsTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectLockTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ProjectLockTest.java
index c03240b7341..c03240b7341 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectLockTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ProjectLockTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectReactorBuilderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ProjectReactorBuilderTest.java
index d1a61853ef2..d1a61853ef2 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectReactorBuilderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ProjectReactorBuilderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectReactorValidatorTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ProjectReactorValidatorTest.java
index fd5882467b5..fd5882467b5 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectReactorValidatorTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ProjectReactorValidatorTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectScanContainerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ProjectScanContainerTest.java
index 512462923a1..512462923a1 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectScanContainerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ProjectScanContainerTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectSettingsTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ProjectSettingsTest.java
index 2f983e9d327..7f9c6eecc4c 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectSettingsTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ProjectSettingsTest.java
@@ -37,9 +37,9 @@ import org.sonar.batch.analysis.DefaultAnalysisMode;
 import org.sonar.batch.bootstrap.GlobalMode;
 import org.sonar.batch.bootstrap.GlobalProperties;
 import org.sonar.batch.bootstrap.GlobalSettings;
-import org.sonar.batch.protocol.input.GlobalRepositories;
 import org.sonar.batch.repository.FileData;
 import org.sonar.batch.repository.ProjectRepositories;
+import org.sonar.scanner.protocol.input.GlobalRepositories;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/WorkDirectoryCleanerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/WorkDirectoryCleanerTest.java
index 8bd3d5c4e3a..8bd3d5c4e3a 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/WorkDirectoryCleanerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/WorkDirectoryCleanerTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/AdditionalFilePredicatesTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/AdditionalFilePredicatesTest.java
index c0f9fd3c062..c0f9fd3c062 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/AdditionalFilePredicatesTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/AdditionalFilePredicatesTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/ComponentIndexerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/ComponentIndexerTest.java
index 554f175695f..554f175695f 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/ComponentIndexerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/ComponentIndexerTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystemTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystemTest.java
index 46b70a17522..46b70a17522 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystemTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystemTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/DeprecatedFileFiltersTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/DeprecatedFileFiltersTest.java
index e1905a12a9e..e1905a12a9e 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/DeprecatedFileFiltersTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/DeprecatedFileFiltersTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/ExclusionFiltersTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/ExclusionFiltersTest.java
index c7b4e6eaa5e..c7b4e6eaa5e 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/ExclusionFiltersTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/ExclusionFiltersTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/InputFileBuilderFactoryTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/InputFileBuilderFactoryTest.java
index b9c627e1ea8..b9c627e1ea8 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/InputFileBuilderFactoryTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/InputFileBuilderFactoryTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/InputFileBuilderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/InputFileBuilderTest.java
index eaec22ca37a..eaec22ca37a 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/InputFileBuilderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/InputFileBuilderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/InputPathCacheTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/InputPathCacheTest.java
index 23269eef7d3..23269eef7d3 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/InputPathCacheTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/InputPathCacheTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/LanguageDetectionFactoryTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/LanguageDetectionFactoryTest.java
index b30bb73036c..b30bb73036c 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/LanguageDetectionFactoryTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/LanguageDetectionFactoryTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/LanguageDetectionTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/LanguageDetectionTest.java
index 01a6a8aef3c..01a6a8aef3c 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/LanguageDetectionTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/LanguageDetectionTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializerTest.java
index 08dcf9197e5..08dcf9197e5 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializerTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/StatusDetectionFactoryTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/StatusDetectionFactoryTest.java
index b741f1eb344..b741f1eb344 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/StatusDetectionFactoryTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/StatusDetectionFactoryTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/StatusDetectionTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/StatusDetectionTest.java
index 0601fa26b3b..0601fa26b3b 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/StatusDetectionTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/StatusDetectionTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/measure/MeasureCacheTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/measure/MeasureCacheTest.java
index 61f21529547..61f21529547 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/measure/MeasureCacheTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/measure/MeasureCacheTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/report/ConsoleReportTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/report/ConsoleReportTest.java
index 1a49bb94731..1a49bb94731 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/report/ConsoleReportTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/report/ConsoleReportTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/report/JSONReportTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/report/JSONReportTest.java
index fdeadc562dd..da798a2dbf1 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/report/JSONReportTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/report/JSONReportTest.java
@@ -46,9 +46,9 @@ import org.sonar.api.resources.Resource;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.batch.issue.IssueCache;
 import org.sonar.batch.issue.tracking.TrackedIssue;
-import org.sonar.batch.protocol.input.BatchInput;
 import org.sonar.batch.repository.user.UserRepositoryLoader;
 import org.sonar.batch.scan.filesystem.InputPathCache;
+import org.sonar.scanner.protocol.input.ScannerInput;
 
 import static net.javacrumbs.jsonunit.assertj.JsonAssert.assertThatJson;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -117,8 +117,8 @@ public class JSONReportTest {
     issue.setCreationDate(SIMPLE_DATE_FORMAT.parse("2013-04-24"));
     issue.setNew(false);
     when(issueCache.all()).thenReturn(Lists.newArrayList(issue));
-    BatchInput.User user1 = BatchInput.User.newBuilder().setLogin("julien").setName("Julien").build();
-    BatchInput.User user2 = BatchInput.User.newBuilder().setLogin("simon").setName("Simon").build();
+    ScannerInput.User user1 = ScannerInput.User.newBuilder().setLogin("julien").setName("Julien").build();
+    ScannerInput.User user2 = ScannerInput.User.newBuilder().setLogin("simon").setName("Simon").build();
     when(userRepository.load("julien")).thenReturn(user1);
     when(userRepository.load("simon")).thenReturn(user2);
 
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/report/RuleNameProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/report/RuleNameProviderTest.java
index 3c3af0e689c..3c3af0e689c 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/report/RuleNameProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/report/RuleNameProviderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scm/DefaultBlameOutputTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/scm/DefaultBlameOutputTest.java
index 743f9175ba4..743f9175ba4 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scm/DefaultBlameOutputTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/scm/DefaultBlameOutputTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/sensor/DefaultSensorContextTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/sensor/DefaultSensorContextTest.java
index ba40858840d..ba40858840d 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/sensor/DefaultSensorContextTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/sensor/DefaultSensorContextTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/sensor/DefaultSensorStorageTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/sensor/DefaultSensorStorageTest.java
index caa16b11a19..caa16b11a19 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/sensor/DefaultSensorStorageTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/sensor/DefaultSensorStorageTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/sensor/SensorOptimizerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/sensor/SensorOptimizerTest.java
index 0fac9a72139..0fac9a72139 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/sensor/SensorOptimizerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/sensor/SensorOptimizerTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/sensor/coverage/CoverageExclusionsTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/sensor/coverage/CoverageExclusionsTest.java
index 284226f9af0..284226f9af0 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/sensor/coverage/CoverageExclusionsTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/sensor/coverage/CoverageExclusionsTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/source/CodeColorizersTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/source/CodeColorizersTest.java
index 2a9530e1142..2a9530e1142 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/source/CodeColorizersTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/source/CodeColorizersTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/source/DefaultHighlightableTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/source/DefaultHighlightableTest.java
index 3a791783b1d..3a791783b1d 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/source/DefaultHighlightableTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/source/DefaultHighlightableTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/source/DefaultSymbolTableTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/source/DefaultSymbolTableTest.java
index 86c7b7b316d..86c7b7b316d 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/source/DefaultSymbolTableTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/source/DefaultSymbolTableTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/source/DefaultSymbolizableTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/source/DefaultSymbolizableTest.java
index f19a4b04099..f19a4b04099 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/source/DefaultSymbolizableTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/source/DefaultSymbolizableTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/source/HighlightableBuilderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/source/HighlightableBuilderTest.java
index 07ca60048b3..07ca60048b3 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/source/HighlightableBuilderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/source/HighlightableBuilderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/source/SymbolizableBuilderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/source/SymbolizableBuilderTest.java
index 5cc7fe2d06b..5cc7fe2d06b 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/source/SymbolizableBuilderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/source/SymbolizableBuilderTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/task/ListTaskTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/task/ListTaskTest.java
index 0bf7ef0afc2..0bf7ef0afc2 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/task/ListTaskTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/task/ListTaskTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/task/TasksTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/task/TasksTest.java
index b2d52b253f2..b2d52b253f2 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/task/TasksTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/task/TasksTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/util/BatchUtilsTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/util/BatchUtilsTest.java
index 8de6036b5e3..8de6036b5e3 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/util/BatchUtilsTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/util/BatchUtilsTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/util/ProgressReportTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/util/ProgressReportTest.java
index b21ad736fde..b21ad736fde 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/util/ProgressReportTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/util/ProgressReportTest.java
diff --git a/sonar-batch/src/test/resources/logback-test.xml b/sonar-scanner-engine/src/test/resources/logback-test.xml
index da6be3344a2..da6be3344a2 100644
--- a/sonar-batch/src/test/resources/logback-test.xml
+++ b/sonar-scanner-engine/src/test/resources/logback-test.xml
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/multi-modules-sample-not-associated/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample-not-associated/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
index 74d29a4fa08..74d29a4fa08 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/multi-modules-sample-not-associated/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample-not-associated/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/multi-modules-sample-not-associated/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample-not-associated/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
index 42039538a92..42039538a92 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/multi-modules-sample-not-associated/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample-not-associated/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/multi-modules-sample-not-associated/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample-not-associated/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
index b83c3af128c..b83c3af128c 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/multi-modules-sample-not-associated/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample-not-associated/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/multi-modules-sample-not-associated/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample-not-associated/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
index 20b8bb3876a..20b8bb3876a 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/multi-modules-sample-not-associated/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample-not-associated/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/multi-modules-sample-not-associated/sonar-project.properties b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample-not-associated/sonar-project.properties
index c2b00ede37c..c2b00ede37c 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/multi-modules-sample-not-associated/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample-not-associated/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/multi-modules-sample/module_a/module_a1/.sonar/sonar-report.json b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/module_a/module_a1/.sonar/sonar-report.json
index 581142ee53c..581142ee53c 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/multi-modules-sample/module_a/module_a1/.sonar/sonar-report.json
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/module_a/module_a1/.sonar/sonar-report.json
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
index 74d29a4fa08..74d29a4fa08 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
index 42039538a92..42039538a92 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
index b83c3af128c..b83c3af128c 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
index 20b8bb3876a..20b8bb3876a 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/multi-modules-sample/sonar-project.properties b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/sonar-project.properties
index b07be6f3e6f..b07be6f3e6f 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/multi-modules-sample/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/sample-multiline/sonar-project.properties b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/sonar-project.properties
index 0c8e5dc5354..0c8e5dc5354 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/sample-multiline/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/Multiline.xoo b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/Multiline.xoo
index 6e8a35f20a5..6e8a35f20a5 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/Multiline.xoo
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/Multiline.xoo
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/Multiple.xoo b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/Multiple.xoo
index b6b1b8369a4..b6b1b8369a4 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/Multiple.xoo
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/Multiple.xoo
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/Single.xoo b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/Single.xoo
index fc664425a99..fc664425a99 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/Single.xoo
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/Single.xoo
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/WithFlow.xoo b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/WithFlow.xoo
index 9dc4685fe84..9dc4685fe84 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/WithFlow.xoo
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/WithFlow.xoo
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/sample-with-empty-file/sonar-project.properties b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-empty-file/sonar-project.properties
index 58f27e81f61..58f27e81f61 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/sample-with-empty-file/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-empty-file/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/sample-with-empty-file/xources/hello/Empty.xoo b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-empty-file/xources/hello/Empty.xoo
index e69de29bb2d..e69de29bb2d 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/sample-with-empty-file/xources/hello/Empty.xoo
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-empty-file/xources/hello/Empty.xoo
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/sample-with-empty-file/xources/hello/HelloJava.xoo b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-empty-file/xources/hello/HelloJava.xoo
index 1d9c60d56b7..1d9c60d56b7 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/sample-with-empty-file/xources/hello/HelloJava.xoo
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-empty-file/xources/hello/HelloJava.xoo
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/sample-with-symlink/.gitignore b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-symlink/.gitignore
index ecbefd4f19d..ecbefd4f19d 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/sample-with-symlink/.gitignore
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-symlink/.gitignore
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/sample-with-symlink/sonar-project.properties b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-symlink/sonar-project.properties
index 8810e376701..8810e376701 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/sample-with-symlink/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-symlink/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/sample-with-symlink/testx b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-symlink/testx
index 7385ebd51cf..7385ebd51cf 120000
--- a/sonar-batch/src/test/resources/mediumtest/xoo/sample-with-symlink/testx
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-symlink/testx
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/sample-with-symlink/xources b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-symlink/xources
index 15dca9d90d2..15dca9d90d2 120000
--- a/sonar-batch/src/test/resources/mediumtest/xoo/sample-with-symlink/xources
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-symlink/xources
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/sample/sonar-project.properties b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/sonar-project.properties
index 8810e376701..8810e376701 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/sample/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo
index 8c0967e496f..8c0967e496f 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo.measures b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo.measures
index 23b08dc0e0e..23b08dc0e0e 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo.measures
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo.measures
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo.scm b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo.scm
index 2cec35b8a72..2cec35b8a72 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo.scm
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo.scm
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo
index 1d9c60d56b7..1d9c60d56b7 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo.measures b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo.measures
index 9eaf8ba2549..9eaf8ba2549 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo.measures
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo.measures
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo.scm b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo.scm
index 03a9de2f486..03a9de2f486 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo.scm
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo.scm
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/sample/xources/hello/helloscala.xoo b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/helloscala.xoo
index 53cb085156c..53cb085156c 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/sample/xources/hello/helloscala.xoo
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/helloscala.xoo
diff --git a/sonar-batch/src/test/resources/mediumtest/xoo/sample/xources/hello/helloscala.xoo.measures b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/helloscala.xoo.measures
index d2c8386aed1..d2c8386aed1 100644
--- a/sonar-batch/src/test/resources/mediumtest/xoo/sample/xources/hello/helloscala.xoo.measures
+++ b/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/helloscala.xoo.measures
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BatchPluginJarExploderTest/sonar-checkstyle-plugin-2.8.jar b/sonar-scanner-engine/src/test/resources/org/sonar/batch/bootstrap/BatchPluginJarExploderTest/sonar-checkstyle-plugin-2.8.jar
index f937399bec5..f937399bec5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BatchPluginJarExploderTest/sonar-checkstyle-plugin-2.8.jar
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/bootstrap/BatchPluginJarExploderTest/sonar-checkstyle-plugin-2.8.jar
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/cache/ProjectCacheSynchronizerTest/api_rules_list.protobuf b/sonar-scanner-engine/src/test/resources/org/sonar/batch/cache/ProjectCacheSynchronizerTest/api_rules_list.protobuf
index 1d417ce2880..1d417ce2880 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/cache/ProjectCacheSynchronizerTest/api_rules_list.protobuf
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/cache/ProjectCacheSynchronizerTest/api_rules_list.protobuf
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/cache/ProjectCacheSynchronizerTest/batch_issues.protobuf b/sonar-scanner-engine/src/test/resources/org/sonar/batch/cache/ProjectCacheSynchronizerTest/batch_issues.protobuf
index 8b610d8f73c..8b610d8f73c 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/cache/ProjectCacheSynchronizerTest/batch_issues.protobuf
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/cache/ProjectCacheSynchronizerTest/batch_issues.protobuf
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/cache/ProjectCacheSynchronizerTest/batch_project.json b/sonar-scanner-engine/src/test/resources/org/sonar/batch/cache/ProjectCacheSynchronizerTest/batch_project.json
index 2887ce18d10..2887ce18d10 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/cache/ProjectCacheSynchronizerTest/batch_project.json
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/cache/ProjectCacheSynchronizerTest/batch_project.json
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/cache/ProjectCacheSynchronizerTest/batch_users.protobuf b/sonar-scanner-engine/src/test/resources/org/sonar/batch/cache/ProjectCacheSynchronizerTest/batch_users.protobuf
index e69de29bb2d..e69de29bb2d 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/cache/ProjectCacheSynchronizerTest/batch_users.protobuf
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/cache/ProjectCacheSynchronizerTest/batch_users.protobuf
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/cpd/ManyStatements.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/cpd/ManyStatements.java
index ed2297068e4..ed2297068e4 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/cpd/ManyStatements.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/cpd/ManyStatements.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-mess.txt b/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-mess.txt
index 48d30c92f97..48d30c92f97 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-mess.txt
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-mess.txt
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-twice.txt b/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-twice.txt
index 9ae63dc57f9..9ae63dc57f9 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-twice.txt
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-twice.txt
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-unfinished.txt b/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-unfinished.txt
index dd7656180ab..dd7656180ab 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-unfinished.txt
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-unfinished.txt
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-wrong-order.txt b/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-wrong-order.txt
index 7cac0b98aed..7cac0b98aed 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-wrong-order.txt
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-wrong-order.txt
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp.txt b/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp.txt
index 002169fe031..002169fe031 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp.txt
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp.txt
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-no-regexp.txt b/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-no-regexp.txt
index f18fa5b90ad..f18fa5b90ad 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-no-regexp.txt
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-no-regexp.txt
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-single-regexp-and-double-regexp.txt b/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-single-regexp-and-double-regexp.txt
index e09ecd7a323..e09ecd7a323 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-single-regexp-and-double-regexp.txt
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-single-regexp-and-double-regexp.txt
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-single-regexp.txt b/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-single-regexp.txt
index ef135ebc50c..ef135ebc50c 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-single-regexp.txt
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-single-regexp.txt
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/repository/DefaultProjectRepositoriesLoaderTest/project.protobuf b/sonar-scanner-engine/src/test/resources/org/sonar/batch/repository/DefaultProjectRepositoriesLoaderTest/project.protobuf
index ce579fdbd5e..ce579fdbd5e 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/repository/DefaultProjectRepositoriesLoaderTest/project.protobuf
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/repository/DefaultProjectRepositoriesLoaderTest/project.protobuf
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/repository/DefaultQualityProfileLoaderTest/quality_profile_search_default b/sonar-scanner-engine/src/test/resources/org/sonar/batch/repository/DefaultQualityProfileLoaderTest/quality_profile_search_default
index 6780d7338a1..6780d7338a1 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/repository/DefaultQualityProfileLoaderTest/quality_profile_search_default
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/repository/DefaultQualityProfileLoaderTest/quality_profile_search_default
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/DefaultActiveRulesLoaderTest/active_rule_search1.protobuf b/sonar-scanner-engine/src/test/resources/org/sonar/batch/rule/DefaultActiveRulesLoaderTest/active_rule_search1.protobuf
index 5544968df4b..5544968df4b 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/rule/DefaultActiveRulesLoaderTest/active_rule_search1.protobuf
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/rule/DefaultActiveRulesLoaderTest/active_rule_search1.protobuf
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/DefaultActiveRulesLoaderTest/active_rule_search2.protobuf b/sonar-scanner-engine/src/test/resources/org/sonar/batch/rule/DefaultActiveRulesLoaderTest/active_rule_search2.protobuf
index a23bd1d5d81..a23bd1d5d81 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/rule/DefaultActiveRulesLoaderTest/active_rule_search2.protobuf
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/rule/DefaultActiveRulesLoaderTest/active_rule_search2.protobuf
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/DefaultRulesLoader/response.protobuf b/sonar-scanner-engine/src/test/resources/org/sonar/batch/rule/DefaultRulesLoader/response.protobuf
index 3c24dd83d29..3c24dd83d29 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/rule/DefaultRulesLoader/response.protobuf
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/rule/DefaultRulesLoader/response.protobuf
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/ModuleQProfilesTest/shared.xml b/sonar-scanner-engine/src/test/resources/org/sonar/batch/rule/ModuleQProfilesTest/shared.xml
index feb234f20e8..feb234f20e8 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/rule/ModuleQProfilesTest/shared.xml
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/rule/ModuleQProfilesTest/shared.xml
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module1/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module1/sonar-project.properties
index 7bace22a204..7bace22a204 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module1/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module1/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module1/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module1/sources/Fake.java
index 9d445f04fc6..9d445f04fc6 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module1/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module1/sources/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module2/newBaseDir/src/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module2/newBaseDir/src/Fake.java
index 22d579be381..22d579be381 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module2/newBaseDir/src/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module2/newBaseDir/src/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module2/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module2/sonar-project.properties
index d25a9e9e1f5..d25a9e9e1f5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module2/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module2/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/sonar-project.properties
index 4744284e7bf..4744284e7bf 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module1/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module1/sonar-project.properties
index ec642a9443a..ec642a9443a 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module1/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module1/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module1/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module1/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module1/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module1/sources/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module2/newBaseDir/src/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module2/newBaseDir/src/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module2/newBaseDir/src/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module2/newBaseDir/src/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module2/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module2/sonar-project.properties
index d25a9e9e1f5..d25a9e9e1f5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module2/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module2/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/sonar-project.properties
index 2f16886c91d..2f16886c91d 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/generated/any-file.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/generated/any-file.properties
index c50d50b50f7..c50d50b50f7 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/generated/any-file.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/generated/any-file.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/sources/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/sonar-project.properties
index c1640b15cba..c1640b15cba 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/any-folder/any-file.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/any-folder/any-file.properties
index 460d3495a89..460d3495a89 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/any-folder/any-file.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/any-folder/any-file.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/any-folder/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/any-folder/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/any-folder/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/any-folder/sources/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/sonar-project.properties
index e246f8c2af8..e246f8c2af8 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-unexisting-file/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-unexisting-file/sonar-project.properties
index e246f8c2af8..e246f8c2af8 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-unexisting-file/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-unexisting-file/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module1/module11/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module1/module11/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module1/module11/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module1/module11/sources/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module1/module12/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module1/module12/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module1/module12/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module1/module12/sources/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module2/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module2/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module2/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module2/sources/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/sonar-project.properties
index e14567d26af..e14567d26af 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/sonar-project.properties
index 53aacb54061..53aacb54061 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/src/main/groovy/Fake.groovy b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/src/main/groovy/Fake.groovy
index e69de29bb2d..e69de29bb2d 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/src/main/groovy/Fake.groovy
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/src/main/groovy/Fake.groovy
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/src/main/java/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/src/main/java/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/src/main/java/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/src/main/java/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/module1/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/module1/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/module1/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/module1/sources/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/module2/src/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/module2/src/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/module2/src/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/module2/src/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/sonar-project.properties
index 0f06d31466e..0f06d31466e 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/module1/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/module1/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/module1/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/module1/sources/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/module2/src/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/module2/src/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/module2/src/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/module2/src/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/sonar-project.properties
index 6def8070d6f..6def8070d6f 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/module1.feature/src/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/module1.feature/src/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/module1.feature/src/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/module1.feature/src/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/module1/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/module1/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/module1/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/module1/sources/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/sonar-project.properties
index 2a6221a3757..2a6221a3757 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-duplicate-id/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-duplicate-id/sonar-project.properties
index 0a971805d13..0a971805d13 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-duplicate-id/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-duplicate-id/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-repeated-id/modules/module1/module1/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-repeated-id/modules/module1/module1/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-repeated-id/modules/module1/module1/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-repeated-id/modules/module1/module1/sources/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-repeated-id/modules/module1/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-repeated-id/modules/module1/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-repeated-id/modules/module1/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-repeated-id/modules/module1/sources/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-repeated-id/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-repeated-id/sonar-project.properties
index e63d3da926c..e63d3da926c 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-repeated-id/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-repeated-id/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir-not-associated/modules/module1/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir-not-associated/modules/module1/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir-not-associated/modules/module1/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir-not-associated/modules/module1/sources/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir-not-associated/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir-not-associated/sonar-project.properties
index c572ef1f9e5..c572ef1f9e5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir-not-associated/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir-not-associated/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir/modules/module1/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir/modules/module1/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir/modules/module1/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir/modules/module1/sources/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir/sonar-project.properties
index 615f5c77a7f..615f5c77a7f 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-explicit-unexisting-test-dir/module1/src/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-explicit-unexisting-test-dir/module1/src/Fake.java
index 8b137891791..8b137891791 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-explicit-unexisting-test-dir/module1/src/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-explicit-unexisting-test-dir/module1/src/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-explicit-unexisting-test-dir/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-explicit-unexisting-test-dir/sonar-project.properties
index 09cb2208fcd..09cb2208fcd 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-explicit-unexisting-test-dir/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-explicit-unexisting-test-dir/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-basedir/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-basedir/sonar-project.properties
index 67fbf347c0e..67fbf347c0e 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-basedir/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-basedir/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-source-dir/module1/src/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-source-dir/module1/src/Fake.java
index 8b137891791..8b137891791 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-source-dir/module1/src/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-source-dir/module1/src/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-source-dir/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-source-dir/sonar-project.properties
index 04ea08a89a1..04ea08a89a1 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-source-dir/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-source-dir/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/shouldGetFile/foo.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/shouldGetFile/foo.properties
index 8fbb104c92d..8fbb104c92d 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/shouldGetFile/foo.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/shouldGetFile/foo.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/shouldGetList/foo.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/shouldGetList/foo.properties
index 8fbb104c92d..8fbb104c92d 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/shouldGetList/foo.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/shouldGetList/foo.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-blank-source-dir/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-blank-source-dir/sonar-project.properties
index ba79992d5a0..ba79992d5a0 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-blank-source-dir/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-blank-source-dir/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/build/report.txt b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/build/report.txt
index e69de29bb2d..e69de29bb2d 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/build/report.txt
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/build/report.txt
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/sonar-project.properties
index 35b33996ea7..35b33996ea7 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/sources/Fake.java
index aee03e60b4a..aee03e60b4a 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/sources/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/lib/Fake.class b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/lib/Fake.class
index bf2c3a09e07..bf2c3a09e07 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/lib/Fake.class
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/lib/Fake.class
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/sonar-project.properties
index 0cada50b51f..0cada50b51f 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/sources/Fake.java
index aee03e60b4a..aee03e60b4a 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/sources/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-missing-source-dir/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-missing-source-dir/sonar-project.properties
index 3a7a65335dc..3a7a65335dc 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-missing-source-dir/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-missing-source-dir/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-binary/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-binary/sonar-project.properties
index 55d1ddf0242..55d1ddf0242 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-binary/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-binary/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-binary/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-binary/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-binary/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-binary/sources/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-lib/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-lib/sonar-project.properties
index 69ccd8d1411..69ccd8d1411 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-lib/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-lib/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-lib/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-lib/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-lib/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-lib/sources/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-source-dir/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-source-dir/sonar-project.properties
index 0b83b11f29c..0b83b11f29c 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-source-dir/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-source-dir/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-test-dir/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-test-dir/sonar-project.properties
index a4fac8e4ca6..a4fac8e4ca6 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-test-dir/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-test-dir/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-test-dir/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-test-dir/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-test-dir/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-test-dir/sources/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/libs/lib1.txt b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/libs/lib1.txt
index 81d4e95a0b6..81d4e95a0b6 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/libs/lib1.txt
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/libs/lib1.txt
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/libs/lib2.txt b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/libs/lib2.txt
index 7dacac0fd9a..7dacac0fd9a 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/libs/lib2.txt
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/libs/lib2.txt
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/sonar-project.properties
index 69ccd8d1411..69ccd8d1411 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/sonar-project.properties
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/sources/Fake.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/report/JSONReportTest/report-without-resolved-issues.json b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/report/JSONReportTest/report-without-resolved-issues.json
index b5af45efe6c..b5af45efe6c 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/report/JSONReportTest/report-without-resolved-issues.json
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/report/JSONReportTest/report-without-resolved-issues.json
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/report/JSONReportTest/report.json b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/report/JSONReportTest/report.json
index a33e06342fa..a33e06342fa 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/report/JSONReportTest/report.json
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/report/JSONReportTest/report.json
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/source/CodeColorizersTest/Person.java b/sonar-scanner-engine/src/test/resources/org/sonar/batch/source/CodeColorizersTest/Person.java
index c5cc9793730..c5cc9793730 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/source/CodeColorizersTest/Person.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/source/CodeColorizersTest/Person.java
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/source/CodeColorizersTest/Person.js b/sonar-scanner-engine/src/test/resources/org/sonar/batch/source/CodeColorizersTest/Person.js
index fc36e5aa127..fc36e5aa127 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/source/CodeColorizersTest/Person.js
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/source/CodeColorizersTest/Person.js
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/source/CodeColorizersTest/package.html b/sonar-scanner-engine/src/test/resources/org/sonar/batch/source/CodeColorizersTest/package.html
index f2d90e627d6..f2d90e627d6 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/source/CodeColorizersTest/package.html
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/batch/source/CodeColorizersTest/package.html
diff --git a/sonar-batch/test-resources/DefaultModuleFileSystemTest/exclude_dir_starting_with_dot/src/org/.dirPrefixedWithDot/Excluded.java b/sonar-scanner-engine/test-resources/DefaultModuleFileSystemTest/exclude_dir_starting_with_dot/src/org/.dirPrefixedWithDot/Excluded.java
index 9578920820c..9578920820c 100644
--- a/sonar-batch/test-resources/DefaultModuleFileSystemTest/exclude_dir_starting_with_dot/src/org/.dirPrefixedWithDot/Excluded.java
+++ b/sonar-scanner-engine/test-resources/DefaultModuleFileSystemTest/exclude_dir_starting_with_dot/src/org/.dirPrefixedWithDot/Excluded.java
diff --git a/sonar-batch/test-resources/DefaultModuleFileSystemTest/exclude_dir_starting_with_dot/src/org/.sonar/Excluded2.java b/sonar-scanner-engine/test-resources/DefaultModuleFileSystemTest/exclude_dir_starting_with_dot/src/org/.sonar/Excluded2.java
index 9578920820c..9578920820c 100644
--- a/sonar-batch/test-resources/DefaultModuleFileSystemTest/exclude_dir_starting_with_dot/src/org/.sonar/Excluded2.java
+++ b/sonar-scanner-engine/test-resources/DefaultModuleFileSystemTest/exclude_dir_starting_with_dot/src/org/.sonar/Excluded2.java
diff --git a/sonar-batch/test-resources/DefaultModuleFileSystemTest/exclude_dir_starting_with_dot/src/org/sonar/Included.java b/sonar-scanner-engine/test-resources/DefaultModuleFileSystemTest/exclude_dir_starting_with_dot/src/org/sonar/Included.java
index ec5235a301b..ec5235a301b 100644
--- a/sonar-batch/test-resources/DefaultModuleFileSystemTest/exclude_dir_starting_with_dot/src/org/sonar/Included.java
+++ b/sonar-scanner-engine/test-resources/DefaultModuleFileSystemTest/exclude_dir_starting_with_dot/src/org/sonar/Included.java
diff --git a/sonar-batch/test-resources/DefaultModuleFileSystemTest/main_and_test_files/src/main/java/Foo.java b/sonar-scanner-engine/test-resources/DefaultModuleFileSystemTest/main_and_test_files/src/main/java/Foo.java
index 4e6a6de6531..4e6a6de6531 100644
--- a/sonar-batch/test-resources/DefaultModuleFileSystemTest/main_and_test_files/src/main/java/Foo.java
+++ b/sonar-scanner-engine/test-resources/DefaultModuleFileSystemTest/main_and_test_files/src/main/java/Foo.java
diff --git a/sonar-batch/test-resources/DefaultModuleFileSystemTest/main_and_test_files/src/main/java/Hello.java b/sonar-scanner-engine/test-resources/DefaultModuleFileSystemTest/main_and_test_files/src/main/java/Hello.java
index 6afc99f0d36..6afc99f0d36 100644
--- a/sonar-batch/test-resources/DefaultModuleFileSystemTest/main_and_test_files/src/main/java/Hello.java
+++ b/sonar-scanner-engine/test-resources/DefaultModuleFileSystemTest/main_and_test_files/src/main/java/Hello.java
diff --git a/sonar-batch/test-resources/DefaultModuleFileSystemTest/main_and_test_files/src/test/java/FooTest.java b/sonar-scanner-engine/test-resources/DefaultModuleFileSystemTest/main_and_test_files/src/test/java/FooTest.java
index 6f74bf43d13..6f74bf43d13 100644
--- a/sonar-batch/test-resources/DefaultModuleFileSystemTest/main_and_test_files/src/test/java/FooTest.java
+++ b/sonar-scanner-engine/test-resources/DefaultModuleFileSystemTest/main_and_test_files/src/test/java/FooTest.java
diff --git a/sonar-batch/test-resources/DefaultModuleFileSystemTest/main_and_test_files/src/test/java/HelloTest.java b/sonar-scanner-engine/test-resources/DefaultModuleFileSystemTest/main_and_test_files/src/test/java/HelloTest.java
index 2e1392f9e59..2e1392f9e59 100644
--- a/sonar-batch/test-resources/DefaultModuleFileSystemTest/main_and_test_files/src/test/java/HelloTest.java
+++ b/sonar-scanner-engine/test-resources/DefaultModuleFileSystemTest/main_and_test_files/src/test/java/HelloTest.java
diff --git a/sonar-batch-protocol/pom.xml b/sonar-scanner-protocol/pom.xml
index 76ed752bf1e..ed015f33bc7 100644
--- a/sonar-batch-protocol/pom.xml
+++ b/sonar-scanner-protocol/pom.xml
@@ -7,14 +7,14 @@
     <version>5.5-SNAPSHOT</version>
   </parent>
 
-  <artifactId>sonar-batch-protocol</artifactId>
-  <name>SonarQube :: Batch :: Protocol</name>
+  <artifactId>sonar-scanner-protocol</artifactId>
+  <name>SonarQube :: Scanner :: Protocol</name>
 
-  <description>Classes used for communication between batch and server</description>
+  <description>Classes used for communication between scanner and server</description>
 
   <properties>
     <!-- Viewer is for our internal use. This is not production code and mostly generated with Eclipse GUI builder -->
-    <sonar.exclusions>target/generated-sources/**/*,src/main/java/org/sonar/batch/protocol/viewer/**</sonar.exclusions>
+    <sonar.exclusions>target/generated-sources/**/*,src/main/java/org/sonar/scanner/protocol/viewer/**</sonar.exclusions>
     <sonar.test.exclusions>target/generated-test-sources/**/*</sonar.test.exclusions>
   </properties>
 
@@ -89,7 +89,7 @@
           <finalName>scanner-report-viewer-${project.version}</finalName>
           <archive>
             <manifest>
-              <mainClass>org.sonar.batch.protocol.viewer.ViewerApplication</mainClass>
+              <mainClass>org.sonar.scanner.protocol.viewer.ScannerReportViewerApp</mainClass>
             </manifest>
           </archive>
           <descriptors>
diff --git a/sonar-batch-protocol/src/main/assembly/viewer.xml b/sonar-scanner-protocol/src/main/assembly/viewer.xml
index dcb1ad07c78..dcb1ad07c78 100644
--- a/sonar-batch-protocol/src/main/assembly/viewer.xml
+++ b/sonar-scanner-protocol/src/main/assembly/viewer.xml
diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/GsonHelper.java b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/GsonHelper.java
index 8642a7d3120..890db7e52e1 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/GsonHelper.java
+++ b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/GsonHelper.java
@@ -17,7 +17,7 @@
  * 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.batch.protocol;
+package org.sonar.scanner.protocol;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/FileData.java b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/input/FileData.java
index 20ccaf8dae4..be9d993b5c3 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/FileData.java
+++ b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/input/FileData.java
@@ -17,7 +17,7 @@
  * 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.batch.protocol.input;
+package org.sonar.scanner.protocol.input;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/GlobalRepositories.java b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/input/GlobalRepositories.java
index c30032532a0..7bf3bdb643a 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/GlobalRepositories.java
+++ b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/input/GlobalRepositories.java
@@ -17,14 +17,13 @@
  * 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.batch.protocol.input;
-
-import org.sonar.batch.protocol.GsonHelper;
+package org.sonar.scanner.protocol.input;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import org.sonar.scanner.protocol.GsonHelper;
 
 /**
  * Container for all global data going from server to batch.
diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/Metric.java b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/input/Metric.java
index 71619d9e593..24c68c76414 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/Metric.java
+++ b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/input/Metric.java
@@ -17,7 +17,7 @@
  * 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.batch.protocol.input;
+package org.sonar.scanner.protocol.input;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ProjectRepositories.java b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/input/ProjectRepositories.java
index e9d2c2f7771..d248e2ec290 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ProjectRepositories.java
+++ b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/input/ProjectRepositories.java
@@ -17,7 +17,7 @@
  * 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.batch.protocol.input;
+package org.sonar.scanner.protocol.input;
 
 import java.util.Collections;
 import java.util.Date;
@@ -25,7 +25,7 @@ import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
-import org.sonar.batch.protocol.GsonHelper;
+import org.sonar.scanner.protocol.GsonHelper;
 
 /**
  * Container for all project data going from server to batch.
diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/package-info.java b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/input/package-info.java
index 1f3003c7445..8df79ed33e1 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/package-info.java
+++ b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/input/package-info.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.batch.protocol.output;
+package org.sonar.scanner.protocol.input;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/FileStructure.java b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/output/FileStructure.java
index 0314590cd66..c4d3197cb43 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/FileStructure.java
+++ b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/output/FileStructure.java
@@ -17,7 +17,7 @@
  * 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.batch.protocol.output;
+package org.sonar.scanner.protocol.output;
 
 import java.io.File;
 
diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/BatchReportReader.java b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/output/ScannerReportReader.java
index 03aef1590ab..d47b94225ef 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/BatchReportReader.java
+++ b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/output/ScannerReportReader.java
@@ -17,7 +17,7 @@
  * 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.batch.protocol.output;
+package org.sonar.scanner.protocol.output;
 
 import java.io.File;
 import javax.annotation.CheckForNull;
@@ -26,83 +26,83 @@ import org.sonar.core.util.Protobuf;
 
 import static org.sonar.core.util.CloseableIterator.emptyCloseableIterator;
 
-public class BatchReportReader {
+public class ScannerReportReader {
 
   private final FileStructure fileStructure;
 
-  public BatchReportReader(File dir) {
+  public ScannerReportReader(File dir) {
     this.fileStructure = new FileStructure(dir);
   }
 
-  public BatchReport.Metadata readMetadata() {
+  public ScannerReport.Metadata readMetadata() {
     File file = fileStructure.metadataFile();
     if (!fileExists(file)) {
       throw new IllegalStateException("Metadata file is missing in analysis report: " + file);
     }
-    return Protobuf.read(file, BatchReport.Metadata.PARSER);
+    return Protobuf.read(file, ScannerReport.Metadata.PARSER);
   }
 
-  public CloseableIterator<BatchReport.ActiveRule> readActiveRules() {
+  public CloseableIterator<ScannerReport.ActiveRule> readActiveRules() {
     File file = fileStructure.activeRules();
     if (!fileExists(file)) {
       return emptyCloseableIterator();
     }
-    return Protobuf.readStream(file, BatchReport.ActiveRule.PARSER);
+    return Protobuf.readStream(file, ScannerReport.ActiveRule.PARSER);
   }
 
-  public CloseableIterator<BatchReport.Measure> readComponentMeasures(int componentRef) {
+  public CloseableIterator<ScannerReport.Measure> readComponentMeasures(int componentRef) {
     File file = fileStructure.fileFor(FileStructure.Domain.MEASURES, componentRef);
     if (fileExists(file)) {
-      return Protobuf.readStream(file, BatchReport.Measure.PARSER);
+      return Protobuf.readStream(file, ScannerReport.Measure.PARSER);
     }
     return emptyCloseableIterator();
   }
 
   @CheckForNull
-  public BatchReport.Changesets readChangesets(int componentRef) {
+  public ScannerReport.Changesets readChangesets(int componentRef) {
     File file = fileStructure.fileFor(FileStructure.Domain.CHANGESETS, componentRef);
     if (fileExists(file)) {
-      return Protobuf.read(file, BatchReport.Changesets.PARSER);
+      return Protobuf.read(file, ScannerReport.Changesets.PARSER);
     }
     return null;
   }
 
-  public BatchReport.Component readComponent(int componentRef) {
+  public ScannerReport.Component readComponent(int componentRef) {
     File file = fileStructure.fileFor(FileStructure.Domain.COMPONENT, componentRef);
     if (!fileExists(file)) {
       throw new IllegalStateException("Unable to find report for component #" + componentRef + ". File does not exist: " + file);
     }
-    return Protobuf.read(file, BatchReport.Component.PARSER);
+    return Protobuf.read(file, ScannerReport.Component.PARSER);
   }
 
-  public CloseableIterator<BatchReport.Issue> readComponentIssues(int componentRef) {
+  public CloseableIterator<ScannerReport.Issue> readComponentIssues(int componentRef) {
     File file = fileStructure.fileFor(FileStructure.Domain.ISSUES, componentRef);
     if (fileExists(file)) {
-      return Protobuf.readStream(file, BatchReport.Issue.PARSER);
+      return Protobuf.readStream(file, ScannerReport.Issue.PARSER);
     }
     return emptyCloseableIterator();
   }
 
-  public CloseableIterator<BatchReport.Duplication> readComponentDuplications(int componentRef) {
+  public CloseableIterator<ScannerReport.Duplication> readComponentDuplications(int componentRef) {
     File file = fileStructure.fileFor(FileStructure.Domain.DUPLICATIONS, componentRef);
     if (fileExists(file)) {
-      return Protobuf.readStream(file, BatchReport.Duplication.PARSER);
+      return Protobuf.readStream(file, ScannerReport.Duplication.PARSER);
     }
     return emptyCloseableIterator();
   }
 
-  public CloseableIterator<BatchReport.CpdTextBlock> readCpdTextBlocks(int componentRef) {
+  public CloseableIterator<ScannerReport.CpdTextBlock> readCpdTextBlocks(int componentRef) {
     File file = fileStructure.fileFor(FileStructure.Domain.CPD_TEXT_BLOCKS, componentRef);
     if (fileExists(file)) {
-      return Protobuf.readStream(file, BatchReport.CpdTextBlock.parser());
+      return Protobuf.readStream(file, ScannerReport.CpdTextBlock.parser());
     }
     return emptyCloseableIterator();
   }
 
-  public CloseableIterator<BatchReport.Symbol> readComponentSymbols(int componentRef) {
+  public CloseableIterator<ScannerReport.Symbol> readComponentSymbols(int componentRef) {
     File file = fileStructure.fileFor(FileStructure.Domain.SYMBOLS, componentRef);
     if (fileExists(file)) {
-      return Protobuf.readStream(file, BatchReport.Symbol.PARSER);
+      return Protobuf.readStream(file, ScannerReport.Symbol.PARSER);
     }
     return emptyCloseableIterator();
   }
@@ -112,10 +112,10 @@ public class BatchReportReader {
     return file.exists();
   }
 
-  public CloseableIterator<BatchReport.SyntaxHighlighting> readComponentSyntaxHighlighting(int fileRef) {
+  public CloseableIterator<ScannerReport.SyntaxHighlighting> readComponentSyntaxHighlighting(int fileRef) {
     File file = fileStructure.fileFor(FileStructure.Domain.SYNTAX_HIGHLIGHTINGS, fileRef);
     if (fileExists(file)) {
-      return Protobuf.readStream(file, BatchReport.SyntaxHighlighting.PARSER);
+      return Protobuf.readStream(file, ScannerReport.SyntaxHighlighting.PARSER);
     }
     return emptyCloseableIterator();
   }
@@ -125,10 +125,10 @@ public class BatchReportReader {
     return file.exists();
   }
 
-  public CloseableIterator<BatchReport.Coverage> readComponentCoverage(int fileRef) {
+  public CloseableIterator<ScannerReport.Coverage> readComponentCoverage(int fileRef) {
     File file = fileStructure.fileFor(FileStructure.Domain.COVERAGES, fileRef);
     if (fileExists(file)) {
-      return Protobuf.readStream(file, BatchReport.Coverage.PARSER);
+      return Protobuf.readStream(file, ScannerReport.Coverage.PARSER);
     }
     return emptyCloseableIterator();
   }
diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/BatchReportWriter.java b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/output/ScannerReportWriter.java
index 709280683fa..5cbba578c2a 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/BatchReportWriter.java
+++ b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/output/ScannerReportWriter.java
@@ -17,7 +17,7 @@
  * 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.batch.protocol.output;
+package org.sonar.scanner.protocol.output;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -26,11 +26,11 @@ import java.io.OutputStream;
 import org.sonar.core.util.ContextException;
 import org.sonar.core.util.Protobuf;
 
-public class BatchReportWriter {
+public class ScannerReportWriter {
 
   private final FileStructure fileStructure;
 
-  public BatchReportWriter(File dir) {
+  public ScannerReportWriter(File dir) {
     if (!dir.exists() && !dir.mkdirs()) {
       throw new IllegalStateException("Unable to create directory: " + dir);
     }
@@ -49,29 +49,29 @@ public class BatchReportWriter {
   /**
    * Metadata is mandatory
    */
-  public File writeMetadata(BatchReport.Metadata metadata) {
+  public File writeMetadata(ScannerReport.Metadata metadata) {
     Protobuf.write(metadata, fileStructure.metadataFile());
     return fileStructure.metadataFile();
   }
 
-  public File writeActiveRules(Iterable<BatchReport.ActiveRule> activeRules) {
+  public File writeActiveRules(Iterable<ScannerReport.ActiveRule> activeRules) {
     Protobuf.writeStream(activeRules, fileStructure.activeRules(), false);
     return fileStructure.metadataFile();
   }
 
-  public File writeComponent(BatchReport.Component component) {
+  public File writeComponent(ScannerReport.Component component) {
     File file = fileStructure.fileFor(FileStructure.Domain.COMPONENT, component.getRef());
     Protobuf.write(component, file);
     return file;
   }
 
-  public File writeComponentIssues(int componentRef, Iterable<BatchReport.Issue> issues) {
+  public File writeComponentIssues(int componentRef, Iterable<ScannerReport.Issue> issues) {
     File file = fileStructure.fileFor(FileStructure.Domain.ISSUES, componentRef);
     Protobuf.writeStream(issues, file, false);
     return file;
   }
 
-  public void appendComponentIssue(int componentRef, BatchReport.Issue issue) {
+  public void appendComponentIssue(int componentRef, ScannerReport.Issue issue) {
     File file = fileStructure.fileFor(FileStructure.Domain.ISSUES, componentRef);
     try (OutputStream out = new BufferedOutputStream(new FileOutputStream(file, true))) {
       issue.writeDelimitedTo(out);
@@ -80,55 +80,55 @@ public class BatchReportWriter {
     }
   }
 
-  public File writeComponentMeasures(int componentRef, Iterable<BatchReport.Measure> measures) {
+  public File writeComponentMeasures(int componentRef, Iterable<ScannerReport.Measure> measures) {
     File file = fileStructure.fileFor(FileStructure.Domain.MEASURES, componentRef);
     Protobuf.writeStream(measures, file, false);
     return file;
   }
 
-  public File writeComponentChangesets(BatchReport.Changesets changesets) {
+  public File writeComponentChangesets(ScannerReport.Changesets changesets) {
     File file = fileStructure.fileFor(FileStructure.Domain.CHANGESETS, changesets.getComponentRef());
     Protobuf.write(changesets, file);
     return file;
   }
 
-  public File writeComponentDuplications(int componentRef, Iterable<BatchReport.Duplication> duplications) {
+  public File writeComponentDuplications(int componentRef, Iterable<ScannerReport.Duplication> duplications) {
     File file = fileStructure.fileFor(FileStructure.Domain.DUPLICATIONS, componentRef);
     Protobuf.writeStream(duplications, file, false);
     return file;
   }
 
-  public File writeCpdTextBlocks(int componentRef, Iterable<BatchReport.CpdTextBlock> blocks) {
+  public File writeCpdTextBlocks(int componentRef, Iterable<ScannerReport.CpdTextBlock> blocks) {
     File file = fileStructure.fileFor(FileStructure.Domain.CPD_TEXT_BLOCKS, componentRef);
     Protobuf.writeStream(blocks, file, false);
     return file;
   }
 
-  public File writeComponentSymbols(int componentRef, Iterable<BatchReport.Symbol> symbols) {
+  public File writeComponentSymbols(int componentRef, Iterable<ScannerReport.Symbol> symbols) {
     File file = fileStructure.fileFor(FileStructure.Domain.SYMBOLS, componentRef);
     Protobuf.writeStream(symbols, file, false);
     return file;
   }
 
-  public File writeComponentSyntaxHighlighting(int componentRef, Iterable<BatchReport.SyntaxHighlighting> syntaxHighlightingRules) {
+  public File writeComponentSyntaxHighlighting(int componentRef, Iterable<ScannerReport.SyntaxHighlighting> syntaxHighlightingRules) {
     File file = fileStructure.fileFor(FileStructure.Domain.SYNTAX_HIGHLIGHTINGS, componentRef);
     Protobuf.writeStream(syntaxHighlightingRules, file, false);
     return file;
   }
 
-  public File writeComponentCoverage(int componentRef, Iterable<BatchReport.Coverage> coverageList) {
+  public File writeComponentCoverage(int componentRef, Iterable<ScannerReport.Coverage> coverageList) {
     File file = fileStructure.fileFor(FileStructure.Domain.COVERAGES, componentRef);
     Protobuf.writeStream(coverageList, file, false);
     return file;
   }
 
-  public File writeTests(int componentRef, Iterable<BatchReport.Test> tests) {
+  public File writeTests(int componentRef, Iterable<ScannerReport.Test> tests) {
     File file = fileStructure.fileFor(FileStructure.Domain.TESTS, componentRef);
     Protobuf.writeStream(tests, file, false);
     return file;
   }
 
-  public File writeCoverageDetails(int componentRef, Iterable<BatchReport.CoverageDetail> tests) {
+  public File writeCoverageDetails(int componentRef, Iterable<ScannerReport.CoverageDetail> tests) {
     File file = fileStructure.fileFor(FileStructure.Domain.COVERAGE_DETAILS, componentRef);
     Protobuf.writeStream(tests, file, false);
     return file;
diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/package-info.java b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/output/package-info.java
index d01715cd99d..7a1b7b47a3e 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/package-info.java
+++ b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/output/package-info.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.batch.protocol.input;
+package org.sonar.scanner.protocol.output;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/package-info.java b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/package-info.java
index 787f7c26865..be3678faecd 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/package-info.java
+++ b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/package-info.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.batch.protocol;
+package org.sonar.scanner.protocol;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/viewer/ViewerApplication.java b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/viewer/ScannerReportViewerApp.java
index a3476adab4e..3768c1ca0d2 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/viewer/ViewerApplication.java
+++ b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/viewer/ScannerReportViewerApp.java
@@ -17,7 +17,7 @@
  * 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.batch.protocol.viewer;
+package org.sonar.scanner.protocol.viewer;
 
 import java.awt.BorderLayout;
 import java.awt.Cursor;
@@ -47,17 +47,17 @@ import javax.swing.event.TreeSelectionListener;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeSelectionModel;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.batch.protocol.output.BatchReport.Component;
-import org.sonar.batch.protocol.output.BatchReport.Metadata;
-import org.sonar.batch.protocol.output.BatchReportReader;
-import org.sonar.batch.protocol.output.FileStructure.Domain;
 import org.sonar.core.util.CloseableIterator;
+import org.sonar.scanner.protocol.output.ScannerReportReader;
+import org.sonar.scanner.protocol.output.FileStructure.Domain;
+import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.protocol.output.ScannerReport.Component;
+import org.sonar.scanner.protocol.output.ScannerReport.Metadata;
 
-public class ViewerApplication {
+public class ScannerReportViewerApp {
 
   private JFrame frame;
-  private BatchReportReader reader;
+  private ScannerReportReader reader;
   private Metadata metadata;
   private SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
   private JTree componentTree;
@@ -81,7 +81,7 @@ public class ViewerApplication {
   /**
    * Create the application.
    */
-  public ViewerApplication() {
+  public ScannerReportViewerApp() {
     initialize();
   }
 
@@ -93,7 +93,7 @@ public class ViewerApplication {
       @Override
       public void run() {
         try {
-          ViewerApplication window = new ViewerApplication();
+          ScannerReportViewerApp window = new ScannerReportViewerApp();
           window.frame.setVisible(true);
 
           window.loadReport();
@@ -132,7 +132,7 @@ public class ViewerApplication {
   }
 
   private void loadReport(File file) {
-    reader = new BatchReportReader(file);
+    reader = new ScannerReportReader(file);
     metadata = reader.readMetadata();
     updateTitle();
     loadComponents();
@@ -194,9 +194,9 @@ public class ViewerApplication {
   private void updateDuplications(Component component) {
     duplicationEditor.setText("");
     if (reader.hasCoverage(component.getRef())) {
-      try (CloseableIterator<BatchReport.Duplication> it = reader.readComponentDuplications(component.getRef())) {
+      try (CloseableIterator<ScannerReport.Duplication> it = reader.readComponentDuplications(component.getRef())) {
         while (it.hasNext()) {
-          BatchReport.Duplication dup = it.next();
+          ScannerReport.Duplication dup = it.next();
           duplicationEditor.getDocument().insertString(duplicationEditor.getDocument().getEndPosition().getOffset(), dup.toString() + "\n", null);
         }
       } catch (Exception e) {
@@ -207,9 +207,9 @@ public class ViewerApplication {
 
   private void updateCoverage(Component component) {
     coverageEditor.setText("");
-    try (CloseableIterator<BatchReport.Coverage> it = reader.readComponentCoverage(component.getRef())) {
+    try (CloseableIterator<ScannerReport.Coverage> it = reader.readComponentCoverage(component.getRef())) {
       while (it.hasNext()) {
-        BatchReport.Coverage coverage = it.next();
+        ScannerReport.Coverage coverage = it.next();
         coverageEditor.getDocument().insertString(coverageEditor.getDocument().getEndPosition().getOffset(), coverage.toString() + "\n", null);
       }
     } catch (Exception e) {
@@ -236,9 +236,9 @@ public class ViewerApplication {
 
   private void updateHighlighting(Component component) {
     highlightingEditor.setText("");
-    try (CloseableIterator<BatchReport.SyntaxHighlighting> it = reader.readComponentSyntaxHighlighting(component.getRef())) {
+    try (CloseableIterator<ScannerReport.SyntaxHighlighting> it = reader.readComponentSyntaxHighlighting(component.getRef())) {
       while (it.hasNext()) {
-        BatchReport.SyntaxHighlighting rule = it.next();
+        ScannerReport.SyntaxHighlighting rule = it.next();
         highlightingEditor.getDocument().insertString(highlightingEditor.getDocument().getEndPosition().getOffset(), rule.toString() + "\n", null);
       }
     } catch (Exception e) {
@@ -248,9 +248,9 @@ public class ViewerApplication {
 
   private void updateSymbols(Component component) {
     symbolEditor.setText("");
-    try (CloseableIterator<BatchReport.Symbol> it = reader.readComponentSymbols(component.getRef())) {
+    try (CloseableIterator<ScannerReport.Symbol> it = reader.readComponentSymbols(component.getRef())) {
       while (it.hasNext()) {
-        BatchReport.Symbol symbol = it.next();
+        ScannerReport.Symbol symbol = it.next();
         symbolEditor.getDocument().insertString(symbolEditor.getDocument().getEndPosition().getOffset(), symbol.toString() + "\n", null);
       }
     } catch (Exception e) {
diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/viewer/TextLineNumber.java b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/viewer/TextLineNumber.java
index a4bcfa48750..138b8e3a0e5 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/viewer/TextLineNumber.java
+++ b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/viewer/TextLineNumber.java
@@ -17,7 +17,7 @@
  * 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.batch.protocol.viewer;
+package org.sonar.scanner.protocol.viewer;
 
 import java.awt.Color;
 import java.awt.Dimension;
diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/viewer/package-info.java b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/viewer/package-info.java
index f518f9be464..17684b0c408 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/viewer/package-info.java
+++ b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/viewer/package-info.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.batch.protocol.viewer;
+package org.sonar.scanner.protocol.viewer;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
diff --git a/sonar-batch-protocol/src/main/protobuf/constants.proto b/sonar-scanner-protocol/src/main/protobuf/constants.proto
index c0825ffefae..862b4afa54c 100644
--- a/sonar-batch-protocol/src/main/protobuf/constants.proto
+++ b/sonar-scanner-protocol/src/main/protobuf/constants.proto
@@ -18,7 +18,7 @@
 
 syntax = "proto2";
 
-option java_package = "org.sonar.batch.protocol";
+option java_package = "org.sonar.scanner.protocol";
 
 option optimize_for = SPEED;
 
diff --git a/sonar-batch-protocol/src/main/protobuf/batch_input.proto b/sonar-scanner-protocol/src/main/protobuf/scanner_input.proto
index 06edb314b5e..db66fe50101 100644
--- a/sonar-batch-protocol/src/main/protobuf/batch_input.proto
+++ b/sonar-scanner-protocol/src/main/protobuf/scanner_input.proto
@@ -30,7 +30,7 @@ syntax = "proto2";
 
 import "constants.proto";
 
-option java_package = "org.sonar.batch.protocol.input";
+option java_package = "org.sonar.scanner.protocol.input";
 option optimize_for = SPEED;
 
 message ServerIssue {
diff --git a/sonar-batch-protocol/src/main/protobuf/batch_report.proto b/sonar-scanner-protocol/src/main/protobuf/scanner_report.proto
index 2abebf20e00..3df7f4343a6 100644
--- a/sonar-batch-protocol/src/main/protobuf/batch_report.proto
+++ b/sonar-scanner-protocol/src/main/protobuf/scanner_report.proto
@@ -30,7 +30,7 @@ syntax = "proto2";
 
 import "constants.proto";
 
-option java_package = "org.sonar.batch.protocol.output";
+option java_package = "org.sonar.scanner.protocol.output";
 
 option optimize_for = SPEED;
 
diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalRepositoriesTest.java b/sonar-scanner-protocol/src/test/java/org/sonar/scanner/protocol/input/GlobalRepositoriesTest.java
index fe0643b5c45..703e182ea8d 100644
--- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalRepositoriesTest.java
+++ b/sonar-scanner-protocol/src/test/java/org/sonar/scanner/protocol/input/GlobalRepositoriesTest.java
@@ -17,10 +17,12 @@
  * 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.batch.protocol.input;
+package org.sonar.scanner.protocol.input;
 
 import org.apache.commons.io.IOUtils;
 import org.junit.Test;
+import org.sonar.scanner.protocol.input.GlobalRepositories;
+import org.sonar.scanner.protocol.input.Metric;
 
 import static net.javacrumbs.jsonunit.assertj.JsonAssert.assertThatJson;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/FileStructureTest.java b/sonar-scanner-protocol/src/test/java/org/sonar/scanner/protocol/output/FileStructureTest.java
index 1692263a17c..69d5266cf50 100644
--- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/FileStructureTest.java
+++ b/sonar-scanner-protocol/src/test/java/org/sonar/scanner/protocol/output/FileStructureTest.java
@@ -17,13 +17,13 @@
  * 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.batch.protocol.output;
+package org.sonar.scanner.protocol.output;
 
 import org.apache.commons.io.FileUtils;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-
+import org.sonar.scanner.protocol.output.FileStructure;
 import java.io.File;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchReportReaderTest.java b/sonar-scanner-protocol/src/test/java/org/sonar/scanner/protocol/output/ScannerReportReaderTest.java
index 540bfbe4c53..ce2a6e86149 100644
--- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchReportReaderTest.java
+++ b/sonar-scanner-protocol/src/test/java/org/sonar/scanner/protocol/output/ScannerReportReaderTest.java
@@ -17,7 +17,7 @@
  * 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.batch.protocol.output;
+package org.sonar.scanner.protocol.output;
 
 import com.google.common.collect.Lists;
 import java.io.File;
@@ -29,14 +29,17 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.sonar.batch.protocol.Constants;
 import org.sonar.core.util.CloseableIterator;
+import org.sonar.scanner.protocol.Constants;
+import org.sonar.scanner.protocol.output.ScannerReportReader;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
+import org.sonar.scanner.protocol.output.FileStructure;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class BatchReportReaderTest {
+public class ScannerReportReaderTest {
 
   private static int UNKNOWN_COMPONENT_REF = 123;
 
@@ -45,25 +48,25 @@ public class BatchReportReaderTest {
 
   File dir;
 
-  BatchReportReader underTest;
+  ScannerReportReader underTest;
 
   @Before
   public void setUp() throws Exception {
     dir = temp.newFolder();
-    underTest = new BatchReportReader(dir);
+    underTest = new ScannerReportReader(dir);
   }
 
   @Test
   public void read_metadata() {
-    BatchReportWriter writer = new BatchReportWriter(dir);
-    BatchReport.Metadata.Builder metadata = BatchReport.Metadata.newBuilder()
+    ScannerReportWriter writer = new ScannerReportWriter(dir);
+    ScannerReport.Metadata.Builder metadata = ScannerReport.Metadata.newBuilder()
       .setAnalysisDate(15000000L)
       .setProjectKey("PROJECT_A")
       .setRootComponentRef(1)
       .setCrossProjectDuplicationActivated(true);
     writer.writeMetadata(metadata.build());
 
-    BatchReport.Metadata readMetadata = underTest.readMetadata();
+    ScannerReport.Metadata readMetadata = underTest.readMetadata();
     assertThat(readMetadata.getAnalysisDate()).isEqualTo(15000000L);
     assertThat(readMetadata.getProjectKey()).isEqualTo("PROJECT_A");
     assertThat(readMetadata.getRootComponentRef()).isEqualTo(1);
@@ -77,8 +80,8 @@ public class BatchReportReaderTest {
 
   @Test
   public void read_components() {
-    BatchReportWriter writer = new BatchReportWriter(dir);
-    BatchReport.Component.Builder component = BatchReport.Component.newBuilder()
+    ScannerReportWriter writer = new ScannerReportWriter(dir);
+    ScannerReport.Component.Builder component = ScannerReport.Component.newBuilder()
       .setRef(1)
       .setPath("src/main/java/Foo.java");
     writer.writeComponent(component.build());
@@ -93,8 +96,8 @@ public class BatchReportReaderTest {
 
   @Test
   public void read_issues() {
-    BatchReportWriter writer = new BatchReportWriter(dir);
-    BatchReport.Issue issue = BatchReport.Issue.newBuilder()
+    ScannerReportWriter writer = new ScannerReportWriter(dir);
+    ScannerReport.Issue issue = ScannerReport.Issue.newBuilder()
       .setLine(50)
       .build();
     writer.writeComponentIssues(1, asList(issue));
@@ -110,8 +113,8 @@ public class BatchReportReaderTest {
 
   @Test
   public void read_measures() {
-    BatchReportWriter writer = new BatchReportWriter(dir);
-    BatchReport.Measure.Builder measure = BatchReport.Measure.newBuilder()
+    ScannerReportWriter writer = new ScannerReportWriter(dir);
+    ScannerReport.Measure.Builder measure = ScannerReport.Measure.newBuilder()
       .setStringValue("value_a");
     writer.writeComponentMeasures(1, asList(measure.build()));
 
@@ -125,10 +128,10 @@ public class BatchReportReaderTest {
 
   @Test
   public void read_changesets() {
-    BatchReportWriter writer = new BatchReportWriter(dir);
-    BatchReport.Changesets.Builder scm = BatchReport.Changesets.newBuilder()
+    ScannerReportWriter writer = new ScannerReportWriter(dir);
+    ScannerReport.Changesets.Builder scm = ScannerReport.Changesets.newBuilder()
       .setComponentRef(1)
-      .addChangeset(BatchReport.Changesets.Changeset.newBuilder().setDate(123_456_789).setAuthor("jack.daniels").setRevision("123-456-789"));
+      .addChangeset(ScannerReport.Changesets.Changeset.newBuilder().setDate(123_456_789).setAuthor("jack.daniels").setRevision("123-456-789"));
     writer.writeComponentChangesets(scm.build());
 
     assertThat(underTest.readChangesets(1).getChangesetList()).hasSize(1);
@@ -142,20 +145,20 @@ public class BatchReportReaderTest {
 
   @Test
   public void read_duplications() {
-    BatchReportWriter writer = new BatchReportWriter(dir);
-    writer.writeMetadata(BatchReport.Metadata.newBuilder()
+    ScannerReportWriter writer = new ScannerReportWriter(dir);
+    writer.writeMetadata(ScannerReport.Metadata.newBuilder()
       .setRootComponentRef(1).build());
-    writer.writeComponent(BatchReport.Component.newBuilder()
+    writer.writeComponent(ScannerReport.Component.newBuilder()
       .setRef(1).build());
 
-    BatchReport.Duplication duplication = BatchReport.Duplication.newBuilder()
-      .setOriginPosition(BatchReport.TextRange.newBuilder()
+    ScannerReport.Duplication duplication = ScannerReport.Duplication.newBuilder()
+      .setOriginPosition(ScannerReport.TextRange.newBuilder()
         .setStartLine(1)
         .setEndLine(5)
         .build())
-      .addDuplicate(BatchReport.Duplicate.newBuilder()
+      .addDuplicate(ScannerReport.Duplicate.newBuilder()
         .setOtherFileRef(2)
-        .setRange(BatchReport.TextRange.newBuilder()
+        .setRange(ScannerReport.TextRange.newBuilder()
           .setStartLine(6)
           .setEndLine(10)
           .build())
@@ -163,7 +166,7 @@ public class BatchReportReaderTest {
       .build();
     writer.writeComponentDuplications(1, asList(duplication));
 
-    BatchReportReader sut = new BatchReportReader(dir);
+    ScannerReportReader sut = new ScannerReportReader(dir);
     assertThat(sut.readComponentDuplications(1)).hasSize(1);
   }
 
@@ -174,13 +177,13 @@ public class BatchReportReaderTest {
 
   @Test
   public void read_duplication_blocks() {
-    BatchReportWriter writer = new BatchReportWriter(dir);
-    writer.writeMetadata(BatchReport.Metadata.newBuilder()
+    ScannerReportWriter writer = new ScannerReportWriter(dir);
+    writer.writeMetadata(ScannerReport.Metadata.newBuilder()
       .setRootComponentRef(1).build());
-    writer.writeComponent(BatchReport.Component.newBuilder()
+    writer.writeComponent(ScannerReport.Component.newBuilder()
       .setRef(1).build());
 
-    BatchReport.CpdTextBlock duplicationBlock = BatchReport.CpdTextBlock.newBuilder()
+    ScannerReport.CpdTextBlock duplicationBlock = ScannerReport.CpdTextBlock.newBuilder()
       .setHash("abcdefghijklmnop")
       .setStartLine(1)
       .setEndLine(2)
@@ -189,7 +192,7 @@ public class BatchReportReaderTest {
       .build();
     writer.writeCpdTextBlocks(1, singletonList(duplicationBlock));
 
-    BatchReportReader sut = new BatchReportReader(dir);
+    ScannerReportReader sut = new ScannerReportReader(dir);
     assertThat(sut.readCpdTextBlocks(1)).hasSize(1);
   }
 
@@ -200,24 +203,24 @@ public class BatchReportReaderTest {
 
   @Test
   public void read_syntax_highlighting() throws Exception {
-    BatchReportWriter writer = new BatchReportWriter(dir);
-    writer.writeMetadata(BatchReport.Metadata.newBuilder()
+    ScannerReportWriter writer = new ScannerReportWriter(dir);
+    writer.writeMetadata(ScannerReport.Metadata.newBuilder()
       .setRootComponentRef(1)
       .build());
-    writer.writeComponent(BatchReport.Component.newBuilder()
+    writer.writeComponent(ScannerReport.Component.newBuilder()
       .setRef(1).build());
 
     writer.writeComponentSyntaxHighlighting(1, asList(
-      BatchReport.SyntaxHighlighting.newBuilder()
-        .setRange(BatchReport.TextRange.newBuilder()
+      ScannerReport.SyntaxHighlighting.newBuilder()
+        .setRange(ScannerReport.TextRange.newBuilder()
           .setStartLine(1)
           .setEndLine(10)
           .build())
         .setType(Constants.HighlightingType.ANNOTATION)
         .build()));
 
-    try (CloseableIterator<BatchReport.SyntaxHighlighting> it = underTest.readComponentSyntaxHighlighting(1)) {
-      BatchReport.SyntaxHighlighting syntaxHighlighting = it.next();
+    try (CloseableIterator<ScannerReport.SyntaxHighlighting> it = underTest.readComponentSyntaxHighlighting(1)) {
+      ScannerReport.SyntaxHighlighting syntaxHighlighting = it.next();
       assertThat(syntaxHighlighting.getRange()).isNotNull();
       assertThat(syntaxHighlighting.getRange().getStartLine()).isEqualTo(1);
       assertThat(syntaxHighlighting.getRange().getEndLine()).isEqualTo(10);
@@ -232,21 +235,21 @@ public class BatchReportReaderTest {
 
   @Test
   public void read_symbols() {
-    BatchReportWriter writer = new BatchReportWriter(dir);
-    writer.writeMetadata(BatchReport.Metadata.newBuilder()
+    ScannerReportWriter writer = new ScannerReportWriter(dir);
+    writer.writeMetadata(ScannerReport.Metadata.newBuilder()
       .setRootComponentRef(1)
       .build());
-    writer.writeComponent(BatchReport.Component.newBuilder()
+    writer.writeComponent(ScannerReport.Component.newBuilder()
       .setRef(1).build());
 
-    writer.writeComponentSymbols(1, asList(BatchReport.Symbol.newBuilder()
-      .setDeclaration(BatchReport.TextRange.newBuilder()
+    writer.writeComponentSymbols(1, asList(ScannerReport.Symbol.newBuilder()
+      .setDeclaration(ScannerReport.TextRange.newBuilder()
         .setStartLine(1)
         .setStartOffset(3)
         .setEndLine(1)
         .setEndOffset(5)
         .build())
-      .addReference(BatchReport.TextRange.newBuilder()
+      .addReference(ScannerReport.TextRange.newBuilder()
         .setStartLine(10)
         .setStartOffset(15)
         .setEndLine(11)
@@ -254,7 +257,7 @@ public class BatchReportReaderTest {
         .build())
       .build()));
 
-    underTest = new BatchReportReader(dir);
+    underTest = new ScannerReportReader(dir);
     assertThat(underTest.readComponentSymbols(1)).hasSize(1);
   }
 
@@ -265,15 +268,15 @@ public class BatchReportReaderTest {
 
   @Test
   public void read_coverage() throws Exception {
-    BatchReportWriter writer = new BatchReportWriter(dir);
-    writer.writeMetadata(BatchReport.Metadata.newBuilder()
+    ScannerReportWriter writer = new ScannerReportWriter(dir);
+    writer.writeMetadata(ScannerReport.Metadata.newBuilder()
       .setRootComponentRef(1)
       .build());
-    writer.writeComponent(BatchReport.Component.newBuilder()
+    writer.writeComponent(ScannerReport.Component.newBuilder()
       .setRef(1).build());
 
     writer.writeComponentCoverage(1, asList(
-      BatchReport.Coverage.newBuilder()
+      ScannerReport.Coverage.newBuilder()
         .setLine(1)
         .setConditions(1)
         .setUtHits(true)
@@ -282,7 +285,7 @@ public class BatchReportReaderTest {
         .setItCoveredConditions(1)
         .setOverallCoveredConditions(1)
         .build(),
-      BatchReport.Coverage.newBuilder()
+      ScannerReport.Coverage.newBuilder()
         .setLine(2)
         .setConditions(5)
         .setUtHits(false)
@@ -292,9 +295,9 @@ public class BatchReportReaderTest {
         .setOverallCoveredConditions(5)
         .build()));
 
-    underTest = new BatchReportReader(dir);
-    try (CloseableIterator<BatchReport.Coverage> it = new BatchReportReader(dir).readComponentCoverage(1)) {
-      BatchReport.Coverage coverage = it.next();
+    underTest = new ScannerReportReader(dir);
+    try (CloseableIterator<ScannerReport.Coverage> it = new ScannerReportReader(dir).readComponentCoverage(1)) {
+      ScannerReport.Coverage coverage = it.next();
       assertThat(coverage.getLine()).isEqualTo(1);
       assertThat(coverage.getConditions()).isEqualTo(1);
       assertThat(coverage.getUtHits()).isTrue();
@@ -312,19 +315,19 @@ public class BatchReportReaderTest {
 
   @Test
   public void read_source_lines() throws Exception {
-    BatchReportWriter writer = new BatchReportWriter(dir);
+    ScannerReportWriter writer = new ScannerReportWriter(dir);
     File file = writer.getFileStructure().fileFor(FileStructure.Domain.SOURCE, 1);
     FileUtils.writeLines(file, Lists.newArrayList("line1", "line2"));
 
-    File sourceFile = new BatchReportReader(dir).readFileSource(1);
+    File sourceFile = new ScannerReportReader(dir).readFileSource(1);
     assertThat(sourceFile).isEqualTo(file);
   }
 
   @Test
   public void read_tests() throws Exception {
-    BatchReportWriter writer = new BatchReportWriter(dir);
+    ScannerReportWriter writer = new ScannerReportWriter(dir);
     writer.writeTests(1, asList(
-      BatchReport.Test.newBuilder()
+      ScannerReport.Test.newBuilder()
         .setDurationInMs(60_000)
         .setStacktrace("stacktrace")
         .setMsg("message")
@@ -332,7 +335,7 @@ public class BatchReportReaderTest {
         .build()));
 
     try (InputStream inputStream = FileUtils.openInputStream(underTest.readTests(1))) {
-      BatchReport.Test testResult = BatchReport.Test.PARSER.parseDelimitedFrom(inputStream);
+      ScannerReport.Test testResult = ScannerReport.Test.PARSER.parseDelimitedFrom(inputStream);
       assertThat(testResult.getDurationInMs()).isEqualTo(60_000);
       assertThat(testResult.getStacktrace()).isEqualTo("stacktrace");
       assertThat(testResult.getMsg()).isEqualTo("message");
@@ -347,17 +350,17 @@ public class BatchReportReaderTest {
 
   @Test
   public void read_coverage_details() throws Exception {
-    BatchReportWriter writer = new BatchReportWriter(dir);
+    ScannerReportWriter writer = new ScannerReportWriter(dir);
     writer.writeCoverageDetails(1, asList(
-      BatchReport.CoverageDetail.newBuilder()
+      ScannerReport.CoverageDetail.newBuilder()
         .setTestName("test-name")
-        .addCoveredFile(BatchReport.CoverageDetail.CoveredFile.newBuilder()
+        .addCoveredFile(ScannerReport.CoverageDetail.CoveredFile.newBuilder()
           .addAllCoveredLine(asList(1, 2, 3, 5, 7))
           .setFileRef(2))
         .build()));
 
     try (InputStream inputStream = FileUtils.openInputStream(underTest.readCoverageDetails(1))) {
-      BatchReport.CoverageDetail coverageDetail = BatchReport.CoverageDetail.PARSER.parseDelimitedFrom(inputStream);
+      ScannerReport.CoverageDetail coverageDetail = ScannerReport.CoverageDetail.PARSER.parseDelimitedFrom(inputStream);
       assertThat(coverageDetail.getTestName()).isEqualTo("test-name");
       assertThat(coverageDetail.getCoveredFile(0).getFileRef()).isEqualTo(2);
       assertThat(coverageDetail.getCoveredFile(0).getCoveredLineList()).containsExactly(1, 2, 3, 5, 7);
@@ -371,7 +374,7 @@ public class BatchReportReaderTest {
 
   @Test
   public void read_file_source() throws Exception {
-    BatchReportWriter writer = new BatchReportWriter(dir);
+    ScannerReportWriter writer = new ScannerReportWriter(dir);
     try (FileOutputStream outputStream = new FileOutputStream(writer.getSourceFile(1))) {
       IOUtils.write("line1\nline2", outputStream);
     }
diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchReportWriterTest.java b/sonar-scanner-protocol/src/test/java/org/sonar/scanner/protocol/output/ScannerReportWriterTest.java
index fc594c00068..9a08cd726ac 100644
--- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchReportWriterTest.java
+++ b/sonar-scanner-protocol/src/test/java/org/sonar/scanner/protocol/output/ScannerReportWriterTest.java
@@ -17,7 +17,7 @@
  * 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.batch.protocol.output;
+package org.sonar.scanner.protocol.output;
 
 import com.google.common.collect.Iterators;
 import java.io.File;
@@ -26,43 +26,45 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.sonar.batch.protocol.Constants;
 import org.sonar.core.util.CloseableIterator;
 import org.sonar.core.util.Protobuf;
+import org.sonar.scanner.protocol.Constants;
+import org.sonar.scanner.protocol.output.ScannerReportWriter;
+import org.sonar.scanner.protocol.output.FileStructure;
 
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class BatchReportWriterTest {
+public class ScannerReportWriterTest {
 
   @Rule
   public TemporaryFolder temp = new TemporaryFolder();
   File dir;
-  BatchReportWriter underTest;
+  ScannerReportWriter underTest;
 
   @Before
   public void setUp() throws Exception {
     dir = temp.newFolder();
-    underTest = new BatchReportWriter(dir);
+    underTest = new ScannerReportWriter(dir);
   }
 
   @Test
   public void create_dir_if_does_not_exist() {
     FileUtils.deleteQuietly(dir);
-    underTest = new BatchReportWriter(dir);
+    underTest = new ScannerReportWriter(dir);
 
     assertThat(dir).isDirectory().exists();
   }
 
   @Test
   public void write_metadata() {
-    BatchReport.Metadata.Builder metadata = BatchReport.Metadata.newBuilder()
+    ScannerReport.Metadata.Builder metadata = ScannerReport.Metadata.newBuilder()
       .setAnalysisDate(15000000L)
       .setProjectKey("PROJECT_A")
       .setRootComponentRef(1);
     underTest.writeMetadata(metadata.build());
 
-    BatchReport.Metadata read = Protobuf.read(underTest.getFileStructure().metadataFile(), BatchReport.Metadata.PARSER);
+    ScannerReport.Metadata read = Protobuf.read(underTest.getFileStructure().metadataFile(), ScannerReport.Metadata.PARSER);
     assertThat(read.getAnalysisDate()).isEqualTo(15000000L);
     assertThat(read.getProjectKey()).isEqualTo("PROJECT_A");
     assertThat(read.getRootComponentRef()).isEqualTo(1);
@@ -74,7 +76,7 @@ public class BatchReportWriterTest {
     assertThat(underTest.hasComponentData(FileStructure.Domain.COMPONENT, 1)).isFalse();
 
     // write data
-    BatchReport.Component.Builder component = BatchReport.Component.newBuilder()
+    ScannerReport.Component.Builder component = ScannerReport.Component.newBuilder()
       .setRef(1)
       .setLanguage("java")
       .setPath("src/Foo.java")
@@ -87,7 +89,7 @@ public class BatchReportWriterTest {
     assertThat(underTest.hasComponentData(FileStructure.Domain.COMPONENT, 1)).isTrue();
     File file = underTest.getFileStructure().fileFor(FileStructure.Domain.COMPONENT, 1);
     assertThat(file).exists().isFile();
-    BatchReport.Component read = Protobuf.read(file, BatchReport.Component.PARSER);
+    ScannerReport.Component read = Protobuf.read(file, ScannerReport.Component.PARSER);
     assertThat(read.getRef()).isEqualTo(1);
     assertThat(read.getChildRefList()).containsOnly(5, 42);
     assertThat(read.hasName()).isFalse();
@@ -100,7 +102,7 @@ public class BatchReportWriterTest {
     assertThat(underTest.hasComponentData(FileStructure.Domain.ISSUES, 1)).isFalse();
 
     // write data
-    BatchReport.Issue issue = BatchReport.Issue.newBuilder()
+    ScannerReport.Issue issue = ScannerReport.Issue.newBuilder()
       .setLine(50)
       .setMsg("the message")
       .build();
@@ -110,7 +112,7 @@ public class BatchReportWriterTest {
     assertThat(underTest.hasComponentData(FileStructure.Domain.ISSUES, 1)).isTrue();
     File file = underTest.getFileStructure().fileFor(FileStructure.Domain.ISSUES, 1);
     assertThat(file).exists().isFile();
-    try (CloseableIterator<BatchReport.Issue> read = Protobuf.readStream(file, BatchReport.Issue.PARSER)) {
+    try (CloseableIterator<ScannerReport.Issue> read = Protobuf.readStream(file, ScannerReport.Issue.PARSER)) {
       assertThat(Iterators.size(read)).isEqualTo(1);
     }
   }
@@ -119,7 +121,7 @@ public class BatchReportWriterTest {
   public void write_measures() {
     assertThat(underTest.hasComponentData(FileStructure.Domain.MEASURES, 1)).isFalse();
 
-    BatchReport.Measure measure = BatchReport.Measure.newBuilder()
+    ScannerReport.Measure measure = ScannerReport.Measure.newBuilder()
       .setStringValue("text-value")
       .setDoubleValue(2.5d)
       .setValueType(Constants.MeasureValueType.DOUBLE)
@@ -130,7 +132,7 @@ public class BatchReportWriterTest {
     assertThat(underTest.hasComponentData(FileStructure.Domain.MEASURES, 1)).isTrue();
     File file = underTest.getFileStructure().fileFor(FileStructure.Domain.MEASURES, 1);
     assertThat(file).exists().isFile();
-    try (CloseableIterator<BatchReport.Measure> read = Protobuf.readStream(file, BatchReport.Measure.PARSER)) {
+    try (CloseableIterator<ScannerReport.Measure> read = Protobuf.readStream(file, ScannerReport.Measure.PARSER)) {
       assertThat(Iterators.size(read)).isEqualTo(1);
     }
   }
@@ -139,10 +141,10 @@ public class BatchReportWriterTest {
   public void write_scm() {
     assertThat(underTest.hasComponentData(FileStructure.Domain.CHANGESETS, 1)).isFalse();
 
-    BatchReport.Changesets scm = BatchReport.Changesets.newBuilder()
+    ScannerReport.Changesets scm = ScannerReport.Changesets.newBuilder()
       .setComponentRef(1)
       .addChangesetIndexByLine(0)
-      .addChangeset(BatchReport.Changesets.Changeset.newBuilder()
+      .addChangeset(ScannerReport.Changesets.Changeset.newBuilder()
         .setRevision("123-456-789")
         .setAuthor("author")
         .setDate(123_456_789L))
@@ -153,7 +155,7 @@ public class BatchReportWriterTest {
     assertThat(underTest.hasComponentData(FileStructure.Domain.CHANGESETS, 1)).isTrue();
     File file = underTest.getFileStructure().fileFor(FileStructure.Domain.CHANGESETS, 1);
     assertThat(file).exists().isFile();
-    BatchReport.Changesets read = Protobuf.read(file, BatchReport.Changesets.PARSER);
+    ScannerReport.Changesets read = Protobuf.read(file, ScannerReport.Changesets.PARSER);
     assertThat(read.getComponentRef()).isEqualTo(1);
     assertThat(read.getChangesetCount()).isEqualTo(1);
     assertThat(read.getChangesetList()).hasSize(1);
@@ -164,14 +166,14 @@ public class BatchReportWriterTest {
   public void write_duplications() {
     assertThat(underTest.hasComponentData(FileStructure.Domain.DUPLICATIONS, 1)).isFalse();
 
-    BatchReport.Duplication duplication = BatchReport.Duplication.newBuilder()
-      .setOriginPosition(BatchReport.TextRange.newBuilder()
+    ScannerReport.Duplication duplication = ScannerReport.Duplication.newBuilder()
+      .setOriginPosition(ScannerReport.TextRange.newBuilder()
         .setStartLine(1)
         .setEndLine(5)
         .build())
-      .addDuplicate(BatchReport.Duplicate.newBuilder()
+      .addDuplicate(ScannerReport.Duplicate.newBuilder()
         .setOtherFileRef(2)
-        .setRange(BatchReport.TextRange.newBuilder()
+        .setRange(ScannerReport.TextRange.newBuilder()
           .setStartLine(6)
           .setEndLine(10)
           .build())
@@ -182,8 +184,8 @@ public class BatchReportWriterTest {
     assertThat(underTest.hasComponentData(FileStructure.Domain.DUPLICATIONS, 1)).isTrue();
     File file = underTest.getFileStructure().fileFor(FileStructure.Domain.DUPLICATIONS, 1);
     assertThat(file).exists().isFile();
-    try (CloseableIterator<BatchReport.Duplication> duplications = Protobuf.readStream(file, BatchReport.Duplication.PARSER)) {
-      BatchReport.Duplication dup = duplications.next();
+    try (CloseableIterator<ScannerReport.Duplication> duplications = Protobuf.readStream(file, ScannerReport.Duplication.PARSER)) {
+      ScannerReport.Duplication dup = duplications.next();
       assertThat(dup.getOriginPosition()).isNotNull();
       assertThat(dup.getDuplicateList()).hasSize(1);
     }
@@ -193,7 +195,7 @@ public class BatchReportWriterTest {
   public void write_duplication_blocks() {
     assertThat(underTest.hasComponentData(FileStructure.Domain.CPD_TEXT_BLOCKS, 1)).isFalse();
 
-    BatchReport.CpdTextBlock duplicationBlock = BatchReport.CpdTextBlock.newBuilder()
+    ScannerReport.CpdTextBlock duplicationBlock = ScannerReport.CpdTextBlock.newBuilder()
       .setHash("abcdefghijklmnop")
       .setStartLine(1)
       .setEndLine(2)
@@ -205,8 +207,8 @@ public class BatchReportWriterTest {
     assertThat(underTest.hasComponentData(FileStructure.Domain.CPD_TEXT_BLOCKS, 1)).isTrue();
     File file = underTest.getFileStructure().fileFor(FileStructure.Domain.CPD_TEXT_BLOCKS, 1);
     assertThat(file).exists().isFile();
-    try (CloseableIterator<BatchReport.CpdTextBlock> duplicationBlocks = Protobuf.readStream(file, BatchReport.CpdTextBlock.parser())) {
-      BatchReport.CpdTextBlock duplicationBlockResult = duplicationBlocks.next();
+    try (CloseableIterator<ScannerReport.CpdTextBlock> duplicationBlocks = Protobuf.readStream(file, ScannerReport.CpdTextBlock.parser())) {
+      ScannerReport.CpdTextBlock duplicationBlockResult = duplicationBlocks.next();
       assertThat(duplicationBlockResult.getHash()).isEqualTo("abcdefghijklmnop");
       assertThat(duplicationBlockResult.getStartLine()).isEqualTo(1);
       assertThat(duplicationBlockResult.getEndLine()).isEqualTo(2);
@@ -221,14 +223,14 @@ public class BatchReportWriterTest {
     assertThat(underTest.hasComponentData(FileStructure.Domain.SYMBOLS, 1)).isFalse();
 
     // write data
-    BatchReport.Symbol symbol = BatchReport.Symbol.newBuilder()
-      .setDeclaration(BatchReport.TextRange.newBuilder()
+    ScannerReport.Symbol symbol = ScannerReport.Symbol.newBuilder()
+      .setDeclaration(ScannerReport.TextRange.newBuilder()
         .setStartLine(1)
         .setStartOffset(3)
         .setEndLine(1)
         .setEndOffset(5)
         .build())
-      .addReference(BatchReport.TextRange.newBuilder()
+      .addReference(ScannerReport.TextRange.newBuilder()
         .setStartLine(10)
         .setStartOffset(15)
         .setEndLine(11)
@@ -242,7 +244,7 @@ public class BatchReportWriterTest {
 
     File file = underTest.getFileStructure().fileFor(FileStructure.Domain.SYMBOLS, 1);
     assertThat(file).exists().isFile();
-    try (CloseableIterator<BatchReport.Symbol> read = Protobuf.readStream(file, BatchReport.Symbol.PARSER)) {
+    try (CloseableIterator<ScannerReport.Symbol> read = Protobuf.readStream(file, ScannerReport.Symbol.PARSER)) {
       assertThat(read).hasSize(1);
     }
   }
@@ -253,8 +255,8 @@ public class BatchReportWriterTest {
     assertThat(underTest.hasComponentData(FileStructure.Domain.SYNTAX_HIGHLIGHTINGS, 1)).isFalse();
 
     underTest.writeComponentSyntaxHighlighting(1, asList(
-      BatchReport.SyntaxHighlighting.newBuilder()
-        .setRange(BatchReport.TextRange.newBuilder()
+      ScannerReport.SyntaxHighlighting.newBuilder()
+        .setRange(ScannerReport.TextRange.newBuilder()
           .setStartLine(1)
           .setEndLine(1)
           .build())
@@ -270,7 +272,7 @@ public class BatchReportWriterTest {
     assertThat(underTest.hasComponentData(FileStructure.Domain.COVERAGES, 1)).isFalse();
 
     underTest.writeComponentCoverage(1, asList(
-      BatchReport.Coverage.newBuilder()
+      ScannerReport.Coverage.newBuilder()
         .setLine(1)
         .setConditions(1)
         .setUtHits(true)
@@ -288,7 +290,7 @@ public class BatchReportWriterTest {
     assertThat(underTest.hasComponentData(FileStructure.Domain.TESTS, 1)).isFalse();
 
     underTest.writeTests(1, asList(
-      BatchReport.Test.getDefaultInstance()));
+      ScannerReport.Test.getDefaultInstance()));
 
     assertThat(underTest.hasComponentData(FileStructure.Domain.TESTS, 1)).isTrue();
 
@@ -299,7 +301,7 @@ public class BatchReportWriterTest {
     assertThat(underTest.hasComponentData(FileStructure.Domain.COVERAGE_DETAILS, 1)).isFalse();
 
     underTest.writeCoverageDetails(1, asList(
-      BatchReport.CoverageDetail.getDefaultInstance()));
+      ScannerReport.CoverageDetail.getDefaultInstance()));
 
     assertThat(underTest.hasComponentData(FileStructure.Domain.COVERAGE_DETAILS, 1)).isTrue();
   }
diff --git a/sonar-batch-protocol/src/test/resources/org/sonar/batch/protocol/input/GlobalRepositoriesTest/expected.json b/sonar-scanner-protocol/src/test/resources/org/sonar/scanner/protocol/input/GlobalRepositoriesTest/expected.json
index de38ae0cb18..de38ae0cb18 100644
--- a/sonar-batch-protocol/src/test/resources/org/sonar/batch/protocol/input/GlobalRepositoriesTest/expected.json
+++ b/sonar-scanner-protocol/src/test/resources/org/sonar/scanner/protocol/input/GlobalRepositoriesTest/expected.json
diff --git a/sonar-batch-protocol/src/test/resources/org/sonar/batch/protocol/input/ProjectRepositoriesTest/testToJson.json b/sonar-scanner-protocol/src/test/resources/org/sonar/scanner/protocol/input/ProjectRepositoriesTest/testToJson.json
index ba7489143a6..ba7489143a6 100644
--- a/sonar-batch-protocol/src/test/resources/org/sonar/batch/protocol/input/ProjectRepositoriesTest/testToJson.json
+++ b/sonar-scanner-protocol/src/test/resources/org/sonar/scanner/protocol/input/ProjectRepositoriesTest/testToJson.json
diff --git a/sonar-batch-protocol/src/test/resources/org/sonar/batch/protocol/input/RulesSearchTest/empty.json b/sonar-scanner-protocol/src/test/resources/org/sonar/scanner/protocol/input/RulesSearchTest/empty.json
index 055fe8b8d63..055fe8b8d63 100644
--- a/sonar-batch-protocol/src/test/resources/org/sonar/batch/protocol/input/RulesSearchTest/empty.json
+++ b/sonar-scanner-protocol/src/test/resources/org/sonar/scanner/protocol/input/RulesSearchTest/empty.json
diff --git a/sonar-batch-protocol/src/test/resources/org/sonar/batch/protocol/input/RulesSearchTest/expected.json b/sonar-scanner-protocol/src/test/resources/org/sonar/scanner/protocol/input/RulesSearchTest/expected.json
index 89350a7e331..89350a7e331 100644
--- a/sonar-batch-protocol/src/test/resources/org/sonar/batch/protocol/input/RulesSearchTest/expected.json
+++ b/sonar-scanner-protocol/src/test/resources/org/sonar/scanner/protocol/input/RulesSearchTest/expected.json
diff --git a/sonar-batch-protocol/src/test/resources/org/sonar/batch/protocol/output/component/ReportComponentsTest/expected.json b/sonar-scanner-protocol/src/test/resources/org/sonar/scanner/protocol/output/component/ReportComponentsTest/expected.json
index 581bbc5ea23..581bbc5ea23 100644
--- a/sonar-batch-protocol/src/test/resources/org/sonar/batch/protocol/output/component/ReportComponentsTest/expected.json
+++ b/sonar-scanner-protocol/src/test/resources/org/sonar/scanner/protocol/output/component/ReportComponentsTest/expected.json