diff --git a/sonar-kotlin-checks/src/main/java/org/sonarsource/kotlin/checks/environment/optimized_api/BluetoothBleCheck.kt b/sonar-kotlin-checks/src/main/java/org/sonarsource/kotlin/checks/environment/optimized_api/BluetoothBleCheck.kt
index da25e72..25977a5 100644
--- a/sonar-kotlin-checks/src/main/java/org/sonarsource/kotlin/checks/environment/optimized_api/BluetoothBleCheck.kt
+++ b/sonar-kotlin-checks/src/main/java/org/sonarsource/kotlin/checks/environment/optimized_api/BluetoothBleCheck.kt
@@ -34,7 +34,7 @@ private const val IMPORT_STR_BLE = "android.bluetooth.le"
 private const val ERROR_MESSAGE = "You are using Bluetooth. Did you take a look at the Bluetooth Low Energy API?"
 private const val GOOD_PRACTICE_MESSAGE = "Using android.bluetooth.le.* is a good practice."
 
-@Rule(key = "EC518")
+@Rule(key = "GCI518")
 class BluetoothBleCheck : AbstractCheck() {
 
     override fun visitImportList(importList: KtImportList, data: KotlinFileContext?) {
diff --git a/sonar-kotlin-checks/src/main/java/org/sonarsource/kotlin/checks/environment/optimized_api/FusedLocationCheck.kt b/sonar-kotlin-checks/src/main/java/org/sonarsource/kotlin/checks/environment/optimized_api/FusedLocationCheck.kt
index 204e7fd..9f87e90 100644
--- a/sonar-kotlin-checks/src/main/java/org/sonarsource/kotlin/checks/environment/optimized_api/FusedLocationCheck.kt
+++ b/sonar-kotlin-checks/src/main/java/org/sonarsource/kotlin/checks/environment/optimized_api/FusedLocationCheck.kt
@@ -30,7 +30,7 @@ private const val GOOD_IMPORT = "com.google.android.gms.location"
 private const val ERROR_MESSAGE =
     "Use com.google.android.gms.location instead of android.location to maximize battery life."
 
-@Rule(key = "EC517")
+@Rule(key = "GCI517")
 class FusedLocationCheck : AbstractCheck() {
 
     override fun visitImportList(importList: KtImportList, data: KotlinFileContext?) {
@@ -45,4 +45,4 @@ class FusedLocationCheck : AbstractCheck() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/Ecocode_profile.json b/sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/Ecocode_profile.json
index 9602c2e..dd00457 100644
--- a/sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/Ecocode_profile.json
+++ b/sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/Ecocode_profile.json
@@ -1,7 +1,7 @@
 {
   "name": "ecoCode (Android)",
   "ruleKeys": [
-    "EC518",
-    "EC517"
+    "GCI518",
+    "GCI517"
   ]
 }
diff --git a/sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/EC517.html b/sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/GCI517.html
similarity index 100%
rename from sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/EC517.html
rename to sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/GCI517.html
diff --git a/sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/EC517.json b/sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/GCI517.json
similarity index 93%
rename from sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/EC517.json
rename to sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/GCI517.json
index 70d0c57..889a48e 100644
--- a/sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/EC517.json
+++ b/sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/GCI517.json
@@ -14,5 +14,5 @@
     "eco-design"
   ],
   "defaultSeverity": "Major",
-  "sqKey": "EC517"
-}
\ No newline at end of file
+  "sqKey": "GCI517"
+}
diff --git a/sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/EC518.html b/sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/GCI518.html
similarity index 100%
rename from sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/EC518.html
rename to sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/GCI518.html
diff --git a/sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/EC518.json b/sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/GCI518.json
similarity index 93%
rename from sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/EC518.json
rename to sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/GCI518.json
index d7da6fe..107c497 100644
--- a/sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/EC518.json
+++ b/sonar-kotlin-plugin/src/main/resources/org/sonar/l10n/kotlin/rules/kotlin/GCI518.json
@@ -14,5 +14,5 @@
     "eco-design"
   ],
   "defaultSeverity": "Major",
