--- a/plugins/color/csd-color-manager.c
+++ b/plugins/color/csd-color-manager.c
@@ -1014,7 +1014,7 @@ gcm_session_use_output_profile_for_scree
                         connected = outputs[i];
                 if (gnome_rr_output_get_is_primary (outputs[i]))
                         has_primary = TRUE;
-                if (gnome_rr_output_is_laptop (outputs[i]))
+                if (gnome_rr_output_is_builtin_display (outputs[i]))
                         has_laptop = TRUE;
         }
 
@@ -1024,7 +1024,7 @@ gcm_session_use_output_profile_for_scree
 
         /* choosing the internal panel is probably sane */
         if (has_laptop)
-                return gnome_rr_output_is_laptop (output);
+                return gnome_rr_output_is_builtin_display (output);
 
         /* we have to choose one, so go for the first connected device */
         if (connected != NULL)
@@ -1123,7 +1123,7 @@ gcm_session_device_assign_profile_connec
          * calibration brightness then set this new brightness */
         brightness_profile = cd_profile_get_metadata_item (profile,
                                                            CD_PROFILE_METADATA_SCREEN_BRIGHTNESS);
-        if (gnome_rr_output_is_laptop (output) &&
+        if (gnome_rr_output_is_builtin_display (output) &&
             brightness_profile != NULL) {
                 /* the percentage is stored in the profile metadata as
                  * a string, not ideal, but it's all we have... */
@@ -1384,7 +1384,7 @@ gcm_session_add_x11_output (CsdColorMana
         }
 
         /* prefer DMI data for the internal output */
-        ret = gnome_rr_output_is_laptop (output);
+        ret = gnome_rr_output_is_builtin_display (output);
         if (ret) {
                 model = gcm_dmi_get_name (priv->dmi);
                 vendor = gcm_dmi_get_vendor (priv->dmi);
@@ -1443,7 +1443,7 @@ gcm_session_add_x11_output (CsdColorMana
 #if CD_CHECK_VERSION(0,1,27)
         /* set this so we can call the device a 'Laptop Screen' in the
          * control center main panel */
-        if (gnome_rr_output_is_laptop (output)) {
+        if (gnome_rr_output_is_builtin_display (output)) {
                 g_hash_table_insert (device_props,
                                      (gpointer) CD_DEVICE_PROPERTY_EMBEDDED,
                                      NULL);
--- a/plugins/power/csd-power-manager.c
+++ b/plugins/power/csd-power-manager.c
@@ -2234,7 +2234,7 @@ non_laptop_outputs_are_all_off (GnomeRRS
 
         outputs = gnome_rr_screen_list_outputs (screen);
         for (i = 0; outputs[i] != NULL; i++) {
-                if (gnome_rr_output_is_laptop (outputs[i]))
+                if (gnome_rr_output_is_builtin_display (outputs[i]))
                         continue;
 
                 if (is_on (outputs[i]))
@@ -2432,7 +2432,7 @@ get_primary_output (CsdPowerManager *man
 
         for (i = 0; outputs[i] != NULL; i++) {
                 if (gnome_rr_output_is_connected (outputs[i]) &&
-                    gnome_rr_output_is_laptop (outputs[i]) &&
+                    gnome_rr_output_is_builtin_display (outputs[i]) &&
                     gnome_rr_output_get_backlight_min (outputs[i]) >= 0 &&
                     gnome_rr_output_get_backlight_max (outputs[i]) > 0) {
                         output = outputs[i];
--- a/plugins/xrandr/csd-xrandr-manager.c
+++ b/plugins/xrandr/csd-xrandr-manager.c
@@ -372,7 +372,7 @@ is_laptop (GnomeRRScreen *screen, GnomeR
 
         rr_output = gnome_rr_screen_get_output_by_name (screen, gnome_rr_output_info_get_name (output));
 
-        return gnome_rr_output_is_laptop (rr_output);
+        return gnome_rr_output_is_builtin_display (rr_output);
 }
 
 static GnomeRROutputInfo *