diff --git a/lib/spack/spack/platforms/cray_xc.py b/lib/spack/spack/platforms/cray_xc.py
index dffa2e4031..da90726fef 100644
--- a/lib/spack/spack/platforms/cray_xc.py
+++ b/lib/spack/spack/platforms/cray_xc.py
@@ -1,8 +1,7 @@
 import os
-
 from spack.architecture import Platform, Target
 from spack.operating_system.linux_distro import LinuxDistro
-from spack.operating_system.cnl import ComputeNodeLinux
+from spack.operating_system.cnl import Cnl
 
 class CrayXc(Platform):
     priority    = 20
@@ -39,7 +38,7 @@ def __init__(self):
                         Target('haswell', 'MODULES', 'craype-haswell'))         
 
         self.add_operating_system('SuSE11', LinuxDistro())
-        self.add_operating_system('CNL10', ComputeNodeLinux())
+        self.add_operating_system('CNL10', Cnl())
 
     @classmethod
     def detect(self):
diff --git a/lib/spack/spack/platforms/darwin.py b/lib/spack/spack/platforms/darwin.py
index 5b797a78db..4512857371 100644
--- a/lib/spack/spack/platforms/darwin.py
+++ b/lib/spack/spack/platforms/darwin.py
@@ -1,6 +1,6 @@
 import subprocess
 from spack.architecture import Platform, Target
-from spack.operating_system.mac_osx import MacOSX
+from spack.operating_system.mac_osx import MacOsx
 
 class Darwin(Platform):
     priority    = 89
@@ -11,7 +11,7 @@ class Darwin(Platform):
     def __init__(self):
         super(Darwin, self).__init__('darwin')
         self.add_target(self.default, Target(self.default, 'PATH'))
-        mac_os = MacOSX()
+        mac_os = MacOsx()
         self.default_os = mac_os.name
         self.add_operating_system(mac_os.name, mac_os)