From 5371f9bb92ae655e03690925ec29526d485e45c5 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <dceejay@gmail.com>
Date: Tue, 28 Nov 2023 17:56:07 +0000
Subject: [PATCH] move name field to top for a bunch of nodes

---
 analysis/sentiment/72-sentiment.html |  8 +++---
 analysis/sentiment/package.json      |  4 +--
 function/random/package.json         |  4 +--
 function/random/random.html          |  9 +++----
 function/rbe/package.json            |  4 +--
 function/rbe/rbe.html                |  8 +++---
 function/smooth/17-smooth.html       |  9 +++----
 function/smooth/package.json         |  4 +--
 io/mdns/mdns.html                    | 16 +++++------
 io/mdns/package.json                 |  4 +--
 io/ping/88-ping.html                 |  8 +++---
 io/ping/package.json                 |  4 +--
 io/serialport/25-serial.html         | 32 +++++++++++-----------
 io/serialport/25-serial.js           |  7 ++---
 io/serialport/package.json           |  2 +-
 io/snmp/package.json                 |  4 +--
 io/snmp/snmp.html                    | 40 ++++++++++++++--------------
 io/stomp/18-stomp.html               | 34 +++++++++++------------
 io/stomp/18-stomp.js                 | 21 ++++++++-------
 io/stomp/package.json                |  2 +-
 io/wol/39-wol.html                   |  8 +++---
 io/wol/package.json                  |  4 +--
 parsers/base64/70-base64.html        |  8 +++---
 parsers/base64/package.json          |  2 +-
 parsers/msgpack/70-msgpack.html      |  8 +++---
 parsers/msgpack/package.json         |  2 +-
 social/xmpp/92-xmpp.html             | 24 ++++++++---------
 social/xmpp/package.json             |  4 +--
 storage/tail/28-tail.html            |  8 +++---
 storage/tail/package.json            |  6 ++---
 time/suncalc/79-suncalc.html         |  8 +++---
 time/suncalc/package.json            |  4 +--
 time/timeswitch/package.json         |  4 +--
 time/timeswitch/timeswitch.html      |  8 +++---
 utility/annotate-image/annotate.html |  8 +++---
 utility/annotate-image/package.json  |  2 +-
 utility/daemon/daemon.html           |  8 +++---
 utility/daemon/package.json          |  4 +--
 utility/exif/94-exif.html            |  8 +++---
 utility/exif/package.json            |  2 +-
 40 files changed, 177 insertions(+), 177 deletions(-)

diff --git a/analysis/sentiment/72-sentiment.html b/analysis/sentiment/72-sentiment.html
index c50479fc..c4de8e18 100644
--- a/analysis/sentiment/72-sentiment.html
+++ b/analysis/sentiment/72-sentiment.html
@@ -1,12 +1,12 @@
 <script type="text/html" data-template-name="sentiment">
-    <div class="form-row">
-        <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="node-red:common.label.property"></span></label>
-        <input type="text" id="node-input-property" style="width:70%;"/>
-    </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
     </div>
+    <div class="form-row">
+        <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="node-red:common.label.property"></span></label>
+        <input type="text" id="node-input-property" style="width:70%;"/>
+    </div>
 </script>
 
 <script type="text/javascript">
diff --git a/analysis/sentiment/package.json b/analysis/sentiment/package.json
index fa96bd05..21f97c6d 100644
--- a/analysis/sentiment/package.json
+++ b/analysis/sentiment/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-sentiment",
-    "version"       : "0.1.6",
+    "version"       : "0.1.7",
     "description"   : "A Node-RED node that uses the AFINN-165 wordlists for sentiment analysis of words.",
     "dependencies"  : {
         "sentiment" : "2.1.0"
@@ -19,7 +19,7 @@
     },
     "author": {
         "name": "Dave Conway-Jones",
-        "email": "ceejay@vnet.ibm.com",
+        "email": "dceejay@gmail.com",
         "url": "http://nodered.org"
     }
 }
diff --git a/function/random/package.json b/function/random/package.json
index ba190135..7a67cc86 100644
--- a/function/random/package.json
+++ b/function/random/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-random",
-    "version"       : "0.4.1",
+    "version"       : "0.4.2",
     "description"   : "A Node-RED node that when triggered generates a random number between two values.",
     "dependencies"  : {
     },
@@ -18,7 +18,7 @@
     },
     "author": {
         "name": "Dave Conway-Jones",
-        "email": "ceejay@vnet.ibm.com",
+        "email": "dceejay@gmail.com",
         "url": "http://nodered.org"
     },
     "contributors": [
diff --git a/function/random/random.html b/function/random/random.html
index 7443615f..da930a9d 100644
--- a/function/random/random.html
+++ b/function/random/random.html
@@ -1,4 +1,8 @@
 <script type="text/html" data-template-name="random">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name" style="width:70%;">
+    </div>
     <div class="form-row">
         <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="node-red:common.label.property"></span></label>
         <input type="text" id="node-input-property" style="width:70%;"/>
@@ -18,11 +22,6 @@
         <label for="node-input-high"><i class="fa fa-arrow-up"></i> <span data-i18n="random.label.to"></label>
         <input type="text" id="node-input-high" data-i18n="[placeholder]random.label.highestNumber" style="width:70%;">
     </div>
-    <br/>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name" style="width:70%;">
-    </div>
 </script>
 
 <script type="text/javascript">
diff --git a/function/rbe/package.json b/function/rbe/package.json
index da87376d..41a01ac4 100644
--- a/function/rbe/package.json
+++ b/function/rbe/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-rbe",
-    "version"       : "0.6.0",
+    "version"       : "0.6.1",
     "description"   : "A Node-RED node that provides report-by-exception (RBE) and deadband capabilities.",
     "dependencies"  : {
     },
@@ -18,7 +18,7 @@
     },
     "author": {
         "name": "Dave Conway-Jones",
-        "email": "ceejay@vnet.ibm.com",
+        "email": "dceejay@gmail.com",
         "url": "http://nodered.org"
     }
 }
