diff --git a/_generator/default/project/golang.json b/_generator/default/project/golang.json
index 12042ec..335a342 100644
--- a/_generator/default/project/golang.json
+++ b/_generator/default/project/golang.json
@@ -5,7 +5,7 @@
     "templates": [
         {
             "engine": "",  
-            "folder": "{{.SelfFolder}}/definitions/{{.TemplateName}}",
+            "folder": "{{.TemplateDefinition.SelfFolder}}/definitions/{{.TemplateDefinition.TemplateName}}",
             "file_name": "*",
             "output_folder": "^/srcg",
             "output_name": "*"
diff --git a/rediops/default/definitions/qaskx_server/qaskx-lint.yaml b/rediops/default/definitions/qaskx_server/qaskx-lint.yaml
index dc43ff1..ee75a60 100644
--- a/rediops/default/definitions/qaskx_server/qaskx-lint.yaml
+++ b/rediops/default/definitions/qaskx_server/qaskx-lint.yaml
@@ -99,13 +99,13 @@ rules:
   severity_type: warning
   values:
   - ^.*/metadata.*$
-  handler: sku61.com/qaskx/execute.QLintMissingFile
+  handler: sku61.com/qaskx/execute.QLintFile
 - rule_identifier: MIS_SRC_FILE
   rule_type: vcs
   severity_type: warning
   values:
   - .*/.*lint.go$
-  handler: sku61.com/qaskx/execute.QLintMissingFile
+  handler: sku61.com/qaskx/execute.QLintFile
 - rule_identifier: EXR_SRC_FILE
   rule_type: vcs
   values:
@@ -117,4 +117,4 @@ rules:
   severity_type: error
   values:
   - ^/tools/golang/test.data/legacy_metadata.yaml$
-  handler: sku61.com/qaskx/execute.QLintMissingFile
+  handler: sku61.com/qaskx/execute.QLintFile