4 files changed, 16 insertions, 16 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index d92ab8c..b93b554 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
-uidir = $(datadir)/gcalctool
+uidir = $(datadir)/mate-calc
 ui_DATA = \
 	preferences.ui \
 	buttons-basic.ui \
@@ -6,20 +6,20 @@ ui_DATA = \
 	buttons-financial.ui \
 	buttons-programming.ui
 
-gsettings_SCHEMAS = org.mate.gcalctool.gschema.xml
+gsettings_SCHEMAS = org.mate.mate-calc.gschema.xml
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 Utilitiesdir = $(datadir)/applications
-Utilities_in_files = gcalctool.desktop.in
+Utilities_in_files = mate-calc.desktop.in
 Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-man1_MANS = gcalctool.1
+man1_MANS = mate-calc.1
 
-EXTRA_DIST = $(ui_DATA) org.mate.gcalctool.gschema.xml.in gcalctool.desktop.in $(man1_MANS)
+EXTRA_DIST = $(ui_DATA) org.mate.mate-calc.gschema.xml.in mate-calc.desktop.in $(man1_MANS)
 
 DISTCLEANFILES = \
 	Makefile.in \
-	gcalctool.desktop \
+	mate-calc.desktop \
 	$(gsettings_SCHEMAS)
diff --git a/data/gcalctool.1 b/data/mate-calc.1
index 0b384b3..88d8f35 100644
--- a/data/gcalctool.1
+++ b/data/mate-calc.1
@@ -1,14 +1,14 @@
 .\" Copyright (c) 1987-2008 - Sun Microsystems, Inc.
-.TH GCALCTOOL 1 "17 June 2009"
+.TH MATE_CALC 1 "17 June 2009"
 .SH NAME
-gcalctool \- a desktop calculator
+mate-calc \- a desktop calculator
 .SH SYNOPSIS
-.B gcalctool
+.B mate-calc
 [
 .I OPTION
 ] ...
 .SH DESCRIPTION
-.B gcalctool
+.B mate-calc
 is the official calculator of the MATE desktop environment.
 .SH OPTIONS
 .TP
@@ -26,8 +26,8 @@ Prints the command line options.
 .SH FILES
 .PD 0
 .TP 18
-.B ~/.gcalctoolrc
-user's personal gcalctool resources for customizing the appearance and color of
-.B gcalctool
+.B ~/.mate-calcrc
+user's personal mate-calc resources for customizing the appearance and color of
+.B mate-calc
 .sp
 .LP
diff --git a/data/gcalctool.desktop.in b/data/mate-calc.desktop.in
index c23b8ac..dd2de5c 100644
--- a/data/gcalctool.desktop.in
+++ b/data/mate-calc.desktop.in
@@ -1,15 +1,15 @@
 [Desktop Entry]
 _Name=Calculator
 _Comment=Perform arithmetic, scientific or financial calculations
-Exec=gcalctool
+Exec=mate-calc
 Icon=accessories-calculator
 NotShowIn=KDE;
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=MATE;GTK;Utility;Calculator
-X-MATE-DocPath=gcalctool/gcalctool.xml
+X-MATE-DocPath=mate-calc/mate-calc.xml
 X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=gcalctool
+X-MATE-Bugzilla-Product=mate-calc
 X-MATE-Bugzilla-Component=general
 X-MATE-Bugzilla-OtherBinaries=mate-calculator
diff --git a/data/org.mate.gcalctool.gschema.xml.in b/data/org.mate.mate-calc.gschema.xml.in
index 8a11a2c..8a11a2c 100644
--- a/data/org.mate.gcalctool.gschema.xml.in
+++ b/data/org.mate.mate-calc.gschema.xml.in