diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-advanced-snapin/ChangeLog b/trunk/novell4gentoo/app-admin/novell-advanced-admin/ChangeLog
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-advanced-snapin/ChangeLog
rename to trunk/novell4gentoo/app-admin/novell-advanced-admin/ChangeLog
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-advanced-snapin/Manifest b/trunk/novell4gentoo/app-admin/novell-advanced-admin/Manifest
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-advanced-snapin/Manifest
rename to trunk/novell4gentoo/app-admin/novell-advanced-admin/Manifest
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-advanced-snapin/metadata.xml b/trunk/novell4gentoo/app-admin/novell-advanced-admin/metadata.xml
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-advanced-snapin/metadata.xml
rename to trunk/novell4gentoo/app-admin/novell-advanced-admin/metadata.xml
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-advanced-snapin/novell-consoleone-advanced-snapin-1.0.0_p20030512.ebuild b/trunk/novell4gentoo/app-admin/novell-advanced-admin/novell-consoleone-advanced-snapin-1.0.0_p20030512.ebuild
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-advanced-snapin/novell-consoleone-advanced-snapin-1.0.0_p20030512.ebuild
rename to trunk/novell4gentoo/app-admin/novell-advanced-admin/novell-consoleone-advanced-snapin-1.0.0_p20030512.ebuild
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-ichain-snapin/ChangeLog b/trunk/novell4gentoo/app-admin/novell-ichain-admin/ChangeLog
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-ichain-snapin/ChangeLog
rename to trunk/novell4gentoo/app-admin/novell-ichain-admin/ChangeLog
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-ichain-snapin/Manifest b/trunk/novell4gentoo/app-admin/novell-ichain-admin/Manifest
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-ichain-snapin/Manifest
rename to trunk/novell4gentoo/app-admin/novell-ichain-admin/Manifest
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-ichain-snapin/metadata.xml b/trunk/novell4gentoo/app-admin/novell-ichain-admin/metadata.xml
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-ichain-snapin/metadata.xml
rename to trunk/novell4gentoo/app-admin/novell-ichain-admin/metadata.xml
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-ichain-snapin/novell-consoleone-ichain-snapin-2.1.ebuild b/trunk/novell4gentoo/app-admin/novell-ichain-admin/novell-consoleone-ichain-snapin-2.1.ebuild
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-ichain-snapin/novell-consoleone-ichain-snapin-2.1.ebuild
rename to trunk/novell4gentoo/app-admin/novell-ichain-admin/novell-consoleone-ichain-snapin-2.1.ebuild
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-ncs-snapin/ChangeLog b/trunk/novell4gentoo/app-admin/novell-ncs-admin/ChangeLog
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-ncs-snapin/ChangeLog
rename to trunk/novell4gentoo/app-admin/novell-ncs-admin/ChangeLog
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-ncs-snapin/Manifest b/trunk/novell4gentoo/app-admin/novell-ncs-admin/Manifest
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-ncs-snapin/Manifest
rename to trunk/novell4gentoo/app-admin/novell-ncs-admin/Manifest
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-ncs-snapin/metadata.xml b/trunk/novell4gentoo/app-admin/novell-ncs-admin/metadata.xml
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-ncs-snapin/metadata.xml
rename to trunk/novell4gentoo/app-admin/novell-ncs-admin/metadata.xml
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-ncs-snapin/novell-consoleone-ncs-snapin-1.7.ebuild b/trunk/novell4gentoo/app-admin/novell-ncs-admin/novell-consoleone-ncs-snapin-1.7.ebuild
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-ncs-snapin/novell-consoleone-ncs-snapin-1.7.ebuild
rename to trunk/novell4gentoo/app-admin/novell-ncs-admin/novell-consoleone-ncs-snapin-1.7.ebuild
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-nisnfs-snapin/ChangeLog b/trunk/novell4gentoo/app-admin/novell-nisnfs-admin/ChangeLog
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-nisnfs-snapin/ChangeLog
rename to trunk/novell4gentoo/app-admin/novell-nisnfs-admin/ChangeLog
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-nisnfs-snapin/Manifest b/trunk/novell4gentoo/app-admin/novell-nisnfs-admin/Manifest
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-nisnfs-snapin/Manifest
rename to trunk/novell4gentoo/app-admin/novell-nisnfs-admin/Manifest
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-nisnfs-snapin/metadata.xml b/trunk/novell4gentoo/app-admin/novell-nisnfs-admin/metadata.xml
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-nisnfs-snapin/metadata.xml
rename to trunk/novell4gentoo/app-admin/novell-nisnfs-admin/metadata.xml
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-nisnfs-snapin/novell-consoleone-nisnfs-snapin-85.00.00.ebuild b/trunk/novell4gentoo/app-admin/novell-nisnfs-admin/novell-consoleone-nisnfs-snapin-85.00.00.ebuild
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-nisnfs-snapin/novell-consoleone-nisnfs-snapin-85.00.00.ebuild
rename to trunk/novell4gentoo/app-admin/novell-nisnfs-admin/novell-consoleone-nisnfs-snapin-85.00.00.ebuild
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-nmas-snapin/ChangeLog b/trunk/novell4gentoo/app-admin/novell-nmas-admin/ChangeLog
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-nmas-snapin/ChangeLog
rename to trunk/novell4gentoo/app-admin/novell-nmas-admin/ChangeLog
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-nmas-snapin/Manifest b/trunk/novell4gentoo/app-admin/novell-nmas-admin/Manifest
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-nmas-snapin/Manifest
rename to trunk/novell4gentoo/app-admin/novell-nmas-admin/Manifest
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-nmas-method-snapin/metadata.xml b/trunk/novell4gentoo/app-admin/novell-nmas-admin/metadata.xml
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-nmas-method-snapin/metadata.xml
rename to trunk/novell4gentoo/app-admin/novell-nmas-admin/metadata.xml
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-nmas-snapin/novell-consoleone-nmas-snapin-2.0.1.ebuild b/trunk/novell4gentoo/app-admin/novell-nmas-admin/novell-consoleone-nmas-snapin-2.0.1.ebuild
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-nmas-snapin/novell-consoleone-nmas-snapin-2.0.1.ebuild
rename to trunk/novell4gentoo/app-admin/novell-nmas-admin/novell-consoleone-nmas-snapin-2.0.1.ebuild
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-nmas-method-snapin/ChangeLog b/trunk/novell4gentoo/app-admin/novell-nmas-method-admin/ChangeLog
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-nmas-method-snapin/ChangeLog
rename to trunk/novell4gentoo/app-admin/novell-nmas-method-admin/ChangeLog
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-nmas-method-snapin/Manifest b/trunk/novell4gentoo/app-admin/novell-nmas-method-admin/Manifest
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-nmas-method-snapin/Manifest
rename to trunk/novell4gentoo/app-admin/novell-nmas-method-admin/Manifest
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-nmas-snapin/metadata.xml b/trunk/novell4gentoo/app-admin/novell-nmas-method-admin/metadata.xml
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-nmas-snapin/metadata.xml
rename to trunk/novell4gentoo/app-admin/novell-nmas-method-admin/metadata.xml
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-nmas-method-snapin/novell-consoleone-nmas-method-snapin-2.0.1.ebuild b/trunk/novell4gentoo/app-admin/novell-nmas-method-admin/novell-consoleone-nmas-method-snapin-2.0.1.ebuild
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-nmas-method-snapin/novell-consoleone-nmas-method-snapin-2.0.1.ebuild
rename to trunk/novell4gentoo/app-admin/novell-nmas-method-admin/novell-consoleone-nmas-method-snapin-2.0.1.ebuild
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-radius-snapin/ChangeLog b/trunk/novell4gentoo/app-admin/novell-radius-admin/ChangeLog
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-radius-snapin/ChangeLog
rename to trunk/novell4gentoo/app-admin/novell-radius-admin/ChangeLog
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-radius-snapin/Manifest b/trunk/novell4gentoo/app-admin/novell-radius-admin/Manifest
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-radius-snapin/Manifest
rename to trunk/novell4gentoo/app-admin/novell-radius-admin/Manifest
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-radius-snapin/metadata.xml b/trunk/novell4gentoo/app-admin/novell-radius-admin/metadata.xml
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-radius-snapin/metadata.xml
rename to trunk/novell4gentoo/app-admin/novell-radius-admin/metadata.xml
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-radius-snapin/novell-consoleone-radius-snapin-2.0.1-r1.ebuild b/trunk/novell4gentoo/app-admin/novell-radius-admin/novell-consoleone-radius-snapin-2.0.1-r1.ebuild
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-radius-snapin/novell-consoleone-radius-snapin-2.0.1-r1.ebuild
rename to trunk/novell4gentoo/app-admin/novell-radius-admin/novell-consoleone-radius-snapin-2.0.1-r1.ebuild
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-radius-snapin/novell-consoleone-radius-snapin-2.0.1.ebuild b/trunk/novell4gentoo/app-admin/novell-radius-admin/novell-consoleone-radius-snapin-2.0.1.ebuild
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-radius-snapin/novell-consoleone-radius-snapin-2.0.1.ebuild
rename to trunk/novell4gentoo/app-admin/novell-radius-admin/novell-consoleone-radius-snapin-2.0.1.ebuild
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-rconsolej/ChangeLog b/trunk/novell4gentoo/app-admin/novell-rconsolej/ChangeLog
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-rconsolej/ChangeLog
rename to trunk/novell4gentoo/app-admin/novell-rconsolej/ChangeLog
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-rconsolej/Manifest b/trunk/novell4gentoo/app-admin/novell-rconsolej/Manifest
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-rconsolej/Manifest
rename to trunk/novell4gentoo/app-admin/novell-rconsolej/Manifest
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-rconsolej/metadata.xml b/trunk/novell4gentoo/app-admin/novell-rconsolej/metadata.xml
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-rconsolej/metadata.xml
rename to trunk/novell4gentoo/app-admin/novell-rconsolej/metadata.xml
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-rconsolej/novell-consoleone-rconsolej-6.6.00.ebuild b/trunk/novell4gentoo/app-admin/novell-rconsolej/novell-consoleone-rconsolej-6.6.00.ebuild
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-rconsolej/novell-consoleone-rconsolej-6.6.00.ebuild
rename to trunk/novell4gentoo/app-admin/novell-rconsolej/novell-consoleone-rconsolej-6.6.00.ebuild
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-unix-account-management-snapin/ChangeLog b/trunk/novell4gentoo/app-admin/novell-unix-admin/ChangeLog
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-unix-account-management-snapin/ChangeLog
rename to trunk/novell4gentoo/app-admin/novell-unix-admin/ChangeLog
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-unix-account-management-snapin/Manifest b/trunk/novell4gentoo/app-admin/novell-unix-admin/Manifest
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-unix-account-management-snapin/Manifest
rename to trunk/novell4gentoo/app-admin/novell-unix-admin/Manifest
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-unix-account-management-snapin/metadata.xml b/trunk/novell4gentoo/app-admin/novell-unix-admin/metadata.xml
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-unix-account-management-snapin/metadata.xml
rename to trunk/novell4gentoo/app-admin/novell-unix-admin/metadata.xml
diff --git a/trunk/novell4gentoo/app-admin/novell-consoleone-unix-account-management-snapin/novell-consoleone-unix-account-management-snapin-2.1.ebuild b/trunk/novell4gentoo/app-admin/novell-unix-admin/novell-consoleone-unix-account-management-snapin-2.1.ebuild
similarity index 100%
rename from trunk/novell4gentoo/app-admin/novell-consoleone-unix-account-management-snapin/novell-consoleone-unix-account-management-snapin-2.1.ebuild
rename to trunk/novell4gentoo/app-admin/novell-unix-admin/novell-consoleone-unix-account-management-snapin-2.1.ebuild