diff --git a/package.json b/package.json
index f13d2126c1..a3b381cb96 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "cross-spawn": "^4.0.0",
     "del": "^2.2.0",
     "dgeni": "^0.4.0",
-    "dgeni-packages": "^0.13.1",
+    "dgeni-packages": "^0.15.2",
     "diff": "^2.1.3",
     "fs-extra": "^0.30.0",
     "globby": "^4.0.0",
diff --git a/tools/api-builder/angular.io-package/templates/class.template.html b/tools/api-builder/angular.io-package/templates/class.template.html
index 66809d79b8..bb9afaeb6b 100644
--- a/tools/api-builder/angular.io-package/templates/class.template.html
+++ b/tools/api-builder/angular.io-package/templates/class.template.html
@@ -1,5 +1,5 @@
-{% include "lib/githubLinks.html" -%}
-{% include "lib/paramList.html" -%}
+{% import "lib/githubLinks.html" as github -%}
+{% import "lib/paramList.html" as params -%}
 {% extends 'layout/base.template.html' -%}
 
 {% block body %}
@@ -25,7 +25,7 @@ div(layout="row" layout-xs="column" class="ng-cloak")
         pre(class="prettyprint no-bg-with-indent")
           a(class="code-anchor" href="#{$ member.name $}-anchor")
             code(class="code-background api-doc-code") {$ member.name | indent(6, false) | trim $}
-          code(class="api-doc-code") {$ paramList(member.parameters) | indent(8, false) | trim $}{$ returnType(member.returnType) $}
+          code(class="api-doc-code") {$ params.paramList(member.parameters) | indent(8, false) | trim $}{$ params.returnType(member.returnType) $}
       {% endif %}{% endfor %}
     {% endif %}
     {% if doc.constructorDoc.name %}
@@ -34,7 +34,7 @@ div(layout="row" layout-xs="column" class="ng-cloak")
         a(class="code-anchor" href="#constructor")
           code(class="code-background api-doc-code") {$ doc.constructorDoc.name $}
         code(class="api-doc-code").
-          {$ paramList(doc.constructorDoc.parameters) | indent(8, false) | trim $}
+          {$ params.paramList(doc.constructorDoc.parameters) | indent(8, false) | trim $}
     {% endif %}
     {% if doc.members.length %}
     div(layout="column")
@@ -42,7 +42,7 @@ div(layout="row" layout-xs="column" class="ng-cloak")
         pre(class="prettyprint no-bg-with-indent")
           a(class="code-anchor" href="#{$ member.name $}-anchor")
             code(class="code-background api-doc-code") {$ member.name | indent(6, false) | trim $}
-          code(class="api-doc-code") {$ paramList(member.parameters) | indent(8, false) | trim $}{$ returnType(member.returnType) $}
+          code(class="api-doc-code") {$ params.paramList(member.parameters) | indent(8, false) | trim $}{$ params.returnType(member.returnType) $}
       {% endif %}{% endfor %}
     {% endif %}
     p(class="selector endParens")
@@ -69,7 +69,7 @@ div(layout="row" layout-xs="column" class="row-margin ng-cloak")
     {%- for decorator in doc.decorators %}
       pre.prettyprint.no-bg
         code(class="api-doc-code").
-          @{$ decorator.name $}{$ paramList(decorator.arguments) | indent(10, false) $}
+          @{$ decorator.name $}{$ params.paramList(decorator.arguments) | indent(10, false) $}
       :marked
       {%- if not decorator.notYetDocumented %}
         {$ decorator.description | indentForMarkdown(8) | trimBlankLines $}
@@ -86,7 +86,7 @@ div(layout="row" layout-xs="column" class="row-margin ng-cloak")
     a(name="constructor" class="anchor-offset")
     pre(class="prettyprint no-bg" ng-class="{ 'anchor-focused': appCtrl.isApiDocMemberFocused('{$ doc.constructorDoc.name $}') }")
       code(class="api-doc-code").
-        {$ doc.constructorDoc.name $}{$ paramList(doc.constructorDoc.parameters) | indent(8, false) | trim $}
+        {$ doc.constructorDoc.name $}{$ params.paramList(doc.constructorDoc.parameters) | indent(8, false) | trim $}
     :marked
       {%- if not doc.constructorDoc.notYetDocumented %}
 {$ doc.constructorDoc.description | indentForMarkdown(6) | replace('### Example', '') | replace('## Example', '') | replace('# Example', '') | trimBlankLines $}
