--- rxvt-unicode/src/scrollbar.C	2008/01/29 14:45:55	1.50
+++ rxvt-unicode/src/scrollbar.C	2008/02/17 12:11:56	1.53
@@ -112,7 +112,7 @@
       scrollBar.win = XCreateSimpleWindow (dpy,
                                            parent[0],
                                            window_sb_x, 0,
-                                           scrollbar_TotalWidth (),
+                                           scrollBar.total_width (),
                                            szHint.height,
                                            0,
                                            pix_colors[Color_fg],
@@ -151,11 +151,11 @@
       top = view_start - top_row;
       bot = top + (nrow - 1);
       len = max (nrow - 1 - top_row, 1);
-      adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0;
+      adj = (((bot - top) * scrollBar.size ()) % len) > 0 ? 1 : 0;
 
-      scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len);
-      scrollBar.len = ((bot - top) * scrollbar_size ()) / len +
-                      scrollbar_minheight () + adj;
+      scrollBar.top = (scrollBar.beg + (top * scrollBar.size ()) / len);
+      scrollBar.len = ((bot - top) * scrollBar.size ()) / len +
+                      scrollBar.min_height () + adj;
       scrollBar.bot = (scrollBar.top + scrollBar.len);
       /* no change */
       if (scrollBar.top == scrollBar.last_top
@@ -231,13 +231,13 @@
 
 # ifdef RXVT_SCROLLBAR
   if (! term->option (Opt_scrollBar_floating) && style == R_SB_RXVT)
-    scrollBar.shadow = SHADOW_WIDTH;
+    shadow = SHADOW_WIDTH;
 # endif
 
   this->style = style;
   this->width = width;
 
-  /* scrollBar.align = R_SB_ALIGN_CENTRE; */
+  /* align = R_SB_ALIGN_CENTRE; */
   if (scrollalign)
     {
       if (strncasecmp (scrollalign, "top", 3) == 0)