diff --git a/sys-kernel/server-sources/Manifest b/sys-kernel/nas-sources/Manifest
similarity index 100%
rename from sys-kernel/server-sources/Manifest
rename to sys-kernel/nas-sources/Manifest
diff --git a/sys-kernel/server-sources/files/hotfixes/2.6.33/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch b/sys-kernel/nas-sources/files/hotfixes/2.6.33/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch
similarity index 100%
rename from sys-kernel/server-sources/files/hotfixes/2.6.33/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch
rename to sys-kernel/nas-sources/files/hotfixes/2.6.33/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch
diff --git a/sys-kernel/server-sources/files/hotfixes/2.6.33/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch b/sys-kernel/nas-sources/files/hotfixes/2.6.33/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch
similarity index 100%
rename from sys-kernel/server-sources/files/hotfixes/2.6.33/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch
rename to sys-kernel/nas-sources/files/hotfixes/2.6.33/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch
diff --git a/sys-kernel/server-sources/files/hotfixes/2.6.33/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch b/sys-kernel/nas-sources/files/hotfixes/2.6.33/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch
similarity index 100%
rename from sys-kernel/server-sources/files/hotfixes/2.6.33/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch
rename to sys-kernel/nas-sources/files/hotfixes/2.6.33/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch
diff --git a/sys-kernel/server-sources/files/hotfixes/2.6.34/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch b/sys-kernel/nas-sources/files/hotfixes/2.6.34/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch
similarity index 100%
rename from sys-kernel/server-sources/files/hotfixes/2.6.34/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch
rename to sys-kernel/nas-sources/files/hotfixes/2.6.34/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch
diff --git a/sys-kernel/server-sources/files/hotfixes/2.6.34/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch b/sys-kernel/nas-sources/files/hotfixes/2.6.34/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch
similarity index 100%
rename from sys-kernel/server-sources/files/hotfixes/2.6.34/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch
rename to sys-kernel/nas-sources/files/hotfixes/2.6.34/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch
diff --git a/sys-kernel/server-sources/files/hotfixes/2.6.34/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch b/sys-kernel/nas-sources/files/hotfixes/2.6.34/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch
similarity index 100%
rename from sys-kernel/server-sources/files/hotfixes/2.6.34/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch
rename to sys-kernel/nas-sources/files/hotfixes/2.6.34/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch
diff --git a/sys-kernel/server-sources/files/hotfixes/2.6.35/linux-2.6.git-36d001c70d8a0144ac1d038f6876c484849a74de.patch b/sys-kernel/nas-sources/files/hotfixes/2.6.35/linux-2.6.git-36d001c70d8a0144ac1d038f6876c484849a74de.patch
similarity index 100%
rename from sys-kernel/server-sources/files/hotfixes/2.6.35/linux-2.6.git-36d001c70d8a0144ac1d038f6876c484849a74de.patch
rename to sys-kernel/nas-sources/files/hotfixes/2.6.35/linux-2.6.git-36d001c70d8a0144ac1d038f6876c484849a74de.patch
diff --git a/sys-kernel/server-sources/files/hotfixes/2.6.35/linux-2.6.git-c41d68a513c71e35a14f66d71782d27a79a81ea6.patch b/sys-kernel/nas-sources/files/hotfixes/2.6.35/linux-2.6.git-c41d68a513c71e35a14f66d71782d27a79a81ea6.patch
similarity index 100%
rename from sys-kernel/server-sources/files/hotfixes/2.6.35/linux-2.6.git-c41d68a513c71e35a14f66d71782d27a79a81ea6.patch
rename to sys-kernel/nas-sources/files/hotfixes/2.6.35/linux-2.6.git-c41d68a513c71e35a14f66d71782d27a79a81ea6.patch
diff --git a/sys-kernel/server-sources/files/hotfixes/2.6.35/linux-2.6.git-eefdca043e8391dcd719711716492063030b55ac.patch b/sys-kernel/nas-sources/files/hotfixes/2.6.35/linux-2.6.git-eefdca043e8391dcd719711716492063030b55ac.patch
similarity index 100%
rename from sys-kernel/server-sources/files/hotfixes/2.6.35/linux-2.6.git-eefdca043e8391dcd719711716492063030b55ac.patch
rename to sys-kernel/nas-sources/files/hotfixes/2.6.35/linux-2.6.git-eefdca043e8391dcd719711716492063030b55ac.patch
diff --git a/sys-kernel/server-sources/files/server-sources-2.6.33-amd64.config b/sys-kernel/nas-sources/files/nas-sources-2.6.33-amd64.config
similarity index 100%
rename from sys-kernel/server-sources/files/server-sources-2.6.33-amd64.config
rename to sys-kernel/nas-sources/files/nas-sources-2.6.33-amd64.config
diff --git a/sys-kernel/server-sources/files/server-sources-2.6.33-x86.config b/sys-kernel/nas-sources/files/nas-sources-2.6.33-x86.config
similarity index 100%
rename from sys-kernel/server-sources/files/server-sources-2.6.33-x86.config
rename to sys-kernel/nas-sources/files/nas-sources-2.6.33-x86.config
diff --git a/sys-kernel/server-sources/server-sources-2.6.33.ebuild b/sys-kernel/nas-sources/nas-sources-2.6.33.ebuild
similarity index 100%
rename from sys-kernel/server-sources/server-sources-2.6.33.ebuild
rename to sys-kernel/nas-sources/nas-sources-2.6.33.ebuild
diff --git a/sys-kernel/server-sources/server-sources-2.6.34.ebuild b/sys-kernel/nas-sources/nas-sources-2.6.34.ebuild
similarity index 100%
rename from sys-kernel/server-sources/server-sources-2.6.34.ebuild
rename to sys-kernel/nas-sources/nas-sources-2.6.34.ebuild
diff --git a/sys-kernel/server-sources/server-sources-2.6.35-r5.ebuild b/sys-kernel/nas-sources/nas-sources-2.6.35-r5.ebuild
similarity index 100%
rename from sys-kernel/server-sources/server-sources-2.6.35-r5.ebuild
rename to sys-kernel/nas-sources/nas-sources-2.6.35-r5.ebuild
diff --git a/sys-kernel/server-sources/server-sources-2.6.35-r6.ebuild b/sys-kernel/nas-sources/nas-sources-2.6.35-r6.ebuild
similarity index 100%
rename from sys-kernel/server-sources/server-sources-2.6.35-r6.ebuild
rename to sys-kernel/nas-sources/nas-sources-2.6.35-r6.ebuild