diff --git a/csharp/App/Backend/Database/Db.cs b/csharp/App/Backend/Database/Db.cs
index 69c61b50c..05048f8c3 100644
--- a/csharp/App/Backend/Database/Db.cs
+++ b/csharp/App/Backend/Database/Db.cs
@@ -71,6 +71,10 @@ public static partial class Db
         Connection.Execute("UPDATE User SET Language = 'fr' WHERE Language = 'french'");
         Connection.Execute("UPDATE User SET Language = 'it' WHERE Language = 'italian'");
 
+        // One-time migration: rebrand folder names
+        Connection.Execute("UPDATE Folder SET Name = 'inesco Energy' WHERE Name = 'InnovEnergy'");
+        Connection.Execute("UPDATE Folder SET Name = 'Sodistore Max Installations' WHERE Name = 'SodistoreMax Installations'");
+
         //UpdateKeys();
         CleanupSessions().SupressAwaitWarning();
         DeleteSnapshots().SupressAwaitWarning();
diff --git a/csharp/App/Backend/Websockets/RabbitMQManager.cs b/csharp/App/Backend/Websockets/RabbitMQManager.cs
index 48d63f116..417a04e86 100644
--- a/csharp/App/Backend/Websockets/RabbitMQManager.cs
+++ b/csharp/App/Backend/Websockets/RabbitMQManager.cs
@@ -126,7 +126,7 @@ public static class RabbitMqManager
                                     Console.WriteLine("Send replace battery email to the support team for installation "+installationId);
                                     string recipient = "support@innov.energy";
                                     string subject = $"Battery Alarm from {installation.InstallationName}: 2 or more strings broken";
-                                    string text = $"Dear InnovEnergy Support Team,\n" +
+                                    string text = $"Dear inesco Energy Support Team,\n" +
                                                   $"\n"+
                                                   $"Installation Name: {installation.InstallationName}\n"+
                                                   $"\n"+
@@ -138,7 +138,7 @@ public static class RabbitMqManager
                                                   $"\n"+
                                                   $"Thank you for your great support:)";
                                     //Disable this function now
-                                    //Mailer.Send("InnovEnergy Support Team", recipient, subject, text);
+                                    //Mailer.Send("inesco Energy Support Team", recipient, subject, text);
                                 }
                                 //Create a new error and add it to the database
                                 Db.HandleError(newError, installationId);
diff --git a/typescript/frontend-marios2/src/components/LogoSign/index.tsx b/typescript/frontend-marios2/src/components/LogoSign/index.tsx
index 1a2f6da1d..a23c98200 100644
--- a/typescript/frontend-marios2/src/components/LogoSign/index.tsx
+++ b/typescript/frontend-marios2/src/components/LogoSign/index.tsx
@@ -98,7 +98,7 @@ function Logo() {
   const theme = useTheme();
 
   return (
-    <TooltipWrapper title="InnovEnergy" arrow>
+    <TooltipWrapper title="inesco Energy" arrow>
       <LogoWrapper to="/overview">
         <Badge
           sx={{
diff --git a/typescript/frontend-marios2/src/content/dashboards/Tree/Information.tsx b/typescript/frontend-marios2/src/content/dashboards/Tree/Information.tsx
index f5601597e..f2e2b35a8 100644
--- a/typescript/frontend-marios2/src/content/dashboards/Tree/Information.tsx
+++ b/typescript/frontend-marios2/src/content/dashboards/Tree/Information.tsx
@@ -66,6 +66,10 @@ function TreeInformation(props: TreeInformationProps) {
   };
 
   const ProductTypes = ['Salimax', 'Salidomo', 'SodistoreHome', 'SodistoreMax'];
+  const ProductDisplayNames: Record<string, string> = {
+    'SodistoreHome': 'Sodistore Home',
+    'SodistoreMax': 'Sodistore Max'
+  };
 
   const isMobile = window.innerWidth <= 1490;
 
@@ -282,7 +286,7 @@ function TreeInformation(props: TreeInformationProps) {
                   >
                     {ProductTypes.map((type) => (
                       <MenuItem key={type} value={type}>
-                        {type}
+                        {ProductDisplayNames[type] || type}
                       </MenuItem>
                     ))}
                   </Select>
diff --git a/typescript/frontend-marios2/src/content/pages/Status/Status500/index.tsx b/typescript/frontend-marios2/src/content/pages/Status/Status500/index.tsx
index 79efb079e..492156a9f 100644
--- a/typescript/frontend-marios2/src/content/pages/Status/Status500/index.tsx
+++ b/typescript/frontend-marios2/src/content/pages/Status/Status500/index.tsx
@@ -115,7 +115,7 @@ function Status500() {
               <Container maxWidth="sm">
                 <Box textAlign="center">
                   <TypographyPrimary variant="h1" sx={{ my: 2 }}>
-                    InnovEnergy{' '}
+                    inesco Energy{' '}
                   </TypographyPrimary>
                   <TypographySecondary
                     variant="h4"
diff --git a/typescript/frontend-marios2/src/layouts/SidebarLayout/Sidebar/SidebarMenu/index.tsx b/typescript/frontend-marios2/src/layouts/SidebarLayout/Sidebar/SidebarMenu/index.tsx
index c00ddced6..7dfbef9e9 100644
--- a/typescript/frontend-marios2/src/layouts/SidebarLayout/Sidebar/SidebarMenu/index.tsx
+++ b/typescript/frontend-marios2/src/layouts/SidebarLayout/Sidebar/SidebarMenu/index.tsx
@@ -213,7 +213,7 @@ function SidebarMenu() {
                     <Box sx={{ marginTop: '3px' }}>
                       <FormattedMessage
                         id="sodistore"
-                        defaultMessage="SodistoreMax"
+                        defaultMessage="Sodistore Max"
                       />
                     </Box>
                   </Button>