diff --git a/packages/linux_make/Makefile b/packages/linux_make/Makefile
index 2eb5539b5be804f7a02b1b04905001aefceaa410..0d91750a5e230338ab1b964f937687b733c8c3e7 100644
--- a/packages/linux_make/Makefile
+++ b/packages/linux_make/Makefile
@@ -106,7 +106,7 @@ deb: $(bindir)
 #	install -p -m0644 $(packages_src)/linux_make/pd-48x48.png \
 #		$(DESTDIR)/usr/share/icons/hicolor/48x48/apps/pd-l2ork.png
 	install -d $(DESTDIR)/usr/share/icons/hicolor/128x128/mimetypes
-	install -p -m0644 $(packages_src)/linux_make/text-x-puredata.png \
+	install -p -m0644 $(packages_src)/linux_make/text-x-pd-l2ork.png \
 		$(DESTDIR)/usr/share/icons/hicolor/128x128/mimetypes
 	install -d $(DESTDIR)/usr/share/applications/ 
 	install -p -m0644 $(packages_src)/linux_make/pd-l2ork.desktop \
@@ -140,7 +140,7 @@ deb: $(bindir)
 	install -p $(packages_src)/linux_make/pd-l2ork.gif $(DESTDIR)$(libpddir)
 # emacs mode for .pd files
 	install -d $(DESTDIR)/usr/share/emacs/site-lisp/
-	install -p -m0644 $(scripts_src)/pd-mode.el \
+	install -p -m0644 $(scripts_src)/pd-l2ork-mode.el \
 		$(DESTDIR)/usr/share/emacs/site-lisp/
 # Pd-related scripts
 	#install -p $(scripts_src)/pd-diff $(DESTDIR)$(bindir)
@@ -193,7 +193,7 @@ installer_settings:
 #	install -p -m0644 $(packages_src)/linux_make/pd-48x48.png \
 #		$(DESTDIR)/usr/share/icons/hicolor/48x48/apps/pd-l2ork.png
 #	install -d $(DESTDIR)/usr/share/icons/hicolor/128x128/mimetypes
-#	install -p -m0644 $(packages_src)/linux_make/text-x-puredata.png \
+#	install -p -m0644 $(packages_src)/linux_make/text-x-pd-l2ork.png \
 #		$(DESTDIR)/usr/share/icons/hicolor/128x128/mimetypes
 #	install -d $(DESTDIR)/usr/share/applications/ 
 #	install -p -m0644 $(packages_src)/linux_make/pd-l2ork.desktop \
@@ -208,7 +208,7 @@ installer_makefile:
 	cp -f $(packages_src)/linux_make/pd-l2ork-red.png $(DESTDIR)$(libpddir)
 	cp -f $(packages_src)/linux_make/pd-l2ork-k12.png $(DESTDIR)$(libpddir)
 	cp -f $(packages_src)/linux_make/pd-l2ork-k12-red.png $(DESTDIR)$(libpddir)
-	cp -f $(packages_src)/linux_make/text-x-puredata.png $(DESTDIR)$(libpddir)
+	cp -f $(packages_src)/linux_make/text-x-pd-l2ork.png $(DESTDIR)$(libpddir)
 	cp -f $(packages_src)/linux_make/pd-l2ork.desktop $(DESTDIR)$(libpddir)
 	cp -f $(packages_src)/linux_make/pd-l2ork-k12.desktop $(DESTDIR)$(libpddir)
 	cp -f $(packages_src)/linux_make/pd-l2ork-debug.desktop $(DESTDIR)$(libpddir)
diff --git a/packages/linux_make/generate_install_makefile.bash b/packages/linux_make/generate_install_makefile.bash
index 7c66e69e87bbfd42387a785cb4133560f76f20cb..5c84cf295f7ae6a5e6ffc709e5f0dd5e14707fd7 100755
--- a/packages/linux_make/generate_install_makefile.bash
+++ b/packages/linux_make/generate_install_makefile.bash
@@ -28,7 +28,7 @@ function post_install ()
 	echo -e "\tcp -f /usr/local/lib/pd-l2ork/pd-l2ork-red.png /usr/share/icons/hicolor/128x128/apps/"
 	echo -e "\tcp -f /usr/local/lib/pd-l2ork/pd-l2ork-k12.png /usr/share/icons/hicolor/128x128/apps/"
 	echo -e "\tcp -f /usr/local/lib/pd-l2ork/pd-l2ork-k12-red.png /usr/share/icons/hicolor/128x128/apps/"
-	echo -e "\tcp -f /usr/local/lib/pd-l2ork/text-x-puredata.png /usr/share/icons/hicolor/128x128/mimetypes"
+	echo -e "\tcp -f /usr/local/lib/pd-l2ork/text-x-pd-l2ork.png /usr/share/icons/hicolor/128x128/mimetypes"
 	echo -e "\tcp -f /usr/local/lib/pd-l2ork/pd-l2ork.desktop /usr/share/applications/"
 	echo -e "\tcp -f /usr/local/lib/pd-l2ork/pd-l2ork-k12.desktop /usr/share/applications/"
 	echo -e "\tcp -f /usr/local/lib/pd-l2ork/pd-l2ork-debug.desktop /usr/share/applications/"
