diff --git a/PiPedalCommon/src/AlsaSequencer.cpp b/PiPedalCommon/src/AlsaSequencer.cpp
index d079ac9..c45a101 100644
--- a/PiPedalCommon/src/AlsaSequencer.cpp
+++ b/PiPedalCommon/src/AlsaSequencer.cpp
@@ -275,9 +275,9 @@ namespace pipedal
         {
             Lv2Log::warning("Failed resize the ALSA sequencer input buffer: %s", snd_strerror(rc));
         }
-        snd_seq_set_client_name(seqHandle, "PiPedal");
+        snd_seq_set_client_name(seqHandle, "OP-Pedal");
 
-        inPort = snd_seq_create_simple_port(seqHandle, "PiPedal:in",
+        inPort = snd_seq_create_simple_port(seqHandle, "OP-Pedal:in",
                                             SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_WRITE,
                                             SND_SEQ_PORT_TYPE_MIDI_GENERIC |
                                                 SND_SEQ_PORT_TYPE_MIDI_GM | SND_SEQ_PORT_TYPE_APPLICATION);
@@ -651,7 +651,7 @@ namespace pipedal
         // Create a new queue if we don't have one yet
         if (queueId < 0)
         {
-            queueId = snd_seq_alloc_named_queue(seqHandle, "PiPedal Realtime Queue");
+            queueId = snd_seq_alloc_named_queue(seqHandle, "OP-Pedal Realtime Queue");
             if (queueId < 0)
             {
                 throw std::runtime_error(SS("Failed to create ALSA queue: " << snd_strerror(queueId)));
@@ -862,7 +862,7 @@ namespace pipedal
         snd_seq_set_client_name(seqHandle, "Device Monitor");
 
         int inPort = snd_seq_create_simple_port(
-            seqHandle, "PiPedal:portMonitor",
+            seqHandle, "OP-Pedal:portMonitor",
                         SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_WRITE,
                         SND_SEQ_PORT_TYPE_APPLICATION);
         if (inPort < 0)
@@ -973,7 +973,7 @@ namespace pipedal
         // Create a new queue if we don't have one yet
         int queueId = -1;
         {
-            queueId = snd_seq_alloc_named_queue(seqHandle, "PiPedal Device Monitor Queue");
+            queueId = snd_seq_alloc_named_queue(seqHandle, "OP-Pedal Device Monitor Queue");
             if (queueId < 0)
             {
                 throw std::runtime_error(SS("Failed to create ALSA queue: " << snd_strerror(queueId)));
diff --git a/PiPedalCommon/src/ServiceConfiguration.cpp b/PiPedalCommon/src/ServiceConfiguration.cpp
index 3cfdd2b..0a915c2 100644
--- a/PiPedalCommon/src/ServiceConfiguration.cpp
+++ b/PiPedalCommon/src/ServiceConfiguration.cpp
@@ -71,10 +71,10 @@ void ServiceConfiguration::Save()
         t.close();
 
        struct group *group_;
-        group_ = getgrnam("pipedal_d");
+        group_ = getgrnam("oppedal_d");
         if (group_ == nullptr)
         {
-            throw logic_error("Group not found: pipedal_d");
+            throw logic_error("Group not found: oppedal_d");
         }
         std::ignore = chown(DEVICEID_FILE_NAME, -1, group_->gr_gid);
         std::ignore = chmod(DEVICEID_FILE_NAME, S_IWUSR | S_IRUSR | S_IRGRP | S_IWGRP | S_IROTH);
diff --git a/PiPedalCommon/src/WifiDirectConfigSettings.cpp b/PiPedalCommon/src/WifiDirectConfigSettings.cpp
index c5fdd1f..8934db0 100644
--- a/PiPedalCommon/src/WifiDirectConfigSettings.cpp
+++ b/PiPedalCommon/src/WifiDirectConfigSettings.cpp
@@ -174,7 +174,7 @@ void WifiDirectConfigSettings::Load()
 
     if (!ConfigUtil::GetConfigLine("/var/pipedal/config/pipedal_p2pd.conf","p2p_device_name",&this->hotspotName_))
     {
-        this->hotspotName_ = "PiPedal";
+        this->hotspotName_ = "OP-Pedal";
     }
 
     if (!ConfigUtil::GetConfigLine("/var/pipedal/config/pipedal_p2pd.conf","country_code",&this->countryCode_))
diff --git a/PiPedalCommon/src/include/ServiceConfiguration.hpp b/PiPedalCommon/src/include/ServiceConfiguration.hpp
index 19ae977..8d0804a 100644
--- a/PiPedalCommon/src/include/ServiceConfiguration.hpp
+++ b/PiPedalCommon/src/include/ServiceConfiguration.hpp
@@ -46,7 +46,7 @@ namespace pipedal {
 
 
         std::string uuid;
-        std::string deviceName = "PiPedal";
+        std::string deviceName = "OP-Pedal";
         uint32_t server_port = 80;
     private: 
         std::filesystem::path filename;
diff --git a/PiPedalCommon/src/include/WifiConfigSettings.hpp b/PiPedalCommon/src/include/WifiConfigSettings.hpp
index 9c28ccf..b82319f 100644
--- a/PiPedalCommon/src/include/WifiConfigSettings.hpp
+++ b/PiPedalCommon/src/include/WifiConfigSettings.hpp
@@ -71,11 +71,11 @@ namespace pipedal {
         std::string homeNetwork_;
 
         std::string countryCode_ = "US"; // iso 3661
-        std::string hotspotName_ = "pipedal";
+        std::string hotspotName_ = "op-pedal";
         bool hasPassword_ = false;
         std::string password_;
         std::string channel_ = "";
-        std::string mdnsName_ = "pipedal";
+        std::string mdnsName_ = "op-pedal";
 
         bool wifiWarningGiven_ = false;  // Do not use. Present only for backward compatibility.
         bool valid_ = false; // Do not use. Present only for backward compatibility.
diff --git a/PiPedalCommon/src/include/WifiDirectConfigSettings.hpp b/PiPedalCommon/src/include/WifiDirectConfigSettings.hpp
index 3d00cda..71fde68 100644
--- a/PiPedalCommon/src/include/WifiDirectConfigSettings.hpp
+++ b/PiPedalCommon/src/include/WifiDirectConfigSettings.hpp
@@ -34,7 +34,7 @@ namespace pipedal {
         bool rebootRequired_ = false;
         bool enable_ = false;
         std::string countryCode_ = ""; // iso 3661
-        std::string hotspotName_ = "pipedal";
+        std::string hotspotName_ = "op-pedal";
         bool pinChanged_ = false;
         std::string pin_;
         std::string channel_ = "1"; // "0" -> select automatically.