diff --git a/setup.py b/setup.py
index 562d184929b88e730b3169ccaa53e67363337463..d61ae32086c66868d1d890182ae659d50e2739f4 100644
--- a/setup.py
+++ b/setup.py
@@ -52,10 +52,10 @@ setup(name=name,
           'mysql = slapos.recipe.mysql:Recipe',
           'nbdserver = slapos.recipe.nbdserver:Recipe',
           'nosqltestbed = slapos.recipe.nosqltestbed:NoSQLTestBed',
-          'osoeslaptraining = slapos.recipe.osoeslaptraining:Request',
-          'osoeslaptraining.request = slapos.recipe.osoeslaptraining:Request',
-          'osoeslaptraining.static = slapos.recipe.osoeslaptraining:Static',
-          'osoeslaptraining.simple = slapos.recipe.osoeslaptraining:Simple',
+          'lamp = slapos.recipe.lamp:Request',
+          'lamp.request = slapos.recipe.lamp:Request',
+          'lamp.static = slapos.recipe.lamp:Static',
+          'lamp.simple = slapos.recipe.lamp:Simple',
           'proactive = slapos.recipe.proactive:Recipe',
           'sheepdogtestbed = slapos.recipe.sheepdogtestbed:SheepDogTestBed',
           'siptester = slapos.recipe.siptester:SipTesterRecipe',
diff --git a/slapos/recipe/osoeslaptraining/__init__.py b/slapos/recipe/lamp/__init__.py
similarity index 100%
rename from slapos/recipe/osoeslaptraining/__init__.py
rename to slapos/recipe/lamp/__init__.py
diff --git a/slapos/recipe/osoeslaptraining/apache.py b/slapos/recipe/lamp/apache.py
similarity index 100%
rename from slapos/recipe/osoeslaptraining/apache.py
rename to slapos/recipe/lamp/apache.py
diff --git a/slapos/recipe/osoeslaptraining/mysql.py b/slapos/recipe/lamp/mysql.py
similarity index 100%
rename from slapos/recipe/osoeslaptraining/mysql.py
rename to slapos/recipe/lamp/mysql.py
diff --git a/slapos/recipe/osoeslaptraining/template/apache.in b/slapos/recipe/lamp/template/apache.in
similarity index 100%
rename from slapos/recipe/osoeslaptraining/template/apache.in
rename to slapos/recipe/lamp/template/apache.in
diff --git a/slapos/recipe/osoeslaptraining/template/my.cnf.in b/slapos/recipe/lamp/template/my.cnf.in
similarity index 100%
rename from slapos/recipe/osoeslaptraining/template/my.cnf.in
rename to slapos/recipe/lamp/template/my.cnf.in
diff --git a/slapos/recipe/osoeslaptraining/template/mysqlinit.sql.in b/slapos/recipe/lamp/template/mysqlinit.sql.in
similarity index 100%
rename from slapos/recipe/osoeslaptraining/template/mysqlinit.sql.in
rename to slapos/recipe/lamp/template/mysqlinit.sql.in
diff --git a/slapos/recipe/osoeslaptraining/template/php.ini.in b/slapos/recipe/lamp/template/php.ini.in
similarity index 100%
rename from slapos/recipe/osoeslaptraining/template/php.ini.in
rename to slapos/recipe/lamp/template/php.ini.in
diff --git a/software/lamp-template-static/software.cfg b/software/lamp-template-static/software.cfg
index 4e6310dfe19e5bb5240bcf002b54cb9b8b821f3f..dcf92258e86ada246bcc42a19cf031fe158c8caa 100644
--- a/software/lamp-template-static/software.cfg
+++ b/software/lamp-template-static/software.cfg
@@ -22,7 +22,7 @@ url = Student shall put here url of zipped or tarballed web page or application
 
 [instance-recipe]
 egg = slapos.cookbook
-module = osoeslaptraining.static
+module = lamp.static
 
 [template]
 # Default template for the instance.
diff --git a/software/lamp-template/software.cfg b/software/lamp-template/software.cfg
index df63edada120fa19ce92c2d7e86aff57a6d4d935..bf173d6340ef4c270fd61bf9c21ebe12e0ef3b2d 100644
--- a/software/lamp-template/software.cfg
+++ b/software/lamp-template/software.cfg
@@ -34,7 +34,7 @@ location = Student shall put here relative path to application top level directo
   
 [instance-recipe]
 egg = slapos.cookbook
-module = osoeslaptraining.simple
+module = lamp.simple
 
 [template]
 # Default template for the instance.
diff --git a/software/phpmyadmin/software.cfg b/software/phpmyadmin/software.cfg
index 4791f12700e9204068288613ee38a15512ae448e..22a17ba00fe21baff72c52eb300f8f6d072c733d 100644
--- a/software/phpmyadmin/software.cfg
+++ b/software/phpmyadmin/software.cfg
@@ -39,7 +39,7 @@ location = config.inc.php
 
 [instance-recipe]
 egg = slapos.cookbook
-module = osoeslaptraining.simple
+module = lamp.simple
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
diff --git a/software/wordpress/software.cfg b/software/wordpress/software.cfg
index 3a68fa504e8723c90c0bcd5dfed0d3a1c76737e1..59831f86193f9cc9090e014986e93ec37589d674 100644
--- a/software/wordpress/software.cfg
+++ b/software/wordpress/software.cfg
@@ -30,7 +30,7 @@ location = wp-config.php
   
 [instance-recipe]
 egg = slapos.cookbook
-module = osoeslaptraining.request
+module = lamp.request
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg