diff --git a/check_updates/LICENSE-GPL3 b/check_package_updates/LICENSE-GPL3
similarity index 100%
rename from check_updates/LICENSE-GPL3
rename to check_package_updates/LICENSE-GPL3
diff --git a/check_updates/README.md b/check_package_updates/README.md
similarity index 90%
rename from check_updates/README.md
rename to check_package_updates/README.md
index 7692799..5416396 100644
--- a/check_updates/README.md
+++ b/check_package_updates/README.md
@@ -26,7 +26,7 @@ Critical Security
 
 Critical on all security type updates
 ```
-$ check_updates --no-longoutput --th "metric=security,critical=1..inf"
+$ check_package_updates --no-longoutput --th "metric=security,critical=1..inf"
 Critical - Total: 67, Security: 15, Bug fix: 48, Enhancement: 0, Normal: 4. Critical on security | 'total'=67;;;; 'security'=15;;1..inf;; 'bug fix'=48;;;; 'normal'=4;;;;
 ```
 
@@ -35,7 +35,7 @@ Total Updates
 
 Critical on all security type updates and warning on many total updates
 ```
-$ python check_updates --no-longoutput --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf"
+$ python check_package_updates --no-longoutput --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf"
 Critical - Total: 67, Security: 15, Bug fix: 48, Enhancement: 0, Normal: 4. Critical on security. Warning on total | 'total'=67;40..inf;;; 'security'=15;;1..inf;; 'bug fix'=48;;;; 'normal'=4;;;;
 ```
 
@@ -44,7 +44,7 @@ Long Output
 With long output (default) you also get the list of packages
 
 ```
-$ python check_updates --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf"
+$ python check_package_updates --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf"
 Critical - Total: 32, Security: 1, Bug fix: 31, Enhancement: 0, Normal: 0. Critical on security | 'total'=32;40..inf;;; 'security'=1;;1..inf;; 'bug fix'=31;;;;
 Security
   python-bugzilla-0.9.0-1.fc18.noarch
@@ -102,7 +102,7 @@ Install
 * Install PackageKit (packagekit in Debian)
 
 ```
-wget https://raw.github.com/opinkerfi/nagios-plugins/master/check_updates/check_updates
+wget https://raw.github.com/opinkerfi/nagios-plugins/master/check_package_updates/check_package_updates
 ```
 
 Room for improvement
diff --git a/check_updates/check_updates b/check_package_updates/check_package_updates
similarity index 100%
rename from check_updates/check_updates
rename to check_package_updates/check_package_updates
diff --git a/check_updates/nagios-okplugin-check_updates.spec b/check_package_updates/nagios-okplugin-check_package_updates.spec
similarity index 97%
rename from check_updates/nagios-okplugin-check_updates.spec
rename to check_package_updates/nagios-okplugin-check_package_updates.spec
index 7808a03..093250b 100644
--- a/check_updates/nagios-okplugin-check_updates.spec
+++ b/check_package_updates/nagios-okplugin-check_package_updates.spec
@@ -1,5 +1,5 @@
 %define debug_package %{nil}
-%define plugin check_updates
+%define plugin check_package_updates
 
 Summary:	A Nagios plugin to check operating system updates
 Name:		nagios-okplugin-%{plugin}
diff --git a/check_package_updates/nrpe.d/check_package_updates.cfg b/check_package_updates/nrpe.d/check_package_updates.cfg
new file mode 100644
index 0000000..c0ad7dc
--- /dev/null
+++ b/check_package_updates/nrpe.d/check_package_updates.cfg
@@ -0,0 +1,2 @@
+# Critical on security updates, warning if 40 or more total updates
+command[check_updates]=/usr/lib64/nagios/plugins/check_package_updates --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf"
diff --git a/check_updates/nrpe.d/check_updates.cfg b/check_updates/nrpe.d/check_updates.cfg
deleted file mode 100644
index fbbf088..0000000
--- a/check_updates/nrpe.d/check_updates.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-# Critical on security updates, warning if 40 or more total updates
-command[check_updates]=/usr/lib64/nagios/plugins/check_updates --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf"