diff --git a/randr/rrmonitor.c b/randr/rrmonitor.c
index 5bca09d9be..585ed6465f 100644
--- a/randr/rrmonitor.c
+++ b/randr/rrmonitor.c
@@ -37,7 +37,7 @@ RRMonitorCrtcName(RRCrtcPtr crtc)
         return MakeAtom(output->name, output->nameLength, TRUE);
     }
     sprintf(name, "Monitor-%08lx", (unsigned long int)crtc->id);
-    return MakeAtom(name, strlen(name), TRUE);
+    return dixAddAtom(name);
 }
 
 static Bool
diff --git a/randr/rroutput.c b/randr/rroutput.c
index b53e3864d5..1ed48f46b0 100644
--- a/randr/rroutput.c
+++ b/randr/rroutput.c
@@ -70,7 +70,6 @@ RROutputCreate(ScreenPtr pScreen,
     RROutputPtr output;
     RROutputPtr *outputs;
     rrScrPrivPtr pScrPriv;
-    Atom nonDesktopAtom;
     Atom DPIAtom;
 
     if (!RRInit())
@@ -103,7 +102,7 @@ RROutputCreate(ScreenPtr pScreen,
 
     pScrPriv->outputs[pScrPriv->numOutputs++] = output;
 
-    nonDesktopAtom = MakeAtom(RR_PROPERTY_NON_DESKTOP, strlen(RR_PROPERTY_NON_DESKTOP), TRUE);
+    Atom nonDesktopAtom = dixAddAtom(RR_PROPERTY_NON_DESKTOP);
     if (nonDesktopAtom != BAD_RESOURCE) {
         static const INT32 values[2] = { 0, 1 };
         (void) RRConfigureOutputProperty(output, nonDesktopAtom, FALSE, FALSE, FALSE,
@@ -112,7 +111,7 @@ RROutputCreate(ScreenPtr pScreen,
     RROutputSetNonDesktop(output, FALSE);
 
     /* Initialize DPI property for all outputs. */
-    DPIAtom = MakeAtom("DPI", 3, TRUE);
+    DPIAtom = dixAddAtom("DPI");
     if (DPIAtom != BAD_RESOURCE) {
         static const INT32 values[2] = { 0, 960 }; // arbitrary range
         (void) RRConfigureOutputProperty(output, DPIAtom, FALSE, TRUE, FALSE,
@@ -323,7 +322,7 @@ Bool
 RROutputSetNonDesktop(RROutputPtr output, Bool nonDesktop)
 {
     const char *nonDesktopStr = RR_PROPERTY_NON_DESKTOP;
-    Atom nonDesktopProp = MakeAtom(nonDesktopStr, strlen(nonDesktopStr), TRUE);
+    Atom nonDesktopProp = dixAddAtom(nonDesktopStr);
     uint32_t value = nonDesktop ? 1 : 0;
 
     if (nonDesktopProp == None || nonDesktopProp == BAD_RESOURCE)