diff --git a/client/components/menu/menu_component.html b/client/components/menu/menu_component.html
index cda8f15e5..2fc70abb5 100644
--- a/client/components/menu/menu_component.html
+++ b/client/components/menu/menu_component.html
@@ -1,4 +1,4 @@
-<!-- 
+<!--
 
 Menu Component
 
@@ -58,4 +58,4 @@ menuMode (String) [optional]
       </a>
     </div>
   </div>
-</template>
\ No newline at end of file
+</template>
diff --git a/client/components/menu/menu_component.js b/client/components/menu/menu_component.js
index 95a2597a0..33f03f694 100644
--- a/client/components/menu/menu_component.js
+++ b/client/components/menu/menu_component.js
@@ -16,12 +16,11 @@ getMenuItems = function (menu) {
   return menuItems;
 }
 
-Template[getTemplate('menuComponent')].helpers({
+Template.menuComponent.helpers({
   getMenuItems: function () {
     return getMenuItems(this);
   },
   menuClass: function () {
-
     var classes = [this.menuName+"-menu"];
     var mode = (typeof this.menuMode === "undefined") ? "list" : this.menuMode;
     var count = getMenuItems(this).length;
@@ -58,7 +57,7 @@ Template[getTemplate('menuComponent')].helpers({
   itemClass: function () {
     var itemClass = "";
     var currentPath = Router.current().location.get().path ;
-    
+
     if (this.adminOnly) {
       itemClass += " item-admin";
     }
@@ -81,10 +80,10 @@ Template[getTemplate('menuComponent')].helpers({
   }
 });
 
-Template[getTemplate('menuComponent')].events({
+Template.menuComponent.events({
   'click .show-more': function (e, t) {
     e.preventDefault();
     $menu = t.$('.menu');
     $menu.toggleClass('menu-open');
   }
-});
\ No newline at end of file
+});
diff --git a/client/components/postList/posts_list.html b/client/components/postList/posts_list.html
index a2294fca5..ab8545755 100644
--- a/client/components/postList/posts_list.html
+++ b/client/components/postList/posts_list.html
@@ -27,15 +27,15 @@ loadMoreHandler (Function)
 
 <template name="posts_list">
   <div class="posts-wrapper grid grid-module">
-    {{> Template.dynamic template=postsListIncoming data=incoming}}
+    {{> postsListIncoming data=incoming}}
     <div class="posts list {{postsLayout}}" aria-live="polite">
       {{#each postsCursor}}
-        {{> Template.dynamic template=before_post_item}}
-        {{> Template.dynamic template=post_item}}
-        {{> Template.dynamic template=after_post_item}}
+        {{> before_post_item}}
+        {{> post_item}}
+        {{> after_post_item}}
       {{/each}}
     </div>
-    {{> Template.dynamic template=postsLoadMore}}
+    {{> postsLoadMore}}
   </div>
 </template>
 
diff --git a/client/components/postList/posts_list.js b/client/components/postList/posts_list.js
index 47c7f5230..0661712d4 100644
--- a/client/components/postList/posts_list.js
+++ b/client/components/postList/posts_list.js
@@ -1,10 +1,10 @@
 // ----------------------------------- Post List -----------------------------------//
 
-Template[getTemplate('posts_list')].created = function() {
+Template.posts_list.created = function() {
   Session.set('listPopulatedAt', new Date());
 };
 
-Template[getTemplate('posts_list')].helpers({
+Template.posts_list.helpers({
   postsLayout: function () {
     return Settings.get('postsLayout', 'posts-list');
   },
@@ -13,15 +13,6 @@ Template[getTemplate('posts_list')].helpers({
     if (typeof controller.getDescription === 'function')
       return Iron.controller().getDescription();
   },
-  before_post_item: function () {
-    return getTemplate('before_post_item');
-  },
-  post_item: function () {
-    return getTemplate('post_item');
-  },
-  after_post_item: function () {
-    return getTemplate('after_post_item');
-  },
   postsCursor : function () {
     if (this.postsCursor) { // not sure why this should ever be undefined, but it can apparently
       var posts = this.postsCursor.map(function (post, index, cursor) {
@@ -32,21 +23,12 @@ Template[getTemplate('posts_list')].helpers({
     } else {
       console.log('postsCursor not defined')
     }
-  },
-  postsLoadMore: function () {
-    return getTemplate('postsLoadMore');
-  },
-  postsListIncoming: function () {
-    return getTemplate('postsListIncoming');
-  },
-  postsListSort: function () {
-    return getTemplate('postsListSort');
   }
 });
 
 // ----------------------------------- Incoming -----------------------------------//
 
-Template[getTemplate('postsListIncoming')].events({
+Template.postsListIncoming.events({
   'click .show-new': function(e, instance) {
     Session.set('listPopulatedAt', new Date());
   }
@@ -54,16 +36,16 @@ Template[getTemplate('postsListIncoming')].events({
 
 // ----------------------------------- Load More -----------------------------------//
 
-Template[getTemplate('postsLoadMore')].helpers({
+Template.postsLoadMore.helpers({
   postsReady: function () {
     return this.postsReady;
   },
   hasPosts: function () {
     return !!this.postsCursor.count();
-  }  
+  }
 });
 
-Template[getTemplate('postsLoadMore')].events({
+Template.postsLoadMore.events({
   'click .more-button': function (event, instance) {
     event.preventDefault();
     if (this.controllerInstance) {
diff --git a/client/main.js b/client/main.js
index 6c2f50bcc..c470d642f 100644
--- a/client/main.js
+++ b/client/main.js
@@ -40,3 +40,9 @@ Meteor.startup(function() {
   SEO.config(seoProperties);
 
 });
+
+// Template extension stuff for backwards compatibility
+
+_.each(templates, function (replacement, original) {
+  Template[replacement].replaces(original);
+});
\ No newline at end of file
diff --git a/client/views/admin/admin_menu.js b/client/views/admin/admin_menu.js
index 066c50f92..49fd08e91 100644
--- a/client/views/admin/admin_menu.js
+++ b/client/views/admin/admin_menu.js
@@ -1,4 +1,4 @@
-Template[getTemplate('adminMenu')].helpers({
+Template.adminMenu.helpers({
   adminMenuItems: function () {
     return adminMenu;
   }
diff --git a/client/views/admin/admin_wrapper.html b/client/views/admin/admin_wrapper.html
index e3ac795fa..32692e0c6 100644
--- a/client/views/admin/admin_wrapper.html
+++ b/client/views/admin/admin_wrapper.html
@@ -1,8 +1,8 @@
 <template name="adminWrapper">
   <div class="grid admin-wrapper">
-    {{> Template.dynamic template=adminMenu}}
+    {{> adminMenu}}
     <div class="admin-contents {{contentsClass}}">
       {{> Template.dynamic template=contents data=this}}
     </div>
   </div>
-</template>
\ No newline at end of file
+</template>
diff --git a/client/views/admin/admin_wrapper.js b/client/views/admin/admin_wrapper.js
index 64746aca1..93ec2df8e 100644
--- a/client/views/admin/admin_wrapper.js
+++ b/client/views/admin/admin_wrapper.js
@@ -1,7 +1,4 @@
-Template[getTemplate('adminWrapper')].helpers({
-  adminMenu: function () {
-    return getTemplate("adminMenu");
-  },
+Template.adminWrapper.helpers({
   contents: function () {
     return Router.current().route.getName();
   },
diff --git a/client/views/comments/comment_edit.js b/client/views/comments/comment_edit.js
index 3106137c5..c231f81ae 100644
--- a/client/views/comments/comment_edit.js
+++ b/client/views/comments/comment_edit.js
@@ -16,7 +16,7 @@ var editComment = function(instance) {
   Router.go('post_page_comment', {_id: comment.postId, commentId: comment._id});
 };
 
-Template[getTemplate('comment_edit')].onRendered(function() {
+Template.comment_edit.onRendered(function() {
   var self = this;
   this.$("#comment").keydown(function (e) {
     if(((e.metaKey || e.ctrlKey) && e.keyCode == 13) || (e.ctrlKey && e.keyCode == 13)){
@@ -25,7 +25,7 @@ Template[getTemplate('comment_edit')].onRendered(function() {
   });
 });
 
-Template[getTemplate('comment_edit')].events({
+Template.comment_edit.events({
   'click input[type=submit]': function(e, instance){
     e.preventDefault();
     editComment(instance);
diff --git a/client/views/comments/comment_form.js b/client/views/comments/comment_form.js
index 13916c1c9..4e11a7755 100644
--- a/client/views/comments/comment_form.js
+++ b/client/views/comments/comment_form.js
@@ -40,7 +40,7 @@ var submitComment = function(instance) {
   });
 };
 
-Template[getTemplate('comment_form')].onRendered(function() {
+Template.comment_form.onRendered(function() {
   var self = this;
   this.$("#comment").keydown(function (e) {
     if(((e.metaKey || e.ctrlKey) && e.keyCode == 13) || (e.ctrlKey && e.keyCode == 13)){
@@ -49,13 +49,13 @@ Template[getTemplate('comment_form')].onRendered(function() {
   });
 });
 
-Template[getTemplate('comment_form')].helpers({
+Template.comment_form.helpers({
   reason: function () {
     return !!Meteor.user() ? i18n.t('sorry_you_do_not_have_the_rights_to_comments'): i18n.t('please_log_in_to_comment');
   }
 });
 
-Template[getTemplate('comment_form')].events({
+Template.comment_form.events({
   'submit form': function(e, instance){
     e.preventDefault();
     submitComment(instance);
diff --git a/client/views/comments/comment_item.html b/client/views/comments/comment_item.html
index 7f12a4472..75e6ee9dd 100644
--- a/client/views/comments/comment_item.html
+++ b/client/views/comments/comment_item.html
@@ -38,7 +38,7 @@
         <ul class="comment-children comment-list">
         {{#each childComments}}
           {{#with this}}
-            {{> UI.dynamic template=comment_item}}
+            {{> comment_item}}
           {{/with}}
         {{/each}}
         </ul>
diff --git a/client/views/comments/comment_item.js b/client/views/comments/comment_item.js
index 2739db794..0bffdfa1d 100644
--- a/client/views/comments/comment_item.js
+++ b/client/views/comments/comment_item.js
@@ -56,16 +56,13 @@ findQueueContainer = function($comment) {
   return $container;
 };
 
-Template[getTemplate('comment_item')].created = function() {
+Template.comment_item.created = function() {
   // if comments are supposed to be queued, then queue this comment on create
   this.isQueued = window.queueComments;
   window.openedComments = [];
 };
 
-Template[getTemplate('comment_item')].helpers({
-  comment_item: function () {
-    return getTemplate('comment_item');
-  },
+Template.comment_item.helpers({
   commentClass: function () {
     // if this comment was made by the post author
     if (Posts.findOne(this.postId).userId == this.userId) {
@@ -124,7 +121,7 @@ var handleVoteClick = function (meteorMethodName, eventName, e, instance) {
   }
 };
 
-Template[getTemplate('comment_item')].events({
+Template.comment_item.events({
   'click .not-upvoted .upvote': _.partial(handleVoteClick, 'upvoteComment', 'post upvoted'),
   'click .upvoted .upvote': _.partial(handleVoteClick, 'cancelUpvoteComment', 'post upvote cancelled'),
   'click .not-downvoted .downvote': _.partial(handleVoteClick, 'downvoteComment', 'post downvoted'),
diff --git a/client/views/comments/comment_list.html b/client/views/comments/comment_list.html
index 25f6ba1ff..a8dd99ea0 100644
--- a/client/views/comments/comment_list.html
+++ b/client/views/comments/comment_list.html
@@ -1,10 +1,10 @@
 <template name="comment_list">
   <ul class="comments comment-list" aria-live="polite">
     {{#each child_comments}}
-      {{> UI.dynamic template=comment_item}}
+      {{> comment_item}}
     {{/each}}
   </ul>
   {{#each threadModules}}
-    {{> UI.dynamic template=getTemplate data=..}}
+    {{> Template.dynamic template=template data=..}}
   {{/each}}
 </template>
diff --git a/client/views/comments/comment_list.js b/client/views/comments/comment_list.js
index 5f32aaa84..e7a5dc23d 100644
--- a/client/views/comments/comment_list.js
+++ b/client/views/comments/comment_list.js
@@ -1,7 +1,4 @@
-Template[getTemplate('comment_list')].helpers({
-  comment_item: function () {
-    return getTemplate('comment_item');
-  },
+Template.comment_list.helpers({
   child_comments: function(){
     var post = this;
     var comments = Comments.find({postId: post._id, parentCommentId: null}, {sort: {score: -1, postedAt: -1}});
@@ -9,13 +6,10 @@ Template[getTemplate('comment_list')].helpers({
   },
   threadModules: function () {
     return threadModules;
-  },
-  getTemplate: function () {
-    return getTemplate(this.template);
   }
 });
 
-Template[getTemplate('comment_list')].rendered = function(){
+Template.comment_list.rendered = function(){
   // once all comments have been rendered, activate comment queuing for future real-time comments
   window.queueComments = true;
-};
\ No newline at end of file
+};
diff --git a/client/views/comments/comment_reply.html b/client/views/comments/comment_reply.html
index e3e82b212..1e09e742c 100644
--- a/client/views/comments/comment_reply.html
+++ b/client/views/comments/comment_reply.html
@@ -3,18 +3,18 @@
     
     {{#with post}}
       <div class="posts posts-list">
-        {{> UI.dynamic template=post_item}}
+        {{> post_item}}
       </div>
     {{/with}}
 
     {{#with comment}}
       <ul class="selected-comment" aria-live="polite">
-       {{> UI.dynamic template=comment_item}}
+       {{> comment_item}}
       </ul>
     {{/with}}
 
     {{#if canComment}}
-      {{> UI.dynamic template=comment_form}}
+      {{> comment_form}}
     {{/if}}
 
     {{#if isLoggedIn}}
diff --git a/client/views/comments/comment_reply.js b/client/views/comments/comment_reply.js
index cb1f7b6b5..01ab37c2b 100644
--- a/client/views/comments/comment_reply.js
+++ b/client/views/comments/comment_reply.js
@@ -1,17 +1,8 @@
-Template[getTemplate('comment_reply')].helpers({
-  post_item: function () {
-    return getTemplate('post_item');
-  },
-  comment_item: function () {
-    return getTemplate('comment_item');
-  },
-  comment_form: function () {
-    return getTemplate('comment_form');
-  },
+Template.comment_reply.helpers({
   post: function () {
     if(this.comment){ // XXX
       var post = Posts.findOne(this.comment.postId);
       return post;
     }
   }
-});
\ No newline at end of file
+});
diff --git a/client/views/common/css.html b/client/views/common/css.html
index 8730912c9..d396a59d9 100644
--- a/client/views/common/css.html
+++ b/client/views/common/css.html
@@ -1,8 +1,8 @@
 <template name="css">
   <style>
-      
+
       {{elementColors}}
-      
+
       body, textarea, input, button, input[type="submit"], input[type="button"]{
         font-family: {{getSetting 'fontFamily'}};
       }
@@ -26,5 +26,5 @@
       }
 
   </style>
-  <link href='{{getSetting 'fontUrl'}}' rel='stylesheet' type='text/css'>
-</template>
\ No newline at end of file
+  <link href='{{getSetting "fontUrl"}}' rel='stylesheet' type='text/css'>
+</template>
diff --git a/client/views/common/css.js b/client/views/common/css.js
index e3c97d35f..c46ff78cc 100644
--- a/client/views/common/css.js
+++ b/client/views/common/css.js
@@ -1,4 +1,4 @@
-Template[getTemplate('css')].helpers({
+Template.css.helpers({
   elementColors: function () {
     var css = "";
 
diff --git a/client/views/common/footer.html b/client/views/common/footer.html
index f07075b3f..1bcb950fa 100644
--- a/client/views/common/footer.html
+++ b/client/views/common/footer.html
@@ -5,6 +5,6 @@
     </div>
   {{/if}}
   {{#each footerModules}}
-    {{> UI.dynamic template=getTemplate}}
+    {{> Template.dynamic template=template}}
   {{/each}}
-</template>
\ No newline at end of file
+</template>
diff --git a/client/views/common/footer.js b/client/views/common/footer.js
index 90e0eb613..e81f1dd11 100644
--- a/client/views/common/footer.js
+++ b/client/views/common/footer.js
@@ -1,4 +1,4 @@
-Template[getTemplate('footer')].helpers({
+Template.footer.helpers({
   footerCode: function(){
     return Settings.get('footerCode');
   },
@@ -7,8 +7,5 @@ Template[getTemplate('footer')].helpers({
   },
   footerModules: function () {
     return footerModules;
-  },
-  getTemplate: function () {
-    return getTemplate(this.template);
   }
 });
diff --git a/client/views/common/layout.html b/client/views/common/layout.html
index e1a3cbd34..12678f3e7 100644
--- a/client/views/common/layout.html
+++ b/client/views/common/layout.html
@@ -1,22 +1,22 @@
 <template name="layout">
 
-{{> UI.dynamic template=css}}
+{{> css}}
   <div class="outer-wrapper {{currentPage}} {{navLayout}}">
-    {{> UI.dynamic template=mobile_nav}}
+    {{> mobile_nav}}
     <div class="inner-wrapper template-{{pageName}}">
-      {{> UI.dynamic template=nav}}
+      {{> nav}}
       <div class="content-wrapper">
-        {{> UI.dynamic template=messages}}
+        {{> messages}}
         {{#each heroModules}}
-          {{> UI.dynamic template=getTemplate}}
+          {{> Template.dynamic template=template}}
         {{/each}}
         {{> yield "adminMenu"}}
         {{> yield "postListTop"}}
         {{> yield}}
-        {{> UI.dynamic template=footer}}
+        {{> footer}}
       </div>
       <div class="overlay hidden"></div>
     </div>
     {{{extraCode}}}
   </div>
-</template>
\ No newline at end of file
+</template>
diff --git a/client/views/common/layout.js b/client/views/common/layout.js
index 2e1305046..95b153120 100644
--- a/client/views/common/layout.js
+++ b/client/views/common/layout.js
@@ -1,44 +1,23 @@
-Template[getTemplate('layout')].helpers({
-  mobile_nav: function () {
-    return getTemplate('mobile_nav');
-  },
-  nav: function () {
-    return getTemplate('nav');
-  },
+Template.layout.helpers({
   navLayout: function () {
     return Settings.get('navLayout', 'top-nav');
   },
-  messages: function () {
-    return getTemplate('messages');
-  },
-  notifications: function () {
-    return getTemplate('notifications');
-  },
-  footer: function () {
-    return getTemplate('footer');
-  },
   pageName : function(){
     return getCurrentTemplate();
   },
-  css: function () {
-    return getTemplate('css');
-  },
   extraCode: function() {
     return Settings.get('extraCode');
   },
   heroModules: function () {
     return _.sortBy(heroModules, 'order');
-  },
-  getTemplate: function () {
-    return getTemplate(this.template);
   }
 });
 
-Template[getTemplate('layout')].created = function(){
+Template.layout.created = function(){
   Session.set('currentScroll', null);
 };
 
-Template[getTemplate('layout')].rendered = function(){
+Template.layout.rendered = function(){
   if(currentScroll=Session.get('currentScroll')){
     $('body').scrollTop(currentScroll);
     Session.set('currentScroll', null);
@@ -53,7 +32,7 @@ Template[getTemplate('layout')].rendered = function(){
 
 };
 
-Template[getTemplate('layout')].events({
+Template.layout.events({
   'click .inner-wrapper': function (e) {
     if ($('body').hasClass('mobile-nav-open')) {
       e.preventDefault();
diff --git a/client/views/errors/loading.js b/client/views/errors/loading.js
index c49a0040e..23c7d9239 100644
--- a/client/views/errors/loading.js
+++ b/client/views/errors/loading.js
@@ -1,4 +1,4 @@
-Template[getTemplate('loading')].helpers({
+Template.loading.helpers({
   log: function () {
     console.log('loading…')
   }  
diff --git a/client/views/errors/no_account.js b/client/views/errors/no_account.js
index 8ae8be649..d156d8eca 100644
--- a/client/views/errors/no_account.js
+++ b/client/views/errors/no_account.js
@@ -1,9 +1,9 @@
-Template[getTemplate('no_account')].helpers({
+Template.no_account.helpers({
   landingPageText: function(){
     return Settings.get("landingPageText");
   }
 });
-Template[getTemplate('no_account')].events({
+Template.no_account.events({
   'click .twitter-button': function(){
     Meteor.loginWithTwitter(function(){
 		Router.go('/');
diff --git a/client/views/errors/no_invite.js b/client/views/errors/no_invite.js
index 02174e462..e144d04b3 100644
--- a/client/views/errors/no_invite.js
+++ b/client/views/errors/no_invite.js
@@ -1,4 +1,4 @@
-Template[getTemplate('no_invite')].helpers({
+Template.no_invite.helpers({
   afterSignupText: function(){
     return Settings.get("afterSignupText");
   }
diff --git a/client/views/forms/quickFormTelescope.js b/client/views/forms/quickFormTelescope.js
index bed46cb46..d1947c04e 100644
--- a/client/views/forms/quickFormTelescope.js
+++ b/client/views/forms/quickFormTelescope.js
@@ -11,7 +11,7 @@ var canEditField = function (field) {
   return isAdmin(Meteor.user()) || (!!field.atts && !!field.atts.editable) || (!!field.afFieldInputAtts && !!field.afFieldInputAtts.editable)
 }
 
-Template[getTemplate('quickForm_telescope')].helpers({
+Template.quickForm_telescope.helpers({
   fieldsWithNoFieldset: function () {
     // get names of fields who don't have an autoform attribute or don't have a group, but are not omitted
     // note: we need to _.map() first to assign the field key to the "name" property to preserve it. 
diff --git a/client/views/nav/logo.js b/client/views/nav/logo.js
index 0bf1b9377..f95558033 100644
--- a/client/views/nav/logo.js
+++ b/client/views/nav/logo.js
@@ -1,4 +1,4 @@
-Template[getTemplate('logo')].helpers({
+Template.logo.helpers({
   site_title: function(){
     return Settings.get('title', "Telescope");
   },
diff --git a/client/views/nav/mobile_nav.html b/client/views/nav/mobile_nav.html
index 7626ad8bb..6bf84e098 100644
--- a/client/views/nav/mobile_nav.html
+++ b/client/views/nav/mobile_nav.html
@@ -4,10 +4,10 @@
       <ul class="mobile-menu">
         {{#each mobileNav}}
           <li>
-            {{> Template.dynamic template=getTemplate data=mobileContext}}
+            {{> Template.dynamic template=template data=mobileContext}}
           </li>
         {{/each}}
       </ul>
     </div>
   </div>
-</template>
\ No newline at end of file
+</template>
diff --git a/client/views/nav/mobile_nav.js b/client/views/nav/mobile_nav.js
index 1653433cc..7df5b5909 100644
--- a/client/views/nav/mobile_nav.js
+++ b/client/views/nav/mobile_nav.js
@@ -1,25 +1,19 @@
-Template[getTemplate('mobile_nav')].helpers({
+Template.mobile_nav.helpers({
   mobileNav: function () {
     return _.sortBy(mobileNav, 'order');
   },
-  logoTemplate: function () {
-    return getTemplate('logo');
-  },
-  getTemplate: function () {
-    return getTemplate(this.template);
-  },
   mobileContext: function () {
     return {mobile: true};
   }
 });
 
-Template[getTemplate('mobile_nav')].events({
+Template.mobile_nav.events({
   'click .menu-sub-level': function () {
     $('body').toggleClass('mobile-nav-open');
   }
 });
 
-Template[getTemplate('mobile_nav')].events({
+Template.mobile_nav.events({
   'click .menu-top-level': function (e) {
     e.preventDefault();
     $(e.currentTarget).next().slideToggle('fast');
@@ -29,4 +23,4 @@ Template[getTemplate('mobile_nav')].events({
       $('body').removeClass('mobile-nav-open');
     }
   }
-});
\ No newline at end of file
+});
diff --git a/client/views/nav/nav.html b/client/views/nav/nav.html
index 2e3e29d25..876901013 100644
--- a/client/views/nav/nav.html
+++ b/client/views/nav/nav.html
@@ -5,12 +5,12 @@
       {{{icon "menu"}}}
     </a>
 
-    {{> Template.dynamic template=logoTemplate}}
+    {{> logo}}
 
     {{#with primaryNav}}
       <div class="nav primary-nav desktop-nav header-module desktop-only">
         {{#each this}}
-          {{> UI.dynamic template=getTemplate}}
+          {{> Template.dynamic template=template}}
         {{/each}}
       </div>
     {{/with}}
@@ -18,10 +18,10 @@
     {{#with secondaryNav}}
       <div class="nav secondary-nav desktop-nav header-module desktop-only">
         {{#each this}}
-          {{> UI.dynamic template=getTemplate}}
+          {{> Template.dynamic template=template}}
         {{/each}}
       </div>
     {{/with}}
-      
+
   </header>
 </template>
diff --git a/client/views/nav/nav.js b/client/views/nav/nav.js
index 4ad37b863..38c9dafdb 100644
--- a/client/views/nav/nav.js
+++ b/client/views/nav/nav.js
@@ -1,4 +1,4 @@
-Template[getTemplate('nav')].helpers({
+Template.nav.helpers({
   headerClass: function () {
     var headerClass = "";
     var bgBrightness = tinycolor(Settings.get('headerColor')).getBrightness();
@@ -44,18 +44,9 @@ Template[getTemplate('nav')].helpers({
     console.log(this)
     return this.length > 3;
   },
-  logoTemplate: function () {
-    return getTemplate('logo');
-  },
-  navZoneTemplate: function () {
-    return getTemplate('navZone');
-  },
-  getTemplate: function () {
-    return getTemplate(this.template);
-  }
 });
 
-Template[getTemplate('nav')].events({
+Template.nav.events({
   'click .mobile-menu-button': function(e){
     e.preventDefault();
     e.stopPropagation(); // Make sure we don't immediately close the mobile nav again. See layout.js event handler.
diff --git a/client/views/nav/user_menu.js b/client/views/nav/user_menu.js
index eb1c0308b..212e4bd09 100644
--- a/client/views/nav/user_menu.js
+++ b/client/views/nav/user_menu.js
@@ -1,4 +1,4 @@
-Template[getTemplate('userMenu')].helpers({
+Template.userMenu.helpers({
   menuLabel: function () {
     return getDisplayName(Meteor.user());
   },
diff --git a/client/views/nav/views_menu.js b/client/views/nav/views_menu.js
index f52355a33..27821ebfa 100644
--- a/client/views/nav/views_menu.js
+++ b/client/views/nav/views_menu.js
@@ -1,4 +1,4 @@
-Template[getTemplate('viewsMenu')].helpers({
+Template.viewsMenu.helpers({
   viewsMenuData: function () {
     return {
       dropdownName: 'view',
diff --git a/client/views/posts/modules/post_actions.js b/client/views/posts/modules/post_actions.js
index 15ced19ae..0c26c76a5 100644
--- a/client/views/posts/modules/post_actions.js
+++ b/client/views/posts/modules/post_actions.js
@@ -1,8 +1,8 @@
-Template[getTemplate('postActions')].helpers({
+Template.postActions.helpers({
 
 });
 
-Template[getTemplate('postActions')].events({
+Template.postActions.events({
   'click .toggle-actions-link': function(e, instance){
     e.preventDefault();
     var $post = $(e.target).parents('.post');
diff --git a/client/views/posts/modules/post_admin.js b/client/views/posts/modules/post_admin.js
index 95fe0daec..bf5d45aeb 100644
--- a/client/views/posts/modules/post_admin.js
+++ b/client/views/posts/modules/post_admin.js
@@ -1,4 +1,4 @@
-Template[getTemplate('postAdmin')].helpers({
+Template.postAdmin.helpers({
   showApprove: function () {
     return this.status == STATUS_PENDING;
   },
@@ -10,7 +10,7 @@ Template[getTemplate('postAdmin')].helpers({
   }
 });
 
-Template[getTemplate('postAdmin')].events({
+Template.postAdmin.events({
   'click .approve-link': function(e, instance){
     Meteor.call('approvePost', this);
     e.preventDefault();
diff --git a/client/views/posts/modules/post_avatars.js b/client/views/posts/modules/post_avatars.js
index 3be46c7e3..2d70c273b 100644
--- a/client/views/posts/modules/post_avatars.js
+++ b/client/views/posts/modules/post_avatars.js
@@ -1,4 +1,4 @@
-Template[getTemplate('postAvatars')].helpers({
+Template.postAvatars.helpers({
   commenters: function () {
     // remove post author ID from commenters to avoid showing author's avatar again
     // limit to 4 commenters in case there's more
diff --git a/client/views/posts/modules/post_content.html b/client/views/posts/modules/post_content.html
index d630fee7f..ab113e185 100644
--- a/client/views/posts/modules/post_content.html
+++ b/client/views/posts/modules/post_content.html
@@ -1,17 +1,17 @@
 <template name="postContent">
     {{#each postThumbnail}}
-      {{> UI.dynamic template=getTemplate data=..}}
+      {{> Template.dynamic template=template data=..}}
     {{/each}}
     <div class="post-info">
       <h3 class="post-heading">
         {{#each postHeading}}
-          {{> UI.dynamic template=getTemplate data=..}}
+          {{> Template.dynamic template=template data=..}}
         {{/each}}
       </h3>
       <div class="post-meta">
         {{#each postMeta}}
-          {{> UI.dynamic template=getTemplate data=..}}
+          {{> Template.dynamic template=template data=..}}
         {{/each}}
       </div>
     </div>
-</template>
\ No newline at end of file
+</template>
diff --git a/client/views/posts/modules/post_content.js b/client/views/posts/modules/post_content.js
index 0c3729095..21fd28923 100644
--- a/client/views/posts/modules/post_content.js
+++ b/client/views/posts/modules/post_content.js
@@ -1,4 +1,4 @@
-Template[getTemplate('postContent')].helpers({
+Template.postContent.helpers({
   postThumbnail: function () {
     return postThumbnail;
   },
@@ -8,9 +8,6 @@ Template[getTemplate('postContent')].helpers({
   postMeta: function () {
     return postMeta;
   },
-  getTemplate: function () {
-    return getTemplate(this.template);
-  },
   sourceLink: function(){
     return !!this.url ? this.url : "/posts/"+this._id;
   },
@@ -33,4 +30,4 @@ Template[getTemplate('postContent')].helpers({
   commentsDisplayText: function(){
     return this.comments == 1 ? i18n.t('comment') : i18n.t('comments');
   }
-});
\ No newline at end of file
+});
diff --git a/client/views/posts/modules/post_domain.js b/client/views/posts/modules/post_domain.js
index 34ef3a845..bbd224dff 100644
--- a/client/views/posts/modules/post_domain.js
+++ b/client/views/posts/modules/post_domain.js
@@ -1,4 +1,4 @@
-Template[getTemplate('postDomain')].helpers({
+Template.postDomain.helpers({
   domain: function(){
     var a = document.createElement('a');
     a.href = this.url;
diff --git a/client/views/posts/modules/post_info.js b/client/views/posts/modules/post_info.js
index 59991c3ea..aae91236c 100644
--- a/client/views/posts/modules/post_info.js
+++ b/client/views/posts/modules/post_info.js
@@ -1,8 +1,5 @@
-Template[getTemplate('postInfo')].helpers({
+Template.postInfo.helpers({
   pointsUnitDisplayText: function(){
     return this.upvotes == 1 ? i18n.t('point') : i18n.t('points');
-  },
-  getTemplate: function() {
-    return getTemplate("postAuthor");
   }
-});
\ No newline at end of file
+});
diff --git a/client/views/posts/modules/post_rank.js b/client/views/posts/modules/post_rank.js
index a940ddec8..44f4adcce 100644
--- a/client/views/posts/modules/post_rank.js
+++ b/client/views/posts/modules/post_rank.js
@@ -1,4 +1,4 @@
-Template[getTemplate('postRank')].helpers({
+Template.postRank.helpers({
   oneBasedRank: function(){
     if (typeof this.rank !== 'undefined') {
       return this.rank + 1;
diff --git a/client/views/posts/modules/post_title.js b/client/views/posts/modules/post_title.js
index 97d360819..a910493bb 100644
--- a/client/views/posts/modules/post_title.js
+++ b/client/views/posts/modules/post_title.js
@@ -1,4 +1,4 @@
-Template[getTemplate('postTitle')].helpers({
+Template.postTitle.helpers({
   postLink: function(){
     return !!this.url ? getOutgoingUrl(this.url) : "/posts/"+this._id;
   },
diff --git a/client/views/posts/modules/post_upvote.js b/client/views/posts/modules/post_upvote.js
index 09aea27b5..6c1674756 100644
--- a/client/views/posts/modules/post_upvote.js
+++ b/client/views/posts/modules/post_upvote.js
@@ -1,4 +1,4 @@
-Template[getTemplate('postUpvote')].helpers({
+Template.postUpvote.helpers({
   upvoted: function(){
     var user = Meteor.user();
     if(!user) return false;
@@ -6,7 +6,7 @@ Template[getTemplate('postUpvote')].helpers({
   }
 });
 
-Template[getTemplate('postUpvote')].events({
+Template.postUpvote.events({
   'click .upvote-link': function(e, instance){
     var post = this;
     e.preventDefault();
diff --git a/client/views/posts/post_edit.js b/client/views/posts/post_edit.js
index 6165a136c..77de689e0 100644
--- a/client/views/posts/post_edit.js
+++ b/client/views/posts/post_edit.js
@@ -40,7 +40,7 @@ AutoForm.hooks({
 });
 
 // delete link
-Template[getTemplate('post_edit')].events({
+Template.post_edit.events({
   'click .delete-link': function(e){
     var post = this.post;
 
diff --git a/client/views/posts/post_item.html b/client/views/posts/post_item.html
index df0a85d6f..6594b970a 100644
--- a/client/views/posts/post_item.html
+++ b/client/views/posts/post_item.html
@@ -2,7 +2,7 @@
   <div class="post {{#if sticky}}sticky{{/if}} {{inactiveClass}} {{postClass}}" id="{{_id}}">
       {{#each postModules}}
         <div class="{{moduleClass}}">
-          {{> UI.dynamic template=getTemplate data=..}}
+          {{> Template.dynamic template=template data=..}}
         </div>
       {{/each}}
   </div>
diff --git a/client/views/posts/post_item.js b/client/views/posts/post_item.js
index 8e7a1cc0f..b167772bb 100644
--- a/client/views/posts/post_item.js
+++ b/client/views/posts/post_item.js
@@ -1,16 +1,13 @@
 var post = {};
 
-Template[getTemplate('post_item')].created = function () {
+Template.post_item.created = function () {
   post = this.data;
 };
 
-Template[getTemplate('post_item')].helpers({
+Template.post_item.helpers({
   postModules: function () {
     return postModules;
   },
-  getTemplate: function () {
-    return getTemplate(this.template);
-  },
   moduleContext: function () { // not used for now
     var module = this;
     module.templateClass = camelToDash(this.template) + ' ' + this.position + ' cell';
@@ -27,7 +24,7 @@ Template[getTemplate('post_item')].helpers({
     var postClass = postClassCallbacks.reduce(function(result, currentFunction) {
         return currentFunction(post, result);
     }, postAuthorClass);
-    
+
     return postClass;
   }
 });
diff --git a/client/views/posts/post_list_top.html b/client/views/posts/post_list_top.html
index 9ebdce477..c45100a8d 100644
--- a/client/views/posts/post_list_top.html
+++ b/client/views/posts/post_list_top.html
@@ -1,5 +1,5 @@
 <template name="postListTop">
   {{#each postListTopModules}}
-    {{> Template.dynamic template=getTemplate}}
+    {{> Template.dynamic template=template}}
   {{/each}}
 </template>
diff --git a/client/views/posts/post_list_top.js b/client/views/posts/post_list_top.js
index cd59ecfcc..56f404769 100644
--- a/client/views/posts/post_list_top.js
+++ b/client/views/posts/post_list_top.js
@@ -1,8 +1,5 @@
-Template[getTemplate('postListTop')].helpers({
+Template.postListTop.helpers({
   postListTopModules: function () {
     return _.sortBy(postListTopModules, 'order');
-  },
-  getTemplate: function () {
-    return getTemplate(this.template);
   }
 });
diff --git a/client/views/posts/post_page.html b/client/views/posts/post_page.html
index a452dc0ff..63109bef1 100644
--- a/client/views/posts/post_page.html
+++ b/client/views/posts/post_page.html
@@ -1,12 +1,12 @@
 <template name="post_page">
   <div class="single-post grid">
     <div class="posts posts-list">
-      {{> UI.dynamic template=post_item}}
+      {{> post_item}}
     </div>
     {{#if body}}
-      {{> UI.dynamic template=post_body}}
+      {{> post_body}}
     {{/if}}
-    {{> UI.dynamic template=comment_form}}
-    {{> UI.dynamic template=comment_list}}
+    {{> comment_form}}
+    {{> comment_list}}
   </div>
 </template>
diff --git a/client/views/posts/post_page.js b/client/views/posts/post_page.js
index bb0102e54..aae82ec0f 100644
--- a/client/views/posts/post_page.js
+++ b/client/views/posts/post_page.js
@@ -1,18 +1,3 @@
-Template[getTemplate('post_page')].helpers({
-  post_item: function () {
-    return getTemplate('post_item');
-  },
-  post_body: function () {
-    return getTemplate('post_body');
-  },
-  comment_form: function () {
-    return getTemplate('comment_form');
-  },
-  comment_list: function () {
-    return getTemplate('comment_list');
-  }
-});
-
-Template[getTemplate('post_page')].rendered = function(){
+Template.post_page.rendered = function(){
   $('body').scrollTop(0);
 };
diff --git a/client/views/posts/post_view_nav.js b/client/views/posts/post_view_nav.js
index a85bf7cfd..ef1dedcae 100644
--- a/client/views/posts/post_view_nav.js
+++ b/client/views/posts/post_view_nav.js
@@ -1,4 +1,4 @@
-Template[getTemplate('postViewsNav')].helpers({
+Template.postViewsNav.helpers({
   showNav: function () {
     var navElements = Settings.get('postViews', _.pluck(viewsMenu, 'route'));
     var navCount = (typeof navElements === "array") ? navElements.length : _.keys(navElements).length;
diff --git a/client/views/users/account/user_account.js b/client/views/users/account/user_account.js
index 7fb3938ec..b1564dcf0 100644
--- a/client/views/users/account/user_account.js
+++ b/client/views/users/account/user_account.js
@@ -1,4 +1,4 @@
-Template[getTemplate('userAccount')].helpers({
+Template.userAccount.helpers({
   profileIncomplete : function() {
     return this && !this.loading && !userProfileComplete(this);
   },
@@ -34,7 +34,7 @@ Template[getTemplate('userAccount')].helpers({
   }
 });
 
-Template[getTemplate('userAccount')].events({
+Template.userAccount.events({
   'submit #account-form': function(e){
     e.preventDefault();
 
diff --git a/client/views/users/dashboard/users-dashboard.js b/client/views/users/dashboard/users-dashboard.js
index 47f35c179..07a7136b3 100644
--- a/client/views/users/dashboard/users-dashboard.js
+++ b/client/views/users/dashboard/users-dashboard.js
@@ -1,4 +1,4 @@
-Template[getTemplate('usersDashboard')].helpers({
+Template.usersDashboard.helpers({
   settings: function() {
     return {
       collection: 'all-users',
diff --git a/client/views/users/dashboard/users_list_actions.js b/client/views/users/dashboard/users_list_actions.js
index d98dba00f..c90de60db 100644
--- a/client/views/users/dashboard/users_list_actions.js
+++ b/client/views/users/dashboard/users_list_actions.js
@@ -1,4 +1,4 @@
-Template[getTemplate('users_list_actions')].helpers({
+Template.users_list_actions.helpers({
   isInvited: function() {
     return this.isInvited;
   },
@@ -7,7 +7,7 @@ Template[getTemplate('users_list_actions')].helpers({
   },
 });
 
-Template[getTemplate('users_list_actions')].events({
+Template.users_list_actions.events({
   'click .invite-link': function(e){
     e.preventDefault();
     Meteor.call('inviteUser', { userId : this._id });
diff --git a/client/views/users/profile/user_comments.js b/client/views/users/profile/user_comments.js
index a1c92c6b5..66110f01a 100644
--- a/client/views/users/profile/user_comments.js
+++ b/client/views/users/profile/user_comments.js
@@ -1,4 +1,4 @@
-Template[getTemplate('userComments')].created = function () {
+Template.userComments.created = function () {
   Session.set('commentsShown', 5);
 
   var user = this.data;
@@ -20,7 +20,7 @@ Template[getTemplate('userComments')].created = function () {
   });
 };
 
-Template[getTemplate('userComments')].helpers({
+Template.userComments.helpers({
   comments: function () {
     var comments = Template.instance().comments.get();
     if(!!comments){
@@ -39,7 +39,7 @@ Template[getTemplate('userComments')].helpers({
   }
 });
 
-Template[getTemplate('userComments')].events({
+Template.userComments.events({
   'click .comments-more': function (e) {
     e.preventDefault();
     var commentsShown = Template.instance().commentsShown.get();
diff --git a/client/views/users/profile/user_downvoted_posts.js b/client/views/users/profile/user_downvoted_posts.js
index 94f38eebf..676c5b539 100644
--- a/client/views/users/profile/user_downvoted_posts.js
+++ b/client/views/users/profile/user_downvoted_posts.js
@@ -1,4 +1,4 @@
-Template[getTemplate('userDownvotedPosts')].created = function () {
+Template.userDownvotedPosts.created = function () {
 
   var user = this.data;
   var instance = this;
@@ -27,7 +27,7 @@ Template[getTemplate('userDownvotedPosts')].created = function () {
   });
 };
 
-Template[getTemplate('userDownvotedPosts')].helpers({
+Template.userDownvotedPosts.helpers({
   posts: function () {
     var user = this;
     var posts = Template.instance().posts.get().fetch();
@@ -43,7 +43,7 @@ Template[getTemplate('userDownvotedPosts')].helpers({
   }
 });
 
-Template[getTemplate('userDownvotedPosts')].events({
+Template.userDownvotedPosts.events({
   'click .downvotedposts-more': function (e) {
     e.preventDefault();
     var terms = Template.instance().terms.get();
diff --git a/client/views/users/profile/user_info.js b/client/views/users/profile/user_info.js
index 279708c94..81d667c5e 100644
--- a/client/views/users/profile/user_info.js
+++ b/client/views/users/profile/user_info.js
@@ -1,4 +1,4 @@
-Template[getTemplate('userInfo')].helpers({
+Template.userInfo.helpers({
   canEditProfile: function() {
     var currentUser = Meteor.user();
     return currentUser && (this._id == currentUser._id || isAdmin(currentUser));
@@ -21,7 +21,7 @@ Template[getTemplate('userInfo')].helpers({
   }
 });
 
-Template[getTemplate('userInfo')].events({
+Template.userInfo.events({
   'click .invite-link': function(e, instance){
     Meteor.call('inviteUser', instance.data.user._id);
     Messages.flash('Thanks, user has been invited.', "success");
diff --git a/client/views/users/profile/user_posts.js b/client/views/users/profile/user_posts.js
index f29d07ff2..e43200c4d 100644
--- a/client/views/users/profile/user_posts.js
+++ b/client/views/users/profile/user_posts.js
@@ -1,4 +1,4 @@
-Template[getTemplate('userPosts')].created = function () {
+Template.userPosts.created = function () {
 
   var user = this.data;
   var instance = this;
@@ -37,7 +37,7 @@ Template[getTemplate('userPosts')].created = function () {
   });
 };
 
-Template[getTemplate('userPosts')].helpers({
+Template.userPosts.helpers({
   posts: function () {
     return Template.instance().posts.get();
   },
@@ -49,7 +49,7 @@ Template[getTemplate('userPosts')].helpers({
   }
 });
 
-Template[getTemplate('userPosts')].events({
+Template.userPosts.events({
   'click .posts-more': function (e) {
     e.preventDefault();
     var terms = Template.instance().terms.get();
diff --git a/client/views/users/profile/user_upvoted_posts.js b/client/views/users/profile/user_upvoted_posts.js
index e2e03d6d5..0b02a4fd2 100644
--- a/client/views/users/profile/user_upvoted_posts.js
+++ b/client/views/users/profile/user_upvoted_posts.js
@@ -1,4 +1,4 @@
-Template[getTemplate('userUpvotedPosts')].created = function () {
+Template.userUpvotedPosts.created = function () {
 
   var user = this.data;
   var instance = this;
@@ -27,7 +27,7 @@ Template[getTemplate('userUpvotedPosts')].created = function () {
   });
 };
 
-Template[getTemplate('userUpvotedPosts')].helpers({
+Template.userUpvotedPosts.helpers({
   posts: function () {
     var user = this;
     var posts = Template.instance().posts.get().fetch();
@@ -43,7 +43,7 @@ Template[getTemplate('userUpvotedPosts')].helpers({
   }
 });
 
-Template[getTemplate('userUpvotedPosts')].events({
+Template.userUpvotedPosts.events({
   'click .upvotedposts-more': function (e) {
     e.preventDefault();
     var terms = Template.instance().terms.get();
diff --git a/client/views/users/sign_out.html b/client/views/users/sign_out.html
index e2d8aadcf..687a77f7e 100644
--- a/client/views/users/sign_out.html
+++ b/client/views/users/sign_out.html
@@ -2,4 +2,4 @@
     <div class="grid-small grid-block dialog">
     <p>{{_ "you_ve_been_signed_out"}}</p>
   </div>
-</template>
\ No newline at end of file
+</template>
diff --git a/client/views/users/user_edit.html b/client/views/users/user_edit.html
index 8c57c88d8..67521d066 100644
--- a/client/views/users/user_edit.html
+++ b/client/views/users/user_edit.html
@@ -1,7 +1,7 @@
 <template name="user_edit">
 	{{#with user}}
     {{#each userProfileEdit}}
-      {{> UI.dynamic template=getTemplate data=..}}
+      {{> Template.dynamic template=template data=..}}
     {{/each}}
   {{/with}}
 </template>
diff --git a/client/views/users/user_edit.js b/client/views/users/user_edit.js
index 8206bc4e5..53872d8c2 100644
--- a/client/views/users/user_edit.js
+++ b/client/views/users/user_edit.js
@@ -1,8 +1,5 @@
-Template[getTemplate('user_edit')].helpers({
+Template.user_edit.helpers({
   userProfileEdit: function () {
     return userProfileEdit;
-  },
-  getTemplate: function () {
-    return getTemplate(this.template);
   }
 });
diff --git a/client/views/users/user_email.js b/client/views/users/user_email.js
index 36a6c71c5..1699abdea 100644
--- a/client/views/users/user_email.js
+++ b/client/views/users/user_email.js
@@ -1,4 +1,4 @@
-Template[getTemplate('user_email')].helpers({
+Template.user_email.helpers({
   user: function(){
     return Meteor.user();
   },
@@ -7,7 +7,7 @@ Template[getTemplate('user_email')].helpers({
   }
 });
 
-Template[getTemplate('user_email')].events({
+Template.user_email.events({
   'submit form': function(e){
     e.preventDefault();
     if(!Meteor.user())
diff --git a/client/views/users/user_item.js b/client/views/users/user_item.js
index 2fa376034..a5ec56df3 100644
--- a/client/views/users/user_item.js
+++ b/client/views/users/user_item.js
@@ -1,4 +1,4 @@
-Template[getTemplate('user_item')].helpers({
+Template.user_item.helpers({
   createdAtFormatted: function(){
     return this.createdAt ? moment(this.createdAt).fromNow() : '–';
   },
@@ -29,7 +29,7 @@ Template[getTemplate('user_item')].helpers({
   }
 });
 
-Template[getTemplate('user_item')].events({
+Template.user_item.events({
   'click .invite-link': function(e, instance){
     e.preventDefault();
     Meteor.call('inviteUser', { userId : instance.data._id });
diff --git a/client/views/users/user_profile.html b/client/views/users/user_profile.html
index 5ee75d2fe..745b1ad0d 100644
--- a/client/views/users/user_profile.html
+++ b/client/views/users/user_profile.html
@@ -1,7 +1,7 @@
 <template name="user_profile">
 	{{#with user}}
-		{{#each userProfileDisplay}}	
-			{{> UI.dynamic template=getTemplate data=..}}
+		{{#each userProfileDisplay}}
+			{{> Template.dynamic template=template data=..}}
 		{{/each}}
 	{{/with}}
 </template>
diff --git a/client/views/users/user_profile.js b/client/views/users/user_profile.js
index 544778eca..5c8fd030f 100644
--- a/client/views/users/user_profile.js
+++ b/client/views/users/user_profile.js
@@ -1,8 +1,5 @@
-Template[getTemplate('user_profile')].helpers({
+Template.user_profile.helpers({
   userProfileDisplay: function () {
     return userProfileDisplay;
-  },
-  getTemplate: function () {
-    return getTemplate(this.template);
   }
-});
\ No newline at end of file
+});
diff --git a/lib/router/admin.js b/lib/router/admin.js
index 9f9349aee..4041685ab 100644
--- a/lib/router/admin.js
+++ b/lib/router/admin.js
@@ -10,14 +10,14 @@ Meteor.startup(function (){
 
   Router.route('/loading', {
     name: 'loading',
-    template: getTemplate('loading')
+    template: 'loading'
   });
 
   // Toolbox
 
   Router.route('/toolbox', {
     name: 'toolbox',
-    template: getTemplate('toolbox')
+    template: 'toolbox'
   });
 
 });
diff --git a/lib/router/comments.js b/lib/router/comments.js
index 02538e97f..7fbc64e00 100644
--- a/lib/router/comments.js
+++ b/lib/router/comments.js
@@ -25,7 +25,7 @@ Meteor.startup( function () {
 
   Router.route('/comments/:_id', {
     name: 'comment_reply',
-    template: getTemplate('comment_reply'),
+    template: 'comment_reply',
     controller: CommentPageController,
     onAfterAction: function() {
       window.queueComments = false;
@@ -36,11 +36,11 @@ Meteor.startup( function () {
 
   Router.route('/comments/:_id/edit', {
     name: 'comment_edit',
-    template: getTemplate('comment_edit'),
+    template: 'comment_edit',
     controller: CommentPageController,
     onAfterAction: function() {
       window.queueComments = false;
     }
   });
 
-});
\ No newline at end of file
+});
diff --git a/lib/router/config.js b/lib/router/config.js
index 724dc98f1..3dd06445a 100644
--- a/lib/router/config.js
+++ b/lib/router/config.js
@@ -4,9 +4,9 @@ preloadSubscriptions.push('settings');
 preloadSubscriptions.push('currentUser');
 
 Router.configure({
-  layoutTemplate: getTemplate('layout'),
-  loadingTemplate: getTemplate('loading'),
-  notFoundTemplate: getTemplate('notFound'),
+  layoutTemplate: 'layout',
+  loadingTemplate: 'loading',
+  notFoundTemplate: 'notFound',
   waitOn: function () {
     return _.map(preloadSubscriptions, function(sub){
       // can either pass strings or objects with subName and subArguments properties
diff --git a/lib/router/filters.js b/lib/router/filters.js
index 285e6eb1a..a0ceeb768 100644
--- a/lib/router/filters.js
+++ b/lib/router/filters.js
@@ -7,7 +7,7 @@ Router._filters = {
   isReady: function () {
     if (!this.ready()) {
       // console.log('not ready')
-      this.render(getTemplate('loading'));
+      this.render('loading');
     }else{
       this.next();
       // console.log('ready')
@@ -52,7 +52,7 @@ Router._filters = {
   isAdmin: function () {
     if(!this.ready()) return;
     if(!isAdmin()){
-      this.render(getTemplate('no_rights'));
+      this.render('no_rights');
     } else {
       this.next();
     }
@@ -60,9 +60,9 @@ Router._filters = {
 
   canView: function () {
     if(!this.ready() || Meteor.loggingIn()){
-      this.render(getTemplate('loading'));
+      this.render('loading');
     } else if (!can.view()) {
-      this.render(getTemplate('no_rights'));
+      this.render('no_rights');
     } else {
       this.next();
     }
@@ -71,7 +71,7 @@ Router._filters = {
   canViewPendingPosts: function () {
     var post = this.data();
     if (!!post && post.status == STATUS_PENDING && !can.viewPendingPosts()) {
-      this.render(getTemplate('no_rights'));
+      this.render('no_rights');
     } else {
       this.next();
     }
@@ -80,7 +80,7 @@ Router._filters = {
   canViewRejectedPosts: function () {
     var post = this.data();
     if (!!post && post.status == STATUS_REJECTED && !can.viewRejectedPosts()) {
-      this.render(getTemplate('no_rights'));
+      this.render('no_rights');
     } else {
       this.next();
     }
@@ -88,10 +88,10 @@ Router._filters = {
 
   canPost: function () {
     if(!this.ready() || Meteor.loggingIn()){
-      this.render(getTemplate('loading'));
+      this.render('loading');
     } else if(!can.post()) {
       Messages.flash(i18n.t("sorry_you_dont_have_permissions_to_add_new_items"), "error");
-      this.render(getTemplate('no_rights'));
+      this.render('no_rights');
     } else {
       this.next();
     }
@@ -103,7 +103,7 @@ Router._filters = {
     var post = Posts.findOne(this.params._id);
     if(!can.currentUserEdit(post)){
       Messages.flash(i18n.t("sorry_you_cannot_edit_this_post"), "error");
-      this.render(getTemplate('no_rights'));
+      this.render('no_rights');
     } else {
       this.next();
     }
@@ -115,7 +115,7 @@ Router._filters = {
     var comment = Comments.findOne(this.params._id);
     if(!can.currentUserEdit(comment)){
       Messages.flash(i18n.t("sorry_you_cannot_edit_this_comment"), "error");
-      this.render(getTemplate('no_rights'));
+      this.render('no_rights');
     } else {
       this.next();
     }
@@ -125,7 +125,7 @@ Router._filters = {
     if(!this.ready()) return;
     var user = Meteor.user();
     if (user && ! userProfileComplete(user)){
-      this.render(getTemplate('user_email'));
+      this.render('user_email');
     } else {
       this.next();
     }
diff --git a/lib/router/posts.js b/lib/router/posts.js
index 83d8b18d0..d46e3fd8a 100644
--- a/lib/router/posts.js
+++ b/lib/router/posts.js
@@ -2,13 +2,13 @@
 
 PostsListController = RouteController.extend({
 
-  template: getTemplate('posts_list'),
+  template: 'posts_list',
 
   onBeforeAction: function () {
     var showViewsNav = (typeof this.showViewsNav === 'undefined') ? true : this.showViewsNav;
 
     if (showViewsNav) {
-      this.render(getTemplate('postListTop'), {to: 'postListTop'});
+      this.render('postListTop', {to: 'postListTop'});
     }
     this.next();
   },
@@ -129,7 +129,7 @@ PostsScheduledController = PostsListController.extend({
 
 PostPageController = RouteController.extend({
 
-  template: getTemplate('post_page'),
+  template: 'post_page',
 
   waitOn: function() {
     this.postSubscription = coreSubscriptions.subscribe('singlePost', this.params._id);
@@ -149,9 +149,9 @@ PostPageController = RouteController.extend({
   onBeforeAction: function() {
     if (! this.post()) {
       if (this.postSubscription.ready()) {
-        this.render(getTemplate('not_found'));
+        this.render('not_found');
       } else {
-        this.render(getTemplate('loading'));
+        this.render('loading');
       }
     } else {
       this.next();
@@ -229,7 +229,7 @@ Meteor.startup(function () {
 
   Router.route('/posts/:_id/edit', {
     name: 'post_edit',
-    template: getTemplate('post_edit'),
+    template: 'post_edit',
     waitOn: function () {
       return [
         coreSubscriptions.subscribe('singlePost', this.params._id),
@@ -249,7 +249,7 @@ Meteor.startup(function () {
 
   Router.route('/submit', {
     name: 'post_submit',
-    template: getTemplate('post_submit'),
+    template: 'post_submit',
     waitOn: function () {
       return coreSubscriptions.subscribe('allUsersAdmin');
     }
diff --git a/lib/router/server.js b/lib/router/server.js
index ffb2948c2..898945647 100644
--- a/lib/router/server.js
+++ b/lib/router/server.js
@@ -56,7 +56,7 @@ Meteor.startup(function (){
         siteTitle: Settings.get('title'),
         siteUrl: getSiteUrl()
       };
-      html = Handlebars.templates[getTemplate('emailAccountApproved')](emailProperties);
+      html = Handlebars.templates['emailAccountApproved'](emailProperties);
       this.response.write(buildEmailTemplate(html));
       this.response.end();
     }
diff --git a/lib/router/users.js b/lib/router/users.js
index b0ad6b079..b6c1755f3 100644
--- a/lib/router/users.js
+++ b/lib/router/users.js
@@ -61,7 +61,7 @@ Meteor.startup(function () {
 
   Router.route('/sign-out', {
     name: 'signOut',
-    template: getTemplate('sign_out'),
+    template: 'sign_out',
     onBeforeAction: function() {
       Meteor.logout(function() {
       });
@@ -73,7 +73,7 @@ Meteor.startup(function () {
 
   Router.route('/users/:_idOrSlug', {
     name: 'user_profile',
-    template: getTemplate('user_profile'),
+    template: 'user_profile',
     controller: UserPageController
   });
 
@@ -81,7 +81,7 @@ Meteor.startup(function () {
 
   Router.route('/users/:slug/edit', {
     name: 'user_edit',
-    template: getTemplate('user_edit'),
+    template: 'user_edit',
     controller: UserEditController,
     onBeforeAction: function () {
       // Only allow users with permissions to see the user edit page.
@@ -91,14 +91,14 @@ Meteor.startup(function () {
       )) {
         this.next();
       } else {
-        this.render(getTemplate('no_rights'));
+        this.render('no_rights');
       }
     }
   });
 
   Router.route('/account', {
     name: 'userAccountShortcut',
-    template: getTemplate('user_edit'),
+    template: 'user_edit',
     controller: UserEditController
   });
 
@@ -107,14 +107,14 @@ Meteor.startup(function () {
   Router.route('/users-dashboard', {
     controller: AdminController,
     name: 'usersDashboard'
-    // template: getTemplate('users')
+    // template: 'users'
   });
 
   // Unsubscribe (from notifications)
 
   Router.route('/unsubscribe/:hash', {
     name: 'unsubscribe',
-    template: getTemplate('unsubscribe'),
+    template: 'unsubscribe',
     data: function() {
       return {
         hash: this.params.hash
diff --git a/packages/telescope-base/lib/base.js b/packages/telescope-base/lib/base.js
index 7bc77b1a6..da7eae0e3 100644
--- a/packages/telescope-base/lib/base.js
+++ b/packages/telescope-base/lib/base.js
@@ -385,9 +385,11 @@ userProfileCompleteChecks.push(
 
 templates = {}
 
+// note: not used anymore, but keep for backwards compatibility
 getTemplate = function (name) {
   // if template has been overwritten, return this; else return template name
-  return !!templates[name] ? templates[name] : name;
+  return name;
+  // return !!templates[name] ? templates[name] : name;
 };
 
 // ------------------------------ Theme Settings ------------------------------ //
diff --git a/packages/telescope-blank/lib/client/templates/custom_template.js b/packages/telescope-blank/lib/client/templates/custom_template.js
index a7c7a8df2..2ced73827 100644
--- a/packages/telescope-blank/lib/client/templates/custom_template.js
+++ b/packages/telescope-blank/lib/client/templates/custom_template.js
@@ -1,6 +1,6 @@
 Meteor.startup(function () {
 
-  Template[getTemplate('customTemplate')].helpers({
+  Template.customTemplate.helpers({
     name: function () {
       return "Bruce Willis";
     }
diff --git a/packages/telescope-blank/lib/routes.js b/packages/telescope-blank/lib/routes.js
index 6813127b1..5c09798e2 100644
--- a/packages/telescope-blank/lib/routes.js
+++ b/packages/telescope-blank/lib/routes.js
@@ -1,8 +1,8 @@
 Meteor.startup(function () {
-  
+
   Router.route('/custom-path', {
     name: 'customRoute',
-    template: getTemplate('customTemplate')
+    template: 'customTemplate'
   });
 
-});
\ No newline at end of file
+});
diff --git a/packages/telescope-daily/lib/client/templates/posts_daily.html b/packages/telescope-daily/lib/client/templates/posts_daily.html
index 111cfa29b..8c0ffbda2 100644
--- a/packages/telescope-daily/lib/client/templates/posts_daily.html
+++ b/packages/telescope-daily/lib/client/templates/posts_daily.html
@@ -1,12 +1,12 @@
 <template name="postsDaily">
   <div class="grid">
     {{#each days}}
-      {{> Template.dynamic template=before_day}}
+      {{> beforeDay}}
       <h2 class="posts-day-heading">{{formatDate date "dddd, MMMM Do YYYY"}}</h2>
 
-      {{> Template.dynamic template=singleDay data=context}}
+      {{> singleDay data=context}}
 
-      {{> Template.dynamic template=after_day}}
+      {{> afterDay}}
     {{/each}}
     <a class="load-more-days-button grid-module" href="{{loadMoreDaysUrl}}"><span>{{_ "load_next_days"}}</span></a>
   </div>
diff --git a/packages/telescope-daily/lib/client/templates/posts_daily.js b/packages/telescope-daily/lib/client/templates/posts_daily.js
index 38d595355..fae2beffa 100644
--- a/packages/telescope-daily/lib/client/templates/posts_daily.js
+++ b/packages/telescope-daily/lib/client/templates/posts_daily.js
@@ -1,6 +1,6 @@
 Meteor.startup(function () {
 
-  Template[getTemplate('postsDaily')].helpers({
+  Template.postsDaily.helpers({
     days: function () {
       var daysArray = [];
       // var days = this.days;
@@ -13,20 +13,11 @@ Meteor.startup(function () {
       }
       return daysArray;
     },
-    before_day: function () {
-      return getTemplate('beforeDay');
-    },
-    singleDay: function () {
-      return getTemplate('singleDay');
-    },
     context: function () {
       var context = this;
       context.showDateNav = false;
       return context;
     },
-    after_day: function () {
-      return getTemplate('afterDay');
-    },
     loadMoreDaysUrl: function () {
       var count = parseInt(Session.get('postsDays')) + daysPerPage;
       return '/daily/' + count;
diff --git a/packages/telescope-daily/lib/routes.js b/packages/telescope-daily/lib/routes.js
index b8c6fbdd7..8a26afe68 100644
--- a/packages/telescope-daily/lib/routes.js
+++ b/packages/telescope-daily/lib/routes.js
@@ -8,13 +8,13 @@ var coreSubscriptions = new SubsManager({
 PostsDailyController = RouteController.extend({
 
   onBeforeAction: function () {
-    this.render(getTemplate('postListTop'), {to: 'postListTop'});
+    this.render('postListTop', {to: 'postListTop'});
     this.next();
   },
 
   template: function() {
     // use a function to make sure the template is evaluated *after* any template overrides
-    return getTemplate('postsDaily');
+    return 'postsDaily';
   },
 
   subscriptions: function () {
diff --git a/packages/telescope-email/lib/server/email.js b/packages/telescope-email/lib/server/email.js
index d0ae60d81..18b82bb08 100644
--- a/packages/telescope-email/lib/server/email.js
+++ b/packages/telescope-email/lib/server/email.js
@@ -3,11 +3,11 @@ var htmlToText = Npm.require('html-to-text');
 
 // check if server-side template has been customized, and return the correct template
 getEmailTemplate = function (template) {
-  var emailTemplate = Handlebars.templates[getTemplate(template)];
+  var emailTemplate = Handlebars.templates[template];
   if(typeof emailTemplate === 'function'){
-    return Handlebars.templates[getTemplate(template)];
+    return Handlebars.templates[template];
   } else {
-    console.log('Cannot find template '+getTemplate(template)+', defaulting to '+template);
+    console.log('Cannot find template '+template+', defaulting to '+template);
     return Handlebars.templates[template];
   }
 }
@@ -29,7 +29,7 @@ buildEmailTemplate = function (htmlContent) {
     logoWidth: Settings.get('logoWidth')
   }
 
-  var emailHTML = Handlebars.templates[getTemplate('emailWrapper')](emailProperties);
+  var emailHTML = Handlebars.templates['emailWrapper'](emailProperties);
 
   var inlinedHTML = juice(emailHTML);
 
diff --git a/packages/telescope-embedly/lib/client/post_thumbnail.html b/packages/telescope-embedly/lib/client/post_thumbnail.html
index ec1d080b5..70c96b582 100644
--- a/packages/telescope-embedly/lib/client/post_thumbnail.html
+++ b/packages/telescope-embedly/lib/client/post_thumbnail.html
@@ -9,6 +9,6 @@
     <div class="post-thumbnail-empty"></div>
   {{/if}}
   {{#if media}}
-    {{> UI.dynamic template=videoTemplate data=this}}
+    {{> postVideo data=this}}
   {{/if}}
-</template>
\ No newline at end of file
+</template>
diff --git a/packages/telescope-embedly/lib/client/post_thumbnail.js b/packages/telescope-embedly/lib/client/post_thumbnail.js
index 9af7e7c8b..cc20846dc 100644
--- a/packages/telescope-embedly/lib/client/post_thumbnail.js
+++ b/packages/telescope-embedly/lib/client/post_thumbnail.js
@@ -1,19 +1,16 @@
-Template[getTemplate('postThumbnail')].helpers({
+Template.postThumbnail.helpers({
   postLink: function () {
     return !!this.url ? getOutgoingUrl(this.url) : "/posts/"+this._id;
   },
   playVideoClass: function () {
     return !!this.media ? 'post-thumbnail-has-video': '';
-  },
-  videoTemplate: function () {
-    return getTemplate('postVideo');
   }
 });
 
-Template[getTemplate('postThumbnail')].events({
+Template.postThumbnail.events({
   'click .post-thumbnail-has-video': function (e) {
     e.preventDefault();
     $('body').addClass('showing-lightbox');
     $(e.target).parents('.post').find('.post-video-lightbox').fadeIn('fast');
   }
-})
\ No newline at end of file
+});
diff --git a/packages/telescope-embedly/lib/client/post_video.js b/packages/telescope-embedly/lib/client/post_video.js
index a9e6b2144..20c3f03ad 100644
--- a/packages/telescope-embedly/lib/client/post_video.js
+++ b/packages/telescope-embedly/lib/client/post_video.js
@@ -1,4 +1,4 @@
-Template[getTemplate('postVideo')].events({
+Template.postVideo.events({
   'click .post-video-lightbox-hide, click .post-video-lightbox': function (e) {
     e.preventDefault();
     $(e.target).parents('.post').find('.post-video-lightbox').fadeOut('fast');
diff --git a/packages/telescope-invites/lib/client/templates/user_invites.js b/packages/telescope-invites/lib/client/templates/user_invites.js
index 0ca260f9a..7fbee0246 100644
--- a/packages/telescope-invites/lib/client/templates/user_invites.js
+++ b/packages/telescope-invites/lib/client/templates/user_invites.js
@@ -1,4 +1,4 @@
-Template[getTemplate('userInvites')].created = function () {
+Template.userInvites.created = function () {
 
   var user = this.data;
   var instance = this;
@@ -12,7 +12,7 @@ Template[getTemplate('userInvites')].created = function () {
   });
 };
 
-Template[getTemplate('userInvites')].helpers({
+Template.userInvites.helpers({
   canCurrentUserInvite: function () {
     var currentUser = Meteor.user();
     return currentUser && (currentUser.inviteCount > 0 && can.invite(currentUser));
diff --git a/packages/telescope-invites/lib/server/invites.js b/packages/telescope-invites/lib/server/invites.js
index 2b9412ede..462255178 100644
--- a/packages/telescope-invites/lib/server/invites.js
+++ b/packages/telescope-invites/lib/server/invites.js
@@ -70,7 +70,7 @@ Meteor.methods({
           };
 
       Meteor.setTimeout(function () {
-        buildAndSendEmail(userEmail, emailSubject, getTemplate('emailInvite'), emailProperties);
+        buildAndSendEmail(userEmail, emailSubject, 'emailInvite', emailProperties);
       }, 1);
 
     }
diff --git a/packages/telescope-messages/lib/client/templates/message_item.js b/packages/telescope-messages/lib/client/templates/message_item.js
index 91c13ed4c..0f381f58a 100644
--- a/packages/telescope-messages/lib/client/templates/message_item.js
+++ b/packages/telescope-messages/lib/client/templates/message_item.js
@@ -1,4 +1,4 @@
-Template[getTemplate('message_item')].onCreated(function(){
+Template.message_item.onCreated(function(){
 	var messageId=this.data._id;
 
 	Meteor.setTimeout(function(){
diff --git a/packages/telescope-messages/lib/client/templates/messages.html b/packages/telescope-messages/lib/client/templates/messages.html
index 1fd5bf80d..486c06c78 100644
--- a/packages/telescope-messages/lib/client/templates/messages.html
+++ b/packages/telescope-messages/lib/client/templates/messages.html
@@ -1,5 +1,5 @@
 <template name="messages">
 	{{#each messages}}
-		{{> UI.dynamic template=message_item}}
+		{{> message_item}}
 	{{/each}}
 </template>
\ No newline at end of file
diff --git a/packages/telescope-messages/lib/client/templates/messages.js b/packages/telescope-messages/lib/client/templates/messages.js
index 1ea07ccd8..dec019012 100644
--- a/packages/telescope-messages/lib/client/templates/messages.js
+++ b/packages/telescope-messages/lib/client/templates/messages.js
@@ -1,7 +1,4 @@
-Template[getTemplate('messages')].helpers({
-  message_item: function () {
-    return getTemplate('message_item');
-  },
+Template.messages.helpers({
   messages: function(){
     return Messages.collection.find({show: true});
   }
diff --git a/packages/telescope-module-share/lib/client/post_share.js b/packages/telescope-module-share/lib/client/post_share.js
index 0236a28fd..a0d95c3d4 100644
--- a/packages/telescope-module-share/lib/client/post_share.js
+++ b/packages/telescope-module-share/lib/client/post_share.js
@@ -1,5 +1,5 @@
 Meteor.startup(function () {
-  Template[getTemplate('postShare')].helpers({
+  Template.postShare.helpers({
     sourceLink: function(){
       return !!this.url ? this.url : getSiteUrl() + "posts/"+this._id;
     },
@@ -8,7 +8,7 @@ Meteor.startup(function () {
     }
   });
 
-  Template[getTemplate('postShare')].events({
+  Template.postShare.events({
     'click .share-link': function(e){
       var $this = $(e.target).parents('.post-share').find('.share-link');
       var $share = $this.parents('.post-share').find('.share-options');
diff --git a/packages/telescope-newsletter/lib/client/templates/newsletter_banner.js b/packages/telescope-newsletter/lib/client/templates/newsletter_banner.js
index 77f202cd6..25167d67a 100644
--- a/packages/telescope-newsletter/lib/client/templates/newsletter_banner.js
+++ b/packages/telescope-newsletter/lib/client/templates/newsletter_banner.js
@@ -20,7 +20,7 @@ var dismissBanner = function () {
 }
 
 Meteor.startup(function () {
-  Template[getTemplate('newsletterBanner')].helpers({
+  Template.newsletterBanner.helpers({
     siteName: function () {
       return Settings.get('title');
     },
@@ -44,7 +44,7 @@ Meteor.startup(function () {
     }
   });
 
-  Template[getTemplate('newsletterBanner')].events({
+  Template.newsletterBanner.events({
     'click .newsletter-button': function (e) {
       e.preventDefault();
       var $banner = $('.newsletter-banner');
diff --git a/packages/telescope-notifications/lib/client/templates/notification_item.js b/packages/telescope-notifications/lib/client/templates/notification_item.js
index 45e28c093..729412815 100644
--- a/packages/telescope-notifications/lib/client/templates/notification_item.js
+++ b/packages/telescope-notifications/lib/client/templates/notification_item.js
@@ -1,4 +1,4 @@
-Template[getTemplate('notificationItem')].helpers({
+Template.notificationItem.helpers({
   properties: function(){
     return this.data;
   },
@@ -7,7 +7,7 @@ Template[getTemplate('notificationItem')].helpers({
   }
 });
 
-Template[getTemplate('notificationItem')].events({
+Template.notificationItem.events({
   'click .action-link': function(event, instance){
     var notificationId=instance.data._id;
     Herald.collection.update(
diff --git a/packages/telescope-notifications/lib/client/templates/notifications_mark_as_read.js b/packages/telescope-notifications/lib/client/templates/notifications_mark_as_read.js
index 02ac2c9b8..e65d3a8bd 100644
--- a/packages/telescope-notifications/lib/client/templates/notifications_mark_as_read.js
+++ b/packages/telescope-notifications/lib/client/templates/notifications_mark_as_read.js
@@ -1,4 +1,4 @@
-Template[getTemplate('notificationsMarkAsRead')].events({
+Template.notificationsMarkAsRead.events({
   'click .mark-as-read': function(e, t){
     e.preventDefault();
     t.$('li').parents('.dropdown').removeClass('dropdown-open');
diff --git a/packages/telescope-notifications/lib/client/templates/notifications_menu.js b/packages/telescope-notifications/lib/client/templates/notifications_menu.js
index eda7e692b..e21cb6298 100644
--- a/packages/telescope-notifications/lib/client/templates/notifications_menu.js
+++ b/packages/telescope-notifications/lib/client/templates/notifications_menu.js
@@ -1,4 +1,4 @@
-Template[getTemplate('notificationsMenu')].helpers({
+Template.notificationsMenu.helpers({
   menuLabel: function () {
     var notificationsCount;
     var notifications=Herald.collection.find({userId: Meteor.userId(), read: false}, {sort: {timestamp: -1}}).fetch();
diff --git a/packages/telescope-notifications/lib/client/templates/unsubscribe.js b/packages/telescope-notifications/lib/client/templates/unsubscribe.js
index 99f713d59..19b144967 100644
--- a/packages/telescope-notifications/lib/client/templates/unsubscribe.js
+++ b/packages/telescope-notifications/lib/client/templates/unsubscribe.js
@@ -1,4 +1,4 @@
-Template[getTemplate('unsubscribe')].created = function(){
+Template.unsubscribe.created = function(){
   var hash = this.data.hash;
   Meteor.call('unsubscribeUser', hash, function(error, result){
     if(result){
@@ -10,7 +10,7 @@ Template[getTemplate('unsubscribe')].created = function(){
   trackEvent('notificationsUnsubcribe', {hash: hash});
 };
 
-Template[getTemplate('unsubscribe')].helpers({
+Template.unsubscribe.helpers({
   unsubscribed : function(){
     // we have to use a session variable because the string we want to display
     // depends on the return value of an asynchronous callback (unsubscribeUser)
diff --git a/packages/telescope-notifications/lib/herald.js b/packages/telescope-notifications/lib/herald.js
index 2992e5cb3..277e96efb 100644
--- a/packages/telescope-notifications/lib/herald.js
+++ b/packages/telescope-notifications/lib/herald.js
@@ -88,7 +88,7 @@ Herald.addCourier('postApproved', {
   message: {
     default: function (user) {
       return Blaze.toHTML(Blaze.With(this, function () {
-        return Template[getTemplate('notificationPostApproved')];
+        return Template.notificationPostApproved;
       }));
     }
   },
@@ -137,7 +137,7 @@ Herald.addCourier('newComment', {
   message: {
     default: function (user) {
       return Blaze.toHTML(Blaze.With(this, function () {
-        return Template[getTemplate('notificationNewComment')];
+        return Template.notificationNewComment;
       }));
     }
   },
@@ -154,7 +154,7 @@ Herald.addCourier('newReply', {
   message: {
     default: function (user) {
       return Blaze.toHTML(Blaze.With(this, function () {
-        return Template[getTemplate('notificationNewReply')];
+        return Template.notificationNewReply;
       }));
     }
   },
@@ -171,7 +171,7 @@ Herald.addCourier('newCommentSubscribed', {
   message: {
     default: function (user) {
       return Blaze.toHTML(Blaze.With(this, function () {
-        return Template[getTemplate('notificationNewReply')];
+        return Template.notificationNewReply;
       }));
     }
   },
diff --git a/packages/telescope-pages/lib/client/templates/page_item.js b/packages/telescope-pages/lib/client/templates/page_item.js
index bf9ab4e28..82ab69d94 100644
--- a/packages/telescope-pages/lib/client/templates/page_item.js
+++ b/packages/telescope-pages/lib/client/templates/page_item.js
@@ -1,11 +1,11 @@
 Meteor.startup(function () {
-  Template[getTemplate('pageItem')].helpers({
+  Template.pageItem.helpers({
     formId: function () {
       return 'updatePage-'+ this._id
     }
   });
 
-  Template[getTemplate('pageItem')].events({
+  Template.pageItem.events({
     'click .delete-link': function(e, instance){
       e.preventDefault();
       if (confirm("Delete page?")) {
diff --git a/packages/telescope-pages/lib/client/templates/pages.html b/packages/telescope-pages/lib/client/templates/pages.html
index ce95ef2af..0569fe1fc 100644
--- a/packages/telescope-pages/lib/client/templates/pages.html
+++ b/packages/telescope-pages/lib/client/templates/pages.html
@@ -4,6 +4,6 @@
     {{> quickForm collection="Pages.collection" id="insertPageForm" type="insert" label-class="control-label" input-col-class="controls" template="bootstrap-horizontal"}}
   </div>
   {{#each pages}}
-    {{> UI.dynamic template=pageItem}}
+    {{> pageItem}}
   {{/each}}
 </template>
diff --git a/packages/telescope-pages/lib/client/templates/pages.js b/packages/telescope-pages/lib/client/templates/pages.js
index 66d019df5..a1df0926d 100644
--- a/packages/telescope-pages/lib/client/templates/pages.js
+++ b/packages/telescope-pages/lib/client/templates/pages.js
@@ -1,10 +1,7 @@
 Meteor.startup(function () {
-  Template[getTemplate('pages')].helpers({
+  Template.pages.helpers({
     pages: function(){
       return Pages.collection.find({}, {sort: {order: 1}});
-    },
-    pageItem: function () {
-      return getTemplate('pageItem');
     }
   });
 });
diff --git a/packages/telescope-pages/lib/client/templates/pages_menu.js b/packages/telescope-pages/lib/client/templates/pages_menu.js
index eabaefa3a..356b28912 100644
--- a/packages/telescope-pages/lib/client/templates/pages_menu.js
+++ b/packages/telescope-pages/lib/client/templates/pages_menu.js
@@ -1,8 +1,8 @@
-Template[getTemplate("pagesMenu")].helpers({
+Template.pagesMenu.helpers({
   hasPages: function () {
-    return Pages.collection.find().count()
+    return Pages.collection.find().count();
   },
   pages: function () {
     return Pages.collection.find();
   }
-})
\ No newline at end of file
+});
diff --git a/packages/telescope-post-by-feed/lib/client/routes.js b/packages/telescope-post-by-feed/lib/client/routes.js
index 6cdd7ddc8..a6adf1d06 100644
--- a/packages/telescope-post-by-feed/lib/client/routes.js
+++ b/packages/telescope-post-by-feed/lib/client/routes.js
@@ -7,7 +7,7 @@ adminMenu.push({
 Meteor.startup(function () {
 
   Router.onBeforeAction(Router._filters.isAdmin, {only: ['feeds']});
-  
+
   // RSS Urls Admin
 
   Router.route('/feeds', {
@@ -20,7 +20,7 @@ Meteor.startup(function () {
         Meteor.subscribe('categories')
       ];
     },
-    // template: getTemplate('feeds')
+    // template: 'feeds'
   });
 
 });
diff --git a/packages/telescope-post-by-feed/lib/client/templates/feed_item.js b/packages/telescope-post-by-feed/lib/client/templates/feed_item.js
index e54c7bdcd..c7db01e64 100644
--- a/packages/telescope-post-by-feed/lib/client/templates/feed_item.js
+++ b/packages/telescope-post-by-feed/lib/client/templates/feed_item.js
@@ -1,11 +1,11 @@
 Meteor.startup(function () {
-  Template[getTemplate('feedItem')].helpers({
+  Template.feedItem.helpers({
     formId: function () {
       return 'updateFeed-'+ this._id
     }
   });
 
-  Template[getTemplate('feedItem')].events({
+  Template.feedItem.events({
     'click .delete-link': function(e, instance){
       e.preventDefault();
       if (confirm("Delete feed?")) {
diff --git a/packages/telescope-post-by-feed/lib/client/templates/feeds.html b/packages/telescope-post-by-feed/lib/client/templates/feeds.html
index bc4fe40b2..f8fa55d88 100644
--- a/packages/telescope-post-by-feed/lib/client/templates/feeds.html
+++ b/packages/telescope-post-by-feed/lib/client/templates/feeds.html
@@ -4,6 +4,6 @@
     {{> quickForm collection="Feeds" id="insertFeedForm" type="insert" label-class="control-label" input-col-class="controls" template="telescope"}}
   </div>
   {{#each feeds}}
-    {{> UI.dynamic template=feedItem}}
+    {{> feedItem}}
   {{/each}}
 </template>
diff --git a/packages/telescope-post-by-feed/lib/client/templates/feeds.js b/packages/telescope-post-by-feed/lib/client/templates/feeds.js
index d8458cf2d..359e5a801 100644
--- a/packages/telescope-post-by-feed/lib/client/templates/feeds.js
+++ b/packages/telescope-post-by-feed/lib/client/templates/feeds.js
@@ -1,10 +1,7 @@
 Meteor.startup(function () {
-  Template[getTemplate('feeds')].helpers({
+  Template.feeds.helpers({
     feeds: function(){
       return Feeds.find({}, {sort: {url: 1}});
-    },
-    feedItem: function () {
-      return getTemplate('feedItem');
     }
   });
 });
diff --git a/packages/telescope-releases/lib/client/templates/current_release.js b/packages/telescope-releases/lib/client/templates/current_release.js
index 06c220fe5..8e2e9f86d 100644
--- a/packages/telescope-releases/lib/client/templates/current_release.js
+++ b/packages/telescope-releases/lib/client/templates/current_release.js
@@ -1,18 +1,18 @@
 Meteor.startup(function () {
 
-  Template[getTemplate('currentRelease')].created = function () {
+  Template.currentRelease.created = function () {
     this.release = function () {
       return Releases.find({read: false}).fetch()[0];
     }
   };
 
-  Template[getTemplate('currentRelease')].helpers({
+  Template.currentRelease.helpers({
     currentRelease: function () {
       return Template.instance().release();
     }
   });
 
-  Template[getTemplate('currentRelease')].events({
+  Template.currentRelease.events({
     'click .release-dismiss': function (event, instance) {
       event.preventDefault();
       Releases.update(instance.release()._id, {$set: {read: true}});
diff --git a/packages/telescope-search/lib/client/templates/search.js b/packages/telescope-search/lib/client/templates/search.js
index 67d8b747c..aac19eb8b 100644
--- a/packages/telescope-search/lib/client/templates/search.js
+++ b/packages/telescope-search/lib/client/templates/search.js
@@ -9,7 +9,7 @@ var delay = (function(){
 
 Meteor.startup(function () {
 
-  Template[getTemplate('search')].helpers({
+  Template.search.helpers({
     canSearch: function () {
       return can.view(Meteor.user());
     },
@@ -21,7 +21,7 @@ Meteor.startup(function () {
     }
   });
 
-  Template[getTemplate('search')].events({
+  Template.search.events({
     'keyup .search-field, search .search-field': function(e){
       e.preventDefault();
       var val = $(e.target).val(),
diff --git a/packages/telescope-search/lib/client/templates/search_logs.js b/packages/telescope-search/lib/client/templates/search_logs.js
index e1dc5afda..3ae3a649a 100644
--- a/packages/telescope-search/lib/client/templates/search_logs.js
+++ b/packages/telescope-search/lib/client/templates/search_logs.js
@@ -1,5 +1,5 @@
 Meteor.startup(function () {
-  Template[getTemplate('searchLogs')].helpers({
+  Template.searchLogs.helpers({
     getTime: function () {
       return moment(this.timestamp).format("HH:mm:ss");
     },
diff --git a/packages/telescope-settings/lib/router.js b/packages/telescope-settings/lib/router.js
index 8167d3f07..9f2ea8abf 100644
--- a/packages/telescope-settings/lib/router.js
+++ b/packages/telescope-settings/lib/router.js
@@ -4,7 +4,7 @@ Meteor.startup(function () {
   Router.route('/settings', {
     controller: AdminController,
     name: 'settings',
-    // layoutTemplate: getTemplate('adminLayout'),
+    // layoutTemplate: 'adminLayout',
     data: function () {
       // we only have one set of settings for now
 
diff --git a/packages/telescope-singleday/lib/client/templates/single_day.html b/packages/telescope-singleday/lib/client/templates/single_day.html
index 9ced5d511..7971f386d 100644
--- a/packages/telescope-singleday/lib/client/templates/single_day.html
+++ b/packages/telescope-singleday/lib/client/templates/single_day.html
@@ -1,6 +1,6 @@
 <template name="singleDay">
   {{#if showDateNav}}
-    {{> Template.dynamic template=singleDayNav}}
+    {{> singleDayNav}}
   {{/if}}
-  {{> Template.dynamic template=posts_list data=context}}
+  {{> posts_list data=context}}
 </template>
diff --git a/packages/telescope-singleday/lib/client/templates/single_day.js b/packages/telescope-singleday/lib/client/templates/single_day.js
index 7c1610113..3b22a60bc 100644
--- a/packages/telescope-singleday/lib/client/templates/single_day.js
+++ b/packages/telescope-singleday/lib/client/templates/single_day.js
@@ -3,7 +3,7 @@
 // this template acts as the controller that sets and
 // manages the reactive context for the embedded postsList template
 
-Template[getTemplate('singleDay')].created = function () {
+Template.singleDay.created = function () {
 
   // 1. Initialization
 
@@ -74,16 +74,10 @@ Template[getTemplate('singleDay')].created = function () {
 
 };
 
-Template[getTemplate('singleDay')].helpers({
+Template.singleDay.helpers({
   showDateNav: function () {
     return (typeof this.showDateNav === 'undefined') ? true : this.showDateNav;
   },
-  singleDayNav: function () {
-    return getTemplate('singleDayNav');
-  },
-  posts_list: function () {
-    return getTemplate('posts_list');
-  },
   context: function () {
     // create context for postsList module
     var instance = Template.instance();
diff --git a/packages/telescope-singleday/lib/client/templates/single_day_nav.js b/packages/telescope-singleday/lib/client/templates/single_day_nav.js
index 86103fdb3..694eeaad9 100644
--- a/packages/telescope-singleday/lib/client/templates/single_day_nav.js
+++ b/packages/telescope-singleday/lib/client/templates/single_day_nav.js
@@ -1,4 +1,4 @@
-Template[getTemplate('singleDayNav')].created = function(){
+Template.singleDayNav.created = function(){
 
   $(document).unbind('keyup'); //remove any potential existing bindings to avoid duplicates
 
@@ -16,7 +16,7 @@ Template[getTemplate('singleDayNav')].created = function(){
 
 };
 
-Template[getTemplate('singleDayNav')].helpers({
+Template.singleDayNav.helpers({
   currentDate: function(){
     var currentDate = moment(Session.get('currentDate'));
     var today = moment(new Date());
diff --git a/packages/telescope-singleday/lib/routes.js b/packages/telescope-singleday/lib/routes.js
index 5cd5597b2..205fc3575 100644
--- a/packages/telescope-singleday/lib/routes.js
+++ b/packages/telescope-singleday/lib/routes.js
@@ -2,10 +2,10 @@
 
 PostsSingledayController = RouteController.extend({
 
-  template: getTemplate('singleDay'),
+  template: 'singleDay',
 
   onBeforeAction: function () {
-    this.render(getTemplate('postListTop'), {to: 'postListTop'});
+    this.render('postListTop', {to: 'postListTop'});
     this.next();
   },
 
diff --git a/packages/telescope-subscribe-to-posts/lib/client/templates/post_subscribe.js b/packages/telescope-subscribe-to-posts/lib/client/templates/post_subscribe.js
index 30cd39850..de4b1a0ee 100644
--- a/packages/telescope-subscribe-to-posts/lib/client/templates/post_subscribe.js
+++ b/packages/telescope-subscribe-to-posts/lib/client/templates/post_subscribe.js
@@ -1,4 +1,4 @@
-Template[getTemplate('postSubscribe')].helpers({
+Template.postSubscribe.helpers({
   canSubscribe: function() {
     // you cannot subscribe to your own posts
     return Meteor.userId() && this.userId !== Meteor.userId();
@@ -11,7 +11,7 @@ Template[getTemplate('postSubscribe')].helpers({
   }
 });
 
-Template[getTemplate('postSubscribe')].events({
+Template.postSubscribe.events({
   'click .subscribe-link': function(e, instance) {
     e.preventDefault();
     if (this.userId === Meteor.userId())
diff --git a/packages/telescope-subscribe-to-posts/lib/client/templates/user_subscribed_posts.js b/packages/telescope-subscribe-to-posts/lib/client/templates/user_subscribed_posts.js
index b7989f218..1798c893a 100644
--- a/packages/telescope-subscribe-to-posts/lib/client/templates/user_subscribed_posts.js
+++ b/packages/telescope-subscribe-to-posts/lib/client/templates/user_subscribed_posts.js
@@ -1,4 +1,4 @@
-Template[getTemplate('userSubscribedPosts')].created = function () {
+Template.userSubscribedPosts.created = function () {
   var user = this.data,
       instance = this;
 
@@ -26,7 +26,7 @@ Template[getTemplate('userSubscribedPosts')].created = function () {
   });
 };
 
-Template[getTemplate('userSubscribedPosts')].helpers({
+Template.userSubscribedPosts.helpers({
   posts: function () {
     var user = this,
         posts = Template.instance().posts.get().fetch();
@@ -42,7 +42,7 @@ Template[getTemplate('userSubscribedPosts')].helpers({
   }
 });
 
-Template[getTemplate('userSubscribedPosts')].events({
+Template.userSubscribedPosts.events({
   'click .subscribedposts-more': function (e) {
     e.preventDefault();
     var terms = Template.instance().terms.get();
diff --git a/packages/telescope-tagline-banner/lib/client/templates/tagline_banner.js b/packages/telescope-tagline-banner/lib/client/templates/tagline_banner.js
index adf4ee7d8..3c94bf7e1 100644
--- a/packages/telescope-tagline-banner/lib/client/templates/tagline_banner.js
+++ b/packages/telescope-tagline-banner/lib/client/templates/tagline_banner.js
@@ -1,4 +1,4 @@
-Template[getTemplate('taglineBanner')].helpers({
+Template.taglineBanner.helpers({
   showTaglineBanner: function () {
     return !!Settings.get('tagline') && !!Settings.get('showTaglineBanner');
   }
diff --git a/packages/telescope-tags/lib/client/routes.js b/packages/telescope-tags/lib/client/routes.js
index 456a6ba4c..129c60022 100644
--- a/packages/telescope-tags/lib/client/routes.js
+++ b/packages/telescope-tags/lib/client/routes.js
@@ -3,13 +3,13 @@ Meteor.startup(function () {
   Router.onBeforeAction(Router._filters.isAdmin, {only: ['categories']});
 
   PostsCategoryController = PostsListController.extend({
-    
+
     view: 'category',
 
     showViewsNav: false,
 
     onBeforeAction: function () {
-      this.render(getTemplate('categoryTitle'), {to: 'postListTop'});
+      this.render('categoryTitle', {to: 'postListTop'});
       this.next();
     },
 
@@ -22,7 +22,7 @@ Meteor.startup(function () {
     },
 
     getDescription: function () {
-      return this.getCurrentCategory().description;    
+      return this.getCurrentCategory().description;
     }
 
   });
@@ -46,4 +46,4 @@ Meteor.startup(function () {
   });
 
 
-});
\ No newline at end of file
+});
diff --git a/packages/telescope-tags/lib/client/templates/categories.html b/packages/telescope-tags/lib/client/templates/categories.html
index 811ac0081..0d68446db 100644
--- a/packages/telescope-tags/lib/client/templates/categories.html
+++ b/packages/telescope-tags/lib/client/templates/categories.html
@@ -4,6 +4,6 @@
     {{> quickForm collection="Categories" id="insertCategoryForm" type="insert" label-class="control-label" input-col-class="controls" template="telescope"}}
   </div>
   {{#each categories}}
-    {{> UI.dynamic template=categoryItem}}
+    {{> categoryItem}}
   {{/each}}
 </template>
diff --git a/packages/telescope-tags/lib/client/templates/categories.js b/packages/telescope-tags/lib/client/templates/categories.js
index 8105d5861..9e116293a 100644
--- a/packages/telescope-tags/lib/client/templates/categories.js
+++ b/packages/telescope-tags/lib/client/templates/categories.js
@@ -1,10 +1,7 @@
 Meteor.startup(function () {
-  Template[getTemplate('categories')].helpers({
+  Template.categories.helpers({
     categories: function(){
       return Categories.find({}, {sort: {order: 1, name: 1}});
-    },
-    categoryItem: function () {
-      return getTemplate('categoryItem');
     }
   });
 });
diff --git a/packages/telescope-tags/lib/client/templates/categories_menu.js b/packages/telescope-tags/lib/client/templates/categories_menu.js
index 13fa9dc9e..f22941fb3 100644
--- a/packages/telescope-tags/lib/client/templates/categories_menu.js
+++ b/packages/telescope-tags/lib/client/templates/categories_menu.js
@@ -1,5 +1,5 @@
 Meteor.startup(function () {
-  Template[getTemplate('categoriesMenu')].helpers({
+  Template.categoriesMenu.helpers({
     hasCategories: function () {
       return Categories.find().count();
     },
diff --git a/packages/telescope-tags/lib/client/templates/category_item.js b/packages/telescope-tags/lib/client/templates/category_item.js
index 1ea524d4c..5b906ff16 100644
--- a/packages/telescope-tags/lib/client/templates/category_item.js
+++ b/packages/telescope-tags/lib/client/templates/category_item.js
@@ -1,11 +1,11 @@
 Meteor.startup(function () {
-  Template[getTemplate('categoryItem')].helpers({
+  Template.categoryItem.helpers({
     formId: function () {
       return 'updateCategory-'+ this._id
     }
   });
 
-  Template[getTemplate('categoryItem')].events({
+  Template.categoryItem.events({
     'click .delete-link': function(e, instance){
       e.preventDefault();
       if (confirm("Delete category?")) {
diff --git a/packages/telescope-tags/lib/client/templates/post_categories.js b/packages/telescope-tags/lib/client/templates/post_categories.js
index 779c81efe..fd53eebb2 100644
--- a/packages/telescope-tags/lib/client/templates/post_categories.js
+++ b/packages/telescope-tags/lib/client/templates/post_categories.js
@@ -1,5 +1,5 @@
 Meteor.startup(function () {
-  Template[getTemplate('postCategories')].helpers({
+  Template.postCategories.helpers({
     categoriesArray: function(){
       return _.map(this.categories, function (categoryId) { // note: this.categories maybe be undefined
         return Categories.findOne(categoryId);
diff --git a/packages/telescope-update-prompt/lib/client/templates/update_banner.js b/packages/telescope-update-prompt/lib/client/templates/update_banner.js
index 454624299..7b321e6c8 100644
--- a/packages/telescope-update-prompt/lib/client/templates/update_banner.js
+++ b/packages/telescope-update-prompt/lib/client/templates/update_banner.js
@@ -1,4 +1,4 @@
-Template[getTemplate('updateBanner')].helpers({
+Template.updateBanner.helpers({
   showBanner: function () {
     return Session.get('updateVersion');
   },
diff --git a/tests/jasmine/client/unit/commentItemSpec.js b/tests/jasmine/client/unit/commentItemSpec.js
index a3a8c3cef..be667e9d4 100644
--- a/tests/jasmine/client/unit/commentItemSpec.js
+++ b/tests/jasmine/client/unit/commentItemSpec.js
@@ -13,7 +13,7 @@ describe('test clicking vote buttons', function () {
   });
 
   var render = function (data) {
-    return Blaze.renderWithData(Template[getTemplate('comment_item')], data || {}, $div.get(0));
+    return Blaze.renderWithData(Template.comment_item, data || {}, $div.get(0));
   };
 
   var shouldRedirectIfLoggedOut = function (selector) {
diff --git a/tests/jasmine/client/unit/navSpec.js b/tests/jasmine/client/unit/navSpec.js
index 1bb77beac..ff783630d 100644
--- a/tests/jasmine/client/unit/navSpec.js
+++ b/tests/jasmine/client/unit/navSpec.js
@@ -13,7 +13,7 @@ describe('test nav template', function() {
   });
 
   var render = function () {
-    Blaze.render(Template[getTemplate('nav')], $div.get(0));
+    Blaze.render(Template.nav, $div.get(0));
   };
 
   it('should render mobile menu button', function () {