@@ -102,7 +102,7 @@ div(layout="row" layout-xs="column" class="row-margin ng-cloak")
     a(name="{$ member.name $}-anchor" class="anchor-offset")
     pre(class="prettyprint no-bg" ng-class="{ 'anchor-focused': appCtrl.isApiDocMemberFocused('{$ member.name $}') }")
       code(class="api-doc-code").
-        {$ member.name $}{$ paramList(member.parameters) | indent(8, false) | trim $}{$ returnType(member.returnType) $}
+        {$ member.name $}{$ params.paramList(member.parameters) | indent(8, false) | trim $}{$ params.returnType(member.returnType) $}
     :marked
       {%- if not member.notYetDocumented %}
 {$ member.description | indentForMarkdown(6) | replace('### Example', '') | replace('## Example', '') | replace('# Example', '') | trimBlankLines $}
@@ -124,7 +124,7 @@ div(layout="row" layout-xs="column" class="instance-members" class="row-margin n
     a(name="{$ member.name $}-anchor" class="anchor-offset")
     pre(class="prettyprint no-bg" ng-class="{ 'anchor-focused': appCtrl.isApiDocMemberFocused('{$ member.name $}') }")
       code(class="api-doc-code").
-        {$ member.name $}{$ paramList(member.parameters) | indent(8, false) | trim $}{$ returnType(member.returnType) $}
+        {$ member.name $}{$ params.paramList(member.parameters) | indent(8, false) | trim $}{$ params.returnType(member.returnType) $}
 
     :marked
       {%- if not member.notYetDocumented %}
@@ -140,6 +140,6 @@ div(layout="row" layout-xs="column" class="instance-members" class="row-margin n
 
 p(class="location-badge").
   exported from {@link {$ doc.moduleDoc.id $} {$doc.moduleDoc.id $} },
-  defined in {$ githubViewLink(doc) $}
+  defined in {$ github.githubViewLink(doc) $}
 
 {% endblock %}
diff --git a/tools/api-builder/angular.io-package/templates/decorator.template.html b/tools/api-builder/angular.io-package/templates/decorator.template.html
index 7c86eca94d..c055039527 100644
--- a/tools/api-builder/angular.io-package/templates/decorator.template.html
+++ b/tools/api-builder/angular.io-package/templates/decorator.template.html
@@ -1,5 +1,5 @@
-{% include "lib/githubLinks.html" -%}
-{% include "lib/paramList.html" -%}
+{% import "lib/githubLinks.html" as github -%}
+{% import "lib/paramList.html" as params -%}
 {% extends 'layout/base.template.html' %}
 
 {% block body %}
@@ -19,13 +19,13 @@ div(layout="row" layout-xs="column" class="row-margin ng-cloak")
   div(class="code-links" flex="80" flex-xs="100")
     pre.prettyprint.no-bg
       code.
-        export {$ doc.name $}(options : {@link {$ doc.decoratorType $} {$ doc.decoratorType | escape $}}){$ returnType(doc.returnType) $}
+        export {$ doc.name $}(options : {@link {$ doc.decoratorType $} {$ doc.decoratorType | escape $}}){$ params.returnType(doc.returnType) $}
     :marked
       {%- if not doc.notYetDocumented %}
 {$ doc.description | indentForMarkdown(6) | trimBlankLines $}
       {% endif %}
 
 p.location-badge.
-  exported from {@link {$ doc.moduleDoc.id $} {$doc.moduleDoc.id $} } defined in {$ githubViewLink(doc) $}
+  exported from {@link {$ doc.moduleDoc.id $} {$doc.moduleDoc.id $} } defined in {$ github.githubViewLink(doc) $}
 
 {% endblock %}
diff --git a/tools/api-builder/angular.io-package/templates/directive.template.html b/tools/api-builder/angular.io-package/templates/directive.template.html
index 4bff9414cb..5e8a3cd24d 100644
--- a/tools/api-builder/angular.io-package/templates/directive.template.html
+++ b/tools/api-builder/angular.io-package/templates/directive.template.html
@@ -1,5 +1,5 @@
-{% include "lib/githubLinks.html" -%}
-{% include "lib/paramList.html" -%}
+{% import "lib/githubLinks.html" as github -%}
+{% import "lib/paramList.html" as params -%}
 {% extends 'class.template.html' -%}
 
 {% block annotations %}
diff --git a/tools/api-builder/angular.io-package/templates/function.template.html b/tools/api-builder/angular.io-package/templates/function.template.html
index 7cac55eb24..7cf1d85640 100644
--- a/tools/api-builder/angular.io-package/templates/function.template.html
+++ b/tools/api-builder/angular.io-package/templates/function.template.html
@@ -1,5 +1,5 @@
-{% include "lib/githubLinks.html" -%}
-{% include "lib/paramList.html" -%}
+{% import "lib/githubLinks.html" as github -%}
+{% import "lib/paramList.html" as params -%}
 {% extends 'layout/base.template.html' -%}
 
 {% block body %}
@@ -19,13 +19,13 @@ div(layout="row" layout-xs="column" class="row-margin ng-cloak")
   div(class="code-links" flex="80" flex-xs="100")
     pre.prettyprint.no-bg
       code.
-        export {$ doc.name $}{$ paramList(doc.parameters) | indent(8, true) | trim $}{$ returnType(doc.returnType) $}
+        export {$ doc.name $}{$ params.paramList(doc.parameters) | indent(8, true) | trim $}{$ params.returnType(doc.returnType) $}
     :marked
       {%- if not doc.notYetDocumented %}
 {$ doc.description | indentForMarkdown(6) | trimBlankLines $}
       {% endif %}
 
 p.location-badge.
-  exported from {@link {$ doc.moduleDoc.id $} {$doc.moduleDoc.id $} } defined in {$ githubViewLink(doc) $}
+  exported from {@link {$ doc.moduleDoc.id $} {$doc.moduleDoc.id $} } defined in {$ github.githubViewLink(doc) $}
 
 {% endblock %}
\ No newline at end of file
diff --git a/tools/api-builder/angular.io-package/templates/interface.template.html b/tools/api-builder/angular.io-package/templates/interface.template.html
index 9151b3a5b0..59d7ae7cc5 100644
--- a/tools/api-builder/angular.io-package/templates/interface.template.html
+++ b/tools/api-builder/angular.io-package/templates/interface.template.html
@@ -1,5 +1,5 @@
-{% include "lib/githubLinks.html" -%}
-{% include "lib/paramList.html" -%}
+{% import "lib/githubLinks.html" as github -%}
+{% import "lib/paramList.html" as params -%}
 {% extends 'layout/base.template.html' -%}
 
 {% block body %}
@@ -25,7 +25,7 @@ div(layout="row" layout-xs="column" class="ng-cloak")
         pre(class="prettyprint no-bg-with-indent")
           a(class="code-anchor" href="#{$ member.name $}-anchor")
             code(class="code-background api-doc-code") {$ member.name | indent(6, false) | trim $}
-          code(class="api-doc-code") {$ paramList(member.parameters) | indent(8, false) | trim $}{$ returnType(member.returnType) $}
+          code(class="api-doc-code") {$ params.paramList(member.parameters) | indent(8, false) | trim $}{$ params.returnType(member.returnType) $}
       {% endif %}{% endfor %}
     {% endif %}
     p(class="selector endParens")
@@ -52,7 +52,7 @@ div(layout="row" layout-xs="column" class="instance-members" class="row-margin n
     a(name="{$ member.name $}-anchor" class="anchor-offset")
     pre(class="prettyprint no-bg" ng-class="{ 'anchor-focused': appCtrl.isApiDocMemberFocused('{$ member.name $}') }")
       code(class="api-doc-code").
-        {$ member.name $}{$ paramList(member.parameters) | indent(8, false) | trim $}{$ returnType(member.returnType) $}
+        {$ member.name $}{$ params.paramList(member.parameters) | indent(8, false) | trim $}{$ params.returnType(member.returnType) $}
 
     :marked
       {%- if not member.notYetDocumented %}
@@ -68,6 +68,6 @@ div(layout="row" layout-xs="column" class="instance-members" class="row-margin n
 
 p(class="location-badge").
   exported from {@link {$ doc.moduleDoc.id $} {$doc.moduleDoc.id $} },
-  defined in {$ githubViewLink(doc) $}
+  defined in {$ github.githubViewLink(doc) $}
 
 {% endblock %}
diff --git a/tools/api-builder/angular.io-package/templates/module.template.html b/tools/api-builder/angular.io-package/templates/module.template.html
index fb62f190e4..d047e67fb1 100644
--- a/tools/api-builder/angular.io-package/templates/module.template.html
+++ b/tools/api-builder/angular.io-package/templates/module.template.html
@@ -1,9 +1,9 @@
-{% include "lib/githubLinks.html" -%}
+{% import "lib/githubLinks.html" as github -%}
 {% extends 'layout/base.template.html' -%}
 {% block body -%}
 include {$ relativePath(doc.path, '_util-fns') $}
 p.location-badge.
-  defined in {$ githubViewLink(doc) $}
+  defined in {$ github.githubViewLink(doc) $}
 
 ul
   {% for page in doc.childPages -%}
diff --git a/tools/api-builder/angular.io-package/templates/overview-dump.template.html b/tools/api-builder/angular.io-package/templates/overview-dump.template.html
index 535b57be45..e02c70adff 100644
--- a/tools/api-builder/angular.io-package/templates/overview-dump.template.html
+++ b/tools/api-builder/angular.io-package/templates/overview-dump.template.html
@@ -1,5 +1,5 @@
-{% include "lib/githubLinks.html" -%}
-{% include "lib/paramList.html" -%}
+{% import "lib/githubLinks.html" as github -%}
+{% import "lib/paramList.html" as params -%}
 <!DOCTYPE html>
 <html>
 <head>
@@ -47,21 +47,21 @@
 
   {% for export in module.exports %}
   <h3 {% if export.notYetDocumented %}class="not-documented"{% endif %}>
-    <a href="{$ githubHref(export) $}">
+    <a href="{$ github.githubHref(export) $}">
     <code>{$ export.docType $} {$ export.name $}</code>
     </a>
   </h3>
       {%- if export.constructorDoc %}
       <h4  {% if export.constructorDoc.notYetDocumented %}class="not-documented"{% endif %}>
-        <a href="{$ githubHref(export.constructorDoc) $}">
-        <code>{$ export.constructorDoc.name $}{$ paramList(export.constructorDoc.params) $}</code>
+        <a href="{$ github.githubHref(export.constructorDoc) $}">
+        <code>{$ export.constructorDoc.name $}{$ params.paramList(export.constructorDoc.params) $}</code>
         </a>
       </h4>
     {% endif -%}
     {%- for member in export.members %}
       <h4 {% if member.notYetDocumented %}class="not-documented"{% endif %}>
-        <a href="{$ githubHref(member) $}">
-        <code>{$ member.name $}{$ paramList(member.params) $}</code>
+        <a href="{$ github.githubHref(member) $}">
+        <code>{$ member.name $}{$ params.paramList(member.params) $}</code>
         </a>
       </h4>
     {% endfor %}
diff --git a/tools/api-builder/angular.io-package/templates/var.template.html b/tools/api-builder/angular.io-package/templates/var.template.html
index fc9851617e..6985ec43ff 100644
--- a/tools/api-builder/angular.io-package/templates/var.template.html
+++ b/tools/api-builder/angular.io-package/templates/var.template.html
@@ -1,5 +1,5 @@
-{% include "lib/githubLinks.html" -%}
-{% include "lib/paramList.html" -%}
+{% import "lib/githubLinks.html" as github -%}
+{% import "lib/paramList.html" as params -%}
 {% extends 'layout/base.template.html' %}
 
 {% block body %}
@@ -27,6 +27,6 @@ div(layout="row" layout-xs="column" class="row-margin ng-cloak")
 
 p.location-badge.
   exported from {@link {$ doc.moduleDoc.id $} {$doc.moduleDoc.id $} }
-  defined in {$ githubViewLink(doc) $}
+  defined in {$ github.githubViewLink(doc) $}
 
 {% endblock %}
diff --git a/tools/api-builder/docs-package/templates/module.template.html b/tools/api-builder/docs-package/templates/module.template.html
index 34ab0f67ab..c4b7360141 100644
--- a/tools/api-builder/docs-package/templates/module.template.html
+++ b/tools/api-builder/docs-package/templates/module.template.html
@@ -1,9 +1,9 @@
-{% include "lib/githubLinks.html" -%}
+{% import "lib/githubLinks.html" as github -%}
 {% extends 'layout/base.template.html' %}
 
 {% block body %}
 <h1 class="id">{$ doc.id $} <span class="type">module</span></h1>
-<p>defined in {$ githubViewLink(doc) $}</p>
+<p>defined in {$ github.githubViewLink(doc) $}</p>
 <p>{$ doc.description | marked $}</p>
 
 {% if doc.exports.length %}