diff --git a/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java b/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java
index 05dfb6f1bd91..6c5a1e76a73b 100644
--- a/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java
+++ b/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java
@@ -66,9 +66,9 @@ public class DefaultGenerator implements Generator {
         List<CodegenOperation> ops = paths.get(tag);
 
         operations = processOperations(config, tag, ops);
+        operations.put("baseName", tag);
         operations.put("modelPackage", config.modelPackage());
         operations.putAll(config.additionalProperties());
-        operations.put("baseName", tag);
         for(String templateName : config.apiTemplateFiles().keySet()) {
           String suffix = config.apiTemplateFiles().get(templateName);
           String filename = config.apiFileFolder() +