14 files changed, 42 insertions, 56 deletions

diff --git a/src/core/hle/service/nvdrv/core/container.cpp b/src/core/hle/service/nvdrv/core/container.cpp
index 4175d3d9c..d2a632646 100644
--- a/src/core/hle/service/nvdrv/core/container.cpp
+++ b/src/core/hle/service/nvdrv/core/container.cpp
@@ -1,7 +1,6 @@
-// SPDX-FileCopyrightText: 2022 yuzu emulator team and Skyline Team and Contributors
-// (https://github.com/skyline-emu/)
-// SPDX-License-Identifier: GPL-3.0-or-later Licensed under GPLv3
-// or any later version Refer to the license.txt file included.
+// SPDX-FileCopyrightText: 2022 yuzu Emulator Project
+// SPDX-FileCopyrightText: 2022 Skyline Team and Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "core/hle/service/nvdrv/core/container.h"
 #include "core/hle/service/nvdrv/core/nvmap.h"
diff --git a/src/core/hle/service/nvdrv/core/container.h b/src/core/hle/service/nvdrv/core/container.h
index e069ade4e..5c8b95803 100644
--- a/src/core/hle/service/nvdrv/core/container.h
+++ b/src/core/hle/service/nvdrv/core/container.h
@@ -1,7 +1,6 @@
-// SPDX-FileCopyrightText: 2022 yuzu emulator team and Skyline Team and Contributors
-// (https://github.com/skyline-emu/)
-// SPDX-License-Identifier: GPL-3.0-or-later Licensed under GPLv3
-// or any later version Refer to the license.txt file included.
+// SPDX-FileCopyrightText: 2022 yuzu Emulator Project
+// SPDX-FileCopyrightText: 2022 Skyline Team and Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once
 
diff --git a/src/core/hle/service/nvdrv/core/nvmap.cpp b/src/core/hle/service/nvdrv/core/nvmap.cpp
index 9b21da6b1..e63ec7717 100644
--- a/src/core/hle/service/nvdrv/core/nvmap.cpp
+++ b/src/core/hle/service/nvdrv/core/nvmap.cpp
@@ -1,7 +1,6 @@
-// SPDX-FileCopyrightText: 2022 yuzu emulator team and Skyline Team and Contributors
-// (https://github.com/skyline-emu/)
-// SPDX-License-Identifier: GPL-3.0-or-later Licensed under GPLv3
-// or any later version Refer to the license.txt file included.
+// SPDX-FileCopyrightText: 2022 yuzu Emulator Project
+// SPDX-FileCopyrightText: 2022 Skyline Team and Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "common/alignment.h"
 #include "common/assert.h"
diff --git a/src/core/hle/service/nvdrv/core/nvmap.h b/src/core/hle/service/nvdrv/core/nvmap.h
index ef2df3ad7..6d6dac023 100644
--- a/src/core/hle/service/nvdrv/core/nvmap.h
+++ b/src/core/hle/service/nvdrv/core/nvmap.h
@@ -1,7 +1,6 @@
-// SPDX-FileCopyrightText: 2022 yuzu emulator team and Skyline Team and Contributors
-// (https://github.com/skyline-emu/)
-// SPDX-License-Identifier: GPL-3.0-or-later Licensed under GPLv3
-// or any later version Refer to the license.txt file included.
+// SPDX-FileCopyrightText: 2022 yuzu Emulator Project
+// SPDX-FileCopyrightText: 2022 Skyline Team and Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once
 
diff --git a/src/core/hle/service/nvdrv/core/syncpoint_manager.cpp b/src/core/hle/service/nvdrv/core/syncpoint_manager.cpp
index fc4ff3c2f..0bb2aec97 100644
--- a/src/core/hle/service/nvdrv/core/syncpoint_manager.cpp
+++ b/src/core/hle/service/nvdrv/core/syncpoint_manager.cpp
@@ -1,7 +1,6 @@
-// SPDX-FileCopyrightText: 2022 yuzu emulator team and Skyline Team and Contributors
-// (https://github.com/skyline-emu/)
-// SPDX-License-Identifier: GPL-3.0-or-later Licensed under GPLv3
-// or any later version Refer to the license.txt file included.
+// SPDX-FileCopyrightText: 2022 yuzu Emulator Project
+// SPDX-FileCopyrightText: 2022 Skyline Team and Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "common/assert.h"
 #include "core/hle/service/nvdrv/core/syncpoint_manager.h"
