diff --git a/connections/implementation/mediums/wifi_hotspot_test.cc b/connections/implementation/mediums/wifi_hotspot_test.cc
index da01bd22..d6057158 100644
--- a/connections/implementation/mediums/wifi_hotspot_test.cc
+++ b/connections/implementation/mediums/wifi_hotspot_test.cc
@@ -21,7 +21,7 @@
 #include "absl/time/clock.h"
 #include "internal/platform/medium_environment.h"
 #include "internal/platform/wifi_hotspot.h"
-#include "internal/platform/wifi_hotspot_credential.h"
+#include "internal/platform/wifi_credential.h"
 
 namespace nearby {
 namespace connections {
diff --git a/internal/platform/BUILD b/internal/platform/BUILD
index ca272e81..f20ce238 100644
--- a/internal/platform/BUILD
+++ b/internal/platform/BUILD
@@ -40,7 +40,7 @@ cc_library(
         "runnable.h",
         "socket.h",
         "types.h",
-        "wifi_hotspot_credential.h",
+        "wifi_credential.h",
     ],
     copts = ["-DCORE_ADAPTER_DLL"],
     defines = ["NO_WEBRTC"],
diff --git a/internal/platform/implementation/wifi_direct.h b/internal/platform/implementation/wifi_direct.h
index db88d13d..aa23e8da 100644
--- a/internal/platform/implementation/wifi_direct.h
+++ b/internal/platform/implementation/wifi_direct.h
@@ -22,7 +22,7 @@
 #include "internal/platform/cancellation_flag.h"
 #include "internal/platform/input_stream.h"
 #include "internal/platform/output_stream.h"
-#include "internal/platform/wifi_hotspot_credential.h"
+#include "internal/platform/wifi_credential.h"
 
 namespace nearby {
 namespace api {
diff --git a/internal/platform/implementation/wifi_hotspot.h b/internal/platform/implementation/wifi_hotspot.h
index f9ff2c80..44f99b38 100644
--- a/internal/platform/implementation/wifi_hotspot.h
+++ b/internal/platform/implementation/wifi_hotspot.h
@@ -21,7 +21,7 @@
 #include "internal/platform/input_stream.h"
 #include "internal/platform/listeners.h"
 #include "internal/platform/output_stream.h"
-#include "internal/platform/wifi_hotspot_credential.h"
+#include "internal/platform/wifi_credential.h"
 
 namespace nearby {
 namespace api {
diff --git a/internal/platform/medium_environment.h b/internal/platform/medium_environment.h
index 7334b790..2b366de8 100644
--- a/internal/platform/medium_environment.h
+++ b/internal/platform/medium_environment.h
@@ -42,7 +42,7 @@
 #include "internal/platform/mutex.h"
 #include "internal/platform/nsd_service_info.h"
 #include "internal/platform/single_thread_executor.h"
-#include "internal/platform/wifi_hotspot_credential.h"
+#include "internal/platform/wifi_credential.h"
 
 namespace nearby {
 
diff --git a/internal/platform/wifi_hotspot_credential.h b/internal/platform/wifi_credential.h
similarity index 97%
rename from internal/platform/wifi_hotspot_credential.h
rename to internal/platform/wifi_credential.h
index 4c53ac7a..e715235a 100644
--- a/internal/platform/wifi_hotspot_credential.h
+++ b/internal/platform/wifi_credential.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef PLATFORM_BASE_WIFI_HOTSPOT_CREDENTIAL_H_
-#define PLATFORM_BASE_WIFI_HOTSPOT_CREDENTIAL_H_
+#ifndef PLATFORM_BASE_WIFI_CREDENTIAL_H_
+#define PLATFORM_BASE_WIFI_CREDENTIAL_H_
 
 #include <string>
 
@@ -143,4 +143,4 @@ class WifiDirectCredentials {
 
 }  // namespace nearby
 
-#endif  // PLATFORM_BASE_WIFI_HOTSPOT_CREDENTIAL_H_
+#endif  // PLATFORM_BASE_WIFI_CREDENTIAL_H_
diff --git a/internal/platform/wifi_hotspot.h b/internal/platform/wifi_hotspot.h
index dbe31c0a..88ee985a 100644
--- a/internal/platform/wifi_hotspot.h
+++ b/internal/platform/wifi_hotspot.h
@@ -29,7 +29,7 @@
 #include "internal/platform/mutex.h"
 #include "internal/platform/mutex_lock.h"
 #include "internal/platform/output_stream.h"
-#include "internal/platform/wifi_hotspot_credential.h"
+#include "internal/platform/wifi_credential.h"
 
 namespace nearby {
 
diff --git a/internal/platform/wifi_hotspot_test.cc b/internal/platform/wifi_hotspot_test.cc
index 7b5f3bee..f9bd78d1 100644
--- a/internal/platform/wifi_hotspot_test.cc
+++ b/internal/platform/wifi_hotspot_test.cc
@@ -23,7 +23,7 @@
 #include "internal/platform/medium_environment.h"
 #include "internal/platform/count_down_latch.h"
 #include "internal/platform/logging.h"
-#include "internal/platform/wifi_hotspot_credential.h"
+#include "internal/platform/wifi_credential.h"
 
 namespace nearby {
 namespace {