diff --git a/flake.lock b/flake.lock
index 735166a..8145417 100644
--- a/flake.lock
+++ b/flake.lock
@@ -25,35 +25,6 @@
         "type": "github"
       }
     },
-    "clicky-bunty-server": {
-      "inputs": {
-        "naersk": [
-          "dump-dvb",
-          "naersk"
-        ],
-        "nixpkgs": [
-          "dump-dvb",
-          "nixpkgs"
-        ],
-        "utils": [
-          "dump-dvb",
-          "utils"
-        ]
-      },
-      "locked": {
-        "lastModified": 1663719647,
-        "narHash": "sha256-mq0Zmj9hzO/8KlBdrBKXFnD+4/DMtfDXJ4XpoKz6Aus=",
-        "owner": "dump-dvb",
-        "repo": "clicky-bunty-server",
-        "rev": "a483e2e263c44e08d6d51fd6a4048b9bf8ac1851",
-        "type": "github"
-      },
-      "original": {
-        "owner": "dump-dvb",
-        "repo": "clicky-bunty-server",
-        "type": "github"
-      }
-    },
     "data-accumulator": {
       "inputs": {
         "naersk": [
@@ -83,6 +54,35 @@
         "type": "github"
       }
     },
+    "datacare": {
+      "inputs": {
+        "naersk": [
+          "dump-dvb",
+          "naersk"
+        ],
+        "nixpkgs": [
+          "dump-dvb",
+          "nixpkgs"
+        ],
+        "utils": [
+          "dump-dvb",
+          "utils"
+        ]
+      },
+      "locked": {
+        "lastModified": 1671752356,
+        "narHash": "sha256-ERdozxCjRZFREBCjBx7DEnTcZtxp1J1N65OR8EdEOgY=",
+        "owner": "dump-dvb",
+        "repo": "datacare",
+        "rev": "9cd65246000b6de3fa83736c7f9c308eefd5b375",
+        "type": "github"
+      },
+      "original": {
+        "owner": "dump-dvb",
+        "repo": "datacare",
+        "type": "github"
+      }
+    },
     "decode-server": {
       "inputs": {
         "naersk": [
@@ -131,8 +131,8 @@
     "dump-dvb": {
       "inputs": {
         "click": "click",
-        "clicky-bunty-server": "clicky-bunty-server",
         "data-accumulator": "data-accumulator",
+        "datacare": "datacare",
         "decode-server": "decode-server",
         "dump-dvb-rs": "dump-dvb-rs",
         "dvb-api": "dvb-api",
@@ -149,11 +149,11 @@
         "windshield": "windshield"
       },
       "locked": {
-        "lastModified": 1671412431,
-        "narHash": "sha256-yRQymowv8kE+wPaoHJEhIm73l7lks4Za1hhZB0Q0wFI=",
+        "lastModified": 1671753060,
+        "narHash": "sha256-U0xm5DVuEc9olOoH2TqtFxBfakp81X9iKiKSvHjXqiw=",
         "owner": "dump-dvb",
         "repo": "dump-dvb.nix",
-        "rev": "bec44d507b8006ee95804fa2e1644b9cd8020564",
+        "rev": "05d96871c917996ee5a6c73c4a4545a1580bd466",
         "type": "github"
       },
       "original": {
@@ -170,11 +170,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1671387664,
-        "narHash": "sha256-BOJbKIMQnf60ZTY8JbTigD4SdYEXMW9HisyTjKjOiws=",
+        "lastModified": 1671743049,
+        "narHash": "sha256-Z1Mt7TfgEmhM4ph7NMYQ/q3IbJX2Z4QeVYx5GvGbSJo=",
         "owner": "dump-dvb",
         "repo": "dump-dvb.rs",
-        "rev": "fe0b2f5227bf7759ebbbfb7b91a1b88115ce12b3",
+        "rev": "f6cf7e3cd00d2f1994748a75241986fbc59f028c",
         "type": "github"
       },
       "original": {
@@ -280,11 +280,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1671027878,
-        "narHash": "sha256-MQnsc7JB0qISgyr8dtUPxs4sKduRsji1iwVcJKsB770=",
+        "lastModified": 1671475854,
+        "narHash": "sha256-ZXhdb+dwIFkkgYzN7VJsBu3aCrfNIjYUePDTEfXl0Uk=",
         "owner": "dump-dvb",
         "repo": "funnel",
-        "rev": "58c1e667fdfa84225429842f03b9eafb3a75f863",
+        "rev": "24ba4397dbca6cbb9d08a566a639c3203b838871",
         "type": "github"
       },
       "original": {
@@ -353,11 +353,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1671313200,
-        "narHash": "sha256-itZTrtHeDJjV696+ur0/TzkTqb5y3Eb57WRLRPK3rwA=",
+        "lastModified": 1671525405,
+        "narHash": "sha256-MEgNxm/oRt5w4ycMENewfZQKOak0ixmjVPfXM96N1FA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0938d73bb143f4ae037143572f11f4338c7b2d1c",
+        "rev": "cbe419ed4c8f98bd82d169c321d339ea30904f1f",
         "type": "github"
       },
       "original": {
@@ -369,11 +369,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1670146390,
-        "narHash": "sha256-XrEoDpuloRHHbUkbPnhF2bQ0uwHllXq3NHxtuVe/QK4=",
+        "lastModified": 1671459584,
+        "narHash": "sha256-6wRK7xmeHfClJ0ICOkax1avLZVGTDqBodQlkl/opccY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "86370507cb20c905800527539fc049a2bf09c667",
+        "rev": "87b58217c9a05edcf7630b9be32570f889217aef",
         "type": "github"
       },
       "original": {
@@ -458,11 +458,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1670149631,
-        "narHash": "sha256-rwmtlxx45PvOeZNP51wql/cWjY3rqzIR3Oj2Y+V7jM0=",
+        "lastModified": 1671472949,
+        "narHash": "sha256-9iHSGpljCX+RypahQssBXPwkru9onfKfceCTeVrMpH4=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "da98a111623101c64474a14983d83dad8f09f93d",
+        "rev": "32840f16ffa0856cdf9503a8658f2dd42bf70342",
         "type": "github"
       },
       "original": {
@@ -599,11 +599,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1671412128,
-        "narHash": "sha256-xvf9/kjvWvSgcgKjg7sVf6KFnmlx/1nk86ZJHnkAE3o=",
+        "lastModified": 1671752444,
+        "narHash": "sha256-jmvrzLePt4hcvcXxAsM0JImWKdxPbT08e5xUyPtNfxY=",
         "owner": "dump-dvb",
         "repo": "windshield",
-        "rev": "0fc405e8bc2cc5be5ed5ab4f328bcd291e01cfc9",
+        "rev": "774914702f0e2569bcc632a98484f15f23bb4a8e",
         "type": "github"
       },
       "original": {
diff --git a/modules/data-hoarder/clicky-bunty.nix b/modules/data-hoarder/datacare.nix
similarity index 73%
rename from modules/data-hoarder/clicky-bunty.nix
rename to modules/data-hoarder/datacare.nix
index 8249679..b2f9bec 100644
--- a/modules/data-hoarder/clicky-bunty.nix
+++ b/modules/data-hoarder/datacare.nix
@@ -1,5 +1,5 @@
 { config, ... }: {
-  dump-dvb.clickyBuntyServer = {
+  dump-dvb.datacare = {
     enable = true;
     host = "127.0.0.1";
     port = 8070;
@@ -7,10 +7,10 @@
     postgresPort = config.services.postgresql.port;
     postgresPasswordFile = config.sops.secrets.postgres_password.path;
     saltFile = config.sops.secrets.postgres_password_hash_salt.path;
-    user = "clicky-bunty-server";
+    user = "datacare";
     group = config.users.groups.postgres-dvbdump.name;
   };
-  systemd.services."clicky-bunty-server" = {
+  systemd.services."datacare" = {
     after = [ "postgresql.service" ];
     wants = [ "postgresql.service" ];
   };
@@ -21,12 +21,12 @@
       enable = true;
       recommendedProxySettings = true;
       virtualHosts = {
-        "management-backend.${config.deployment-dvb.domain}" = {
+        "datacare.${config.deployment-dvb.domain}" = {
           forceSSL = true;
           enableACME = true;
           locations = {
             "/" = {
-              proxyPass = with config.dump-dvb.clickyBuntyServer; "http://${host}:${toString port}/";
+              proxyPass = with config.dump-dvb.datacare; "http://${host}:${toString port}/";
               proxyWebsockets = true;
             };
           };
diff --git a/modules/data-hoarder/default.nix b/modules/data-hoarder/default.nix
index f360f55..0c10b35 100644
--- a/modules/data-hoarder/default.nix
+++ b/modules/data-hoarder/default.nix
@@ -1,7 +1,7 @@
 {
   imports = [
     ./click.nix
-    ./clicky-bunty.nix
+    ./datacare.nix
     ./data-accumulator.nix
     ./documentation.nix
     ./dvb-api.nix
diff --git a/modules/data-hoarder/secrets.nix b/modules/data-hoarder/secrets.nix
index 530114a..7ddd2da 100644
--- a/modules/data-hoarder/secrets.nix
+++ b/modules/data-hoarder/secrets.nix
@@ -1,6 +1,6 @@
 { config, ... }:
 let
-  clicky-bunty-user = config.dump-dvb.clickyBuntyServer.user;
+  datacare-user = config.dump-dvb.datacare.user;
   data-accumulator-user = config.dump-dvb.dataAccumulator.user;
   trekkie-user = config.dump-dvb.trekkie.user;
 in
@@ -10,18 +10,18 @@ in
   users.groups = {
     postgres-dvbdump = {
       name = "postgres-dvbdump";
-      members = [ clicky-bunty-user data-accumulator-user trekkie-user "postgres" ];
+      members = [ datacare-user data-accumulator-user trekkie-user "postgres" ];
     };
 
     password-salt = {
       name = "password-salt";
-      members = [ clicky-bunty-user trekkie-user "postgres" ];
+      members = [ datacare-user trekkie-user "postgres" ];
     };
 
     #TODO: remove this the two databases got merged
     postgres-telegrams = {
       name = "postgres-telegrams";
-      members = [ clicky-bunty-user data-accumulator-user "postgres" ];
+      members = [ datacare-user data-accumulator-user "postgres" ];
     };
 
   };