diff --git a/feature/src/main/resources/feature.xml b/feature/src/main/resources/feature.xml
index d037b12..1787220 100644
--- a/feature/src/main/resources/feature.xml
+++ b/feature/src/main/resources/feature.xml
@@ -34,414 +34,414 @@
         <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oauth-commons/${net.oauth.bundle.version}</bundle>
         <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jersey-core/${jersey.bundle.version}</bundle>
         <bundle dependency='true'>mvn:com.google.code.gson/gson/${gson.version}</bundle>
-        <bundle>mvn:org.jclouds/jclouds-core/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds/jclouds-core/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-blobstore' description='JClouds Blobstore' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds</feature>
-        <bundle>mvn:org.jclouds/jclouds-blobstore/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds/jclouds-blobstore/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-compute' description='JClouds Compute' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds</feature>
-        <bundle dependency='true'>mvn:org.jclouds.driver/jclouds-log4j/${jclouds.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds/jclouds-scriptbuilder/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds/jclouds-compute/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.driver/jclouds-log4j/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds/jclouds-scriptbuilder/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds/jclouds-compute/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-management' description='JClouds Management' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
         <feature version='${project.version}'>jclouds-blobstore</feature>
-        <bundle>mvn:org.jclouds.labs.representations/representations-core/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.labs.representations/representations-codec/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.labs.management/management-core/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.labs.management/management-blobstore/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.labs.management/management-compute/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.labs.representations/representations-core/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.labs.representations/representations-codec/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.labs.management/management-core/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.labs.management/management-blobstore/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.labs.management/management-compute/${jclouds.version}</bundle>
     </feature>
 
     <!-- APIS -->
     <feature name='jclouds-api-filesystem' description='JClouds - API - FileSystem' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-blobstore</feature>
-        <bundle>mvn:org.jclouds.api/filesystem/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.api/filesystem/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-api-elasticstack' description='JClouds - API - Elasticstack' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle>mvn:org.jclouds.api/elasticstack/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.api/elasticstack/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-api-vcloud' description='JClouds - API - Vcloud' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
         <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.java-xmlbuilder/${java-xmlbuilder.bundle.version}</bundle>
-        <bundle>mvn:org.jclouds.api/vcloud/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.api/vcloud/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-api-byon' description='JClouds - API - Byon' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
         <bundle dependency='true'>mvn:org.yaml/snakeyaml/${snakeyaml.version}</bundle>
-        <bundle>mvn:org.jclouds.api/byon/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.api/byon/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-api-swift' description='JClouds - API - Swift' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-blobstore</feature>
         <feature version='${project.version}'>jclouds-api-openstack-keystone</feature>
-        <bundle dependency='true'>mvn:org.jclouds.common/openstack-common/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.api/swift/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.api/swift/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-api-openstack-nova' description='JClouds - API - OpenStack Nova' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
         <feature version='${project.version}'>jclouds-api-openstack-keystone</feature>
-        <bundle dependency='true'>mvn:org.jclouds.common/openstack-common/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.api/openstack-nova/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.api/openstack-nova/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-api-openstack-keystone' description='JClouds - API - OpenStack Nova' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds</feature>
-        <bundle>mvn:org.jclouds.api/openstack-keystone/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.api/openstack-keystone/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-api-openstack-cinder' description='JClouds - API - OpenStack Cinder' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
         <feature version='${project.version}'>jclouds-api-openstack-keystone</feature>
-        <bundle dependency='true'>mvn:org.jclouds.common/openstack-common/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.api/openstack-cinder/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.api/openstack-cinder/${jclouds.version}</bundle>
     </feature>
 
     <feature name="jclouds-api-s3" description="S3 API" version="${project.version}" resolver="(obr)">
         <feature version='${project.version}'>jclouds-blobstore</feature>
         <feature version='${project.version}'>jclouds-api-sts</feature>
         <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.java-xmlbuilder/${java-xmlbuilder.bundle.version}</bundle>
-        <bundle>mvn:org.jclouds.api/s3/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.api/s3/${jclouds.version}</bundle>
     </feature>
 
     <feature name="jclouds-api-sqs" description="SQS API" version="${project.version}" resolver="(obr)">
         <feature version='${project.version}'>jclouds-api-sts</feature>
-        <bundle>mvn:org.jclouds.api/sqs/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.api/sqs/${jclouds.version}</bundle>
     </feature>
 
     <feature name="jclouds-api-ec2" description="EC2 API" version="${project.version}" resolver="(obr)">
         <feature version='${project.version}'>jclouds-compute</feature>
         <feature version='${project.version}'>jclouds-api-sts</feature>
-        <bundle>mvn:org.jclouds.api/ec2/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.api/ec2/${jclouds.version}</bundle>
     </feature>
 
     <feature name="jclouds-api-cloudstack" description="Cloudstack API" version="${project.version}" resolver="(obr)">
         <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle>mvn:org.jclouds.api/cloudstack/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.api/cloudstack/${jclouds.version}</bundle>
     </feature>
 
     <feature name="jclouds-api-rackspace-cloudidentity" description="Rackspace Cloud Identity API" version="${project.version}" resolver="(obr)">
         <feature version='${project.version}'>jclouds-compute</feature>
         <feature version='${project.version}'>jclouds-api-openstack-keystone</feature>
-        <bundle dependency='true'>mvn:org.jclouds.api/rackspace-cloudidentity/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.api/rackspace-cloudidentity/${jclouds.version}</bundle>
     </feature>
 
     <feature name="jclouds-api-rackspace-clouddns" description="Rackspace Cloud DNS API" version="${project.version}" resolver="(obr)">
         <feature version='${project.version}'>jclouds-api-rackspace-cloudidentity</feature>
-        <bundle dependency='true'>mvn:org.jclouds.api/rackspace-clouddns/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.api/rackspace-clouddns/${jclouds.version}</bundle>
 
     </feature>
 
     <feature name="jclouds-api-chef" description="Jclouds - API - Chef" version="${project.version}" resolver="(obr)">
         <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle>mvn:org.jclouds.api/chef/${jclouds.chef.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.api/chef/${jclouds.chef.version}</bundle>
     </feature>
 
     <feature name="jclouds-api-sts" description="Jclouds - API - STS" version="${project.version}" resolver="(obr)">
         <feature version='${project.version}'>jclouds</feature>
-        <bundle>mvn:org.jclouds.api/sts/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.api/sts/${jclouds.version}</bundle>
     </feature>
 
     <feature name="jclouds-api-route53" description="Jclouds - API - Route53" version="${project.version}" resolver="(obr)">
         <feature version='${project.version}'>jclouds-api-sts</feature>
-        <bundle>mvn:org.jclouds.api/route53/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.api/route53/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-aws-cloudwatch' description='Amazon Web Service - Cloudwatch' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-api-sts</feature>
-        <bundle>mvn:org.jclouds.api/cloudwatch/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/aws-cloudwatch/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.api/cloudwatch/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/aws-cloudwatch/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-aws-ec2' description='Amazon Web Service - EC2' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-api-ec2</feature>
-        <bundle>mvn:org.jclouds.provider/aws-ec2/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/aws-ec2/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-aws-route53' description='Amazon Web Service - Route 53' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-api-route53</feature>
-        <bundle>mvn:org.jclouds.provider/aws-route53/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/aws-route53/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-aws-s3' description='Amazon Web Service - S3' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-api-s3</feature>
         <bundle dependency='true'>mvn:org.bouncycastle/bcprov-jdk15on/${bcprov.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds.driver/jclouds-bouncycastle/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.driver/jclouds-bouncycastle/${jclouds.version}</bundle>
         <bundle dependency='true'>mvn:io.netty/netty/${netty.bundle.version}</bundle>
         <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore.version}</bundle>
         <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient.version}</bundle>
         <bundle dependency='true'>mvn:joda-time/joda-time/${joda.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds.driver/jclouds-joda/${jclouds.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds.driver/jclouds-netty/${jclouds.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds.driver/jclouds-enterprise/${jclouds.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds.driver/jclouds-apachehc/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/aws-s3/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.driver/jclouds-joda/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.driver/jclouds-netty/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.driver/jclouds-enterprise/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.driver/jclouds-apachehc/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/aws-s3/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-aws-sqs' description='Amazon Web Service - SQS' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-api-sqs</feature>
-        <bundle>mvn:org.jclouds.provider/aws-sqs/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/aws-sqs/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-aws-sts' description='Amazon Web Service - STS' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-api-sts</feature>
-        <bundle>mvn:org.jclouds.provider/aws-sts/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/aws-sts/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-azureblob' description='Azureblob' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-blobstore</feature>
-        <bundle dependency='true'>mvn:org.jclouds.common/azure-common/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/azureblob/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.common/azure-common/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/azureblob/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-bluelock-vcloud-zone01' description='vCloud implementation targeted to Bluelock vCloud Zone01' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-api-vcloud</feature>
         <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.java-xmlbuilder/${java-xmlbuilder.bundle.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds/jclouds-compute/${jclouds.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds/jclouds-scriptbuilder/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/bluelock-vcloud-zone01/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds/jclouds-compute/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds/jclouds-scriptbuilder/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/bluelock-vcloud-zone01/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-cloudfiles-uk' description='Cloudfiles UK' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-api-swift</feature>
-        <bundle dependency='true'>mvn:org.jclouds.api/cloudfiles/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/cloudfiles-uk/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.api/cloudfiles/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/cloudfiles-uk/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-cloudfiles-us' description='Cloudfiles US' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-api-swift</feature>
-        <bundle dependency='true'>mvn:org.jclouds.api/cloudfiles/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/cloudfiles-us/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.api/cloudfiles/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/cloudfiles-us/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-dynect' description='DynECT Managed DNS' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds</feature>
-        <bundle>mvn:org.jclouds.provider/dynect/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/dynect/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-rackspace-cloudloadbalancers-us' description='Cloud Load Balancers US' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds</feature>
         <feature version='${project.version}'>jclouds-api-rackspace-cloudidentity</feature>
-        <bundle dependency='true'>mvn:org.jclouds.common/openstack-common/${jclouds.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds/jclouds-loadbalancer/${jclouds.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds/jclouds-scriptbuilder/${jclouds.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds/jclouds-compute/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.api/rackspace-cloudloadbalancers/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/rackspace-cloudloadbalancers-us/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds/jclouds-loadbalancer/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds/jclouds-scriptbuilder/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds/jclouds-compute/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.api/rackspace-cloudloadbalancers/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/rackspace-cloudloadbalancers-us/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-rackspace-cloudloadbalancers-uk' description='Cloud Load Balancers UK' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds</feature>
         <feature version='${project.version}'>jclouds-api-rackspace-cloudidentity</feature>
-        <bundle dependency='true'>mvn:org.jclouds.common/openstack-common/${jclouds.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds/jclouds-loadbalancer/${jclouds.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds/jclouds-scriptbuilder/${jclouds.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds/jclouds-compute/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.api/rackspace-cloudloadbalancers/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/rackspace-cloudloadbalancers-uk/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds/jclouds-loadbalancer/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds/jclouds-scriptbuilder/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds/jclouds-compute/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.api/rackspace-cloudloadbalancers/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/rackspace-cloudloadbalancers-uk/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-cloudonestorage' description='Cloud One Storage' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-blobstore</feature>
-        <bundle dependency='true'>mvn:org.jclouds.api/atmos/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/cloudonestorage/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.api/atmos/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/cloudonestorage/${jclouds.version}</bundle>
     </feature>
 
 
     <feature name='jclouds-cloudserver-uk' description='Cloudservers UK' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle dependency='true'>mvn:org.jclouds.common/openstack-common/${jclouds.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds.api/cloudservers/${jclouds.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds/jclouds-scriptbuilder/${jclouds.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds/jclouds-compute/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/cloudservers-uk/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.api/cloudservers/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds/jclouds-scriptbuilder/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds/jclouds-compute/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/cloudservers-uk/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-cloudserver-us' description='Cloudservers US' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle dependency='true'>mvn:org.jclouds.common/openstack-common/${jclouds.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds.api/cloudservers/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/cloudservers-us/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.api/cloudservers/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/cloudservers-us/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-rackspace-cloudservers-us' description='Rackspace Cloudservers US' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
         <feature version='${project.version}'>jclouds-api-openstack-nova</feature>
         <feature version='${project.version}'>jclouds-api-rackspace-cloudidentity</feature>
-        <bundle>mvn:org.jclouds.provider/rackspace-cloudservers-us/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/rackspace-cloudservers-us/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-rackspace-cloudservers-uk' description='Rackspace Cloudservers UK' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
         <feature version='${project.version}'>jclouds-api-openstack-nova</feature>
         <feature version='${project.version}'>jclouds-api-rackspace-cloudidentity</feature>
-        <bundle>mvn:org.jclouds.provider/rackspace-cloudservers-uk/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/rackspace-cloudservers-uk/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-rackspace-clouddns-us' description='Racksapce Cloud DNS US' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-api-rackspace-clouddns</feature>
-        <bundle>mvn:org.jclouds.provider/rackspace-clouddns-us/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/rackspace-clouddns-us/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-rackspace-clouddns-uk' description='Racksapce Cloud DNS UK' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-api-rackspace-clouddns</feature>
-        <bundle>mvn:org.jclouds.provider/rackspace-clouddns-uk/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/rackspace-clouddns-uk/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-rackspace-cloudblockstorage-us' description='Racksapce Cloud Block Storage US' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-api-openstack-cinder</feature>
         <feature version='${project.version}'>jclouds-api-rackspace-cloudidentity</feature>
-        <bundle>mvn:org.jclouds.provider/rackspace-cloudblockstorage-us/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/rackspace-cloudblockstorage-us/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-rackspace-cloudblockstorage-uk' description='Racksapce Cloud Block Storage UK' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-api-openstack-cinder</feature>
         <feature version='${project.version}'>jclouds-api-rackspace-cloudidentity</feature>
-        <bundle>mvn:org.jclouds.provider/rackspace-cloudblockstorage-uk/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/rackspace-cloudblockstorage-uk/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-cloudsigma-zrh' description='CloudSigma ZRH' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle dependency='true'>mvn:org.jclouds.common/openstack-common/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.api/cloudsigma/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/cloudsigma-zrh/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.api/cloudsigma/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/cloudsigma-zrh/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-cloudsigma-lvs' description='CloudSigma ZRH' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle dependency='true'>mvn:org.jclouds.common/openstack-common/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.api/cloudsigma/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/cloudsigma-lvs/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.api/cloudsigma/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/cloudsigma-lvs/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-elastichosts-lon-b' description='Elastichosts Bluesquare London' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle dependency='true'>mvn:org.jclouds.api/elasticstack/${jclouds.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds.common/openstack-common/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/elastichosts-lon-b/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.api/elasticstack/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/elastichosts-lon-b/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-elastichosts-lon-p' description='Elastichosts Peer1 London' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle dependency='true'>mvn:org.jclouds.api/elasticstack/${jclouds.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds.common/openstack-common/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/elastichosts-lon-p/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.api/elasticstack/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/elastichosts-lon-p/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-elastichosts-sat-p' description='Elastichosts Peer1 San Antonio' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle dependency='true'>mvn:org.jclouds.api/elasticstack/${jclouds.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds.common/openstack-common/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/elastichosts-sat-p/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.api/elasticstack/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/elastichosts-sat-p/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-elastichosts-lax-p' description='Elastichosts Peer1 Los Angeles' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle dependency='true'>mvn:org.jclouds.api/elasticstack/${jclouds.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds.common/openstack-common/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/elastichosts-lax-p/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.api/elasticstack/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/elastichosts-lax-p/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-elastichosts-tor-p' description='Elastichosts Peer1 Toronto' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle dependency='true'>mvn:org.jclouds.api/elasticstack/${jclouds.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds.common/openstack-common/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/elastichosts-tor-p/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.api/elasticstack/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/elastichosts-tor-p/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-gogrid' description='GoGrid' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle>mvn:org.jclouds.provider/gogrid/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/gogrid/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-go2cloud-jhb1' description='Go2Cloud implementation targeted to Johannesburg1' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-api-elasticstack</feature>
-        <bundle>mvn:org.jclouds.provider/go2cloud-jhb1/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/go2cloud-jhb1/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-greenhousedata-element-vcloud' description='Green House Data Element vCloud' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-api-vcloud</feature>
         <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.java-xmlbuilder/${java-xmlbuilder.bundle.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/greenhousedata-element-vcloud/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/greenhousedata-element-vcloud/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-glesys' description='GleSYS' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle>mvn:org.jclouds.provider/glesys/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/glesys/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-hpcloud-objectstorage' description='HP Cloud Object Storage' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-api-swift</feature>
-        <bundle>mvn:org.jclouds.provider/hpcloud-objectstorage/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/hpcloud-objectstorage/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-hpcloud-compute' description='HP Cloud Compute' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-api-openstack-nova</feature>
-        <bundle>mvn:org.jclouds.provider/hpcloud-compute/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/hpcloud-compute/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-ninefold-storage' description='Ninefold Storage' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-blobstore</feature>
-        <bundle dependency='true'>mvn:org.jclouds.api/atmos/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/ninefold-storage/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.api/atmos/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/ninefold-storage/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-ninefold-compute' description='Ninefold Compute' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle dependency='true'>mvn:org.jclouds.api/cloudstack/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/ninefold-compute/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.api/cloudstack/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/ninefold-compute/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-openhosting-east1' description='Open Hosting for East1' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle dependency='true'>mvn:org.jclouds.api/elasticstack/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/openhosting-east1/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.api/elasticstack/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/openhosting-east1/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-serverlove-z1-man' description='Serverlove implementation targeted to Manchester' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle dependency='true'>mvn:org.jclouds.api/elasticstack/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/serverlove-z1-man/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.api/elasticstack/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/serverlove-z1-man/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-skalicloud-sdg-my' description='SkaliCloud implementation targeted to Malaysia' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle dependency='true'>mvn:org.jclouds.api/elasticstack/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/skalicloud-sdg-my/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.api/elasticstack/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/skalicloud-sdg-my/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-softlayer' description='Components to access SoftLayer' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle>mvn:org.jclouds.provider/softlayer/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/softlayer/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-trmk-ecloud' description='Terremark Enterprise Cloud' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
         <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.java-xmlbuilder/${java-xmlbuilder.bundle.version}</bundle>
-        <bundle>mvn:org.jclouds.common/trmk-common/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/trmk-ecloud/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.common/trmk-common/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/trmk-ecloud/${jclouds.version}</bundle>
     </feature>
 
     <feature name='jclouds-trmk-vcloudexpress' description='Terremark vCloud Express' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
         <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.java-xmlbuilder/${java-xmlbuilder.bundle.version}</bundle>
-        <bundle>mvn:org.jclouds.common/trmk-common/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.provider/trmk-vcloudexpress/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.common/trmk-common/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.provider/trmk-vcloudexpress/${jclouds.version}</bundle>
     </feature>
 
     <feature name="jclouds-services" description="OSGi Service Factories for JClouds" version="${project.version}" resolver="(obr)">
-        <configfile finalname="/etc/org.jclouds.credentials.cfg">mvn:org.jclouds.karaf/jclouds-karaf/${project.version}/cfg/credentials</configfile>
+        <configfile finalname="/etc/org.apache.jclouds.credentials.cfg">mvn:org.apache.jclouds.karaf/jclouds-karaf/${project.version}/cfg/credentials</configfile>
         <feature version='${project.version}'>jclouds-compute</feature>
         <feature version='${project.version}'>jclouds-blobstore</feature>
         <feature version='${project.version}'>jclouds-management</feature>
@@ -449,39 +449,39 @@
         <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jzlib/${jzlib.bundle.version}</bundle>
         <bundle dependency='true'>mvn:org.bouncycastle/bcpkix-jdk15on/${bcprov.version}</bundle>
         <bundle dependency='true'>mvn:org.bouncycastle/bcprov-jdk15on/${bcprov.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds.driver/jclouds-bouncycastle/${jclouds.version}</bundle>
-        <bundle dependency='true'>mvn:org.jclouds.driver/jclouds-slf4j/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.driver/jclouds-sshj/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.driver/jclouds-log4j/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.karaf/core/${project.version}</bundle>
-        <bundle>mvn:org.jclouds.karaf/cache/${project.version}</bundle>
-        <bundle>mvn:org.jclouds.karaf/recipe/${project.version}</bundle>
-        <bundle>mvn:org.jclouds.karaf/services/${project.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.driver/jclouds-bouncycastle/${jclouds.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.driver/jclouds-slf4j/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.driver/jclouds-sshj/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.driver/jclouds-log4j/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.karaf/core/${project.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.karaf/cache/${project.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.karaf/recipe/${project.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.karaf/services/${project.version}</bundle>
     </feature>
 
     <feature name="jclouds-commands" description="Karaf Commands for JClouds" version="${project.version}" resolver="(obr)">
-        <configfile finalname="/etc/org.jclouds.shell.cfg">mvn:org.jclouds.karaf/jclouds-karaf/${project.version}/cfg/shell</configfile>
+        <configfile finalname="/etc/org.apache.jclouds.shell.cfg">mvn:org.apache.jclouds.karaf/jclouds-karaf/${project.version}/cfg/shell</configfile>
         <feature version='${project.version}'>jclouds-services</feature>
         <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${scripting.api.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.codehaus.groovy/groovy-all/${groovy.version}</bundle>
-        <bundle>mvn:org.jclouds.karaf/core/${project.version}</bundle>
-        <bundle>mvn:org.jclouds.karaf/recipe/${project.version}</bundle>
-        <bundle>mvn:org.jclouds.karaf/commands/${project.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.karaf/core/${project.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.karaf/recipe/${project.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.karaf/commands/${project.version}</bundle>
     </feature>
 
 
     <feature name="jclouds-chef" description="JClouds Chef Services and Commands" version="${project.version}" resolver="(obr)">
         <feature version='${project.version}'>jclouds-api-chef</feature>
         <feature version='${project.version}'>jclouds-commands</feature>
-        <bundle dependency='true'>mvn:org.jclouds.driver/jclouds-slf4j/${jclouds.version}</bundle>
-        <bundle>mvn:org.jclouds.karaf.chef/cache/${project.version}</bundle>
-        <bundle>mvn:org.jclouds.karaf.chef/services/${project.version}</bundle>
-        <bundle>mvn:org.jclouds.karaf.chef/commands/${project.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.jclouds.driver/jclouds-slf4j/${jclouds.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.karaf.chef/cache/${project.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.karaf.chef/services/${project.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.karaf.chef/commands/${project.version}</bundle>
     </feature>
 
      <feature name="jclouds-url-handler" description="Url Handler for JClouds Blobs" version="${project.version}" resolver="(obr)">
         <feature version='${project.version}'>jclouds</feature>
-        <bundle>mvn:org.jclouds.karaf/urlhandler/${project.version}</bundle>
+        <bundle>mvn:org.apache.jclouds.karaf/urlhandler/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/itests/src/test/java/org/jclouds/karaf/itests/JcloudsKarafTestSupport.java b/itests/src/test/java/org/jclouds/karaf/itests/JcloudsKarafTestSupport.java
index 2e944dd..c193788 100644
--- a/itests/src/test/java/org/jclouds/karaf/itests/JcloudsKarafTestSupport.java
+++ b/itests/src/test/java/org/jclouds/karaf/itests/JcloudsKarafTestSupport.java
@@ -59,10 +59,10 @@ public class JcloudsKarafTestSupport {
     public static final String KARAF_GROUP_ID = "org.apache.karaf";
     public static final String KARAF_ARTIFACT_ID = "apache-karaf";
 
-    public static final String JCLOUDS_KARAF_GROUP_ID = "org.jclouds.karaf";
+    public static final String JCLOUDS_KARAF_GROUP_ID = "org.apache.jclouds.karaf";
     public static final String JCLOUDS_KARAF_ARTIFACT_ID = "jclouds-karaf";
 
-    public static final String JCLOUDS_GROUP_ID = "org.jclouds";
+    public static final String JCLOUDS_GROUP_ID = "org.apache.jclouds";
     public static final String JCLOUDS_ARTIFACT_ID = "jclouds-core";
 
     @Inject