diff --git a/Source/NSApplication.m b/Source/NSApplication.m
index fec31f045..7759536c3 100644
--- a/Source/NSApplication.m
+++ b/Source/NSApplication.m
@@ -128,7 +128,7 @@ NSApplication	*NSApp = nil;
   [super _initDefaults];
   [self setExcludedFromWindowsMenu: YES];
   [self setReleasedWhenClosed: NO];
-  window_level = NSDockWindowLevel;
+  _windowLevel = NSDockWindowLevel;
 }
 
 @end
diff --git a/Source/NSMenu.m b/Source/NSMenu.m
index 9413fa483..f1a2b2721 100644
--- a/Source/NSMenu.m
+++ b/Source/NSMenu.m
@@ -1279,7 +1279,7 @@ static NSString	*NSMenuLocationsKey = @"NSMenuLocations";
 - (void) _initDefaults
 {
   [super _initDefaults];
-  window_level = NSSubmenuWindowLevel;
+  _windowLevel = NSSubmenuWindowLevel;
 }
 
 - (id) init
@@ -1309,7 +1309,7 @@ static NSString	*NSMenuLocationsKey = @"NSMenuLocations";
 // This method is a hack to speed-up menu dragging.
 - (void) moveToPoint: (NSPoint)aPoint
 {
-  NSRect frameRect = frame;
+  NSRect frameRect = _frame;
 
   frameRect.origin = aPoint;
   DPSplacewindow(GSCurrentContext(), frameRect.origin.x, frameRect.origin.y,
diff --git a/Source/NSView.m b/Source/NSView.m
index d82a1b9c0..d1b72654c 100644
--- a/Source/NSView.m
+++ b/Source/NSView.m
@@ -1267,7 +1267,7 @@ GSSetDragTypes(NSView* obj, NSArray *types)
   NSDebugLLog(@"NSView", @"Displaying rect \n\t%@\n\t window %p", 
 	      NSStringFromRect(wrect), _window);
   window_t = (struct NSWindow_struct *)_window;
-  [window_t->rectsBeingDrawn addObject: [NSValue valueWithRect: wrect]];
+  [window_t->_rectsBeingDrawn addObject: [NSValue valueWithRect: wrect]];
 
   DPSgsave(ctxt);
   if (_gstate)
@@ -1342,12 +1342,12 @@ GSSetDragTypes(NSView* obj, NSArray *types)
   window_t = (struct NSWindow_struct *)_window;
   if (flush)
     {
-      rect = [[window_t->rectsBeingDrawn lastObject] rectValue];
-      window_t->rectNeedingFlush =
-	NSUnionRect(window_t->rectNeedingFlush, rect);
+      rect = [[window_t->_rectsBeingDrawn lastObject] rectValue];
+      window_t->_rectNeedingFlush =
+	NSUnionRect(window_t->_rectNeedingFlush, rect);
       window_t->_f.needs_flush = YES;
     }
-  [window_t->rectsBeingDrawn removeLastObject];
+  [window_t->_rectsBeingDrawn removeLastObject];
   [ctxt unlockFocusView: self needsFlush: YES ];
 }