diff --git a/function/rbe/rbe.html b/function/rbe/rbe.html
index 9c484038..2f881aa6 100644
--- a/function/rbe/rbe.html
+++ b/function/rbe/rbe.html
@@ -1,5 +1,9 @@
 
 <script type="text/html" data-template-name="rbe">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="rbe.label.name"></span></label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]rbe.label.name" style="width:70%;">
+    </div>
     <div class="form-row">
         <label for="node-input-func"><i class="fa fa-wrench"></i> <span data-i18n="rbe.label.func"></span></label>
         <select type="text" id="node-input-func" style="width:70%;">
@@ -32,10 +36,6 @@
         <input type="checkbox" id="node-input-septopics" style="display:inline-block; width:20px; vertical-align:baseline;">
         <span data-i18n="rbe.label.septopics"></span> <input type="text" id="node-input-topi" style="width:27%;"/>
     </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="rbe.label.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]rbe.label.name" style="width:70%;">
-    </div>
 </script>
 
 <script type="text/javascript">
diff --git a/function/smooth/17-smooth.html b/function/smooth/17-smooth.html
index 81643a1b..1bc5650d 100644
--- a/function/smooth/17-smooth.html
+++ b/function/smooth/17-smooth.html
@@ -1,5 +1,9 @@
 
 <script type="text/html" data-template-name="smooth">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
     <div class="form-row">
         <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="node-red:common.label.property"></span></label>
         <input type="text" id="node-input-property" style="width:70%;"/>
@@ -37,11 +41,6 @@
         <input type="checkbox" id="node-input-reduce" style="display:inline-block; width:20px; vertical-align:baseline;">
         only emit one message per most recent N values
     </div>
-    <br/>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
     <div class="form-tips" id="node-tip">Tip: This node ONLY works with numbers.</div>
 </script>
 
diff --git a/function/smooth/package.json b/function/smooth/package.json
index c917a2be..b2dfd3b2 100644
--- a/function/smooth/package.json
+++ b/function/smooth/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-smooth",
-    "version"       : "0.1.2",
+    "version"       : "0.1.3",
     "description"   : "A Node-RED node that provides several simple smoothing algorithms for incoming data values.",
     "dependencies"  : {
     },
@@ -18,7 +18,7 @@
     },
     "author": {
         "name": "Dave Conway-Jones",
-        "email": "ceejay@vnet.ibm.com",
+        "email": "dceejay@gmail.com",
         "url": "http://nodered.org"
     },
     "contributors" : [ "@clickworkorange" ]
diff --git a/io/mdns/mdns.html b/io/mdns/mdns.html
index 7c7ffb99..eaa02ace 100644
--- a/io/mdns/mdns.html
+++ b/io/mdns/mdns.html
@@ -1,5 +1,9 @@
 
 <script type="text/html" data-template-name="discovery">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
     <div class="form-row">
         <label for="node-input-service"><i class="fa fa-gear"></i> Service</label>
         <input type="text" id="node-input-service" placeholder="_http._tcp">
@@ -8,10 +12,6 @@
         <label for="node-input-topic"><i class="fa fa-tasks"></i> Topic</label>
         <input type="text" id="node-input-topic" placeholder="Topic">
     </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
     <div class="form-tips">The service <i>must</i> start with an underscore _ and end ._tcp or ._udp</div>
 </script>
 
@@ -52,6 +52,10 @@
 </script>
 
 <script type="text/html" data-template-name="announce">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name of service">
+    </div>
     <div class="form-row">
         <label for="node-input-service"><i class="fa fa-gear"></i> Service</label>
         <input type="text" id="node-input-service" placeholder="_http._tcp">
@@ -64,10 +68,6 @@
         <label for="node-input-txt"><i class="fa fa-tasks"></i> TxtRecord</label>
         <input type="text" id="node-input-txt" placeholder='"name":"value","name2":"value2"'>
     </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name of service">
-    </div>
     <div class="form-tips">%h in the name will be replaced by the machine hostname.</div>
 </script>
 
diff --git a/io/mdns/package.json b/io/mdns/package.json
index e12366b9..c2b13a05 100644
--- a/io/mdns/package.json
+++ b/io/mdns/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-discovery",
-    "version"       : "0.0.23",
+    "version"       : "0.0.24",
     "description"   : "A Node-RED node that uses Bonjour / Avahi to discover nearby services.",
     "dependencies"  : {
         "mdns"   : "^2.5.1"
@@ -19,7 +19,7 @@
     },
     "author": {
         "name": "Dave Conway-Jones",
-        "email": "ceejay@vnet.ibm.com",
+        "email": "dceejay@gmail.com",
         "url": "http://nodered.org"
     }
 }
diff --git a/io/ping/88-ping.html b/io/ping/88-ping.html
index 8ec5509e..1f7f389f 100644
--- a/io/ping/88-ping.html
+++ b/io/ping/88-ping.html
@@ -1,5 +1,9 @@
 
 <script type="text/html" data-template-name="ping">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
+    </div>
     <div class="form-row" id="div-node-input-host">
         <label for="node-input-host"><i class="fa fa-dot-circle-o"></i> <span data-i18n="ping.label.target"></span></label>
         <input type="text" id="node-input-host" placeholder="192.168.0.1, www.google.com">
@@ -23,10 +27,6 @@
         <label for="node-input-timer"><i class="fa fa-repeat"></i> <span data-i18n="ping.label.ping"></label>
         <input type="text" id="node-input-timer" placeholder="20">
     </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
