diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PythonClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PythonClientCodegen.java
index 132095e7d611..c578e049bedd 100755
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PythonClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PythonClientCodegen.java
@@ -113,7 +113,7 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
   public String toDefaultValue(Property p) {
 	// TODO: Support Python def value
     return "null";
-  }	
+  }
 
   @Override
   public String toVarName(String name) {
@@ -176,9 +176,15 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
   public String toApiName(String name) {
     if(name.length() == 0)
       return "DefaultApi";
-    // e.g. phone_number_api => PhoneNumberApi 
+    // e.g. phone_number_api => PhoneNumberApi
     return camelize(name) + "Api";
   }
 
+  @Override
+  public String toApiVarName(String name) {
+      if(name.length() == 0)
+          return "default_api";
+    return underscore(name) + "_api";
+  }
 
 }
diff --git a/modules/swagger-codegen/src/main/resources/python/__init__package.mustache b/modules/swagger-codegen/src/main/resources/python/__init__package.mustache
index 4b595ed56b8a..e88c5f01ee23 100644
--- a/modules/swagger-codegen/src/main/resources/python/__init__package.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/__init__package.mustache
@@ -3,16 +3,14 @@
 import os
 
 # import models into package
-{{#models}}
-{{#model}}
-from .models.{{classname}} import {{classname}}
-{{/model}}
-{{/models}}
+{{#models}}{{#model}}
+from .models.{{classVarName}} import {{classname}}
+{{/model}}{{/models}}
 
 # import apis into package
-{{#apiInfo}}{{#apis}}{{#operations}}
-from .{{classname}} import {{classname}}
-{{/operations}}{{/apis}}{{/apiInfo}}
+{{#apiInfo}}{{#apis}}
+from .{{classVarName}} import {{classname}}
+{{/apis}}{{/apiInfo}}
 
 # import ApiClient
 from .swagger import ApiClient
diff --git a/samples/client/petstore/python/client/__init__.py b/samples/client/petstore/python/client/__init__.py
index a8240eaf541d..30d634bc4b38 100644
--- a/samples/client/petstore/python/client/__init__.py
+++ b/samples/client/petstore/python/client/__init__.py
@@ -3,19 +3,25 @@
 import os
 
 # import models into package
-from .models.User import User
-from .models.Category import Category
-from .models.Pet import Pet
-from .models.Tag import Tag
-from .models.Order import Order
+
+from .models.user import User
+
+from .models.category import Category
+
+from .models.pet import Pet
+
+from .models.tag import Tag
+
+from .models.order import Order
+
 
 # import apis into package
 
-from .UserApi import UserApi
+from .user_api import UserApi
 
-from .PetApi import PetApi
+from .pet_api import PetApi
 
-from .StoreApi import StoreApi
+from .store_api import StoreApi
 
 
 # import ApiClient