21 files changed, 101 insertions, 100 deletions
diff --git a/Makefile.in b/Makefile.in
index 02d1a19..fb7cfd0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -164,8 +164,6 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-MATE_CFLAGS = @MATE_CFLAGS@
-MATE_LIBS = @MATE_LIBS@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -197,6 +195,8 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MATE_CFLAGS = @MATE_CFLAGS@
+MATE_LIBS = @MATE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
diff --git a/help/Makefile.in b/help/Makefile.in
index 57c1579..fd92608 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -110,8 +110,6 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-MATE_CFLAGS = @MATE_CFLAGS@
-MATE_LIBS = @MATE_LIBS@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -143,6 +141,8 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MATE_CFLAGS = @MATE_CFLAGS@
+MATE_LIBS = @MATE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -343,7 +343,7 @@ _clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
 _clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
 _clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
 _doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
-DOC_MODULE = sensors-applet
+DOC_MODULE = mate-sensors-applet
 DOC_ENTITIES = legal.xml
 DOC_FIGURES = figures/applet_in_panel.png
 DOC_INCLUDES = 
diff --git a/lib/Makefile.in b/lib/Makefile.in
index de17c5c..6d2c7b9 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -132,8 +132,6 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-MATE_CFLAGS = @MATE_CFLAGS@
-MATE_LIBS = @MATE_LIBS@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -165,6 +163,8 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MATE_CFLAGS = @MATE_CFLAGS@
+MATE_LIBS = @MATE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
diff --git a/pixmaps/Makefile.in b/pixmaps/Makefile.in
index 9631ba5..3fe69a0 100644
--- a/pixmaps/Makefile.in
+++ b/pixmaps/Makefile.in
@@ -110,8 +110,6 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-MATE_CFLAGS = @MATE_CFLAGS@
-MATE_LIBS = @MATE_LIBS@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -143,6 +141,8 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MATE_CFLAGS = @MATE_CFLAGS@
+MATE_LIBS = @MATE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -233,7 +233,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-pixmapsdir = $(datadir)/pixmaps/sensors-applet
+pixmapsdir = $(datadir)/pixmaps/mate-sensors-applet
 pixmaps_DATA = \
 very-low-temp-icon.png \
 low-temp-icon.png \
@@ -243,17 +243,17 @@ pixmaps_DATA = \
 
 deviceiconsdir = $(datadir)/icons/hicolor/22x22/devices
 deviceicons_DATA = \
- sensors-applet-battery.png \
- sensors-applet-case.png \
- sensors-applet-chip.png \
- sensors-applet-cpu.png \
- sensors-applet-gpu.png \
- sensors-applet-fan.png \
- sensors-applet-drive-harddisk.png \
- sensors-applet-memory.png
+ mate-sensors-applet-battery.png \
+ mate-sensors-applet-case.png \
+ mate-sensors-applet-chip.png \
+ mate-sensors-applet-cpu.png \
+ mate-sensors-applet-gpu.png \
+ mate-sensors-applet-fan.png \
+ mate-sensors-applet-drive-harddisk.png \
+ mate-sensors-applet-memory.png
 
 appicondir = $(datadir)/icons/hicolor/48x48/apps
-appicon_DATA = sensors-applet.png
+appicon_DATA = mate-sensors-applet.png
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 EXTRA_DIST = \
 $(pixmaps_DATA) \
diff --git a/plugins/Makefile.in b/plugins/Makefile.in
index c754515..0b2ffdd 100644
--- a/plugins/Makefile.in
+++ b/plugins/Makefile.in
@@ -129,8 +129,6 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-MATE_CFLAGS = @MATE_CFLAGS@
-MATE_LIBS = @MATE_LIBS@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -162,6 +160,8 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MATE_CFLAGS = @MATE_CFLAGS@
+MATE_LIBS = @MATE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
diff --git a/plugins/acpi/Makefile.in b/plugins/acpi/Makefile.in
index 5887772..6fcfe10 100644
--- a/plugins/acpi/Makefile.in
+++ b/plugins/acpi/Makefile.in
@@ -68,7 +68,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(plugindir)"
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libacpi_la_DEPENDENCIES = \
- $(top_builddir)/lib/libsensors-applet-plugin.la
+ $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 am_libacpi_la_OBJECTS = acpi-plugin.lo
 libacpi_la_OBJECTS = $(am_libacpi_la_OBJECTS)
 libacpi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -131,8 +131,6 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-MATE_CFLAGS = @MATE_CFLAGS@