-    </div>
     <div class="form-tips" id="node-ping-tip"><span data-i18n="ping.label.tip"></span></div>
 </script>
 
diff --git a/io/ping/package.json b/io/ping/package.json
index c56918ad..2521e0aa 100644
--- a/io/ping/package.json
+++ b/io/ping/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-ping",
-    "version"       : "0.3.3",
+    "version"       : "0.3.4",
     "description"   : "A Node-RED node to ping a remote server, for use as a keep-alive check.",
     "dependencies"  : {
     },
@@ -18,7 +18,7 @@
     },
     "author": {
         "name": "Dave Conway-Jones",
-        "email": "ceejay@vnet.ibm.com",
+        "email": "dceejay@gmail.com",
         "url": "http://nodered.org"
     },
     "contributors": [
diff --git a/io/serialport/25-serial.html b/io/serialport/25-serial.html
index 596173fd..1cd20ca3 100644
--- a/io/serialport/25-serial.html
+++ b/io/serialport/25-serial.html
@@ -1,13 +1,13 @@
 
 <script type="text/html" data-template-name="serial in">
-    <div class="form-row node-input-serial">
-        <label for="node-input-serial"><i class="fa fa-random"></i> <span data-i18n="serial.label.serialport"></span></label>
-        <input type="text" id="node-input-serial">
-    </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
     </div>
+    <div class="form-row node-input-serial">
+        <label for="node-input-serial"><i class="fa fa-random"></i> <span data-i18n="serial.label.serialport"></span></label>
+        <input type="text" id="node-input-serial">
+    </div>
 </script>
 
 <script type="text/javascript">
@@ -33,14 +33,14 @@
 </script>
 
 <script type="text/html" data-template-name="serial out">
-    <div class="form-row node-input-serial">
-        <label for="node-input-serial"><i class="fa fa-random"></i> <span data-i18n="serial.label.serialport"></span></label>
-        <input type="text" id="node-input-serial">
-    </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
     </div>
+    <div class="form-row node-input-serial">
+        <label for="node-input-serial"><i class="fa fa-random"></i> <span data-i18n="serial.label.serialport"></span></label>
+        <input type="text" id="node-input-serial">
+    </div>
 </script>
 
 <script type="text/javascript">
@@ -66,14 +66,14 @@
 </script>
 
 <script type="text/html" data-template-name="serial request">
-    <div class="form-row node-input-serial">
-        <label for="node-input-serial"><i class="fa fa-random"></i> <span data-i18n="serial.label.serialport"></span></label>
-        <input type="text" id="node-input-serial">
-    </div>
     <div class="form-row">
         <label for="node-inputoutput-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
     </div>
+    <div class="form-row node-input-serial">
+        <label for="node-input-serial"><i class="fa fa-random"></i> <span data-i18n="serial.label.serialport"></span></label>
+        <input type="text" id="node-input-serial">
+    </div>
 </script>
 
 <script type="text/javascript">
@@ -367,14 +367,14 @@
 </script>
 
 <script type="text/html" data-template-name="serial control">
-    <div class="form-row node-input-serial">
-        <label for="node-input-serial"><i class="fa fa-random"></i> <span data-i18n="serial.label.serialport"></span></label>
-        <input type="text" id="node-input-serial">
-    </div>
     <div class="form-row">
         <label for="node-inputoutput-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
     </div>
+    <div class="form-row node-input-serial">
+        <label for="node-input-serial"><i class="fa fa-random"></i> <span data-i18n="serial.label.serialport"></span></label>
+        <input type="text" id="node-input-serial">
+    </div>
 </script>
 
 <script type="text/javascript">
diff --git a/io/serialport/25-serial.js b/io/serialport/25-serial.js
index 0a7803bf..4cff5142 100644
--- a/io/serialport/25-serial.js
+++ b/io/serialport/25-serial.js
@@ -1,5 +1,6 @@
 
 module.exports = function(RED) {
+    /*jshint -W082 */
     "use strict";
     var settings = RED.settings;
     var events = require("events");
@@ -44,7 +45,7 @@ module.exports = function(RED) {
             this.out = serialPort.out || this.out;
         }
 
-    };
+    }
     RED.nodes.registerType("serial-port",SerialPortNode);
 
     // receives msgs and sends them to the serial port
@@ -138,7 +139,7 @@ module.exports = function(RED) {
             node.port.on('stopped', function() {
                 node.status({fill:"grey",shape:"ring",text:"serial.status.stopped"});
             });
-        };
+        }
         setCallback(node)
     }
     RED.nodes.registerType("serial in",SerialInNode);
