diff -urp sites/all/modules/pathauto/pathauto.install sites/all/modules/pathauto/pathauto.install
--- sites/all/modules/pathauto/pathauto.install	2007-04-26 21:13:32.000000000 -0400
+++ sites/all/modules/pathauto/pathauto.install	2007-06-22 17:09:51.000000000 -0400
@@ -17,11 +17,11 @@ function pathauto_install() {
   if (module_exists('taxonomy')) {
     variable_set('pathauto_modulelist', array('node', 'user', 'taxonomy'));
     variable_set('pathauto_taxonomy_supportsfeeds', '0/feed');
-    variable_set('pathauto_taxonomy_pattern', 'category/[vocab]/[catpath]');
+    variable_set('pathauto_taxonomy_p', 'category/[vocab]/[catpath]');
     variable_set('pathauto_taxonomy_bulkupdate', FALSE);
     variable_set('pathauto_taxonomy_applytofeeds', FALSE);
-    variable_set('pathauto_taxonomy_2_pattern', '');
-    variable_set('pathauto_taxonomy_1_pattern', '');
+    variable_set('pathauto_taxonomy_2_p', '');
+    variable_set('pathauto_taxonomy_1_p', '');
   }
   else { // Node and user are required so we don't have to check
     variable_set('pathauto_modulelist', array('node', 'user'));
@@ -34,17 +34,17 @@ function pathauto_install() {
   variable_set('pathauto_max_length', '100');
   variable_set('pathauto_node_applytofeeds', FALSE);
   variable_set('pathauto_node_bulkupdate', FALSE);
-  variable_set('pathauto_node_forum_pattern', '');
-  variable_set('pathauto_node_image_pattern', '');
-  variable_set('pathauto_node_page_pattern', '');
-  variable_set('pathauto_node_pattern', 'content/[title]');
-  variable_set('pathauto_node_story_pattern', '');
+  variable_set('pathauto_node_forum_p', '');
+  variable_set('pathauto_node_image_p', '');
+  variable_set('pathauto_node_page_p', '');
+  variable_set('pathauto_node_p', 'content/[title]');
+  variable_set('pathauto_node_story_p', '');
   variable_set('pathauto_node_supportsfeeds', 'feed');
   variable_set('pathauto_quotes', '0');
   variable_set('pathauto_separator', '-');
   variable_set('pathauto_update_action', '2');
   variable_set('pathauto_user_bulkupdate', FALSE);
-  variable_set('pathauto_user_pattern', 'users/[user]');
+  variable_set('pathauto_user_p', 'users/[user]');
   variable_set('pathauto_user_supportsfeeds', NULL);
   variable_set('pathauto_verbose', FALSE);
   
@@ -59,4 +59,16 @@ function pathauto_uninstall() {
   // Delete all the pathauto variables and then clear the variable cache  
   db_query("DELETE FROM {variable} WHERE name LIKE 'pathauto_%'");
   cache_clear_all('variables', 'cache');
-}
\ No newline at end of file
+}
+
+/**
+ * Implementation of hook_update_N().
+
+ * For CCK compatability, reduce the number of characters used in the 
+ * pattern variable names from the 5.x-1.* releases.
+ */
+function pathauto_update_5200() {
+  $ret = array();
+  $ret[] = update_sql("UPDATE `variable` SET name = LEFT( name, LENGTH( name) -6 ) WHERE name LIKE 'pathauto_%_pattern'"); 
+  return $ret;
+}
diff -urp sites/all/modules/pathauto/pathauto.module sites/all/modules/pathauto/pathauto.module
--- sites/all/modules/pathauto/pathauto.module	2007-05-18 00:14:16.000000000 -0400
+++ sites/all/modules/pathauto/pathauto.module	2007-06-22 16:15:36.000000000 -0400
@@ -180,7 +180,7 @@ function pathauto_admin_settings() {
     $group_weight++;
 
     // Prompt for the default pattern for this module
-    $variable = 'pathauto_'. $module .'_pattern';
+    $variable = 'pathauto_'. $module .'_p';
     $form[$module][$variable] = array('#type' => 'textfield',
       '#title' => $patterndescr,
       '#default_value' => variable_get($variable, $patterndefault),
@@ -190,7 +190,7 @@ function pathauto_admin_settings() {
     // them up here
     if (isset($settings->patternitems)) {
       foreach ($settings->patternitems as $itemname => $itemlabel) {
-        $variable = 'pathauto_'. $module .'_'. $itemname .'_pattern';
+        $variable = 'pathauto_'. $module .'_'. $itemname .'_p';
         $form[$module][$variable] = array('#type' => 'textfield',
           '#title' => $itemlabel,
           '#default_value' => variable_get($variable, ''),
@@ -368,10 +368,10 @@ function pathauto_create_alias($module, 
   // Retrieve and apply the pattern for this content type
   $pattern = '';
   if ($type) {
-    $pattern = drupal_strtolower(variable_get('pathauto_'. $module .'_'. $type .'_pattern', ''));
+    $pattern = drupal_strtolower(variable_get('pathauto_'. $module .'_'. $type .'_p', ''));
   }
   if (!trim($pattern)) {
-    $pattern = drupal_strtolower(variable_get('pathauto_'. $module .'_pattern', ''));
+    $pattern = drupal_strtolower(variable_get('pathauto_'. $module .'_p', ''));
   }
   
   // No pattern? Do nothing (otherwise we may blow away existing aliases...)