-MATE_LIBS = @MATE_LIBS@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -164,6 +162,8 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MATE_CFLAGS = @MATE_CFLAGS@
+MATE_LIBS = @MATE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -256,7 +256,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # ACPI plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
 -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \
@@ -273,7 +273,7 @@ libacpi_la_SOURCES = \
 acpi-plugin.c
 
 libacpi_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS)
-libacpi_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libacpi_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 all: all-am
 
 .SUFFIXES:
diff --git a/plugins/aticonfig/Makefile.in b/plugins/aticonfig/Makefile.in
index 6dc1f0a..17f60aa 100644
--- a/plugins/aticonfig/Makefile.in
+++ b/plugins/aticonfig/Makefile.in
@@ -68,7 +68,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(plugindir)"
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libaticonfig_la_DEPENDENCIES = \
- $(top_builddir)/lib/libsensors-applet-plugin.la
+ $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 am_libaticonfig_la_OBJECTS = aticonfig-plugin.lo
 libaticonfig_la_OBJECTS = $(am_libaticonfig_la_OBJECTS)
 libaticonfig_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -131,8 +131,6 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-MATE_CFLAGS = @MATE_CFLAGS@
-MATE_LIBS = @MATE_LIBS@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -164,6 +162,8 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MATE_CFLAGS = @MATE_CFLAGS@
+MATE_LIBS = @MATE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -256,7 +256,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # ATICONFIG plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
 -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \
@@ -273,7 +273,7 @@ libaticonfig_la_SOURCES = \
 aticonfig-plugin.c
 
 libaticonfig_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS) 
-libaticonfig_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libaticonfig_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 all: all-am
 
 .SUFFIXES:
diff --git a/plugins/eee/Makefile.in b/plugins/eee/Makefile.in
index cd59e8a..bcad96a 100644
--- a/plugins/eee/Makefile.in
+++ b/plugins/eee/Makefile.in
@@ -68,7 +68,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(plugindir)"
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libeee_la_DEPENDENCIES = \
- $(top_builddir)/lib/libsensors-applet-plugin.la
+ $(top_builddir)/lib/libmatesensors-applet-plugin.la
 am_libeee_la_OBJECTS = eee-plugin.lo
 libeee_la_OBJECTS = $(am_libeee_la_OBJECTS)
 libeee_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -131,8 +131,6 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-MATE_CFLAGS = @MATE_CFLAGS@
-MATE_LIBS = @MATE_LIBS@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -164,6 +162,8 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MATE_CFLAGS = @MATE_CFLAGS@
+MATE_LIBS = @MATE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -256,7 +256,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # ACPI plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
 -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \
@@ -273,7 +273,7 @@ libeee_la_SOURCES = \
 eee-plugin.c
 
 libeee_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS)
-libeee_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libeee_la_LIBADD = $(top_builddir)/lib/libmatesensors-applet-plugin.la
 all: all-am
 
 .SUFFIXES:
diff --git a/plugins/hddtemp/Makefile.in b/plugins/hddtemp/Makefile.in
index 4ebbd38..518cea3 100644
--- a/plugins/hddtemp/Makefile.in
+++ b/plugins/hddtemp/Makefile.in
@@ -68,7 +68,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(plugindir)"
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libhddtemp_la_DEPENDENCIES = \
- $(top_builddir)/lib/libsensors-applet-plugin.la
+ $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 am_libhddtemp_la_OBJECTS = hddtemp-plugin.lo
 libhddtemp_la_OBJECTS = $(am_libhddtemp_la_OBJECTS)
 libhddtemp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -131,8 +131,6 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-MATE_CFLAGS = @MATE_CFLAGS@
