diff --git a/Templates/custom.pm.tem b/Templates/custom.pm.tem
index 0c765a6..498ec18 100644
--- a/Templates/custom.pm.tem
+++ b/Templates/custom.pm.tem
@@ -28,7 +28,7 @@ use constant TRUE  => 1;
 <tal:block tal:repeat="panel panels">
 	sub validate_${panel} {
 		my $c = shift;
-		my $prefix_data = shift; #Data hash as parameter
+		my ${prefix}_data = shift; #Data hash as parameter
 		# Validation for each field 
 		my $ret = "";
 		<tal:block tal:repeat="field fields[panel]">
@@ -111,7 +111,7 @@ sub get_${tablecontrol[0]} {
 <tal:block tal:repeat="panel panels">
 	sub perform_${panel} {
 		my $c = shift;
-		my $prefix_data = shift; #Data hash as parameter
+		my ${prefix}_data = shift; #Data hash as parameter
 		my $ret = "";
 		my $db = $cdb; #maybe one of the others
 		my $dbkey = 'ChangeThis';