diff --git a/graphviz-2.20.2-interpreter_names.patch b/graphviz-2.20.2-interpreter_names.patch
index 9e5a79c..ee884eb 100644
--- a/graphviz-2.20.2-interpreter_names.patch
+++ b/graphviz-2.20.2-interpreter_names.patch
@@ -6,11 +6,3 @@
  
  -- display the kernel module dependencies
  
---- tclpkg/gv/demo/modgraph.php
-+++ tclpkg/gv/demo/modgraph.php
-@@ -1,4 +1,4 @@
--#!/usr/bin/php
-+#!/usr/bin/php5
- <?
- include("gv.php");
- 
diff --git a/fix-headers.diff b/graphviz-missing_headers.patch
similarity index 100%
rename from fix-headers.diff
rename to graphviz-missing_headers.patch
diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes
index 1d56379..5dc7866 100644
--- a/graphviz-plugins.changes
+++ b/graphviz-plugins.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Oct 19 18:36:48 UTC 2011 - coolo@suse.com
+
+- /usr/bin/php5 does not exist
+
+-------------------------------------------------------------------
+Tue Oct  4 18:41:12 CEST 2011 - pth@suse.de
+
+- Rename and prefix patch for uniformity within the package.
+
 -------------------------------------------------------------------
 Wed Sep 28 14:01:13 UTC 2011 - idonmez@suse.com
 
diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec
index 5d0bc4a..c96001b 100644
--- a/graphviz-plugins.spec
+++ b/graphviz-plugins.spec
@@ -72,7 +72,7 @@ Group:          Productivity/Graphics/Visualization/Graph
 Source:         http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.gz
 Patch1:         graphviz-gd_png_check_sig.patch
 Patch100:       graphviz-plugins-fix_install_dirs.patch
-Patch101:       python-version.diff
+Patch101:       graphviz-python_version.patch
 Patch102:       graphviz-plugins-tcl_install_dir.patch
 Patch103:       graphviz-2.20.2-interpreter_names.patch
 Patch104:       graphviz-guile.patch
diff --git a/python-version.diff b/graphviz-python_version.patch
similarity index 100%
rename from python-version.diff
rename to graphviz-python_version.patch
diff --git a/graphviz.changes b/graphviz.changes
index e02f2cd..889adfc 100644
--- a/graphviz.changes
+++ b/graphviz.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct  4 18:41:12 CEST 2011 - pth@suse.de
+
+- Rename and prefix patch for uniformity within the package.
+
 -------------------------------------------------------------------
 Mon Oct  3 13:55:01 UTC 2011 - coolo@suse.com
 
diff --git a/graphviz.spec b/graphviz.spec
index 68752a1..0123760 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -30,7 +30,7 @@ Source:         http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.
 Source2:        graphviz-rpmlintrc
 Patch1:         graphviz-gd_png_check_sig.patch
 Patch2:         graphviz-fix-pkgIndex.patch
-Patch3:         fix-headers.diff
+Patch3:         graphviz-missing_headers.patch
 BuildRequires:  bison
 BuildRequires:  fdupes
 BuildRequires:  flex