diff --git a/nixos/modules/services/desktop-managers/budgie.nix b/nixos/modules/services/desktop-managers/budgie.nix
index a32caa838779..160ac04ecd6d 100644
--- a/nixos/modules/services/desktop-managers/budgie.nix
+++ b/nixos/modules/services/desktop-managers/budgie.nix
@@ -186,12 +186,12 @@ in
       ++ lib.optional config.networking.networkmanager.enable pkgs.networkmanagerapplet
       ++ (utils.removePackagesByName [
         nemo
-        mate.eom
-        mate.pluma
-        mate.atril
-        mate.engrampa
-        mate.mate-calc
-        mate.mate-system-monitor
+        eom
+        pluma
+        atril
+        engrampa
+        mate-calc
+        mate-system-monitor
         vlc
 
         # Supplemental tooling.
diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index b72461a75938..2e658cb83c66 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -29,14 +29,14 @@ in
 
       extraPanelApplets = mkOption {
         default = [ ];
-        example = literalExpression "with pkgs.mate; [ mate-applets ]";
+        example = literalExpression "with pkgs; [ mate-applets ]";
         type = types.listOf types.package;
         description = "Extra applets to add to mate-panel.";
       };
 
       extraCajaExtensions = mkOption {
         default = [ ];
-        example = lib.literalExpression "with pkgs.mate; [ caja-extensions ]";
+        example = lib.literalExpression "with pkgs; [ caja-extensions ]";
         type = types.listOf types.package;
         description = "Extra extensions to add to caja.";
       };
@@ -46,7 +46,7 @@ in
 
     environment.mate.excludePackages = mkOption {
       default = [ ];
-      example = literalExpression "[ pkgs.mate.mate-terminal pkgs.mate.pluma ]";
+      example = literalExpression "[ pkgs.mate-terminal pkgs.pluma ]";
       type = types.listOf types.package;
       description = "Which MATE packages to exclude from the default environment";
     };
@@ -56,7 +56,7 @@ in
   config = mkMerge [
     (mkIf (cfg.enable || cfg.enableWaylandSession) {
       services.displayManager.sessionPackages = [
-        pkgs.mate.mate-session-manager
+        pkgs.mate-session-manager
       ];
 
       environment.extraInit = lib.optionalString config.services.gnome.gcr-ssh-agent.enable ''
@@ -74,10 +74,10 @@ in
         pkgs.mate.basePackages
         ++ pkgs.mate.extraPackages
         ++ [
-          (pkgs.mate.caja-with-extensions.override {
+          (pkgs.caja-with-extensions.override {
             extensions = cfg.extraCajaExtensions;
           })
-          (pkgs.mate.mate-panel-with-applets.override {
+          (pkgs.mate-panel-with-applets.override {
             applets = cfg.extraPanelApplets;
           })
           pkgs.desktop-file-utils
@@ -101,24 +101,24 @@ in
       services.gnome.glib-networking.enable = true;
       services.gnome.gnome-keyring.enable = true;
       services.gnome.gcr-ssh-agent.enable = mkDefault true;
-      services.udev.packages = [ pkgs.mate.mate-settings-daemon ];
+      services.udev.packages = [ pkgs.mate-settings-daemon ];
       services.gvfs.enable = true;
       services.upower.enable = config.powerManagement.enable;
       services.libinput.enable = mkDefault true;
 
       security.pam.services.mate-screensaver.unixAuth = true;
 
-      xdg.portal.configPackages = mkDefault [ pkgs.mate.mate-desktop ];
+      xdg.portal.configPackages = mkDefault [ pkgs.mate-desktop ];
 
       environment.pathsToLink = [ "/share" ];
     })
     (mkIf cfg.enableWaylandSession {
       programs.wayfire.enable = true;
 
-      environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${pkgs.mate.mate-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
+      environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${pkgs.mate-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
 
-      environment.systemPackages = [ pkgs.mate.mate-wayland-session ];
-      services.displayManager.sessionPackages = [ pkgs.mate.mate-wayland-session ];
+      environment.systemPackages = [ pkgs.mate-wayland-session ];
+      services.displayManager.sessionPackages = [ pkgs.mate-wayland-session ];
     })
   ];
 }
diff --git a/nixos/tests/mate-wayland.nix b/nixos/tests/mate-wayland.nix
index b5856facd2ac..ad293cef9e9d 100644
--- a/nixos/tests/mate-wayland.nix
+++ b/nixos/tests/mate-wayland.nix
@@ -51,7 +51,7 @@
           cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf mate-panel)/environ"
           machine.succeed(f"{cmd} | grep 'XDG_SESSION_TYPE' | grep 'wayland'")
           machine.succeed(f"{cmd} | grep 'XDG_SESSION_DESKTOP' | grep 'MATE'")
-          machine.succeed(f"{cmd} | grep 'MATE_PANEL_APPLETS_DIR' | grep '${pkgs.mate.mate-panel-with-applets.pname}'")
+          machine.succeed(f"{cmd} | grep 'MATE_PANEL_APPLETS_DIR' | grep '${pkgs.mate-panel-with-applets.pname}'")
           # From the nixos/mate module
           machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
 
diff --git a/nixos/tests/mate.nix b/nixos/tests/mate.nix
index 81948d5a1ae1..f25dda0b92d6 100644
--- a/nixos/tests/mate.nix
+++ b/nixos/tests/mate.nix
@@ -58,7 +58,7 @@
       with subtest("Check if various environment variables are set"):
           machine.succeed("xargs --null --max-args=1 echo < /proc/$(pgrep -xf marco)/environ | grep 'XDG_CURRENT_DESKTOP' | grep 'MATE'")
           # From mate-panel-with-applets packaging
-          machine.succeed("xargs --null --max-args=1 echo < /proc/$(pgrep -xf mate-panel)/environ | grep 'MATE_PANEL_APPLETS_DIR' | grep '${pkgs.mate.mate-panel-with-applets.pname}'")
+          machine.succeed("xargs --null --max-args=1 echo < /proc/$(pgrep -xf mate-panel)/environ | grep 'MATE_PANEL_APPLETS_DIR' | grep '${pkgs.mate-panel-with-applets.pname}'")
           # From the nixos/mate module
           machine.succeed("xargs --null --max-args=1 echo < /proc/$(pgrep -xf mate-panel)/environ | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
 
diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix
index 2af1cbe518ba..68f265fa0286 100644
--- a/nixos/tests/terminal-emulators.nix
+++ b/nixos/tests/terminal-emulators.nix
@@ -61,7 +61,7 @@ let
 
     lxterminal.pkg = p: p.lxterminal;
 
-    mate-terminal.pkg = p: p.mate.mate-terminal;
+    mate-terminal.pkg = p: p.mate-terminal;
     mate-terminal.cmd = "SHELL=$command mate-terminal --disable-factory"; # factory mode uses dbus, and we don't have a proper dbus session set up
 
     mlterm.pkg = p: p.mlterm;
diff --git a/pkgs/by-name/ay/ayatana-indicator-display/package.nix b/pkgs/by-name/ay/ayatana-indicator-display/package.nix
index 18afb05894a3..83adddf1ae61 100644
--- a/pkgs/by-name/ay/ayatana-indicator-display/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-display/package.nix
@@ -20,7 +20,8 @@
   librda,
   libsForQt5,
   lomiri,
-  mate,
+  marco,
+  mate-settings-daemon,
   pkg-config,
   properties-cpp,
   python3,
@@ -78,8 +79,8 @@ stdenv.mkDerivation (finalAttrs: {
     lomiri-schemas # lomiri schema
   ])
   ++ [
-    mate.marco # marco schema
-    mate.mate-settings-daemon # mate mouse schema
+    marco # marco schema
+    mate-settings-daemon # mate mouse schema
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/ay/ayatana-indicator-session/package.nix b/pkgs/by-name/ay/ayatana-indicator-session/package.nix
index d674cf3b76cb..39a05c6e5d03 100644
--- a/pkgs/by-name/ay/ayatana-indicator-session/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-session/package.nix
@@ -14,7 +14,7 @@
   libayatana-common,
   librda,
   lomiri,
-  mate,
+  mate-settings-daemon,
   pkg-config,
   systemd,
   wrapGAppsHook3,
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
     # is there a better way to give it access to DE-specific schemas as needed?
     # https://github.com/AyatanaIndicators/ayatana-indicator-session/blob/88846bad7ee0aa8e0bb122816d06f9bc887eb464/src/service.c#L1387-L1413
     gnome-settings-daemon
-    mate.mate-settings-daemon
+    mate-settings-daemon
   ];
 
   nativeCheckInputs = [ dbus ];
diff --git a/pkgs/by-name/ma/mate-icon-theme-faenza/package.nix b/pkgs/by-name/ma/mate-icon-theme-faenza/package.nix
index 8e87c6fc1c88..db4db4b498b1 100644
--- a/pkgs/by-name/ma/mate-icon-theme-faenza/package.nix
+++ b/pkgs/by-name/ma/mate-icon-theme-faenza/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   autoreconfHook,
   gtk3,
-  mate,
+  mate-icon-theme,
   hicolor-icon-theme,
   gitUpdater,
 }:
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   propagatedBuildInputs = [
-    mate.mate-icon-theme
+    mate-icon-theme
     hicolor-icon-theme
   ];
 
diff --git a/pkgs/by-name/ma/mate-netbook/package.nix b/pkgs/by-name/ma/mate-netbook/package.nix
index 19d330f53c6c..af7d45dee75f 100644
--- a/pkgs/by-name/ma/mate-netbook/package.nix
+++ b/pkgs/by-name/ma/mate-netbook/package.nix
@@ -8,7 +8,7 @@
   libwnck,
   libfakekey,
   libxtst,
-  mate,
+  mate-panel,
   wrapGAppsHook3,
   gitUpdater,
 }:
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     libwnck
     libfakekey
     libxtst
-    mate.mate-panel
+    mate-panel
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/ma/mate-settings-daemon-wrapped/package.nix b/pkgs/by-name/ma/mate-settings-daemon-wrapped/package.nix
index 097f429460c2..7ae3080c5416 100644
--- a/pkgs/by-name/ma/mate-settings-daemon-wrapped/package.nix
+++ b/pkgs/by-name/ma/mate-settings-daemon-wrapped/package.nix
@@ -1,13 +1,14 @@
 {
   stdenv,
-  mate,
+  mate-control-center,
+  mate-settings-daemon,
   glib,
   wrapGAppsHook3,
 }:
 
 stdenv.mkDerivation {
-  pname = "${mate.mate-settings-daemon.pname}-wrapped";
-  inherit (mate.mate-settings-daemon) version outputs;
+  pname = "${mate-settings-daemon.pname}-wrapped";
+  inherit (mate-settings-daemon) version outputs;
 
   nativeBuildInputs = [
     wrapGAppsHook3
@@ -15,7 +16,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     glib
-    mate.mate-control-center
+    mate-control-center
   ];
 
   dontWrapGApps = true;
@@ -24,21 +25,21 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out/etc/xdg/autostart
-    cp ${mate.mate-settings-daemon}/etc/xdg/autostart/mate-settings-daemon.desktop $out/etc/xdg/autostart
+    cp ${mate-settings-daemon}/etc/xdg/autostart/mate-settings-daemon.desktop $out/etc/xdg/autostart
 
     mkdir -p $out/share/man
-    cp -r ${mate.mate-settings-daemon.man}/share/man/* $out/share/man/
+    cp -r ${mate-settings-daemon.man}/share/man/* $out/share/man/
   '';
 
   postFixup = ''
     mkdir -p $out/libexec
-    makeWrapper ${mate.mate-settings-daemon}/libexec/mate-settings-daemon $out/libexec/mate-settings-daemon \
+    makeWrapper ${mate-settings-daemon}/libexec/mate-settings-daemon $out/libexec/mate-settings-daemon \
       "''${gappsWrapperArgs[@]}"
     substituteInPlace $out/etc/xdg/autostart/mate-settings-daemon.desktop \
-      --replace-fail "${mate.mate-settings-daemon}/libexec/mate-settings-daemon" "$out/libexec/mate-settings-daemon"
+      --replace-fail "${mate-settings-daemon}/libexec/mate-settings-daemon" "$out/libexec/mate-settings-daemon"
   '';
 
-  meta = mate.mate-settings-daemon.meta // {
+  meta = mate-settings-daemon.meta // {
     priority = -10;
   };
 }
diff --git a/pkgs/by-name/ma/mate-tweak/package.nix b/pkgs/by-name/ma/mate-tweak/package.nix
index f7225cf363d0..63cc32afbd25 100644
--- a/pkgs/by-name/ma/mate-tweak/package.nix
+++ b/pkgs/by-name/ma/mate-tweak/package.nix
@@ -3,7 +3,11 @@
   fetchFromGitHub,
   python3Packages,
   intltool,
-  mate,
+  mate-applets,
+  mate-panel,
+  marco,
+  libmatekbd,
+  mate-session-manager,
   libnotify,
   gtk3,
   gdk-pixbuf,
@@ -37,11 +41,11 @@ python3Packages.buildPythonApplication rec {
     gdk-pixbuf
     libnotify
     glib
-    mate.mate-applets
-    mate.mate-panel
-    mate.marco
-    mate.libmatekbd
-    mate.mate-session-manager
+    mate-applets
+    mate-panel
+    marco
+    libmatekbd
+    mate-session-manager
   ];
 
   propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/by-name/ma/mate-user-share/package.nix b/pkgs/by-name/ma/mate-user-share/package.nix
index 3df42a10b273..f3e0b3846e5d 100644
--- a/pkgs/by-name/ma/mate-user-share/package.nix
+++ b/pkgs/by-name/ma/mate-user-share/package.nix
@@ -13,7 +13,6 @@
   libcanberra-gtk3,
   apacheHttpdPackages,
   hicolor-icon-theme,
-  mate,
   wrapGAppsHook3,
   gitUpdater,
 }:
diff --git a/pkgs/by-name/pl/plata-theme/package.nix b/pkgs/by-name/pl/plata-theme/package.nix
index 23a82e148f61..fb7d678b14f9 100644
--- a/pkgs/by-name/pl/plata-theme/package.nix
+++ b/pkgs/by-name/pl/plata-theme/package.nix
@@ -18,7 +18,7 @@
   xfceSupport ? true,
   mateSupport ? true,
   gtk3,
-  mate,
+  marco,
   gtkNextSupport ? false,
   plankSupport ? false,
   steamSupport ? false,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals mateSupport [
     gtk3
-    mate.marco
+    marco
   ]
   ++ lib.optional telegramSupport zip;
 
diff --git a/pkgs/by-name/th/themechanger/package.nix b/pkgs/by-name/th/themechanger/package.nix
index 130bb9ef0ff3..9f35e962288a 100644
--- a/pkgs/by-name/th/themechanger/package.nix
+++ b/pkgs/by-name/th/themechanger/package.nix
@@ -10,7 +10,8 @@
   glib,
   gnome,
   gtk3,
-  mate,
+  mate-desktop,
+  mate-settings-daemon,
   python3,
   gsettings-desktop-schemas,
   python3Packages,
@@ -44,8 +45,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
     glib
     gnome.nixos-gsettings-overrides
     gtk3
-    mate.mate-desktop
-    mate.mate-settings-daemon
+    mate-desktop
+    mate-settings-daemon
     python3
     gsettings-desktop-schemas
   ];
diff --git a/pkgs/by-name/xa/xapp/package.nix b/pkgs/by-name/xa/xapp/package.nix
index c18b94a9f468..f22a5048769f 100644
--- a/pkgs/by-name/xa/xapp/package.nix
+++ b/pkgs/by-name/xa/xapp/package.nix
@@ -17,7 +17,7 @@
   wrapGAppsHook3,
   file,
   inxi,
-  mate,
+  mate-panel,
   dbus,
   libdbusmenu-gtk3,
 }:
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     gdk-pixbuf
     libxkbfile
     python3.pkgs.pygobject3 # for .pc file
-    mate.mate-panel # for gobject-introspection
+    mate-panel # for gobject-introspection
     dbus
     libdbusmenu-gtk3
   ];
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
index ca9dc42fcfce..5fcaf5502746 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
@@ -10,7 +10,7 @@
   glib,
   gtk3,
   gsettings-desktop-schemas,
-  mate,
+  mate-desktop,
   xapp,
   xdg-desktop-portal,
 }:
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtk3
     gsettings-desktop-schemas # org.gnome.system.location
-    mate.mate-desktop # org.mate.background
+    mate-desktop # org.mate.background
     xapp # org.x.apps.portal
     xdg-desktop-portal
   ];
diff --git a/pkgs/by-name/xm/xmonad_log_applet/package.nix b/pkgs/by-name/xm/xmonad_log_applet/package.nix
index 35ee0988a8f2..6a134e91ebe5 100644
--- a/pkgs/by-name/xm/xmonad_log_applet/package.nix
+++ b/pkgs/by-name/xm/xmonad_log_applet/package.nix
@@ -11,7 +11,7 @@
   gtk2,
   gtk3,
   gnome-panel,
-  mate,
+  mate-panel,
   libxfce4util,
   xfce4-panel,
 }:
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals (desktopSupport == "mate") [
     gtk3
-    mate.mate-panel
+    mate-panel
   ]
   ++ lib.optionals (desktopSupport == "xfce4") [
     gtk2