diff --git a/misc/deploy/puppet/init.pp b/misc/deploy/puppet/init.pp
index 1fef161ffa277aadf3afee80e7192ce333bd4fdc..af4368dee65babc392969d9708cc5b059187df15 100644
--- a/misc/deploy/puppet/init.pp
+++ b/misc/deploy/puppet/init.pp
@@ -25,10 +25,10 @@ package {
 
 include git
 
-import 'php'
+import 'php-piwik'
 
 import 'piwikrepo'
 
-import 'mysql'
+import 'mysql-piwik'
 
 import 'nodes'
\ No newline at end of file
diff --git a/misc/deploy/puppet/mysql.pp b/misc/deploy/puppet/mysql-piwik.pp
similarity index 100%
rename from misc/deploy/puppet/mysql.pp
rename to misc/deploy/puppet/mysql-piwik.pp
diff --git a/misc/deploy/puppet/php.pp b/misc/deploy/puppet/php-piwik.pp
similarity index 63%
rename from misc/deploy/puppet/php.pp
rename to misc/deploy/puppet/php-piwik.pp
index eeea8ec9a9ad45d106525090e8d9984a840e87f9..924274cefbddf7e7c1ce0eaa68ee98a964a7327b 100644
--- a/misc/deploy/puppet/php.pp
+++ b/misc/deploy/puppet/php-piwik.pp
@@ -1,9 +1,4 @@
 include php
 
 php::module { ['snmp', 'xdebug', 'mysql', 'gd', 'sqlite', 'memcache', 'mcrypt', 'imagick', 'geoip', 'uuid', 'recode', 'cgi']:
-}
-
-# php::conf { "global":
-#   source => "puppet:///files/php/global.ini",
-# }
-
+}
\ No newline at end of file