diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Rails5ServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Rails5ServerCodegen.java
index dd35131cb74..61eef3fba02 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Rails5ServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Rails5ServerCodegen.java
@@ -186,7 +186,7 @@ public class Rails5ServerCodegen extends DefaultCodegen implements CodegenConfig
     }
 
     @Override
-    public String escapeReservedWord(String name) {           
+    public String escapeReservedWord(String name) {
         if(this.reservedWordsMappings().containsKey(name)) {
             return this.reservedWordsMappings().get(name);
         }
@@ -285,7 +285,7 @@ public class Rails5ServerCodegen extends DefaultCodegen implements CodegenConfig
         name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         // e.g. DefaultController => defaults_controller.rb
-        return underscore(name) + "s_controller";
+        return underscore(name) + "_controller";
     }
 
     @Override
diff --git a/samples/server/petstore/rails5/app/controllers/pets_controller.rb b/samples/server/petstore/rails5/app/controllers/pet_controller.rb
similarity index 100%
rename from samples/server/petstore/rails5/app/controllers/pets_controller.rb
rename to samples/server/petstore/rails5/app/controllers/pet_controller.rb
diff --git a/samples/server/petstore/rails5/app/controllers/stores_controller.rb b/samples/server/petstore/rails5/app/controllers/store_controller.rb
similarity index 100%
rename from samples/server/petstore/rails5/app/controllers/stores_controller.rb
rename to samples/server/petstore/rails5/app/controllers/store_controller.rb
diff --git a/samples/server/petstore/rails5/app/controllers/users_controller.rb b/samples/server/petstore/rails5/app/controllers/user_controller.rb
similarity index 100%
rename from samples/server/petstore/rails5/app/controllers/users_controller.rb
rename to samples/server/petstore/rails5/app/controllers/user_controller.rb