diff --git a/Templates/controller.pm.tem b/Templates/controller.pm.tem
index 319008d..1e9deeb 100644
--- a/Templates/controller.pm.tem
+++ b/Templates/controller.pm.tem
@@ -151,7 +151,7 @@ sub do_update {
 	if ($ret ne "ok") {
         # return to the panel with error message
 		$c->stash(error => $c->l($ret));
-		$c->render("${PackageName}");		
+		$c->render("${lcPackageName}");		
 	} else {
 		#Do whatever is needed, including writing values to the DB
 		<tal:block tal:repeat="panel panels">
@@ -161,7 +161,7 @@ sub do_update {
 				if ($ret ne "ok") {
 					# return to the panel with error message
 					$c->stash(error => $c->l($ret));
-					$c->render("${PackageName}");		
+					$c->render("${lcPackageName}");		
 				} else {
 					$c->stash( success => $c->l('${panel} panel action was successful')); #A bit bland - edit it in the lex file
 				}
@@ -180,7 +180,7 @@ sub do_update {
 		} else {
 			$$${prefix}_data{'trt'} = '${NextPanel | "none"}';
 		}	
-		$c->render("${PackageName}");
+		$c->render("${lcPackageName}");
 	} 
 }
 
@@ -241,7 +241,7 @@ sub do_display {
 		title 			=> $title, 
 		${prefix}_data  => \%${prefix}_data
 	);
-	$c->render("${PackageName}");
+	$c->render("${lcPackageName}");
 }    
 1;
 
diff --git a/Templates/layout.html.ep.tem b/Templates/layout.html.ep.tem
index 2360cd4..8dd035b 100644
--- a/Templates/layout.html.ep.tem
+++ b/Templates/layout.html.ep.tem
@@ -38,6 +38,7 @@
 	%}
 
 	%#Routing to partials according to trt parameter.
+	%#This ought to be cascading if/then/elsif, but is easier to just stack the if/then's rather like a case statement'
 	<tal:block tal:repeat="condition conditions">
 	% if ($$${prefix}_data->{trt} eq "${condition}") {
 		%= include 'partials/_${prefix}_${condition}'