diff --git a/Confidence/src/main/java/com/spotify/confidence/Confidence.kt b/Confidence/src/main/java/com/spotify/confidence/Confidence.kt
index 6e731c44..21e6d6d5 100644
--- a/Confidence/src/main/java/com/spotify/confidence/Confidence.kt
+++ b/Confidence/src/main/java/com/spotify/confidence/Confidence.kt
@@ -219,7 +219,7 @@ class Confidence internal constructor(
     }
 }
 
-internal const val VISITOR_ID_CONTEXT_KEY = "visitorId"
+internal const val VISITOR_ID_CONTEXT_KEY = "visitor_id"
 
 object ConfidenceFactory {
     fun create(
diff --git a/Confidence/src/test/java/com/spotify/confidence/ConfidenceRemoteClientTests.kt b/Confidence/src/test/java/com/spotify/confidence/ConfidenceRemoteClientTests.kt
index 94af65c3..b1c4fb48 100644
--- a/Confidence/src/test/java/com/spotify/confidence/ConfidenceRemoteClientTests.kt
+++ b/Confidence/src/test/java/com/spotify/confidence/ConfidenceRemoteClientTests.kt
@@ -522,7 +522,7 @@ internal class ConfidenceRemoteClientTests {
                     "  \"clientSecret\": \"secret1\",\n" +
                     "  \"resolveToken\": \"token1\",\n" +
                     "  \"sdk\": {\n" +
-                    "    \"id\": \"SDK_ID_KOTLIN_PROVIDER_TEST\",\n" +
+                    "    \"id\": \"SDK_ID_KOTLIN_CONFIDENCE_TEST\",\n" +
                     "    \"version\": \"\"\n" +
                     "  }\n" +
                     "}"
diff --git a/Provider/src/test/java/com/spotify/confidence/openfeature/InMemorySharedPreferences.kt b/Provider/src/test/java/com/spotify/confidence/openfeature/InMemorySharedPreferences.kt
index 93ecd428..e7d0ceb8 100644
--- a/Provider/src/test/java/com/spotify/confidence/openfeature/InMemorySharedPreferences.kt
+++ b/Provider/src/test/java/com/spotify/confidence/openfeature/InMemorySharedPreferences.kt
@@ -3,7 +3,7 @@ package com.spotify.confidence.openfeature
 import android.content.SharedPreferences
 
 internal const val SHARED_PREFS_NAME = "confidence-visitor"
-internal const val VISITOR_ID_SHARED_PREFS_KEY = "visitorId"
+internal const val VISITOR_ID_SHARED_PREFS_KEY = "visitor_id"
 
 internal class InMemorySharedPreferences : SharedPreferences {
     private var visitorId: String = ""