-MATE_LIBS = @MATE_LIBS@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -164,6 +162,8 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MATE_CFLAGS = @MATE_CFLAGS@
+MATE_LIBS = @MATE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -256,7 +256,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # HDDTEMP plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
 -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \
@@ -273,7 +273,7 @@ libhddtemp_la_SOURCES = \
 hddtemp-plugin.c
 
 libhddtemp_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS)
-libhddtemp_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libhddtemp_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 all: all-am
 
 .SUFFIXES:
diff --git a/plugins/i2c-proc/Makefile.in b/plugins/i2c-proc/Makefile.in
index 94bbdaa..5141892 100644
--- a/plugins/i2c-proc/Makefile.in
+++ b/plugins/i2c-proc/Makefile.in
@@ -68,7 +68,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(plugindir)"
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libi2c_proc_la_DEPENDENCIES = \
- $(top_builddir)/lib/libsensors-applet-plugin.la
+ $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 am_libi2c_proc_la_OBJECTS = i2c-proc-plugin.lo
 libi2c_proc_la_OBJECTS = $(am_libi2c_proc_la_OBJECTS)
 libi2c_proc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -131,8 +131,6 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-MATE_CFLAGS = @MATE_CFLAGS@
-MATE_LIBS = @MATE_LIBS@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -164,6 +162,8 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MATE_CFLAGS = @MATE_CFLAGS@
+MATE_LIBS = @MATE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -256,7 +256,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # I2C-PROC plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
 -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \
@@ -273,7 +273,7 @@ libi2c_proc_la_SOURCES = \
 i2c-proc-plugin.c
 
 libi2c_proc_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS)
-libi2c_proc_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libi2c_proc_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 all: all-am
 
 .SUFFIXES:
diff --git a/plugins/i2c-sys/Makefile.in b/plugins/i2c-sys/Makefile.in
index f609513..a96b947 100644
--- a/plugins/i2c-sys/Makefile.in
+++ b/plugins/i2c-sys/Makefile.in
@@ -68,7 +68,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(plugindir)"
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libi2c_sys_la_DEPENDENCIES = \
- $(top_builddir)/lib/libsensors-applet-plugin.la
+ $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 am_libi2c_sys_la_OBJECTS = i2c-sys-plugin.lo
 libi2c_sys_la_OBJECTS = $(am_libi2c_sys_la_OBJECTS)
 libi2c_sys_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -131,8 +131,6 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-MATE_CFLAGS = @MATE_CFLAGS@
-MATE_LIBS = @MATE_LIBS@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -164,6 +162,8 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MATE_CFLAGS = @MATE_CFLAGS@
+MATE_LIBS = @MATE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -256,7 +256,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # I2C-SYS plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
 -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \
@@ -273,7 +273,7 @@ libi2c_sys_la_SOURCES = \
 i2c-sys-plugin.c
 
 libi2c_sys_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS)
-libi2c_sys_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libi2c_sys_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 all: all-am
 
 .SUFFIXES:
diff --git a/plugins/i8k/Makefile.in b/plugins/i8k/Makefile.in
index 781dd08..a30a3b6 100644
--- a/plugins/i8k/Makefile.in
+++ b/plugins/i8k/Makefile.in
@@ -68,7 +68,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(plugindir)"
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libi8k_la_DEPENDENCIES = \
- $(top_builddir)/lib/libsensors-applet-plugin.la
+ $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 am_libi8k_la_OBJECTS = i8k-plugin.lo
 libi8k_la_OBJECTS = $(am_libi8k_la_OBJECTS)
 libi8k_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -131,8 +131,6 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-MATE_CFLAGS = @MATE_CFLAGS@
