--- a/dwt/graphics/Device.d	Tue Dec 09 21:52:21 2008 +0100
+++ b/dwt/graphics/Device.d	Mon Dec 22 15:10:19 2008 +0100
@@ -46,7 +46,6 @@
 import dwt.internal.objc.cocoa.Cocoa;
 import objc = dwt.internal.objc.runtime;
 
-
 /**
  * This class is the abstract superclass of all device objects,
  * such as the Display device and the Printer device. Devices
@@ -149,7 +148,7 @@
         NSAutoreleasePool pool = cast(NSAutoreleasePool) (new NSAutoreleasePool()).alloc().init();
         NSThread nsthread = NSThread.currentThread();
         NSMutableDictionary dictionary = nsthread.threadDictionary();
-        NSString key = NSString.stringWith("DWT_NSAutoreleasePool");
+        NSString key = NSString.stringWith("SWT_NSAutoreleasePool");
         cocoa.id obj = dictionary.objectForKey(key);
         if (obj is null) {
             NSNumber nsnumber = NSNumber.numberWithInteger(cast(NSInteger) pool.id);
@@ -546,8 +545,8 @@
     COLOR_WHITE = new Color (this, 0xFF,0xFF,0xFF);
     
     /* Initialize the system font slot */
-    bool smallFonts = System.getProperty("dwt.internal.carbon.smallFonts") !is null;
-    float systemFontSize = smallFonts ? NSFont.smallSystemFontSize() : NSFont.systemFontSize();     
+    bool smallFonts = System.getProperty("org.eclipse.swt.internal.carbon.smallFonts") !is null;
+    Carbon.CGFloat systemFontSize = smallFonts ? NSFont.smallSystemFontSize() : NSFont.systemFontSize();     
     Point dpi = this.dpi = getDPI(), screenDPI = getScreenDPI();
     NSFont font = NSFont.systemFontOfSize(systemFontSize * dpi.y / screenDPI.y);
     systemFont = Font.cocoa_new(this, font);