Renamed custom_template.Loader to CustomLoader.

2 files changed, 4 insertions, 5 deletions

diff --git a/pystache/custom_template.py b/pystache/custom_template.py
index 3b51c28..53d46f5 100644
--- a/pystache/custom_template.py
+++ b/pystache/custom_template.py
@@ -8,9 +8,8 @@ This module supports specifying custom template information per view.
 import os.path
 
 from .context import Context
+from .loader import Loader
 from .locator import Locator as TemplateLocator
-# TODO: remove this alias.
-from pystache.loader import Loader as Reader
 from .renderer import Renderer
 
 
@@ -121,7 +120,7 @@ class View(CustomizedTemplate):
         return renderer.render(template, self.context)
 
 
-class Loader(object):
+class CustomLoader(object):
 
     """
     Supports loading a custom-specified template.
@@ -133,7 +132,7 @@ class Loader(object):
             locator = TemplateLocator()
 
         if reader is None:
-            reader = Reader()
+            reader = Loader()
 
         if search_dirs is None:
             search_dirs = []
diff --git a/tests/test_custom_template.py b/tests/test_custom_template.py
index 2cf0abe..2c1a714 100644
--- a/tests/test_custom_template.py
+++ b/tests/test_custom_template.py
@@ -16,7 +16,7 @@ from examples.inverted import Inverted, InvertedLists
 from pystache import CustomizedTemplate as Template
 from pystache import Renderer
 from pystache import View
-from pystache.custom_template import Loader as CustomLoader
+from pystache.custom_template import CustomLoader
 from pystache.locator import Locator
 # TODO: remove this alias.
 from pystache.loader import Loader as Reader