-MATE_LIBS = @MATE_LIBS@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -164,6 +162,8 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MATE_CFLAGS = @MATE_CFLAGS@
+MATE_LIBS = @MATE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -256,7 +256,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # I8K plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
 -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \
@@ -273,7 +273,7 @@ libi8k_la_SOURCES = \
 i8k-plugin.c
 
 libi8k_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS)
-libi8k_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libi8k_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 all: all-am
 
 .SUFFIXES:
diff --git a/plugins/ibm-acpi/Makefile.in b/plugins/ibm-acpi/Makefile.in
index 184f25b..e15409e 100644
--- a/plugins/ibm-acpi/Makefile.in
+++ b/plugins/ibm-acpi/Makefile.in
@@ -68,7 +68,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(plugindir)"
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libibm_acpi_la_DEPENDENCIES = \
- $(top_builddir)/lib/libsensors-applet-plugin.la
+ $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 am_libibm_acpi_la_OBJECTS = ibm-acpi-plugin.lo
 libibm_acpi_la_OBJECTS = $(am_libibm_acpi_la_OBJECTS)
 libibm_acpi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -131,8 +131,6 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-MATE_CFLAGS = @MATE_CFLAGS@
-MATE_LIBS = @MATE_LIBS@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -164,6 +162,8 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MATE_CFLAGS = @MATE_CFLAGS@
+MATE_LIBS = @MATE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -256,7 +256,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # IBM-ACPI plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
 -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \
@@ -273,7 +273,7 @@ libibm_acpi_la_SOURCES = \
 ibm-acpi-plugin.c
 
 libibm_acpi_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS)
-libibm_acpi_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libibm_acpi_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 all: all-am
 
 .SUFFIXES:
diff --git a/plugins/libsensors/Makefile.in b/plugins/libsensors/Makefile.in
index dbc77bc..12386e8 100644
--- a/plugins/libsensors/Makefile.in
+++ b/plugins/libsensors/Makefile.in
@@ -68,7 +68,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(plugindir)"
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 liblibsensors_la_DEPENDENCIES = \
- $(top_builddir)/lib/libsensors-applet-plugin.la
+ $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 am_liblibsensors_la_OBJECTS = libsensors-plugin.lo
 liblibsensors_la_OBJECTS = $(am_liblibsensors_la_OBJECTS)
 liblibsensors_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -131,8 +131,6 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-MATE_CFLAGS = @MATE_CFLAGS@
-MATE_LIBS = @MATE_LIBS@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -164,6 +162,8 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MATE_CFLAGS = @MATE_CFLAGS@
+MATE_LIBS = @MATE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -254,7 +254,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 
 # libsensors plugin
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
@@ -273,7 +273,7 @@ liblibsensors_la_SOURCES = \
 libsensors-plugin.c
 
 liblibsensors_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS) $(LIBSENSORS_LIBS)
-liblibsensors_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+liblibsensors_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 all: all-am
 
 .SUFFIXES:
diff --git a/plugins/nvidia/Makefile.in b/plugins/nvidia/Makefile.in
index 5c9803f..6c50794 100644
--- a/plugins/nvidia/Makefile.in
+++ b/plugins/nvidia/Makefile.in
@@ -68,7 +68,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(plugindir)"
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libnvidia_la_DEPENDENCIES = \
- $(top_builddir)/lib/libsensors-applet-plugin.la
+ $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 am_libnvidia_la_OBJECTS = nvidia-plugin.lo
 libnvidia_la_OBJECTS = $(am_libnvidia_la_OBJECTS)
 libnvidia_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -131,8 +131,6 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-MATE_CFLAGS = @MATE_CFLAGS@
-MATE_LIBS = @MATE_LIBS@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -164,6 +162,8 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MATE_CFLAGS = @MATE_CFLAGS@
+MATE_LIBS = @MATE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -256,7 +256,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # NVIDIA plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
 -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \
@@ -273,7 +273,7 @@ libnvidia_la_SOURCES = \
 nvidia-plugin.c
 
 libnvidia_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS) $(NVIDIA_LIBS)