@@ -212,7 +213,7 @@ module.exports = function(RED) {
                 node.port.on('stopped', function() {
                     node.status({fill:"grey",shape:"ring",text:"serial.status.stopped"});
                 });
-            };
+            }
             setCallback(node);
         }
         else {
diff --git a/io/serialport/package.json b/io/serialport/package.json
index ed2b9988..9eb2fab9 100644
--- a/io/serialport/package.json
+++ b/io/serialport/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-serialport",
-    "version"       : "2.0.0",
+    "version"       : "2.0.1",
     "description"   : "Node-RED nodes to talk to serial ports",
     "dependencies"  : {
         "serialport"   : "^12.0.0"
diff --git a/io/snmp/package.json b/io/snmp/package.json
index e64f3ec0..9eeefad8 100644
--- a/io/snmp/package.json
+++ b/io/snmp/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-snmp",
-    "version"       : "2.0.0",
+    "version"       : "2.0.1",
     "description"   : "A Node-RED node that gets and sets SNMP oid values. Supports v1, v2c and v3",
     "dependencies"  : {
         "net-snmp"  : "^3.9.0"
@@ -19,7 +19,7 @@
     },
     "author": {
         "name": "Dave Conway-Jones",
-        "email": "ceejay@vnet.ibm.com",
+        "email": "dceejay@gmail.com",
         "url": "http://nodered.org"
     },
     "contributors": [
diff --git a/io/snmp/snmp.html b/io/snmp/snmp.html
index 3e3c029b..7287079e 100644
--- a/io/snmp/snmp.html
+++ b/io/snmp/snmp.html
@@ -53,6 +53,10 @@
     }
 </script>
 <script type="text/html" data-template-name="snmp">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
     <div class="form-row">
         <label for="node-input-host"><i class="fa fa-globe"></i> Host</label>
         <input type="text" id="node-input-host" placeholder="ip address(:optional port)">
@@ -111,10 +115,6 @@
         <label for="node-input-oids"><i class="fa fa-tags"></i> OIDs</label>
         <textarea rows="4" cols="60" id="node-input-oids" placeholder="e.g. 1.3.6.1.2.1.1.5.0" style="width:70%;"></textarea>
     </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
     <div class="form-tips">Tip: Multiple OIDs can be separated by commas.</div>
 </script>
 
@@ -166,6 +166,10 @@
 </script>
 
 <script type="text/html" data-template-name="snmp set">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
     <div class="form-row">
         <label for="node-input-host"><i class="fa fa-globe"></i> Host</label>
         <input type="text" id="node-input-host" placeholder="ip address(:optional port)">
@@ -227,10 +231,6 @@
         <textarea rows="10" cols="60" id="node-input-varbinds" placeholder="e.g.  [ { &quot;oid&quot;: &quot;1.3.6.1.2.1.1.5.0&quot;, &quot;type&quot;: &quot;OctetString&quot;, &quot;value&quot;: &quot;host1&quot;}, { &quot;oid&quot;: &quot;1.3.6.1.2.1.1.6.0&quot;, &quot;type&quot;: &quot;OctetString&quot;, value: &quot;somewhere&quot; } ]"
             style="width:70%;"></textarea>
     </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
     <div class="form-tips">Tip: Numeric inputs must be numbers not strings, e.g. 1 not "1".</div>
 </script>
 
@@ -298,6 +298,10 @@
 </script>
 
 <script type="text/html" data-template-name="snmp table">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
     <div class="form-row">
         <label for="node-input-host"><i class="fa fa-globe"></i> Host</label>
         <input type="text" id="node-input-host" placeholder="ip address(:optional port)">
@@ -358,10 +362,6 @@
         <label for="node-input-oids"><i class="fa fa-tags"></i> OID</label>
         <input type="text" id="node-input-oids" placeholder="e.g. 1.3.6.1.2.1.1.5.0">
     </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
     <div class="form-tips">Tip: ONLY accepts a single OID.</div>
 </script>
 
@@ -413,6 +413,10 @@
 </script>
 
 <script type="text/html" data-template-name="snmp subtree">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
     <div class="form-row">
         <label for="node-input-host"><i class="fa fa-globe"></i> Host</label>
         <input type="text" id="node-input-host" placeholder="ip address(:optional port)">
@@ -473,10 +477,6 @@
         <label for="node-input-oids"><i class="fa fa-tags"></i> OID</label>
         <input type="text" id="node-input-oids" placeholder="e.g. 1.3.6.1.2.1.1.5.0">
     </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
     <div class="form-tips">Tip: ONLY accepts a single OID (node).</div>
 </script>
 
@@ -529,6 +529,10 @@
 
 
 <script type="text/html" data-template-name="snmp walker">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
     <div class="form-row">
         <label for="node-input-host"><i class="fa fa-globe"></i> Host</label>
         <input type="text" id="node-input-host" placeholder="ip address(:optional port)">
@@ -589,10 +593,6 @@
         <label for="node-input-oids"><i class="fa fa-tags"></i> OID</label>
         <input type="text" id="node-input-oids" placeholder="e.g. 1.3.6.1.2.1.1.5.0">
     </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
     <div class="form-tips">Tip: ONLY accepts a single OID (node).</div>
 </script>
 
diff --git a/io/stomp/18-stomp.html b/io/stomp/18-stomp.html
index 7d9b307c..f5782ea2 100644
--- a/io/stomp/18-stomp.html
+++ b/io/stomp/18-stomp.html
@@ -1,5 +1,9 @@
 
 <script type="text/html" data-template-name="stomp in">
+    <div class="form-row">
+        <label for="node-input-name" style="width: 110px;"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
     <div class="form-row">
         <label for="node-input-server" style="width: 110px;"><i class="fa fa-bookmark"></i> Server</label>
         <input type="text" id="node-input-server">
@@ -17,13 +21,9 @@
         </select>
     </div>
     <div class="form-tips" style="margin-bottom: 12px;">
-        Enabling the ACK (acknowledgment) will set the <code>ack</code> header to <code>client</code> while subscribing to topics. 
+        Enabling the ACK (acknowledgment) will set the <code>ack</code> header to <code>client</code> while subscribing to topics.
         This means the items on the broker queue will not be dequeue'd unless an ACK message is sent using the <code>ack</code> node.
     </div>
-    <div class="form-row">
-        <label for="node-input-name" style="width: 110px;"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
 </script>
 
 <script type="text/html" data-help-name="stomp in">
@@ -61,6 +61,10 @@
 </script>
 
 <script type="text/html" data-template-name="stomp out">
+    <div class="form-row">
+        <label for="node-input-name" style="width: 110px;"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
     <div class="form-row">
         <label for="node-input-server" style="width: 110px;"><i class="fa fa-bookmark"></i> Server</label>
         <input type="text" id="node-input-server">
@@ -69,10 +73,6 @@
         <label for="node-input-topic" style="width: 110px;"><i class="fa fa-envelope"></i> Destination</label>
         <input type="text" id="node-input-topic" placeholder="topic or queue">
     </div>
-    <div class="form-row">
-        <label for="node-input-name" style="width: 110px;"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
     <div class="form-tips" style="margin-bottom: 12px;">The <b>Destination</b> field is optional. If not set uses the <code>msg.topic</code>
     property of the message.</div>
 </script>
@@ -113,6 +113,10 @@
 </script>
 
 <script type="text/html" data-template-name="stomp-server">
+    <div class="form-row">
+        <label for="node-config-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-config-input-name" placeholder="Name">
+    </div>
     <div class="form-row node-input-server">
         <label for="node-config-input-server"><i class="fa fa-bookmark"></i> Server</label>
         <input class="input-append-left" type="text" id="node-config-input-server" placeholder="localhost" style="width: 45%;" >
@@ -150,10 +154,6 @@
     <div class="form-tips" style="margin-bottom: 12px;">
         Reconnection timings are calculated using exponential backoff. The first reconnection happens immediately, the second reconnection happens at +delay ms, the third at + 2*delay ms, etc.
     </div>
-    <div class="form-row">
-        <label for="node-config-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-config-input-name" placeholder="Name">
-    </div>
 </script>
 
 <script type="text/javascript">
@@ -179,6 +179,10 @@
 </script>
 
 <script type="text/html" data-template-name="stomp ack">
+    <div class="form-row">
+        <label for="node-input-name" style="width: 110px;"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
     <div class="form-row">
         <label for="node-input-server" style="width: 110px;"><i class="fa fa-bookmark"></i> Server</label>
         <input type="text" id="node-input-server">
@@ -187,10 +191,6 @@
         <label for="node-input-topic" style="width: 110px;"><i class="fa fa-envelope"></i> Destination</label>
         <input type="text" id="node-input-topic" placeholder="topic or queue">
     </div>
-    <div class="form-row">
-        <label for="node-input-name" style="width: 110px;"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
 </script>
 
 <script type="text/html" data-help-name="stomp ack">
diff --git a/io/stomp/18-stomp.js b/io/stomp/18-stomp.js
index 575a495a..4887a674 100644
--- a/io/stomp/18-stomp.js
+++ b/io/stomp/18-stomp.js
@@ -1,4 +1,4 @@
-
+/* jshint ignore:start */
 module.exports = function(RED) {
     "use strict";
     var StompClient = require('stomp-client');
@@ -136,7 +136,7 @@ module.exports = function(RED) {
          */
         node.register = function(stompNode, callback = () => {}) {
             node.users[stompNode.id] = stompNode;
-            
+
             if (!node.connected) {
                 node.connectedCallbacks.push(callback);
             }
@@ -158,7 +158,7 @@ module.exports = function(RED) {
          * Remove registered STOMP processing nodes from the connection.
          * @param { StompInNode | StompOutNode | StompAckNode } stompNode The STOMP processing node to unregister
          * @param { Boolean } autoDisconnect Automatically disconnect from the STOM server when no processing nodes registered to the connection
-         * @param { Function } callback 
+         * @param { Function } callback
          */
         node.deregister = function(stompNode, autoDisconnect, callback = () => {}) {
             delete node.users[stompNode.id];
@@ -179,7 +179,7 @@ module.exports = function(RED) {
 
         /**
          * Connect to the STOMP server.
-         * @param {Function} callback 
+         * @param {Function} callback
          */
         node.connect = function(callback = () => {}) {
             if (node.canConnect()) {
@@ -195,7 +195,7 @@ module.exports = function(RED) {
                     }
 
                     node.client = new StompClient(node.options);
-                    
+
                     node.client.on("connect", function(sessionId) {
                         node.closing = false;
                         node.connecting = false;
@@ -206,7 +206,7 @@ module.exports = function(RED) {
                         setStatusConnected(node, true);
                         callback();
                     });
-                    
+
                     node.client.on("reconnect", function(sessionId, numOfRetries) {
                         node.closing = false;
                         node.connecting = false;
@@ -246,7 +246,7 @@ module.exports = function(RED) {
 
         /**
          * Disconnect from the STOMP server.
-         * @param {Function} callback 
+         * @param {Function} callback
          */
         node.disconnect = function(callback = () => {}) {
             const waitDisconnect = (client, timeout) => {
@@ -295,7 +295,7 @@ module.exports = function(RED) {
          * Subscribe to a given STOMP queue.
          * @param { String}  queue The queue to subscribe to
          * @param { "auto" | "client" | "client-individual" } clientAck Can be `auto`, `client` or `client-individual` (the latter only starting from STOMP v1.1)
-         * @param { Function } callback 
+         * @param { Function } callback
          */
         node.subscribe = function(queue, acknowledgment, callback) {
             node.log(`Subscribe to: ${queue}`);
@@ -308,7 +308,7 @@ module.exports = function(RED) {
                 const headers = {
                     id: node.subscriptionIds[queue],
                     // Only set client-individual if not v1.0
-                    ack: acknowledgment === "client-individual" && node.options.protocolVersion === "1.0" ? "client" : acknowledgment 
+                    ack: acknowledgment === "client-individual" && node.options.protocolVersion === "1.0" ? "client" : acknowledgment
                 }
 
                 node.client.subscribe(queue, headers, function(body, responseHeaders) {
@@ -544,4 +544,5 @@ module.exports = function(RED) {
         //JavaScript does not protect the property name hasOwnProperty
         //Object.prototype.hasOwnProperty.call is the recommended/safer test
         return Object.prototype.hasOwnProperty.call(obj, propName);
-    }
\ No newline at end of file
+    }
+/* jshint ignore:end */
\ No newline at end of file
diff --git a/io/stomp/package.json b/io/stomp/package.json
index f37ef301..57c80737 100644
--- a/io/stomp/package.json
+++ b/io/stomp/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-stomp",
-    "version"       : "1.0.5",
+    "version"       : "1.0.6",
     "description"   : "A Node-RED node to publish and subscribe to/from a Stomp server",
     "dependencies"  : {
         "stomp-client"   : "^0.9.0"
diff --git a/io/wol/39-wol.html b/io/wol/39-wol.html
index 5e5ad0ec..503c18d0 100644
--- a/io/wol/39-wol.html
+++ b/io/wol/39-wol.html
@@ -1,5 +1,9 @@
 
 <script type="text/html" data-template-name="wake on lan">
+    <div class="form-row">
+        <label for="node-input-name" style="width:120px;"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
     <div class="form-row">
         <label for="node-input-mac" style="width:120px;"><i class="fa fa-address-card-o"></i> MAC Address</label>
         <input type="text" id="node-input-mac" placeholder="e.g. DE:AD:BE:EF:FE:ED">
@@ -20,10 +24,6 @@
         <label for="node-input-interval" style="width:120px;"><i class="fa fa-clock-o"></i> Interval Between Packets (ms)</label>
         <input type="number" id="node-input-interval" placeholder="100">
     </div>
-    <div class="form-row">
-        <label for="node-input-name" style="width:120px;"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
     <div class="form-tips">Tip: leave blank if you want to use <code>msg.mac</code> or <code>msg.host</code> to dynamically set target information.</div>
 </script>
 
diff --git a/io/wol/package.json b/io/wol/package.json
index bd64d4d8..ecda1ba5 100644
--- a/io/wol/package.json
+++ b/io/wol/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red-node-wol",
-    "version": "0.2.0",
+    "version": "0.2.1",
     "description": "A Node-RED node to send Wake-On-LAN (WOL) magic packets",
     "dependencies": {
         "wake_on_lan": "^1.0.0"
@@ -23,7 +23,7 @@
     },
     "author": {
         "name": "Dave Conway-Jones",
-        "email": "ceejay@vnet.ibm.com",
+        "email": "dceejay@gmail.com",
         "url": "http://nodered.org"
     }
 }
diff --git a/parsers/base64/70-base64.html b/parsers/base64/70-base64.html
index 913d5d9b..0d31f181 100644
--- a/parsers/base64/70-base64.html
+++ b/parsers/base64/70-base64.html
@@ -1,5 +1,9 @@
 
 <script type="text/html" data-template-name="base64">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
+    </div>
     <div class="form-row">
         <label for="node-input-action"><i class="fa fa-dot-circle-o"></i> <span data-i18n="base64.label.action"></span></label>
         <select style="width:70%" id="node-input-action">
@@ -12,10 +16,6 @@
         <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="node-red:common.label.property"></span></label>
         <input type="text" id="node-input-property" style="width:70%;"/>
     </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
-    </div>
 </script>
 
 <script type="text/javascript">
diff --git a/parsers/base64/package.json b/parsers/base64/package.json
index 17496dad..90675bbd 100644
--- a/parsers/base64/package.json
+++ b/parsers/base64/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-base64",
-    "version"       : "0.3.0",
+    "version"       : "0.3.1",
     "description"   : "A Node-RED node to pack and unpack objects to base64 format",
     "dependencies"  : {
     },
diff --git a/parsers/msgpack/70-msgpack.html b/parsers/msgpack/70-msgpack.html
index a7965cab..95764559 100644
--- a/parsers/msgpack/70-msgpack.html
+++ b/parsers/msgpack/70-msgpack.html
@@ -1,13 +1,13 @@
 
 <script type="text/html" data-template-name="msgpack">
-    <div class="form-row">
-        <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="node-red:common.label.property"></span></label>
-        <input type="text" id="node-input-property" style="width:70%;"/>
-    </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
+    <div class="form-row">
+        <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="node-red:common.label.property"></span></label>
+        <input type="text" id="node-input-property" style="width:70%;"/>
+    </div>
 </script>
 
 <script type="text/html" data-help-name="msgpack">
diff --git a/parsers/msgpack/package.json b/parsers/msgpack/package.json
index fd9eef8b..c2755e5d 100644
--- a/parsers/msgpack/package.json
+++ b/parsers/msgpack/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-msgpack",
-    "version"       : "1.2.1",
+    "version"       : "1.2.2",
     "description"   : "A Node-RED node to pack and unpack objects to msgpack format",
     "dependencies"  : {
         "msgpack-lite"   : "^0.1.26"
diff --git a/social/xmpp/92-xmpp.html b/social/xmpp/92-xmpp.html
index ab299773..a6ffe869 100644
--- a/social/xmpp/92-xmpp.html
+++ b/social/xmpp/92-xmpp.html
@@ -1,5 +1,9 @@
 
 <script type="text/html" data-template-name="xmpp in">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
     <div class="form-row">
         <label for="node-input-server"><i class="fa fa-bookmark"></i> Connect as</label>
         <input type="text" id="node-input-server">
@@ -17,10 +21,6 @@
         <label for="node-input-password"><i class="fa fa-lock"></i> Password</label>
         <input type="password" id="node-input-password" placeholder="optional room password">
     </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
     <div class="form-tips"><b>Note:</b> By leaving Buddy empty and ticking "Is a chat room",
         the node will try to listen to all the rooms the user has access to.
         You can specify multiple rooms by separating them by a :
@@ -72,6 +72,10 @@
 
 
 <script type="text/html" data-template-name="xmpp out">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
     <div class="form-row">
         <label for="node-input-server"><i class="fa fa-bookmark"></i> Connect as</label>
         <input type="text" id="node-input-server">
@@ -94,10 +98,6 @@
         <label for="node-input-password"><i class="fa fa-lock"></i> Password</label>
         <input type="password" id="node-input-password" placeholder="optional room password">
     </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
     <div class="form-tips">The <b>To</b> field is optional. If not set uses the <code>msg.topic</code> property of the message.</div>
 </script>
 
@@ -146,6 +146,10 @@
 </script>
 
 <script type="text/html" data-template-name="xmpp-server">
+    <div class="form-row">
+        <label for="node-config-input-resource"><i class="fa fa-globe"></i> Resource</label>
+        <input type="text" id="node-config-input-resource" placeholder="optional resource id">
+    </div>
     <div class="form-row">
         <label for="node-config-input-server"><i class="fa fa-bookmark"></i> Server</label>
         <input class="input-append-left" type="text" id="node-config-input-server" placeholder="blah.im" style="width: 40%;" >
@@ -164,10 +168,6 @@
         <label for="node-config-input-password"><i class="fa fa-lock"></i> Password</label>
         <input type="password" id="node-config-input-password">
     </div>
-    <div class="form-row">
-        <label for="node-config-input-resource"><i class="fa fa-globe"></i> Resource</label>
-        <input type="text" id="node-config-input-resource" placeholder="optional resource id">
-    </div>
 </script>
 
 <script type="text/javascript">
diff --git a/social/xmpp/package.json b/social/xmpp/package.json
index b0cadcb4..56f03ec0 100644
--- a/social/xmpp/package.json
+++ b/social/xmpp/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red-node-xmpp",
-    "version": "0.6.0",
+    "version": "0.6.1",
     "description": "A Node-RED node to talk to an XMPP server",
     "dependencies": {
         "@xmpp/client": "^0.13.1"
@@ -25,7 +25,7 @@
     },
     "author": {
         "name": "Dave Conway-Jones",
-        "email": "ceejay@vnet.ibm.com",
+        "email": "dceejay@gmail.com",
         "url": "http://nodered.org"
     }
 }
diff --git a/storage/tail/28-tail.html b/storage/tail/28-tail.html
index 2138dd2c..f2f50ce4 100644
--- a/storage/tail/28-tail.html
+++ b/storage/tail/28-tail.html
@@ -1,4 +1,8 @@
 <script type="text/html" data-template-name="tail">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="tail.label.name"></span></label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]tail.label.name">
+    </div>
     <div class="form-row">
          <label for="node-input-filename"><i class="fa fa-file"></i> <span data-i18n="tail.label.filename"></span></label>
          <input id="node-input-filename" type="text">
@@ -17,10 +21,6 @@
         <label for="node-input-split"><i class="fa fa-tag"></i> <span data-i18n="tail.label.splitlines"></span></label>
         <input type="text" id="node-input-split" data-i18n="[placeholder]tail.label.regex">
     </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="tail.label.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]tail.label.name">
-    </div>
 </script>
 
 <script type="text/javascript">
diff --git a/storage/tail/package.json b/storage/tail/package.json
index a6d542cd..82910017 100644
--- a/storage/tail/package.json
+++ b/storage/tail/package.json
@@ -1,9 +1,9 @@
 {
     "name": "node-red-node-tail",
-    "version": "0.4.0",
+    "version": "0.4.1",
     "description": "A node to tail files for Node-RED",
     "dependencies": {
-        "tail": "^2.2.4"
+        "tail": "^2.2.6"
     },
     "repository": {
         "type": "git",
@@ -22,7 +22,7 @@
     },
     "author": {
         "name": "Dave Conway-Jones",
-        "email": "ceejay@vnet.ibm.com",
+        "email": "dceejay@gmail.com",
         "url": "http://nodered.org"
     }
 }
diff --git a/time/suncalc/79-suncalc.html b/time/suncalc/79-suncalc.html
index d4cbd8b7..2b68ff5e 100644
--- a/time/suncalc/79-suncalc.html
+++ b/time/suncalc/79-suncalc.html
@@ -1,5 +1,9 @@
 
 <script type="text/html" data-template-name="sunrise">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i><span data-i18n="sunrise.label.name"></span></label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]sunrise.label.name">
+    </div>
     <div class="form-row">
         <label for="node-input-lat"><i class="fa fa-globe"></i><span data-i18n="sunrise.label.latitude"></span></label>
         <input type="text" id="node-input-lat" placeholder="51.025">
@@ -35,10 +39,6 @@
         <span style="margin-right:4px" data-i18n="sunrise.start"></span> <input type="text" id="node-input-soff" placeholder="minutes" style='width:60px;' > <span data-i18n="sunrise.mins"></span>
         <span style="margin-left:14px; margin-right:4px" data-i18n="sunrise.end"></span> <input type="text" id="node-input-eoff" placeholder="minutes" style='width:60px;'><span data-i18n="sunrise.mins"></span>
     </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i><span data-i18n="sunrise.label.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]sunrise.label.name">
-    </div>
 </script>
 
 <script type="text/javascript">
diff --git a/time/suncalc/package.json b/time/suncalc/package.json
index ec5b574b..337e13db 100644
--- a/time/suncalc/package.json
+++ b/time/suncalc/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-suncalc",
-    "version"       : "1.1.0",
+    "version"       : "1.1.1",
     "description"   : "A Node-RED node to provide a signal at sunrise and sunset",
     "dependencies"  : {
         "suncalc"   : "^1.8.0"
@@ -19,7 +19,7 @@
     },
     "author": {
         "name": "Dave Conway-Jones",
-        "email": "ceejay@vnet.ibm.com",
+        "email": "dceejay@gmail.com",
         "url": "http://nodered.org"
     }
 }
diff --git a/time/timeswitch/package.json b/time/timeswitch/package.json
index 1c0b3de5..75cbe87b 100644
--- a/time/timeswitch/package.json
+++ b/time/timeswitch/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-timeswitch",
-    "version"       : "1.1.1",
+    "version"       : "1.1.2",
     "description"   : "A Node-RED node to provide a simple timeswitch to schedule daily on/off events.",
     "dependencies"  : {
         "spacetime": "^7.4.3",
@@ -20,7 +20,7 @@
     },
     "author": {
         "name": "Dave Conway-Jones",
-        "email": "ceejay@vnet.ibm.com",
+        "email": "dceejay@gmail.com",
         "url": "http://nodered.org"
     },
     "contributors": [
diff --git a/time/timeswitch/timeswitch.html b/time/timeswitch/timeswitch.html
index e7041a5a..07f1722f 100644
--- a/time/timeswitch/timeswitch.html
+++ b/time/timeswitch/timeswitch.html
@@ -1,5 +1,9 @@
 
 <script type="text/html" data-template-name="timeswitch">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
     <div class="form-row">
         <label for="node-input-starttime"><i class="fa fa-clock-o"></i> Time&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;On</label>
         <select id="node-input-starttime" style="width:24% !important">
@@ -870,10 +874,6 @@
     <label for="node-input-mytopic"><i class="fa fa-tasks"></i> Topic </label>
     <input type="text" id="node-input-mytopic" placeholder="optional msg.topic">
   </div>
-  <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
 </script>
 
 <script type="text/javascript">
diff --git a/utility/annotate-image/annotate.html b/utility/annotate-image/annotate.html
index 38b061f5..c10a6ae6 100644
--- a/utility/annotate-image/annotate.html
+++ b/utility/annotate-image/annotate.html
@@ -1,5 +1,9 @@
 
 <script type="text/html" data-template-name="annotate-image">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
     <div class="form-row">
         <span id="node-input-row-stroke">
             <label for="node-input-stroke">Line Color</label>
@@ -14,10 +18,6 @@
         <label style="margin-left: 20px" for="node-input-fontSize">Font Size</label>
         <input style="width: 50px" type="text" id="node-input-fontSize">
     </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
 </script>
 
 <script type="text/javascript">
diff --git a/utility/annotate-image/package.json b/utility/annotate-image/package.json
index 37102c12..5446a84f 100644
--- a/utility/annotate-image/package.json
+++ b/utility/annotate-image/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red-node-annotate-image",
-    "version": "0.1.2",
+    "version": "0.1.3",
     "description": "A Node-RED node that can annotate an image",
     "dependencies": {
         "pureimage": "^0.2.7"
diff --git a/utility/daemon/daemon.html b/utility/daemon/daemon.html
index 582ad36c..50e8ea61 100644
--- a/utility/daemon/daemon.html
+++ b/utility/daemon/daemon.html
@@ -1,6 +1,10 @@
 <!DOCTYPE html>
 
 <script type="text/html" data-template-name="daemon">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i><span data-i18n="node-red:common.label.name"></span></label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
+    </div>
     <div class="form-row">
         <label for="node-input-command"><i class="fa fa-file"></i><span data-i18n="daemon.label.command"></span></label>
         <input type="text" id="node-input-command" data-i18n="[placeholder]daemon.label.command">
@@ -41,10 +45,6 @@
             <option value="SIGINT" data-i18n="[label]daemon.option.onclose.sigint"></option>
         </select>
     </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i><span data-i18n="node-red:common.label.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
-    </div>
     <div class="form-tips"><span data-i18n="[html]daemon.tip"></span></div>
 </script>
 
diff --git a/utility/daemon/package.json b/utility/daemon/package.json
index 5c98c768..7573af72 100644
--- a/utility/daemon/package.json
+++ b/utility/daemon/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-daemon",
-    "version"       : "0.6.0",
+    "version"       : "0.6.1",
     "description"   : "A Node-RED node that runs and monitors a long running system command.",
     "dependencies"  : {
     },
@@ -18,7 +18,7 @@
     },
     "author": {
         "name": "Dave Conway-Jones",
-        "email": "ceejay@vnet.ibm.com",
+        "email": "dceejay@gmail.com",
         "url": "http://nodered.org"
     }
 }
diff --git a/utility/exif/94-exif.html b/utility/exif/94-exif.html
index ef962255..69fb9ee2 100644
--- a/utility/exif/94-exif.html
+++ b/utility/exif/94-exif.html
@@ -1,5 +1,9 @@
 
 <script type="text/html" data-template-name="exif">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i><span data-i18n="node-red:common.label.name"></label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
+    </div>
     <div class="form-row">
         <label for="node-input-mode"><i class="fa fa-dot-circle-o"></i><span data-i18n="exif.label.mode"></span></label>
         <select style="width:70%" id="node-input-mode">
@@ -11,10 +15,6 @@
         <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="node-red:common.label.property"></span></label>
         <input type="text" id="node-input-property" style="width:70%;"/>
     </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i><span data-i18n="node-red:common.label.name"></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
-    </div>
 </script>
 
 <script type="text/javascript">
diff --git a/utility/exif/package.json b/utility/exif/package.json
index a7f1d46b..d5c4b9dd 100644
--- a/utility/exif/package.json
+++ b/utility/exif/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red-node-exif",
-    "version": "0.4.0",
+    "version": "0.4.1",
     "description": "A Node-RED node that extracts Exif information from JPEG image buffers.",
     "dependencies": {
         "exif": "^0.6.0"