diff --git a/routes/kube_helm_routes.py b/routes/kube_helm_routes.py
index d570b7c..184de81 100644
--- a/routes/kube_helm_routes.py
+++ b/routes/kube_helm_routes.py
@@ -9,7 +9,7 @@ import json
 def index():
     ns = get_namespaces()
     form = deploySelectForm()
-    form.ns.choices = [(name['metadata']['name'], name['metadata']['name']) for name in ns['items']]
+    form.ns.choices = [(name.metadata.name, name.metadata.name) for name in ns.items]
     return render_template('nameChartSelect.html', ns=ns, form=form)
 
 @routes.route('/chartSelect', methods=['POST'])
diff --git a/templates/nameChartSelect.html b/templates/nameChartSelect.html
index 61c0c0f..17a72a4 100644
--- a/templates/nameChartSelect.html
+++ b/templates/nameChartSelect.html
@@ -18,8 +18,8 @@
               <div class = "row">
                 <div class = "col-sm-6">
                   <div class="input-group">
-                    <span class="input-group-addon" id="basic-addon1">Tiller Namespace:</span>
-                    {{ form.tiller_ns(class_="form-control") }}
+                    <span class="input-group-addon" id="basic-addon1">Namespace:</span>
+                    {{ form.ns(class_="form-control") }}
                   </div>
                 </div>
               </div>
@@ -50,16 +50,16 @@
     </dl>
 
     <script>
-      var tillerSelect = document.getElementById("tiller_ns");
+      var nsSelect = document.getElementById("ns");
       var chartSelect = document.getElementById("chart");
       
-      tillerSelect.onchange = function() {myFunction()};
+      nsSelect.onchange = function() {myFunction()};
       
       function myFunction() {
         
-        tiller_ns = tillerSelect.value;    
+        ns = nsSelect.value;    
           
-        fetch('/nsLookup/' + tiller_ns + '/default').then(function(response) {
+        fetch('/nsLookup/' + ns + '/default').then(function(response) {
           response.json().then(function(data) {
             if (data != 'EMPTY') {
               var optionHTML = '';