-libnvidia_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libnvidia_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 all: all-am
 
 .SUFFIXES:
diff --git a/plugins/omnibook/Makefile.in b/plugins/omnibook/Makefile.in
index b73d7d5..6b026a7 100644
--- a/plugins/omnibook/Makefile.in
+++ b/plugins/omnibook/Makefile.in
@@ -68,7 +68,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(plugindir)"
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libomnibook_la_DEPENDENCIES = \
- $(top_builddir)/lib/libsensors-applet-plugin.la
+ $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 am_libomnibook_la_OBJECTS = omnibook-plugin.lo
 libomnibook_la_OBJECTS = $(am_libomnibook_la_OBJECTS)
 libomnibook_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -131,8 +131,6 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-MATE_CFLAGS = @MATE_CFLAGS@
-MATE_LIBS = @MATE_LIBS@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -164,6 +162,8 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MATE_CFLAGS = @MATE_CFLAGS@
+MATE_LIBS = @MATE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -256,7 +256,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # OMNIBOOK plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
 -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \
@@ -273,7 +273,7 @@ libomnibook_la_SOURCES = \
 omnibook-plugin.c
 
 libomnibook_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS)
-libomnibook_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libomnibook_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 all: all-am
 
 .SUFFIXES:
diff --git a/plugins/pmu-sys/Makefile.in b/plugins/pmu-sys/Makefile.in
index 3998330..4d9736d 100644
--- a/plugins/pmu-sys/Makefile.in
+++ b/plugins/pmu-sys/Makefile.in
@@ -68,7 +68,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(plugindir)"
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libpmu_sys_la_DEPENDENCIES = \
- $(top_builddir)/lib/libsensors-applet-plugin.la
+ $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 am_libpmu_sys_la_OBJECTS = pmu-sys-plugin.lo
 libpmu_sys_la_OBJECTS = $(am_libpmu_sys_la_OBJECTS)
 libpmu_sys_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -131,8 +131,6 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-MATE_CFLAGS = @MATE_CFLAGS@
-MATE_LIBS = @MATE_LIBS@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -164,6 +162,8 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MATE_CFLAGS = @MATE_CFLAGS@
+MATE_LIBS = @MATE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -256,7 +256,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # PMU-SYS plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
 -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \
@@ -273,7 +273,7 @@ libpmu_sys_la_SOURCES = \
 pmu-sys-plugin.c
 
 libpmu_sys_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS)
-libpmu_sys_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libpmu_sys_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 all: all-am
 
 .SUFFIXES:
diff --git a/plugins/smu-sys/Makefile.in b/plugins/smu-sys/Makefile.in
index f8e600b..b467316 100644
--- a/plugins/smu-sys/Makefile.in
+++ b/plugins/smu-sys/Makefile.in
@@ -68,7 +68,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(plugindir)"
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libsmu_sys_la_DEPENDENCIES = \
- $(top_builddir)/lib/libsensors-applet-plugin.la
+ $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 am_libsmu_sys_la_OBJECTS = smu-sys-plugin.lo
 libsmu_sys_la_OBJECTS = $(am_libsmu_sys_la_OBJECTS)
 libsmu_sys_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -131,8 +131,6 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-MATE_CFLAGS = @MATE_CFLAGS@
-MATE_LIBS = @MATE_LIBS@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -164,6 +162,8 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MATE_CFLAGS = @MATE_CFLAGS@
+MATE_LIBS = @MATE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -256,7 +256,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # SMU-SYS plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
 -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \
@@ -273,7 +273,7 @@ libsmu_sys_la_SOURCES = \
 smu-sys-plugin.c
 
 libsmu_sys_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS)
-libsmu_sys_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libsmu_sys_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 all: all-am
 
 .SUFFIXES:
