diff --git a/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java b/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java
index cae3346e7532..f90ddb0897db 100644
--- a/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java
+++ b/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java
@@ -69,7 +69,7 @@ public class DefaultCodegen {
   }
 
   public String toApiFilename(String name) {
-    return initialCaps(name);
+    return initialCaps(name) + "Api";
   }
 
   public String toModelFilename(String name) {
@@ -224,7 +224,7 @@ public class DefaultCodegen {
   }
 
   public String toApiName(String name) {
-    return initialCaps(name);
+    return initialCaps(name) + "Api";
   }
 
   public String toModelName(String name) {