-  "sqKey": "EC518"
-}
\ No newline at end of file
+  "sqKey": "GCI518"
+}
diff --git a/sonar-kotlin-plugin/src/test/java/org/sonarsource/kotlin/plugin/KotlinProfileDefinitionTest.kt b/sonar-kotlin-plugin/src/test/java/org/sonarsource/kotlin/plugin/KotlinProfileDefinitionTest.kt
index 1e124a4..85dd61e 100644
--- a/sonar-kotlin-plugin/src/test/java/org/sonarsource/kotlin/plugin/KotlinProfileDefinitionTest.kt
+++ b/sonar-kotlin-plugin/src/test/java/org/sonarsource/kotlin/plugin/KotlinProfileDefinitionTest.kt
@@ -46,6 +46,6 @@ internal class KotlinProfileDefinitionTest {
         assertThat(profile.rules().size).isGreaterThan(MIN_RULE_COUNT)
         assertThat(profile.rules())
             .extracting<String> { obj: BuiltInQualityProfilesDefinition.BuiltInActiveRule -> obj.ruleKey() }
-            .contains("EC518", "EC517")
+            .contains("GCI518", "GCI517")
     }
 }
diff --git a/sonar-kotlin-plugin/src/test/java/org/sonarsource/kotlin/plugin/KotlinRulesDefinitionTest.kt b/sonar-kotlin-plugin/src/test/java/org/sonarsource/kotlin/plugin/KotlinRulesDefinitionTest.kt
index 872cabd..99be50f 100644
--- a/sonar-kotlin-plugin/src/test/java/org/sonarsource/kotlin/plugin/KotlinRulesDefinitionTest.kt
+++ b/sonar-kotlin-plugin/src/test/java/org/sonarsource/kotlin/plugin/KotlinRulesDefinitionTest.kt
@@ -36,7 +36,7 @@ internal class KotlinRulesDefinitionTest {
         val repository = repositoryForVersion(Version.create(8, 9))
         Assertions.assertThat(repository!!.name()).isEqualTo("SonarQube")
         Assertions.assertThat(repository.language()).isEqualTo("kotlin")
-        val rule = repository.rule("EC518")!!
+        val rule = repository.rule("GCI518")!!
         Assertions.assertThat(rule.name())
             .isEqualTo("Optimized API: Bluetooth Low-Energy")
         Assertions.assertThat(rule.type()).isEqualTo(RuleType.CODE_SMELL)
diff --git a/sonar-kotlin-plugin/src/test/java/org/sonarsource/kotlin/plugin/KotlinSensorTest.kt b/sonar-kotlin-plugin/src/test/java/org/sonarsource/kotlin/plugin/KotlinSensorTest.kt
index e37416c..0f9c4eb 100644
--- a/sonar-kotlin-plugin/src/test/java/org/sonarsource/kotlin/plugin/KotlinSensorTest.kt
+++ b/sonar-kotlin-plugin/src/test/java/org/sonarsource/kotlin/plugin/KotlinSensorTest.kt
@@ -93,12 +93,12 @@ internal class KotlinSensorTest : AbstractSensorTest() {
      """.trimIndent()
         )
         context.fileSystem().add(inputFile)
-        val checkFactory = checkFactory("EC518")
+        val checkFactory = checkFactory("GCI518")
         sensor(checkFactory).execute(context)
         val issues = context.allIssues()
         assertThat(issues).hasSize(1)
         val issue = issues.iterator().next()
-        assertThat(issue.ruleKey().rule()).isEqualTo("EC518")
+        assertThat(issue.ruleKey().rule()).isEqualTo("GCI518")
         val location = issue.primaryLocation()
         assertThat(location.inputComponent()).isEqualTo(inputFile)
         assertThat(location.message())