Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.802
diff -u -p -r1.802 common.inc
--- includes/common.inc	9 Oct 2008 01:49:03 -0000	1.802
+++ includes/common.inc	10 Oct 2008 19:06:46 -0000
@@ -3424,7 +3424,7 @@ function drupal_write_record($table, &$o
  *   description = Enables threaded discussions about general topics.
  *   dependencies[] = taxonomy
  *   dependencies[] = comment
- *   package = Core - optional
+ *   package = Drupal core
  *   version = VERSION
  * @endverbatim
  *
Index: modules/aggregator/aggregator.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.info,v
retrieving revision 1.8
diff -u -p -r1.8 aggregator.info
--- modules/aggregator/aggregator.info	9 Oct 2008 22:51:37 -0000	1.8
+++ modules/aggregator/aggregator.info	10 Oct 2008 19:06:47 -0000
@@ -2,7 +2,7 @@
 
 name = Aggregator
 description = "Aggregates syndicated content (RSS, RDF, and Atom feeds)."
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = aggregator.module
Index: modules/block/block.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.info,v
retrieving revision 1.8
diff -u -p -r1.8 block.info
--- modules/block/block.info	9 Oct 2008 22:51:37 -0000	1.8
+++ modules/block/block.info	10 Oct 2008 19:06:47 -0000
@@ -2,7 +2,7 @@
 
 name = Block
 description = Controls the boxes that are displayed around the main content.
-package = Core - required
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = block.module
Index: modules/blog/blog.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.info,v
retrieving revision 1.9
diff -u -p -r1.9 blog.info
--- modules/blog/blog.info	22 Jul 2008 20:00:55 -0000	1.9
+++ modules/blog/blog.info	10 Oct 2008 19:06:47 -0000
@@ -2,7 +2,7 @@
 
 name = Blog
 description = Enables multi-user blogs.
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = blog.module
Index: modules/blogapi/blogapi.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/blogapi/blogapi.info,v
retrieving revision 1.8
diff -u -p -r1.8 blogapi.info
--- modules/blogapi/blogapi.info	9 Oct 2008 22:51:37 -0000	1.8
+++ modules/blogapi/blogapi.info	10 Oct 2008 19:06:47 -0000
@@ -2,7 +2,7 @@
 
 name = Blog API
 description = Allows users to post content using applications that support XML-RPC blog APIs.
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = blogapi.module
Index: modules/book/book.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.info,v
retrieving revision 1.9
diff -u -p -r1.9 book.info
--- modules/book/book.info	9 Oct 2008 22:51:38 -0000	1.9
+++ modules/book/book.info	10 Oct 2008 19:06:47 -0000
@@ -2,7 +2,7 @@
 
 name = Book
 description = Allows users to structure site pages in a hierarchy or outline.
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = book.module
Index: modules/color/color.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/color/color.info,v
retrieving revision 1.8
diff -u -p -r1.8 color.info
--- modules/color/color.info	9 Oct 2008 22:51:38 -0000	1.8
+++ modules/color/color.info	10 Oct 2008 19:06:47 -0000
@@ -2,7 +2,7 @@
 
 name = Color
 description = Allows administrators to change the color scheme of compatible themes.
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = color.module
Index: modules/comment/comment.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.info,v
retrieving revision 1.8
diff -u -p -r1.8 comment.info
--- modules/comment/comment.info	9 Oct 2008 22:51:38 -0000	1.8
+++ modules/comment/comment.info	10 Oct 2008 19:06:47 -0000
@@ -2,7 +2,7 @@
 
 name = Comment
 description = Allows users to comment on and discuss published content.
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = comment.module
Index: modules/contact/contact.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.info,v
retrieving revision 1.7
diff -u -p -r1.7 contact.info
--- modules/contact/contact.info	9 Oct 2008 22:51:38 -0000	1.7
+++ modules/contact/contact.info	10 Oct 2008 19:06:47 -0000
@@ -1,7 +1,7 @@
 ; $Id: contact.info,v 1.7 2008/10/09 22:51:38 webchick Exp $
 name = Contact
 description = Enables the use of both personal and site-wide contact forms.
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = contact.module
Index: modules/dblog/dblog.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.info,v
retrieving revision 1.5
diff -u -p -r1.5 dblog.info
--- modules/dblog/dblog.info	9 Oct 2008 22:51:38 -0000	1.5
+++ modules/dblog/dblog.info	10 Oct 2008 19:06:47 -0000
@@ -1,7 +1,7 @@
 ; $Id: dblog.info,v 1.5 2008/10/09 22:51:38 webchick Exp $
 name = Database logging
 description = Logs and records system events to the database.
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = dblog.module
Index: modules/filter/filter.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.info,v
retrieving revision 1.8
diff -u -p -r1.8 filter.info
--- modules/filter/filter.info	9 Oct 2008 22:51:39 -0000	1.8
+++ modules/filter/filter.info	10 Oct 2008 19:06:47 -0000
@@ -1,7 +1,7 @@
 ;h $Id: filter.info,v 1.8 2008/10/09 22:51:39 webchick Exp $
 name = Filter
 description = Filters content in preparation for display.
-package = Core - required
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = filter.module
Index: modules/forum/forum.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.info,v
retrieving revision 1.10
diff -u -p -r1.10 forum.info
--- modules/forum/forum.info	9 Oct 2008 22:51:39 -0000	1.10
+++ modules/forum/forum.info	10 Oct 2008 19:06:47 -0000
@@ -3,7 +3,7 @@ name = Forum
 description = Provides discussion forums.
 dependencies[] = taxonomy
 dependencies[] = comment
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = forum.module
Index: modules/help/help.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/help/help.info,v
retrieving revision 1.6
diff -u -p -r1.6 help.info
--- modules/help/help.info	6 May 2008 12:18:47 -0000	1.6
+++ modules/help/help.info	10 Oct 2008 19:06:47 -0000
@@ -1,7 +1,7 @@
 ; $Id: help.info,v 1.6 2008/05/06 12:18:47 dries Exp $
 name = Help
 description = Manages the display of online help.
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = help.module
Index: modules/locale/locale.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.info,v
retrieving revision 1.9
diff -u -p -r1.9 locale.info
--- modules/locale/locale.info	9 Oct 2008 22:51:39 -0000	1.9
+++ modules/locale/locale.info	10 Oct 2008 19:06:47 -0000
@@ -1,7 +1,7 @@
 ; $Id: locale.info,v 1.9 2008/10/09 22:51:39 webchick Exp $
 name = Locale
 description = Adds language handling functionality and enables the translation of the user interface to languages other than English.
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = locale.module
Index: modules/menu/menu.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.info,v
retrieving revision 1.7
diff -u -p -r1.7 menu.info
--- modules/menu/menu.info	9 Oct 2008 22:51:39 -0000	1.7
+++ modules/menu/menu.info	10 Oct 2008 19:06:47 -0000
@@ -1,7 +1,7 @@
 ; $Id: menu.info,v 1.7 2008/10/09 22:51:39 webchick Exp $
 name = Menu
 description = Allows administrators to customize the site navigation menu.
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = menu.module
Index: modules/node/node.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.info,v
retrieving revision 1.7
diff -u -p -r1.7 node.info
--- modules/node/node.info	9 Oct 2008 22:51:39 -0000	1.7
+++ modules/node/node.info	10 Oct 2008 19:06:47 -0000
@@ -1,7 +1,7 @@
 ; $Id: node.info,v 1.7 2008/10/09 22:51:39 webchick Exp $
 name = Node
 description = Allows content to be submitted to the site and displayed on pages.
-package = Core - required
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = node.module
Index: modules/openid/openid.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/openid/openid.info,v
retrieving revision 1.5
diff -u -p -r1.5 openid.info
--- modules/openid/openid.info	9 Oct 2008 22:51:39 -0000	1.5
+++ modules/openid/openid.info	10 Oct 2008 19:06:47 -0000
@@ -2,7 +2,7 @@
 name = OpenID
 description = "Allows users to log into your site using OpenID."
 version = VERSION
-package = Core - optional
+package = Drupal core
 core = 7.x
 files[] = openid.module
 files[] = openid.inc
Index: modules/path/path.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.info,v
retrieving revision 1.6
diff -u -p -r1.6 path.info
--- modules/path/path.info	6 May 2008 12:18:48 -0000	1.6
+++ modules/path/path.info	10 Oct 2008 19:06:47 -0000
@@ -1,7 +1,7 @@
 ; $Id: path.info,v 1.6 2008/05/06 12:18:48 dries Exp $
 name = Path
 description = Allows users to rename URLs.
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = path.module
Index: modules/php/php.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/php/php.info,v
retrieving revision 1.5
diff -u -p -r1.5 php.info
--- modules/php/php.info	9 Oct 2008 22:51:39 -0000	1.5
+++ modules/php/php.info	10 Oct 2008 19:06:47 -0000
@@ -1,7 +1,7 @@
 ; $Id: php.info,v 1.5 2008/10/09 22:51:39 webchick Exp $
 name = PHP filter
 description = Allows embedded PHP code/snippets to be evaluated.
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = php.module
Index: modules/poll/poll.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.info,v
retrieving revision 1.7
diff -u -p -r1.7 poll.info
--- modules/poll/poll.info	9 Oct 2008 22:51:39 -0000	1.7
+++ modules/poll/poll.info	10 Oct 2008 19:06:47 -0000
@@ -1,7 +1,7 @@
 ; $Id: poll.info,v 1.7 2008/10/09 22:51:39 webchick Exp $
 name = Poll
 description = Allows your site to capture votes on different topics in the form of multiple choice questions.
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = poll.module
Index: modules/profile/profile.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.info,v
retrieving revision 1.7
diff -u -p -r1.7 profile.info
--- modules/profile/profile.info	9 Oct 2008 22:51:40 -0000	1.7
+++ modules/profile/profile.info	10 Oct 2008 19:06:47 -0000
@@ -1,7 +1,7 @@
 ; $Id: profile.info,v 1.7 2008/10/09 22:51:40 webchick Exp $
 name = Profile
 description = Supports configurable user profiles.
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = profile.module
Index: modules/search/search.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.info,v
retrieving revision 1.7
diff -u -p -r1.7 search.info
--- modules/search/search.info	9 Oct 2008 22:51:40 -0000	1.7
+++ modules/search/search.info	10 Oct 2008 19:06:47 -0000
@@ -1,7 +1,7 @@
 ; $Id: search.info,v 1.7 2008/10/09 22:51:40 webchick Exp $
 name = Search
 description = Enables site-wide keyword searching.
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = search.module
Index: modules/simpletest/simpletest.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.info,v
retrieving revision 1.3
diff -u -p -r1.3 simpletest.info
--- modules/simpletest/simpletest.info	9 Oct 2008 22:51:40 -0000	1.3
+++ modules/simpletest/simpletest.info	10 Oct 2008 19:06:47 -0000
@@ -1,7 +1,7 @@
 ; $Id: simpletest.info,v 1.3 2008/10/09 22:51:40 webchick Exp $
 name = "SimpleTest"
 description = "Provides a framework for unit and functional testing."
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = simpletest.module
Index: modules/statistics/statistics.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.info,v
retrieving revision 1.7
diff -u -p -r1.7 statistics.info
--- modules/statistics/statistics.info	9 Oct 2008 22:51:40 -0000	1.7
+++ modules/statistics/statistics.info	10 Oct 2008 19:06:47 -0000
@@ -1,7 +1,7 @@
 ; $Id: statistics.info,v 1.7 2008/10/09 22:51:40 webchick Exp $
 name = Statistics
 description = Logs access statistics for your site.
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = statistics.module
Index: modules/syslog/syslog.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/syslog/syslog.info,v
retrieving revision 1.4
diff -u -p -r1.4 syslog.info
--- modules/syslog/syslog.info	6 May 2008 12:18:50 -0000	1.4
+++ modules/syslog/syslog.info	10 Oct 2008 19:06:47 -0000
@@ -1,7 +1,7 @@
 ; $Id: syslog.info,v 1.4 2008/05/06 12:18:50 dries Exp $
 name = Syslog
 description = Logs and records system events to syslog.
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = syslog.module
Index: modules/system/system.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.info,v
retrieving revision 1.8
diff -u -p -r1.8 system.info
--- modules/system/system.info	9 Oct 2008 22:51:40 -0000	1.8
+++ modules/system/system.info	10 Oct 2008 19:06:47 -0000
@@ -1,7 +1,7 @@
 ; $Id: system.info,v 1.8 2008/10/09 22:51:40 webchick Exp $
 name = System
 description = Handles general site configuration for administrators.
-package = Core - required
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = system.module
Index: modules/system/system.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.test,v
retrieving revision 1.12
diff -u -p -r1.12 system.test
--- modules/system/system.test	15 Sep 2008 20:48:09 -0000	1.12
+++ modules/system/system.test	10 Oct 2008 19:06:47 -0000
@@ -35,7 +35,7 @@ class EnableDisableCoreTestCase extends 
     $this->assertTableCount('aggregator', FALSE);
 
     $edit = array();
-    $edit['modules[Core - optional][aggregator][enable]'] = 'aggregator';
+    $edit['modules[Drupal core][aggregator][enable]'] = 'aggregator';
     $this->drupalPost('admin/build/modules', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'), t('Modules status has been updated.'));
 
@@ -44,7 +44,7 @@ class EnableDisableCoreTestCase extends 
 
     // Disable aggregator, check tables, uninstall aggregator, check tables.
     $edit = array();
-    $edit['modules[Core - optional][aggregator][enable]'] = FALSE;
+    $edit['modules[Drupal core][aggregator][enable]'] = FALSE;
     $this->drupalPost('admin/build/modules', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'), t('Modules status has been updated.'));
 
@@ -68,7 +68,7 @@ class EnableDisableCoreTestCase extends 
   function testEnableWithoutDependency () {
     // Attempt to enable content translation without locale enabled.
     $edit = array();
-    $edit['modules[Core - optional][translation][enable]'] = 'translation';
+    $edit['modules[Drupal core][translation][enable]'] = 'translation';
     $this->drupalPost('admin/build/modules', $edit, t('Save configuration'));
     $this->assertText(t('Some required modules must be enabled'), t('Dependecy required.'));
 
Index: modules/taxonomy/taxonomy.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.info,v
retrieving revision 1.7
diff -u -p -r1.7 taxonomy.info
--- modules/taxonomy/taxonomy.info	9 Oct 2008 22:51:40 -0000	1.7
+++ modules/taxonomy/taxonomy.info	10 Oct 2008 19:06:47 -0000
@@ -1,7 +1,7 @@
 ; $Id: taxonomy.info,v 1.7 2008/10/09 22:51:40 webchick Exp $
 name = Taxonomy
 description = Enables the categorization of content.
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = taxonomy.module
Index: modules/tracker/tracker.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/tracker/tracker.info,v
retrieving revision 1.7
diff -u -p -r1.7 tracker.info
--- modules/tracker/tracker.info	6 May 2008 12:18:51 -0000	1.7
+++ modules/tracker/tracker.info	10 Oct 2008 19:06:47 -0000
@@ -2,7 +2,7 @@
 name = Tracker
 description = Enables tracking of recent posts for users.
 dependencies[] = comment
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = tracker.module
Index: modules/translation/translation.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/translation/translation.info,v
retrieving revision 1.3
diff -u -p -r1.3 translation.info
--- modules/translation/translation.info	6 May 2008 12:18:51 -0000	1.3
+++ modules/translation/translation.info	10 Oct 2008 19:06:47 -0000
@@ -2,7 +2,7 @@
 name = Content translation
 description = Allows content to be translated into different languages.
 dependencies[] = locale
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = translation.module
Index: modules/trigger/trigger.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/trigger/trigger.info,v
retrieving revision 1.4
diff -u -p -r1.4 trigger.info
--- modules/trigger/trigger.info	9 Oct 2008 22:51:40 -0000	1.4
+++ modules/trigger/trigger.info	10 Oct 2008 19:06:47 -0000
@@ -1,7 +1,7 @@
 ; $Id: trigger.info,v 1.4 2008/10/09 22:51:40 webchick Exp $
 name = Trigger
 description = Enables actions to be fired on certain system events, such as when new content is created.
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = trigger.module
Index: modules/update/update.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/update/update.info,v
retrieving revision 1.4
diff -u -p -r1.4 update.info
--- modules/update/update.info	9 Oct 2008 22:51:41 -0000	1.4
+++ modules/update/update.info	10 Oct 2008 19:06:47 -0000
@@ -2,7 +2,7 @@
 name = Update status
 description = Checks the status of available updates for Drupal and your installed modules and themes.
 version = VERSION
-package = Core - optional
+package = Drupal core
 core = 7.x
 files[] = update.module
 files[] = update.compare.inc
Index: modules/upload/upload.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.info,v
retrieving revision 1.7
diff -u -p -r1.7 upload.info
--- modules/upload/upload.info	9 Oct 2008 22:51:41 -0000	1.7
+++ modules/upload/upload.info	10 Oct 2008 19:06:47 -0000
@@ -1,7 +1,7 @@
 ; $Id: upload.info,v 1.7 2008/10/09 22:51:41 webchick Exp $
 name = Upload
 description = Allows users to upload and attach files to content.
-package = Core - optional
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = upload.module
Index: modules/user/user.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.info,v
retrieving revision 1.7
diff -u -p -r1.7 user.info
--- modules/user/user.info	9 Oct 2008 22:51:41 -0000	1.7
+++ modules/user/user.info	10 Oct 2008 19:06:47 -0000
@@ -1,7 +1,7 @@
 ; $Id: user.info,v 1.7 2008/10/09 22:51:41 webchick Exp $
 name = User
 description = Manages the user registration and login system.
-package = Core - required
+package = Drupal core
 version = VERSION
 core = 7.x
 files[] = user.module