diff --git a/templates/server/cmd.gotmpl b/templates/server/cmd.gotmpl
index 73aff05670f0014d5881b79fb11be9dadd253c39_dGVtcGxhdGVzL3NlcnZlci9jbWQuZ290bXBs..f69a9cee3858352570dd20cfa281fee604bd2fbf_dGVtcGxhdGVzL3NlcnZlci9jbWQuZ290bXBs 100644
--- a/templates/server/cmd.gotmpl
+++ b/templates/server/cmd.gotmpl
@@ -74,7 +74,7 @@
 func init() {
 	parser.NamespaceDelimiter = "-"
 	parser.EnvNamespaceDelimiter = "_"
-	parser.EnvNamespace = "CARNET"
+	parser.EnvNamespace = "{{ upper .Name }}"
 	if _, err := parser.AddGroup("Configuration", "Configuration file", ConfigFileOption); err != nil {
 		panic(err)
 	}
@@ -110,7 +110,7 @@
 
 	bootstrapParser.NamespaceDelimiter = "-"
 	bootstrapParser.EnvNamespaceDelimiter = "_"
-	bootstrapParser.EnvNamespace = "CARNET"
+	bootstrapParser.EnvNamespace = "{{ upper .Name }}"
 	if _, err := bootstrapParser.AddGroup("Configuration", "Configuration file", ConfigFileOption); err != nil {
 		panic(err)
 	}
diff --git a/testutils/logger.go b/testutils/logger.go
index 73aff05670f0014d5881b79fb11be9dadd253c39_dGVzdHV0aWxzL2xvZ2dlci5nbw==..f69a9cee3858352570dd20cfa281fee604bd2fbf_dGVzdHV0aWxzL2xvZ2dlci5nbw== 100644
--- a/testutils/logger.go
+++ b/testutils/logger.go
@@ -7,7 +7,7 @@
 	"github.com/rs/zerolog"
 )
 
-//NewTestLogger creates a TestLogger
+// NewTestLogger creates a TestLogger
 func NewTestLogger(tb testing.TB) *TestLogger {
 	return &TestLogger{tb}
 }