@@ -43,7 +43,7 @@ function post_remove ()
 	echo -e "\trm -f /usr/share/icons/hicolor/128x128/apps/pd-l2ork-red.png"
 	echo -e "\trm -f /usr/share/icons/hicolor/128x128/apps/pd-l2ork-k12.png"
 	echo -e "\trm -f /usr/share/icons/hicolor/128x128/apps/pd-l2ork-k12-red.png"
-	echo -e "\trm -f /usr/share/icons/hicolor/128x128/mimetypes/text-x-puredata.png"
+	echo -e "\trm -f /usr/share/icons/hicolor/128x128/mimetypes/text-x-pd-l2ork.png"
 	echo -e "\trm -f /usr/share/applications/pd-l2ork.desktop"
 	echo -e "\trm -f /usr/share/applications/pd-l2ork-k12.desktop"
 	echo -e "\trm -f /usr/share/applications/pd-l2ork-debug.desktop"
diff --git a/packages/linux_make/pd-l2ork.xml b/packages/linux_make/pd-l2ork.xml
index 51a5d54d1084a3d2d963a57dc75ceecb689c9590..f0057a1dee68484831db3abae2650d337c360364 100644
--- a/packages/linux_make/pd-l2ork.xml
+++ b/packages/linux_make/pd-l2ork.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="text/x-puredata">
+  <mime-type type="text/x-pd-l2ork">
     <sub-class-of type="text/plain"/>
     <glob pattern="*.pd"/>
-	<alias type="application/x-puredata"/>
+	<alias type="application/x-pd-l2ork"/>
 	<magic priority="50">
 	  <match type="string" value="#N " offset="0"/>
 	</magic>
@@ -24,22 +24,22 @@
 	<comment xml:lang="tr">Pure Data Belgesi</comment>
 	<comment xml:lang="ru">Документ Pure Data</comment>
   </mime-type>
-  <mime-type type="text/x-puredata-help">
-    <sub-class-of type="text/x-puredata"/>
+  <mime-type type="text/x-pd-l2ork-help">
+    <sub-class-of type="text/x-pd-l2ork"/>
     <glob pattern="*-help.pd"/>
     <comment>Pure Data Help</comment>
   </mime-type>
-  <mime-type type="text/x-puredata-meta">
-    <sub-class-of type="text/x-puredata"/>
+  <mime-type type="text/x-pd-l2ork-meta">
+    <sub-class-of type="text/x-pd-l2ork"/>
     <glob pattern="*-meta.pd"/>
     <comment>Pure Data Meta Marker for Libraries</comment>
   </mime-type>
-  <mime-type type="application/x-puredata-external-linux">
+  <mime-type type="application/x-pd-l2ork-external-linux">
     <sub-class-of type="application/octet-stream"/>
     <glob pattern="*.pd_linux"/>
     <comment>Pure Data External (Linux Binary)</comment>
   </mime-type>
-  <mime-type type="application/x-puredata-external-darwin">
+  <mime-type type="application/x-pd-l2ork-external-darwin">
     <sub-class-of type="application/octet-stream"/>
     <glob pattern="*.pd_darwin"/>
     <comment>Pure Data External (Mac OS X Binary)</comment>
diff --git a/packages/linux_make/text-x-puredata.png b/packages/linux_make/text-x-puredata.png
deleted file mode 100644
index 0b68b1f95a825d88af9c4778ae478a0cddca2958..0000000000000000000000000000000000000000
Binary files a/packages/linux_make/text-x-puredata.png and /dev/null differ
diff --git a/scripts/pd-mode.el b/scripts/pd-mode.el
deleted file mode 100644
index 7fa296310a3f17603cced13249b174626e0a1c85..0000000000000000000000000000000000000000
--- a/scripts/pd-mode.el
+++ /dev/null
@@ -1,56 +0,0 @@
-;;; pd-mode.el --- major mode for editing Pd configuration files
-
-;; Author: Hans-Christoph Steiner <hans@at.or.at>
-;; Keywords:    languages, faces
-;; Last edit: 
-;; Version: 1.0.1 
-
-;; This file is an add-on for XEmacs or GNU Emacs (not tested with the latter).
-;;
-;; It is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.x
-;;
-;; It is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with your copy of Emacs; see the file COPYING.  If not, write
-;; to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-
-;;; Commentary:
-;;
-;; There isn't really much to say.  The list of keywords was derived from
-;; the Pd there may be some errors or omissions.
-;;
-;; There are currently no local keybindings defined, but the hooks are
-;; there in the event that anyone gets around to adding any.
-;;
-;; To enable automatic selection of this mode when appropriate files are
-;; visited, add the following to your favourite site or personal Emacs
-;; configuration file:
-;;
-;;   (autoload 'pd-mode "pd-mode" "autoloaded" t)
-;;   (add-to-list 'auto-mode-alist '("\\.pat$" . pd-mode))
-;;   (add-to-list 'auto-mode-alist '("\\.pd$"  . pd-mode))
-;;
- 
-;;; Code:
-
-;; Requires
-(require 'generic-x)
-
-(define-generic-mode 'pd-mode
-  nil
-  '("osc~" "random" "route" "trigger")
-  '(("#X \\([^ ]+\\) " . 'font-lock-function-name-face)
-    (";" . 'font-lock-warning-face))
-  '(".pd\\'" ".pat\\'")
-  nil
-  "Major mode for editing Pd files")
-
-;;; pd-mode.el ends here