diff --git a/widgets/make_widget.sh b/widgets/make_widget.sh
index deec05bc3..e93bb29f6 100755
--- a/widgets/make_widget.sh
+++ b/widgets/make_widget.sh
@@ -4,7 +4,7 @@
 
 LOWERNAME=`echo $1 | tr [:upper:] [:lower:]`
 NAME=$1
-CAPNAME=`echo $3 | tr [:lower:] [:upper:]`
+CAPNAME=`echo $1 | tr [:lower:] [:upper:]`
 NATIVE="Q${NAME}"
 HEADER="${LOWERNAME}.h"
 SOURCE="${LOWERNAME}.cpp"
diff --git a/widgets/template.h b/widgets/template.h
index 82bb3e328..4922221e6 100644
--- a/widgets/template.h
+++ b/widgets/template.h
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef PLASMA_TEMPLATE_H
-#define PLASMA_TEMPLATE_H
+#ifndef PLASMA_<NAME>_H
+#define PLASMA_<NAME>_H
 
 #include <QGraphicsProxyWidget>