Index: modules/panels.skinr.inc
=========================================================
--- modules/panels.skinr.inc	(revision 1.8.2.2.2.13)
+++ modules/panels.skinr.inc	Mon Oct 18 01:37:19 EDT 2010
@@ -78,7 +78,7 @@
           return 'display-'. $form['#parameters'][1]['display']->did;
         case 'panel': // Deprecated in Panels 3.7
         case 'region':
-          return 'display-'. $form['#parameters'][1]['display']->did .'-panel-'. $form['#parameters'][1]['pid'];
+          return 'display-'. $form['#parameters'][1]['display']->did .'-region-'. $form['#parameters'][1]['pid'];
         case 'pane':
           return 'display-'. $form['#parameters'][1]['display']->did .'-pane-'. $form['#parameters'][1]['pid'];
       }
@@ -348,8 +348,7 @@
       return 'panels_display';
     case 'panel': // Deprecated as of Panels 3.7
     case 'region':
-    /* @todo  This needs to use panels_region */
-      return 'panels_panel';
+      return 'panels_region';
     case 'pane':
       return 'panels_pane';
   }
Index: modules/panels/skinr.inc
=========================================================
--- modules/panels/skinr.inc	(revision 1.1.2.2)
+++ modules/panels/skinr.inc	Mon Oct 18 01:19:30 EDT 2010
@@ -42,7 +42,7 @@
   if (empty($region_id)) {
     // We grab the first pane that we know exists in this panel and extract the region_id from it.
     $panes_keys = array_keys($panes);
-    $panel_id = $display->content[$panes_keys[0]]->panel;
+    $region_id = $display->content[$panes_keys[0]]->panel;
   }
 
   $output = '';
@@ -50,10 +50,9 @@
   foreach ($panes as $pane_id => $content) {
     // Add the separator if we've already displayed a pane.
     if ($print_separator) {
-      $output .= '<div class="panel-separator"></div>';
+      $output .= '<div class="panel-region-separator"></div>';
     }
     $output .= $text = $content;
-
     // If we displayed a pane, this will become true; if not, it will become
     // false.
     $print_separator = (bool) $text;
@@ -63,17 +62,20 @@
   $hook = 'panels';
   if (isset($display->panel_settings[$region_id]['style']) && isset($display->panel_settings[$region_id]['style']) == 'skinr') {
     // Specific style set for this panel.
-    $sid = 'display-'. $display->did .'-panel-'. $region_id;
+    $sid = 'display-'. $display->did .'-region-'. $region_id;
   }
   else {
     // No specific style set, so use the display's style.
     $sid = 'display-'. $display->did;
   }
   $style = array();
-  if($skinr = skinr_get(NULL, $hook, $sid)) {
+  // Get the Skinr classes for the region panel or display.
+  if ($skinr = skinr_get(NULL, $hook, $sid)) {
+    // Convert the array to a string fit for printing in the class attribute.
     $style = implode(' ', skinr_flatten_skins_array($skinr->skins));
   }
 
+  // Wrap the output in a DIV containing the Skinr class.
   if (!empty($style)) {
     $output = '<div class="'. $style .'">'. $output .'</div>';
   }
Index: skinr.install
=========================================================
--- skinr.install	(revision 1.3.2.2.2.5)
+++ skinr.install	Mon Oct 18 00:26:38 EDT 2010
@@ -276,3 +276,13 @@
 
   return $ret;
 }
+
+/**
+ * Change all panels regions to the new format.
+ */
+function skinr_update_6004() {
+  $ret = array();
+  $ret[] = update_sql("UPDATE {skinr} SET sid = REPLACE(sid, '-panel-', '-region-') WHERE module = 'panels' && sid LIKE '%-panel-%'");
+
+  return $ret;
+}