diff --git a/Resources/config/aws_config.xml b/Resources/config/aws_config.xml
index d947fec..9097079 100644
--- a/Resources/config/aws_config.xml
+++ b/Resources/config/aws_config.xml
@@ -32,7 +32,8 @@
 
         <service id="aws_factory" class="%aws_factory.class%"/>
 
-        <service id="aws_service" class="AwsService" factory-service="aws_factory" factory-method="get" abstract="true">
+        <service id="aws_service" class="AwsService" abstract="true">
+            <factory service="aws_factory" method="get"></factory>
             <argument type="service" id="aws"/>
         </service>
 
diff --git a/Resources/config/aws_service.xml b/Resources/config/aws_service.xml
index 1096c79..fad8931 100644
--- a/Resources/config/aws_service.xml
+++ b/Resources/config/aws_service.xml
@@ -32,7 +32,8 @@
 
         <service id="aws_factory" class="%aws_factory.class%"/>
 
-        <service id="aws_service" class="AwsService" factory-service="aws_factory" factory-method="get" abstract="true">
+        <service id="aws_service" class="AwsService" abstract="true">
+            <factory service="aws_factory" method="get"></factory>
             <argument type="service" id="aws"/>
         </service>
 
diff --git a/composer.json b/composer.json
index 7c088d7..1ed8e94 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name":         "thephalcons/amazon-webservices-bundle",
+    "name":         "andrewlowther/amazon-webservices-bundle",
     "description":  "A Symfony2 Bundle for interfacing with Amazon Web Services (AWS)",
     "keywords":     ["amazon", "aws", "web services", "aws-sdk-php"],
     "license":      "MIT",