diff --git a/website/agenda/planung/css/fileUploader.css b/website/agenda/planung/css/fileUploader.css
deleted file mode 100644
index d29ee1e..0000000
--- a/website/agenda/planung/css/fileUploader.css
+++ /dev/null
@@ -1,46 +0,0 @@
-#px_display {
-	padding-top: 10px;
-	padding-bottom: 10px;
-}
-.uploadData {
-	padding: 5px;
-	width: 420px;
-	margin-top: 5px;
-	margin-bottom: 5px;
-	background-color: #F0F8FF;
-	border: 1px solid #B0D8FF;
-	position: relative;
-}
-.uploadData .fname {
-	padding-right: 10px;
-	width: 120px;
-}
-.uploadData .loader {
-	width: 140px;
-	text-align: center;
-	border-bottom-width: 1px;
-	border-bottom-style: dotted;
-	border-bottom-color: #999999;
-}
-.uploadData .result {
-	display: block;
-	float: left;
-	width: 130px;
-	padding-left: 10px;
-}
-.uploadData .close {
-	background-image: url(close.gif);
-	height: 16px;
-	width: 16px;
-	position: absolute;
-	top: 5px;
-	right: 5px;
-	cursor: pointer;
-}
-.uploadData .close:hover {
-	background-position: 16px 0px;
-}
-#px_button input{
-	margin-right: 6px;
-	padding: 5px;
-}
diff --git a/website/agenda/planung/imageUpload.cgi b/website/agenda/planung/image-upload.cgi
similarity index 99%
rename from website/agenda/planung/imageUpload.cgi
rename to website/agenda/planung/image-upload.cgi
index 61d51d7..142ff96 100755
--- a/website/agenda/planung/imageUpload.cgi
+++ b/website/agenda/planung/image-upload.cgi
@@ -370,7 +370,7 @@ sub check_params {
     my $params = shift;
 
     my $checked = {};
-    $checked->{template} = template::check( $config, $params->{template}, 'imageUpload' );
+    $checked->{template} = template::check( $config, $params->{template}, 'image-upload' );
 
     #numeric values
     for my $param ( 'project_id', 'studio_id', 'default_studio_id' ) {
diff --git a/website/agenda/planung/js/image_upload.js b/website/agenda/planung/js/image_upload.js
index 86e2dca..6518b2c 100644
--- a/website/agenda/planung/js/image_upload.js
+++ b/website/agenda/planung/js/image_upload.js
@@ -1,5 +1,5 @@
 function initUploadDialog(){
-    var url='imageUpload.cgi?project_id='+ getProjectId()+"&studio_id="+getStudioId();
+    var url='image-upload.cgi?project_id='+ getProjectId()+"&studio_id="+getStudioId();
     updateContainer("image-tabs-upload", url, pageLeaveHandler);
 }
 
@@ -8,7 +8,7 @@ function uploadImage(){
     var form=$("#img_upload");
     var fd = new FormData(form[0]);
     var rq = $.ajax({
-        url: 'imageUpload.cgi',  
+        url: 'image-upload.cgi',  
         type: 'POST',
         data: fd,
         cache: false,
@@ -27,7 +27,7 @@ function uploadImage(){
         //remove existing image from list
         $('#imageList div.images #img_'+image_id).remove();
 
-        var url='showImage.cgi?project_id='+getProjectId()+'&studioId='+getStudioId()+'&type=icon&filename='+filename;
+        var url='show-image.cgi?project_id='+getProjectId()+'&studioId='+getStudioId()+'&type=icon&filename='+filename;
 
         var html = '<div';
         html += ' id="img_' + image_id + '"';
diff --git a/website/agenda/planung/showImage.cgi b/website/agenda/planung/show-image.cgi
similarity index 100%
rename from website/agenda/planung/showImage.cgi
rename to website/agenda/planung/show-image.cgi
diff --git a/website/agenda/planung/templates/edit_event.html b/website/agenda/planung/templates/edit_event.html
index 8060fb0..15593f9 100644
--- a/website/agenda/planung/templates/edit_event.html
+++ b/website/agenda/planung/templates/edit_event.html
@@ -391,7 +391,7 @@
         <tr> 
             <td class="label">description</td>
             <td>
-                <img style="float:right;padding-left:1em" src="showImage.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR .studio_id>&type=icon&filename=<TMPL_VAR image>">
+                <img style="float:right;padding-left:1em" src="show-image.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR .studio_id>&type=icon&filename=<TMPL_VAR image>">
                    <div><TMPL_VAR topic</div>
                    <div><TMPL_VAR html_content escape=none></div>
             </td>
@@ -459,7 +459,7 @@
                     <button onclick="selectImage('<TMPL_VAR series_name escape=HTML>', '<TMPL_VAR image ESCAPE=url>', 'event', '<TMPL_VAR .project_id>','<TMPL_VAR .studio_id>','<TMPL_VAR series_id>','<TMPL_VAR event_id>'); return false;"
                         class="selectImage"
                     >
-                        <img id="imagePreview" src="showImage.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR studio_id>&filename=<TMPL_VAR image>&type=icon">
+                        <img id="imagePreview" src="show-image.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR studio_id>&filename=<TMPL_VAR image>&type=icon">
                     </button>
                     <input id="image_<TMPL_VAR event_id>" name="image" value="<TMPL_VAR image>" class="image" placeholder="<TMPL_VAR .loc.label_image>">
                     <input type="hidden" name="series_image" value="<TMPL_VAR series_image>" > 
diff --git a/website/agenda/planung/templates/edit_series.html b/website/agenda/planung/templates/edit_series.html
index 98d8c11..60d69b8 100644
--- a/website/agenda/planung/templates/edit_series.html
+++ b/website/agenda/planung/templates/edit_series.html
@@ -123,7 +123,7 @@
                         <button class="selectImage" 
                             onclick="selectImage('<TMPL_VAR series_name escape=HTML>', '<TMPL_VAR image ESCAPE=url>', 'series', '<TMPL_VAR .project_id>','<TMPL_VAR .studio_id>','<TMPL_VAR series_id>'); return false;"
                         >
-                            <img id="imagePreview" src="showImage.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR .studio_id>&filename=<TMPL_VAR image>&type=icon">
+                            <img id="imagePreview" src="show-image.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR .studio_id>&filename=<TMPL_VAR image>&type=icon">
                         </button>
 
                         <input type="hidden" name="series_image" value="<TMPL_VAR series_image>" > 
@@ -433,7 +433,7 @@
 		<TMPL_LOOP events>
 			<tr id="event_<TMPL_VAR event_id>">
 			    <TMPL_IF .allow.read_image>
-				<td class="logo"><img width="33" height="33" src="showImage.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR .studio_id>&type=icon&filename=<TMPL_VAR image>"></td>
+				<td class="logo"><img width="33" height="33" src="show-image.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR .studio_id>&type=icon&filename=<TMPL_VAR image>"></td>
 				</TMPL_IF>
 				<td class="weekday"><TMPL_VAR weekday_short_name></td>
 				<td class="date"><TMPL_VAR start_date></td>
diff --git a/website/agenda/planung/templates/imageUpload.html b/website/agenda/planung/templates/image-upload.html
similarity index 93%
rename from website/agenda/planung/templates/imageUpload.html
rename to website/agenda/planung/templates/image-upload.html
index f2a8a40..a5b9c9d 100644
--- a/website/agenda/planung/templates/imageUpload.html
+++ b/website/agenda/planung/templates/image-upload.html
@@ -16,7 +16,7 @@
             </TMPL_IF>
         </TMPL_IF>
 
-        <form name="img_upload" id="img_upload" method="POST" action="imageUpload.cgi" enctype="multipart/form-data">
+        <form name="img_upload" id="img_upload" method="POST" action="image-upload.cgi" enctype="multipart/form-data">
             <input type="hidden" name="project_id" value="<TMPL_VAR .project_id>">
             <input type="hidden" name="studio_id" value="<TMPL_VAR .studio_id>">
             <input type="hidden" name="action" value="upload">
@@ -24,7 +24,7 @@
 		        <tr>	
 			        <td>
 				        <TMPL_IF filename>
-				        <div class="image" style="background-image:url('showImage.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR .studio_id>&type=icon&filename=<TMPL_VAR filename>')" >
+				        <div class="image" style="background-image:url('show-image.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR .studio_id>&type=icon&filename=<TMPL_VAR filename>')" >
                         </div>
 				        </TMPL_IF>
 			        </td>
diff --git a/website/agenda/planung/templates/image.html b/website/agenda/planung/templates/image.html
index 14f5293..930d2fb 100644
--- a/website/agenda/planung/templates/image.html
+++ b/website/agenda/planung/templates/image.html
@@ -98,7 +98,7 @@
             <TMPL_LOOP images>
 	            <div class="image" 
 		            id="img_<TMPL_VAR id>" 
-		            style="background-image:url('showImage.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR .studio_id>&type=icon&filename=<TMPL_VAR filename>')"
+		            style="background-image:url('show-image.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR .studio_id>&type=icon&filename=<TMPL_VAR filename>')"
 		            title="<TMPL_VAR description>"
                     filename="<TMPL_VAR filename>"
 	            >
diff --git a/website/agenda/planung/templates/projects.html b/website/agenda/planung/templates/projects.html
index 45f7d25..5ab596a 100644
--- a/website/agenda/planung/templates/projects.html
+++ b/website/agenda/planung/templates/projects.html
@@ -52,7 +52,7 @@
     <!-- view project -->
     <div id="view_<TMPL_VAR project_id>" class="panel-body">
         <table>
-            <tr><td class="label"><TMPL_VAR .loc.label_image></td>      <td colspan="2"><img src="showImage.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR .studio_id>&filename=<TMPL_VAR image>&type=thumbs"> &nbsp;</td></tr>
+            <tr><td class="label"><TMPL_VAR .loc.label_image></td>      <td colspan="2"><img src="show-image.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR .studio_id>&filename=<TMPL_VAR image>&type=thumbs"> &nbsp;</td></tr>
             <tr><td class="label"><TMPL_VAR .loc.label_name></td>       <td colspan="2"><TMPL_VAR name> &nbsp;</td></tr>
             <tr><td class="label"><TMPL_VAR .loc.label_subtitle></td>   <td colspan="2"><TMPL_VAR subtitle> &nbsp;</td></tr>
             <tr><td class="label"><TMPL_VAR .loc.label_start_date></td> <td colspan="2"><TMPL_VAR start_date> &nbsp;</td></tr>
@@ -99,7 +99,7 @@
                             class="selectImage"
                             onclick="selectImage('<TMPL_VAR name escape=HTML>', '<TMPL_VAR image ESCAPE=url>', 'projects', '<TMPL_VAR .project_id>','<TMPL_VAR .studio_id>', null, null, '<TMPL_VAR pid>'); return false;"
                         >
-                            <img id="imagePreview" src="showImage.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR .studio_id>&filename=<TMPL_VAR image>&type=icon">
+                            <img id="imagePreview" src="show-image.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR .studio_id>&filename=<TMPL_VAR image>&type=icon">
                         </button>
                         <input id="image_<TMPL_VAR pid>" name="image" value="<TMPL_VAR image>" class="image" placeholder="<TMPL_VAR .loc.template_image>">
                     </td>
diff --git a/website/agenda/planung/templates/seriesNames.html b/website/agenda/planung/templates/series-names.html
similarity index 100%
rename from website/agenda/planung/templates/seriesNames.html
rename to website/agenda/planung/templates/series-names.html
diff --git a/website/agenda/planung/templates/studios.html b/website/agenda/planung/templates/studios.html
index dcd72ee..ade4d1b 100644
--- a/website/agenda/planung/templates/studios.html
+++ b/website/agenda/planung/templates/studios.html
@@ -48,7 +48,7 @@
 	<!-- view studio -->
 	<div id="view_<TMPL_VAR id>" class="panel-body">
 		<table>
-			<tr><td class="label"><TMPL_VAR .loc.label_image></td> 	         <td><img src="showImage.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR .studio_id>&filename=<TMPL_VAR image>&type=thumbs"> &nbsp;</td></tr>
+			<tr><td class="label"><TMPL_VAR .loc.label_image></td> 	         <td><img src="show-image.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR .studio_id>&filename=<TMPL_VAR image>&type=thumbs"> &nbsp;</td></tr>
 			<tr><td class="label"><TMPL_VAR .loc.label_name></td> 	         <td><TMPL_VAR name> &nbsp;</td></tr>
 			<tr><td class="label"><TMPL_VAR .loc.label_description></td> 	 <td><TMPL_VAR description> &nbsp;</td></tr>
 			<tr><td class="label"><TMPL_VAR .loc.label_location></td> 	     <td><TMPL_VAR location> &nbsp;</td></tr>
@@ -75,7 +75,7 @@
                             class="selectImage"
                             onclick="selectImage('<TMPL_VAR name escape=HTML>', '<TMPL_VAR image ESCAPE=url>', 'studios', '<TMPL_VAR .project_id>','<TMPL_VAR .studio_id>'); return false;"
                         >
-                            <img id="imagePreview" src="showImage.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR .studio_id>&filename=<TMPL_VAR image>&type=icon">
+                            <img id="imagePreview" src="show-image.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR .studio_id>&filename=<TMPL_VAR image>&type=icon">
                         </button>
                         <input id="image_<TMPL_VAR id>" name="image" value="<TMPL_VAR image>" class="image" placeholder="<TMPL_VAR .loc.template_image>">
                     </td>