diff --git a/server/hooks.go b/server/hooks.go
index 1d199bd08..bd5812533 100644
--- a/server/hooks.go
+++ b/server/hooks.go
@@ -14,7 +14,7 @@ import (
 
 // UserHasBeenCreated is invoked after a user was created.
 func (p *Plugin) UserHasBeenCreated(c *plugin.Context, user *model.User) {
-	data := p.constructGlobalMessageTemplate(user.Id)
+	data := p.getGlobalMessageTemplateData(user.Id)
 	if data == nil {
 		return
 	}
@@ -25,7 +25,7 @@ func (p *Plugin) UserHasBeenCreated(c *plugin.Context, user *model.User) {
 		}
 
 		if len(message.GlobalWelcomeMessage) > 0 {
-			tmpMsg, _ := template.New("Response").Parse(strings.Join(message.GlobalWelcomeMessage, "\n"))
+			tmpMsg, _ := template.New(templateNameResponse).Parse(strings.Join(message.GlobalWelcomeMessage, "\n"))
 			var message bytes.Buffer
 			err := tmpMsg.Execute(&message, data)
 			if err != nil {
diff --git a/server/plugin.go b/server/plugin.go
index c13354ae7..c85c86236 100644
--- a/server/plugin.go
+++ b/server/plugin.go
@@ -14,6 +14,8 @@ const (
 	botDisplayName = "Welcomebot"
 	botDescription = "A bot account created by the Welcomebot plugin."
 
+	templateNameResponse = "Response"
+
 	welcomebotChannelWelcomeKey = "chanmsg_"
 )
 
diff --git a/server/welcomebot.go b/server/welcomebot.go
index c1a54c3f0..ae17b6fcd 100644
--- a/server/welcomebot.go
+++ b/server/welcomebot.go
@@ -45,7 +45,7 @@ func (p *Plugin) constructMessageTemplate(userID, teamID string) *MessageTemplat
 	return data
 }
 
-func (p *Plugin) constructGlobalMessageTemplate(userID string) *GloablMessageTemplate {
+func (p *Plugin) getGlobalMessageTemplateData(userID string) *GloablMessageTemplate {
 	data := &GloablMessageTemplate{}
 	var err *model.AppError
 
@@ -156,7 +156,7 @@ func (p *Plugin) renderWelcomeMessage(messageTemplate MessageTemplate, configMes
 		}
 	}
 
-	tmpMsg, _ := template.New("Response").Parse(strings.Join(configMessage.Message, "\n"))
+	tmpMsg, _ := template.New(templateNameResponse).Parse(strings.Join(configMessage.Message, "\n"))
 	var message bytes.Buffer
 	err := tmpMsg.Execute(&message, messageTemplate)
 	if err != nil {
@@ -225,7 +225,7 @@ func (p *Plugin) processActionMessage(messageTemplate MessageTemplate, action *A
 		p.joinChannel(action, channelName)
 	}
 
-	tmpMsg, _ := template.New("Response").Parse(strings.Join(configMessageAction.ActionSuccessfulMessage, "\n"))
+	tmpMsg, _ := template.New(templateNameResponse).Parse(strings.Join(configMessageAction.ActionSuccessfulMessage, "\n"))
 	var message bytes.Buffer
 	err := tmpMsg.Execute(&message, messageTemplate)
 	if err != nil {