diff --git a/panda/src/display/graphicsWindow.cxx b/panda/src/display/graphicsWindow.cxx
index c591678268..3f1006e5cf 100644
--- a/panda/src/display/graphicsWindow.cxx
+++ b/panda/src/display/graphicsWindow.cxx
@@ -641,14 +641,14 @@ set_properties_now(WindowProperties &properties) {
       properties.clear_mouse_mode();
     }
     else {
-      if(properties.get_mouse_mode() == WindowProperties::MOUSE_absolute) {
-        _properties.set_mouse_mode(WindowProperties::MOUSE_absolute);
+      if(properties.get_mouse_mode() == WindowProperties::M_absolute) {
+        _properties.set_mouse_mode(WindowProperties::M_absolute);
         mouse_mode_absolute();
         properties.clear_mouse_mode();
       }
       else
       {
-        _properties.set_mouse_mode(WindowProperties::MOUSE_relative);
+        _properties.set_mouse_mode(WindowProperties::M_relative);
         mouse_mode_relative();
         properties.clear_mouse_mode();        
       }    
diff --git a/panda/src/display/windowProperties.I b/panda/src/display/windowProperties.I
index c86cb0b204..6beb50188e 100644
--- a/panda/src/display/windowProperties.I
+++ b/panda/src/display/windowProperties.I
@@ -789,7 +789,7 @@ has_mouse_mode() const {
 INLINE void WindowProperties::
 clear_mouse_mode() {
   _specified &= ~S_mouse_mode;
-  _mouse_mode=MOUSE_absolute;
+  _mouse_mode = M_absolute;
 }
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/display/windowProperties.cxx b/panda/src/display/windowProperties.cxx
index e9c35bcc0e..d01f2d4e9e 100644
--- a/panda/src/display/windowProperties.cxx
+++ b/panda/src/display/windowProperties.cxx
@@ -87,7 +87,7 @@ get_default() {
     props.set_z_order(z_order);
   }
   props.set_title(window_title);
-  props.set_mouse_mode(MOUSE_absolute);
+  props.set_mouse_mode(M_absolute);
   return props;
 }
 
@@ -145,7 +145,7 @@ clear() {
   _cursor_filename = Filename();
   _z_order = Z_normal;
   _flags = 0;
-  _mouse_mode = MOUSE_absolute;
+  _mouse_mode = M_absolute;
   _parent_window = 0;
 }
 
@@ -317,9 +317,9 @@ operator >> (istream &in, WindowProperties::ZOrder &z_order) {
 ostream &
 operator << (ostream &out, WindowProperties::MouseMode mode) {
   switch (mode) {
-  case WindowProperties::MOUSE_absolute:
+  case WindowProperties::M_absolute:
     return out << "absolute";
-  case WindowProperties::MOUSE_relative:
+  case WindowProperties::M_relative:
     return out << "relative";
   }
   return out << "**invalid WindowProperties::MouseMode(" << (int)mode << ")**";
@@ -331,13 +331,13 @@ operator >> (istream &in, WindowProperties::MouseMode &mode) {
   in >> word;
 
   if (word == "absolute") {
-    mode = WindowProperties::MOUSE_absolute;
+    mode = WindowProperties::M_absolute;
   } else if (word == "relative") {
-    mode = WindowProperties::MOUSE_relative;
+    mode = WindowProperties::M_relative;
   } else {
     display_cat.warning()
       << "Unknown mouse mode: " << word << "\n";
-    mode = WindowProperties::MOUSE_absolute;
+    mode = WindowProperties::M_absolute;
   }
 
   return in;
diff --git a/panda/src/display/windowProperties.h b/panda/src/display/windowProperties.h
index a121578ba9..1d2682d6f5 100644
--- a/panda/src/display/windowProperties.h
+++ b/panda/src/display/windowProperties.h
@@ -41,8 +41,8 @@ PUBLISHED:
   };
   
   enum MouseMode {
-    MOUSE_absolute,
-    MOUSE_relative,
+    M_absolute,
+    M_relative,
   };
 
   WindowProperties();
diff --git a/panda/src/osxdisplay/osxGraphicsWindow.cxx b/panda/src/osxdisplay/osxGraphicsWindow.cxx
index 37410de35b..571ed13fff 100644
--- a/panda/src/osxdisplay/osxGraphicsWindow.cxx
+++ b/panda/src/osxdisplay/osxGraphicsWindow.cxx
@@ -1277,7 +1277,7 @@ void osxGraphicsWindow::SystemSetWindowForground(bool forground)
                 {
                     GetEventParameter(event, kEventParamMouseButton, typeMouseButton, NULL, sizeof(EventMouseButton), NULL, &button);
                     GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers);
-                    if(_properties.get_mouse_mode()==WindowProperties::MOUSE_relative)
+                    if(_properties.get_mouse_mode()==WindowProperties::M_relative)
                     {
                       GetEventParameter(event, kEventParamMouseDelta,typeQDPoint, NULL, sizeof(Point),NULL	, (void*) &qdGlobalPoint);
                       MouseData currMouse=get_pointer(0);
@@ -1304,7 +1304,7 @@ void osxGraphicsWindow::SystemSetWindowForground(bool forground)
                 {
                     GetEventParameter(event, kEventParamMouseButton, typeMouseButton, NULL, sizeof(EventMouseButton), NULL, &button);
                     //				GetEventParameter(event, kEventParamWindowMouseLocation, typeHIPoint, NULL, sizeof(HIPoint), NULL, &location);	// Mac OS X v10.1 and later
-                    if(_properties.get_mouse_mode()==WindowProperties::MOUSE_relative)
+                    if(_properties.get_mouse_mode()==WindowProperties::M_relative)
                     {
                       GetEventParameter(event, kEventParamMouseDelta,typeQDPoint, NULL, sizeof(Point),NULL	, (void*) &qdGlobalPoint);
                       MouseData currMouse=get_pointer(0);
@@ -1328,7 +1328,7 @@ void osxGraphicsWindow::SystemSetWindowForground(bool forground)
                 break;
             case kEventMouseMoved:	
             case kEventMouseDragged:
-                if(_properties.get_mouse_mode()==WindowProperties::MOUSE_relative)
+                if(_properties.get_mouse_mode()==WindowProperties::M_relative)
                 {
                   GetEventParameter(event, kEventParamMouseDelta,typeQDPoint, NULL, sizeof(Point),NULL	, (void*) &qdGlobalPoint);
                   
@@ -1544,7 +1544,7 @@ if (osxdisplay_cat.is_debug())
     pt.v = y; 
     _input_devices[0].set_pointer_in_window(x, y);  
 
-    if(_properties.get_mouse_mode()==WindowProperties::MOUSE_absolute)
+    if(_properties.get_mouse_mode()==WindowProperties::M_absolute)
     {
        LocalPointToSystemPoint(pt); 
        CGPoint newCursorPosition = {0, 0};