3 files changed, 6 insertions, 6 deletions
diff --git a/drivemount/Makefile.am b/drivemount/Makefile.am
index ef482faf..b2e99df5 100644
--- a/drivemount/Makefile.am
+++ b/drivemount/Makefile.am
@@ -7,16 +7,16 @@ AM_CPPFLAGS = \
 $(MATE_APPLETS4_CFLAGS) \
 $(MATEDESKTOP_CFLAGS)
 
-libexec_PROGRAMS = drivemount_applet2
+libexec_PROGRAMS = drivemount-applet
 
-drivemount_applet2_SOURCES = \
+drivemount_applet_SOURCES = \
 drivemount.c \
 drive-list.c \
 drive-list.h \
 drive-button.c \
 drive-button.h
 
-drivemount_applet2_LDADD = \
+drivemount_applet_LDADD = \
 $(MATE_APPLETS4_LIBS) \
 $(MATEDESKTOP_LIBS)
 
@@ -42,7 +42,7 @@ org.mate.panel.applet.DriveMountAppletFactory.service: $(service_in_files)
 -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
 $< > $@
 
-uidir = $(datadir)/mate-2.0/ui
+uidir = $(datadir)/mate/ui
 ui_DATA = drivemount-applet-menu.xml
 
 CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
diff --git a/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in b/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in
index 376c9447..2cff60f5 100644
--- a/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in
+++ b/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in
@@ -1,6 +1,6 @@
 [Applet Factory]
 Id=DriveMountAppletFactory
-Location=@LIBEXECDIR@/drivemount_applet2
+Location=@LIBEXECDIR@/drivemount-applet
 _Name=Drive Mount Applet Factory
 _Description=Factory for drive mount applet
 
diff --git a/drivemount/org.mate.panel.applet.DriveMountAppletFactory.service.in b/drivemount/org.mate.panel.applet.DriveMountAppletFactory.service.in
index 454d0a1f..898c4f09 100644
--- a/drivemount/org.mate.panel.applet.DriveMountAppletFactory.service.in
+++ b/drivemount/org.mate.panel.applet.DriveMountAppletFactory.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.mate.panel.applet.DriveMountAppletFactory
-Exec=@LIBEXECDIR@/drivemount_applet2
+Exec=@LIBEXECDIR@/drivemount-applet