diff --git a/ampel-firmware/ampel-firmware.ino b/ampel-firmware/ampel-firmware.ino
index b72d7f1bf0d6dec88486bbfb5c50dd61850c459e..749a85b064b39cc4a8e69e127e07cd4051c2ddb2 100644
--- a/ampel-firmware/ampel-firmware.ino
+++ b/ampel-firmware/ampel-firmware.ino
@@ -84,7 +84,7 @@ void wifiConnected() {
 
 void wifiFailed() {
   Serial.print(F("WiFi - Could not connect to "));
-  Serial.println(config::current_ssid()); //TODO: Rename
+  Serial.println(config::selected_ssid()); //TODO: Rename
   led_effects::showKITTWheel(color::red);
 }
 /*****************************************************************
diff --git a/ampel-firmware/mqtt.cpp b/ampel-firmware/mqtt.cpp
index 2366e38ea4b116969c43a5b90b28724fe29e0128..e300bafdec77bdf507c6c503f1ffb34f88fac593 100644
--- a/ampel-firmware/mqtt.cpp
+++ b/ampel-firmware/mqtt.cpp
@@ -201,7 +201,7 @@ namespace mqtt {
 
     char payload[75]; // Should be enough for info json...
     const char *json_info_format = PSTR("{\"local_ip\":\"%s\", \"ssid\":\"%s\"}");
-    snprintf(payload, sizeof(payload), json_info_format, wifi::local_ip, config::current_ssid());
+    snprintf(payload, sizeof(payload), json_info_format, wifi::local_ip, config::selected_ssid());
 
     mqttClient.publish(info_topic, payload);
   }
diff --git a/ampel-firmware/web_config.cpp b/ampel-firmware/web_config.cpp
index 43d767e6ede003049623a3889e48dd7b577102ee..b6f3656d4f603a670abb9079d15d5ff62051524a 100644
--- a/ampel-firmware/web_config.cpp
+++ b/ampel-firmware/web_config.cpp
@@ -286,7 +286,7 @@ namespace web_config {
  */
 namespace config {
 
-  char* current_ssid() {
+  char* selected_ssid() {
     return web_config::iotWebConf->getWifiSsidParameter()->valueBuffer;
   }
 
diff --git a/ampel-firmware/web_config.h b/ampel-firmware/web_config.h
index 69132fc32a6f170a716f0412c915dac9398773d4..2d02e2b3d14132f3f90c9afb7ffd0316e236ee58 100644
--- a/ampel-firmware/web_config.h
+++ b/ampel-firmware/web_config.h
@@ -10,7 +10,7 @@
 #endif
 
 namespace config {
-  char* current_ssid();
+  char* selected_ssid();
   // Sensor
   extern uint16_t &measurement_timestep; // [s] Value between 2 and 1800 (range for SCD30 sensor).
   extern uint16_t &altitude_above_sea_level; // [m]
diff --git a/ampel-firmware/wifi_util.cpp b/ampel-firmware/wifi_util.cpp
index 852e20806c6764196bffbdddf024eed43d8e11e0..ddf12a114f8c2ab7bef662bd3e916411bef78e74 100644
--- a/ampel-firmware/wifi_util.cpp
+++ b/ampel-firmware/wifi_util.cpp
@@ -41,7 +41,7 @@ namespace wifi {
     Serial.print(F("WiFi - Local IP : "));
     Serial.println(wifi::local_ip);
     Serial.print(F("WiFi - SSID : "));
-    Serial.println(config::current_ssid());
+    Serial.println(config::selected_ssid());
   }
 
   void defineCommands() {