diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java
index c0430515201..8f78f2e1d49 100755
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java
@@ -117,7 +117,7 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
 
     @Override
     public String escapeReservedWord(String name) {
-        return "_" + name;
+        return name + "_";
     }
 
     @Override
@@ -160,8 +160,7 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
     }
 
     public String toDefaultValue(Property p) {
-        // TODO: Support Python def value
-        return "null";
+        return "None";
     }
 
     @Override
@@ -183,6 +182,9 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
             name = escapeReservedWord(name);
         }
 
+        // remove leading underscore
+        name = name.replaceAll("^_*", "");
+
         return name;
     }