diff --git a/src/core/hle/service/nvdrv/core/syncpoint_manager.h b/src/core/hle/service/nvdrv/core/syncpoint_manager.h
index da456f206..6b71cd33d 100644
--- a/src/core/hle/service/nvdrv/core/syncpoint_manager.h
+++ b/src/core/hle/service/nvdrv/core/syncpoint_manager.h
@@ -1,7 +1,6 @@
-// SPDX-FileCopyrightText: 2022 yuzu emulator team and Skyline Team and Contributors
-// (https://github.com/skyline-emu/)
-// SPDX-License-Identifier: GPL-3.0-or-later Licensed under GPLv3
-// or any later version Refer to the license.txt file included.
+// SPDX-FileCopyrightText: 2022 yuzu Emulator Project
+// SPDX-FileCopyrightText: 2022 Skyline Team and Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once
 
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp
index d1beefba6..b48f7fcaf 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp
@@ -1,7 +1,6 @@
-// SPDX-FileCopyrightText: 2021 yuzu emulator team, Skyline Team and Contributors
-// (https://github.com/skyline-emu/)
-// SPDX-License-Identifier: GPL-3.0-or-later Licensed under GPLv3
-// or any later version Refer to the license.txt file included.
+// SPDX-FileCopyrightText: 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: 2021 Skyline Team and Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #include <cstring>
 #include <utility>
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h
index 12e881f0d..86fe71c75 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h
+++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h
@@ -1,7 +1,6 @@
-// SPDX-FileCopyrightText: 2021 yuzu emulator team, Skyline Team and Contributors
-// (https://github.com/skyline-emu/)
-// SPDX-License-Identifier: GPL-3.0-or-later Licensed under GPLv3
-// or any later version Refer to the license.txt file included.
+// SPDX-FileCopyrightText: 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: 2021 Skyline Team and Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once
 
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
index 7fffb8e48..5bee4a3d3 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
@@ -1,7 +1,6 @@
-// SPDX-FileCopyrightText: 2021 yuzu emulator team, Skyline Team and Contributors
-// (https://github.com/skyline-emu/)
-// SPDX-License-Identifier: GPL-3.0-or-later Licensed under GPLv3
-// or any later version Refer to the license.txt file included.
+// SPDX-FileCopyrightText: 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: 2021 Skyline Team and Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #include <bit>
 #include <cstdlib>
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h
index f511c0296..4aa738b41 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h
+++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h
@@ -1,7 +1,6 @@
-// SPDX-FileCopyrightText: 2021 yuzu emulator team, Skyline Team and Contributors
-// (https://github.com/skyline-emu/)
-// SPDX-License-Identifier: GPL-3.0-or-later Licensed under GPLv3
-// or any later version Refer to the license.txt file included.
+// SPDX-FileCopyrightText: 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: 2021 Skyline Team and Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once
 
diff --git a/src/core/hle/service/nvdrv/nvdata.h b/src/core/hle/service/nvdrv/nvdata.h
index 2ee91f9c4..0e2f47075 100644
--- a/src/core/hle/service/nvdrv/nvdata.h
+++ b/src/core/hle/service/nvdrv/nvdata.h
@@ -1,7 +1,6 @@
-// SPDX-FileCopyrightText: 2021 yuzu emulator team and Skyline Team and Contributors
-// (https://github.com/skyline-emu/)
-// SPDX-License-Identifier: GPL-3.0-or-later Licensed under GPLv3
-// or any later version Refer to the license.txt file included.
+// SPDX-FileCopyrightText: 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: 2021 Skyline Team and Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once
 
diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp
index 20bf24ec8..7929443d2 100644
--- a/src/core/hle/service/nvdrv/nvdrv.cpp
+++ b/src/core/hle/service/nvdrv/nvdrv.cpp
@@ -1,7 +1,6 @@
-// SPDX-FileCopyrightText: 2021 yuzu emulator team and Skyline Team and Contributors
-// (https://github.com/skyline-emu/)
-// SPDX-License-Identifier: GPL-3.0-or-later Licensed under GPLv3
-// or any later version Refer to the license.txt file included.
+// SPDX-FileCopyrightText: 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: 2021 Skyline Team and Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #include <utility>
 
diff --git a/src/core/hle/service/nvdrv/nvdrv.h b/src/core/hle/service/nvdrv/nvdrv.h
index 22836529d..a2aeb80b4 100644
--- a/src/core/hle/service/nvdrv/nvdrv.h
+++ b/src/core/hle/service/nvdrv/nvdrv.h
@@ -1,7 +1,6 @@
-// SPDX-FileCopyrightText: 2021 yuzu emulator team and Skyline Team and Contributors
-// (https://github.com/skyline-emu/)
-// SPDX-License-Identifier: GPL-3.0-or-later Licensed under GPLv3
-// or any later version Refer to the license.txt file included.
+// SPDX-FileCopyrightText: 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: 2021 Skyline Team and Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once
 
diff --git a/src/core/hle/service/nvdrv/nvdrv_interface.cpp b/src/core/hle/service/nvdrv/nvdrv_interface.cpp
index 5e50a04e8..edbdfee43 100644
--- a/src/core/hle/service/nvdrv/nvdrv_interface.cpp
+++ b/src/core/hle/service/nvdrv/nvdrv_interface.cpp
@@ -1,7 +1,6 @@
-// SPDX-FileCopyrightText: 2021 yuzu emulator team and Skyline Team and Contributors
-// (https://github.com/skyline-emu/)
-// SPDX-License-Identifier: GPL-3.0-or-later Licensed under GPLv3
-// or any later version Refer to the license.txt file included.
+// SPDX-FileCopyrightText: 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: 2021 Skyline Team and Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #include <cinttypes>
 #include "common/logging/log.h"