diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
index 0964f0e2a0e..90ed4ab5e26 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@@ -1706,8 +1706,9 @@ public class DefaultCodegen {
             property.isFile = true;
         }
         if (p instanceof UUIDProperty) {
-            property.isString = true;
             property.isUuid = true;
+            // keep isString to true to make it backward compatible
+            property.isString = true;
         }
         if (p instanceof ByteArrayProperty) {
             property.isByteArray = true;
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/Api/StoreApi.md b/samples/client/petstore/php/SwaggerClient-php/docs/Api/StoreApi.md
index a377df225db..9daa65eba7b 100644
--- a/samples/client/petstore/php/SwaggerClient-php/docs/Api/StoreApi.md
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/Api/StoreApi.md
@@ -87,7 +87,7 @@ This endpoint does not need any parameter.
 
 ### Return type
 
-[**map[string,int]**](../Model/map.md)
+**map[string,int]**
 
 ### Authorization
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api_client.rb b/samples/client/petstore/ruby/lib/petstore/api_client.rb
index 65a161c2c05..9bb932695a7 100644
--- a/samples/client/petstore/ruby/lib/petstore/api_client.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api_client.rb
@@ -280,7 +280,7 @@ module Petstore
         data = {}
         form_params.each do |key, value|
           case value
-          when File, Array, nil
+          when ::File, ::Array, nil
             # let typhoeus handle File, Array and nil parameters
             data[key] = value
           else