5 files changed, 9 insertions, 9 deletions
diff --git a/it/it-plugins/billing-plugin/pom.xml b/it/it-plugins/fake-billing-plugin/pom.xml
index e3fc4d6ad10..c469ece0549 100644
--- a/it/it-plugins/billing-plugin/pom.xml
+++ b/it/it-plugins/fake-billing-plugin/pom.xml
@@ -8,9 +8,9 @@
     <version>6.4-SNAPSHOT</version>
   </parent>
 
-  <artifactId>billing-plugin</artifactId>
+  <artifactId>fake-billing-plugin</artifactId>
   <packaging>sonar-plugin</packaging>
-  <description>Plugins :: Billing</description>
+  <description>Plugins :: Fake Billing Plugin</description>
 
   <dependencies>
     <dependency>
@@ -35,7 +35,7 @@
         <version>1.15</version>
         <extensions>true</extensions>
         <configuration>
-          <pluginClass>BillingPlugin</pluginClass>
+          <pluginClass>FakeBillingPlugin</pluginClass>
           <pluginKey>billing</pluginKey>
         </configuration>
       </plugin>
diff --git a/it/it-plugins/billing-plugin/src/main/java/BillingPlugin.java b/it/it-plugins/fake-billing-plugin/src/main/java/FakeBillingPlugin.java
index 95525691a5e..910dfc9998a 100644
--- a/it/it-plugins/billing-plugin/src/main/java/BillingPlugin.java
+++ b/it/it-plugins/fake-billing-plugin/src/main/java/FakeBillingPlugin.java
@@ -21,13 +21,13 @@
 
 import org.sonar.api.Plugin;
 
-public class BillingPlugin implements Plugin {
+public class FakeBillingPlugin implements Plugin {
 
   @Override
   public void define(Context context) {
     // Nothing should be loaded when the plugin is running within by the scanner
     if (isRunningInSQ()) {
-      context.addExtension(BillingValidations.class);
+      context.addExtension(FakeBillingValidations.class);
     }
   }
 
diff --git a/it/it-plugins/billing-plugin/src/main/java/BillingValidations.java b/it/it-plugins/fake-billing-plugin/src/main/java/FakeBillingValidations.java
index 0e57d8d305d..8ce39311117 100644
--- a/it/it-plugins/billing-plugin/src/main/java/BillingValidations.java
+++ b/it/it-plugins/fake-billing-plugin/src/main/java/FakeBillingValidations.java
@@ -24,14 +24,14 @@ import org.sonar.server.organization.BillingValidationsExtension;
 
 import static java.lang.String.format;
 
-public class BillingValidations implements BillingValidationsExtension {
+public class FakeBillingValidations implements BillingValidationsExtension {
 
   private static final String PREVENT_PROJECT_ANALYSIS_SETTING = "sonar.billing.preventProjectAnalysis";
   private static final String PREVENT_UPDATING_PROJECTS_VISIBILITY_TO_PRIVATE_SETTING = "sonar.billing.preventUpdatingProjectsVisibilityToPrivate";
 
   private final Settings settings;
 
-  public BillingValidations(Settings settings) {
+  public FakeBillingValidations(Settings settings) {
     this.settings = settings;
   }
 
diff --git a/it/it-plugins/pom.xml b/it/it-plugins/pom.xml
index a36083c8433..f2033ce0ff0 100644
--- a/it/it-plugins/pom.xml
+++ b/it/it-plugins/pom.xml
@@ -33,8 +33,8 @@
     <module>access-secured-props-plugin</module>
     <module>base-auth-plugin</module>
     <module>batch-plugin</module>
-    <module>billing-plugin</module>
     <module>extension-lifecycle-plugin</module>
+    <module>fake-billing-plugin</module>
     <module>global-property-change-plugin</module>
     <module>issue-filter-plugin</module>
     <module>l10n-fr-pack</module>
diff --git a/it/it-tests/src/test/java/it/Category6Suite.java b/it/it-tests/src/test/java/it/Category6Suite.java
index 65a39793a75..b0c4d66a960 100644
--- a/it/it-tests/src/test/java/it/Category6Suite.java
+++ b/it/it-tests/src/test/java/it/Category6Suite.java
@@ -55,8 +55,8 @@ public class Category6Suite {
   public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
     .addPlugin(xooPlugin())
     .addPlugin(pluginArtifact("base-auth-plugin"))
+    .addPlugin(pluginArtifact("fake-billing-plugin"))
     .addPlugin(pluginArtifact("ui-extensions-plugin"))
-    .addPlugin(pluginArtifact("billing-plugin"))
     .build();
 
   @BeforeClass