diff --git a/agents/diam_it_test.go b/agents/diam_it_test.go
index bbe90e0f9..f84756671 100644
--- a/agents/diam_it_test.go
+++ b/agents/diam_it_test.go
@@ -4,14 +4,17 @@
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
+
 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
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
+
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
+
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
diff --git a/apier/v1/analyzer.go b/apier/v1/analyzer.go
index d72cf3b42..f7c09d6c1 100644
--- a/apier/v1/analyzer.go
+++ b/apier/v1/analyzer.go
@@ -9,7 +9,7 @@ the Free Software Foundation, either version 3 of the License, or
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNEtS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
diff --git a/apier/v1/ees_it_test.go b/apier/v1/ees_it_test.go
index 8b0f80563..4be297cf6 100644
--- a/apier/v1/ees_it_test.go
+++ b/apier/v1/ees_it_test.go
@@ -4,14 +4,17 @@
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
+
 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
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
+
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
+
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
diff --git a/apier/v1/filter_indexes_health_it_test.go b/apier/v1/filter_indexes_health_it_test.go
index 3f440a189..e64372b6c 100644
--- a/apier/v1/filter_indexes_health_it_test.go
+++ b/apier/v1/filter_indexes_health_it_test.go
@@ -12,7 +12,7 @@ the Free Software Foundation, either version 3 of the License, or
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FIdxTNESS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
diff --git a/apier/v1/filter_indexes_it_test.go b/apier/v1/filter_indexes_it_test.go
index 1ef5b3cb7..a747131e1 100644
--- a/apier/v1/filter_indexes_it_test.go
+++ b/apier/v1/filter_indexes_it_test.go
@@ -12,7 +12,7 @@ the Free Software Foundation, either version 3 of the License, or
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FIdxTNESS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
diff --git a/apier/v1/filterindexecache_it_test.go b/apier/v1/filterindexecache_it_test.go
index 4cd489ce5..40dbc6962 100644
--- a/apier/v1/filterindexecache_it_test.go
+++ b/apier/v1/filterindexecache_it_test.go
@@ -12,7 +12,7 @@ the Free Software Foundation, either version 3 of the License, or
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FIdxCaTNESS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
diff --git a/apier/v1/schedulers.go b/apier/v1/schedulers.go
index 5e4f31b03..3ce137bf6 100644
--- a/apier/v1/schedulers.go
+++ b/apier/v1/schedulers.go
@@ -1,18 +1,20 @@
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
+
 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
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
+
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
+
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
-
 package v1
 
 import (
diff --git a/apier/v1/thresholds.go b/apier/v1/thresholds.go
index c76a06448..640700112 100644
--- a/apier/v1/thresholds.go
+++ b/apier/v1/thresholds.go
@@ -9,7 +9,7 @@ the Free Software Foundation, either version 3 of the License, or
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNEtS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
diff --git a/apier/v1/timing.go b/apier/v1/timing.go
index eac708206..3bbda78ee 100644
--- a/apier/v1/timing.go
+++ b/apier/v1/timing.go
@@ -9,7 +9,7 @@ the Free Software Foundation, either version 3 of the License, or
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNEtS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
diff --git a/cmd/cgr-console/cgr-console_flags_test.go b/cmd/cgr-console/cgr-console_flags_test.go
index 0f47dce44..526ab7696 100644
--- a/cmd/cgr-console/cgr-console_flags_test.go
+++ b/cmd/cgr-console/cgr-console_flags_test.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/cmd/cgr-console/cgr-console_it_test.go b/cmd/cgr-console/cgr-console_it_test.go
index 055cec5ce..8245014a1 100644
--- a/cmd/cgr-console/cgr-console_it_test.go
+++ b/cmd/cgr-console/cgr-console_it_test.go
@@ -2,7 +2,7 @@
 // +build integration
 
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/cmd/cgr-engine/cgr-engine_flags_test.go b/cmd/cgr-engine/cgr-engine_flags_test.go
index 365ddde5b..71c6734b6 100644
--- a/cmd/cgr-engine/cgr-engine_flags_test.go
+++ b/cmd/cgr-engine/cgr-engine_flags_test.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/cmd/cgr-loader/cgr-loader_it_test.go b/cmd/cgr-loader/cgr-loader_it_test.go
index 2d73b2910..7dba19c5d 100644
--- a/cmd/cgr-loader/cgr-loader_it_test.go
+++ b/cmd/cgr-loader/cgr-loader_it_test.go
@@ -2,7 +2,7 @@
 // +build integration
 
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/cmd/cgr-loader/flags_test.go b/cmd/cgr-loader/flags_test.go
index f116df997..5ae13a20e 100644
--- a/cmd/cgr-loader/flags_test.go
+++ b/cmd/cgr-loader/flags_test.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/cmd/cgr-migrator/cgr-migrator_test.go b/cmd/cgr-migrator/cgr-migrator_test.go
index 9ffc11ade..b6f1a3566 100644
--- a/cmd/cgr-migrator/cgr-migrator_test.go
+++ b/cmd/cgr-migrator/cgr-migrator_test.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/config/configs.go b/config/configs.go
index a2b2d0ff2..4bc15a427 100644
--- a/config/configs.go
+++ b/config/configs.go
@@ -1,14 +1,17 @@
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
+
 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
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
+
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
+
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
diff --git a/config/diametercfg_test.go b/config/diametercfg_test.go
index 53606a716..37afd6d44 100644
--- a/config/diametercfg_test.go
+++ b/config/diametercfg_test.go
@@ -1,6 +1,6 @@
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
-Copyright (C) ITsysCOraM GmbH
+Copyright (C) ITsysCOM GmbH
 
 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
diff --git a/ees/ee.go b/ees/ee.go
index 175c917cf..974e6ae48 100644
--- a/ees/ee.go
+++ b/ees/ee.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/ees/ee_test.go b/ees/ee_test.go
index 5a53f691d..6dc596f92 100644
--- a/ees/ee_test.go
+++ b/ees/ee_test.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/ees/ees.go b/ees/ees.go
index b8756218b..37b2d1a22 100644
--- a/ees/ees.go
+++ b/ees/ees.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/ees/elastic.go b/ees/elastic.go
index 47ba58221..e889c8a39 100644
--- a/ees/elastic.go
+++ b/ees/elastic.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/ees/elastic_test.go b/ees/elastic_test.go
index 308f4a20a..22e7eb8b9 100644
--- a/ees/elastic_test.go
+++ b/ees/elastic_test.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/ees/filecsv.go b/ees/filecsv.go
index 5b14b88a1..94b2d93ef 100644
--- a/ees/filecsv.go
+++ b/ees/filecsv.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/ees/filecsv_test.go b/ees/filecsv_test.go
index ed6d74c56..d1c52dd42 100644
--- a/ees/filecsv_test.go
+++ b/ees/filecsv_test.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/ees/filefwv.go b/ees/filefwv.go
index 157051551..58b55596e 100644
--- a/ees/filefwv.go
+++ b/ees/filefwv.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/ees/httpjsonmap.go b/ees/httpjsonmap.go
index ff82ee741..064cf5d41 100644
--- a/ees/httpjsonmap.go
+++ b/ees/httpjsonmap.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/ees/httpjsonmap_test.go b/ees/httpjsonmap_test.go
index f021150ca..23ccac5ef 100644
--- a/ees/httpjsonmap_test.go
+++ b/ees/httpjsonmap_test.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/ees/httppost.go b/ees/httppost.go
index e116632dd..3a0953bef 100644
--- a/ees/httppost.go
+++ b/ees/httppost.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/ees/httppost_test.go b/ees/httppost_test.go
index 27afdf781..fbb9743f5 100644
--- a/ees/httppost_test.go
+++ b/ees/httppost_test.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/ees/lib_test.go b/ees/lib_test.go
index 0e504ccd3..336974885 100644
--- a/ees/lib_test.go
+++ b/ees/lib_test.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/ees/log.go b/ees/log.go
index af276ee19..112c5dd70 100644
--- a/ees/log.go
+++ b/ees/log.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/ees/nats.go b/ees/nats.go
index fc9929864..5d4782fa3 100644
--- a/ees/nats.go
+++ b/ees/nats.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/ees/nats_it_test.go b/ees/nats_it_test.go
index 4781928e0..49f415795 100644
--- a/ees/nats_it_test.go
+++ b/ees/nats_it_test.go
@@ -4,14 +4,17 @@
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
+
 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
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
+
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
+
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
diff --git a/ees/nats_test.go b/ees/nats_test.go
index 605413c56..10acbe4ab 100644
--- a/ees/nats_test.go
+++ b/ees/nats_test.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/ees/sql.go b/ees/sql.go
index bf8b011ec..89f45edac 100644
--- a/ees/sql.go
+++ b/ees/sql.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/ees/virtualee.go b/ees/virtualee.go
index 5852b560a..105d0bd69 100644
--- a/ees/virtualee.go
+++ b/ees/virtualee.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/engine/cdrs.go b/engine/cdrs.go
index f896b886b..edcaa423d 100644
--- a/engine/cdrs.go
+++ b/engine/cdrs.go
@@ -1,14 +1,17 @@
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
+
 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
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
+
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
+
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
diff --git a/engine/datamanager.go b/engine/datamanager.go
index c7dcfd9c2..83e70bfb8 100644
--- a/engine/datamanager.go
+++ b/engine/datamanager.go
@@ -1,14 +1,17 @@
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
+
 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
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
+
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
+
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
diff --git a/engine/dynamicdp.go b/engine/dynamicdp.go
index e787e1d3e..2ef9118ed 100644
--- a/engine/dynamicdp.go
+++ b/engine/dynamicdp.go
@@ -1,14 +1,17 @@
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
+
 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
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
+
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
+
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
diff --git a/engine/exportrequest.go b/engine/exportrequest.go
index 248bcfc3d..55ee4e869 100644
--- a/engine/exportrequest.go
+++ b/engine/exportrequest.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/engine/filters.go b/engine/filters.go
index 87da54407..6c075fd1d 100644
--- a/engine/filters.go
+++ b/engine/filters.go
@@ -1,14 +1,17 @@
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
+
 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
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
+
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
+
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
diff --git a/engine/filters_test.go b/engine/filters_test.go
index 76761304b..5553b205f 100644
--- a/engine/filters_test.go
+++ b/engine/filters_test.go
@@ -1,17 +1,21 @@
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
+
 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
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
+
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
+
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
+
 package engine
 
 import (
diff --git a/engine/globalvars.go b/engine/globalvars.go
index 9c9b1d4ec..a21187339 100644
--- a/engine/globalvars.go
+++ b/engine/globalvars.go
@@ -1,18 +1,22 @@
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
+
 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
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
+
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
+
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 
+
 package engine
 
 import (
diff --git a/engine/storage_mongo_stordb.go b/engine/storage_mongo_stordb.go
index f97dbbe22..7853ddd45 100644
--- a/engine/storage_mongo_stordb.go
+++ b/engine/storage_mongo_stordb.go
@@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>
+along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 
 package engine
diff --git a/engine/z_chargers_test.go b/engine/z_chargers_test.go
index b06943875..a2434ded2 100644
--- a/engine/z_chargers_test.go
+++ b/engine/z_chargers_test.go
@@ -1,18 +1,22 @@
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
+
 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
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
+
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
+
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 
+
 package engine
 
 import (
diff --git a/engine/z_filterindexer_test.go b/engine/z_filterindexer_test.go
index 8f25fd887..ed8d864d4 100644
--- a/engine/z_filterindexer_test.go
+++ b/engine/z_filterindexer_test.go
@@ -1,17 +1,21 @@
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
+
 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
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
+
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
+
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
+
 package engine
 
 import (
diff --git a/ers/ers.go b/ers/ers.go
index 7dbc386a1..44438e448 100644
--- a/ers/ers.go
+++ b/ers/ers.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/ers/libers.go b/ers/libers.go
index 68d244a75..b227ecfcd 100644
--- a/ers/libers.go
+++ b/ers/libers.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/ers/nats.go b/ers/nats.go
index 2f6340635..46812cefc 100644
--- a/ers/nats.go
+++ b/ers/nats.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/general_tests/oldtutorial_it_test.go b/general_tests/oldtutorial_it_test.go
index a0b77cc9a..a5299849c 100644
--- a/general_tests/oldtutorial_it_test.go
+++ b/general_tests/oldtutorial_it_test.go
@@ -1,23 +1,23 @@
 //go:build integration
 // +build integration
 
-// /*
-// Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
-// Copyright (C) ITsysCOM GmbH
+/*
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
+Copyright (C) ITsysCOM GmbH
 
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+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
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>
-// */
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
 
 package general_tests
 
diff --git a/general_tests/session_money_rating_subject_it_test.go b/general_tests/session_money_rating_subject_it_test.go
index 21715ad3e..b0e7806c4 100644
--- a/general_tests/session_money_rating_subject_it_test.go
+++ b/general_tests/session_money_rating_subject_it_test.go
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licensesMRS/>
+along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 package general_tests
 
diff --git a/general_tests/session_refund_expired_it_test.go b/general_tests/session_refund_expired_it_test.go
index 9931a5a64..f95438ee6 100644
--- a/general_tests/session_refund_expired_it_test.go
+++ b/general_tests/session_refund_expired_it_test.go
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licensesExp/>
+along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 package general_tests
 
diff --git a/general_tests/session_rounding_it_test.go b/general_tests/session_rounding_it_test.go
index 44a38fd07..763c39ef0 100644
--- a/general_tests/session_rounding_it_test.go
+++ b/general_tests/session_rounding_it_test.go
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licensesRnd/>
+along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 package general_tests
 
diff --git a/services/registrarc_test.go b/services/registrarc_test.go
index 680a805c9..d57dd04ff 100644
--- a/services/registrarc_test.go
+++ b/services/registrarc_test.go
@@ -1,17 +1,21 @@
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
+
 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
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
+
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
+
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
+
 package services
 
 import (
diff --git a/utils/cgrevent.go b/utils/cgrevent.go
index 968af2ff1..0da73c5e1 100644
--- a/utils/cgrevent.go
+++ b/utils/cgrevent.go
@@ -9,7 +9,7 @@ the Free Software Foundation, either version 3 of the License, or
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOev.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
diff --git a/utils/chrgdincrement_test.go b/utils/chrgdincrement_test.go
index 649553182..68c622e1a 100644
--- a/utils/chrgdincrement_test.go
+++ b/utils/chrgdincrement_test.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/utils/decimal.go b/utils/decimal.go
index 71b491aef..df9344d15 100644
--- a/utils/decimal.go
+++ b/utils/decimal.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,6 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
-
 package utils
 
 import (
diff --git a/utils/file.go b/utils/file.go
index 7af8ba0c3..96a5e5b38 100644
--- a/utils/file.go
+++ b/utils/file.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/utils/libeventcharges.go b/utils/libeventcharges.go
index be2b7f8c9..97bba67d6 100644
--- a/utils/libeventcharges.go
+++ b/utils/libeventcharges.go
@@ -1,5 +1,5 @@
 /*
-Real-time Online/Offline Charging System (OerS) for Telecom & ISP environments
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
 Copyright (C) ITsysCOM GmbH
 
 This program is free software: you can redistribute it and/or modify
diff --git a/utils/xmlelement.go b/utils/xmlelement.go
index dfb0525d4..9bcf5e72b 100644
--- a/utils/xmlelement.go
+++ b/utils/xmlelement.go
@@ -9,7 +9,7 @@ the Free Software Foundation, either version 3 of the License, or
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOev.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License