diff --git a/demo/Makefile b/demo/Makefile
index a85067f528489f899e7c299b4a69d6bf451b7258..f6ac7b31e7807f480f8576ffe7a0ed612ec5500b 100644
--- a/demo/Makefile
+++ b/demo/Makefile
@@ -2,9 +2,7 @@
 # of the TTCN-3 Test Executor version 1.7.pre0 build 2
 # for Attila Balasko (ethbaat@ehubuux110) on Mon Jan 15 16:28:23 2007
 
-# Copyright 2000-2006 Test Competence Center, Ericsson R & D, Hungary
-# For trouble reporting use the tool MTTSMS.
-# For TR writers guide please visit the web page: http://ttcn.ericsson.se
+# Copyright Ericsson Telecom AB 2000-2018
 
 # The following make commands are available:
 # - make, make all     Builds the executable test suite.
diff --git a/src/HTTPmsg_MessageLen_Function.cc b/src/HTTPmsg_MessageLen_Function.cc
index d11059b82e7cd8f723bc7f75df3d83a59c6c0012..1dd0e53d34a8cc90cd9f0eefc59ee7a6c6f20a50 100644
--- a/src/HTTPmsg_MessageLen_Function.cc
+++ b/src/HTTPmsg_MessageLen_Function.cc
@@ -1,49 +1,49 @@
-/******************************************************************************
-* Copyright (c) 2000-2018 Ericsson Telecom AB
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v2.0
-* which accompanies this distribution, and is available at
-* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
-*
-* Contributors:
-*   Eduard Czimbalmos - initial implementation and initial documentation
-*   Istvan Ovary
-*   Peter Dimitrov
-*   Balasko Jeno
-*   Gabor Szalai
-******************************************************************************/
-//
-//  File:               HTTPmsg_MessageLen_Function.cc
-//  Description:        HTTP Message length calculator
+/******************************************************************************
+* Copyright (c) 2000-2018 Ericsson Telecom AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v2.0
+* which accompanies this distribution, and is available at
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
+*
+* Contributors:
+*   Eduard Czimbalmos - initial implementation and initial documentation
+*   Istvan Ovary
+*   Peter Dimitrov
+*   Balasko Jeno
+*   Gabor Szalai
+******************************************************************************/
+//
+//  File:               HTTPmsg_MessageLen_Function.cc
+//  Description:        HTTP Message length calculator
 //  Rev:                R9B
-//  Prodnr:             CNL 113 469
-
-#include "HTTPmsg_PT.hh"
-#include "HTTPmsg_Types.hh"
-#include "HTTPmsg_MessageLen.hh"
-
-using namespace HTTPmsg__Types;
-using namespace HTTPmsg__PortType;
-
-namespace HTTPmsg__MessageLen {
-INTEGER f__HTTPMessage__len(OCTETSTRING const& stream) {
-   HTTPMessage msg;
-   TTCN_Buffer *buf_p = new TTCN_Buffer() ;
-   buf_p->put_os(stream);
-
-   int buf_len = buf_p->get_read_len();
-   if( buf_len > 0)
-   {
-       if(f_HTTP_decodeCommon(buf_p, msg, true, false, NULL, NULL))
-       {
-         buf_len -= buf_p->get_read_len();
-       }
-       else
-         buf_len = -1;
-
-
-   } else buf_len = -1;
-   delete buf_p;
-   return buf_len;
-}
-}
+//  Prodnr:             CNL 113 469
+
+#include "HTTPmsg_PT.hh"
+#include "HTTPmsg_Types.hh"
+#include "HTTPmsg_MessageLen.hh"
+
+using namespace HTTPmsg__Types;
+using namespace HTTPmsg__PortType;
+
+namespace HTTPmsg__MessageLen {
+INTEGER f__HTTPMessage__len(OCTETSTRING const& stream) {
+   HTTPMessage msg;
+   TTCN_Buffer *buf_p = new TTCN_Buffer() ;
+   buf_p->put_os(stream);
+
+   int buf_len = buf_p->get_read_len();
+   if( buf_len > 0)
+   {
+       if(f_HTTP_decodeCommon(buf_p, msg, true, false, NULL, NULL))
+       {
+         buf_len -= buf_p->get_read_len();
+       }
+       else
+         buf_len = -1;
+
+
+   } else buf_len = -1;
+   delete buf_p;
+   return buf_len;
+}
+}