diff --git a/src/main/java/com/twilio/oai/template/AbstractApiActionTemplate.java b/src/main/java/com/twilio/oai/template/AbstractApiActionTemplate.java
index 2728afc34..8551cae43 100644
--- a/src/main/java/com/twilio/oai/template/AbstractApiActionTemplate.java
+++ b/src/main/java/com/twilio/oai/template/AbstractApiActionTemplate.java
@@ -67,10 +67,11 @@ protected String getVersionFilename(final String apiVersionClass) {
 
     public String apiFilename(final String templateName, final String filename) {
         final List<String> templateStrings = templates.get(VERSION_TEMPLATE);
-        final String apiVersionClass = codegen.additionalProperties().get("apiVersion").toString();
+        final String apiVersionClass = codegen.additionalProperties().get("apiVersionClass").toString();
 
         if (apiVersionClass != null && templateStrings != null && templateName.equals(templateStrings.get(0))) {
-            return codegen.apiFileFolder() + File.separator + apiVersionClass + templateStrings.get(1);
+            return codegen.apiFileFolder() + File.separator + getVersionFilename(apiVersionClass) +
+                templateStrings.get(1);
         }
 
         return filename;