diff --git a/examples/OneOpenAir/LocalServer.cpp b/examples/OneOpenAir/LocalServer.cpp
index c9736e7..5dd97a7 100644
--- a/examples/OneOpenAir/LocalServer.cpp
+++ b/examples/OneOpenAir/LocalServer.cpp
@@ -81,7 +81,9 @@ void LocalServer::_GET_dashboard(void) {
 void LocalServer::_GET_storage(void) {
   char *data = measure.getLocalStorage();
   if (data != nullptr) {
-    server.sendHeader("Content-Disposition", "attachment; filename=\"measurements.csv\"");
+    String filename =
+        "measurements-" + ag->deviceId().substring(8) + ".csv"; // measurements-fdsa.csv
+    server.sendHeader("Content-Disposition", "attachment; filename=\"" + filename + "\"");
     server.send(200, "text/plain", data);
     free(data);
   } else {
diff --git a/examples/OneOpenAir/OneOpenAir.ino b/examples/OneOpenAir/OneOpenAir.ino
index 0e6984c..ea17238 100644
--- a/examples/OneOpenAir/OneOpenAir.ino
+++ b/examples/OneOpenAir/OneOpenAir.ino
@@ -187,13 +187,16 @@ void setup() {
     delay(DISPLAY_DELAY_SHOW_CONTENT_MS);
   }
 
+  String deviceId = ag->deviceId();
+
   // Connect to Wi-Fi network with SSID and password
   Serial.print("Setting AP (Access Point)…");
   // Remove the password parameter, if you want the AP (Access Point) to be open
-  WiFi.softAP("airgradient", "cleanair");
+  WiFi.softAP("ag_" + deviceId, "cleanair");
   IPAddress IP = WiFi.softAPIP();
   Serial.print("AP IP address: ");
   Serial.println(IP);
+  Serial.printf("SSID: ag_%s\n", deviceId.c_str());
 
   oledDisplay.setText("", "Offline Storage Mode", "");