diff --git a/manifests/init.pp b/manifests/init.pp
index 2145c1f..e74f15b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -26,6 +26,9 @@ define wmdeit_install::program(
 	$exec = "$extract_path/$extract_dir/$program",
 	$exec_path = "$extract_path/$extract_dir",
 
+	$generic_name = "$program",
+	$comment = "$program",
+
 ){
 
 	file {$extract_path:
diff --git a/templates/program.desktop.erb b/templates/program.desktop.erb
index 762abb8..a839380 100644
--- a/templates/program.desktop.erb
+++ b/templates/program.desktop.erb
@@ -2,8 +2,8 @@
 Type=Application
 Version=1.0
 Name=<%= @program %>
-GenericName=Upload-Werkzeug
-Comment=Uploader für Wikimedia Commons
+GenericName=<%= @generic_name %>
+Comment=<%= @comment %>
 Path=<%= @exec_path %>
 Exec=<%= @exec %>
 Icon=<%= @extract_path %>/<%= @svg %>