diff --git a/plugins/sonypi/Makefile.in b/plugins/sonypi/Makefile.in
index 31a022e..160d85b 100644
--- a/plugins/sonypi/Makefile.in
+++ b/plugins/sonypi/Makefile.in
@@ -68,7 +68,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(plugindir)"
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libsonypi_la_DEPENDENCIES = \
- $(top_builddir)/lib/libsensors-applet-plugin.la
+ $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 am_libsonypi_la_OBJECTS = sonypi-plugin.lo
 libsonypi_la_OBJECTS = $(am_libsonypi_la_OBJECTS)
 libsonypi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -131,8 +131,6 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-MATE_CFLAGS = @MATE_CFLAGS@
-MATE_LIBS = @MATE_LIBS@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -164,6 +162,8 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MATE_CFLAGS = @MATE_CFLAGS@
+MATE_LIBS = @MATE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -256,7 +256,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # SONYPI plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
 -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \
@@ -273,7 +273,7 @@ libsonypi_la_SOURCES = \
 sonypi-plugin.c
 
 libsonypi_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS)
-libsonypi_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libsonypi_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 all: all-am
 
 .SUFFIXES:
diff --git a/plugins/udisks/Makefile.in b/plugins/udisks/Makefile.in
index db2e3a4..c15f512 100644
--- a/plugins/udisks/Makefile.in
+++ b/plugins/udisks/Makefile.in
@@ -68,7 +68,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(plugindir)"
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libudisks_la_DEPENDENCIES = \
- $(top_builddir)/lib/libsensors-applet-plugin.la
+ $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 am_libudisks_la_OBJECTS = udisks-plugin.lo
 libudisks_la_OBJECTS = $(am_libudisks_la_OBJECTS)
 libudisks_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -131,8 +131,6 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-MATE_CFLAGS = @MATE_CFLAGS@
-MATE_LIBS = @MATE_LIBS@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -164,6 +162,8 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MATE_CFLAGS = @MATE_CFLAGS@
+MATE_LIBS = @MATE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -256,7 +256,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # UDisks plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
 -DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \
@@ -273,7 +273,7 @@ libudisks_la_SOURCES = \
 udisks-plugin.c
 
 libudisks_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(DBUSGLIB_LIBS) $(LIBATASMART_LIBS)
-libudisks_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libudisks_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
 all: all-am
 
 .SUFFIXES:
diff --git a/sensors-applet/Makefile.in b/sensors-applet/Makefile.in
index e69178a..27d3593 100644
--- a/sensors-applet/Makefile.in
+++ b/sensors-applet/Makefile.in
@@ -56,7 +56,8 @@ am__sensors_applet_SOURCES_DIST = main.c about-dialog.c about-dialog.h \
 sensors-applet-plugins.c sensors-applet-plugins.h \
 sensors-applet-mateconf.c sensors-applet-mateconf.h \
 active-sensor-libmatenotify.c active-sensor-libmatenotify.h
-@LIBMATENOTIFY_TRUE@am__objects_1 = active-sensor-libmatenotify.$(OBJEXT)
+@LIBMATENOTIFY_TRUE@am__objects_1 = \
+@LIBMATENOTIFY_TRUE@ active-sensor-libmatenotify.$(OBJEXT)
 am_sensors_applet_OBJECTS = main.$(OBJEXT) about-dialog.$(OBJEXT) \
 active-sensor.$(OBJEXT) prefs-dialog.$(OBJEXT) \
 sensor-config-dialog.$(OBJEXT) sensors-applet.$(OBJEXT) \
@@ -143,8 +144,6 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-MATE_CFLAGS = @MATE_CFLAGS@
-MATE_LIBS = @MATE_LIBS@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -176,6 +175,8 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MATE_CFLAGS = @MATE_CFLAGS@
+MATE_LIBS = @MATE_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -302,7 +303,7 @@ sensors_applet_SOURCES = main.c \
 
 # install headers for plugins to use
 INST_H_FILES = sensors-applet-plugin.h sensors-applet-sensor.h
-headerdir = $(prefix)/include/sensors-applet
+headerdir = $(prefix)/include/mate-sensors-applet
 header_DATA = $(INST_H_FILES)
 
 # since it is separate