diff --git a/garr/idpfirewall/.project b/garr/idpfirewall/.project
index a55d7f6d8ec7ac6b2586fdb4d69d46d078c9f492..bcbfd817dc1048648fac5458788094090b5338a8 100644
--- a/garr/idpfirewall/.project
+++ b/garr/idpfirewall/.project
@@ -3,10 +3,12 @@
 	<name>garr-idpfirewall</name>
 	<comment></comment>
 	<projects>
+		<project>puppetlabs-firewall</project>
+		<project>puppetlabs-stdlib</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.cloudsmith.geppetto.pp.dsl.ui.modulefileBuilder</name>
+			<name>com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -27,7 +29,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.cloudsmith.geppetto.pp.dsl.ui.puppetNature</nature>
+		<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
 		<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 		<nature>org.python.pydev.pythonNature</nature>
diff --git a/garr/shib2common/.project b/garr/shib2common/.project
index 5dc2a1d09752228061a9bdf29ce36a56682ea05c..5002a69312f6d5732f97a267dde0388fa84e848e 100644
--- a/garr/shib2common/.project
+++ b/garr/shib2common/.project
@@ -3,11 +3,13 @@
 	<name>garr-shib2common</name>
 	<comment></comment>
 	<projects>
-		<project>puppet-apache2</project>
+		<project>garr-tomcat</project>
+		<project>puppetlabs-apache</project>
+		<project>puppetlabs-stdlib</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.cloudsmith.geppetto.pp.dsl.ui.modulefileBuilder</name>
+			<name>com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -23,7 +25,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.cloudsmith.geppetto.pp.dsl.ui.puppetNature</nature>
+		<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
 		<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 	</natures>
diff --git a/garr/tomcat/.project b/garr/tomcat/.project
index 3b27bb2f55560e10049ee25c8c5325ba256ebefd..d1ffe0166e2f243b9f9a12d65e695a6f2a5f53ec 100644
--- a/garr/tomcat/.project
+++ b/garr/tomcat/.project
@@ -3,10 +3,11 @@
 	<name>garr-tomcat</name>
 	<comment></comment>
 	<projects>
+		<project>puppetlabs-stdlib</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.cloudsmith.geppetto.pp.dsl.ui.modulefileBuilder</name>
+			<name>com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -22,7 +23,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.cloudsmith.geppetto.pp.dsl.ui.puppetNature</nature>
+		<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
 		<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 	</natures>