diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java
index 4034b966cb6..188e5c76644 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java
@@ -17,8 +17,8 @@ import java.util.HashSet;
 
 public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
     protected String invokerPackage = "Swagger\\Client";
-    protected String groupId = "swagger";
-    protected String artifactId = "swagger-client";
+    protected String composerVendorName = "swagger";
+    protected String composerProjectName = "swagger-client";
     protected String packagePath = "SwaggerClient-php";
     protected String artifactVersion = "1.0.0";
     protected String srcBasePath = "lib";
@@ -38,15 +38,6 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
                         "__halt_compiler", "abstract", "and", "array", "as", "break", "callable", "case", "catch", "class", "clone", "const", "continue", "declare", "default", "die", "do", "echo", "else", "elseif", "empty", "enddeclare", "endfor", "endforeach", "endif", "endswitch", "endwhile", "eval", "exit", "extends", "final", "for", "foreach", "function", "global", "goto", "if", "implements", "include", "include_once", "instanceof", "insteadof", "interface", "isset", "list", "namespace", "new", "or", "print", "private", "protected", "public", "require", "require_once", "return", "static", "switch", "throw", "trait", "try", "unset", "use", "var", "while", "xor")
         );
 
-        additionalProperties.put("invokerPackage", invokerPackage);
-        additionalProperties.put("modelPackage", modelPackage);
-        additionalProperties.put("apiPackage", apiPackage);
-        additionalProperties.put("srcBasePath", srcBasePath);
-        additionalProperties.put("escapedInvokerPackage", invokerPackage.replace("\\", "\\\\"));
-        additionalProperties.put("groupId", groupId);
-        additionalProperties.put("artifactId", artifactId);
-        additionalProperties.put("artifactVersion", artifactVersion);
-
         // ref: http://php.net/manual/en/language.types.intro.php
         languageSpecificPrimitives = new HashSet<String>(
                 Arrays.asList(
@@ -86,8 +77,12 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
         typeMapping.put("object", "object");
         typeMapping.put("DateTime", "\\DateTime");
         
-        cliOptions.add(new CliOption("packagePath", "main package name for classes"));
-        cliOptions.add(new CliOption("srcBasePath", "directory directory under packagePath to serve as source root"));
+        cliOptions.add(new CliOption("invokerPackage", "The main namespace to use for all classes."));
+        cliOptions.add(new CliOption("packagePath", "The main package name for classes."));
+        cliOptions.add(new CliOption("srcBasePath", "The directory under packagePath to serve as source root."));
+        cliOptions.add(new CliOption("composerVendorName", "The vendor name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name."));
+        cliOptions.add(new CliOption("composerProjectName", "The project name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name."));
+        cliOptions.add(new CliOption("artifactVersion", "The version to use in the composer package version field."));
     }
 
     public String getPackagePath() {
@@ -141,23 +136,52 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
 
         if (additionalProperties.containsKey("packagePath")) {
             this.setPackagePath((String) additionalProperties.get("packagePath"));
+        } else {
+            additionalProperties.put("packagePath", packagePath);
         }
 
         if (additionalProperties.containsKey("srcBasePath")) {
             this.setSrcBasePath((String) additionalProperties.get("srcBasePath"));
+        } else {
+            additionalProperties.put("srcBasePath", srcBasePath);
         }
-
+        
+        if (additionalProperties.containsKey("invokerPackage")) {
+            this.setInvokerPackage((String) additionalProperties.get("invokerPackage"));
+        } else {
+            additionalProperties.put("invokerPackage", invokerPackage);
+        }
+        
         if (additionalProperties.containsKey("modelPackage")) {
             this.setModelPackage((String) additionalProperties.get("modelPackage"));
+        } else {
+            additionalProperties.put("modelPackage", modelPackage);
         }
 
         if (additionalProperties.containsKey("apiPackage")) {
             this.setApiPackage((String) additionalProperties.get("apiPackage"));
+        } else {
+            additionalProperties.put("apiPackage", apiPackage);
         }
-
-        additionalProperties.put("srcBasePath", srcBasePath);
-        additionalProperties.put("modelPackage", modelPackage);
-        additionalProperties.put("apiPackage", apiPackage);
+                
+        if (additionalProperties.containsKey("composerProjectName")) {
+            this.setComposerProjectName((String) additionalProperties.get("composerProjectName"));
+        } else {
+            additionalProperties.put("composerProjectName", composerProjectName);
+        }
+        
+        if (additionalProperties.containsKey("composerVendorName")) {
+            this.setComposerVendorName((String) additionalProperties.get("composerVendorName"));
+        } else {
+            additionalProperties.put("composerVendorName", composerVendorName);
+        }
+        
+        if (additionalProperties.containsKey("artifactVersion")) {
+            this.setArtifactVersion((String) additionalProperties.get("artifactVersion"));
+        } else {
+            additionalProperties.put("artifactVersion", artifactVersion);
+        }
+        
         additionalProperties.put("escapedInvokerPackage", invokerPackage.replace("\\", "\\\\"));
 
         supportingFiles.add(new SupportingFile("configuration.mustache", toPackagePath(invokerPackage, srcBasePath), "Configuration.php"));
@@ -235,6 +259,10 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
     public void setInvokerPackage(String invokerPackage) {
         this.invokerPackage = invokerPackage;
     }
+        
+    public void setArtifactVersion(String artifactVersion) {
+        this.artifactVersion = artifactVersion;
+    }
 
     public void setPackagePath(String packagePath) {
         this.packagePath = packagePath;
@@ -243,6 +271,14 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
     public void setSrcBasePath(String srcBasePath) {
         this.srcBasePath = srcBasePath;
     }
+    
+    private void setComposerVendorName(String composerVendorName) {
+        this.composerVendorName = composerVendorName;
+    }
+    
+    public void setComposerProjectName(String composerProjectName) {
+        this.composerProjectName = composerProjectName;
+    }
 
     @Override
     public String toVarName(String name) {
diff --git a/modules/swagger-codegen/src/main/resources/php/composer.mustache b/modules/swagger-codegen/src/main/resources/php/composer.mustache
index 52425899ce7..994b6f1ccc7 100644
--- a/modules/swagger-codegen/src/main/resources/php/composer.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/composer.mustache
@@ -1,5 +1,5 @@
 {
-    "name": "{{groupId}}/{{artifactId}}",{{#artifactVersion}}
+    "name": "{{composerVendorName}}/{{composerProjectName}}",{{#artifactVersion}}
     "version": "{{artifactVersion}}",{{/artifactVersion}}
     "description": "{{description}}",
     "keywords": [
diff --git a/samples/client/petstore/php/test.php b/samples/client/petstore/php/test.php
index 79cc4ca4ad7..099e2975a4a 100644
--- a/samples/client/petstore/php/test.php
+++ b/samples/client/petstore/php/test.php
@@ -21,7 +21,7 @@ try {
     //$api_client = new Swagger\Client\ApiClient('http://petstore.swagger.io/v2');
     //$api_client->getConfig()->addDefaultHeader("test1", "value1");
     //$pet_api = new Swagger\Client\PetAPI($api_client);
-    $pet_api = new Swagger\Client\Api\PetAPI();
+    $pet_api = new Swagger\Client\Api\PetApi();
     $pet_api->getApiClient()->getConfig()->setTempFolderPath('/var/tmp/php/');
     // test default header
     //$pet_api->getApiClient()->addDefaultHeader("TEST_API_KEY", "09182sdkanafndsl903");
@@ -47,7 +47,7 @@ try {
     $new_pet->setTags(array($tag));
     $new_pet->setCategory($category);
 
-    $pet_api = new Swagger\Client\Api\PetAPI();
+    $pet_api = new Swagger\Client\Api\PetApi();
     // add a new pet (model)
     $add_response = $pet_api->addPet($new_pet);