diff --git a/src/template.cpp b/src/template.cpp
index 7067cff6..66fcd97b 100644
--- a/src/template.cpp
+++ b/src/template.cpp
@@ -2,13 +2,13 @@
 @file   Template.cpp
 @brief  A_brief_description_for_this_file
 @author Tobias Blomberg / SM0SVX
-@date   2019-
+@date   2020-
 
 A_detailed_description_for_this_file
 
 \verbatim
 <A brief description of the program or library this file belongs to>
-Copyright (C) 2003-2019 Tobias Blomberg / SM0SVX
+Copyright (C) 2003-2020 Tobias Blomberg / SM0SVX
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
 
-
 /****************************************************************************
  *
  * System Includes
@@ -53,15 +52,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "Template.h"
 
 
-
 /****************************************************************************
  *
  * Namespaces to use
  *
  ****************************************************************************/
 
-using namespace std;
-
+using namespace MyNamespace;
 
 
 /****************************************************************************
@@ -96,7 +93,6 @@ using namespace std;
 
 
 
-
 /****************************************************************************
  *
  * Local Global Variables
diff --git a/src/template.h b/src/template.h
index 4c70a102..0454dd76 100644
--- a/src/template.h
+++ b/src/template.h
@@ -1,14 +1,14 @@
 /**
-@file   Template.h
+@file   MyNamespaceTemplate.h
 @brief  A_brief_description_for_this_file
 @author Tobias Blomberg / SM0SVX
-@date   2019-
+@date   2020-
 
 A_detailed_description_for_this_file
 
 \verbatim
 <A brief description of the program or library this file belongs to>
-Copyright (C) 2003-2019 Tobias Blomberg / SM0SVX
+Copyright (C) 2003-2020 Tobias Blomberg / SM0SVX
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -26,11 +26,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 \endverbatim
 */
 
-/** @example Template_demo.cpp
+/** @example MyNamespaceTemplate_demo.cpp
 An example of how to use the Template class
 */
 
-
 #ifndef TEMPLATE_INCLUDED
 #define TEMPLATE_INCLUDED
 
@@ -73,7 +72,7 @@ An example of how to use the Template class
  *
  ****************************************************************************/
 
-namespace MyNameSpace
+namespace MyNamespace
 {
 
 
@@ -110,11 +109,11 @@ namespace MyNameSpace
 /**
 @brief  A_brief_class_description
 @author Tobias Blomberg / SM0SVX
-@date   2019-
+@date   2020-
 
 A_detailed_class_description
 
-\include Template_demo.cpp
+\include MyNamespaceTemplate_demo.cpp
 */
 class Template
 {