diff --git a/LICENSE.md b/LICENSE.md
index bec9862..a4bd13d 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Brion Mario
+Copyright (c) 2019 CSSI
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
+SOFTWARE.
diff --git a/app/routes/v1/application.py b/app/routes/v1/application.py
index a0f327a..aa121f9 100644
--- a/app/routes/v1/application.py
+++ b/app/routes/v1/application.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# (c) Copyright 2019 Brion Mario.
+# (c) Copyright 2019 CSSI.
 # (c) This file is part of the CSSI REST API and is made available under MIT license.
-# (c) For more information, see https://github.com/brionmario/cssi-api/blob/master/LICENSE.txt
-# (c) Please forward any queries to the given email address. email: brion@apareciumlabs.com
+# (c) For more information, see https://github.com/project-cssi/cssi-api/blob/master/LICENSE.md
+# (c) Please forward any queries to the given email address. email: opensource@apareciumlabs.com
 
 """Application routes module
 
diff --git a/app/routes/v1/questionnaire.py b/app/routes/v1/questionnaire.py
index be21216..7012e37 100644
--- a/app/routes/v1/questionnaire.py
+++ b/app/routes/v1/questionnaire.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# (c) Copyright 2019 Brion Mario.
+# (c) Copyright 2019 CSSI.
 # (c) This file is part of the CSSI REST API and is made available under MIT license.
-# (c) For more information, see https://github.com/brionmario/cssi-api/blob/master/LICENSE.txt
-# (c) Please forward any queries to the given email address. email: brion@apareciumlabs.com
+# (c) For more information, see https://github.com/project-cssi/cssi-api/blob/master/LICENSE.md
+# (c) Please forward any queries to the given email address. email: opensource@apareciumlabs.com
 
 """Application routes module
 
diff --git a/app/routes/v1/session.py b/app/routes/v1/session.py
index 1eb8c8c..182ca75 100644
--- a/app/routes/v1/session.py
+++ b/app/routes/v1/session.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# (c) Copyright 2019 Brion Mario.
+# (c) Copyright 2019 CSSI.
 # (c) This file is part of the CSSI REST API and is made available under MIT license.
-# (c) For more information, see https://github.com/brionmario/cssi-api/blob/master/LICENSE.txt
-# (c) Please forward any queries to the given email address. email: brion@apareciumlabs.com
+# (c) For more information, see https://github.com/project-cssi/cssi-api/blob/master/LICENSE.md
+# (c) Please forward any queries to the given email address. email: opensource@apareciumlabs.com
 
 """Session routes module
 
diff --git a/config/config.py b/config/config.py
index ded27de..a3e6ae3 100644
--- a/config/config.py
+++ b/config/config.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# (c) Copyright 2019 Brion Mario.
+# (c) Copyright 2019 CSSI.
 # (c) This file is part of the CSSI REST API and is made available under MIT license.
-# (c) For more information, see https://github.com/brionmario/cssi-api/blob/master/LICENSE.txt
-# (c) Please forward any queries to the given email address. email: brion@apareciumlabs.com
+# (c) For more information, see https://github.com/project-cssi/cssi-api/blob/master/LICENSE.md
+# (c) Please forward any queries to the given email address. email: opensource@apareciumlabs.com
 
 """Configurations for the CSSI REST API
 
diff --git a/manage.py b/manage.py
index ee12068..5076bee 100644
--- a/manage.py
+++ b/manage.py
@@ -1,15 +1,17 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# (c) Copyright 2019 Brion Mario.
+# (c) Copyright 2019 CSSI.
 # (c) This file is part of the CSSI REST API and is made available under MIT license.
-# (c) For more information, see https://github.com/brionmario/cssi-api/blob/master/LICENSE.txt
-# (c) Please forward any queries to the given email address. email: brion@apareciumlabs.com
+# (c) For more information, see https://github.com/project-cssi/cssi-api/blob/master/LICENSE.md
+# (c) Please forward any queries to the given email address. email: opensource@apareciumlabs.com
 
 """
 Brief:   REST API for the CSSI library
 
-Author:  Brion Mario
+Authors:
+    Brion Mario
+
 """
 
 import os